diff options
| author | Marius Kintel <marius@kintel.net> | 2011-08-05 23:08:11 (GMT) |
|---|---|---|
| committer | Marius Kintel <marius@kintel.net> | 2011-08-05 23:08:11 (GMT) |
| commit | cfea2f8934353bfc5635d05d81ecaac57b97e3b7 (patch) | |
| tree | 5d7d52fee1d2d6da56760b2bd5df05c1cadd5ad6 /src/CSGTermEvaluator.h | |
| parent | b9608dd2f8cae5f7e9c22e5feacfe8b58715ffae (diff) | |
bugfix: background and highlight was broken after refactoring
Diffstat (limited to 'src/CSGTermEvaluator.h')
| -rw-r--r-- | src/CSGTermEvaluator.h | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/CSGTermEvaluator.h b/src/CSGTermEvaluator.h index d1ea28e..beb1201 100644 --- a/src/CSGTermEvaluator.h +++ b/src/CSGTermEvaluator.h @@ -18,7 +18,7 @@ class CSGTermEvaluator : public Visitor { public: CSGTermEvaluator(const Tree &tree, class PolySetEvaluator *psevaluator = NULL) - : highlights(NULL), background(NULL), tree(tree), psevaluator(psevaluator) { + : tree(tree), psevaluator(psevaluator) { } virtual ~CSGTermEvaluator() {} @@ -30,7 +30,8 @@ public: virtual Response visit(State &state, const RenderNode &node); class CSGTerm *evaluateCSGTerm(const AbstractNode &node, - vector<CSGTerm*> *highlights, vector<CSGTerm*> *background); + vector<CSGTerm*> &highlights, + vector<CSGTerm*> &background); private: enum CsgOp {UNION, INTERSECTION, DIFFERENCE, MINKOWSKI}; @@ -44,8 +45,8 @@ private: public: map<int, class CSGTerm*> stored_term; // The term evaluated from each node index - vector<CSGTerm*> *highlights; - vector<CSGTerm*> *background; + vector<CSGTerm*> highlights; + vector<CSGTerm*> background; const Tree &tree; class PolySetEvaluator *psevaluator; }; |