fix: aimBone parent resolver not working for some vrms

Author: ashconnell

src/core/extras/createVRMFactory.js

@@ -314,13 +314,13 @@ export function createVRMFactory(glb, setupMaterial) {
           updateLocomotion(delta)
         }
         if (loco.gazeDir && (currentEmote ? currentEmote.gaze : true)) {
-          aimBone('neck', 'upperChest', loco.gazeDir, delta, {
+          aimBone('neck', loco.gazeDir, delta, {
             minAngle: -30,
             maxAngle: 30,
             smoothing: 0.4,
             weight: 0.5,
           })
-          aimBone('head', 'neck', loco.gazeDir, delta, {
+          aimBone('head', loco.gazeDir, delta, {
             minAngle: -30,
             maxAngle: 30,
             smoothing: 0.4,
@@ -337,6 +337,7 @@ export function createVRMFactory(glb, setupMaterial) {
     const aimBone = (() => {
       const smoothedRotations = new Map()
       const normalizedDir = new THREE.Vector3()
+      const parentWorldMatrix = new THREE.Matrix4()
       const parentWorldRotationInverse = new THREE.Quaternion()
       const localDir = new THREE.Vector3()
       const currentAimDir = new THREE.Vector3()
@@ -350,7 +351,7 @@ export function createVRMFactory(glb, setupMaterial) {
       const targetRotation = new THREE.Quaternion()
       const restToTarget = new THREE.Quaternion()
 
-      return function aimBone(boneName, parentBoneName, targetDir, delta, options = {}) {
+      return function aimBone(boneName, targetDir, delta, options = {}) {
         // default options
         const {
           aimAxis = AimAxis.NEG_Z,
@@ -362,8 +363,9 @@ export function createVRMFactory(glb, setupMaterial) {
           maxAngle = 180,
         } = options
         const bone = findBone(boneName)
-        const parentBone = findBone(parentBoneName)
-        if (!bone || !parentBone) return console.warn('aimBone: missing bone')
+        const parentBone = glb.userData.vrm.humanoid.humanBones[boneName].node.parent
+        if (!bone) return console.warn(`aimBone: missing bone (${boneName})`)
+        if (!parentBone) return console.warn(`aimBone: no parent bone`)
         // get or create smoothed state for this bone
         const boneId = bone.uuid
         if (!smoothedRotations.has(boneId)) {
@@ -376,7 +378,7 @@ export function createVRMFactory(glb, setupMaterial) {
         // normalize target direction
         normalizedDir.copy(targetDir).normalize()
         // get parent's world matrix
-        const parentWorldMatrix = getBoneTransform(parentBoneName)
+        parentWorldMatrix.multiplyMatrices(vrm.scene.matrixWorld, parentBone.matrixWorld)
         // extract parent's world rotation
         parentWorldMatrix.decompose(v1, parentWorldRotationInverse, v2)
         parentWorldRotationInverse.invert()
@@ -450,14 +452,13 @@ export function createVRMFactory(glb, setupMaterial) {
 
     // position target equivalent of aimBone()
     const aimBoneDir = new THREE.Vector3()
-    function aimBoneAt(boneName, parentBoneName, targetPos, delta, options = {}) {
+    function aimBoneAt(boneName, targetPos, delta, options = {}) {
       const bone = findBone(boneName)
-      const parentBone = findBone(parentBoneName)
-      if (!bone || !parentBone) return console.warn('aimBoneAt: missing bone')
+      if (!bone) return console.warn(`aimBone: missing bone (${boneName})`)
       const boneWorldMatrix = getBoneTransform(boneName)
       const boneWorldPos = v1.setFromMatrixPosition(boneWorldMatrix)
       aimBoneDir.subVectors(targetPos, boneWorldPos).normalize()
-      aimBone(boneName, parentBoneName, aimBoneDir, delta, options)
+      aimBone(boneName, aimBoneDir, delta, options)
     }
 
     // hooks.loader.load('emote', 'asset://rifle-aim.glb').then(emo => {