Change base type to struct

Author: STREGA

Sources/GateEngine/System/Rendering/Drawables/Canvas.swift

@@ -416,15 +416,13 @@
      This function requires you to first call `setCamera(_:size:)`.
      - returns: A 2D position representing the location of a 3D object.
      */
-    public func convertFrom3DSpace(_ position: Position3) -> Position2 {
-        guard let camera = camera else {
-            preconditionFailure("Must set camera during `Canvas.init` to use \(#function).")
-        }
+    public mutating func convertFrom3DSpace(_ position: Position3) -> Position2 {
+        precondition(camera != nil, "Must set camera during `Canvas.init` to use \(#function).")
         guard let size = size else {
             preconditionFailure("Must set size during `Canvas.init` to use \(#function).")
         }
 
-        let matricies = camera.matricies(withViewportSize: size)
+        let matricies = camera!.matricies(withViewportSize: size)
         var position = position * matricies.viewProjection()
         position.x /= position.z
         position.y /= position.z
@@ -438,23 +436,21 @@
         return Position2(position.x, position.y)
     }
 
-    public func convertTo3DSpace(_ position: Position2) -> Ray3D {
-        guard let camera = camera else {
-            preconditionFailure("Must set camera during `Canvas.init` to use \(#function).")
-        }
+    public mutating func convertTo3DSpace(_ position: Position2) -> Ray3D {
+        precondition(camera != nil, "Must set camera during `Canvas.init` to use \(#function).")
         guard let size = size else {
             preconditionFailure("Must set size during `Canvas.init` to use \(#function).")
         }
 
-        switch camera.fieldOfView {
+        switch camera!.fieldOfView {
         case .perspective(let fov):
             let halfSize = size / 2
             let aspectRatio = size.aspectRatio
 
-            let inverseView = camera.matricies(withViewportSize: size).view.inverse
+            let inverseView = camera!.matricies(withViewportSize: size).view.inverse
             let halfFOV = tan(fov.rawValueAsRadians * 0.5)
-            let near = camera.clippingPlane.near
-            let far = camera.clippingPlane.far
+            let near = camera!.clippingPlane.near
+            let far = camera!.clippingPlane.far
 
             let dx = halfFOV * (position.x / halfSize.width - 1.0) * aspectRatio
             let dy = halfFOV * (1.0 - position.y / halfSize.height)
@@ -476,10 +472,10 @@
             let x = position.x
             let y = position.y
 
-            let inverseView = camera.matricies(withViewportSize: size).view.inverse
+            let inverseView = camera!.matricies(withViewportSize: size).view.inverse
             let start = Position3(x, y, -1) * inverseView
 
-            return Ray3D(from: start, toward: camera.transform.rotation.forward)
+            return Ray3D(from: start, toward: camera!.transform.rotation.forward)
         }
     }
 

Sources/GateEngine/System/Rendering/Drawables/Drawable.swift

@@ -10,7 +10,7 @@ import Foundation
 @MainActor
 public protocol Drawable {
     var drawCommands: ContiguousArray<DrawCommand> { get }
-    func matrices(withSize size: Size2) -> Matrices
+    mutating func matrices(withSize size: Size2) -> Matrices
 }
 
 internal extension Drawable {

Sources/GateEngine/System/Rendering/Drawables/Scene.swift

@@ -362,7 +362,7 @@ import Shaders
     }
 
     @inlinable
-    public func matrices(withSize size: GameMath.Size2) -> Matrices {
+    public mutating func matrices(withSize size: GameMath.Size2) -> Matrices {
         self.camera.matricies(withViewportSize: size)
     }
 }

Sources/GateEngine/System/Rendering/RenderTarget.swift

@@ -230,8 +230,8 @@ extension _RenderTargetProtocol {
                 switch drawable {
                 case let uiCanvas as UICanvas:
                     drawUICanvas(uiCanvas, clipRect: nil, stencil: nil)
-                case let scene as Scene:
-                    drawScene(scene, viewportSize: self.size.vector2, clipRect: nil, stencil: nil)
+                case var scene as Scene:
+                    drawScene(&scene, viewportSize: self.size.vector2, clipRect: nil, stencil: nil)
                 case let canvas as Canvas:
                     drawCanvas(canvas, clipRect: nil, stencil: nil)
                 case let container as RenderTargetFillContainer:
@@ -303,7 +303,7 @@ extension _RenderTargetProtocol {
         renderTargetBackend.didEndContent()
     }
 
-    private func drawScene(_ scene: Scene, viewportSize size: Size2, clipRect: Rect?, stencil: UInt8?) {
+    private func drawScene(_ scene: inout Scene, viewportSize size: Size2, clipRect: Rect?, stencil: UInt8?) {
         let matrices = scene.camera.matricies(withViewportSize: size)
 
         var scissorRect: Rect? = nil

Sources/GateEngine/Types/Camera.swift

@@ -7,7 +7,7 @@
 
 import GameMath
 
-public class Camera {
+public struct Camera {
     public var transform: Transform3 {
         didSet {
             needsUpdateTransform = true
@@ -36,7 +36,7 @@ public class Camera {
         self.clippingPlane = clippingPlane
     }
 
-    public convenience init?(_ entity: Entity?) {
+    public init?(_ entity: Entity?) {
         guard let entity = entity else { return nil }
         guard let cameraComponent = entity.component(ofType: CameraComponent.self) else {
             return nil
@@ -59,7 +59,7 @@ public class Camera {
     private static let viewScale = Matrix4x4(scale: Size3(width: 1.0, height: 1.0, depth: -1.0))
     private var matrices: Matrices = Matrices(projection: .identity)
 
-    public func matricies(withViewportSize size: Size2) -> Matrices {
+    public mutating func matricies(withViewportSize size: Size2) -> Matrices {
         guard self.needsUpdateTransform || self.needsUpdateProjection else { return matrices }
 
         if needsUpdateProjection || self.size != size {

Sources/GateEngine/UI/GameViewController.swift

@@ -189,7 +189,7 @@ extension GameView {
 
      - returns: A 2D position representing the location of a 3D object in this view's bounds.
      */
-    public func convert(_ position: Position3, from camera: Camera) -> Position2 {
+    public func convert(_ position: Position3, from camera: inout Camera) -> Position2 {
         let size = self.bounds.size
         let matricies = camera.matricies(withViewportSize: size * self.interfaceScale)
         var position = position * matricies.viewProjection()
@@ -210,7 +210,7 @@ extension GameView {
 
      - returns: A Ray3D representing the location of a 2D point located on the view. The ray's direction is toward the 3D space accounting for perspective distortion.
      */
-    public func convert(_ position: Position2, to camera: Camera) -> Ray3D {
+    public func convert(_ position: Position2, to camera: inout Camera) -> Ray3D {
         switch camera.fieldOfView {
         case .perspective(let fieldOfView):
             let size = self.bounds.size