@adatechnology/game-characters-three 0.9.6 → 0.11.0

package/dist/index.js

@@ -1048,6 +1048,7 @@ var createPlayerAvatar = (THREE, options = {}) => {
     parent.add(mesh);
     return mesh;
   };
+  const TRIGGER_CURL = 1.22;
   const hands = [];
   rig.arms.forEach((arm, index) => {
     const el = arm.el;
@@ -1080,6 +1081,7 @@ var createPlayerAvatar = (THREE, options = {}) => {
   eyeSocket.position.set(BUILDER_EYE[0] + eyeOffset[0], BUILDER_EYE[1] + eyeOffset[1], BUILDER_EYE[2] + eyeOffset[2]);
   rig.headG.children[0].add(eyeSocket);
   const headHider = createHeadHider([rig.headG, ...rig.neck ? [rig.neck] : []]);
+  const armsHider = createHeadHider(rig.arms.map((arm) => arm.g));
   const eyeLocal = new THREE.Vector3();
   let bob = 0;
   let hipWithoutBob = null;
@@ -1427,7 +1429,10 @@ var createPlayerAvatar = (THREE, options = {}) => {
       root.updateWorldMatrix(true, false);
       return root.localToWorld(out.copy(eyeLocal));
     },
-    setView: (mode, camera) => headHider.setView(mode, camera),
+    setView: (mode, camera, viewOptions) => {
+      headHider.setView(mode, camera);
+      armsHider.setView(viewOptions?.arms ? mode : "third", camera);
+    },
     play(clip, playOptions = {}) {
       const found = typeof clip === "string" ? clips.get(clip) : clip;
       if (!found) throw new Error(`Unknown pose clip: ${String(clip)}`);
@@ -1444,6 +1449,13 @@ var createPlayerAvatar = (THREE, options = {}) => {
       if (run || fall > 0) return;
       root.updateMatrixWorld(true);
       armReach.apply(targets, view);
+      for (const hand of hands) {
+        const curl = hand.side < 0 ? targets?.fingers?.index : targets?.fingersL?.index;
+        if (curl === void 0 || !hand.fingers[1]) continue;
+        const k = TRIGGER_CURL * Math.min(1, Math.max(0, curl));
+        hand.fingers[0].rotation.z = -hand.side * k * 0.9;
+        hand.fingers[1].rotation.z = -hand.side * k * 1.1;
+      }
     },
     on(_type, listener) {
       listeners.add(listener);
@@ -1533,7 +1545,7 @@ var toRoomAvatar = (avatar, options = {}) => {
     root: avatar.root,
     avatar,
     eye: (out) => avatar.eye(out),
-    setView: (mode, camera) => avatar.setView(mode, camera),
+    setView: (mode, camera, options2) => avatar.setView(mode, camera, options2),
     update: (dt, state) => {
       stepGuard(dt, state);
       updateFeet(state);
@@ -1898,7 +1910,7 @@ function createFirstPersonArms(THREE, options = {}) {
   const channelPose = newPose(THREE);
   const mixed = newPose(THREE);
   const dropped = newPose(THREE);
-  let indexCurl;
+  const indexCurl = { R: void 0, L: void 0 };
   const bone = createTwoBone(THREE);
   const shoulder = new THREE.Vector3();
   const wristAt = new THREE.Vector3();
@@ -1962,7 +1974,7 @@ function createFirstPersonArms(THREE, options = {}) {
     arm.anchor.quaternion.copy(pose.q);
     arm.anchor.scale.setScalar(scale);
     arm.hand.setGrip(pose.grip);
-    arm.hand.setIndex(arm.side === "R" ? indexCurl : void 0);
+    arm.hand.setIndex(indexCurl[arm.side]);
     arm.joints.shoulder.copy(shoulder);
     arm.joints.elbow.copy(bone.joint);
     arm.joints.wrist.copy(bone.end);
@@ -2048,7 +2060,7 @@ function createFirstPersonArms(THREE, options = {}) {
           desired.p.add(bobOffset);
         }
         modeOf(mode, arm);
-        if (side === "R") indexCurl = mode === "target" ? targets?.fingers?.index : void 0;
+        indexCurl[side] = mode === "target" ? side === "R" ? targets?.fingers?.index : targets?.fingersL?.index : void 0;
         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));