Merge pull request #7 from noppefoxwolf/feature/AddColliderGroups

Add colliderGroups
tattn · Dec 20, 2019 · cd11a5e · cd11a5e
2 parents 0198707 + 864793b
commit cd11a5e
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 1 deletion.
diff --git a/Sources/VRMKit/VRM/VRM.swift b/Sources/VRMKit/VRM/VRM.swift
@@ -149,6 +149,7 @@ public extension VRM {
 
     struct SecondaryAnimation: Codable {
         public let boneGroups: [BoneGroup]
+        public let colliderGroups: [ColliderGroup]
         public struct BoneGroup: Codable {
             public let bones: [Int]
             public let center: Int
@@ -173,6 +174,16 @@ public extension VRM {
                 stiffiness = try decodeDouble(key: .stiffiness, container: container)
             }
         }
+
+        public struct ColliderGroup: Codable {
+            public let node: Int
+            public let colliders: [Collider]
+
+            public struct Collider: Codable {
+                public let offset: Vector3
+                public let radius: Double
+            }
+        }
     }
 
     struct Vector3: Codable {

diff --git a/Tests/VRMKit/VRMKitTests.swift b/Tests/VRMKit/VRMKitTests.swift
@@ -81,7 +81,7 @@ class VRMTests: XCTestCase {
         XCTAssertEqual(vrm.firstPerson.meshAnnotations[0].mesh, 0)
     }
 
-    func testSecondaryAnimation() {
+    func testSecondaryAnimationBoneGroups() {
         let target = vrm.secondaryAnimation.boneGroups[0]
         XCTAssertEqual(target.bones, [41, 49, 57, 59, 61])
         XCTAssertEqual(target.center, -1)
@@ -95,4 +95,13 @@ class VRMTests: XCTestCase {
         XCTAssertEqual(target.hitRadius, 0.01)
         XCTAssertEqual(target.stiffiness, 0.65)
     }
+
+    func testSecondaryAnimationColliderGroups() {
+        let target = vrm.secondaryAnimation.colliderGroups[0]
+        XCTAssertEqual(target.node, 34)
+        XCTAssertEqual(target.colliders[0].offset.x, 0.0)
+        XCTAssertEqual(target.colliders[0].offset.y, 0.05)
+        XCTAssertEqual(target.colliders[0].offset.z, 0.0)
+        XCTAssertEqual(target.colliders[0].radius, 0.09)
+    }
 }