@drawcall/acta 0.1.20 → 0.1.22

package/dist/behavior.d.ts

@@ -1,7 +1,7 @@
 import { AnimationClip, EventDispatcher, LoadingManager, Vector3 } from 'three';
 import type { Behavior } from './types.js';
 import { CharacterModel, BoneMap } from '@pmndrs/viverse';
-export type AnimationInfo = {
+export type LoadedAnimationInfo = {
     name: string;
     compatibleMasks: Array<'fullbody' | 'upperbody' | 'lowerbody'>;
     isAdditiveAiming: boolean;

package/dist/behavior.js

@@ -18,6 +18,28 @@ const localQuaternionHelper = new Quaternion();
 const eulerHelper = new Euler();
 const directionHelper = new Vector3();
 const vectorHelper = new Vector3();
+const worldQuaternionHelper = new Quaternion();
+const parentWorldQuaternionHelper = new Quaternion();
+const parentWorldQuaternionInvHelper = new Quaternion();
+const worldEulerHelper = new Euler(0, 0, 0, 'YXZ');
+const worldYawDirectionHelper = new Vector3();
+const getWorldYaw = (object) => {
+    object.getWorldQuaternion(worldQuaternionHelper);
+    worldEulerHelper.setFromQuaternion(worldQuaternionHelper, 'YXZ');
+    return worldEulerHelper.y;
+};
+const setWorldYaw = (object, desiredWorldYaw) => {
+    if (object.parent == null) {
+        object.rotation.y = desiredWorldYaw;
+        return;
+    }
+    worldYawDirectionHelper.set(Math.sin(desiredWorldYaw), 0, Math.cos(desiredWorldYaw));
+    object.parent.getWorldQuaternion(parentWorldQuaternionHelper);
+    parentWorldQuaternionInvHelper.copy(parentWorldQuaternionHelper).invert();
+    worldYawDirectionHelper.applyQuaternion(parentWorldQuaternionInvHelper);
+    const localYaw = Math.atan2(worldYawDirectionHelper.x, worldYawDirectionHelper.z);
+    object.rotation.y = localYaw;
+};
 //TODO: support direction AND position targets for head and aim
 export class CharacterBehavior extends EventDispatcher {
     model;
@@ -145,14 +167,14 @@ export class CharacterBehavior extends EventDispatcher {
         }
         // Lerp body yaw with angle wrapping
         this.currentBodyYaw = lerpAngle(this.currentBodyYaw, targetBodyYaw, BodyRotationSpeed * delta);
-        this.model.scene.rotation.y = this.currentBodyYaw;
+        setWorldYaw(this.model.scene, this.currentBodyYaw);
         this.updateTimeline?.(undefined, delta);
         this.model.mixer.update(delta);
         // Stabilize spine during aiming to face the aim direction
         if (this.isAiming) {
             const spineBone = this.model.scene.getObjectByName('spine');
             // Extract yaw from aim direction and add PI offset for model facing
-            const aimYaw = this.model.scene.rotation.y + Math.PI + SpineAimYawOffset;
+            const aimYaw = getWorldYaw(this.model.scene) + Math.PI + SpineAimYawOffset;
             // Create target quaternion with just the yaw (no pitch/roll)
             eulerHelper.set(0, aimYaw, 0, 'YXZ');
             quaternionHelper.setFromEuler(eulerHelper);
@@ -260,7 +282,7 @@ export class CharacterBehavior extends EventDispatcher {
         return () => parallel('all', action({
             update: () => {
                 // Transform world velocity to model's local space by rotating by inverse of model's Y rotation
-                vectorHelper.copy(this.worldMoveVelocity).applyAxisAngle(UpVector, -this.model.scene.rotation.y);
+                vectorHelper.copy(this.worldMoveVelocity).applyAxisAngle(UpVector, -getWorldYaw(this.model.scene));
                 const speed = normalizedLocalMoveDirection.set(vectorHelper.x, -vectorHelper.z).length();
                 normalizedLocalMoveDirection.divideScalar(speed);
                 jogFwdAction.timeScale = 0.222 * speed;

package/package.json

@@ -2,7 +2,7 @@
   "name": "@drawcall/acta",
   "type": "module",
   "main": "dist/index.js",
-  "version": "0.1.20",
+  "version": "0.1.22",
   "author": "Bela Bohlender",
   "license": "SEE LICENSE IN LICENSE",
   "homepage": "https://drawcall.ai",