From 12b0777727e3e4fd30dc1754116b0169bd08da63 Mon Sep 17 00:00:00 2001 From: Marius Kintel Date: Sat, 27 Aug 2011 21:48:59 +0200 Subject: clarified mouse rotation improvement diff --git a/doc/TODO.txt b/doc/TODO.txt index 677619e..1f13234 100644 --- a/doc/TODO.txt +++ b/doc/TODO.txt @@ -71,7 +71,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. -- cgit v0.10.1 From eff40027290f8dff6574ebb8f9058a0d2645f96d Mon Sep 17 00:00:00 2001 From: Marius Kintel Date: Sat, 27 Aug 2011 21:51:59 +0200 Subject: note about configurable CSG element limit diff --git a/doc/TODO.txt b/doc/TODO.txt index 1f13234..b40a825 100644 --- a/doc/TODO.txt +++ b/doc/TODO.txt @@ -82,6 +82,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 -- cgit v0.10.1 From 5911e60fcd586826b0c37ef688459947dfc0c83b Mon Sep 17 00:00:00 2001 From: Marius Kintel Date: Wed, 31 Aug 2011 12:32:36 +0200 Subject: bugfix: deleted uninitialized pointer. Found and fixed by Daid diff --git a/src/cgalrenderer.cc b/src/cgalrenderer.cc index 551c061..ef44b6a 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 -- cgit v0.10.1