diff options
| author | don bright <hugh.m.bright@gmail.com> | 2011-08-12 23:48:59 (GMT) |
|---|---|---|
| committer | don bright <hugh.m.bright@gmail.com> | 2011-08-12 23:48:59 (GMT) |
| commit | ec85e65ee983258db44770f246537562a16d141b (patch) | |
| tree | 9d7f4e278a0402fa7271a6089ef375703e4ef5d4 /src/CSGTermEvaluator.cc | |
| parent | be63c6eeacf7ed4604106dc0859602ba98847a4f (diff) | |
fix build errors on windows
Diffstat (limited to 'src/CSGTermEvaluator.cc')
| -rw-r--r-- | src/CSGTermEvaluator.cc | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/CSGTermEvaluator.cc b/src/CSGTermEvaluator.cc index 769c87f..451929c 100644 --- a/src/CSGTermEvaluator.cc +++ b/src/CSGTermEvaluator.cc @@ -45,11 +45,11 @@ void CSGTermEvaluator::applyToChildren(const AbstractNode &node, CSGTermEvaluato if (t2 && !t1) { t1 = t2; } else if (t2 && t1) { - if (op == UNION) { + if (op == CSGT_UNION) { t1 = new CSGTerm(CSGTerm::TYPE_UNION, t1, t2); - } else if (op == DIFFERENCE) { + } else if (op == CSGT_DIFFERENCE) { t1 = new CSGTerm(CSGTerm::TYPE_DIFFERENCE, t1, t2); - } else if (op == INTERSECTION) { + } else if (op == CSGT_INTERSECTION) { t1 = new CSGTerm(CSGTerm::TYPE_INTERSECTION, t1, t2); } } @@ -67,7 +67,7 @@ void CSGTermEvaluator::applyToChildren(const AbstractNode &node, CSGTermEvaluato Response CSGTermEvaluator::visit(State &state, const AbstractNode &node) { if (state.isPostfix()) { - applyToChildren(node, UNION); + applyToChildren(node, CSGT_UNION); addToParent(state, node); } return ContinueTraversal; @@ -76,7 +76,7 @@ Response CSGTermEvaluator::visit(State &state, const AbstractNode &node) Response CSGTermEvaluator::visit(State &state, const AbstractIntersectionNode &node) { if (state.isPostfix()) { - applyToChildren(node, INTERSECTION); + applyToChildren(node, CSGT_INTERSECTION); addToParent(state, node); } return ContinueTraversal; @@ -120,13 +120,13 @@ Response CSGTermEvaluator::visit(State &state, const CsgNode &node) CsgOp op; switch (node.type) { case CSG_TYPE_UNION: - op = UNION; + op = CSGT_UNION; break; case CSG_TYPE_DIFFERENCE: - op = DIFFERENCE; + op = CSGT_DIFFERENCE; break; case CSG_TYPE_INTERSECTION: - op = INTERSECTION; + op = CSGT_INTERSECTION; break; } applyToChildren(node, op); @@ -157,7 +157,7 @@ Response CSGTermEvaluator::visit(State &state, const TransformNode &node) state.setMatrix(m); } if (state.isPostfix()) { - applyToChildren(node, UNION); + applyToChildren(node, CSGT_UNION); addToParent(state, node); } return ContinueTraversal; @@ -168,7 +168,7 @@ Response CSGTermEvaluator::visit(State &state, const RenderNode &node) { PRINT("WARNING: Found render() statement but compiled without CGAL support!"); if (state.isPostfix()) { - applyToChildren(node, UNION); + applyToChildren(node, CSGT_UNION); addToParent(state, node); } return ContinueTraversal; |