Clean code

tattn · tattn · commit 9e82ce261334 · 2026-02-04T03:02:50.000+09:00
diff --git a/Sources/VRMKitRuntime/Extensions/SIMD+.swift b/Sources/VRMKitRuntime/Extensions/SIMD+.swift
diff --git a/Sources/VRMKitRuntime/Extensions/VRMImage+GLTF.swift b/Sources/VRMKitRuntime/Extensions/VRMImage+GLTF.swift
@@ -0,0 +1,19 @@
+import Foundation
+import VRMKit
+
+package extension VRMImage {
+    static func from(_ image: GLTF.Image,
+                     relativeTo rootDirectory: URL?,
+                     bufferView: (Int) throws -> Data) throws -> VRMImage {
+        let data: Data
+        if let uri = image.uri {
+            data = try Data(gltfUrlString: uri, relativeTo: rootDirectory)
+        } else if let bufferViewIndex = image.bufferView {
+            data = try bufferView(bufferViewIndex)
+        } else {
+            throw VRMError._dataInconsistent("failed to load image: both uri and bufferView are nil")
+        }
+
+        return try VRMImage(data: data) ??? ._dataInconsistent("failed to create image from data")
+    }
+}
diff --git a/Sources/VRMKitRuntime/Extensions/Vector3+SIMD.swift b/Sources/VRMKitRuntime/Extensions/Vector3+SIMD.swift
@@ -1,7 +1,6 @@
 import VRMKit
-import SceneKit
 
-extension VRM0.Vector3 {
+package extension VRM0.Vector3 {
     var simd: SIMD3<Float> {
         SIMD3<Float>(x: Float(x), y: Float(y), z: Float(z))
     }
diff --git a/Sources/VRMKitRuntime/Humanoid.swift b/Sources/VRMKitRuntime/Humanoid.swift
@@ -1,20 +1,20 @@
-#if canImport(RealityKit)
 import VRMKit
-import VRMKitRuntime
-import RealityKit
 
-public final class Humanoid {
-    var bones: [Bones: Entity] = [:]
+public final class Humanoid<Node> {
+    package var bones: [Bones: Node] = [:]
 
-    func setUp(humanoid: VRM0.Humanoid, nodes: [Entity?]) {
+    public init() {}
+
+    package func setUp(humanoid: VRM0.Humanoid, nodes: [Node?]) {
         bones = humanoid.humanBones.reduce(into: [:]) { result, humanBone in
-            guard let bone = Bones(rawValue: humanBone.bone),
-                  let node = nodes[safe: humanBone.node] else { return }
+            guard let bone = Bones(rawValue: humanBone.bone) else { return }
+            guard nodes.indices.contains(humanBone.node),
+                  let node = nodes[humanBone.node] else { return }
             result[bone] = node
         }
     }
 
-    public func node(for bone: Bones) -> Entity? {
+    public func node(for bone: Bones) -> Node? {
         return bones[bone]
     }
 
@@ -75,4 +75,3 @@ public final class Humanoid {
         case upperChest
     }
 }
-#endif
diff --git a/Sources/VRMRealityKit/GLTF2RealityKit/UIImage+GLTF.swift b/Sources/VRMRealityKit/GLTF2RealityKit/UIImage+GLTF.swift
diff --git a/Sources/VRMRealityKit/RuntimeExports.swift b/Sources/VRMRealityKit/RuntimeExports.swift
@@ -8,4 +8,8 @@ import RealityKit
 typealias BlendShapeBinding = VRMKitRuntime.BlendShapeBinding<Entity>
 typealias BlendShapeClip = VRMKitRuntime.BlendShapeClip<Entity>
 typealias MaterialValueBinding = VRMKitRuntime.MaterialValueBinding
+
+// MARK: - Humanoid
+
+public typealias Humanoid = VRMKitRuntime.Humanoid<Entity>
 #endif
diff --git a/Sources/VRMRealityKit/VRMEntityLoader.swift b/Sources/VRMRealityKit/VRMEntityLoader.swift
@@ -613,7 +613,9 @@ open class VRMEntityLoader {
     func image(withImageIndex index: Int) throws -> VRMImage {
         if let cache = try entityData.load(\.images, index: index) { return cache }
         let gltfImage = try gltf.load(\.images)[index]
-        let image = try VRMImage.from(gltfImage, relativeTo: rootDirectory, loader: self)
+        let image = try VRMImage.from(gltfImage, relativeTo: rootDirectory) { index in
+            try self.bufferView(withBufferViewIndex: index).bufferView
+        }
         entityData.images[index] = image
         return image
     }
diff --git a/Sources/VRMSceneKit/CustomType/Humanoid.swift b/Sources/VRMSceneKit/CustomType/Humanoid.swift
diff --git a/Sources/VRMSceneKit/CustomType/VRMSpringBoneColliderGroup.swift b/Sources/VRMSceneKit/CustomType/VRMSpringBoneColliderGroup.swift
@@ -1,4 +1,5 @@
 import VRMKit
+import VRMKitRuntime
 import SceneKit
 
 @available(*, deprecated, message: "Deprecated. Use VRMRealityKit instead.")
diff --git a/Sources/VRMSceneKit/GLTF2SCN/UIImage+GLTF.swift b/Sources/VRMSceneKit/GLTF2SCN/UIImage+GLTF.swift
diff --git a/Sources/VRMSceneKit/RuntimeExports.swift b/Sources/VRMSceneKit/RuntimeExports.swift
@@ -9,3 +9,8 @@ typealias BlendShapeBinding = VRMKitRuntime.BlendShapeBinding<SCNNode>
 typealias BlendShapeClip = VRMKitRuntime.BlendShapeClip<SCNNode>
 @available(*, deprecated, message: "Deprecated. Use VRMRealityKit instead.")
 typealias MaterialValueBinding = VRMKitRuntime.MaterialValueBinding
+
+// MARK: - Humanoid
+
+@available(*, deprecated, message: "Deprecated. Use VRMRealityKit instead.")
+public typealias Humanoid = VRMKitRuntime.Humanoid<SCNNode>
diff --git a/Sources/VRMSceneKit/VRMSceneLoader.swift b/Sources/VRMSceneKit/VRMSceneLoader.swift
@@ -1,5 +1,6 @@
 import Foundation
 import VRMKit
+import VRMKitRuntime
 import SceneKit
 import SpriteKit
 
@@ -144,10 +145,10 @@ open class VRMSceneLoader {
     func image(withImageIndex index: Int) throws -> VRMImage {
         if let cache = try sceneData.load(\.images, index: index) { return cache }
         let gltfImage = try gltf.load(\.images)[index]
-        let image = try VRMImage.from(gltfImage, relativeTo: rootDirectory, loader: self)
+        let image = try VRMImage.from(gltfImage, relativeTo: rootDirectory) { index in
+            try self.bufferView(withBufferViewIndex: index).bufferView
+        }
         sceneData.images[index] = image
         return image
     }
 }
-
-

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,6 @@`
`1`	`1`	`import VRMKit`
`2`		`-import SceneKit`
`3`	`2`
`4`		`-extension VRM0.Vector3 {`
	`3`	`+package extension VRM0.Vector3 {`
`5`	`4`	`var simd: SIMD3<Float> {`
`6`	`5`	`SIMD3<Float>(x: Float(x), y: Float(y), z: Float(z))`
`7`	`6`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`import VRMKit`
	`2`	`+import VRMKitRuntime`
`2`	`3`	`import SceneKit`
`3`	`4`
`4`	`5`	`@available(*, deprecated, message: "Deprecated. Use VRMRealityKit instead.")`