Compile fixes for test programs

5 files changed, 16 insertions, 16 deletions

diff --git a/test-code/CSGTextRenderer.cc b/test-code/CSGTextRenderer.cc
index a366fb7..d9e3667 100644
--- a/test-code/CSGTextRenderer.cc
+++ b/test-code/CSGTextRenderer.cc
@@ -15,7 +15,7 @@
 #include <assert.h>
 #include <QRegExp>
 
-string CSGTextRenderer::getCGALMesh() const
+string CSGTextRenderer::getCSGString() const
 {
 	assert(this->root); 
 	// FIXME: assert that cache contains root
diff --git a/test-code/CSGTextRenderer.h b/test-code/CSGTextRenderer.h
index 84f3d30..22d722f 100644
--- a/test-code/CSGTextRenderer.h
+++ b/test-code/CSGTextRenderer.h
@@ -25,8 +25,7 @@ public:
 	virtual Response visit(const State &state, const TransformNode &node);
 	virtual Response visit(const State &state, const AbstractPolyNode &node);
 
-	string getCGALMesh() const;
-// 	CGAL_Nef_polyhedron getCGALMesh() const;
+	string getCSGString() const;
 private:
   void addToParent(const State &state, const AbstractNode &node);
   bool isCached(const AbstractNode &node);
@@ -38,9 +37,7 @@ private:
   const AbstractNode *root;
   typedef list<pair<const AbstractNode *, QString> > ChildList;
   map<int, ChildList> visitedchildren;
-//	hashmap<string, CGAL_Nef_polyhedron> cache;
 
-  // For now use strings instead of Nef polyhedrons for testing caching
 	QHash<QString, string> cache;
 	const NodeCache<string> &dumpcache;
 };
diff --git a/test-code/csgtexttest.cc b/test-code/csgtexttest.cc
index 837f442..b07bc92 100644
--- a/test-code/csgtexttest.cc
+++ b/test-code/csgtexttest.cc
@@ -31,7 +31,7 @@
 #include "export.h"
 #include "builtin.h"
 #include "nodedumper.h"
-#include "CGALRenderer.h"
+#include "CSGTextRenderer.h"
 
 #include <QApplication>
 #include <QFile>
@@ -152,10 +152,10 @@ int main(int argc, char **argv)
  	std::string dumpstdstr = dumper.getDump() + "\n";
  	std::cout << dumpstdstr << "\n";
 
-	CGALRenderer renderer(dumper.getCache());
+	CSGTextRenderer renderer(dumper.getCache());
 	Traverser render(renderer, *root_node, Traverser::PRE_AND_POSTFIX);
 	render.execute();
-	std::cout << renderer.getCGALMesh() << "\n";
+	std::cout << renderer.getCSGString() << "\n";
 
 	destroy_builtin_functions();
 	destroy_builtin_modules();
diff --git a/test-code/csgtexttest.pro b/test-code/csgtexttest.pro
index 94942da..43632ed 100644
--- a/test-code/csgtexttest.pro
+++ b/test-code/csgtexttest.pro
@@ -35,7 +35,6 @@ LEXSOURCES += ../src/lexer.l
 YACCSOURCES += ../src/parser.y
 
 HEADERS += ../src/builtin.h \
-           ../src/cgal.h \
            ../src/context.h \
            ../src/csgterm.h \
            ../src/dxfdata.h \
@@ -63,12 +62,13 @@ HEADERS += ../src/builtin.h \
            ../src/csgnode.h \
            ../src/visitor.h \
            ../src/nodedumper.h \
-           ../src/CGALRenderer.h \
+           ../src/CSGTextRenderer.h \
            ../src/nodecache.h \
            ../src/importnode.h \
-           ../src/state.h
+           ../src/state.h \
+           ../src/PolySetRenderer.h
 
-SOURCES += cgaltest.cc \
+SOURCES += csgtexttest.cc \
            ../src/export.cc \
            ../src/value.cc \
            ../src/expr.cc \
@@ -97,5 +97,6 @@ SOURCES += cgaltest.cc \
            ../src/printutils.cc \
            ../src/progress.cc \
            ../src/nodedumper.cc \
-           ../src/CGALRenderer.cc \
-           ../src/traverser.cc
+           ../src/CSGTextRenderer.cc \
+           ../src/traverser.cc \
+           ../src/PolySetRenderer.cc
diff --git a/test-code/dumptest.pro b/test-code/dumptest.pro
index f3ba27e..9e42320 100644
--- a/test-code/dumptest.pro
+++ b/test-code/dumptest.pro
@@ -67,7 +67,8 @@ HEADERS += ../src/builtin.h \
            ../src/nodedumper.h \
            ../src/nodecache.h \
            ../src/importnode.h \
-           ../src/state.h
+           ../src/state.h \
+           ../src/PolySetRenderer.h
 
 SOURCES += dumptest.cc \
            ../src/export.cc \
@@ -98,4 +99,5 @@ SOURCES += dumptest.cc \
            ../src/printutils.cc \
            ../src/progress.cc \
            ../src/nodedumper.cc \
-           ../src/traverser.cc
+           ../src/traverser.cc \
+           ../src/PolySetRenderer.cc