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

Don't mutate conversion result placement. Breaks combination of world coords + optimized model.

Browse Source
This commit is contained in:
Thomas Krijnen
2023-12-05 21:11:36 +01:00
parent c595adfb7b
commit 4cd327f711
2 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ifcgeom/ConversionResult.cpp
+10
View File
@@ -8,3 +8,13 @@ IfcGeom::Representation::Triangulation * IfcGeom::ConversionResultShape::Triangu
Triangulate(settings, iden, t, -1); Triangulate(settings, iden, t, -1);
return t; return t;
} }
using namespace ifcopenshell::geometry::taxonomy;
void IfcGeom::ConversionResult::append(ifcopenshell::geometry::taxonomy::matrix4::ptr trsf) {
placement_ = make<matrix4>(placement_->ccomponents() * trsf->ccomponents());
}
void IfcGeom::ConversionResult::prepend(ifcopenshell::geometry::taxonomy::matrix4::ptr trsf) {
placement_ = make<matrix4>(trsf->ccomponents() * placement_->ccomponents());
}
src/ifcgeom/ConversionResult.h
+2 -8
View File
@@ -245,14 +245,8 @@ namespace IfcGeom {
ConversionResult(int id, ConversionResultShape* shape) ConversionResult(int id, ConversionResultShape* shape)
: id(id), placement_(ifcopenshell::geometry::taxonomy::make<ifcopenshell::geometry::taxonomy::matrix4>()), shape_(shape) : id(id), placement_(ifcopenshell::geometry::taxonomy::make<ifcopenshell::geometry::taxonomy::matrix4>()), shape_(shape)
{} {}
void append(ifcopenshell::geometry::taxonomy::matrix4::ptr trsf) { void append(ifcopenshell::geometry::taxonomy::matrix4::ptr trsf);
// @todo verify order void prepend(ifcopenshell::geometry::taxonomy::matrix4::ptr trsf);
placement_->components() = placement_->ccomponents() * trsf->ccomponents();
}
void prepend(ifcopenshell::geometry::taxonomy::matrix4::ptr trsf) {
// @todo verify order
placement_->components() = trsf->ccomponents() * placement_->ccomponents();
}
std::shared_ptr<ConversionResultShape> Shape() const { return shape_; } std::shared_ptr<ConversionResultShape> Shape() const { return shape_; }
ifcopenshell::geometry::taxonomy::matrix4::ptr Placement() const { return placement_; } ifcopenshell::geometry::taxonomy::matrix4::ptr Placement() const { return placement_; }
bool hasStyle() const { return !!style_; } bool hasStyle() const { return !!style_; }