Glassvision/IfcOpenShell
1
0
Fork 0
mirror of https://github.com/IfcOpenShell/IfcOpenShell.git synced 2026-08-19 03:33:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Store edges representation item ids in Triangulation

Browse Source
This commit is contained in:
Andrej730
2024-09-25 15:15:47 +05:00
parent aad66f94a3
commit dd9de98290
8 changed files with 109 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ifcgeom/IfcGeomRepresentation.h
+8 -2
View File
@@ -117,6 +117,7 @@ namespace IfcGeom {
std::vector<int> material_ids_;
std::vector<ifcopenshell::geometry::taxonomy::style::ptr> materials_;
std::vector<int> item_ids_;
std::vector<int> edges_item_ids_;
size_t weld_offset_;
VertexKeyMap welds;
@@ -137,6 +138,7 @@ namespace IfcGeom {
const std::vector<int>& material_ids() const { return material_ids_; }
const std::vector<ifcopenshell::geometry::taxonomy::style::ptr>& materials() const { return materials_; }
const std::vector<int>& item_ids() const { return item_ids_; }
const std::vector<int>& edges_item_ids() const { return edges_item_ids_; }
Triangulation(const BRep& shape_model);
@@ -152,6 +154,7 @@ namespace IfcGeom {
const std::vector<int>& material_ids,
const std::vector<ifcopenshell::geometry::taxonomy::style::ptr>& materials,
const std::vector<int>& item_ids
, const std::vector<int>& edges_item_ids
)
: Representation(settings, entity, id)
, verts_(verts)
@@ -162,6 +165,7 @@ namespace IfcGeom {
, material_ids_(material_ids)
, materials_(materials)
, item_ids_(item_ids)
, edges_item_ids_(edges_item_ids)
{}
virtual ~Triangulation() {}
@@ -204,16 +208,18 @@ namespace IfcGeom {
material_ids_.push_back(style);
}
void addEdge(int style, int i0, int i1) {
void addEdge(int item_id, int style, int i0, int i1) {
edges_.push_back(i0);
edges_.push_back(i1);
material_ids_.push_back(style);
edges_item_ids_.push_back(item_id);
}
void registerEdge(int i0, int i1) {
void registerEdge(int item_id, int i0, int i1) {
edges_.push_back(i0);
edges_.push_back(i1);
edges_item_ids_.push_back(item_id);
}
void registerEdgeCount(int n1, int n2, std::map<std::pair<int, int>, int>& edgecount);
src/ifcgeom/kernels/opencascade/OpenCascadeConversionResult.cpp
+2 -2
View File
@@ -303,7 +303,7 @@ void ifcopenshell::geometry::OpenCascadeShape::Triangulate(ifcopenshell::geometr
// @todo should be != 2?
if (p.second == 1 && emitted_edges.find(p.first) == emitted_edges.end()) {
// non manifold edge, face boundary
t->registerEdge(p.first.first, p.first.second);
t->registerEdge(item_id, p.first.first, p.first.second);
if (settings.get<settings::WeldVertices>().get()) {
// only relevant while welding, because otherwise vertices are not shared among distinct faces
emitted_edges.insert(p.first);
@@ -386,7 +386,7 @@ void ifcopenshell::geometry::OpenCascadeShape::Triangulate(ifcopenshell::geometr
}
for (auto& sgmt : segments) {
t->addEdge(surface_style_id, sgmt.first, sgmt.second);
t->addEdge(item_id, surface_style_id, sgmt.first, sgmt.second);
}
previous = current;