From c47a43caf7b288f1de9ede4f8fd29736b84647ff Mon Sep 17 00:00:00 2001 From: Thomas Krijnen Date: Thu, 2 Jan 2014 13:33:54 +0000 Subject: [PATCH] IfcGeomObjects: No longer implicitly turn off the availability of triangulated data when USE_BREP_DATA is set. Use DISABLE_TRIANGULATION to explicitly disable the generation of triangulated data to gain performance when only OCC brep data is needed. --- src/ifcgeom/IfcGeomObjects.cpp | 1 - src/ifcgeom/IfcGeomObjects.h | 3 +-- src/ifcwrap/Interface.h | 3 ++- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/ifcgeom/IfcGeomObjects.cpp b/src/ifcgeom/IfcGeomObjects.cpp index 1e92d17d02..15ee85cdef 100644 --- a/src/ifcgeom/IfcGeomObjects.cpp +++ b/src/ifcgeom/IfcGeomObjects.cpp @@ -730,7 +730,6 @@ void IfcGeomObjects::Settings(int setting, bool value) { break; case USE_BREP_DATA: use_brep_data = value; - disable_triangulation = value; break; case FASTER_BOOLEANS: use_faster_booleans = value; diff --git a/src/ifcgeom/IfcGeomObjects.h b/src/ifcgeom/IfcGeomObjects.h index a402b5e770..95f8ea023c 100644 --- a/src/ifcgeom/IfcGeomObjects.h +++ b/src/ifcgeom/IfcGeomObjects.h @@ -101,8 +101,7 @@ namespace IfcGeomObjects { // the related building element representations. const int DISABLE_OPENING_SUBTRACTIONS = 8; // Disables the triangulation of the topological representations. Useful if - // the client application understands Open Cascade's native format. Note - // that this setting is implied by the USE_BREP_DATA setting. + // the client application understands Open Cascade's native format. const int DISABLE_TRIANGULATION = 9; // End of settings enumeration. diff --git a/src/ifcwrap/Interface.h b/src/ifcwrap/Interface.h index c5b6ff6b16..851ada7c02 100644 --- a/src/ifcwrap/Interface.h +++ b/src/ifcwrap/Interface.h @@ -26,7 +26,8 @@ namespace IfcGeomObjects { const int SEW_SHELLS = 5; const int FASTER_BOOLEANS = 6; const int FORCE_CCW_FACE_ORIENTATION = 7; - const int DISABLE_OPENING_SUBTRACTIONS = 8; + const int DISABLE_OPENING_SUBTRACTIONS = 8; + const int DISABLE_TRIANGULATION = 9; class Material { private: