Merge branch 'master' of https://epicsparrow.com/epicsparrow/sparrowrenderer
This commit is contained in:
commit
fc2e3c5791
@ -5,8 +5,10 @@ find_package(OpenGL REQUIRED)
|
|||||||
|
|
||||||
if(WIN32)
|
if(WIN32)
|
||||||
set(SYSTEM_LIB_PATH "win32")
|
set(SYSTEM_LIB_PATH "win32")
|
||||||
|
set(GLEW_LIB_NAME "glew32")
|
||||||
else(WIN32)
|
else(WIN32)
|
||||||
set(SYSTEM_LIB_PATH "linux")
|
set(SYSTEM_LIB_PATH "linux")
|
||||||
|
set(GLEW_LIB_NAME "GLEW")
|
||||||
endif(WIN32)
|
endif(WIN32)
|
||||||
|
|
||||||
set(LIB_SRC_LIST
|
set(LIB_SRC_LIST
|
||||||
@ -45,7 +47,7 @@ include_directories(
|
|||||||
|
|
||||||
find_library(GLEW_LIBRARY
|
find_library(GLEW_LIBRARY
|
||||||
NAMES
|
NAMES
|
||||||
GLEW
|
${GLEW_LIB_NAME}
|
||||||
PATHS
|
PATHS
|
||||||
${LIB_ROOT}
|
${LIB_ROOT}
|
||||||
)
|
)
|
||||||
|
@ -50,7 +50,7 @@ void SparrowRenderer::resizeGL(int width, int height)
|
|||||||
|
|
||||||
void SparrowRenderer::renderGL()
|
void SparrowRenderer::renderGL()
|
||||||
{
|
{
|
||||||
glAssert(glClearColor(0.60, 0.65, 0.75, 1.0));
|
glAssert(glClearColor(0, 0, 0, 1.0));
|
||||||
glAssert(glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT));
|
glAssert(glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT));
|
||||||
for(ModuleNode &m : modules)
|
for(ModuleNode &m : modules)
|
||||||
{
|
{
|
||||||
|
Loading…
x
Reference in New Issue
Block a user