summaryrefslogtreecommitdiff
path: root/src/CSGTermEvaluator.cc
diff options
context:
space:
mode:
authorMarius Kintel <marius@kintel.net>2011-12-26 15:34:47 (GMT)
committerMarius Kintel <marius@kintel.net>2011-12-26 15:34:47 (GMT)
commit4ff2d1af446c1f276c644b12e6ec4cc6db0b6d65 (patch)
tree10e9e52c2483efd6149f189c21366cdb0b11de77 /src/CSGTermEvaluator.cc
parentf0817a1c167c9d9f0ecf0ef8ec7bee03d61e63f2 (diff)
Some light refactoring attempts, didn't get very far..
Diffstat (limited to 'src/CSGTermEvaluator.cc')
-rw-r--r--src/CSGTermEvaluator.cc8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/CSGTermEvaluator.cc b/src/CSGTermEvaluator.cc
index fc76d56..65209dd 100644
--- a/src/CSGTermEvaluator.cc
+++ b/src/CSGTermEvaluator.cc
@@ -56,10 +56,10 @@ void CSGTermEvaluator::applyToChildren(const AbstractNode &node, CSGTermEvaluato
}
}
}
- if (t1 && node.modinst->tag_highlight) {
+ if (t1 && node.modinst->isHighlight()) {
this->highlights.push_back(t1);
}
- if (t1 && node.modinst->tag_background) {
+ if (t1 && node.modinst->isBackground()) {
this->background.push_back(t1);
t1.reset(); // don't propagate background tagged nodes
}
@@ -94,10 +94,10 @@ static shared_ptr<CSGTerm> evaluate_csg_term_from_ps(const State &state,
std::stringstream stream;
stream << node.name() << node.index();
shared_ptr<CSGTerm> t(new CSGTerm(ps, state.matrix(), state.color(), stream.str()));
- if (modinst->tag_highlight) {
+ if (modinst->isHighlight()) {
highlights.push_back(t);
}
- if (modinst->tag_background) {
+ if (modinst->isBackground()) {
background.push_back(t);
t.reset();
}
contact: Jan Huwald // Impressum