Fixes after gltf ECEF merge

This commit is contained in:
Thomas Krijnen
2023-10-17 09:50:39 +02:00
parent dcc600805c
commit f504053b27
2 changed files with 3 additions and 3 deletions
+1 -1
View File
@@ -87,7 +87,7 @@ inline namespace settings {
class SerializerSettings : public SettingsContainer < class SerializerSettings : public SettingsContainer <
// @todo should we use tuple_cat here to unify the settings into a single class? // @todo should we use tuple_cat here to unify the settings into a single class?
std::tuple<UseElementNames, UseElementGuids, UseElementStepIds, UseMaterialNames, UseElementTypes, UseYUp, FloatingPointDigits> std::tuple<UseElementNames, UseElementGuids, UseElementStepIds, UseMaterialNames, UseElementTypes, UseYUp, WriteGltfEcef, FloatingPointDigits>
> >
{}; {};
+2 -2
View File
@@ -184,7 +184,7 @@ void GltfSerializer::write(const IfcGeom::TriangulationElement* o) {
// @todo check // @todo check
std::array<double, 16> matrix_flat; std::array<double, 16> matrix_flat;
if (settings_.get<settings::WriteGltfEcef>().get()) { if (settings_.get<ifcopenshell::geometry::settings::WriteGltfEcef>().get()) {
matrix_flat = { matrix_flat = {
m(0,0), m(1,0), m(2,0), m(3,0), m(0,0), m(1,0), m(2,0), m(3,0),
m(0,1), m(1,1), m(2,1), m(3,1), m(0,1), m(1,1), m(2,1), m(3,1),
@@ -435,7 +435,7 @@ namespace {
} }
void GltfSerializer::setFile(IfcParse::IfcFile* f) { void GltfSerializer::setFile(IfcParse::IfcFile* f) {
if (!settings_.get(SerializerSettings::WRITE_GLTF_ECEF)) { if (!settings_.get<ifcopenshell::geometry::settings::WriteGltfEcef>().get()) {
return; return;
} }