Glassvision/IfcOpenShell
1
0
Fork 0
mirror of https://github.com/IfcOpenShell/IfcOpenShell.git synced 2026-10-02 13:04:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Inline conversion result vectors

Browse Source 
Generated with the assistance of an AI coding tool.
This commit is contained in:
Thomas Krijnen
2026-08-08 15:45:04 +02:00
parent 8c003110fe
commit 616c7a00d5
29 changed files with 157 additions and 159 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ifcgeom/kernels/cgal/cgal_kernel.cpp
+7 -7
View File
@@ -840,7 +840,7 @@ bool cgal_kernel::convert(const taxonomy::loop::ptr loop, cgal_wire& result) {
}
bool cgal_kernel::convert_impl(const taxonomy::shell::ptr shell, conversion_results& results) {
bool cgal_kernel::convert_impl(const taxonomy::shell::ptr shell, std::vector<conversion_result>& results) {
cgal_polyhedron shape;
if (!convert(shell, shape)) {
return false;
@@ -857,7 +857,7 @@ bool cgal_kernel::convert_impl(const taxonomy::shell::ptr shell, conversion_resu
return true;
}
bool cgal_kernel::convert_impl(const taxonomy::solid::ptr solid, conversion_results& results) {
bool cgal_kernel::convert_impl(const taxonomy::solid::ptr solid, std::vector<conversion_result>& results) {
if (solid->children.size() > 1) {
logger().error("UNS", 5, "Multiple shells in solid not supported at the moment");
return false;
@@ -897,7 +897,7 @@ namespace {
}
}
bool ifcopenshell::geom::kernels::cgal_kernel::convert_openings(const express::base& entity, const std::vector<std::pair<taxonomy::ptr, ifcopenshell::geom::taxonomy::matrix4>>& openings, const ifcopenshell::geom::conversion_results & entity_shapes, const ifcopenshell::geom::taxonomy::matrix4 & entity_trsf, ifcopenshell::geom::conversion_results & cut_shapes)
bool ifcopenshell::geom::kernels::cgal_kernel::convert_openings(const express::base& entity, const std::vector<std::pair<taxonomy::ptr, ifcopenshell::geom::taxonomy::matrix4>>& openings, const std::vector<ifcopenshell::geom::conversion_result> & entity_shapes, const ifcopenshell::geom::taxonomy::matrix4 & entity_trsf, std::vector<ifcopenshell::geom::conversion_result> & cut_shapes)
{
#ifdef IFOPSH_SIMPLE_KERNEL
return false;
@@ -939,7 +939,7 @@ bool ifcopenshell::geom::kernels::cgal_kernel::convert_openings(const express::b
Eigen::Matrix4d relative = entity_trsf.ccomponents().inverse() * opening_trsf.ccomponents();
opening_trsf = relative;
conversion_results opening_shapes;
std::vector<conversion_result> opening_shapes;
abstract_kernel::convert(op.first, opening_shapes);
for (unsigned int i = 0; i < opening_shapes.size(); ++i) {
@@ -1018,7 +1018,7 @@ bool ifcopenshell::geom::kernels::cgal_kernel::convert_openings(const express::b
}
bool cgal_kernel::convert_impl(const taxonomy::extrusion::ptr extrusion, conversion_results& results) {
bool cgal_kernel::convert_impl(const taxonomy::extrusion::ptr extrusion, std::vector<conversion_result>& results) {
cgal_polyhedron shape;
if (!convert(extrusion, shape)) {
return false;
@@ -1845,7 +1845,7 @@ namespace {
}
}
bool cgal_kernel::convert_impl(const taxonomy::boolean_result::ptr br, conversion_results& results) {
bool cgal_kernel::convert_impl(const taxonomy::boolean_result::ptr br, std::vector<conversion_result>& results) {
double z0, z1;
std::list<CGAL::Polygon_2<kernel_>> loops;
@@ -1962,7 +1962,7 @@ bool cgal_kernel::convert_impl(const taxonomy::boolean_result::ptr br, conversio
// abstract_kernel::convert(c, results);
// continue;
conversion_results cr;
std::vector<conversion_result> cr;
operands.emplace_back();
operands.back().first = c->instance;
src/ifcgeom/kernels/cgal/cgal_kernel.h
+5 -5
View File
@@ -119,13 +119,13 @@ namespace ifcopenshell {
bool process_as_2d_polygon(const taxonomy::boolean_result::ptr br, std::list<CGAL::Polygon_2<kernel_>>& loops, double& z0, double& z1);
bool process_as_2d_polygon(const std::list<std::list<std::pair<express::base, cgal_polyhedron>>>& operands, std::list<CGAL::Polygon_2<kernel_>>& loops, double& z0, double& z1);
virtual bool convert_impl(const taxonomy::shell::ptr, ifcopenshell::geom::conversion_results&);
virtual bool convert_impl(const taxonomy::extrusion::ptr, ifcopenshell::geom::conversion_results&);
virtual bool convert_impl(const taxonomy::boolean_result::ptr, ifcopenshell::geom::conversion_results&);
virtual bool convert_impl(const taxonomy::solid::ptr, ifcopenshell::geom::conversion_results&);
virtual bool convert_impl(const taxonomy::shell::ptr, std::vector<ifcopenshell::geom::conversion_result>&);
virtual bool convert_impl(const taxonomy::extrusion::ptr, std::vector<ifcopenshell::geom::conversion_result>&);
virtual bool convert_impl(const taxonomy::boolean_result::ptr, std::vector<ifcopenshell::geom::conversion_result>&);
virtual bool convert_impl(const taxonomy::solid::ptr, std::vector<ifcopenshell::geom::conversion_result>&);
virtual bool convert_openings(const express::base& entity, const std::vector<std::pair<taxonomy::ptr, ifcopenshell::geom::taxonomy::matrix4>>& openings,
const ifcopenshell::geom::conversion_results& entity_shapes, const ifcopenshell::geom::taxonomy::matrix4& entity_trsf, ifcopenshell::geom::conversion_results& cut_shapes);
const std::vector<ifcopenshell::geom::conversion_result>& entity_shapes, const ifcopenshell::geom::taxonomy::matrix4& entity_trsf, std::vector<ifcopenshell::geom::conversion_result>& cut_shapes);
#ifndef IFOPSH_SIMPLE_KERNEL
CGAL::Nef_polyhedron_3<kernel_> precision_cube() const { return create_precision_cube_(); }