cleanup

hypar-io · Dec 7, 2022 · b7005e9 · b7005e9
1 parent 1e32fb2
commit b7005e9
Showing 1 changed file with 14 additions and 12 deletions.
diff --git a/Elements/src/Serialization/glTF/GltfExtensions.cs b/Elements/src/Serialization/glTF/GltfExtensions.cs
@@ -946,17 +946,19 @@ internal static Gltf InitializeGlTF(Model model,
             };
             gltf.Scenes = new[] { scene };
 
-            var lights = model.AllElementsOfType<Light>().ToList();
-            var extensions = lights.Any() ? new HashSet<string>() {
-                "KHR_materials_specular",
-                "KHR_materials_ior",
-                "KHR_materials_unlit",
-                "KHR_lights_punctual"
-            } : new HashSet<string>() {
+            var extensionsUsed = new HashSet<string> {
                 "KHR_materials_specular",
                 "KHR_materials_ior",
-                "KHR_materials_unlit"};
-            gltf.ExtensionsUsed = extensions.ToArray(extensions.Count);
+                "KHR_materials_unlit"
+            };
+
+            var lights = model.AllElementsOfType<Light>().ToList();
+            if (lights.Any())
+            {
+                extensionsUsed.Add("KHR_lights_punctual");
+            }
+
+            gltf.ExtensionsUsed = extensionsUsed.ToArray();
 
             var bufferViews = new List<BufferView>();
 
@@ -1026,7 +1028,7 @@ internal static Gltf InitializeGlTF(Model model,
                                             textures,
                                             images,
                                             samplers,
-                                            extensions,
+                                            extensionsUsed,
                                             meshes,
                                             nodes,
                                             meshElementMap,
@@ -1102,9 +1104,9 @@ internal static Gltf InitializeGlTF(Model model,
                 gltf.Meshes = meshes.ToArray(meshes.Count);
             }
 
-            if (extensions.Count > 0)
+            if (extensionsUsed.Count > 0)
             {
-                gltf.ExtensionsUsed = extensions.ToArray();
+                gltf.ExtensionsUsed = extensionsUsed.ToArray();
             }
 
             // This is a hack! For web assembly, the ToArray() call creates