Make float4x4.identity a class var

Author: a-tokar

CHANGELOG.md

@@ -6,11 +6,15 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/).
 
 ## Unreleased
 
+## 1.0.3
+
+### Changed
+* `float4x4.identity()` -> `float4x4.identity`
+
 ## 1.0.2
 
 ### Changed
 * Enable public entities unintentionally left private
-* 
 
 ## 1.0.1
 

README.md

@@ -9,7 +9,7 @@ You can consume it as a Swift Package:
 ## Usage
 Import into your Swift source code:
 ```swift
-import StructurKit
+import StructureKit
 ```
 
 ### Integration with Structure SDK

Sources/StructureKit/Metal/STKARKitOverlayRenderer.swift

@@ -32,7 +32,7 @@ import StructureKitCTypes
 
 // Draws an ARKit face geometry as a white transparent mesh
 public class STKARKitOverlayRenderer {
-  var arkitToWorld = simd_float4x4()
+  var arkitToWorld = simd_float4x4.identity
   private var depthStencilARKitState: MTLDepthStencilState
   private var renderARKitState: MTLRenderPipelineState
 

Sources/StructureKit/Metal/STKLineRenderer.swift

@@ -37,8 +37,8 @@ public class STKLineRenderer {
   private var indexCubeBuffer: MTLBuffer!
   private var indexTriadBuffer: MTLBuffer!
   private var mtkView: MTKView
-  var colorCameraGLProjectionMatrix = float4x4()
-  var depthCameraGLProjectionMatrix = float4x4()
+  var colorCameraGLProjectionMatrix = float4x4.identity
+  var depthCameraGLProjectionMatrix = float4x4.identity
 
   private let cubeVertices4: [simd_float4] = [
     simd_float4(0, 0, 0, 1),
@@ -133,7 +133,7 @@ public class STKLineRenderer {
 
     renderAnchors(
       commandEncoder,
-      anchors: [simd_float4x4()],
+      anchors: [simd_float4x4.identity],
       cameraPosition: cameraPosition,
       projection: projection,
       orientation: orientation,

Sources/StructureKit/Metal/STKMeshBuffers.swift

@@ -217,7 +217,7 @@ public class STKMeshBuffers: STKDrawableObject {
 
   public func textureCbCr() -> MTLTexture? { textureCbCrinternal }
 
-  public func modelMatrix() -> float4x4 { float4x4() }
+  public func modelMatrix() -> float4x4 { float4x4.identity }
 
   public func vertexCount() -> Int { nVertex }
 

Sources/StructureKit/Metal/STKMetalRenderer.swift

@@ -154,8 +154,8 @@ public class STKMetalRenderer: NSObject, STKRenderer {
   private var _arkitMesh: STKMeshBuffers
   private var _anchors: [simd_float4x4] = []
   private var _volumeSize = simd_float3(1, 1, 1)
-  private var colorCameraGLProjectionMatrix = float4x4()
-  private var depthCameraGLProjectionMatrix = float4x4()
+  private var colorCameraGLProjectionMatrix = float4x4.identity
+  private var depthCameraGLProjectionMatrix = float4x4.identity
 
   // metal general
   private var _mtkView: MTKView
@@ -297,7 +297,7 @@ public class STKMetalRenderer: NSObject, STKRenderer {
     if drawTriad {
       _anchorRenderer.renderAnchors(
         commandEncoder,
-        anchors: [simd_float4x4()],
+        anchors: [simd_float4x4.identity],
         cameraPosition: cameraPose,
         projection: projection,
         orientation: orientation,

Sources/StructureKit/Metal/STKShaderManager.swift

@@ -0,0 +1,46 @@
+// StructureKit - A collection of extension utilities for Structure SDK
+// Copyright 2022 XRPro, LLC. All rights reserved.
+// http://structure.io
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are met:
+//
+// * Redistributions of source code must retain the above copyright notice,
+//   this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright notice,
+//   this list of conditions and the following disclaimer in the documentation
+//   and/or other materials provided with the distribution.
+// * Neither the name of XRPro, LLC nor the names of its contributors may be
+//   used to endorse or promote products derived from this software without
+//   specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+
+import Metal
+
+public class STKShaderManager {
+  public static let pixelFormat = MTLPixelFormat.bgra8Unorm
+  public static let depthFormat = MTLPixelFormat.depth32Float
+  public static let device = MTLCreateSystemDefaultDevice()!
+
+  public static let solid = STKMeshRendererSolid(colorFormat: pixelFormat, depthFormat: depthFormat, device: device)
+  public static let wireframe = STKMeshRendererWireframe(
+    colorFormat: pixelFormat, depthFormat: depthFormat, device: device)
+  public static let vertexColor = STKMeshRendererColor(
+    colorFormat: pixelFormat, depthFormat: depthFormat, device: device)
+  public static let textureShader = STKMeshRendererTexture(
+    colorFormat: pixelFormat, depthFormat: depthFormat, device: device)
+  public static let pointCloud = STKMeshRendererPoints(
+    colorFormat: pixelFormat, depthFormat: depthFormat, device: device)
+  public static let lines = STKMeshRendererLines(colorFormat: pixelFormat, depthFormat: depthFormat, device: device)
+}

…urces/StructureKit/Metal/STKCommon.swift Sources/StructureKit/STKCommon.swiftSources/StructureKit/Metal/STKCommon.swift renamed to Sources/StructureKit/STKCommon.swift Sources/StructureKit/Metal/STKCommon.swift renamed to Sources/StructureKit/STKCommon.swift

@@ -34,23 +34,6 @@ import StructureKitCTypes
 
 extension String: Error {}
 
-public class STKShaderManager {
-  public static let pixelFormat = MTLPixelFormat.bgra8Unorm
-  public static let depthFormat = MTLPixelFormat.depth32Float
-  public static let device = MTLCreateSystemDefaultDevice()!
-
-  public static let solid = STKMeshRendererSolid(colorFormat: pixelFormat, depthFormat: depthFormat, device: device)
-  public static let wireframe = STKMeshRendererWireframe(
-    colorFormat: pixelFormat, depthFormat: depthFormat, device: device)
-  public static let vertexColor = STKMeshRendererColor(
-    colorFormat: pixelFormat, depthFormat: depthFormat, device: device)
-  public static let textureShader = STKMeshRendererTexture(
-    colorFormat: pixelFormat, depthFormat: depthFormat, device: device)
-  public static let pointCloud = STKMeshRendererPoints(
-    colorFormat: pixelFormat, depthFormat: depthFormat, device: device)
-  public static let lines = STKMeshRendererLines(colorFormat: pixelFormat, depthFormat: depthFormat, device: device)
-}
-
 extension float4x4 {
   public init(_ m: GLKMatrix4) { self = unsafeBitCast(m, to: float4x4.self) }
 
@@ -61,7 +44,7 @@ extension float4x4 {
     return self
   }
 
-  public static func identity() -> float4x4 { unsafeBitCast(GLKMatrix4Identity, to: float4x4.self) }
+  public static var identity: float4x4 { unsafeBitCast(GLKMatrix4Identity, to: float4x4.self) }
 
   public static func makeTranslation(_ vec: vector_float3) -> float4x4 {
     unsafeBitCast(GLKMatrix4MakeTranslation(vec.x, vec.y, vec.z), to: float4x4.self)
@@ -107,6 +90,8 @@ extension float4x4 {
 }
 
 extension float3x3 {
+  public static var identity: float3x3 { unsafeBitCast(GLKMatrix3Identity, to: float3x3.self) }
+
   public static func makeRotationZ(_ radians: Float) -> float3x3 {
     float3x3([
       simd_float3(cos(radians), -sin(radians), 0), simd_float3(sin(radians), cos(radians), 0), simd_float3(0, 0, 1),
@@ -231,7 +216,7 @@ public func makeDepthStencilState(_ device: MTLDevice) -> MTLDepthStencilState {
   depthStencilDescriptor.depthCompareFunction = .less
   depthStencilDescriptor.isDepthWriteEnabled = true
   return device.makeDepthStencilState(descriptor: depthStencilDescriptor)!
-}
+} 
 
 public func makePipeline(
   _ device: MTLDevice,