diff options
| author | Don Bright <hugh.m.bright@gmail.com> | 2011-12-07 01:08:51 (GMT) |
|---|---|---|
| committer | Don Bright <hugh.m.bright@gmail.com> | 2011-12-07 01:08:51 (GMT) |
| commit | 2c90eaa189cd5bc96ef56e89f2841d36f54d0ae2 (patch) | |
| tree | 9f732cf3913312bfb99dc79253bef906864c34b5 /src/CSGTermEvaluator.h | |
| parent | 750f3c8fc94744d6cc4c62de6ac86595cb2b38b6 (diff) | |
| parent | bb0ec94290733835df0716531c30460fc5b5210a (diff) | |
Merge remote branch 'upstream/master' into cakebaby
Conflicts:
tests/CMakeLists.txt
tests/csgtestcore.cc
Diffstat (limited to 'src/CSGTermEvaluator.h')
| -rw-r--r-- | src/CSGTermEvaluator.h | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/src/CSGTermEvaluator.h b/src/CSGTermEvaluator.h index 3a8122b..49bac17 100644 --- a/src/CSGTermEvaluator.h +++ b/src/CSGTermEvaluator.h @@ -6,6 +6,7 @@ #include <vector> #include <cstddef> #include "visitor.h" +#include "memory.h" class CSGTermEvaluator : public Visitor { @@ -24,9 +25,9 @@ public: virtual Response visit(State &state, const class RenderNode &node); virtual Response visit(State &state, const class CgaladvNode &node); - class CSGTerm *evaluateCSGTerm(const AbstractNode &node, - std::vector<CSGTerm*> &highlights, - std::vector<CSGTerm*> &background); + shared_ptr<class CSGTerm> evaluateCSGTerm(const AbstractNode &node, + std::vector<shared_ptr<CSGTerm> > &highlights, + std::vector<shared_ptr<CSGTerm> > &background); private: enum CsgOp {CSGT_UNION, CSGT_INTERSECTION, CSGT_DIFFERENCE, CSGT_MINKOWSKI}; @@ -38,10 +39,10 @@ private: std::map<int, ChildList> visitedchildren; public: - std::map<int, class CSGTerm*> stored_term; // The term evaluated from each node index + std::map<int, shared_ptr<CSGTerm> > stored_term; // The term evaluated from each node index - std::vector<CSGTerm*> highlights; - std::vector<CSGTerm*> background; + std::vector<shared_ptr<CSGTerm> > highlights; + std::vector<shared_ptr<CSGTerm> > background; const Tree &tree; class PolySetEvaluator *psevaluator; }; |