summaryrefslogtreecommitdiff
path: root/csgops.cc
diff options
context:
space:
mode:
authorclifford <clifford@b57f626f-c46c-0410-a088-ec61d464b74c>2009-07-23 12:05:05 (GMT)
committerclifford <clifford@b57f626f-c46c-0410-a088-ec61d464b74c>2009-07-23 12:05:05 (GMT)
commit7516cd5e8150e7f6850179ace35622b186237401 (patch)
treed10012d68d0dcbefe3edeaf3272e42f49a21f71c /csgops.cc
parentf78917d4dee78b720d41bbd59eee82ceaca95454 (diff)
Clifford Wolf:
Added '%' for background stuff git-svn-id: http://svn.clifford.at/openscad/trunk@69 b57f626f-c46c-0410-a088-ec61d464b74c
Diffstat (limited to 'csgops.cc')
-rw-r--r--csgops.cc12
1 files changed, 8 insertions, 4 deletions
diff --git a/csgops.cc b/csgops.cc
index d2b3706..a5f82e0 100644
--- a/csgops.cc
+++ b/csgops.cc
@@ -44,7 +44,7 @@ public:
#ifdef ENABLE_CGAL
virtual CGAL_Nef_polyhedron render_cgal_nef_polyhedron() const;
#endif
- CSGTerm *render_csg_term(double m[16], QVector<CSGTerm*> *highlights) const;
+ CSGTerm *render_csg_term(double m[16], QVector<CSGTerm*> *highlights, QVector<CSGTerm*> *background) const;
virtual QString dump(QString indent) const;
};
@@ -91,11 +91,11 @@ CGAL_Nef_polyhedron CsgNode::render_cgal_nef_polyhedron() const
#endif /* ENABLE_CGAL */
-CSGTerm *CsgNode::render_csg_term(double m[16], QVector<CSGTerm*> *highlights) const
+CSGTerm *CsgNode::render_csg_term(double m[16], QVector<CSGTerm*> *highlights, QVector<CSGTerm*> *background) const
{
CSGTerm *t1 = NULL;
foreach (AbstractNode *v, children) {
- CSGTerm *t2 = v->render_csg_term(m, highlights);
+ CSGTerm *t2 = v->render_csg_term(m, highlights, background);
if (t2 && !t1) {
t1 = t2;
} else if (t2 && t1) {
@@ -108,8 +108,12 @@ CSGTerm *CsgNode::render_csg_term(double m[16], QVector<CSGTerm*> *highlights) c
}
}
}
- if (modinst->tag_highlight && highlights)
+ if (t1 && modinst->tag_highlight && highlights)
highlights->append(t1->link());
+ if (t1 && modinst->tag_background && background) {
+ background->append(t1);
+ return NULL;
+ }
return t1;
}
contact: Jan Huwald // Impressum