Glassvision/IfcOpenShell
1
0
Fork 0
mirror of https://github.com/IfcOpenShell/IfcOpenShell.git synced 2026-09-17 22:11:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

port: adapt cherry-picked ifcgeom code to wgpu APIs

Browse Source 
Fixes clean-but-broken breakage from replayed v0.8.0 commits that
compiled on v0.8.0's API but not wgpu's renamed one (caught by the
checkpoint build, not by any merge conflict):

- face.cpp: logger().Warning -> warning (from #527)
- IfcAsymmetricIShapeProfileDef.cpp (from #1367): map_impl takes a
  reference not a pointer (matches wgpu's BIND convention); inst-> -> inst.;
  boost get_value_or -> std::optional value_or; logger_.Message/Logger:: ->
  message/::logger::
- IfcTriangulatedFaceSet.cpp: inst->PnIndex() -> inst. (my own port slip;
  wgpu's triangulated map_impl is also a reference)

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
This commit is contained in:
Dion Moult
2026-07-25 17:48:07 +10:00
parent 956881bb99
commit 5164d7dac7
3 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ifcgeom/kernels/opencascade/face.cpp
+1 -1
View File
@@ -371,7 +371,7 @@ bool OpenCascadeKernel::convert(const taxonomy::face::ptr face, TopoDS_Shape& re
for (size_t j = 0; j < i && !reported; ++j) { for (size_t j = 0; j < i && !reported; ++j) {
BRepExtrema_DistShapeShape dss(fwires[i], fwires[j]); BRepExtrema_DistShapeShape dss(fwires[i], fwires[j]);
if (dss.IsDone() && dss.Value() < precision_) { if (dss.IsDone() && dss.Value() < precision_) {
logger().Warning("GEO", 402, "Face inner boundary intersects another face boundary", face->instance); logger().warning("GEO", 402, "Face inner boundary intersects another face boundary", face->instance);
reported = true; reported = true;
} }
} }
src/ifcgeom/mapping/IfcAsymmetricIShapeProfileDef.cpp
+16 -16
View File
@@ -32,43 +32,43 @@ using namespace ifcopenshell::geometry;
// it is only defined in the schemas where the type is standalone (IFC4 / IFC4X3). // it is only defined in the schemas where the type is standalone (IFC4 / IFC4X3).
#ifdef SCHEMA_IfcAsymmetricIShapeProfileDef_HAS_BottomFlangeWidth #ifdef SCHEMA_IfcAsymmetricIShapeProfileDef_HAS_BottomFlangeWidth
taxonomy::ptr mapping::map_impl(const IfcSchema::IfcAsymmetricIShapeProfileDef* inst) { taxonomy::ptr mapping::map_impl(const IfcSchema::IfcAsymmetricIShapeProfileDef& inst) {
// Bottom flange (half width), overall depth (half), web (half thickness). // Bottom flange (half width), overall depth (half), web (half thickness).
const double xb = inst->BottomFlangeWidth() / 2.0 * length_unit_; const double xb = inst.BottomFlangeWidth() / 2.0 * length_unit_;
const double xt = inst->TopFlangeWidth() / 2.0 * length_unit_; const double xt = inst.TopFlangeWidth() / 2.0 * length_unit_;
const double y = inst->OverallDepth() / 2.0 * length_unit_; const double y = inst.OverallDepth() / 2.0 * length_unit_;
const double d1 = inst->WebThickness() / 2.0 * length_unit_; const double d1 = inst.WebThickness() / 2.0 * length_unit_;
// Bottom flange thickness; top flange thickness defaults to the bottom one. // Bottom flange thickness; top flange thickness defaults to the bottom one.
const double ftb = inst->BottomFlangeThickness() * length_unit_; const double ftb = inst.BottomFlangeThickness() * length_unit_;
const double ftt = inst->TopFlangeThickness().get_value_or(inst->BottomFlangeThickness()) * length_unit_; const double ftt = inst.TopFlangeThickness().value_or(inst.BottomFlangeThickness()) * length_unit_;
// Optional fillet radii (web/flange transition) and flange edge radii. // Optional fillet radii (web/flange transition) and flange edge radii.
const double fb = inst->BottomFlangeFilletRadius().get_value_or(0.) * length_unit_; const double fb = inst.BottomFlangeFilletRadius().value_or(0.) * length_unit_;
const double ft_top = inst->TopFlangeFilletRadius().get_value_or(0.) * length_unit_; const double ft_top = inst.TopFlangeFilletRadius().value_or(0.) * length_unit_;
const double feb = inst->BottomFlangeEdgeRadius().get_value_or(0.) * length_unit_; const double feb = inst.BottomFlangeEdgeRadius().value_or(0.) * length_unit_;
const double fet = inst->TopFlangeEdgeRadius().get_value_or(0.) * length_unit_; const double fet = inst.TopFlangeEdgeRadius().value_or(0.) * length_unit_;
// Optional flange slopes: the inner edge of the flange rises towards the web. // Optional flange slopes: the inner edge of the flange rises towards the web.
const double bottomSlope = inst->BottomFlangeSlope().get_value_or(0.) * angle_unit_; const double bottomSlope = inst.BottomFlangeSlope().value_or(0.) * angle_unit_;
const double topSlope = inst->TopFlangeSlope().get_value_or(0.) * angle_unit_; const double topSlope = inst.TopFlangeSlope().value_or(0.) * angle_unit_;
const double dyb = (xb - d1) * tan(bottomSlope); const double dyb = (xb - d1) * tan(bottomSlope);
const double dyt = (xt - d1) * tan(topSlope); const double dyt = (xt - d1) * tan(topSlope);
const double tol = settings_.get<settings::Precision>().get(); const double tol = settings_.get<settings::Precision>().get();
if (xb < tol || xt < tol || y < tol || d1 < tol || ftb < tol || ftt < tol) { if (xb < tol || xt < tol || y < tol || d1 < tol || ftb < tol || ftt < tol) {
logger_.Message(Logger::LOG_NOTICE, "GEO", 264, "Skipping zero sized profile:", inst); logger_.message(::logger::LOG_NOTICE, "GEO", 264, "Skipping zero sized profile:", inst);
return nullptr; return nullptr;
} }
taxonomy::matrix4::ptr m4; taxonomy::matrix4::ptr m4;
bool has_position = true; bool has_position = true;
#ifdef SCHEMA_IfcParameterizedProfileDef_Position_IS_OPTIONAL #ifdef SCHEMA_IfcParameterizedProfileDef_Position_IS_OPTIONAL
has_position = !!inst->Position(); has_position = !!inst.Position();
#endif #endif
if (has_position) { if (has_position) {
m4 = taxonomy::cast<taxonomy::matrix4>(map(inst->Position())); m4 = taxonomy::cast<taxonomy::matrix4>(map(inst.Position()));
} }
// Twelve corner points, running counter-clockwise from the bottom-left, with the // Twelve corner points, running counter-clockwise from the bottom-left, with the
src/ifcgeom/mapping/IfcTriangulatedFaceSet.cpp
+1 -1
View File
@@ -42,7 +42,7 @@ taxonomy::ptr mapping::map_impl(const IfcSchema::IfcTriangulatedFaceSet& inst) {
// When the optional PnIndex is present, CoordIndex values do not index into // When the optional PnIndex is present, CoordIndex values do not index into
// CoordList directly but into PnIndex, which in turn remaps to CoordList. // CoordList directly but into PnIndex, which in turn remaps to CoordList.
// Both index levels are 1-based per the IFC specification. // Both index levels are 1-based per the IFC specification.
auto pn_index = inst->PnIndex(); auto pn_index = inst.PnIndex();
auto resolve = [&](int64_t idx) -> const taxonomy::point3::ptr& { auto resolve = [&](int64_t idx) -> const taxonomy::point3::ptr& {
if (pn_index) { if (pn_index) {
if (idx < 1 || idx > (int64_t)pn_index->size()) { if (idx < 1 || idx > (int64_t)pn_index->size()) {