Merge pull request #1374 from pixiv/fix-vrma-type

fix: Fix type definition of VRM Animation
pixiv · Feb 26, 2024 · 6e5bcd5 · 6e5bcd5
2 parents 0d96aea + 7cfbffd
commit 6e5bcd5
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 3 deletions.
diff --git a/packages/three-vrm-animation/src/VRMAnimationLoaderPlugin.ts b/packages/three-vrm-animation/src/VRMAnimationLoaderPlugin.ts
@@ -144,6 +144,10 @@ export class VRMAnimationLoaderPlugin implements GLTFLoaderPlugin {
 
     const worldMatrixMap: VRMAnimationLoaderPluginWorldMatrixMap = new Map();
 
+    if (defExtension.humanoid == null) {
+      return worldMatrixMap;
+    }
+
     for (const [boneName, humanBone] of Object.entries(defExtension.humanoid.humanBones)) {
       const node = humanBone?.node;
       if (node != null) {

diff --git a/packages/types-vrmc-vrm-1.0/src/HumanoidHumanBones.ts b/packages/types-vrmc-vrm-1.0/src/HumanoidHumanBones.ts
@@ -5,5 +5,5 @@ import type { HumanoidHumanBoneName } from './HumanoidHumanBoneName';
  * Represents a set of humanBones of a humanoid.
  */
 export type HumanoidHumanBones = {
-  [key in HumanoidHumanBoneName]: HumanoidHumanBone;
+  [key in HumanoidHumanBoneName]?: HumanoidHumanBone;
 };
diff --git a/packages/types-vrmc-vrm-animation-1.0/src/HumanoidHumanBones.ts b/packages/types-vrmc-vrm-animation-1.0/src/HumanoidHumanBones.ts
@@ -5,5 +5,5 @@ import type { HumanoidHumanBoneName } from '@pixiv/types-vrmc-vrm-1.0';
  * An object which maps humanoid bones to nodes.
  */
 export type HumanoidHumanBones = {
-  [key in HumanoidHumanBoneName]: HumanoidHumanBone;
+  [key in HumanoidHumanBoneName]?: HumanoidHumanBone;
 };
diff --git a/packages/types-vrmc-vrm-animation-1.0/src/VRMCVRMAnimation.ts b/packages/types-vrmc-vrm-animation-1.0/src/VRMCVRMAnimation.ts
@@ -14,7 +14,7 @@ export interface VRMCVRMAnimation {
   /**
    * An object which describes about humanoid bones.
    */
-  humanoid: Humanoid;
+  humanoid?: Humanoid;
 
   /**
    * An object which maps expressions to nodes.