Glassvision/IfcOpenShell
1
0
Fork 0
mirror of https://github.com/IfcOpenShell/IfcOpenShell.git synced 2026-09-26 18:21:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

cgal kernel - conditionally reorient extrusion basis #6529

Browse Source
This commit is contained in:
Thomas Krijnen
2025-04-19 18:50:51 +02:00
parent e54acd83f8
commit b87a7b3d0a
1 changed files with 35 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ifcgeom/kernels/cgal/CgalKernel.cpp
+35 -12
View File
@@ -1051,13 +1051,24 @@ bool CgalKernel::process_extrusion(const cgal_face_t& bottom_face, taxonomy::dir
std::list<cgal_face_t> face_list; std::list<cgal_face_t> face_list;
auto& fs = direction->ccomponents();
cgal_direction_t dir(fs(0), fs(1), fs(2));
int wi = 0; int wi = 0;
for (auto& w : faces_to_extrude) { for (auto& w : faces_to_extrude) {
face_list.push_back(cgal_face_t{ w }); auto fnorm = newell(w);
const bool reverse = fnorm * dir > 0;
auto& fs = direction->ccomponents(); if (reverse) {
cgal_direction_t dir(fs(0), fs(1), fs(2)); cgal_face_t bottom_face;
for (auto vertex = w.rbegin(); vertex != w.rend(); ++vertex) {
bottom_face.outer.push_back(*vertex);
}
face_list.push_back(bottom_face);
} else {
face_list.push_back(cgal_face_t{ w });
}
int si = 0; int si = 0;
for (std::vector<Kernel_::Point_3>::const_iterator current_vertex = w.begin(); for (std::vector<Kernel_::Point_3>::const_iterator current_vertex = w.begin();
@@ -1073,19 +1084,31 @@ bool CgalKernel::process_extrusion(const cgal_face_t& bottom_face, taxonomy::dir
} }
cgal_face_t side_face; cgal_face_t side_face;
side_face.outer.push_back(*next_vertex); if (reverse) {
side_face.outer.push_back(*current_vertex); side_face.outer.push_back(*current_vertex + height * dir);
side_face.outer.push_back(*current_vertex + height * dir); side_face.outer.push_back(*next_vertex + height * dir);
side_face.outer.push_back(*next_vertex + height * dir); side_face.outer.push_back(*next_vertex);
side_face.outer.push_back(*current_vertex);
} else {
side_face.outer.push_back(*current_vertex);
side_face.outer.push_back(*next_vertex);
side_face.outer.push_back(*next_vertex + height * dir);
side_face.outer.push_back(*current_vertex + height * dir);
}
face_list.push_back(side_face); face_list.push_back(side_face);
} }
cgal_face_t top_face; cgal_face_t top_face;
for (std::vector<Kernel_::Point_3>::const_reverse_iterator vertex = w.rbegin(); if (reverse) {
vertex != w.rend(); for (auto vertex = w.begin(); vertex != w.end(); ++vertex) {
++vertex) { top_face.outer.push_back(*vertex + height * dir);
top_face.outer.push_back(*vertex + height * dir); }
} face_list.push_back(top_face); } else {
for (auto vertex = w.rbegin(); vertex != w.rend(); ++vertex) {
top_face.outer.push_back(*vertex + height * dir);
}
}
face_list.push_back(top_face);
wi++; wi++;
} }