Glassvision/IfcOpenShell
1
0
Fork 0
mirror of https://github.com/IfcOpenShell/IfcOpenShell.git synced 2026-09-25 17:57:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Switch back to minkowski dilation for the time being

Browse Source
This commit is contained in:
Thomas Krijnen
2024-06-24 21:56:57 +02:00
parent 8da68f599b
commit bace73f854
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ifcgeom/kernels/cgal/CgalKernel.cpp
+5 -5
View File
@@ -835,7 +835,7 @@ bool ifcopenshell::geometry::kernels::CgalKernel::convert_openings(const IfcUtil
CGAL::Nef_polyhedron_3<Kernel_> a; CGAL::Nef_polyhedron_3<Kernel_> a;
if (!preprocess_boolean_operand(entity, {}, {}, {}, entity_shape, a, PP_UNIFY_PLANES_INTERNALLY)) { if (!preprocess_boolean_operand(entity, {}, {}, {}, entity_shape, a, PP_NONE /*PP_UNIFY_PLANES_INTERNALLY*/)) {
continue; continue;
} }
@@ -870,7 +870,7 @@ bool ifcopenshell::geometry::kernels::CgalKernel::convert_openings(const IfcUtil
continue; continue;
} }
auto tree = build_halfspace_tree_decomposed(nef, all_operand_planes); // auto tree = build_halfspace_tree_decomposed(nef, all_operand_planes);
second_operand_instances.push_back(op.first->instance->as<IfcUtil::IfcBaseClass>()); second_operand_instances.push_back(op.first->instance->as<IfcUtil::IfcBaseClass>());
second_operands.push_back(entity_shape); second_operands.push_back(entity_shape);
@@ -883,7 +883,7 @@ bool ifcopenshell::geometry::kernels::CgalKernel::convert_openings(const IfcUtil
for (auto& nef : second_operands_nef) { for (auto& nef : second_operands_nef) {
auto& inst = *iit++; auto& inst = *iit++;
auto& entity_shape = *pit++; auto& entity_shape = *pit++;
if (!preprocess_boolean_operand(inst, first_operands, first_operands_nef, all_operand_planes, entity_shape, nef, PP_SNAP_PLANES_TO_FIRST_OPERAND)) { if (!preprocess_boolean_operand(inst, first_operands, first_operands_nef, all_operand_planes, entity_shape, nef, PP_MINKOWSKY_DILATE/*PP_SNAP_PLANES_TO_FIRST_OPERAND*/)) {
continue; continue;
} }
second_operand_collector.add_polyhedron(nef); second_operand_collector.add_polyhedron(nef);
@@ -901,7 +901,7 @@ bool ifcopenshell::geometry::kernels::CgalKernel::convert_openings(const IfcUtil
for (auto& entity_shape : first_operands) { for (auto& entity_shape : first_operands) {
auto& a = *nit; auto& a = *nit;
{ if constexpr (false) {
static int NN = 0; static int NN = 0;
auto s = std::string("debug-first-operand-") + std::to_string(NN++) + ".off"; auto s = std::string("debug-first-operand-") + std::to_string(NN++) + ".off";
std::ofstream ofs(s.c_str()); std::ofstream ofs(s.c_str());
@@ -2000,7 +2000,7 @@ bool CgalKernel::convert_impl(const taxonomy::boolean_result::ptr br, Conversion
CGAL::Nef_polyhedron_3<Kernel_> nef; CGAL::Nef_polyhedron_3<Kernel_> nef;
if (!preprocess_boolean_operand(entity_instance, ops, nefops, all_operand_planes, entity_shape, nef, if (!preprocess_boolean_operand(entity_instance, ops, nefops, all_operand_planes, entity_shape, nef,
// Snap boolean subtraction operands // Snap boolean subtraction operands
first ? PP_NONE : PP_SNAP_PLANES_TO_FIRST_OPERAND)) { first ? PP_NONE : PP_MINKOWSKY_DILATE/*PP_SNAP_PLANES_TO_FIRST_OPERAND*/)) {
continue; continue;
} }