1 files changed, 48 insertions, 35 deletions

diff --git a/src/node.h b/src/node.h
index 2e1d718..c95b45b 100644
--- a/src/node.h
+++ b/src/node.h
@@ -4,9 +4,7 @@
 #include <QCache>
 #include <QVector>
 
-#ifdef ENABLE_CGAL
-#include "cgal.h"
-#endif
+#include "traverser.h"
 
 extern int progress_report_count;
 extern void (*progress_report_f)(const class AbstractNode*, void*, int);
@@ -15,64 +13,79 @@ extern void *progress_report_vp;
 void progress_report_prep(AbstractNode *root, void (*f)(const class AbstractNode *node, void *vp, int mark), void *vp);
 void progress_report_fin();
 
+/*!  
+
+	The node tree is the result of evaluation of a module instantiation
+	tree.  Both the module tree and the node tree are regenerated from
+	scratch for each compile.
+
+ */
 class AbstractNode
 {
-	static int idx_counter;   // Node instantiation index
+	// FIXME: the idx_counter/idx is mostly (only?) for debugging.
+	// We can hash on pointer value or smth. else.
+  //  -> remove and
+	// use smth. else to display node identifier in CSG tree output?
+	static size_t idx_counter;   // Node instantiation index
 public:
+	AbstractNode(const class ModuleInstantiation *mi);
+	virtual ~AbstractNode();
+  virtual Response accept(class State &state, class Visitor &visitor) const;
+	virtual std::string toString() const;
+	/*! The 'OpenSCAD name' of this node, defaults to classname, but can be 
+	    overloaded to provide specialization for e.g. CSG nodes, primitive nodes etc.
+	    Used for human-readable output. */
+	virtual std::string name() const;
+
+  // FIXME: Make return value a reference
+	const std::list<AbstractNode*> getChildren() const { 
+		return this->children.toList().toStdList(); 
+	}
+	size_t index() const { return this->idx; }
+
 	static void resetIndexCounter() { idx_counter = 1; }
 
+	// FIXME: Rewrite to STL container?
+	// FIXME: Make protected
 	QVector<AbstractNode*> children;
-	const class ModuleInstantiation *modinst;
+	const ModuleInstantiation *modinst;
 
+	// progress_mark is a running number used for progress indication
+	// FIXME: Make all progress handling external, put it in the traverser class?
 	int progress_mark;
 	void progress_prepare();
 	void progress_report() const;
 
-	int idx;
-	QString dump_cache;
-
-	AbstractNode(const ModuleInstantiation *mi);
-	virtual ~AbstractNode();
-	virtual QString mk_cache_id() const;
-#ifdef ENABLE_CGAL
-	struct cgal_nef_cache_entry {
-		CGAL_Nef_polyhedron N;
-		QString msg;
-		cgal_nef_cache_entry(const CGAL_Nef_polyhedron &N);
-	};
-	static QCache<QString, cgal_nef_cache_entry> cgal_nef_cache;
-	virtual CGAL_Nef_polyhedron render_cgal_nef_polyhedron() const;
-	class CSGTerm *render_csg_term_from_nef(double m[20], QVector<CSGTerm*> *highlights, QVector<CSGTerm*> *background, const char *statement, int convexity) const;
-#endif
-	virtual class CSGTerm *render_csg_term(double m[20], QVector<CSGTerm*> *highlights, QVector<CSGTerm*> *background) const;
-	virtual QString dump(QString indent) const;
+	int idx; // Node index (unique per tree)
 };
 
 class AbstractIntersectionNode : public AbstractNode
 {
 public:
 	AbstractIntersectionNode(const ModuleInstantiation *mi) : AbstractNode(mi) { };
-#ifdef ENABLE_CGAL
-	virtual CGAL_Nef_polyhedron render_cgal_nef_polyhedron() const;
-#endif
-	virtual CSGTerm *render_csg_term(double m[20], QVector<CSGTerm*> *highlights, QVector<CSGTerm*> *background) const;
-	virtual QString dump(QString indent) const;
+	virtual ~AbstractIntersectionNode() { };
+  virtual Response accept(class State &state, class Visitor &visitor) const;
+	virtual std::string toString() const;
+	virtual std::string name() const;
 };
 
 class AbstractPolyNode : public AbstractNode
 {
 public:
+	AbstractPolyNode(const ModuleInstantiation *mi) : AbstractNode(mi) { };
+	virtual ~AbstractPolyNode() { };
+  virtual Response accept(class State &state, class Visitor &visitor) const;
+
 	enum render_mode_e {
 		RENDER_CGAL,
 		RENDER_OPENCSG
 	};
-	AbstractPolyNode(const ModuleInstantiation *mi) : AbstractNode(mi) { };
-	virtual class PolySet *render_polyset(render_mode_e mode) const = 0;
-#ifdef ENABLE_CGAL
-	virtual CGAL_Nef_polyhedron render_cgal_nef_polyhedron() const;
-#endif
-	virtual CSGTerm *render_csg_term(double m[20], QVector<CSGTerm*> *highlights, QVector<CSGTerm*> *background) const;
-	static CSGTerm *render_csg_term_from_ps(double m[20], QVector<CSGTerm*> *highlights, QVector<CSGTerm*> *background, PolySet *ps, const ModuleInstantiation *modinst, int idx);
+  /*! Should return a PolySet of the given geometry. It's normal to return an
+		  empty PolySet if smth. is wrong, but don't return NULL unless we change the calling
+			strategy for this method. */
+	virtual class PolySet *render_polyset(render_mode_e mode, class PolySetRenderer *renderer) const = 0;
 };
 
+std::ostream &operator<<(std::ostream &stream, const AbstractNode &node);
+
 #endif