1 files changed, 6 insertions, 174 deletions

diff --git a/src/module.cc b/src/module.cc
index a319e1e..6352658 100644
--- a/src/module.cc
+++ b/src/module.cc
@@ -18,9 +18,12 @@
  *
  */
 
-#define INCLUDE_ABSTRACT_NODE_DETAILS
-
-#include "openscad.h"
+#include "module.h"
+#include "node.h"
+#include "context.h"
+#include "expression.h"
+#include "function.h"
+#include "builtin.h"
 #include "printutils.h"
 
 AbstractModule::~AbstractModule()
@@ -201,174 +204,3 @@ void destroy_builtin_modules()
 		delete v;
 	builtin_modules.clear();
 }
-
-int AbstractNode::idx_counter;
-
-AbstractNode::AbstractNode(const ModuleInstantiation *mi)
-{
-	modinst = mi;
-	idx = idx_counter++;
-}
-
-AbstractNode::~AbstractNode()
-{
-	foreach (AbstractNode *v, children)
-		delete v;
-}
-
-QString AbstractNode::mk_cache_id() const
-{
-	QString cache_id = dump("");
-	cache_id.remove(QRegExp("[a-zA-Z_][a-zA-Z_0-9]*:"));
-	cache_id.remove(' ');
-	cache_id.remove('\t');
-	cache_id.remove('\n');
-	return cache_id;
-}
-
-#ifdef ENABLE_CGAL
-
-AbstractNode::cgal_nef_cache_entry::cgal_nef_cache_entry(CGAL_Nef_polyhedron N) :
-		N(N), msg(print_messages_stack.last()) { };
-
-QCache<QString, AbstractNode::cgal_nef_cache_entry> AbstractNode::cgal_nef_cache(100000);
-
-static CGAL_Nef_polyhedron render_cgal_nef_polyhedron_backend(const AbstractNode *that, bool intersect)
-{
-	QString cache_id = that->mk_cache_id();
-	if (that->cgal_nef_cache.contains(cache_id)) {
-		that->progress_report();
-		PRINT(that->cgal_nef_cache[cache_id]->msg);
-		return that->cgal_nef_cache[cache_id]->N;
-	}
-
-	print_messages_push();
-
-	bool first = true;
-	CGAL_Nef_polyhedron N;
-	foreach (AbstractNode *v, that->children) {
-		if (v->modinst->tag_background)
-			continue;
-		if (first) {
-			N = v->render_cgal_nef_polyhedron();
-			if (N.dim != 0)
-				first = false;
-		} else if (N.dim == 2) {
-			if (intersect)
-				N.p2 *= v->render_cgal_nef_polyhedron().p2;
-			else
-				N.p2 += v->render_cgal_nef_polyhedron().p2;
-		} else {
-			if (intersect)
-				N.p3 *= v->render_cgal_nef_polyhedron().p3;
-			else
-				N.p3 += v->render_cgal_nef_polyhedron().p3;
-		}
-	}
-
-	that->cgal_nef_cache.insert(cache_id, new AbstractNode::cgal_nef_cache_entry(N), N.weight());
-	that->progress_report();
-	print_messages_pop();
-
-	return N;
-}
-
-CGAL_Nef_polyhedron AbstractNode::render_cgal_nef_polyhedron() const
-{
-	return render_cgal_nef_polyhedron_backend(this, false);
-}
-
-CGAL_Nef_polyhedron AbstractIntersectionNode::render_cgal_nef_polyhedron() const
-{
-	return render_cgal_nef_polyhedron_backend(this, true);
-}
-
-#endif /* ENABLE_CGAL */
-
-static CSGTerm *render_csg_term_backend(const AbstractNode *that, bool intersect, double m[20], QVector<CSGTerm*> *highlights, QVector<CSGTerm*> *background)
-{
-	CSGTerm *t1 = NULL;
-	foreach(AbstractNode *v, that->children) {
-		CSGTerm *t2 = v->render_csg_term(m, highlights, background);
-		if (t2 && !t1) {
-			t1 = t2;
-		} else if (t2 && t1) {
-			if (intersect)
-				t1 = new CSGTerm(CSGTerm::TYPE_INTERSECTION, t1, t2);
-			else
-				t1 = new CSGTerm(CSGTerm::TYPE_UNION, t1, t2);
-		}
-	}
-	if (t1 && that->modinst->tag_highlight && highlights)
-		highlights->append(t1->link());
-	if (t1 && that->modinst->tag_background && background) {
-		background->append(t1);
-		return NULL;
-	}
-	return t1;
-}
-
-CSGTerm *AbstractNode::render_csg_term(double m[20], QVector<CSGTerm*> *highlights, QVector<CSGTerm*> *background) const
-{
-	return render_csg_term_backend(this, false, m, highlights, background);
-}
-
-CSGTerm *AbstractIntersectionNode::render_csg_term(double m[20], QVector<CSGTerm*> *highlights, QVector<CSGTerm*> *background) const
-{
-	return render_csg_term_backend(this, true, m, highlights, background);
-}
-
-QString AbstractNode::dump(QString indent) const
-{
-	if (dump_cache.isEmpty()) {
-		QString text = indent + QString("n%1: group() {\n").arg(idx);
-		foreach (AbstractNode *v, children)
-			text += v->dump(indent + QString("\t"));
-		((AbstractNode*)this)->dump_cache = text + indent + "}\n";
-	}
-	return dump_cache;
-}
-
-QString AbstractIntersectionNode::dump(QString indent) const
-{
-	if (dump_cache.isEmpty()) {
-		QString text = indent + QString("n%1: intersection() {\n").arg(idx);
-		foreach (AbstractNode *v, children)
-			text += v->dump(indent + QString("\t"));
-		((AbstractNode*)this)->dump_cache = text + indent + "}\n";
-	}
-	return dump_cache;
-}
-
-int progress_report_count;
-void (*progress_report_f)(const class AbstractNode*, void*, int);
-void *progress_report_vp;
-
-void AbstractNode::progress_prepare()
-{
-	foreach (AbstractNode *v, children)
-		v->progress_prepare();
-	progress_mark = ++progress_report_count;
-}
-
-void AbstractNode::progress_report() const
-{
-	if (progress_report_f)
-		progress_report_f(this, progress_report_vp, progress_mark);
-}
-
-void progress_report_prep(AbstractNode *root, void (*f)(const class AbstractNode *node, void *vp, int mark), void *vp)
-{
-	progress_report_count = 0;
-	progress_report_f = f;
-	progress_report_vp = vp;
-	root->progress_prepare();
-}
-
-void progress_report_fin()
-{
-	progress_report_count = 0;
-	progress_report_f = NULL;
-	progress_report_vp = NULL;
-}
-