@adatechnology/game-weapons-three 0.11.0 → 0.11.2

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
@@ -3289,7 +3288,7 @@ var models_default = {
 };
 
 // src/models/kit.ts
-import { shapeGeometries } from "@adatechnology/game-shapes-three";
+import { markShared, shapeGeometries } from "@adatechnology/game-shapes-three";
 
 // src/models/rounded-box.ts
 var uvAlong = (THREE, faceDirection, normal, uvAxis, projectionAxis, radius, sideLength) => {
@@ -3361,7 +3360,7 @@ var createMaterials = (THREE) => {
   const standard = (color, roughness = 0.7, metalness = 0.2, extra = {}) => new THREE.MeshStandardMaterial({ color, roughness, metalness, ...extra });
   const basic = (color, extra = {}) => new THREE.MeshBasicMaterial({ color, ...extra });
   const additive = { transparent: true, opacity: 0.95, blending: THREE.AdditiveBlending, depthWrite: false };
-  return {
+  const materials = {
     metal: standard(3422010, 0.42, 0.75),
     steel: standard(7106418, 0.32, 0.85),
     steelL: standard(9080208, 0.28, 0.9),
@@ -3400,6 +3399,8 @@ var createMaterials = (THREE) => {
     bakelite: standard(6958620, 0.6, 0),
     polyMag: standard(2763302, 0.85, 0)
   };
+  markShared(...Object.values(materials));
+  return materials;
 };
 var kits = /* @__PURE__ */ new WeakMap();
 function modelKit(host) {
@@ -3428,6 +3429,7 @@ function modelKit(host) {
       let geometry = geometries.get(key);
       if (!geometry) {
         geometry = radius > 25e-5 ? createRoundedBoxGeometry(THREE, w, h, d, 2, radius) : new THREE.BoxGeometry(w, h, d);
+        markShared(geometry);
         geometries.set(key, geometry);
       }
       const mesh = place(parent, shadowed(new THREE.Mesh(geometry, material)), x, y, z);
@@ -5209,6 +5211,7 @@ function createBoxFx(options) {
 }
 
 // src/fx/viewmodel.ts
+import { discardObject3D as discardObject3D3 } from "@adatechnology/game-shapes-three";
 import { createToolClipPlayer, toolAnimationStep } from "@adatechnology/game-contracts";
 import { createRng as createRng2, muzzleEnergy as muzzleEnergy3 } from "@adatechnology/game-weapons";
 
@@ -6266,6 +6269,7 @@ function createEffects(THREE, sink, random) {
 }
 
 // src/fx/heavy.ts
+import { discardObject3D } from "@adatechnology/game-shapes-three";
 var PI12 = Math.PI;
 var ROCKET_LIGHT_NAME = "rocket-light";
 var rocketsInFlight = /* @__PURE__ */ new WeakMap();
@@ -6319,7 +6323,7 @@ function launchRocket(context, flyRound = true) {
       if (random() < 0.9) context.effects.smoke(rocket.position.clone().addScaledVector(forward, -0.12), new THREE.Vector3((random() - 0.5) * 0.1, 0.05, (random() - 0.5) * 0.1), 0.02 + random() * 0.015, 2.2, 0.5);
     },
     () => {
-      rocket.removeFromParent();
+      discardObject3D(rocket);
       exhaust.geometry.dispose();
       exhaust.material.dispose();
       const remaining = (rocketsInFlight.get(light) ?? 1) - 1;
@@ -6495,6 +6499,7 @@ var toWorld = (session, vector, scaled = false) => {
 };
 
 // src/fx/viewmodel-events.ts
+import { discardObject3D as discardObject3D2 } from "@adatechnology/game-shapes-three";
 import { muzzleSmokeOf } from "@adatechnology/game-weapons";
 var PI13 = Math.PI;
 var UGL_FLASH = 1.6;
@@ -6657,7 +6662,7 @@ function createClipEventHandler(world, session) {
     session.model.inner.add(shell);
     shell.position.set(-0.25, 0, 0);
     world.schedule(0.02, 0.4, (eased) => shell.position.x = -0.25 + 0.6 * eased, () => {
-      shell.removeFromParent();
+      discardObject3D2(shell);
     });
   }
 }
@@ -7218,7 +7223,7 @@ function createViewmodel(options) {
   const release = () => {
     if (!session) return;
     session.attachments?.dispose();
-    session.model.root.removeFromParent();
+    discardObject3D3(session.model.root);
     player = null;
     session = null;
     tasks = [];
@@ -7355,7 +7360,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);
@@ -8861,6 +8866,7 @@ import { EXPLOSIONS } from "@adatechnology/game-vfx";
 import { createArsenal as createArsenal2 } from "@adatechnology/game-weapons";
 
 // src/explosives-bench.ts
+import { discardObject3D as discardObject3D4 } from "@adatechnology/game-shapes-three";
 import { markKitOrigin as markKitOrigin5 } from "@adatechnology/game-contracts";
 
 // src/explosives-text.ts
@@ -9137,7 +9143,7 @@ function createExplosivesBench(options) {
     vessel.rings = group;
   };
   const clearRings = (vessel) => {
-    vessel.rings?.removeFromParent();
+    if (vessel.rings) discardObject3D4(vessel.rings);
     vessel.rings = void 0;
   };
   const phaseOf = (vessel) => {
@@ -9226,7 +9232,7 @@ function createExplosivesBench(options) {
     }
   };
   const clearShells = () => {
-    for (const shell of shells) shell.mesh.removeFromParent();
+    discardObject3D4(shells.map((shell) => shell.mesh));
     shells.length = 0;
   };
   const fullVitality = /* @__PURE__ */ new Map();