@adatechnology/game-characters-three 0.4.1 → 0.5.0

package/dist/index.js

@@ -4065,6 +4065,7 @@ function createCharactersTestModule(options = {}) {
   return {
     id: CHARACTERS_AREA_ID,
     name: text.name,
+    ground: { surface: "concrete_slab" },
     group: text.group,
     get entries() {
       return entries;
@@ -4238,6 +4239,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 +4279,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);
@@ -4376,6 +4379,24 @@ var createPlayerAvatar = (THREE, options = {}) => {
     });
     return { armR: shoulder, armL: shoulder, armRz: AIMED.zRight, armLz: AIMED.zLeft, elbR: AIMED.elbowRight, elbL: AIMED.elbowLeft };
   };
+  const pushingPose = (push) => {
+    const on = push.phase === "grip" ? Math.min(1, push.progress * 2.2) : 1;
+    const strain = push.phase === "strain" ? 1 : 0;
+    const shake = strain * Math.sin(time * 40) * 0.025;
+    const raise = -1.5 * on;
+    const elbow = -0.9 + 0.72 * (push.phase === "grip" ? push.progress : 1) + strain * 0.12;
+    return {
+      lean: (0.2 + 0.2 * strain) * on,
+      headX: (0.05 + 0.08 * strain) * on,
+      armR: raise + shake,
+      armL: raise - shake,
+      armRz: -0.08 * on,
+      armLz: 0.08 * on,
+      elbR: elbow,
+      elbL: elbow,
+      ...strain ? { legL: -0.5, legR: 0.4, kneeL: 0.55, kneeR: 0.08, drop: -0.05 } : {}
+    };
+  };
   const holdingPose = (gait, itemUse) => {
     const bob = Math.sin(cycles * TWO_PI) * 0.05 * gait;
     if (!itemUse) {
@@ -4503,7 +4524,7 @@ var createPlayerAvatar = (THREE, options = {}) => {
   const fireClipEvents = (r, from, to) => {
     for (const event of clipEventsBetween(r.clip, from, to)) emit({ ...event, clip: r.clip.id }, r.onEvent);
   };
-  const stepClip = (dt, down) => {
+  const stepClip = (dt, down, crouch) => {
     if (!run) return;
     const r = run;
     const from = r.time;
@@ -4523,7 +4544,9 @@ var createPlayerAvatar = (THREE, options = {}) => {
       return;
     }
     if (down) return;
-    const sampled = filterPoseChannels(samplePoseClip(r.clip, Math.min(r.time, duration)), r.clip.channels ?? "full");
+    const keepsCrouch = crouch && !r.clip.events?.some((event) => event.data?.kind === "kick");
+    const channels = r.clip.channels ?? "full";
+    const sampled = filterPoseChannels(filterPoseChannels(samplePoseClip(r.clip, Math.min(r.time, duration)), channels), keepsCrouch ? "upper" : "full");
     const current = readPose();
     const blended = {};
     for (const [name, value] of Object.entries(sampled)) if (name in current) blended[name] = current[name] + (value - current[name]) * r.weight;
@@ -4554,7 +4577,8 @@ var createPlayerAvatar = (THREE, options = {}) => {
       else {
         if (running) animator.setPose(rig, runningPose(gait, Boolean(state.armed || state.holding || state.itemUse)));
         if (state.crouch) animator.setPose(rig, crouchPose(gait));
-        if (state.armed) animator.setPose(rig, armed(state.pitch ?? 0, gait, state.hip ?? 0));
+        if (state.push) animator.setPose(rig, pushingPose(state.push));
+        else if (state.armed) animator.setPose(rig, armed(state.pitch ?? 0, gait, state.hip ?? 0));
         else if (state.holding || state.itemUse) animator.setPose(rig, holdingPose(gait, state.itemUse));
         else if (!running) {
           animator.setPose(rig, {
@@ -4566,15 +4590,15 @@ var createPlayerAvatar = (THREE, options = {}) => {
         }
       }
       placeBody(fall);
-      stepClip(dt, down);
-      if (smooth) animator.cascade(rig, dt);
-      const clipId = run ? run.clip.id : null;
+      stepClip(dt, down, Boolean(state.crouch));
+      if (smooth) animator.cascade(rig, run && !run.clip.loop ? dt * clipCascade : dt);
+      const blow = run?.clip.events?.find((event) => (event.type === "impact" || event.type === "grip") && event.data?.kind)?.data?.kind;
       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 = blow === "punch" ? 1.4 : blow === "shove" ? 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 +5027,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 +5096,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 +5144,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));
@@ -5178,6 +5204,8 @@ function createFirstPersonArms(THREE, options = {}) {
 
 // src/player/room-avatar.ts
 var impactOf = (clip) => clip.events?.find((event) => event.type === "impact")?.t ?? null;
+var isPunch = (clip) => clip.events?.some((event) => event.type === "impact" && event.data?.kind === "punch") ?? false;
+var GUARD_SPEED = 0.3;
 var toRoomAvatar = (avatar, options = {}) => {
   const arms = options.firstPerson === false ? null : createFirstPersonArms(avatar.three, {
     colors: { skin: avatar.colors.skin, sleeve: avatar.colors.longSleeves ? avatar.colors.shirt : avatar.colors.skin, trouser: avatar.colors.trousers, shoe: avatar.colors.shoes, ...options.firstPerson?.colors },
@@ -5192,28 +5220,59 @@ var toRoomAvatar = (avatar, options = {}) => {
     if (!found) mirrored.set(clip.id, found = mirrorPoseClip(clip, `${clip.id}_left`));
     return found;
   };
+  const guard = options.guardClip === false ? void 0 : strikes.get(options.guardClip ?? "fight_guard");
+  const guardHold = options.guardHold ?? 1.2;
+  const punchBlend = options.punchBlend ?? 0.05;
+  let strikeLeft = 0;
+  let guardLeft = 0;
+  let guarding = false;
+  const stepGuard = (dt, state) => {
+    if (!guard) return;
+    const free = state.speed < GUARD_SPEED && !state.down && !state.armed && !state.holding && !state.push && !state.itemUse && !state.running;
+    if (strikeLeft > 0) {
+      strikeLeft -= dt;
+      if (strikeLeft <= 0 && guardLeft > 0 && free) {
+        avatar.play(guard);
+        guarding = true;
+      }
+      return;
+    }
+    guardLeft = Math.max(0, guardLeft - dt);
+    if (guarding && (guardLeft <= 0 || !free || avatar.playing !== guard.id)) {
+      if (avatar.playing === guard.id) avatar.stop();
+      guarding = false;
+    }
+  };
   return {
     root: avatar.root,
     avatar,
     arms,
     ...arms ? { firstPerson: { root: arms.root, update: (dt, state) => arms.update(dt, state) } } : {},
-    update: (dt, state) => avatar.update(dt, {
-      speed: state.speed,
-      running: state.running,
-      crouch: state.crouch,
-      down: state.down,
-      armed: state.armed,
-      pitch: -state.pitch,
-      ...state.holding !== void 0 ? { holding: state.holding } : {},
-      ...state.itemUse !== void 0 ? { itemUse: state.itemUse } : {}
-    }),
+    update: (dt, state) => {
+      stepGuard(dt, state);
+      avatar.update(dt, {
+        speed: state.speed,
+        running: state.running,
+        crouch: state.crouch,
+        down: state.down,
+        armed: state.armed,
+        pitch: -state.pitch,
+        ...state.holding !== void 0 ? { holding: state.holding } : {},
+        ...state.itemUse !== void 0 ? { itemUse: state.itemUse } : {},
+        ...state.push !== void 0 ? { push: state.push } : {}
+      });
+    },
     hand: (side) => avatar.hand(side),
     strike: (clipId, strikeOptions) => {
       const clip = strikes.get(clipId);
       if (!clip) return null;
-      const left = strikeOptions?.leg === "left";
-      avatar.play(left ? leftOf(clip) : clip);
-      arms?.play(clipId, left ? { leg: "left" } : void 0);
+      const left = strikeOptions?.leg === "left" || strikeOptions?.hand === "left";
+      const punch = guard !== void 0 && isPunch(clip);
+      avatar.play(left ? leftOf(clip) : clip, punch ? { blend: punchBlend } : void 0);
+      strikeLeft = punch ? clip.duration : 0;
+      guardLeft = punch ? guardHold : 0;
+      guarding = false;
+      arms?.play(clipId, strikeOptions?.leg === "left" ? { leg: "left" } : strikeOptions?.hand === "left" ? { hand: "left" } : void 0);
       return impactOf(clip);
     }
   };
@@ -5328,6 +5387,7 @@ function createAvatarTestModule(options) {
   return {
     id: AVATAR_AREA_ID,
     name: textOf().name,
+    ground: { surface: "concrete_slab" },
     group: textOf().group,
     state,
     items: () => [],