Updated tests to latest internal API

2 files changed, 5 insertions, 11 deletions

diff --git a/tests/cgaltest.cc b/tests/cgaltest.cc
index e30e95b..9725bc3 100644
--- a/tests/cgaltest.cc
+++ b/tests/cgaltest.cc
@@ -164,22 +164,16 @@ int main(int argc, char **argv)
 
 	Tree tree(root_node);
 
-	cgalTree(tree);
+	QHash<std::string, CGAL_Nef_polyhedron> cache;
+	CGALRenderer cgalrenderer(cache, tree);
+ 	PolySetCGALRenderer psrenderer(cgalrenderer);
 
-// 	std::cout << tree.getString(*root_node) << "\n";
-
-// 	CGALRenderer cgalrenderer(dumper.getCache());
-// 	PolySetCGALRenderer psrenderer(cgalrenderer);
-// 	PolySetRenderer::setRenderer(&psrenderer);
-
-	CGAL_Nef_polyhedron N = cache[tree.getString(*root_node)];
+	CGAL_Nef_polyhedron N = cgalrenderer.renderCGALMesh(*root_node);
 
 	QDir::setCurrent(original_path.absolutePath());
 	QTextStream outstream(stdout);
 	export_stl(&N, outstream, NULL);
 
-	PolySetRenderer::setRenderer(NULL);
-
 	destroy_builtin_functions();
 	destroy_builtin_modules();
 
diff --git a/tests/csgtermtest.cc b/tests/csgtermtest.cc
index f8926a5..9eec025 100644
--- a/tests/csgtermtest.cc
+++ b/tests/csgtermtest.cc
@@ -155,7 +155,7 @@ int main(int argc, char **argv)
 
 //	cout << tree.getString(*root_node) << "\n";
 
-	CSGTermRenderer renderer;
+	CSGTermRenderer renderer(tree);
 	CSGTerm *root_term = renderer.renderCSGTerm(*root_node, NULL, NULL);
 	
 	// cout << "Stored terms: " << renderer.stored_term.size() << "\n";