jepler/openscad
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Moved progress_report to NodeVisitor

Browse source
This commit is contained in:
amarjeet 2017-04-04 21:59:36 +05:30
parent 68b75e3cfe
commit 13ae3da498
3 changed files with 2 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/CSGTreeEvaluator.cc
View file

@ -201,7 +201,6 @@ Response CSGTreeEvaluator::visit(State &state, const AbstractPolyNode &node)
if (geom) {
t1 = evaluateCSGNodeFromGeometry(state, geom, node.modinst, node);
}
node.progress_report();
}
this->stored_term[node.index()] = t1;
addToParent(state, node);
@ -257,7 +256,6 @@ Response CSGTreeEvaluator::visit(State &state, const RenderNode &node)
if (geom) {
t1 = evaluateCSGNodeFromGeometry(state, geom, node.modinst, node);
}
node.progress_report();
}
this->stored_term[node.index()] = t1;
addToParent(state, node);
@ -276,7 +274,6 @@ Response CSGTreeEvaluator::visit(State &state, const CgaladvNode &node)
if (geom) {
t1 = evaluateCSGNodeFromGeometry(state, geom, node.modinst, node);
}
node.progress_report();
}
this->stored_term[node.index()] = t1;
applyBackgroundAndHighlight(state, node);

12
src/GeometryEvaluator.cc
View file

@ -381,7 +381,6 @@ Response GeometryEvaluator::visit(State &state, const AbstractNode &node)
else {
geom = smartCacheGet(node, state.preferNef());
}
node.progress_report();
addToParent(state, node, geom);
}
return ContinueTraversal;
@ -422,7 +421,6 @@ Response GeometryEvaluator::visit(State &state, const OffsetNode &node)
else {
geom = smartCacheGet(node, false);
}
node.progress_report();
addToParent(state, node, geom);
}
return ContinueTraversal;
@ -463,7 +461,6 @@ Response GeometryEvaluator::visit(State &state, const RenderNode &node)
else {
geom = smartCacheGet(node, state.preferNef());
}
node.progress_report();
addToParent(state, node, geom);
}
return ContinueTraversal;
@ -492,7 +489,6 @@ Response GeometryEvaluator::visit(State &state, const LeafNode &node)
geom.reset(geometry);
}
else geom = smartCacheGet(node, state.preferNef());
node.progress_report();
addToParent(state, node, geom);
}
return PruneTraversal;
@ -513,7 +509,6 @@ Response GeometryEvaluator::visit(State &state, const TextNode &node)
geom.reset(ClipperUtils::apply(polygonlist, ClipperLib::ctUnion));
}
else geom = GeometryCache::instance()->get(this->tree.getIdString(node));
node.progress_report();
addToParent(state, node, geom);
}
return PruneTraversal;
@ -540,7 +535,6 @@ Response GeometryEvaluator::visit(State &state, const CsgOpNode &node)
else {
geom = smartCacheGet(node, state.preferNef());
}
node.progress_report();
addToParent(state, node, geom);
}
return ContinueTraversal;
@ -616,7 +610,6 @@ Response GeometryEvaluator::visit(State &state, const TransformNode &node)
else {
geom = smartCacheGet(node, state.preferNef());
}
node.progress_report();
addToParent(state, node, geom);
}
return ContinueTraversal;
@ -771,7 +764,6 @@ Response GeometryEvaluator::visit(State &state, const LinearExtrudeNode &node)
else {
geom = smartCacheGet(node, false);
}
node.progress_report();
addToParent(state, node, geom);
}
return ContinueTraversal;
@ -927,7 +919,6 @@ Response GeometryEvaluator::visit(State &state, const RotateExtrudeNode &node)
else {
geom = smartCacheGet(node, false);
}
node.progress_report();
addToParent(state, node, geom);
}
return ContinueTraversal;
@ -1048,7 +1039,6 @@ Response GeometryEvaluator::visit(State &state, const ProjectionNode &node)
else {
geom = smartCacheGet(node, false);
}
node.progress_report();
addToParent(state, node, geom);
}
return ContinueTraversal;
@ -1125,7 +1115,6 @@ Response GeometryEvaluator::visit(State &state, const CgaladvNode &node)
else {
geom = smartCacheGet(node, state.preferNef());
}
node.progress_report();
addToParent(state, node, geom);
}
return ContinueTraversal;
@ -1145,7 +1134,6 @@ Response GeometryEvaluator::visit(State &state, const AbstractIntersectionNode &
else {
geom = smartCacheGet(node, state.preferNef());
}
node.progress_report();
addToParent(state, node, geom);
}
return ContinueTraversal;

2
src/NodeVisitor.cc
View file

@ -30,6 +30,8 @@ Response NodeVisitor::traverse(const AbstractNode &node, const State &state)
response = node.accept(newstate, *this);
}
node.progress_report();
if (response != AbortTraversal) response = ContinueTraversal;
return response;
}