Started refactoring of render_csg_term() into a visitor

1 files changed, 0 insertions, 126 deletions

diff --git a/src/render.cc b/src/render.cc
index 92ec88c..54eb9c7 100644
--- a/src/render.cc
+++ b/src/render.cc
@@ -77,132 +77,6 @@ void register_builtin_render()
 	builtin_modules["render"] = new RenderModule();
 }
 
-// FIXME: #ifdef ENABLE_CGAL
-#if 0
-CSGTerm *AbstractNode::render_csg_term_from_nef(double m[20], QVector<CSGTerm*> *highlights, QVector<CSGTerm*> *background, const char *statement, int convexity) const
-{
-	QString key = mk_cache_id();
-	if (PolySet::ps_cache.contains(key)) {
-		PRINT(PolySet::ps_cache[key]->msg);
-		return AbstractPolyNode::render_csg_term_from_ps(m, highlights, background,
-				PolySet::ps_cache[key]->ps->link(), modinst, idx);
-	}
-
-	print_messages_push();
-	CGAL_Nef_polyhedron N;
-
-	QString cache_id = mk_cache_id();
-	if (cgal_nef_cache.contains(cache_id))
-	{
-		PRINT(cgal_nef_cache[cache_id]->msg);
-		N = cgal_nef_cache[cache_id]->N;
-	}
-	else
-	{
-		PRINTF_NOCACHE("Processing uncached %s statement...", statement);
-		// PRINTA("Cache ID: %1", cache_id);
-		QApplication::processEvents();
-
-		QTime t;
-		t.start();
-
-		N = this->renderCSGMesh();
-
-		int s = t.elapsed() / 1000;
-		PRINTF_NOCACHE("..rendering time: %d hours, %d minutes, %d seconds", s / (60*60), (s / 60) % 60, s % 60);
-	}
-
-	PolySet *ps = NULL;
-
-	if (N.dim == 2)
-	{
-		DxfData dd(N);
-		ps = new PolySet();
-		ps->is2d = true;
-		dxf_tesselate(ps, &dd, 0, true, false, 0);
-		dxf_border_to_ps(ps, &dd);
-	}
-
-	if (N.dim == 3)
-	{
-		if (!N.p3.is_simple()) {
-			PRINTF("WARNING: Result of %s() isn't valid 2-manifold! Modify your design..", statement);
-			return NULL;
-		}
-
-		ps = new PolySet();
-		
-		CGAL_Polyhedron P;
-		N.p3.convert_to_Polyhedron(P);
-
-		typedef CGAL_Polyhedron::Vertex Vertex;
-		typedef CGAL_Polyhedron::Vertex_const_iterator VCI;
-		typedef CGAL_Polyhedron::Facet_const_iterator FCI;
-		typedef CGAL_Polyhedron::Halfedge_around_facet_const_circulator HFCC;
-
-		for (FCI fi = P.facets_begin(); fi != P.facets_end(); ++fi) {
-			HFCC hc = fi->facet_begin();
-			HFCC hc_end = hc;
-			ps->append_poly();
-			do {
-				Vertex v = *VCI((hc++)->vertex());
-				double x = CGAL::to_double(v.point().x());
-				double y = CGAL::to_double(v.point().y());
-				double z = CGAL::to_double(v.point().z());
-				ps->append_vertex(x, y, z);
-			} while (hc != hc_end);
-		}
-	}
-
-	if (ps)
-	{
-		ps->convexity = convexity;
-		PolySet::ps_cache.insert(key, new PolySet::ps_cache_entry(ps->link()));
-
-		CSGTerm *term = new CSGTerm(ps, m, QString("n%1").arg(idx));
-		if (modinst->tag_highlight && highlights)
-			highlights->append(term->link());
-		if (modinst->tag_background && background) {
-			background->append(term);
-			return NULL;
-		}
-		return term;
-	}
-	print_messages_pop();
-
-	return NULL;
-}
-
-CSGTerm *RenderNode::render_csg_term(double m[20], QVector<CSGTerm*> *highlights, QVector<CSGTerm*> *background) const
-{
-	return render_csg_term_from_nef(m, highlights, background, "render", this->convexity);
-}
-
-#else
-
-CSGTerm *RenderNode::render_csg_term(double m[20], QVector<CSGTerm*> *highlights, QVector<CSGTerm*> *background) const
-{
-	CSGTerm *t1 = NULL;
-	PRINT("WARNING: Found render() statement but compiled without CGAL support!");
-	foreach(AbstractNode * v, children) {
-		CSGTerm *t2 = v->render_csg_term(m, highlights, background);
-		if (t2 && !t1) {
-			t1 = t2;
-		} else if (t2 && t1) {
-			t1 = new CSGTerm(CSGTerm::TYPE_UNION, t1, t2);
-		}
-	}
-	if (modinst->tag_highlight && highlights)
-		highlights->append(t1->link());
-	if (t1 && modinst->tag_background && background) {
-		background->append(t1);
-		return NULL;
-	}
-	return t1;
-}
-
-#endif
-
 std::string RenderNode::toString() const
 {
 	std::stringstream stream;