#1047 Some more cleanup for NULLGL

openscad · Dec 3, 2014 · 87f5324 · 87f5324
1 parent 88713b0
commit 87f5324
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 20 deletions.
diff --git a/src/NULLGL.cc b/src/NULLGL.cc
@@ -4,16 +4,10 @@ GLView::GLView() {}
 void GLView::setRenderer(Renderer* r) {}
 void GLView::initializeGL() {}
 void GLView::resizeGL(int w, int h) {}
-//void GLView::setupGimbalCamPerspective() {}
-//void GLView::setupGimbalCamOrtho(double distance, bool offset) {}
-//void GLView::setupVectorCamPerspective() {}
-//void GLView::setupVectorCamOrtho(bool offset) {}
-void GLView::setCamera(const Camera &cam ) {}
+void GLView::setCamera(const Camera &cam ) {assert(false && "not implemented");}
 void GLView::paintGL() {}
-//void GLView::vectorCamPaintGL() {}
-//void GLView::gimbalCamPaintGL() {}
-void GLView::showSmallaxes() {}
-void GLView::showAxes() {}
+void GLView::showSmallaxes(const Color4f &col) {}
+void GLView::showAxes(const Color4f &col) {}
 void GLView::showCrosshairs() {}
 void GLView::setColorScheme(const ColorScheme &cs){assert(false && "not implemented");}
 void GLView::setColorScheme(const std::string &cs) {assert(false && "not implemented");}

diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
@@ -78,7 +78,6 @@ endif()
 # Most tests will fail, but it can be used for testing/experiments
 
 if(NULLGL)
-  set(ENABLE_OPENCSG_FLAG "") # OpenCSG is entirely an OpenGL software
   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DNULLGL")
   set(SKIP_IMAGEMAGICK "1") # we dont generate png, so nothing to compare
 else()
@@ -736,16 +735,10 @@ target_link_libraries(tests-cgal tests-common ${CGAL_LIBRARY} ${CGAL_3RD_PARTY_L
 #
 # Create non-CGAL tests
 #
+add_library(tests-nocgal STATIC ${NOCGAL_SOURCES})
+target_link_libraries(tests-nocgal tests-common)
 if (NOT NULLGL)
-  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)
-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()
 
 add_library(tests-offscreen STATIC ${OFFSCREEN_SOURCES})
@@ -767,8 +760,8 @@ target_link_libraries(csgtexttest tests-nocgal)
 # cgalcachetest
 #
 add_executable(cgalcachetest cgalcachetest.cc)
-set_target_properties(cgalcachetest PROPERTIES COMPILE_FLAGS "${ENABLE_OPENCSG_FLAG} -DENABLE_CGAL ${CGAL_CXX_FLAGS_INIT}")
-target_link_libraries(cgalcachetest tests-cgal ${GLEW_LIBRARY})
+set_target_properties(cgalcachetest PROPERTIES COMPILE_FLAGS "-DENABLE_CGAL ${CGAL_CXX_FLAGS_INIT}")
+target_link_libraries(cgalcachetest tests-cgal)
 
 #
 # openscad no-qt