Remove context arg requirement from System init

Author: STREGA

Sources/GateEngine/ECS/Base/ECSContext.swift

@@ -264,13 +264,13 @@ extension ECSContext {
 //        }
         for system in self.systems {
             self.performance?.beginStatForSystem(system)
-            await system.willUpdate(input: input, withTimePassed: deltaTime)
+            await system.willUpdate(input: input, withTimePassed: deltaTime, context: self)
             self.performance?.endCurrentStatistic()
         }
         for system in self.platformSystems {
 //            guard type(of: system).phase == .postDeferred else { continue }
             self.performance?.beginStatForSystem(system)
-            await system.willUpdate(input: input, withTimePassed: deltaTime)
+            await system.willUpdate(input: input, withTimePassed: deltaTime, context: self)
             self.performance?.endCurrentStatistic()
         }
 
@@ -314,7 +314,7 @@ extension ECSContext {
 
         for system in self.renderingSystems {
             self.performance?.beginStatForSystem(system)
-            system.willRender(into: view, withTimePassed: deltaTime)
+            system.willRender(into: view, withTimePassed: deltaTime, context: self)
             self.performance?.endCurrentStatistic()
         }
 
@@ -443,38 +443,38 @@ public extension ECSContext {
     }
     @discardableResult
     func insertSystem<T: System>(_ system: T.Type) -> T {
-        let system = system.init(context: self)
+        let system = system.init()
         self.insertSystem(system)
         return system
     }
     @discardableResult
     func insertSystem<T: RenderingSystem>(_ system: T.Type) -> T {
-        let system = system.init(context: self)
+        let system = system.init()
         self.insertSystem(system)
         return system
     }
     @discardableResult
     internal func insertSystem<T: PlatformSystem>(_ system: T.Type) -> T {
-        let system = system.init(context: self)
+        let system = system.init()
         self.insertSystem(system)
         return system
     }
     func removeSystem(_ system: System) {
         if let index = self._systems.firstIndex(where: { $0 === system }) {
             let system = self._systems.remove(at: index)
-            system.teardown(context: self)
+            system._teardown(context: self)
         }
     }
     func removeSystem(_ system: RenderingSystem) {
         if let index = self._renderingSystems.firstIndex(where: { $0 === system }) {
             let system = self._renderingSystems.remove(at: index)
-            system.teardown(context: self)
+            system._teardown(context: self)
         }
     }
     internal func removeSystem(_ system: PlatformSystem) {
         if let index = self._platformSystems.firstIndex(where: { $0 === system }) {
             let system = self._platformSystems.remove(at: index)
-            system.teardown(context: self)
+            system._teardown(context: self)
         }
     }
     @discardableResult

Sources/GateEngine/ECS/Base/PlatformSystem.swift

@@ -12,21 +12,30 @@ import GameMath
     private var didSetup = false
     private(set) lazy var backgroundTask = BackgroundTask(system: self)
 
-    required init(context: ECSContext) {
-        self.context = context
+    @usableFromInline
+    internal weak var _context: ECSContext! = nil
+    @inlinable
+    public var context: ECSContext {
+        return _context.unsafelyUnwrapped
     }
 
-    public let context: ECSContext
+    public required init() { }
 
-    internal final func willUpdate(input: HID, withTimePassed deltaTime: Float) async {
+    internal final func willUpdate(input: HID, withTimePassed deltaTime: Float, context: ECSContext) async {
         if didSetup == false {
+            self._context = context
             didSetup = true
             await setup(context: context, input: input)
         }
         if await shouldUpdate(context: context, input: input, withTimePassed: deltaTime) {
             await update(context: context, input: input, withTimePassed: deltaTime)
         }
     }
+    internal func _teardown(context: ECSContext) {
+        self.teardown(context: context)
+        self._context = nil
+        self.didSetup = false
+    }
 
     /**
      Called once when the entity is removed from the game.

Sources/GateEngine/ECS/Base/RenderingSystem.swift

@@ -14,21 +14,30 @@
         return Game.shared
     }
 
-    public let context: ECSContext
-
-    required public init(context: ECSContext) {
-        self.context = context
+    @usableFromInline
+    internal weak var _context: ECSContext! = nil
+    @inlinable
+    public var context: ECSContext {
+        return _context.unsafelyUnwrapped
     }
+    
+    public required init() { }
 
-    internal final func willRender(into view: GameView, withTimePassed deltaTime: Float) {
+    internal final func willRender(into view: GameView, withTimePassed deltaTime: Float, context: ECSContext) {
         if didSetup == false {
+            self._context = context
             didSetup = true
             setup(context: context)
         }
         if shouldRender(context: context, into: view, withTimePassed: deltaTime) {
             render(context: context, into: view, withTimePassed: deltaTime)
         }
     }
+    internal func _teardown(context: ECSContext) {
+        self.teardown(context: context)
+        didSetup = false
+        self._context = nil
+    }
 
     /**
      Called once when this ``RenderingSystem`` is inserted into the game instance.

Sources/GateEngine/ECS/Base/System.swift

@@ -11,21 +11,30 @@ import GameMath
     private var didSetup = false
     public private(set) lazy var backgroundTask = BackgroundTask(system: self)
 
-    required public init(context: ECSContext) {
-        self.context = context
+    @usableFromInline
+    internal weak var _context: ECSContext! = nil
+    @inlinable
+    public var context: ECSContext {
+        return _context.unsafelyUnwrapped
     }
-
-    public let context: ECSContext
-
-    internal final func willUpdate(input: HID, withTimePassed deltaTime: Float) async {
+    
+    public required init() { }
+    
+    internal final func willUpdate(input: HID, withTimePassed deltaTime: Float, context: ECSContext) async {
         if didSetup == false {
+            _context = context
             didSetup = true
             await setup(for: context, input: input)
         }
         if await shouldUpdate(context: context, input: input, withTimePassed: deltaTime) {
             await update(context: context, input: input, withTimePassed: deltaTime)
         }
     }
+    internal func _teardown(context: ECSContext) {
+        self.teardown(context: context)
+        self._context = nil
+        self.didSetup = false
+    }
 
     /**
      Called once when the entity is removed from the game.

Sources/GateEngine/ECS/StandardRenderingSystem.swift

@@ -11,8 +11,8 @@ public final class StandardRenderingSystem: RenderingSystem {
     internal var verticalResolution: Float? = nil
     internal lazy var renderTarget: RenderTarget = RenderTarget()
 
-    public convenience init(verticalResolution: UInt, context: ECSContext) {
-        self.init(context: context)
+    public convenience init(verticalResolution: UInt) {
+        self.init()
         self.verticalResolution = Float(verticalResolution)
     }