vitalif
/
openscad
mirror of https://github.com/vitalif/openscad
1
0
Fork 0
Code Issues Releases Wiki Activity

simplify nef polyhedron code. attempt to add test for bug

brodykenrick-master
Don Bright 2013-11-26 20:29:29 -06:00
parent cf9f19818c
commit faf008ce24
2 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/CGAL_Nef_polyhedron.cc
View File

@ -96,24 +96,22 @@ PolySet *CGAL_Nef_polyhedron::convertToPolyset()
} }
else if (this->dim == 3) { else if (this->dim == 3) {
CGAL::Failure_behaviour old_behaviour = CGAL::set_error_behaviour(CGAL::THROW_EXCEPTION); CGAL::Failure_behaviour old_behaviour = CGAL::set_error_behaviour(CGAL::THROW_EXCEPTION);
bool err = true;
std::string errmsg("");
CGAL_Polyhedron P;
try { try {
CGAL_Polyhedron P; err = nefworkaround::convert_to_Polyhedron<CGAL_Kernel3>( *(this->p3), P );
bool err = nefworkaround::convert_to_Polyhedron<CGAL_Kernel3>( *(this->p3), P );
//this->p3->convert_to_Polyhedron(P); //this->p3->convert_to_Polyhedron(P);
if (err) {
PRINT("ERROR: CGAL NefPolyhedron->Polyhedron conversion failed");
} else {
ps = createPolySetFromPolyhedron(P);
}
} }
catch (const CGAL::Precondition_exception &e) { catch (const CGAL::Failure_exception &e) {
PRINTB("CGAL Precondition error in CGAL_Nef_polyhedron::convertToPolyset(): %s", e.what()); err = true;
errmsg = std::string(e.what());
} }
catch (const CGAL::Assertion_exception &e) { if (err) {
PRINTB("CGAL Assertion error in CGAL_Nef_polyhedron::convertToPolyset(): %s", e.what()); PRINT("ERROR: CGAL NefPolyhedron->Polyhedron conversion failed.");
} if (errmsg!="") PRINTB("ERROR: %s",errmsg);
catch (...) { } else {
PRINT("CGAL unknown error in CGAL_Nef_polyhedron::convertToPolyset()"); ps = createPolySetFromPolyhedron(P);
} }
CGAL::set_error_behaviour(old_behaviour); CGAL::set_error_behaviour(old_behaviour);
} }

1
tests/CMakeLists.txt
View File

@ -800,6 +800,7 @@ list(APPEND CGALPNGTEST_FILES ${FEATURES_FILES} ${SCAD_DXF_FILES} ${EXAMPLE_FILE
list(APPEND CGALPNGTEST_FILES ${CMAKE_SOURCE_DIR}/../testdata/scad/misc/include-tests.scad list(APPEND CGALPNGTEST_FILES ${CMAKE_SOURCE_DIR}/../testdata/scad/misc/include-tests.scad
${CMAKE_SOURCE_DIR}/../testdata/scad/misc/use-tests.scad ${CMAKE_SOURCE_DIR}/../testdata/scad/misc/use-tests.scad
${CMAKE_SOURCE_DIR}/../testdata/scad/bugs/transform-nan-inf-tests.scad ${CMAKE_SOURCE_DIR}/../testdata/scad/bugs/transform-nan-inf-tests.scad
${CMAKE_SOURCE_DIR}/../testdata/scad/bugs/stl-cgal-convert_to_Polyhedron-crash.scad
${CMAKE_SOURCE_DIR}/../testdata/scad/misc/localfiles-test.scad ${CMAKE_SOURCE_DIR}/../testdata/scad/misc/localfiles-test.scad
${CMAKE_SOURCE_DIR}/../testdata/scad/misc/localfiles_dir/localfiles-compatibility-test.scad) ${CMAKE_SOURCE_DIR}/../testdata/scad/misc/localfiles_dir/localfiles-compatibility-test.scad)