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

Prevent unnecessary trsf::form() = other #6909 #6841

Browse Source
This commit is contained in:
Thomas Krijnen
2025-08-06 09:21:57 +02:00
parent 51afe03b78
commit 7a2dc5c0c5
1 changed files with 40 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ifcgeom/IfcGeomRepresentation.cpp
+40 -8
View File
@@ -187,7 +187,21 @@ IfcGeom::Representation::Serialization::Serialization(const BRep& brep)
} }
} }
} }
}
namespace {
bool is_non_uniform(const Eigen::Matrix4d& M, double eps = 1e-6)
{
Eigen::Matrix3d L = M.block<3, 3>(0, 0);
double sx = L.col(0).norm();
double sy = L.col(1).norm();
double sz = L.col(2).norm();
return !(
std::abs(sx - sy) < eps &&
std::abs(sx - sz) < eps &&
std::abs(sy - sz) < eps
);
}
} }
IfcGeom::ConversionResultShape* IfcGeom::Representation::BRep::as_compound(bool force_meters) const { IfcGeom::ConversionResultShape* IfcGeom::Representation::BRep::as_compound(bool force_meters) const {
@@ -199,17 +213,35 @@ IfcGeom::ConversionResultShape* IfcGeom::Representation::BRep::as_compound(bool
for (auto it = begin(); it != end(); ++it) { for (auto it = begin(); it != end(); ++it) {
const TopoDS_Shape& s = *std::static_pointer_cast<ifcopenshell::geometry::OpenCascadeShape>(it->Shape()); const TopoDS_Shape& s = *std::static_pointer_cast<ifcopenshell::geometry::OpenCascadeShape>(it->Shape());
// @todo, check
gp_GTrsf trsf; gp_GTrsf trsf;
if (it->Placement()->components_) { if (it->Placement()->components_) {
gp_Trsf tr;
const auto& m = it->Placement()->ccomponents(); const auto& m = it->Placement()->ccomponents();
trsf.SetVectorialPart(gp_Mat( // This is either a bug or very finicky, but this appears to be the only
m(0, 0), m(0, 1), m(0, 2), // way to get the transformation metadata to line up.
m(1, 0), m(1, 1), m(1, 2), //
m(2, 0), m(2, 1), m(2, 2) // - If gp_GTrsf.form is other, applying the transformation will result in
)); // a conversion to b-spline surfaces for about everything, which impacts
trsf.SetTranslationPart(gp_XYZ(m(0, 3), m(1, 3), m(2, 3))); // performance and breaks detection of view volume in the svg serializer,
// which would be the case when setting the SetVectorialPart() block
// unconditionally.
// (calling SetForm() afterwards to detect CompoundTrsf over Other would
// set Scale to zero (bug?))
if (is_non_uniform(m)) {
trsf.SetVectorialPart(gp_Mat(
m(0, 0), m(0, 1), m(0, 2),
m(1, 0), m(1, 1), m(1, 2),
m(2, 0), m(2, 1), m(2, 2)
));
trsf.SetTranslationPart(gp_XYZ(m(0, 3), m(1, 3), m(2, 3)));
} else {
gp_Trsf tr;
tr.SetValues(
m(0, 0), m(0, 1), m(0, 2), m(0, 3),
m(1, 0), m(1, 1), m(1, 2), m(1, 3),
m(2, 0), m(2, 1), m(2, 2), m(2, 3)
);
trsf = tr;
}
} }
if (!force_meters && settings().get<ifcopenshell::geometry::settings::ConvertBackUnits>().get()) { if (!force_meters && settings().get<ifcopenshell::geometry::settings::ConvertBackUnits>().get()) {