diff options
| author | clifford <clifford@b57f626f-c46c-0410-a088-ec61d464b74c> | 2010-02-20 14:37:20 (GMT) |
|---|---|---|
| committer | clifford <clifford@b57f626f-c46c-0410-a088-ec61d464b74c> | 2010-02-20 14:37:20 (GMT) |
| commit | 332e835f878d477102228a0659fd15c6700b36fe (patch) | |
| tree | 3ea7073e824fc44402a5ff1eb134d2db4b4495f0 /src/render.cc | |
| parent | 0b0aa7b9b3ba8d75e97f249750b3eb1c61d52c38 (diff) | |
Clifford Wolf:
Added cgaladv.cc with advanced transformations via CGAL
(as of now only 3d minkowksi sum is implemented but more is planned)
git-svn-id: http://svn.clifford.at/openscad/trunk@446 b57f626f-c46c-0410-a088-ec61d464b74c
Diffstat (limited to 'src/render.cc')
| -rw-r--r-- | src/render.cc | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/src/render.cc b/src/render.cc index 1081f5b..3c42a80 100644 --- a/src/render.cc +++ b/src/render.cc @@ -125,7 +125,7 @@ CGAL_Nef_polyhedron RenderNode::render_cgal_nef_polyhedron() const return N; } -CSGTerm *RenderNode::render_csg_term(double m[20], QVector<CSGTerm*> *highlights, QVector<CSGTerm*> *background) const +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)) { @@ -145,7 +145,7 @@ CSGTerm *RenderNode::render_csg_term(double m[20], QVector<CSGTerm*> *highlights } else { - PRINT_NOCACHE("Processing uncached render statement..."); + PRINTF_NOCACHE("Processing uncached %s statement...", statement); // PRINTA("Cache ID: %1", cache_id); QApplication::processEvents(); @@ -172,7 +172,7 @@ CSGTerm *RenderNode::render_csg_term(double m[20], QVector<CSGTerm*> *highlights if (N.dim == 3) { if (!N.p3.is_simple()) { - PRINTF("WARNING: Result of render() isn't valid 2-manifold! Modify your design.."); + PRINTF("WARNING: Result of %s() isn't valid 2-manifold! Modify your design..", statement); return NULL; } @@ -219,6 +219,11 @@ CSGTerm *RenderNode::render_csg_term(double m[20], QVector<CSGTerm*> *highlights 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 |