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/openscad.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/openscad.cc')
| -rw-r--r-- | src/openscad.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/openscad.cc b/src/openscad.cc index 979a68f..f3aee76 100644 --- a/src/openscad.cc +++ b/src/openscad.cc @@ -33,8 +33,8 @@ #include "export.h" #include "builtin.h" #include "nodedumper.h" -#include "CGALRenderer.h" -#include "PolySetCGALRenderer.h" +#include "CGALEvaluator.h" +#include "PolySetCGALEvaluator.h" #include "printutils.h" #include <string> @@ -261,8 +261,8 @@ int main(int argc, char **argv) Tree tree; // FIXME: enforce some maximum cache size (old version had 100K vertices as limit) QHash<std::string, CGAL_Nef_polyhedron> cache; - CGALRenderer cgalrenderer(cache, tree); - PolySetCGALRenderer psrenderer(cgalrenderer); + CGALEvaluator cgalevaluator(cache, tree); + PolySetCGALEvaluator psevaluator(cgalevaluator); if (stl_output_file || off_output_file || dxf_output_file) { @@ -315,7 +315,7 @@ int main(int argc, char **argv) root_node = root_module->evaluate(&root_ctx, &root_inst); tree.setRoot(root_node); - CGAL_Nef_polyhedron root_N = cgalrenderer.renderCGALMesh(*tree.root()); + CGAL_Nef_polyhedron root_N = cgalevaluator.evaluateCGALMesh(*tree.root()); QDir::setCurrent(original_path.absolutePath()); |