Skip to content

Commit 85c0d18

Browse files
committed
fix project files
1 parent f75d278 commit 85c0d18

File tree

3 files changed

+14
-5
lines changed

3 files changed

+14
-5
lines changed

IfcPlusPlus/IfcPlusPlus.vcxproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -128,6 +128,7 @@
128128
</ItemDefinitionGroup>
129129
<ItemGroup>
130130
<ClCompile Include="src\ifcpp\geometry\CSG_Adapter.cpp" />
131+
<ClCompile Include="src\ifcpp\geometry\CurveConverter.cpp" />
131132
<ClCompile Include="src\ifcpp\geometry\GeometryInputData.cpp" />
132133
<ClCompile Include="src\ifcpp\geometry\MeshOps.cpp" />
133134
<ClCompile Include="src\ifcpp\geometry\MeshSimplifier.cpp" />

IfcPlusPlus/IfcPlusPlus.vcxproj.filters

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -299,5 +299,8 @@
299299
<ClCompile Include="src\ifcpp\geometry\SolidModelConverter.cpp">
300300
<Filter>Quelldateien</Filter>
301301
</ClCompile>
302+
<ClCompile Include="src\ifcpp\geometry\CurveConverter.cpp">
303+
<Filter>Quelldateien</Filter>
304+
</ClCompile>
302305
</ItemGroup>
303306
</Project>

IfcPlusPlus/src/ifcpp/geometry/ConverterOSG.h

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -840,17 +840,22 @@ class ConverterOSG : public StatusCallback
840840
double minFaceArea = eps;
841841
bool dumpMeshes = false;
842842
GeomProcessingParams params(m_geom_settings, dumpMeshes);
843-
MeshOps::retriangulateMeshSetForExport(item_meshset, params);
844-
drawMeshSet(item_meshset, geode, crease_angle, min_triangle_area, false, disableBackfaceCulling);
843+
PolyInputCache3D poly(0.001);
844+
MeshOps::retriangulateMeshSetForExport(item_meshset, poly, params);
845+
846+
std::map<std::string, std::string> mesh_input_options;
847+
shared_ptr<carve::mesh::MeshSet<3> > meshsetTriangulated(poly.m_poly_data->createMesh(mesh_input_options, eps));
848+
849+
drawMeshSet(meshsetTriangulated, geode, crease_angle, min_triangle_area, false, disableBackfaceCulling);
845850

846851
if (m_render_crease_edges)
847852
{
848-
renderMeshsetCreaseEdges(item_meshset, geode, m_crease_edges_max_delta_angle, m_crease_edges_line_width);
853+
renderMeshsetCreaseEdges(meshsetTriangulated, geode, m_crease_edges_max_delta_angle, m_crease_edges_line_width);
849854
}
850855

851856
if (m_draw_bounding_box)
852857
{
853-
carve::geom::aabb<3> bbox = item_meshset->getAABB();
858+
carve::geom::aabb<3> bbox = meshsetTriangulated->getAABB();
854859
osg::ref_ptr<osg::Geometry> bbox_geom = new osg::Geometry();
855860
drawBoundingBox(bbox, bbox_geom);
856861
geode->addDrawable(bbox_geom);
@@ -859,7 +864,7 @@ class ConverterOSG : public StatusCallback
859864
#ifdef _DEBUG
860865
//vec4 color(0.6f, 0.6f, 0.6f, 0.1f);
861866
//GeomDebugDump::moveOffset(1);
862-
//GeomDebugDump::dumpMeshset(item_meshset, color, false, true, true);
867+
//GeomDebugDump::dumpMeshset(meshsetTriangulated, color, false, true, true);
863868
#endif
864869
}
865870
}

0 commit comments

Comments
 (0)