vitalif
/
openscad
mirror of https://github.com/vitalif/openscad
1
0
Fork 0
Code Issues Releases Wiki Activity

#1047 Some more cleanup for NULLGL

master
Marius Kintel 2014-12-03 10:58:44 -05:00
parent 88713b01cf
commit 87f532493e
2 changed files with 7 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/NULLGL.cc
View File

@ -4,16 +4,10 @@ GLView::GLView() {}
void GLView::setRenderer(Renderer* r) {} void GLView::setRenderer(Renderer* r) {}
void GLView::initializeGL() {} void GLView::initializeGL() {}
void GLView::resizeGL(int w, int h) {} void GLView::resizeGL(int w, int h) {}
//void GLView::setupGimbalCamPerspective() {} void GLView::setCamera(const Camera &cam ) {assert(false && "not implemented");}
//void GLView::setupGimbalCamOrtho(double distance, bool offset) {}
//void GLView::setupVectorCamPerspective() {}
//void GLView::setupVectorCamOrtho(bool offset) {}
void GLView::setCamera(const Camera &cam ) {}
void GLView::paintGL() {} void GLView::paintGL() {}
//void GLView::vectorCamPaintGL() {} void GLView::showSmallaxes(const Color4f &col) {}
//void GLView::gimbalCamPaintGL() {} void GLView::showAxes(const Color4f &col) {}
void GLView::showSmallaxes() {}
void GLView::showAxes() {}
void GLView::showCrosshairs() {} void GLView::showCrosshairs() {}
void GLView::setColorScheme(const ColorScheme &cs){assert(false && "not implemented");} void GLView::setColorScheme(const ColorScheme &cs){assert(false && "not implemented");}
void GLView::setColorScheme(const std::string &cs) {assert(false && "not implemented");} void GLView::setColorScheme(const std::string &cs) {assert(false && "not implemented");}

15
tests/CMakeLists.txt
View File

@ -78,7 +78,6 @@ endif()
# Most tests will fail, but it can be used for testing/experiments # Most tests will fail, but it can be used for testing/experiments
if(NULLGL) if(NULLGL)
set(ENABLE_OPENCSG_FLAG "") # OpenCSG is entirely an OpenGL software
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DNULLGL") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DNULLGL")
set(SKIP_IMAGEMAGICK "1") # we dont generate png, so nothing to compare set(SKIP_IMAGEMAGICK "1") # we dont generate png, so nothing to compare
else() else()
@ -736,16 +735,10 @@ target_link_libraries(tests-cgal tests-common ${CGAL_LIBRARY} ${CGAL_3RD_PARTY_L
# #
# Create non-CGAL tests # Create non-CGAL tests
# #
add_library(tests-nocgal STATIC ${NOCGAL_SOURCES})
target_link_libraries(tests-nocgal tests-common)
if (NOT NULLGL) if (NOT NULLGL)
add_library(tests-nocgal STATIC ${NOCGAL_SOURCES})
set_target_properties(tests-nocgal PROPERTIES COMPILE_FLAGS ${ENABLE_OPENCSG_FLAG}) set_target_properties(tests-nocgal PROPERTIES COMPILE_FLAGS ${ENABLE_OPENCSG_FLAG})
target_link_libraries(tests-nocgal tests-common)
else()
message(STATUS "NULLGL: cannot use GL/GLU tessellator. see dxftess.cc")
message(STATUS "NULLGL: non-CGAL tests will use CGAL's tessellator")
add_library(tests-nocgal STATIC ${NOCGAL_SOURCES})
set_target_properties(tests-nocgal PROPERTIES COMPILE_FLAGS ${ENABLE_OPENCSG_FLAG})
target_link_libraries(tests-nocgal tests-common)
endif() endif()
add_library(tests-offscreen STATIC ${OFFSCREEN_SOURCES}) add_library(tests-offscreen STATIC ${OFFSCREEN_SOURCES})
@ -767,8 +760,8 @@ target_link_libraries(csgtexttest tests-nocgal)
# cgalcachetest # cgalcachetest
# #
add_executable(cgalcachetest cgalcachetest.cc) add_executable(cgalcachetest cgalcachetest.cc)
set_target_properties(cgalcachetest PROPERTIES COMPILE_FLAGS "${ENABLE_OPENCSG_FLAG} -DENABLE_CGAL ${CGAL_CXX_FLAGS_INIT}") set_target_properties(cgalcachetest PROPERTIES COMPILE_FLAGS "-DENABLE_CGAL ${CGAL_CXX_FLAGS_INIT}")
target_link_libraries(cgalcachetest tests-cgal ${GLEW_LIBRARY}) target_link_libraries(cgalcachetest tests-cgal)
# #
# openscad no-qt # openscad no-qt