diff options
| author | clifford <clifford@b57f626f-c46c-0410-a088-ec61d464b74c> | 2009-07-23 12:05:05 (GMT) |
|---|---|---|
| committer | clifford <clifford@b57f626f-c46c-0410-a088-ec61d464b74c> | 2009-07-23 12:05:05 (GMT) |
| commit | 7516cd5e8150e7f6850179ace35622b186237401 (patch) | |
| tree | d10012d68d0dcbefe3edeaf3272e42f49a21f71c /transform.cc | |
| parent | f78917d4dee78b720d41bbd59eee82ceaca95454 (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 'transform.cc')
| -rw-r--r-- | transform.cc | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/transform.cc b/transform.cc index c4f76f6..ac6017d 100644 --- a/transform.cc +++ b/transform.cc @@ -45,7 +45,7 @@ public: #ifdef ENABLE_CGAL virtual CGAL_Nef_polyhedron render_cgal_nef_polyhedron() const; #endif - virtual CSGTerm *render_csg_term(double m[16], QVector<CSGTerm*> *highlights) const; + virtual CSGTerm *render_csg_term(double m[16], QVector<CSGTerm*> *highlights, QVector<CSGTerm*> *background) const; virtual QString dump(QString indent) const; }; @@ -168,7 +168,7 @@ CGAL_Nef_polyhedron TransformNode::render_cgal_nef_polyhedron() const #endif /* ENABLE_CGAL */ -CSGTerm *TransformNode::render_csg_term(double c[16], QVector<CSGTerm*> *highlights) const +CSGTerm *TransformNode::render_csg_term(double c[16], QVector<CSGTerm*> *highlights, QVector<CSGTerm*> *background) const { double x[16]; @@ -184,15 +184,19 @@ CSGTerm *TransformNode::render_csg_term(double c[16], QVector<CSGTerm*> *highlig CSGTerm *t1 = NULL; foreach(AbstractNode *v, children) { - CSGTerm *t2 = v->render_csg_term(x, highlights); + CSGTerm *t2 = v->render_csg_term(x, highlights, background); if (t2 && !t1) { t1 = t2; } else if (t2 && t1) { t1 = new CSGTerm(CSGTerm::UNION, t1, t2); } } - 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; } |