@adatechnology/game-weapons-three 0.11.0 → 0.11.1

package/dist/index.js

@@ -1616,9 +1616,7 @@ var HAND_HOLD = {
   /** How far the shooting hand slides on its grip so the thumb reaches the safety lever. */
   thumbReach: 0.02,
   /** How fast the supporting hand goes to the magazine and back, per second. */
-  magRate: 7,
-  /** The hands shrink with the tool: a tool drawn at scale `s` takes hands at `s ** handScaleExponent`. */
-  handScaleExponent: 0.55
+  magRate: 7
 };
 var handFrame = (THREE, x, y) => {
   const ax = x.clone().normalize();
@@ -1708,7 +1706,8 @@ function holdOfModel(THREE, model, holderScale) {
     right,
     left,
     leftMagazine,
-    scale: holderScale ** HAND_HOLD.handScaleExponent,
+    // the hands at the tool's scale: a tool drawn smaller than the hands looks like a toy in them
+    scale: holderScale,
     grip: HAND_HOLD.closed,
     gripLeft: HAND_HOLD.forend
   };
@@ -1723,7 +1722,7 @@ function holdOfProp(THREE, group, category, scale) {
   const long = head && ["smg", "carbine", "rifle", "sniper", "shotgun", "crossbow", "flame"].includes(category);
   const headSize = head ? size(head) : null;
   const left = long && head && headSize ? { part: group, offset: head.position.clone().add(V(THREE, -headSize.x * 0.15, -headSize.y / 2 - HAND_HOLD.palm, 0)), quaternion: forendFrame(THREE) } : null;
-  return { right, left, leftMagazine: null, scale: scale ** HAND_HOLD.handScaleExponent, grip: HAND_HOLD.closed, gripLeft: HAND_HOLD.forend };
+  return { right, left, leftMagazine: null, scale, grip: HAND_HOLD.closed, gripLeft: HAND_HOLD.forend };
 }
 
 // src/props.ts
@@ -7355,7 +7354,7 @@ function createViewmodel(options) {
     ahead.set(0, 0, -1).applyQuaternion(camera.quaternion);
     if (reach === 0) reach = Math.max(0.01, measureReach(session));
     const free = options.contact(camera.position, ahead, WALL_PULL.probe);
-    const want = free === null ? 0 : Math.max(0, Math.min(WALL_PULL.max, reach + WALL_PULL.margin - free));
+    const want = free === null ? 0 : Math.max(0, Math.min(Math.max(WALL_PULL.max, session.lengthMetres * session.holderScale), reach + WALL_PULL.margin - free));
     pull += (want - pull) * Math.min(1, dt * WALL_PULL.rate);
     if (pull < 1e-4) return;
     hand.position.addScaledVector(ahead, -pull);