Peck away at Swift 6 requirements

Author: STREGA

Dependencies/OpenGL/OpenGL_GateEngine/OpenGL_GateEngine.swift

@@ -652,7 +652,7 @@ public enum OpenGL {
             self.possibleReasons = possibleReasons
         }
 
-        public enum Kind: Int {
+        public enum Kind: Int, Sendable {
             case none
             case invalidEnum
             case invalidValue

Package.swift

@@ -1,4 +1,4 @@
-// swift-tools-version:5.9
+// swift-tools-version:6.0
 // The swift-tools-version declares the minimum version of Swift required to build this package.
 
 import PackageDescription
@@ -61,7 +61,7 @@ let package = Package(
                         ])
                         dependencies.append(
                             .target(name: "Vorbis",
-                                    condition: .when(platforms: .any(except: .wasi)))
+                                    condition: .when(platforms: .any(except: .macOS, .wasi)))
                         )
 
                         #if os(macOS) || os(Linux)
@@ -417,7 +417,7 @@ let package = Package(
 
         return targets
     }(),
-    swiftLanguageVersions: [.v5],
+    swiftLanguageModes: [.v5],
     cLanguageStandard: .gnu11,
     cxxLanguageStandard: .gnucxx14
 )

Sources/GateEngine/ECS/Base/ECSContext.swift

@@ -108,6 +108,12 @@
 }
 
 @MainActor public final class ECSContext {
+    /**
+     An immutable copy of the View this ECSContext will be drawn into. 
+     Use this copy for size and color information from witin your simulation
+     */
+    public internal(set) var gameView: GameViewSnapshot = .empty
+    
     private var previousFrameWasDropped: Bool = false
     private var platformSystemsNeedSorting = true
     private var _platformSystems: [PlatformSystem] = []
@@ -378,8 +384,7 @@ extension ECSContext {
 }
 
 //MARK: System Management
-extension ECSContext {
-    @usableFromInline
+public extension ECSContext {
     func system(ofType systemType: System.Type) -> System {
         for system in _systems {
             if type(of: system) == systemType {
@@ -388,7 +393,6 @@ extension ECSContext {
         }
         return insertSystem(systemType)
     }
-    @usableFromInline
     func hasSystem(ofType systemType: System.Type) -> Bool {
         for system in _systems {
             if type(of: system) == systemType {
@@ -397,7 +401,6 @@ extension ECSContext {
         }
         return false
     }
-    @usableFromInline
     func system(ofType systemType: RenderingSystem.Type) -> RenderingSystem {
         for system in _renderingSystems {
             if type(of: system) == systemType {
@@ -406,15 +409,14 @@ extension ECSContext {
         }
         return insertSystem(systemType)
     }
-    func system(ofType systemType: PlatformSystem.Type) -> PlatformSystem {
+    internal func system(ofType systemType: PlatformSystem.Type) -> PlatformSystem {
         for system in _platformSystems {
             if type(of: system) == systemType {
                 return system
             }
         }
         return insertSystem(systemType)
     }
-    @usableFromInline
     func insertSystem(_ newSystem: System) {
         let systemType = type(of: newSystem)
         guard _systems.contains(where: { type(of: $0) == systemType }) == false else { return }
@@ -423,7 +425,6 @@ extension ECSContext {
         _systems = systems
         systemsNeedSorting = true
     }
-    @usableFromInline
     func insertSystem(_ newSystem: RenderingSystem) {
         let systemType = type(of: newSystem)
         guard _renderingSystems.contains(where: { type(of: $0) == systemType }) == false else {
@@ -434,7 +435,7 @@ extension ECSContext {
         _renderingSystems = renderingSystems
         renderingSystemsNeedSorting = true
     }
-    func insertSystem(_ newSystem: PlatformSystem) {
+    internal func insertSystem(_ newSystem: PlatformSystem) {
         let systemType = type(of: newSystem)
         guard _platformSystems.contains(where: { type(of: $0) == systemType }) == false else {
             return
@@ -444,42 +445,40 @@ extension ECSContext {
         _platformSystems = platformSystems
         platformSystemsNeedSorting = true
     }
-    @usableFromInline @discardableResult
+    @discardableResult
     func insertSystem(_ system: System.Type) -> System {
         let system = system.init()
         self.insertSystem(system)
         return system
     }
-    @usableFromInline @discardableResult
+    @discardableResult
     func insertSystem(_ system: RenderingSystem.Type) -> RenderingSystem {
         let system = system.init()
         self.insertSystem(system)
         return system
     }
     @inline(__always) @discardableResult
-    func insertSystem(_ system: PlatformSystem.Type) -> PlatformSystem {
+    internal func insertSystem(_ system: PlatformSystem.Type) -> PlatformSystem {
         let system = system.init()
         self.insertSystem(system)
         return system
     }
-    @usableFromInline
     func removeSystem(_ system: System) {
         if let index = self._systems.firstIndex(where: { $0 === system }) {
             self._systems.remove(at: index).teardown(context: self)
         }
     }
-    @usableFromInline
     func removeSystem(_ system: RenderingSystem) {
         if let index = self._renderingSystems.firstIndex(where: { $0 === system }) {
             self._renderingSystems.remove(at: index).teardown(context: self)
         }
     }
-    func removeSystem(_ system: PlatformSystem) {
+    internal func removeSystem(_ system: PlatformSystem) {
         if let index = self._platformSystems.firstIndex(where: { $0 === system }) {
             self._platformSystems.remove(at: index).teardown(context: self)
         }
     }
-    @usableFromInline @discardableResult
+    @discardableResult
     func removeSystem<T: System>(_ system: T.Type) -> System? {
         if let index = self._systems.firstIndex(where: { type(of: $0) == system }) {
             let system = self._systems.remove(at: index)
@@ -488,7 +487,7 @@ extension ECSContext {
         }
         return nil
     }
-    @usableFromInline @discardableResult
+    @discardableResult
     func removeSystem<T: RenderingSystem>(_ system: T.Type) -> RenderingSystem? {
         if let index = self._renderingSystems.firstIndex(where: { type(of: $0) == system }) {
             let system = self._renderingSystems.remove(at: index)
@@ -498,7 +497,7 @@ extension ECSContext {
         return nil
     }
     @discardableResult
-    func removeSystem<T: PlatformSystem>(_ system: T.Type) -> PlatformSystem? {
+    internal func removeSystem<T: PlatformSystem>(_ system: T.Type) -> PlatformSystem? {
         if let index = self._platformSystems.firstIndex(where: { type(of: $0) == system }) {
             let system = self._platformSystems.remove(at: index)
             system.teardown(context: self)

Sources/GateEngine/ECS/Base/System.swift

@@ -122,7 +122,7 @@ extension System {
             return state == .running
         }
 
-        @MainActor public func run(_ block: @escaping () async -> Void) {
+        public func run(_ block: @escaping () async -> Void) {
             assert(self.isRunning == false, "A Task cannot be run when it's running.")
             self.state = .running
             Task.detached(priority: .low) {
@@ -137,10 +137,10 @@ extension System {
 }
 
 extension System: Hashable {
-    public static func == (lhs: System, rhs: System) -> Bool {
+    public nonisolated static func == (lhs: System, rhs: System) -> Bool {
         return type(of: lhs) == type(of: rhs)
     }
-    public func hash(into hasher: inout Hasher) {
+    public nonisolated func hash(into hasher: inout Hasher) {
         hasher.combine("\(type(of: self))")
     }
 }

Sources/GateEngine/Game.swift

@@ -5,16 +5,22 @@
  * http://stregasgate.com
  */
 
+extension Game {
+    static public fileprivate(set) var identifier: String = ""
+}
+
 public final class Game {
     public let platform: CurrentPlatform
     public let delegate: any GameDelegate
 
     @MainActor public private(set) var state: State! = nil
     @MainActor internal private(set) var internalState: State! = nil
 
-    @MainActor
-    lazy private(set) var identifier: String = delegate.resolvedGameIdentifier()
-
+    @inlinable @inline(__always)
+    nonisolated var identifier: String {
+        return Self.identifier
+    }
+    
     nonisolated public let isHeadless: Bool
     @MainActor internal init(delegate: any GameDelegate, currentPlatform: CurrentPlatform) {
         self.platform = currentPlatform
@@ -29,9 +35,10 @@ public final class Game {
             self.renderingAPI = renderer._backend.renderingAPI
             self.isHeadless = false
         }
+        Self.identifier = delegate.resolvedGameIdentifier()
     }
 
-    public struct Attributes: OptionSet {
+    public struct Attributes: OptionSet, Sendable {
         public let rawValue: UInt
         public init(rawValue: UInt) {
             self.rawValue = rawValue

Sources/GateEngine/System/HID/Keyboard/Keyboard.swift

@@ -7,7 +7,7 @@
 
 import GameMath
 
-@MainActor public final class Keyboard {
+public final class Keyboard {
     internal var modifiers: KeyboardModifierMask = []
     internal var buttons: [KeyboardKey: ButtonState] = [:]
 
@@ -90,7 +90,7 @@ import GameMath
 }
 
 extension Keyboard {
-    @MainActor public final class ButtonState: CustomStringConvertible {
+    public final class ButtonState: CustomStringConvertible {
         internal unowned let keyboard: Keyboard
         let key: KeyboardKey
         // true if the key is a representation instead of a physical key

Sources/GateEngine/System/HID/Keyboard/KeyboardKey.swift

@@ -15,7 +15,7 @@
 /// input.keyboard.button(.azerty("z")).isPressed
 /// ```
 /// The underlying key is still the qwerty representation.
-public enum KeyboardKey: Hashable {
+public enum KeyboardKey: Hashable, Sendable {
     /// The Esc key
     case escape
 
@@ -51,7 +51,7 @@ public enum KeyboardKey: Hashable {
      */
     case function(_ number: Int)
 
-    public enum KeyOrigin {
+    public enum KeyOrigin: Sendable {
         // Any part of the keyboard
         case anyVariation
         // The main keyboard area
@@ -96,7 +96,7 @@ public enum KeyboardKey: Hashable {
      */
     case unhandledPlatformKeyCode(_ int: Int?, _ string: Character?)
 
-    public enum Alignment {
+    public enum Alignment: Sendable {
         // Any key
         case anyVariation
         // On the left of the space bar

Sources/GateEngine/System/HID/Keyboard/KeyboardModifierMask.swift

@@ -5,7 +5,7 @@
  * http://stregasgate.com
  */
 
-public struct KeyboardModifierMask: OptionSet {
+public struct KeyboardModifierMask: OptionSet, Sendable {
     public typealias RawValue = UInt32
     public let rawValue: RawValue
 

Sources/GateEngine/System/Platforms/Apple/AppleFileSystem.swift

@@ -8,7 +8,6 @@
 import Foundation
 
 public struct AppleFileSystem: FileSystem {
-    @MainActor
     public func pathForSearchPath(_ searchPath: FileSystemSearchPath,
                                   in domain: FileSystemSearchPathDomain = .currentUser) throws -> String {
         let foundationSearchPath: FileManager.SearchPathDirectory
@@ -19,7 +18,7 @@ public struct AppleFileSystem: FileSystem {
             foundationSearchPath = .cachesDirectory
         case .temporary:
             let tmpDir = FileManager.default.temporaryDirectory
-            return tmpDir.appendingPathComponent(Game.shared.identifier).path
+            return tmpDir.appendingPathComponent(Game.identifier).path
         }
         let foundationDomainMask: FileManager.SearchPathDomainMask
         switch domain {
@@ -32,7 +31,7 @@ public struct AppleFileSystem: FileSystem {
                                                    in: foundationDomainMask,
                                                    appropriateFor: nil,
                                                    create: false)
-        url = url.appendingPathComponent(Game.shared.identifier)
+        url = url.appendingPathComponent(Game.identifier)
         return url.path
     }
 }

Sources/GateEngine/UI/GameViewController.swift

@@ -7,6 +7,25 @@
 
 import Foundation
 
+public struct GameViewSnapshot: Sendable {
+    let frame: Rect
+    let bounds: Rect
+    let backgroundColor: Color?
+    
+    static var empty: GameViewSnapshot {
+        return .init(frame: .zero, bounds: .zero, backgroundColor: nil)
+    }
+}
+internal extension GameView {
+    func snapshot() -> GameViewSnapshot {
+        return GameViewSnapshot(
+            frame: self.frame, 
+            bounds: self.bounds, 
+            backgroundColor: self.backgroundColor
+        )
+    }
+}
+
 public final class GameView: View {
     @usableFromInline
     var _drawables: [any Drawable] = []
@@ -154,6 +173,7 @@ open class GameViewController: ViewController {
 
     final public override func loadView() {
         self.view = GameView()
+        self.setup(context: self.context)    
     }
 
     internal var shouldSkipRendering: Bool = false
@@ -163,6 +183,10 @@ open class GameViewController: ViewController {
         self.shouldSkipRendering = (await context.shouldRenderAfterUpdate(withTimePassed: deltaTime) == false)
     }
 
+    open func setup(context: ECSContext) {
+        
+    }
+    
     open func render(context: ECSContext, into view: GameView, withTimePassed deltaTime: Float) {
 
     }