diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/CGAL_Nef_polyhedron.cc | 15 | ||||
-rw-r--r-- | src/PolySetCGALEvaluator.cc | 9 |
2 files changed, 19 insertions, 5 deletions
diff --git a/src/CGAL_Nef_polyhedron.cc b/src/CGAL_Nef_polyhedron.cc index 8c65777..6ed2d90 100644 --- a/src/CGAL_Nef_polyhedron.cc +++ b/src/CGAL_Nef_polyhedron.cc @@ -71,6 +71,8 @@ int CGAL_Nef_polyhedron::weight() const This method is not const since convert_to_Polyhedron() wasn't const in earlier versions of CGAL. + + Note: Can return NULL if an error occurred */ PolySet *CGAL_Nef_polyhedron::convertToPolyset() { @@ -85,9 +87,16 @@ PolySet *CGAL_Nef_polyhedron::convertToPolyset() delete dd; } else if (this->dim == 3) { - CGAL_Polyhedron P; - this->p3->convert_to_Polyhedron(P); - ps = createPolySetFromPolyhedron(P); + CGAL::Failure_behaviour old_behaviour = CGAL::set_error_behaviour(CGAL::THROW_EXCEPTION); + try { + CGAL_Polyhedron P; + this->p3->convert_to_Polyhedron(P); + ps = createPolySetFromPolyhedron(P); + } + catch (CGAL::Precondition_exception e) { + PRINTF("CGAL error in CGAL_Nef_polyhedron::convertToPolyset(): %s", e.what()); + } + CGAL::set_error_behaviour(old_behaviour); } return ps; } diff --git a/src/PolySetCGALEvaluator.cc b/src/PolySetCGALEvaluator.cc index 78d5704..7a9566b 100644 --- a/src/PolySetCGALEvaluator.cc +++ b/src/PolySetCGALEvaluator.cc @@ -396,8 +396,13 @@ PolySet *PolySetCGALEvaluator::evaluatePolySet(const RenderNode &node) CGAL_Nef_polyhedron N = this->cgalevaluator.evaluateCGALMesh(node); PolySet *ps = NULL; if (!N.empty()) { - ps = N.convertToPolyset(); - ps->convexity = node.convexity; + if (!N.p3->is_simple()) { + PRINTF("WARNING: Body of render() isn't valid 2-manifold!"); + } + else { + ps = N.convertToPolyset(); + ps->convexity = node.convexity; + } } return ps; } |