@adatechnology/game-characters-three 0.4.1 → 0.4.2

package/dist/index.js

@@ -4238,6 +4238,7 @@ var player_avatar_default = {
 var TWO_PI = Math.PI * 2;
 var MAX_GAIT = 1.4;
 var CLIP_BLEND = 0.12;
+var CLIP_CASCADE = 5;
 var FALL_SECONDS2 = 0.3;
 var HIP_HEIGHT = 0.95;
 var WALK_ARM = 0.28;
@@ -4277,6 +4278,7 @@ var createPlayerAvatar = (THREE, options = {}) => {
   const blendDefault = options.blend ?? CLIP_BLEND;
   const fallSeconds = options.fallSeconds ?? FALL_SECONDS2;
   const smooth = options.cascade ?? true;
+  const clipCascade = options.clipCascade ?? CLIP_CASCADE;
   const root = new THREE.Group();
   const tilt = new THREE.Group();
   tilt.add(body);
@@ -4567,14 +4569,14 @@ var createPlayerAvatar = (THREE, options = {}) => {
       }
       placeBody(fall);
       stepClip(dt, down);
-      if (smooth) animator.cascade(rig, dt);
+      if (smooth) animator.cascade(rig, run && !run.clip.loop ? dt * clipCascade : dt);
       const clipId = run ? run.clip.id : null;
       const ph = cycles * TWO_PI;
       hands.forEach((hand) => {
         const isRight = hand.side < 0;
         const holdRight = isRight && (!!state.holding || !!state.itemUse);
         const holdLeft = !isRight && (state.itemUse?.id === "open" || state.itemUse?.id === "close");
-        const grip = clipId === "punch_right" ? 1.4 : clipId === "shove_two_hands" ? 0.15 : state.armed || holdRight || holdLeft ? 1.22 : running ? 0.85 : 0.12;
+        const grip = clipId?.startsWith("punch_") ? 1.4 : clipId === "shove_two_hands" ? 0.15 : state.armed || holdRight || holdLeft ? 1.22 : running ? 0.85 : 0.12;
         const wristSwing = holdRight || state.armed || running ? 0 : -Math.min(1, gait) * Math.sin(ph - 0.6) * 0.12 * hand.side;
         setHandGrip(hand, grip, wristSwing);
       });
@@ -5003,10 +5005,11 @@ function createFirstPersonArms(THREE, options = {}) {
   const palmAt = new THREE.Vector3();
   const fingers = new THREE.Vector3();
   const towards = new THREE.Vector3();
-  const fromChannel = (channel, side, base, out) => {
+  const fromChannel = (channel, side, base, out, from = side) => {
     out.p.set(...channel.p);
     out.q.copy(quaternionOf(channel.r));
-    if (channel.mirror && side === "L") {
+    const rightNumbers = from === "R" || channel.mirror;
+    if (rightNumbers !== (side === "R")) {
       out.p.x = -out.p.x;
       out.q.copy(mirrorQuaternion(THREE, out.q));
     }
@@ -5071,7 +5074,7 @@ function createFirstPersonArms(THREE, options = {}) {
     play(id, options2) {
       const clip = clips.get(id);
       if (!clip) return false;
-      run = { clip, time: 0, left: options2?.leg === "left" };
+      run = { clip, time: 0, left: options2?.leg === "left", swap: options2?.hand === "left" };
       fire(clip, -1e-9, 0);
       return true;
     },
@@ -5119,10 +5122,11 @@ function createFirstPersonArms(THREE, options = {}) {
         arm.blend = blendSeconds <= 0 ? 1 : Math.min(1, arm.blend + dt / blendSeconds);
         if (arm.blend >= 1) copyPose(arm.shown, desired);
         else mixPose(THREE, arm.shown, arm.from, desired, ease(arm.blend));
-        const channel = sample?.[side];
+        const from = run?.swap ? side === "R" ? "L" : "R" : side;
+        const channel = sample?.[from];
         let pose;
         if (channel && channel.w > 0) {
-          fromChannel(channel, side, arm.shown, channelPose);
+          fromChannel(channel, side, arm.shown, channelPose, from);
           mixPose(THREE, mixed, arm.shown, channelPose, channel.w);
           pose = mode === "target" ? mixed : keepOutside(mixed, handReach(mixed));
         } else pose = mode === "target" ? arm.shown : keepOutside(arm.shown, handReach(arm.shown));
@@ -5211,9 +5215,9 @@ var toRoomAvatar = (avatar, options = {}) => {
     strike: (clipId, strikeOptions) => {
       const clip = strikes.get(clipId);
       if (!clip) return null;
-      const left = strikeOptions?.leg === "left";
+      const left = strikeOptions?.leg === "left" || strikeOptions?.hand === "left";
       avatar.play(left ? leftOf(clip) : clip);
-      arms?.play(clipId, left ? { leg: "left" } : void 0);
+      arms?.play(clipId, strikeOptions?.leg === "left" ? { leg: "left" } : strikeOptions?.hand === "left" ? { hand: "left" } : void 0);
       return impactOf(clip);
     }
   };