Chip away at Swift 6

Author: STREGA

Package.swift

@@ -708,6 +708,9 @@ extension Array where Element == SwiftSetting {
         var settings: Self = []
 
 #if compiler(>=6.2)
+    #if !hasFeature(ImmutableWeakCaptures)
+        enableFeature("ImmutableWeakCaptures")
+    #endif
     #if !hasFeature(InferIsolatedConformances)
         enableFeature("InferIsolatedConformances")
     #endif

Sources/GateEngine/Helpers/TextureAtlas.swift

@@ -152,7 +152,7 @@ public final class TextureAtlasBuilder {
      - parameter sacrificePerformanceForSize: When `true` additional checks are performed to merge textures that are the same but with different paths. Resulting in a smaller atlas, at the cost of performance.
      */
     public func insertTexture(withPath unresolvedPath: String, sacrificePerformanceForSize: Bool = false) throws {
-        let importer = PNGImporter()
+        var importer = PNGImporter()
         try importer.synchronousPrepareToImportResourceFrom(path: unresolvedPath)
         let rawTexture = try importer.synchronousLoadTexture(options: .none)
 

Sources/GateEngine/Resources/Animation/ObjectAnimation3D.swift

@@ -189,7 +189,7 @@ extension RawObjectAnimation3D: BinaryCodable {
 // MARK: - Resource Manager
 
 public protocol ObjectAnimation3DImporter: ResourceImporter {
-    func loadObjectAnimation(options: ObjectAnimation3DImporterOptions) async throws(GateEngineError) -> RawObjectAnimation3D
+    mutating func loadObjectAnimation(options: ObjectAnimation3DImporterOptions) async throws(GateEngineError) -> RawObjectAnimation3D
 }
 
 public struct ObjectAnimation3DImporterOptions: Equatable, Hashable, Sendable {
@@ -224,7 +224,7 @@ extension ResourceManager {
 
 extension RawObjectAnimation3D {
     public init(path: String, options: ObjectAnimation3DImporterOptions = .none) async throws {
-        let importer: any ObjectAnimation3DImporter = try await Game.unsafeShared.resourceManager.objectAnimation3DImporterForPath(path)
+        var importer: any ObjectAnimation3DImporter = try await Game.unsafeShared.resourceManager.objectAnimation3DImporterForPath(path)
         self = try await importer.loadObjectAnimation(options: options)
     }
 }

Sources/GateEngine/Resources/CollisionMesh/CollisionMesh.swift

@@ -94,7 +94,7 @@ public final class CollisionMeshBackend {
 // MARK: - Resource Manager
 
 public protocol CollisionMeshImporter: ResourceImporter {
-    func loadCollisionMesh(options: CollisionMeshImporterOptions) async throws(GateEngineError) -> RawCollisionMesh
+    mutating func loadCollisionMesh(options: CollisionMeshImporterOptions) async throws(GateEngineError) -> RawCollisionMesh
 }
 
 public struct CollisionMeshImporterOptions: Equatable, Hashable, Sendable {
@@ -177,7 +177,7 @@ extension ResourceManager {
 
 public extension RawCollisionMesh {
     init(path: String, options: CollisionMeshImporterOptions = .none) async throws {
-        let importer: any CollisionMeshImporter = try await Game.unsafeShared.resourceManager.collisionMeshImporterForPath(path)
+        var importer: any CollisionMeshImporter = try await Game.unsafeShared.resourceManager.collisionMeshImporterForPath(path)
         self = try await importer.loadCollisionMesh(options: options)
     }
 }

Sources/GateEngine/Resources/Geometry/Geometry.swift

@@ -132,7 +132,7 @@ extension Geometry: Equatable, Hashable {
 // MARK: - Resource Manager
 
 public protocol GeometryImporter: ResourceImporter {
-    func loadGeometry(options: GeometryImporterOptions) async throws(GateEngineError) -> RawGeometry
+    mutating func loadGeometry(options: GeometryImporterOptions) async throws(GateEngineError) -> RawGeometry
 }
 
 public struct GeometryImporterOptions: Equatable, Hashable, Sendable {
@@ -194,7 +194,7 @@ extension RawGeometry {
         try await self.init(path: path.value, options: options)
     }
     public init(path: String, options: GeometryImporterOptions = .none) async throws(GateEngineError) {
-        let importer = try await Game.unsafeShared.resourceManager.geometryImporterForPath(path)
+        var importer = try await Game.unsafeShared.resourceManager.geometryImporterForPath(path)
         self = try await importer.loadGeometry(options: options)
     }
 }

Sources/GateEngine/Resources/Geometry/Lines.swift

@@ -68,7 +68,7 @@ extension RawLines {
         try await self.init(path: path.value, options: options)
     }
     public init(path: String, options: GeometryImporterOptions = .none) async throws(GateEngineError) {
-        let importer = try await Game.unsafeShared.resourceManager.geometryImporterForPath(path)
+        var importer = try await Game.unsafeShared.resourceManager.geometryImporterForPath(path)
         let rawGeometry = try await importer.loadGeometry(options: options)
         self.init(wireframeFrom: rawGeometry)
     }

Sources/GateEngine/Resources/Geometry/Points.swift

@@ -68,7 +68,7 @@ extension RawPoints {
         try await self.init(path: path.value, options: options)
     }
     public init(path: String, options: GeometryImporterOptions = .none) async throws(GateEngineError) {
-        let importer = try await Game.unsafeShared.resourceManager.geometryImporterForPath(path)
+        var importer = try await Game.unsafeShared.resourceManager.geometryImporterForPath(path)
         let rawGeometry = try await importer.loadGeometry(options: options)
         self.init(pointCloudFrom: rawGeometry)
     }

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

@@ -12,12 +12,12 @@ import CoreServices
 import GameMath
 import UniformTypeIdentifiers
 
-public final class ApplePlatformImageImporter: TextureImporter {
+public struct ApplePlatformImageImporter: TextureImporter {
     var data: Data! = nil
     var size: Size2i! = nil
-    public required init() {}
+    public init() {}
 
-    public func synchronousPrepareToImportResourceFrom(path: String) throws(GateEngineError) {
+    public mutating func synchronousPrepareToImportResourceFrom(path: String) throws(GateEngineError) {
         do {
             let data = try Platform.current.synchronousLoadResource(from: path)
             try self.populateFromData(data)
@@ -26,7 +26,7 @@ public final class ApplePlatformImageImporter: TextureImporter {
         }
     }
 
-    public func prepareToImportResourceFrom(path: String) async throws(GateEngineError) {
+    public mutating func prepareToImportResourceFrom(path: String) async throws(GateEngineError) {
         do {
             let data = try await Platform.current.loadResource(from: path)
             try self.populateFromData(data)
@@ -35,7 +35,7 @@ public final class ApplePlatformImageImporter: TextureImporter {
         }
     }
 
-    func populateFromData(_ data: Data) throws(GateEngineError) {
+    mutating func populateFromData(_ data: Data) throws(GateEngineError) {
         do {
             guard let imageSource = CGImageSourceCreateWithData(data as CFData, nil) else {
                 throw GateEngineError.failedToDecode("Failed to decode image source.")
@@ -53,11 +53,11 @@ public final class ApplePlatformImageImporter: TextureImporter {
         }
     }
 
-    public func synchronousLoadTexture(options: TextureImporterOptions) throws(GateEngineError) -> RawTexture {
+    public mutating func synchronousLoadTexture(options: TextureImporterOptions) throws(GateEngineError) -> RawTexture {
         return RawTexture(imageSize: size, imageData: data)
     }
 
-    public func loadTexture(options: TextureImporterOptions) async throws(GateEngineError) -> RawTexture {
+    public mutating func loadTexture(options: TextureImporterOptions) async throws(GateEngineError) -> RawTexture {
         return try synchronousLoadTexture(options: options)
     }
 

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

@@ -7,10 +7,10 @@
 #if canImport(Darwin) && canImport(ModelIO)
 
 import Foundation
-import ModelIO
+@preconcurrency import ModelIO
 
-public final class ApplePlatformModelImporter: GeometryImporter {
-    public required init() {}
+public struct ApplePlatformModelImporter: GeometryImporter {
+    public init() {}
 
     private func positions(from mesh: MDLMesh) throws(GateEngineError) -> [Float] {
         guard let attributeData = mesh.vertexAttributeData(
@@ -138,11 +138,11 @@ public final class ApplePlatformModelImporter: GeometryImporter {
     }
 
     var asset: MDLAsset! = nil
-    public func synchronousPrepareToImportResourceFrom(path: String) throws(GateEngineError) {
+    public mutating func synchronousPrepareToImportResourceFrom(path: String) throws(GateEngineError) {
         guard let path = Platform.current.synchronousLocateResource(from: path) else {throw .failedToLocate(resource: path, nil) }
         self.asset = MDLAsset(url: URL(fileURLWithPath: path))
     }
-    public func prepareToImportResourceFrom(path: String) async throws(GateEngineError) {
+    public mutating func prepareToImportResourceFrom(path: String) async throws(GateEngineError) {
         guard let path = await Platform.current.locateResource(from: path) else {throw .failedToLocate(resource: path, nil) }
         self.asset = await withCheckedContinuation { continuation in
             Task.detached {
@@ -152,7 +152,7 @@ public final class ApplePlatformModelImporter: GeometryImporter {
         }
     }
 
-    public func loadGeometry(options: GeometryImporterOptions) async throws(GateEngineError) -> RawGeometry {
+    public mutating func loadGeometry(options: GeometryImporterOptions) async throws(GateEngineError) -> RawGeometry {
         for meshIndex in 0 ..< asset.count {
             guard let mesh = asset.object(at: meshIndex) as? MDLMesh else {
                 throw GateEngineError.failedToDecode("mesh[\(meshIndex)] is not a MDLMesh instance.")

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

@@ -26,7 +26,7 @@ extension GLTF {
         case mat4 = "MAT4"
     }
 }
-private class GLTF: Decodable {
+private struct GLTF: Decodable, Sendable {
     var baseURL: URL? = nil
 
     let scene: Int
@@ -259,7 +259,7 @@ private class GLTF: Decodable {
     }
 
     lazy var cachedBuffers: [Data?] = Array(repeating: nil, count: buffers.count)
-    func buffer(at index: Int) -> Data? {
+    mutating func buffer(at index: Int) -> Data? {
         // Buffer 0 is pre-cached for glb files
         // So `existing` will always be present for index 0 of a glb file
         if let existing = cachedBuffers[index] {
@@ -282,7 +282,7 @@ private class GLTF: Decodable {
         return buffer
     }
 
-    func values<T: BinaryInteger>(forAccessor accessorIndex: Int) async -> [T]? {
+    mutating func values<T: BinaryInteger>(forAccessor accessorIndex: Int) async -> [T]? {
         let accessor = accessors[accessorIndex]
         let bufferView = bufferViews[accessor.bufferView]
         let count = accessor.count * accessor.primitiveCount
@@ -366,7 +366,7 @@ private class GLTF: Decodable {
         }
     }
 
-    func values<T: BinaryFloatingPoint>(forAccessor accessorIndex: Int) async -> [T]? {
+    mutating func values<T: BinaryFloatingPoint>(forAccessor accessorIndex: Int) async -> [T]? {
         let accessor = accessors[accessorIndex]
         let bufferView = bufferViews[accessor.bufferView]
         let count = accessor.count * accessor.primitiveCount
@@ -450,7 +450,7 @@ private class GLTF: Decodable {
         }
     }
 
-    func animationValues<T: BinaryFloatingPoint>(forAccessor accessorIndex: Int) async -> [T]? {
+    mutating func animationValues<T: BinaryFloatingPoint>(forAccessor accessorIndex: Int) async -> [T]? {
         let accessor = accessors[accessorIndex]
         let bufferView = bufferViews[accessor.bufferView]
         let count = accessor.count * accessor.primitiveCount
@@ -693,32 +693,32 @@ public extension GLTransmissionFormat {
     }
 }
 
-public final class GLTransmissionFormat: ResourceImporter {
+public struct GLTransmissionFormat: ResourceImporter {
     fileprivate var gltf: GLTF! = nil
-    required public init() {}
+    public init() {}
 
-    public func synchronousPrepareToImportResourceFrom(path: String) throws(GateEngineError) {
+    public mutating func synchronousPrepareToImportResourceFrom(path: String) throws(GateEngineError) {
         guard let path = Platform.current.synchronousLocateResource(from: path) else { throw .failedToLocate(resource: path, nil) }
         let baseURL = URL(fileURLWithPath: path).deletingLastPathComponent()
         do {
             let data = try Platform.current.synchronousLoadResource(from: path)
-            self.gltf = try gltf(from: data, baseURL: baseURL)
+            self.gltf = try Self.gltf(from: data, baseURL: baseURL)
         }catch{
             throw GateEngineError(error)
         }
     }
-    public func prepareToImportResourceFrom(path: String) async throws(GateEngineError) {
+    public mutating func prepareToImportResourceFrom(path: String) async throws(GateEngineError) {
         guard let path = await Platform.current.locateResource(from: path) else { throw .failedToLocate(resource: path, nil) }
         let baseURL = URL(fileURLWithPath: path).deletingLastPathComponent()
         do {
             let data = try await Platform.current.loadResource(from: path)
-            self.gltf = try gltf(from: data, baseURL: baseURL)
+            self.gltf = try Self.gltf(from: data, baseURL: baseURL)
         }catch{
             throw GateEngineError(error)
         }
     }
 
-    fileprivate func gltf(from data: Data, baseURL: URL) throws -> GLTF {
+    fileprivate static func gltf(from data: Data, baseURL: URL) throws -> GLTF {
         var jsonData: Data = data
         var bufferData: Data? = nil
         if data[0 ..< 4] == Data("glTF".utf8) {
@@ -728,7 +728,7 @@ public final class GLTransmissionFormat: ResourceImporter {
             jsonData = data.advanced(by: 20)[..<byteCount]
             bufferData = data.advanced(by: (byteCount + 28))
         }
-        let gltf = try JSONDecoder().decode(GLTF.self, from: jsonData)
+        var gltf = try JSONDecoder().decode(GLTF.self, from: jsonData)
         gltf.baseURL = baseURL
         gltf.cachedBuffers[0] = bufferData
         return gltf
@@ -749,7 +749,7 @@ public final class GLTransmissionFormat: ResourceImporter {
 }
 
 extension GLTransmissionFormat: GeometryImporter {
-    public func loadGeometry(options: GeometryImporterOptions) async throws(GateEngineError) -> RawGeometry {
+    public mutating func loadGeometry(options: GeometryImporterOptions) async throws(GateEngineError) -> RawGeometry {
         guard gltf.meshes != nil else {throw GateEngineError.failedToDecode("File contains no geometry.")}
 
         var mesh: GLTF.Mesh? = nil
@@ -921,7 +921,7 @@ extension GLTransmissionFormat: SkinImporter {
         }
         return nil
     }
-    private func inverseBindMatrices(
+    private mutating func inverseBindMatrices(
         from bufferView: GLTF.BufferView,
         expecting count: Int
     ) async -> [Matrix4x4]? {
@@ -945,7 +945,7 @@ extension GLTransmissionFormat: SkinImporter {
         })
     }
 
-    public func loadSkin(options: SkinImporterOptions) async throws(GateEngineError) -> RawSkin {
+    public mutating func loadSkin(options: SkinImporterOptions) async throws(GateEngineError) -> RawSkin {
         guard let skins = gltf.skins, skins.isEmpty == false else {
             throw GateEngineError.failedToDecode("File contains no skins.")
         }
@@ -1055,7 +1055,7 @@ extension GLTransmissionFormat: SkeletonImporter {
         return gltf.scenes[gltf.scene].nodes?.first
     }
 
-    public func loadSkeleton(options: SkeletonImporterOptions) async throws(GateEngineError) -> RawSkeleton {
+    public mutating func loadSkeleton(options: SkeletonImporterOptions) async throws(GateEngineError) -> RawSkeleton {
         guard let rootNode = skeletonNode(named: options.subobjectName) else {
             throw GateEngineError.failedToDecode("Couldn't find skeleton root.")
         }
@@ -1095,7 +1095,7 @@ extension GLTransmissionFormat: SkeletalAnimationImporter {
         return gltf.animations?.first
     }
 
-    public func loadSkeletalAnimation(options: SkeletalAnimationImporterOptions) async throws(GateEngineError) -> RawSkeletalAnimation {
+    public mutating func loadSkeletalAnimation(options: SkeletalAnimationImporterOptions) async throws(GateEngineError) -> RawSkeletalAnimation {
         guard let animation = animation(named: options.subobjectName) else {
             throw GateEngineError.failedToDecode(
                 "Couldn't find animation: \"\(options.subobjectName!)\".\nAvailable Animations: \((gltf.animations ?? []).map({$0.name}))"
@@ -1238,7 +1238,7 @@ extension GLTransmissionFormat: SkeletalAnimationImporter {
 }
 
 extension GLTransmissionFormat: ObjectAnimation3DImporter {
-    public func loadObjectAnimation(options: ObjectAnimation3DImporterOptions) async throws(GateEngineError) -> RawObjectAnimation3D {
+    public mutating func loadObjectAnimation(options: ObjectAnimation3DImporterOptions) async throws(GateEngineError) -> RawObjectAnimation3D {
         guard let animation = animation(named: options.subobjectName) else {
             throw GateEngineError.failedToDecode(
                 "Couldn't find animation: \"\(options.subobjectName!)\".\nAvailable Animations: \((gltf.animations ?? []).map({$0.name}))"
@@ -1339,7 +1339,7 @@ extension GLTransmissionFormat: ObjectAnimation3DImporter {
 
 extension GLTransmissionFormat: TextureImporter {
     // TODO: Supports only PNG. Add other formats (JPEG, WebP, ...)
-    public func synchronousLoadTexture(options: TextureImporterOptions) throws(GateEngineError) -> RawTexture {
+    public mutating func synchronousLoadTexture(options: TextureImporterOptions) throws(GateEngineError) -> RawTexture {
         let imageData: Data
         func loadImageData(image: GLTF.Image) throws(GateEngineError) -> Data {
             if let uri = image.uri {
@@ -1375,13 +1375,13 @@ extension GLTransmissionFormat: TextureImporter {
         return try PNGDecoder().decode(imageData)
     }
 
-    public func loadTexture(options: TextureImporterOptions) async throws(GateEngineError) -> RawTexture {
+    public mutating func loadTexture(options: TextureImporterOptions) async throws(GateEngineError) -> RawTexture {
         return try synchronousLoadTexture(options: options)
     }
 }
 
 extension GLTransmissionFormat: CollisionMeshImporter {
-    public func loadCollisionMesh(options: CollisionMeshImporterOptions) async throws(GateEngineError) -> RawCollisionMesh {
+    public mutating func loadCollisionMesh(options: CollisionMeshImporterOptions) async throws(GateEngineError) -> RawCollisionMesh {
         guard gltf.meshes != nil else {throw GateEngineError.failedToDecode("File contains no geometry.")}
 
         var mesh: GLTF.Mesh? = nil