diff options
| author | Marius Kintel <marius@kintel.net> | 2011-07-30 23:58:51 (GMT) |
|---|---|---|
| committer | Marius Kintel <marius@kintel.net> | 2011-07-30 23:58:51 (GMT) |
| commit | 6882228058d313bb7b98fddd90239bdb1a3e25ef (patch) | |
| tree | 9e3f0077a319939df7496fc6b18350c44cc4b0ec /src/projection.cc | |
| parent | dd9dfcb4ece4dcd1ae7f3374ef03a4babdb91dd8 (diff) | |
| parent | c79ad5010e4ae8a612de5423cd52a518ed6b4d65 (diff) | |
Merge branch 'master' into visitor
Conflicts:
src/GLView.h
src/glview.cc
src/mainwin.cc
src/render-opencsg.cc
Diffstat (limited to 'src/projection.cc')
| -rw-r--r-- | src/projection.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/projection.cc b/src/projection.cc index 125607d..8497405 100644 --- a/src/projection.cc +++ b/src/projection.cc @@ -35,7 +35,7 @@ #include "export.h" #include "progress.h" #include "visitor.h" -#include "PolySetRenderer.h" +#include "PolySetEvaluator.h" #ifdef ENABLE_CGAL # include <CGAL/assertions_behaviour.h> @@ -83,10 +83,10 @@ AbstractNode *ProjectionModule::evaluate(const Context *ctx, const ModuleInstant return node; } -PolySet *ProjectionNode::render_polyset(render_mode_e mode, PolySetRenderer *renderer) const +PolySet *ProjectionNode::evaluate_polyset(render_mode_e mode, PolySetEvaluator *evaluator) const { - if (!renderer) { - PRINTF("WARNING: No suitable PolySetRenderer found for %s module!", this->name().c_str()); + if (!evaluator) { + PRINTF("WARNING: No suitable PolySetEvaluator found for %s module!", this->name().c_str()); PolySet *ps = new PolySet(); ps->is2d = true; return ps; @@ -94,7 +94,7 @@ PolySet *ProjectionNode::render_polyset(render_mode_e mode, PolySetRenderer *ren print_messages_push(); - PolySet *ps = renderer->renderPolySet(*this, mode); + PolySet *ps = evaluator->evaluatePolySet(*this, mode); print_messages_pop(); |