From 164e67a50bc3deaee567a30aa2dc1853299fe71b Mon Sep 17 00:00:00 2001 From: Ken Arroyo Ohori Date: Fri, 21 Apr 2017 15:43:19 +0200 Subject: [PATCH] Catching some more CGAL errors, allow non-closed meshes, start of new code to triangulate faces --- .../kernels/cgal/CgalConversionFunctions.cpp | 52 ++++++++++++++++--- .../kernels/cgal/CgalConversionResult.cpp | 16 ++++-- .../kernels/cgal/CgalIfcGeomShapes.cpp | 34 +++++++++--- src/ifcgeom/kernels/cgal/CgalKernel.cpp | 34 ++++++++++-- src/ifcgeom/kernels/cgal/CgalKernel.h | 1 + 5 files changed, 117 insertions(+), 20 deletions(-) diff --git a/src/ifcgeom/kernels/cgal/CgalConversionFunctions.cpp b/src/ifcgeom/kernels/cgal/CgalConversionFunctions.cpp index c01c6e8576..c3645d77b8 100644 --- a/src/ifcgeom/kernels/cgal/CgalConversionFunctions.cpp +++ b/src/ifcgeom/kernels/cgal/CgalConversionFunctions.cpp @@ -26,7 +26,7 @@ CGAL::Polyhedron_3 IfcGeom::CgalKernel::create_polyhedron(std::list IfcGeom::CgalKernel::create_polyhedron(CGAL::Nef_poly nef_polyhedron.convert_to_polyhedron(polyhedron); return polyhedron; } catch (...) { - std::cout << "Conversion from Nef to polyhedron failed!" << std::endl; + Logger::Message(Logger::LOG_ERROR, "Conversion from Nef to polyhedron failed!"); return CGAL::Polyhedron_3(); } } else { - std::cout << "Nef polyhedron not simple: cannot create polyhedron!" << std::endl; + Logger::Message(Logger::LOG_ERROR, "Nef polyhedron not simple: cannot create polyhedron!"); return CGAL::Polyhedron_3(); } } CGAL::Nef_polyhedron_3 IfcGeom::CgalKernel::create_nef_polyhedron(std::list &face_list) { CGAL::Polyhedron_3 polyhedron = create_polyhedron(face_list); - return CGAL::Nef_polyhedron_3(polyhedron); + CGAL::Polygon_mesh_processing::triangulate_faces(polyhedron); + CGAL::Nef_polyhedron_3 nef_polyhedron; + try { + nef_polyhedron = CGAL::Nef_polyhedron_3(polyhedron); + } catch (...) { + Logger::Message(Logger::LOG_ERROR, "Conversion to Nef polyhedron failed!"); + return nef_polyhedron; + } return nef_polyhedron; } CGAL::Nef_polyhedron_3 IfcGeom::CgalKernel::create_nef_polyhedron(CGAL::Polyhedron_3 &polyhedron) { if (polyhedron.is_valid()) { CGAL::Polygon_mesh_processing::triangulate_faces(polyhedron); - return CGAL::Nef_polyhedron_3(polyhedron); + CGAL::Nef_polyhedron_3 nef_polyhedron; + try { + nef_polyhedron = CGAL::Nef_polyhedron_3(polyhedron); + } catch (...) { + Logger::Message(Logger::LOG_ERROR, "Conversion to Nef polyhedron failed!"); + return nef_polyhedron; + } return nef_polyhedron; } else { - std::cout << "Polyhedron not valid: cannot create Nef polyhedron!" << std::endl; + Logger::Message(Logger::LOG_ERROR, "Polyhedron not valid: cannot create Nef polyhedron!"); return CGAL::Nef_polyhedron_3(); } } + +CGAL::Polyhedron_3 IfcGeom::CgalKernel::triangulate_faces(CGAL::Polyhedron_3 &polyhedron) { + std::list face_list; + + for (CGAL::Polyhedron_3::Facet_const_iterator current_facet = polyhedron.facets_begin(); + current_facet != polyhedron.facets_end(); + ++current_facet) { + + // Triangle + if (current_facet->is_triangle()) { + face_list.push_back(cgal_face_t()); + CGAL::Polyhedron_3::Halfedge_around_facet_const_circulator current_halfedge = current_facet->facet_begin(); + do { + face_list.back().outer.push_back(current_halfedge->vertex()->point()); + ++current_halfedge; + } while (current_halfedge != current_facet->facet_begin()); + } + + // Polygon + else { + std::list points_in_polygon; + + } + } + + return create_polyhedron(face_list); +} diff --git a/src/ifcgeom/kernels/cgal/CgalConversionResult.cpp b/src/ifcgeom/kernels/cgal/CgalConversionResult.cpp index 8aa38cbee1..98a4272fee 100644 --- a/src/ifcgeom/kernels/cgal/CgalConversionResult.cpp +++ b/src/ifcgeom/kernels/cgal/CgalConversionResult.cpp @@ -10,7 +10,7 @@ void IfcGeom::CgalShape::Triangulate(const IfcGeom::IteratorSettings & settings, vertex->point() = vertex->point().transform(trsf); } - if (!s.is_valid() || !s.is_closed()) { + if (!s.is_valid()) { Logger::Message(Logger::LOG_ERROR, "Invalid Polyhedron_3 in object (before triangulation)"); std::ofstream ferror; ferror.open("/Users/ken/Desktop/error.off"); @@ -30,7 +30,17 @@ void IfcGeom::CgalShape::Triangulate(const IfcGeom::IteratorSettings & settings, std::map face_normals; boost::associative_property_map> face_normals_map(face_normals); cgal_shape_t s_copy(s); - if (!CGAL::Polygon_mesh_processing::triangulate_faces(s) ) { + bool success = false; + try { + success = CGAL::Polygon_mesh_processing::triangulate_faces(s); + } catch (...) { + Logger::Message(Logger::LOG_ERROR, "Triangulation crashed"); + std::ofstream ferror; + ferror.open("/Users/ken/Desktop/error.off"); + ferror << s << std::endl; + ferror.close(); + return; + } if (!success) { Logger::Message(Logger::LOG_ERROR, "Triangulation failed"); std::ofstream ferror; ferror.open("/Users/ken/Desktop/error.off"); @@ -45,7 +55,7 @@ void IfcGeom::CgalShape::Triangulate(const IfcGeom::IteratorSettings & settings, // fafter << s << std::endl; // fafter.close(); - if (!s.is_valid() || !s.is_closed()) { + if (!s.is_valid()) { Logger::Message(Logger::LOG_ERROR, "Invalid Polyhedron_3 in object (after triangulation)"); std::ofstream ferror; ferror.open("/Users/ken/Desktop/error.off"); diff --git a/src/ifcgeom/kernels/cgal/CgalIfcGeomShapes.cpp b/src/ifcgeom/kernels/cgal/CgalIfcGeomShapes.cpp index 7b64a21321..f6af7fc884 100644 --- a/src/ifcgeom/kernels/cgal/CgalIfcGeomShapes.cpp +++ b/src/ifcgeom/kernels/cgal/CgalIfcGeomShapes.cpp @@ -91,7 +91,12 @@ bool IfcGeom::CgalKernel::convert(const IfcSchema::IfcExtrudedAreaSolid *l, cgal hole_top_face.outer.push_back(*vertex+height*dir); } face_list.push_back(hole_top_face); - nef_shape -= create_nef_polyhedron(face_list); + try { + nef_shape -= create_nef_polyhedron(face_list); + } catch (...) { + Logger::Message(Logger::LOG_ERROR, "IfcExtrudedAreaSolid: cannot subtract opening for:", l->entity); + return false; + } } if (has_position) { @@ -104,7 +109,7 @@ bool IfcGeom::CgalKernel::convert(const IfcSchema::IfcExtrudedAreaSolid *l, cgal nef_shape.convert_to_polyhedron(shape); return true; } catch (...) { - std::cout << "IfcExtrudedAreaSolid: cannot convert Nef to polyhedron!" << std::endl; + Logger::Message(Logger::LOG_ERROR, "IfcExtrudedAreaSolid: cannot convert Nef to polyhedron for:", l->entity); return false; } @@ -238,7 +243,12 @@ bool IfcGeom::CgalKernel::convert(const IfcSchema::IfcExtrudedAreaSolidTapered* // f2 << inner_polyhedron << std::endl; // f2.close(); - nef_shape -= create_nef_polyhedron(face_list); + try { + nef_shape -= create_nef_polyhedron(face_list); + } catch (...) { + std::cout << "IfcExtrudedAreaSolidTapered: cannot subtract opening for:" << std::endl; + return false; + } ++inner_face1; ++inner_face2; @@ -453,14 +463,24 @@ bool IfcGeom::CgalKernel::convert(const IfcSchema::IfcBooleanResult* l, cgal_sha if (op == IfcSchema::IfcBooleanOperator::IfcBooleanOperator_DIFFERENCE) { // std::cout << "Difference" << std::endl; - CGAL::Nef_polyhedron_3 nef_result(s1); - if (is_halfspace) { + CGAL::Nef_polyhedron_3 nef_result; + try { + nef_result = CGAL::Nef_polyhedron_3(s1); + } catch (...) { + Logger::Message(Logger::LOG_ERROR, "s1: cannot convert to Nef?", operand1->entity); + return false; + } if (is_halfspace) { if (is_plane) nef_result = nef_result.intersection(plane, CGAL::Nef_polyhedron_3::Intersection_mode::CLOSED_HALFSPACE); } else { - nef_result -= CGAL::Nef_polyhedron_3(s2); + CGAL::Nef_polyhedron_3 nef_s2; + try { + nef_s2 = CGAL::Nef_polyhedron_3(s2); + } catch (...) { + Logger::Message(Logger::LOG_ERROR, "s2: cannot convert to Nef?", operand2->entity); + } nef_result -= nef_s2; } if (!nef_result.is_simple()) { - std::cout << "Not simple: " << nef_result.number_of_volumes() << " volumes" << std::endl; + Logger::Message(Logger::LOG_ERROR, "s2: not simple?", operand2->entity); return false; } else { // CGAL::Polyhedron_3 result; diff --git a/src/ifcgeom/kernels/cgal/CgalKernel.cpp b/src/ifcgeom/kernels/cgal/CgalKernel.cpp index d13dab80ec..280db29647 100644 --- a/src/ifcgeom/kernels/cgal/CgalKernel.cpp +++ b/src/ifcgeom/kernels/cgal/CgalKernel.cpp @@ -290,8 +290,26 @@ bool IfcGeom::CgalKernel::convert_openings(const IfcSchema::IfcProduct* entity, // fresult << polyhedron << std::endl; // fresult.close(); - CGAL::Nef_polyhedron_3 nef_opening(opening); - nef_brep_cut_result -= nef_opening; + CGAL::Nef_polyhedron_3 nef_opening; + try { + nef_opening = CGAL::Nef_polyhedron_3(opening); + } catch (...) { + Logger::Message(Logger::LOG_WARNING, "Subtracting combined openings compound failed (Nef conversion):", entity->entity); + std::ofstream ferror; + ferror.open("/Users/ken/Desktop/error.off"); + ferror << entity_shape << std::endl; + ferror.close(); + return false; + } try { + nef_brep_cut_result -= nef_opening; + } catch (...) { + Logger::Message(Logger::LOG_WARNING, "Subtracting combined openings compound failed (subtraction):", entity->entity); + std::ofstream ferror; + ferror.open("/Users/ken/Desktop/error.off"); + ferror << entity_shape << std::endl; + ferror.close(); + return false; + } // brep_cut_result.convert_to_polyhedron(polyhedron); // fresult.open("/Users/ken/Desktop/after.off"); @@ -307,14 +325,22 @@ bool IfcGeom::CgalKernel::convert_openings(const IfcSchema::IfcProduct* entity, // Apparently processing the boolean operation failed or resulted in an invalid result // in which case the original shape without the subtractions is returned instead // we try convert the openings in the original way, one by one. - Logger::Message(Logger::LOG_WARNING, "Subtracting combined openings compound failed:", entity->entity); + Logger::Message(Logger::LOG_WARNING, "Subtracting combined openings compound failed (conversion):", entity->entity); + std::ofstream ferror; + ferror.open("/Users/ken/Desktop/error.off"); + ferror << entity_shape << std::endl; + ferror.close(); return false; } } else { // Apparently processing the boolean operation failed or resulted in an invalid result // in which case the original shape without the subtractions is returned instead // we try convert the openings in the original way, one by one. - Logger::Message(Logger::LOG_WARNING, "Subtracting combined openings compound failed:", entity->entity); + Logger::Message(Logger::LOG_WARNING, "Subtracting combined openings compound failed (invalid):", entity->entity); + std::ofstream ferror; + ferror.open("/Users/ken/Desktop/error.off"); + ferror << entity_shape << std::endl; + ferror.close(); return false; } diff --git a/src/ifcgeom/kernels/cgal/CgalKernel.h b/src/ifcgeom/kernels/cgal/CgalKernel.h index 266b7a8294..a445ec275c 100644 --- a/src/ifcgeom/kernels/cgal/CgalKernel.h +++ b/src/ifcgeom/kernels/cgal/CgalKernel.h @@ -140,6 +140,7 @@ namespace IfcGeom { bool convert_openings(const IfcSchema::IfcProduct* entity, const IfcSchema::IfcRelVoidsElement::list::ptr& openings, const ConversionResults& entity_shapes, const cgal_placement_t& entity_trsf, ConversionResults& cut_shapes); + CGAL::Polyhedron_3 triangulate_faces(CGAL::Polyhedron_3 &polyhedron); CGAL::Polyhedron_3 create_polyhedron(std::list &face_list); CGAL::Polyhedron_3 create_polyhedron(CGAL::Nef_polyhedron_3 &nef_polyhedron); CGAL::Nef_polyhedron_3 create_nef_polyhedron(std::list &face_list);