From f504053b275975ef0e6e3191cb5198a76352ae56 Mon Sep 17 00:00:00 2001
From: Thomas Krijnen <t.krijnen@gmail.com>
Date: Tue, 17 Oct 2023 09:50:39 +0200
Subject: [PATCH] Fixes after gltf ECEF merge

---
 src/ifcgeom/GeometrySerializer.h   | 2 +-
 src/serializers/GltfSerializer.cpp | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/ifcgeom/GeometrySerializer.h b/src/ifcgeom/GeometrySerializer.h
index 6a16193769..8dd9a4a4f2 100644
--- a/src/ifcgeom/GeometrySerializer.h
+++ b/src/ifcgeom/GeometrySerializer.h
@@ -87,7 +87,7 @@ inline namespace settings {
 
 class SerializerSettings : public SettingsContainer <
 	// @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>
 >
 {};
 
diff --git a/src/serializers/GltfSerializer.cpp b/src/serializers/GltfSerializer.cpp
index d7bdf527c2..fac2ed51b0 100644
--- a/src/serializers/GltfSerializer.cpp
+++ b/src/serializers/GltfSerializer.cpp
@@ -184,7 +184,7 @@ void GltfSerializer::write(const IfcGeom::TriangulationElement* o) {
 	
 	// @todo check
 	std::array<double, 16> matrix_flat;
-	if (settings_.get<settings::WriteGltfEcef>().get()) {
+	if (settings_.get<ifcopenshell::geometry::settings::WriteGltfEcef>().get()) {
 		matrix_flat = {
 			m(0,0), m(1,0), m(2,0), m(3,0),
 			m(0,1), m(1,1), m(2,1), m(3,1),
@@ -435,7 +435,7 @@ namespace {
 }
 
 void GltfSerializer::setFile(IfcParse::IfcFile* f) {
-	if (!settings_.get(SerializerSettings::WRITE_GLTF_ECEF)) {
+	if (!settings_.get<ifcopenshell::geometry::settings::WriteGltfEcef>().get()) {
 		return;
 	}