diff options
| author | Marius Kintel <marius@kintel.net> | 2011-08-31 17:02:26 (GMT) |
|---|---|---|
| committer | Marius Kintel <marius@kintel.net> | 2011-08-31 17:02:26 (GMT) |
| commit | c193372d2ff20d32900d72e817e7c9608ae36112 (patch) | |
| tree | c131d0372c9e2c252f05b5e5ed07067e84831a62 | |
| parent | 9e6445320699c259d30f3075faca0140462d2f6b (diff) | |
| parent | 5911e60fcd586826b0c37ef688459947dfc0c83b (diff) | |
Merge branch 'master' into visitor
| -rw-r--r-- | doc/TODO.txt | 3 | ||||
| -rw-r--r-- | src/cgalrenderer.cc | 3 |
2 files changed, 5 insertions, 1 deletions
diff --git a/doc/TODO.txt b/doc/TODO.txt index 751b544..dd9932c 100644 --- a/doc/TODO.txt +++ b/doc/TODO.txt @@ -67,7 +67,7 @@ o MDI and handle_dep. o 3D View - OpenGL 2.0 test: What, exactly, is needed from OpenGL 2.0? Can we use 1.x with extensions? - - Improve mouse rotation + - Improve mouse rotation/zoom/pan - Add modifier key combos to handle pan and zoom on 1 mouse button systems - Show grid - Measurement ticks on the axes that look like rulers that one can turn off and on. @@ -78,6 +78,7 @@ o 3D View - overlay indicator displaying current view mode - OpenCSG rendering: Coincident surfaces causes z-buffer fighting. Is this somehow avoidable tuning the depth tests in OpenCSG? + - Make the 10.000 element OpenCSG klimit configurable (Preferences) ? - Use OpenGL picking to facilitate ray-tracing like features like measuring thicknesses, distances, slot thicknesses etc. o Editor wishlist diff --git a/src/cgalrenderer.cc b/src/cgalrenderer.cc index 687a0f1..7a31747 100644 --- a/src/cgalrenderer.cc +++ b/src/cgalrenderer.cc @@ -36,11 +36,13 @@ CGALRenderer::CGALRenderer(const CGAL_Nef_polyhedron &root) : root(root) { if (root.dim == 2) { DxfData dd(root); + this->polyhedron = NULL; this->polyset = new PolySet(); this->polyset->is2d = true; dxf_tesselate(this->polyset, &dd, 0, true, false, 0); } else if (root.dim == 3) { + this->polyset = NULL; this->polyhedron = new Polyhedron(); // FIXME: Make independent of Preferences this->polyhedron->setColor(Polyhedron::CGAL_NEF3_MARKED_FACET_COLOR, @@ -60,6 +62,7 @@ CGALRenderer::CGALRenderer(const CGAL_Nef_polyhedron &root) : root(root) CGALRenderer::~CGALRenderer() { if (this->polyset) this->polyset->unlink(); + delete this->polyhedron; } void CGALRenderer::draw(bool showfaces, bool showedges) const |