@adatechnology/game-characters-three 0.3.0 → 0.4.0

package/dist/index.js

@@ -648,6 +648,7 @@ var createRigAnimator = (options = {}) => {
 };
 
 // src/rich/best-builder.ts
+import { markKitOrigin } from "@adatechnology/game-contracts";
 import { shapeGeometries as shapeGeometries4 } from "@adatechnology/game-shapes-three";
 import { createBloodStream, createRng, drawAppearance } from "@adatechnology/game-characters";
 var createBestBuilder = (host, { types, random = Math.random }) => {
@@ -1209,13 +1210,15 @@ var createBestBuilder = (host, { types, random = Math.random }) => {
     root.userData.rig = rig;
     return root;
   }
-  return { build, TYPES, setLOD(k) {
+  const marked = (...args) => markKitOrigin(build(...args), { owner: "game-characters-three", kind: "person" });
+  return { build: marked, TYPES, setLOD(k) {
     LK = k;
     SEG = Math.max(5, Math.round(16 * k));
   }, topM: () => topM_ref };
 };
 
 // src/rich/person-builder.ts
+import { markKitOrigin as markKitOrigin2 } from "@adatechnology/game-contracts";
 import { shapeGeometries as shapeGeometries6 } from "@adatechnology/game-shapes-three";
 import { MOVES, createRng as createRng2 } from "@adatechnology/game-characters";
 
@@ -2440,7 +2443,11 @@ var createPersonBuilder = (host, options = {}) => {
     chars.forEach((c) => pose(c, c.z, 0, 0));
     return { root, chars };
   }
-  return { build, pose, zombify, buildPerson };
+  const mark = (c) => {
+    markKitOrigin2(c.root, { owner: "game-characters-three", kind: "person" });
+    return c;
+  };
+  return { build: (sp, idx) => mark(build(sp, idx)), pose, zombify, buildPerson: (p2, zed) => mark(buildPerson(p2, zed)) };
 };
 
 // src/eyes.ts
@@ -4212,7 +4219,17 @@ var player_avatar_default = {
     fem: false,
     life: 1,
     hs: "short",
-    hair: "2a1e16"
+    hair: "2a1e16",
+    pose: {
+      armL: 0,
+      armR: 0,
+      elbL: -0.12,
+      elbR: -0.12,
+      armOut: 0.11,
+      lean: 0.04,
+      headX: 0,
+      headZ: 0
+    }
   },
   shirtColor: "3d5a73"
 };
@@ -4223,9 +4240,12 @@ var MAX_GAIT = 1.4;
 var CLIP_BLEND = 0.12;
 var FALL_SECONDS2 = 0.3;
 var HIP_HEIGHT = 0.95;
-var WALK_ARM = 0.45;
+var WALK_ARM = 0.28;
 var WALK_BOB = 0.035;
 var WALK_LEAN = 0.04;
+var RUN_LEAN = 0.16;
+var RUN_BOB = 0.05;
+var REST_ARM_Z = 0.18;
 var CROUCH = { thigh: -0.95, thighWalk: 0.3, shin: 1.9, lean: 0.25, drop: -0.35 };
 var AIMED = { shoulder: -1.42, perAim: 0.85, swing: 0.02, zRight: -0.54, zLeft: 0.36, elbowRight: -0.04, elbowLeft: -0.12 };
 var DOWN = { thighWalk: 0.5, shinSwing: 0.85, shinBend: 1.3, armHigh: -2.8, armLow: -0.35, armWave: 0.3, armZ: 0.5, armZWave: 0.3, tilt: 1.5, roll: 0.3, hipY: 0.16, hipZ: 0.6, hipZFlip: 1.2 };
@@ -4234,7 +4254,18 @@ var hexOf = (value) => typeof value === "string" ? Number.parseInt(value, 16) :
 var clamp = (value, min, max) => Math.min(max, Math.max(min, value));
 var fract = (value) => value - Math.floor(value);
 var createPlayerAvatar = (THREE, options = {}) => {
-  const spec = { ...player_avatar_default.spec, ...options.spec };
+  const pose = {
+    armL: 0,
+    armR: 0,
+    elbL: -0.08,
+    elbR: -0.08,
+    lean: 0.04,
+    headX: 0,
+    headZ: 0,
+    ...player_avatar_default.spec.pose,
+    ...options.spec?.pose
+  };
+  const spec = { ...player_avatar_default.spec, ...options.spec, pose };
   for (const key of ["skin", "hair"]) if (typeof spec[key] === "string") spec[key] = hexOf(spec[key]);
   const best = createBestBuilder(THREE, { types: [{ name: String(spec.type), eye: 0 }], random: createRng4(Number(spec.seed ?? 1)) });
   const body = best.build(spec);
@@ -4269,6 +4300,41 @@ var createPlayerAvatar = (THREE, options = {}) => {
     sockets[side].position.set(HAND_OFFSET.x, HAND_OFFSET.y, HAND_OFFSET.z);
     armOf[side].el.add(sockets[side]);
   }
+  const addMesh = (parent, geometry, material, x = 0, y = 0, z = 0, rx = 0, ry = 0, rz = 0) => {
+    const mesh = new THREE.Mesh(geometry, material);
+    mesh.position.set(x, y, z);
+    if (rx || ry || rz) mesh.rotation.set(rx, ry, rz);
+    mesh.castShadow = true;
+    mesh.receiveShadow = true;
+    parent.add(mesh);
+    return mesh;
+  };
+  const hands = [];
+  rig.arms.forEach((arm, index) => {
+    const el = arm.el;
+    const side = index === 0 ? 1 : -1;
+    const oldHand = meshesOf(el).find((mesh) => Math.abs(mesh.position.y + 0.33) < 0.025);
+    const handMaterial = oldHand?.material ?? new THREE.MeshLambertMaterial({ color: colors.skin });
+    if (oldHand) {
+      oldHand.geometry?.dispose();
+      el.remove(oldHand);
+    }
+    const hg = new THREE.Group();
+    hg.name = side > 0 ? "hand_group_L" : "hand_group_R";
+    hg.position.set(side * 0.02, -0.3, 0.01);
+    el.add(hg);
+    const palm = addMesh(hg, new THREE.SphereGeometry(0.048, 14, 10), handMaterial, 0, -0.035, 0);
+    palm.scale.set(0.6, 1.05, 1);
+    const built = buildHand({ THREE, add: addMesh, hg, handM: handMaterial, s: side, detailed: true });
+    hands.push({ side, hg, fingers: built.fingers, th: built.th });
+  });
+  const setHandGrip = (hand, grip, wristX = 0) => {
+    hand.fingers.forEach((finger, j) => {
+      finger.rotation.z = -hand.side * grip * (j % 2 ? 1.1 : 0.9);
+    });
+    if (hand.th) hand.th.rotation.z = -hand.side * (0.32 + grip * 0.25);
+    hand.hg.rotation.x = wristX;
+  };
   const legRestX = rig.legs.map((leg) => leg.g.position.x);
   const legSide = (index) => index === 0 ? 1 : -1;
   let cycles = 0;
@@ -4310,6 +4376,42 @@ var createPlayerAvatar = (THREE, options = {}) => {
     });
     return { armR: shoulder, armL: shoulder, armRz: AIMED.zRight, armLz: AIMED.zLeft, elbR: AIMED.elbowRight, elbL: AIMED.elbowLeft };
   };
+  const holdingPose = (gait, itemUse) => {
+    const bob = Math.sin(cycles * TWO_PI) * 0.05 * gait;
+    if (!itemUse) {
+      return { armL: -0.45 + bob, armLz: 0.22, elbL: -1.05 };
+    }
+    const { id, position, rotation } = itemUse;
+    if (id === "drink" || id === "sip" || id === "chug") {
+      const raise2 = clamp((position[1] + 0.2) / 0.22, 0, 1);
+      const tilt3 = clamp(Math.abs(rotation[0]) / 1.22, 0, 1.15);
+      return {
+        armL: -0.45 - 0.95 * raise2 - 0.22 * tilt3,
+        armLz: 0.22 + 0.44 * raise2,
+        elbL: -1.05 - 0.85 * raise2 + 0.12 * tilt3,
+        headX: -0.26 * tilt3
+      };
+    }
+    if (id === "open" || id === "close") {
+      const reach = clamp((0.22 - position[0]) / 0.12, 0, 1);
+      return {
+        armL: -0.45 - 0.35 * reach,
+        armLz: 0.22 + 0.28 * reach,
+        elbL: -1.05 - 0.25 * reach,
+        armR: -0.78 * reach,
+        armRz: -0.48 * reach,
+        elbR: -1.25 * reach
+      };
+    }
+    const raise = clamp((position[1] + 0.2) / 0.25, 0, 1);
+    const tilt2 = clamp(Math.abs(rotation[0]) / 1.75, 0, 1.2);
+    const ext = Math.max(raise, tilt2 * 0.75);
+    return {
+      armL: -0.45 - 0.48 * ext,
+      armLz: 0.22 + 0.08 * ext,
+      elbL: -1.05 + 0.38 * ext
+    };
+  };
   const resetLegYaw = () => {
     rig.legs.forEach((leg, index) => {
       leg.g.rotation.y = 0;
@@ -4317,6 +4419,32 @@ var createPlayerAvatar = (THREE, options = {}) => {
       leg.g.position.z = 0;
     });
   };
+  const runningPose = (gait, busyHands = false) => {
+    const ph = cycles * TWO_PI;
+    const sine = Math.sin(ph);
+    const cosine = Math.cos(ph);
+    const legL = sine * 0.65 * gait;
+    const legR = -sine * 0.65 * gait;
+    const kneeL = Math.max(0, -cosine) * 1.15 * gait;
+    const kneeR = Math.max(0, cosine) * 1.15 * gait;
+    const targets = {
+      lean: RUN_LEAN * Math.min(1, gait),
+      drop: Math.abs(cosine) * RUN_BOB * gait,
+      legL,
+      legR,
+      kneeL,
+      kneeR
+    };
+    if (!busyHands) {
+      targets.armR = -0.32 - sine * 0.65 * gait;
+      targets.armL = -0.32 + sine * 0.65 * gait;
+      targets.elbR = -1.25 + Math.max(0, sine) * 0.3 * gait;
+      targets.elbL = -1.25 + Math.max(0, -sine) * 0.3 * gait;
+      targets.armRz = 0.22;
+      targets.armLz = -0.22;
+    }
+    return targets;
+  };
   const crouchPose = (gait) => {
     const swing = (leg) => {
       const legS = legSide(leg);
@@ -4412,23 +4540,44 @@ var createPlayerAvatar = (THREE, options = {}) => {
     update(dt, state = {}) {
       const speed = state.speed ?? 0;
       const moving = speed >= 0.05;
-      if (moving) cycles += dt * walkCadence(speed);
+      const down = !!state.down;
+      const running = Boolean(state.running && moving && !down && !state.crouch);
+      if (moving) cycles += dt * (running ? walkCadence(speed) * 1.3 : walkCadence(speed));
       const gait = Math.min(MAX_GAIT, walkGait(speed));
-      profile.arm = WALK_ARM * gait;
-      profile.bob = WALK_BOB * gait;
-      time = cycles / walkCadence(Math.max(speed, 0));
+      profile.arm = (running ? 0.55 : WALK_ARM) * gait;
+      profile.bob = (running ? RUN_BOB : WALK_BOB) * gait;
+      time = cycles / (walkCadence(Math.max(speed, 0)) * (running ? 1.3 : 1));
       animator.animate(body, time, { speed });
-      const down = !!state.down;
       fall = fallSeconds <= 0 ? down ? 1 : 0 : clamp(fall + (down ? dt : -dt) / fallSeconds, 0, 1);
       resetLegYaw();
       if (down) animator.setPose(rig, downPose());
       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));
+        else if (state.holding || state.itemUse) animator.setPose(rig, holdingPose(gait, state.itemUse));
+        else if (!running) {
+          animator.setPose(rig, {
+            armRz: REST_ARM_Z,
+            armLz: -REST_ARM_Z,
+            elbR: -0.12,
+            elbL: -0.12
+          });
+        }
       }
       placeBody(fall);
       stepClip(dt, down);
       if (smooth) animator.cascade(rig, 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 wristSwing = holdRight || state.armed || running ? 0 : -Math.min(1, gait) * Math.sin(ph - 0.6) * 0.12 * hand.side;
+        setHandGrip(hand, grip, wristSwing);
+      });
     },
     play(clip, playOptions = {}) {
       const found = typeof clip === "string" ? clips.get(clip) : clip;
@@ -4466,6 +4615,7 @@ import { mirrorPoseClip } from "@adatechnology/game-characters";
 
 // src/first-person/arms.ts
 import { clipEventsBetween as clipEventsBetween2, sampleFirstPersonClip } from "@adatechnology/game-characters";
+import { markKitOrigin as markKitOrigin3 } from "@adatechnology/game-contracts";
 
 // src/presets/first-person-arms.json
 var first_person_arms_default = {
@@ -4490,7 +4640,7 @@ var first_person_arms_default = {
   },
   stances: {
     relaxed: {
-      R: { p: [0.2, -0.2, -0.36], r: [0.2, 1.45, -0.4], grip: 0.35 },
+      R: { p: [0.2, -0.22, -0.36], r: [0.05, 1.57, -0.05], grip: 0.2 },
       L: "mirror"
     },
     fists: {
@@ -4634,6 +4784,10 @@ var CONTACT_MARGIN = 5e-3;
 var CONTACT_PALM = 0.03;
 var FOOT_LENGTH = 0.24;
 var FOOT_SHOWN = 1e-3;
+var AWAY_DROP = 0.55;
+var AWAY_OUT = 7;
+var AWAY_IN = 20;
+var AWAY_HIDDEN = 0.97;
 var FILL = 0.3;
 var FIRST_PERSON_STANCES = first_person_arms_default.stances;
 var FIRST_PERSON_RIG = first_person_arms_default.rig;
@@ -4692,7 +4846,7 @@ function createFirstPersonArms(THREE, options = {}) {
   const bob = { ...FIRST_PERSON_BOB, ...options.bob };
   const blendSeconds = options.blend ?? DEFAULT_BLEND;
   const clips = new Map((options.clips ?? []).map((clip) => [clip.id, clip]));
-  const root = new THREE.Group();
+  const root = markKitOrigin3(new THREE.Group(), { owner: "game-characters-three", kind: "person", id: "first-person-arms" });
   root.name = "first-person-arms";
   root.userData.viewmodel = true;
   const lit = (color) => new THREE.MeshLambertMaterial({ color, emissive: scaleHex(color, FILL) });
@@ -4747,7 +4901,7 @@ function createFirstPersonArms(THREE, options = {}) {
     const cuff = limb(root, rig.radius.cuff, rig.radius.cuff, 0.03, materials.cuff);
     const elbow = ball(root, rig.radius.elbow * 1.02, materials.sleeve);
     elbow.name = `first-person-elbow-${side}`;
-    arms[side] = { side, sign, hand, anchor, upper, fore, cuff, elbow, shown: newPose(THREE), from: newPose(THREE), mode: null, blend: 1, drawn: newPose(THREE), joints: { shoulder: new THREE.Vector3(), elbow: new THREE.Vector3(), wrist: new THREE.Vector3() } };
+    arms[side] = { side, sign, hand, anchor, upper, fore, cuff, elbow, shown: newPose(THREE), from: newPose(THREE), mode: null, blend: 1, drawn: newPose(THREE), joints: { shoulder: new THREE.Vector3(), elbow: new THREE.Vector3(), wrist: new THREE.Vector3() }, away: options.hideWhenIdle ? 1 : 0 };
   }
   const leg = new THREE.Group();
   leg.name = "first-person-leg";
@@ -4841,6 +4995,7 @@ function createFirstPersonArms(THREE, options = {}) {
   const desired = newPose(THREE);
   const channelPose = newPose(THREE);
   const mixed = newPose(THREE);
+  const dropped = newPose(THREE);
   let indexCurl;
   const bone = createTwoBone(THREE);
   const shoulder = new THREE.Vector3();
@@ -4965,11 +5120,22 @@ function createFirstPersonArms(THREE, options = {}) {
         if (arm.blend >= 1) copyPose(arm.shown, desired);
         else mixPose(THREE, arm.shown, arm.from, desired, ease(arm.blend));
         const channel = sample?.[side];
+        let pose;
         if (channel && channel.w > 0) {
           fromChannel(channel, side, arm.shown, channelPose);
           mixPose(THREE, mixed, arm.shown, channelPose, channel.w);
-          drawArm(arm, mode === "target" ? mixed : keepOutside(mixed, handReach(mixed)));
-        } else drawArm(arm, mode === "target" ? arm.shown : keepOutside(arm.shown, handReach(arm.shown)));
+          pose = mode === "target" ? mixed : keepOutside(mixed, handReach(mixed));
+        } else pose = mode === "target" ? arm.shown : keepOutside(arm.shown, handReach(arm.shown));
+        const idle = options.hideWhenIdle === true && mode === "rest:relaxed" && !(channel && channel.w > 0);
+        arm.away = options.hideWhenIdle ? Math.min(1, Math.max(0, arm.away + ((idle ? 1 : 0) - arm.away) * Math.min(1, dt * (idle ? AWAY_OUT : AWAY_IN)))) : 0;
+        if (arm.away > 0) {
+          copyPose(dropped, pose);
+          dropped.p.y -= AWAY_DROP * ease(arm.away);
+          pose = dropped;
+        }
+        drawArm(arm, pose);
+        const shown = arm.away < AWAY_HIDDEN;
+        for (const part of [arm.anchor, arm.upper, arm.fore, arm.cuff, arm.elbow]) part.visible = shown;
       }
       const foot = sample?.F;
       leg.visible = !!foot && foot.w > FOOT_SHOWN;
@@ -5016,6 +5182,7 @@ 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 },
     clips: options.firstPersonClips ?? FIRST_PERSON_CLIPS,
+    hideWhenIdle: true,
     ...options.firstPerson
   });
   const strikes = new Map((options.strikeClips ?? ATTACK_CLIPS).map((clip) => [clip.id, clip]));
@@ -5030,7 +5197,16 @@ var toRoomAvatar = (avatar, options = {}) => {
     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 }),
+    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 } : {}
+    }),
     hand: (side) => avatar.hand(side),
     strike: (clipId, strikeOptions) => {
       const clip = strikes.get(clipId);
@@ -5262,6 +5438,7 @@ export {
   lodAt,
   makeCut,
   makeStump,
+  personSpecOf,
   registerBodyMaterial,
   ringWound,
   solveTwoBone,