Clean code

Author: tattn

Sources/VRMKitRuntime/BlendShapeBindings.swift

@@ -0,0 +1,51 @@
+import simd
+
+package struct BlendShapeBinding<Mesh> {
+    package let mesh: Mesh
+    package let index: Int
+    package let weight: Double
+
+    package init(mesh: Mesh, index: Int, weight: Double) {
+        self.mesh = mesh
+        self.index = index
+        self.weight = weight
+    }
+}
+
+package struct BlendShapeClip<Mesh> {
+    package let name: String
+    package let preset: BlendShapePreset
+    package let values: [BlendShapeBinding<Mesh>]
+    package let isBinary: Bool
+
+    package var key: BlendShapeKey {
+        return preset == .unknown ? .custom(name) : .preset(preset)
+    }
+
+    package init(name: String,
+                 preset: BlendShapePreset,
+                 values: [BlendShapeBinding<Mesh>],
+                 isBinary: Bool) {
+        self.name = name
+        self.preset = preset
+        self.values = values
+        self.isBinary = isBinary
+    }
+}
+
+package struct MaterialValueBinding {
+    package let materialName: String
+    package let valueName: String
+    package let targetValue: SIMD4<Float>
+    package let baseValue: SIMD4<Float>
+
+    package init(materialName: String,
+                 valueName: String,
+                 targetValue: SIMD4<Float>,
+                 baseValue: SIMD4<Float>) {
+        self.materialName = materialName
+        self.valueName = valueName
+        self.targetValue = targetValue
+        self.baseValue = baseValue
+    }
+}

Sources/VRMKitRuntime/BlendShapeTypes.swift

@@ -31,7 +31,7 @@ public enum BlendShapePreset: String {
     case blinkL = "blink_l"
     case blinkR = "blink_r"
 
-    package init(name: String) {
+    public init(name: String) {
         self = BlendShapePreset(rawValue: name.lowercased()) ?? .unknown
     }
 }

…VRMSceneKit/Extensions/Collection+.swift …MKitRuntime/Extensions/Collection+.swiftSources/VRMSceneKit/Extensions/Collection+.swift renamed to Sources/VRMKitRuntime/Extensions/Collection+.swift Sources/VRMSceneKit/Extensions/Collection+.swift renamed to Sources/VRMKitRuntime/Extensions/Collection+.swift

@@ -1,7 +1,7 @@
 import Foundation
 
 extension Collection {
-    subscript(safe index: Index) -> Element? {
+    package subscript(safe index: Index) -> Element? {
         return startIndex <= index && index < endIndex ? self[index] : nil
     }
 }

Sources/VRMKitRuntime/SIMD+Runtime.swift

@@ -1,6 +1,6 @@
 import simd
 
-public extension SIMD3 where Scalar == Float {
+package extension SIMD3 where Scalar == Float {
     var normalized: SIMD3 {
         simd_normalize(self)
     }
@@ -18,20 +18,34 @@ public extension SIMD3 where Scalar == Float {
     }
 }
 
-public extension simd_quatf {
+package extension simd_quatf {
     static func * (_ left: simd_quatf, _ right: SIMD3<Float>) -> SIMD3<Float> {
         simd_act(left, right)
     }
 }
 
-public let quat_identity_float = simd_quatf(matrix_identity_float4x4)
+package let quat_identity_float = simd_quatf(matrix_identity_float4x4)
 
-public func cross(_ left: SIMD3<Float>, _ right: SIMD3<Float>) -> SIMD3<Float> {
+package func cross(_ left: SIMD3<Float>, _ right: SIMD3<Float>) -> SIMD3<Float> {
     simd_cross(left, right)
 }
 
-public func normal(_ v0: SIMD3<Float>, _ v1: SIMD3<Float>, _ v2: SIMD3<Float>) -> SIMD3<Float> {
+package func normal(_ v0: SIMD3<Float>, _ v1: SIMD3<Float>, _ v2: SIMD3<Float>) -> SIMD3<Float> {
     let e1 = v1 - v0
     let e2 = v2 - v0
     return simd_normalize(simd_cross(e1, e2))
 }
+
+package extension simd_float4x4 {
+    var translation: SIMD3<Float> {
+        SIMD3<Float>(columns.3.x, columns.3.y, columns.3.z)
+    }
+
+    func multiplyPoint(_ v: SIMD3<Float>) -> SIMD3<Float> {
+        let result = simd_mul(self, SIMD4<Float>(v.x, v.y, v.z, 1))
+        guard result.w != 0 else {
+            return SIMD3<Float>(result.x, result.y, result.z)
+        }
+        return SIMD3<Float>(result.x / result.w, result.y / result.w, result.z / result.w)
+    }
+}

Sources/VRMKitRuntime/UnityTransform.swift

@@ -1,17 +1,17 @@
-public protocol UnityTransformCompatible {
+package protocol UnityTransformCompatible {
     associatedtype CompatibleType
     var utx: CompatibleType { get }
 }
 
-public final class UnityTransform<Base> {
+package final class UnityTransform<Base> {
     package let base: Base
 
-    public init(_ base: Base) {
+    package init(_ base: Base) {
         self.base = base
     }
 }
 
-public extension UnityTransformCompatible {
+package extension UnityTransformCompatible {
     var utx: UnityTransform<Self> {
         UnityTransform(self)
     }

Sources/VRMRealityKit/CustomType/BlendShape.swift

@@ -1,5 +1,6 @@
 #if canImport(RealityKit)
 import VRMKit
+import VRMKitRuntime
 import RealityKit
 
 public final class Humanoid {

Sources/VRMRealityKit/CustomType/Humanoid.swift

@@ -1 +1,11 @@
 @_exported import VRMKitRuntime
+
+#if canImport(RealityKit)
+import RealityKit
+
+// MARK: - BlendShapeBindings
+
+typealias BlendShapeBinding = VRMKitRuntime.BlendShapeBinding<Entity>
+typealias BlendShapeClip = VRMKitRuntime.BlendShapeClip<Entity>
+typealias MaterialValueBinding = VRMKitRuntime.MaterialValueBinding
+#endif