Refactor for clarity

Author: STREGA

Sources/GateEngine/Resources/Geometry/Raw/RawGeometry.swift

@@ -257,33 +257,17 @@ public struct RawGeometry: Codable, Sendable, Equatable, Hashable {
         self.uvSets = [uvSet1, uvSet2]
     }
 
-    public init(byCombiningTrianglesFrom geometries: [RawGeometry]) {
-        var triangles: [Triangle] = []
-        for geom in geometries {
-            triangles.append(contentsOf: geom.generateTriangles())
-        }
-        self.init(triangles: triangles)
-    }
-
     /// Creates a new `Geometry` by merging multiple geometry. This is usful for loading files that store geometry speretly base don material if you intend to only use a single material for them all.
-    public init(geometries: [RawGeometry]) {
+    public init(byCombining geometries: [RawGeometry], withOptimization optimization: Optimization = .dontOptimize) {
         var triangles: [Triangle] = []
         for geometry in geometries {
             triangles.append(contentsOf: geometry.generateTriangles())
         }
-        self.init(triangles: triangles)
-    }
-
-    public func hash(into hasher: inout Hasher) {
-        hasher.combine(positions)
-        hasher.combine(normals)
-        hasher.combine(uvSet1)
-        hasher.combine(uvSet2)
-        hasher.combine(tangents)
-        hasher.combine(colors)
-        hasher.combine(indices)
+        self.init(triangles: triangles, optimization: optimization)
     }
+}
 
+extension RawGeometry {
     public static func * (lhs: Self, rhs: Matrix4x4) -> Self {
         let triangles = lhs.generateTriangles().map({ $0 * rhs })
         return RawGeometry(triangles: triangles)
@@ -298,4 +282,12 @@ extension Array where Element == RawGeometry {
         }
         return vertices
     }
+    
+    public func generateTriangles() -> [Triangle] {
+        var triangles: [Triangle] = []
+        for geometry in self {
+            triangles.append(contentsOf: geometry.generateTriangles())
+        }
+        return triangles
+    }
 }

Sources/GateEngine/Resources/Import & Export/Importers/GLTransmissionFormat.swift

@@ -686,7 +686,7 @@ extension GLTransmissionFormat: GeometryImporter {
                 return geometries[0]
             }
         }else{
-            var geometry = RawGeometry(geometries: geometries)
+            var geometry = RawGeometry(byCombining: geometries)
             if options.applyRootTransform, let nodeIndex = gltf.scenes[gltf.scene].nodes?[0] {
                 let transform = gltf.nodes[nodeIndex].transform.createMatrix()
                 geometry = geometry * transform
@@ -840,7 +840,7 @@ extension GLTransmissionFormat: SkeletonImporter {
         guard let rootNode = skeletonNode(named: options.subobjectName, in: gltf) else {
             throw GateEngineError.failedToDecode("Couldn't find skeleton root.")
         }
-        var rawSkeleton: RawSkeleton = .init()
+        var rawSkeleton: RawSkeleton = .init(rawJoints: [])
         rawSkeleton.joints.append(
             RawSkeleton.RawJoint(id: rootNode, parent: nil, name: gltf.nodes[rootNode].name, localTransform: gltf.nodes[rootNode].transform)
         )