Added cgaltest

3 files changed, 25 insertions, 22 deletions

diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 0be0971..dc92e89 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -79,25 +79,28 @@ target_link_libraries(csgtexttest ${QT_LIBRARIES} ${OPENGL_LIBRARY})
 add_executable(csgtermtest csgtermtest.cc ../src/CSGTermRenderer.cc ${COMMON_SOURCES})
 target_link_libraries(csgtermtest ${QT_LIBRARIES} ${OPENGL_LIBRARY})
 
-# FIXME: Add FindCGAL and enable this
-#add_executable(cgaltest cgaltest.cc ../src/CSGTermRenderer.cc ../src/CGALRenderer.cc
-#                        ../src/PolySetCGALRenderer.cc ../src/qhash.cc ../src/nef2dxf.cc
-#                        ../src/nef2dxf.cc ../src/cgaladv_minkowski2.cc
-#                        ../src/cgaladv_minkowski3.cc ${COMMON_SOURCES})
-#target_link_libraries(cgaltest ${QT_LIBRARIES} ${OPENGL_LIBRARY})
+if (NOT $ENV{MACOSX_DEPLOY_DIR} STREQUAL "")
+  set(CGAL_DIR "$ENV{MACOSX_DEPLOY_DIR}/lib/CGAL")
+  set(CMAKE_MODULE_PATH "${CGAL_DIR}")
+endif()
+find_package(CGAL REQUIRED)
+include_directories(${CGAL_INCLUDE_DIRS})
+add_executable(cgaltest cgaltest.cc ../src/CSGTermRenderer.cc ../src/CGALRenderer.cc
+                        ../src/PolySetCGALRenderer.cc ../src/qhash.cc ../src/nef2dxf.cc
+                        ../src/nef2dxf.cc ../src/cgaladv_minkowski2.cc
+                        ../src/cgaladv_minkowski3.cc ${COMMON_SOURCES})
+set_target_properties(cgaltest PROPERTIES COMPILE_FLAGS "-DENABLE_CGAL ${CGAL_CXX_FLAGS_INIT}")
+target_link_libraries(cgaltest ${CGAL_LIBRARY} ${CGAL_3RD_PARTY_LIBRARIES} ${QT_LIBRARIES} ${OPENGL_LIBRARY})
 
 #
-# This functions adds cmd-line tests for those of the FILES which have
-# a corresponding TESTNAME-expected.<suffix> file present.
+# This functions adds cmd-line tests given files.
+# Files are sent as the parameters following TESTSUFFIX
 #
-function(add_cmdline_test TESTCMD TESTSUFFIX FILES)
+function(add_cmdline_test TESTCMD TESTSUFFIX)
   get_filename_component(TESTCMD_NAME ${TESTCMD} NAME_WE)
-  foreach (SCADFILE ${SCAD_FILES})
+  foreach (SCADFILE ${ARGN})
     get_filename_component(TESTNAME ${SCADFILE} NAME_WE)
-# FIXME: Run tests even if no expected files are found (to facilitate generating expected files)
-#    if (EXISTS ${CMAKE_SOURCE_DIR}/regression/${TESTCMD_NAME}/${TESTNAME}-expected.${TESTSUFFIX})
-      add_test(${TESTCMD_NAME}_${TESTNAME} ${tests_SOURCE_DIR}/test_cmdline_tool.py -s ${TESTSUFFIX} ${CMAKE_BINARY_DIR}/${TESTCMD} ${SCADFILE})
-#    endif()
+    add_test(${TESTCMD_NAME}_${TESTNAME} ${tests_SOURCE_DIR}/test_cmdline_tool.py -s ${TESTSUFFIX} ${CMAKE_BINARY_DIR}/${TESTCMD} ${SCADFILE})
   endforeach()
 endfunction()
 
@@ -112,9 +115,12 @@ add_cmdline_test(dumptest txt ${SCAD_FILES})
 add_cmdline_test(csgtexttest txt ${SCAD_FILES})
 # Add csgtermtest tests to CTest
 add_cmdline_test(csgtermtest txt ${SCAD_FILES})
-
-# FIXME: Add FindCGAL and enable these tests
 # Add cgaltest tests to CTest
-#add_cmdline_test(cgaltest stl ${SCAD_FILES})
+LIST(APPEND CGALTEST_FILES ${CMAKE_SOURCE_DIR}/../testdata/scad/cube.scad)
+LIST(APPEND CGALTEST_FILES ${CMAKE_SOURCE_DIR}/../testdata/scad/sphere.scad)
+LIST(APPEND CGALTEST_FILES ${CMAKE_SOURCE_DIR}/../testdata/scad/cylinder.scad)
+LIST(APPEND CGALTEST_FILES ${CMAKE_SOURCE_DIR}/../examples/example001.scad)
+add_cmdline_test(cgaltest stl ${CGALTEST_FILES})
+
 # Add dxfexport tests to CTest
 #add_cmdline_test(${CMAKE_SOURCE_DIR}/../test-code/exportdxf dxf ${SCAD_FILES})
diff --git a/tests/cgaltest.cc b/tests/cgaltest.cc
index 3e2cb44..e30e95b 100644
--- a/tests/cgaltest.cc
+++ b/tests/cgaltest.cc
@@ -162,8 +162,7 @@ int main(int argc, char **argv)
 	AbstractNode::resetIndexCounter();
 	root_node = root_module->evaluate(&root_ctx, &root_inst);
 
-	Tree tree;
-	tree.setRoot(root_node);
+	Tree tree(root_node);
 
 	cgalTree(tree);
 
diff --git a/tests/csgtermtest.cc b/tests/csgtermtest.cc
index be9314c..f8926a5 100644
--- a/tests/csgtermtest.cc
+++ b/tests/csgtermtest.cc
@@ -156,8 +156,7 @@ int main(int argc, char **argv)
 //	cout << tree.getString(*root_node) << "\n";
 
 	CSGTermRenderer renderer;
-	Traverser render(renderer, *tree.root(), Traverser::PRE_AND_POSTFIX);
-	render.execute();
+	CSGTerm *root_term = renderer.renderCSGTerm(*root_node, NULL, NULL);
 	
 	// cout << "Stored terms: " << renderer.stored_term.size() << "\n";
 	// for (map<int, class CSGTerm*>::iterator iter = renderer.stored_term.begin();
@@ -169,7 +168,6 @@ int main(int argc, char **argv)
 	// if (renderer.background) cout << "Background terms: " << renderer.background->size() << "\n";
 	// if (renderer.highlights) cout << "Highlights terms: " << renderer.highlights->size() << "\n";
 
-	CSGTerm *root_term = renderer.stored_term[root_node->index()];
 	if (root_term) {
 		cout << root_term->dump() << "\n";
 	}