Glassvision/IfcOpenShell
1
0
Fork 0
mirror of https://github.com/IfcOpenShell/IfcOpenShell.git synced 2026-09-19 06:39:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Switched to normals per vertex per face

Browse Source
This commit is contained in:
Ken Arroyo Ohori
2017-03-07 12:50:06 -06:00
parent b299c27473
commit 1fb76a9749
1 changed files with 6 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ifcgeom/kernels/cgal/CgalConversionResult.cpp
+6 -14
View File
@@ -38,19 +38,6 @@ void IfcGeom::CgalShape::Triangulate(const IfcGeom::IteratorSettings & settings,
// fafter.close(); // fafter.close();
CGAL::Polygon_mesh_processing::compute_normals(polyhedron, vertex_normals_map, face_normals_map); CGAL::Polygon_mesh_processing::compute_normals(polyhedron, vertex_normals_map, face_normals_map);
std::map<CGAL::Polyhedron_3<Kernel>::Vertex_const_handle, int> vertices_map;
std::size_t initial_size = t->verts().size()/3;
for (auto &vertex: vertices(polyhedron)) {
if (vertices_map.count(vertex) == 0) {
vertices_map[vertex] = (int)(vertices_map.size()+initial_size);
t->addVertex(surface_style_id,
CGAL::to_double(vertex->point().cartesian(0)),
CGAL::to_double(vertex->point().cartesian(1)),
CGAL::to_double(vertex->point().cartesian(2)));
// std::cout << "Size: " << t->verts().size() << std::endl;
for (int i = 0; i < 3; ++i) t->normals().push_back(CGAL::to_double(vertex_normals_map[vertex].cartesian(i)));
}
}
for (auto &face: faces(polyhedron)) { for (auto &face: faces(polyhedron)) {
if (!face->is_triangle()) { if (!face->is_triangle()) {
@@ -59,7 +46,12 @@ void IfcGeom::CgalShape::Triangulate(const IfcGeom::IteratorSettings & settings,
} }
CGAL::Polyhedron_3<Kernel>::Halfedge_around_facet_const_circulator current_halfedge = face->facet_begin(); CGAL::Polyhedron_3<Kernel>::Halfedge_around_facet_const_circulator current_halfedge = face->facet_begin();
do { do {
t->faces().push_back(vertices_map[current_halfedge->vertex()]); t->faces().push_back((int)t->verts().size()/3);
t->addVertex(surface_style_id,
CGAL::to_double(current_halfedge->vertex()->point().cartesian(0)),
CGAL::to_double(current_halfedge->vertex()->point().cartesian(1)),
CGAL::to_double(current_halfedge->vertex()->point().cartesian(2)));
for (int i = 0; i < 3; ++i) t->normals().push_back(CGAL::to_double(face_normals_map[face].cartesian(i)));
++current_halfedge; ++current_halfedge;
} while (current_halfedge != face->facet_begin()); } while (current_halfedge != face->facet_begin());
t->material_ids().push_back(surface_style_id); t->material_ids().push_back(surface_style_id);