ForkMaster/netgen
1
0
Fork 0
mirror of https://github.com/NGSolve/netgen.git synced 2024-12-25 05:20:34 +05:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'solid_face_map_renderdata' into 'master'

Browse Source 
add solid -> faces map in renderData of occ geom

See merge request ngsolve/netgen!517
This commit is contained in:
Hochsteger, Matthias 2022-08-10 09:03:10 +02:00
commit de0d706ec2
1 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
libsrc/occ/python_occ_shapes.cpp
View File

@ -1177,15 +1177,18 @@ DLL_HEADER void ExportNgOCCShapes(py::module &m)
std::vector<double> p[3]; std::vector<double> p[3];
std::vector<double> n[3]; std::vector<double> n[3];
py::list names, colors; py::list names, colors, solid_names;
std::vector<std::vector<int>> solid_face_map;
int index = 0; int index = 0;
Box<3> box(Box<3>::EMPTY_BOX); Box<3> box(Box<3>::EMPTY_BOX);
TopTools_IndexedMapOfShape fmap;
for (TopExp_Explorer e(shape, TopAbs_FACE); e.More(); e.Next()) for (TopExp_Explorer e(shape, TopAbs_FACE); e.More(); e.Next())
{ {
TopoDS_Face face = TopoDS::Face(e.Current()); TopoDS_Face face = TopoDS::Face(e.Current());
// Handle(TopoDS_Face) face = e.Current(); // Handle(TopoDS_Face) face = e.Current();
fmap.Add(face);
ExtractFaceData(face, index, p, n, box); ExtractFaceData(face, index, p, n, box);
auto & props = OCCGeometry::global_shape_properties[face.TShape()]; auto & props = OCCGeometry::global_shape_properties[face.TShape()];
if(props.col) if(props.col)
@ -1204,6 +1207,19 @@ DLL_HEADER void ExportNgOCCShapes(py::module &m)
index++; index++;
} }
for(auto& solid : GetSolids(shape))
{
std::vector<int> faces;
for(auto& face : GetFaces(solid))
faces.push_back(fmap.FindIndex(face)-1);
solid_face_map.push_back(move(faces));
auto& props = OCCGeometry::global_shape_properties[solid.TShape()];
if(props.name)
solid_names.append(*props.name);
else
solid_names.append("");
}
std::vector<double> edge_p[2]; std::vector<double> edge_p[2];
py::list edge_names, edge_colors; py::list edge_names, edge_colors;
index = 0; index = 0;
@ -1263,6 +1279,7 @@ DLL_HEADER void ExportNgOCCShapes(py::module &m)
data["autoscale"] = false; data["autoscale"] = false;
data["colors"] = colors; data["colors"] = colors;
data["names"] = names; data["names"] = names;
data["solid_names"] = solid_names;
py::list edges; py::list edges;
edges.append(edge_p[0]); edges.append(edge_p[0]);
@ -1270,6 +1287,7 @@ DLL_HEADER void ExportNgOCCShapes(py::module &m)
data["edges"] = edges; data["edges"] = edges;
data["edge_names"] = edge_names; data["edge_names"] = edge_names;
data["edge_colors"] = edge_colors; data["edge_colors"] = edge_colors;
data["solid_face_map"] = solid_face_map;
return data; return data;
}) })
; ;