Refactor ObjectAnimation3D importing

Author: STREGA

Sources/GateEngine/Resources/Animation/ObjectAnimation3D.swift

@@ -17,7 +17,7 @@ import Foundation
     }
 
     @usableFromInline
-    internal var backend: ObjectAnimation3DBackend {
+    internal var backend: RawObjectAnimation3D {
         assert(state == .ready, "This resource is not ready to be used. Make sure it's state property is .ready before accessing!")
         return Game.unsafeShared.resourceManager.objectAnimation3DCache(for: cacheKey)!.objectAnimation3DBackend!
     }
@@ -445,7 +445,7 @@ extension ObjectAnimation3D {
     }
 }
 
-public final class ObjectAnimation3DBackend {
+public struct RawObjectAnimation3D {
     let name: String
     let duration: Float
     let animation: ObjectAnimation3D.Animation
@@ -460,9 +460,7 @@ public final class ObjectAnimation3DBackend {
 // MARK: - Resource Manager
 
 public protocol ObjectAnimation3DImporter: ResourceImporter {
-    init()
-
-    func process(data: Data, baseURL: URL, options: ObjectAnimation3DImporterOptions) async throws -> ObjectAnimation3DBackend
+    func loadObjectAnimation(options: ObjectAnimation3DImporterOptions) async throws(GateEngineError) -> RawObjectAnimation3D
 }
 
 public struct ObjectAnimation3DImporterOptions: Equatable, Hashable, Sendable {
@@ -495,6 +493,13 @@ extension ResourceManager {
     }
 }
 
+extension RawObjectAnimation3D {
+    init(path: String, options: ObjectAnimation3DImporterOptions = .none) async throws {
+        let importer: any ObjectAnimation3DImporter = try await Game.unsafeShared.resourceManager.objectAnimation3DImporterForPath(path)
+        self = try await importer.loadObjectAnimation(options: options)
+    }
+}
+
 extension ResourceManager.Cache {
     @usableFromInline
     struct ObjectAnimation3DKey: Hashable, CustomStringConvertible, Sendable {
@@ -517,7 +522,7 @@ extension ResourceManager.Cache {
 
     @usableFromInline
     final class ObjectAnimation3DCache: ResourceCache {
-        @usableFromInline var objectAnimation3DBackend: ObjectAnimation3DBackend?
+        @usableFromInline var objectAnimation3DBackend: RawObjectAnimation3D?
         var lastLoaded: Date
         var state: ResourceState
         var referenceCount: UInt
@@ -565,7 +570,7 @@ extension ResourceManager {
             cache.objectAnimation3Ds[key] = Cache.ObjectAnimation3DCache()
             Game.unsafeShared.resourceManager.incrementLoading(path: key.requestedPath)
             Task.detached {
-                let backend = ObjectAnimation3DBackend(
+                let backend = RawObjectAnimation3D(
                     name: name, 
                     duration: duration, 
                     animation: animation
@@ -618,18 +623,11 @@ extension ResourceManager {
             let path = key.requestedPath
 
             do {
-                let importer: any ObjectAnimation3DImporter = try await Game.unsafeShared.resourceManager.objectAnimation3DImporterForPath(path)
-                
-                let data = try await Platform.current.loadResource(from: path)
-                let backend = try await importer.process(
-                    data: data,
-                    baseURL: URL(string: path)!.deletingLastPathComponent(),
-                    options: key.options
-                )
+                let rawObjectAnimation = try await RawObjectAnimation3D(path: key.requestedPath, options: key.options)
 
                 Task { @MainActor in
                     if let cache = cache.objectAnimation3Ds[key] {
-                        cache.objectAnimation3DBackend = backend
+                        cache.objectAnimation3DBackend = rawObjectAnimation
                         cache.state = .ready
                     }else{
                         Log.warn("Resource \"\(path)\" was deallocated before being " + (isFirstLoad ? "loaded." : "re-loaded."))

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

@@ -1134,10 +1134,8 @@ extension GLTransmissionFormat: SkeletalAnimationImporter {
     }
 }
 
-extension GLTransmissionFormat: ObjectAnimation3DImporter {   
-    public func process(data: Data, baseURL: URL, options: ObjectAnimation3DImporterOptions) async throws -> ObjectAnimation3DBackend {
-        let gltf = try gltf(from: data, baseURL: baseURL)
-        
+extension GLTransmissionFormat: ObjectAnimation3DImporter {
+    public func loadObjectAnimation(options: ObjectAnimation3DImporterOptions) async throws(GateEngineError) -> RawObjectAnimation3D {
         guard let animation = animation(named: options.subobjectName, from: gltf) else {
             throw GateEngineError.failedToDecode(
                 "Couldn't find animation: \"\(options.subobjectName!)\".\nAvailable Animations: \((gltf.animations ?? []).map({$0.name}))"
@@ -1232,7 +1230,7 @@ extension GLTransmissionFormat: ObjectAnimation3DImporter {
         objectAnimation.rotationOutput.times = objectAnimation.rotationOutput.times.map({$0 - timeMin})
         objectAnimation.scaleOutput.times = objectAnimation.scaleOutput.times.map({$0 - timeMin})
 
-        return ObjectAnimation3DBackend(name: animation.name, duration: timeMax, animation: objectAnimation)
+        return RawObjectAnimation3D(name: animation.name, duration: timeMax, animation: objectAnimation)
     }
 }