Update rendering

Author: STREGA

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

@@ -424,7 +424,7 @@
             preconditionFailure("Must set size during `Canvas.init` to use \(#function).")
         }
 
-        let matricies = camera.matricies(withAspectRatio: size.aspectRatio)
+        let matricies = camera.matricies(withViewportSize: size)
         var position = position * matricies.viewProjection()
         position.x /= position.z
         position.y /= position.z
@@ -446,28 +446,33 @@
             preconditionFailure("Must set size during `Canvas.init` to use \(#function).")
         }
 
-        let halfSize = size / 2
-        let aspectRatio = size.aspectRatio
+        switch camera.fieldOfView {
+        case .perspective(let fov):
+            let halfSize = size / 2
+            let aspectRatio = size.aspectRatio
 
-        let inverseView = camera.matricies(withAspectRatio: aspectRatio).view.inverse
-        let halfFOV = tan(camera.fieldOfViewAsRadians.rawValue * 0.5)
-        let near = camera.clippingPlane.near
-        let far = camera.clippingPlane.far
+            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 dx = halfFOV * (position.x / halfSize.width - 1.0) * aspectRatio
-        let dy = halfFOV * (1.0 - position.y / halfSize.height)
+            let dx = halfFOV * (position.x / halfSize.width - 1.0) * aspectRatio
+            let dy = halfFOV * (1.0 - position.y / halfSize.height)
 
-        let p1 = Position3(dx * near, dy * near, near) * inverseView
-        let p2 = Position3(dx * far, dy * far, far) * inverseView
+            let p1 = Position3(dx * near, dy * near, near) * inverseView
+            let p2 = Position3(dx * far, dy * far, far) * inverseView
 
-        return Ray3D(from: p1, toward: p2)
+            return Ray3D(from: p1, toward: p2)
+        case .orthographic(_):
+            fatalError("Not implemented")
+        }
     }
 
     /**
      Create a canvas.
 
      - parameter camera: An optional Scene camera, which is required for 3D space conversions.
-     - parameter size: The exact size of the canvas, this should be the saizxe of your renderTarget.
+     - parameter size: The exact size of the canvas, this should be the size of your renderTarget.
      - parameter interfaceScale: The userInterface scale. Sometimes called HiDPI. This setting changes how some drawable items are laid out. Use `1` for traditional gaming style drawing.
      - parameter estimatedCommandCount: A performance hint of how many commands will be added.
      */

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

@@ -5,6 +5,8 @@
  * http://stregasgate.com
  */
 
+import Shaders
+
 /// A Scene is a drawing space with 3 dimensions and a perspective camera.
 @MainActor public struct Scene: Drawable {
     @usableFromInline internal var camera: Camera
@@ -65,9 +67,10 @@
         _ geometry: Geometry,
         withMaterial material: Material,
         at transform: Transform3,
+        blendMode: DrawCommand.Flags.BlendMode = .normal,
         flags: SceneElementFlags = .default
     ) {
-        self.insert(geometry, withMaterial: material, at: [transform], flags: flags)
+        self.insert(geometry, withMaterial: material, at: [transform], blendMode: blendMode, flags: flags)
     }
 
     /** Adds geometry to the scene for rendering.
@@ -89,8 +92,8 @@
             resource: .geometry(geometry),
             transforms: transforms,
             material: material,
-            vsh: .standard,
-            fsh: (material.channels.first?.texture != nil) ? .textureSample : .materialColor,
+            vsh: (material.channels.first?.texture != nil) ? .standard : material.channels.first?.color == .vertexColors ? .vertexColors : .standard,
+            fsh: (material.channels.first?.texture != nil) ? .textureSample : material.channels.first?.color == .vertexColors ? .vertexColor : .materialColor,
             flags: flags.drawCommandFlags(withPrimitive: .triangle, blendMode: blendMode)
         )
         self.insert(command)
@@ -203,53 +206,15 @@
 
     /** Adds lines to the scene for rendering.
     - parameter lines: The lines to draw.
+    - parameter color: The color information used to draw the geometry. nil will use vertex color data.
     - parameter transform: Describes how the lines instance should be positioned and scaled relative to the scene.
     - parameter flags: Options to customize how drawing is handled.
     - Explicitly instances the geometry as it's own batch. Use this for known instancing like particles.
     */
     @_transparent
     public mutating func insert(
         _ lines: Lines,
-        at transform: Transform3,
-        flags: SceneElementFlags = .default
-    ) {
-        self.insert(lines, at: [transform], flags: flags)
-    }
-    
-    /** Adds lines to the scene for rendering.
-    - parameter lines: The lines to draw.
-    - parameter transforms: Describes how each lines instance should be positioned and scaled relative to the scene.
-    - parameter flags: Options to customize how drawing is handled.
-    - Explicitly instances the geometry as it's own batch. Use this for known instancing like particles.
-    */
-    @inlinable @inline(__always)
-    public mutating func insert(
-        _ lines: Lines,
-        at transforms: [Transform3],
-        flags: SceneElementFlags = .default
-    ) {
-        let command = DrawCommand(
-            resource: .lines(lines),
-            transforms: transforms,
-            material: Material(color: .vertexColors),
-            vsh: .vertexColors,
-            fsh: .vertexColor,
-            flags: flags.drawCommandFlags(withPrimitive: .line)
-        )
-        self.insert(command)
-    }
-    
-    /** Adds lines to the scene for rendering.
-    - parameter lines: The lines to draw.
-    - parameter color: The color information used to draw the geometry.
-    - parameter transform: Describes how the lines instance should be positioned and scaled relative to the scene.
-    - parameter flags: Options to customize how drawing is handled.
-    - Explicitly instances the geometry as it's own batch. Use this for known instancing like particles.
-    */
-    @_transparent
-    public mutating func insert(
-        _ lines: Lines,
-        withColor color: Color,
+        withColor color: Color? = nil,
         at transform: Transform3,
         flags: SceneElementFlags = .default
     ) {
@@ -258,23 +223,24 @@
 
     /** Adds lines to the scene for rendering.
     - parameter lines: The lines to draw.
-    - parameter color: The color information used to draw the geometry.
+    - parameter color: The color information used to draw the geometry. nil will use vertex color data.
     - parameter transforms: Describes how each lines instance should be positioned and scaled relative to the scene.
     - parameter flags: Options to customize how drawing is handled.
     - Explicitly instances the geometry as it's own batch. Use this for known instancing like particles.
     */
     @inlinable @inline(__always)
     public mutating func insert(
         _ lines: Lines,
-        withColor color: Color,
+        withColor color: Color? = nil,
         at transforms: [Transform3],
         flags: SceneElementFlags = .default
     ) {
+        let useVertexColors: Bool = (color == nil)
         let command = DrawCommand(
             resource: .lines(lines),
             transforms: transforms,
-            material: Material(color: color),
-            vsh: .standard,
+            material: Material(color: useVertexColors ? .black : color!),
+            vsh: useVertexColors ? .vertexColors : .materialColor,
             fsh: .materialColor,
             flags: flags.drawCommandFlags(withPrimitive: .line)
         )
@@ -399,7 +365,7 @@
 
     @_transparent
     public func matrices(withSize size: GameMath.Size2) -> Matrices {
-        self.camera.matricies(withAspectRatio: size.aspectRatio)
+        self.camera.matricies(withViewportSize: size)
     }
 }
 

Sources/GateEngine/System/Rendering/SystemShaders.swift

@@ -34,6 +34,15 @@ extension VertexShader {
         return vsh
     }()
 
+    public static let materialColor: VertexShader = {
+        let vsh = VertexShader()
+        let mvp = vsh.modelViewProjectionMatrix
+        let vertexPosition = vsh.input.geometry(0).position
+        vsh.output.position = mvp * Vec4(vertexPosition, 1)
+        vsh.output["color"] = vsh.channel(0).color
+        return vsh
+    }()
+    
     public static let skinned: VertexShader = {
         let vsh = VertexShader()
         let bones = vsh.uniforms.value(named: "bones", as: Mat4Array.self, arrayCapacity: 64)