@adatechnology/game-weapons-three 0.16.0 → 0.17.0

package/dist/{chunk-KWJQO6JS.js → chunk-BDYIF7JD.js}

@@ -1,6 +1,6 @@
 // src/test-area/area.ts
 import { markKitOrigin as markKitOrigin6 } from "@adatechnology/game-contracts";
-import { createArsenal, genericWeapons } from "@adatechnology/game-weapons";
+import { createArsenal, genericWeapons, roundsToWarningOf } from "@adatechnology/game-weapons";
 import { furnitureSpec } from "@adatechnology/game-floorplan-three";
 import { isLightBudget, isRenderPools } from "@adatechnology/game-render-three";
 
@@ -183,6 +183,9 @@ function createAccessoryBench(options) {
     signature = "";
   });
   return {
+    get aimProgress() {
+      return aimProgress;
+    },
     handleChange(change) {
       if (change.kind === "action") return act(change.id);
       if (change.kind === "control" && change.id === SUPPORTED_CONTROL_ID && typeof change.value === "boolean") {
@@ -2460,6 +2463,7 @@ function createWeaponAudio(volume = 0.6, options = {}) {
 }
 
 // src/box-fx.ts
+import { FIRST_PERSON_LAYER } from "@adatechnology/game-contracts";
 import { createRng, muzzleEnergy as muzzleEnergy3 } from "@adatechnology/game-weapons";
 
 // src/fx/layers.ts
@@ -2521,6 +2525,8 @@ var BODY_HOLD = {
   shoulderGripTo: 0.34,
   /** The farthest apart two hands hold a long gun (a support hand past it slides back along the gun, toward the grip). */
   supportSpan: 0.5,
+  /** A gun carried at the hip (`carry: 'hip'`): its rear grip low at the right hip, a little ahead of it. */
+  hipGrip: [0.25, -0.5, -0.24],
   /** How much of the aim's pitch a tool held low in one hand follows. */
   toolPitch: 0.5
 };
@@ -2532,6 +2538,7 @@ var placeOnBody = (placement) => {
   holder.scale.setScalar(1);
   hand.position.set(...frame.position);
   hand.quaternion.set(...frame.quaternion);
+  if (placement.hip) return placeAtHip(placement);
   const shouldered = !placement.handgun && placement.left !== null && placement.lengthMetres >= BODY_HOLD.shoulderedFrom;
   if (shouldered) {
     holder.position.set(0, BODY_HOLD.boreAbove, placement.rear);
@@ -2555,6 +2562,21 @@ var placeOnBody = (placement) => {
   hand.position.add(want.sub(now));
   hand.updateMatrixWorld(true);
 };
+var placeAtHip = (placement) => {
+  const { THREE, hand, holder } = placement;
+  scratch.a ?? (scratch.a = new THREE.Vector3());
+  scratch.b ?? (scratch.b = new THREE.Vector3());
+  scratch.euler ?? (scratch.euler = new THREE.Euler());
+  const turn2 = scratch.euler.setFromQuaternion(hand.quaternion, "YXZ");
+  hand.quaternion.setFromEuler(turn2.set(turn2.x * BODY_HOLD.toolPitch, turn2.y, 0, "YXZ"));
+  holder.position.set(0, 0, 0);
+  hand.updateMatrixWorld(true);
+  if (!placement.right) return;
+  const want = scratch.a.set(...BODY_HOLD.hipGrip).applyQuaternion(hand.quaternion).add(hand.position);
+  const now = placement.right.part.localToWorld(scratch.b.copy(placement.right.offset));
+  hand.position.add(want.sub(now));
+  hand.updateMatrixWorld(true);
+};
 var limitSupportSpan = (targets) => {
   const right = targets.R?.position;
   const left = targets.L?.position;
@@ -2578,6 +2600,57 @@ var createEyeFrame = (THREE, camera) => {
   };
 };
 
+// src/fx/view-hold.ts
+var VIEW_HOLD = {
+  long: { grip: [0.2, -0.28, -0.38], fov: 84, sights: { distance: 0.34, fromRear: 0.3 } },
+  handgun: { grip: [0.13, -0.15, -0.33], fov: 76, sights: { distance: 0.42, fromRear: 0.02 } },
+  launcher: { grip: [0.2, -0.14, -0.3], fov: 84, sights: { distance: 0.18, fromRear: 0.25 } },
+  tool: { grip: [0.21, -0.31, -0.36], fov: 84, sights: { distance: 0.3, fromRear: 0.1 }, tilt: 0.3 },
+  // the gun at the hip, its rear grip low and to the right, the barrels ahead of the body; it has no sights to bring to the eye
+  hip: { grip: [0.44, -0.32, -0.42], fov: 84, sights: { distance: 0.6, fromRear: 0.1 } }
+};
+var NO_GRIP_REAR = [0.2, -0.24, -0.12];
+var SIGHT_UNDER_EYE = 0.02;
+var scratch2 = { grip: null, hip: null, aimed: null, tilt: null };
+var ease = (k) => k * k * (3 - 2 * k);
+function placeInView(placement) {
+  const { THREE, hand, holder, camera, right, box: box2, kind } = placement;
+  const hold = VIEW_HOLD[kind];
+  holder.scale.setScalar(1);
+  hand.position.copy(camera.position);
+  hand.quaternion.copy(camera.quaternion);
+  if (hold.tilt) {
+    scratch2.tilt ?? (scratch2.tilt = new THREE.Quaternion());
+    hand.quaternion.multiply(scratch2.tilt.setFromAxisAngle(new THREE.Vector3(1, 0, 0), hold.tilt));
+  }
+  hand.scale.setScalar(1);
+  holder.position.set(0, 0, 0);
+  hand.updateMatrixWorld(true);
+  scratch2.hip ?? (scratch2.hip = new THREE.Vector3());
+  const hip = scratch2.hip;
+  if (right) {
+    scratch2.grip ?? (scratch2.grip = new THREE.Vector3());
+    const grip = hand.worldToLocal(right.part.localToWorld(scratch2.grip.copy(right.offset)));
+    hip.set(hold.grip[0] - grip.x, hold.grip[1] - grip.y, hold.grip[2] - grip.z);
+  } else hip.set(NO_GRIP_REAR[0], NO_GRIP_REAR[1], NO_GRIP_REAR[2] + box2.min.x);
+  const k = ease(Math.max(0, Math.min(1, placement.aim)));
+  if (k > 0) {
+    const along = box2.min.x + hold.sights.fromRear;
+    scratch2.aimed ?? (scratch2.aimed = new THREE.Vector3());
+    hip.lerp(scratch2.aimed.set(0, -SIGHT_UNDER_EYE - box2.max.y, along - hold.sights.distance), k);
+  }
+  holder.position.copy(hip).add(placement.offset);
+  hand.updateMatrixWorld(true);
+}
+function toWorldLens(camera, point, worldFov, lensFov) {
+  const k = Math.tan(worldFov * Math.PI / 360) / Math.tan(lensFov * Math.PI / 360);
+  camera.updateMatrixWorld();
+  camera.worldToLocal(point);
+  point.x *= k;
+  point.y *= k;
+  return camera.localToWorld(point);
+}
+
 // src/fx/hand-hold.ts
 var HAND_HOLD = {
   /** Half the width of a pistol grip, the palm sits this far (plus the palm) off its middle. */
@@ -2656,6 +2729,7 @@ function holdOfModel(THREE, model, holderScale) {
   const toRoot = (x, y, z) => V(THREE, inner.position.x + x * inner.scale.x, y, z);
   const handgun = parts.family === "pistol" || parts.family === "revolver";
   root.updateWorldMatrix(true, true);
+  if (parts.holdRight || parts.holdLeft) return namedHold(THREE, model, holderScale);
   let gripAt;
   let up;
   if (parts.grip) {
@@ -2702,6 +2776,18 @@ function holdOfModel(THREE, model, holderScale) {
     gripLeft: HAND_HOLD.forend
   };
 }
+function namedHold(THREE, model, holderScale) {
+  const { parts } = model;
+  const on = (mark, fingers) => mark ? { part: mark, offset: V(THREE, 0, HAND_HOLD.palm, 0), quaternion: handFrame(THREE, fingers, V(THREE, 0, 1, 0)) } : null;
+  return {
+    right: on(parts.holdRight, V(THREE, 1, 0, 0)),
+    left: on(parts.holdLeft, V(THREE, 0, 0, 1)),
+    leftMagazine: null,
+    scale: holderScale,
+    grip: HAND_HOLD.closed,
+    gripLeft: HAND_HOLD.closed
+  };
+}
 function holdOfProp(THREE, group, category, scale) {
   const handle = group.getObjectByName("handle") ?? group.getObjectByName("body") ?? group;
   const head = group.getObjectByName("head");
@@ -3210,6 +3296,15 @@ function createBoxFx(options) {
   const q2 = new THREE.Quaternion();
   const pointForward = new THREE.Quaternion().setFromAxisAngle(new THREE.Vector3(0, 1, 0), Math.PI / 2);
   const frontOf = new THREE.Vector3();
+  const restBox = new THREE.Box3();
+  const noMotion = new THREE.Vector3();
+  let inLens = false;
+  const setLens = (on) => {
+    if (on !== inLens) options.viewmodelFov?.(on ? VIEW_HOLD.tool.fov : null);
+    inLens = on;
+    const layer = on ? FIRST_PERSON_LAYER : 0;
+    hand.traverse((node) => node.layers.set(layer));
+  };
   const equip = (weapon) => {
     if (model) hand.remove(model);
     model = null;
@@ -3217,6 +3312,8 @@ function createBoxFx(options) {
     def = arsenal.weapons.get(weapon) ?? null;
     if (!def || BODY_ACTIONS.has(def.id)) return;
     model = buildWeaponModel(THREE, def, options.items);
+    restBox.setFromObject(model);
+    inLens = false;
     const length = new THREE.Box3().setFromObject(model).getSize(v).x;
     rear = new THREE.Box3().setFromObject(model).min.x;
     lengthMetres = length;
@@ -3317,6 +3414,7 @@ function createBoxFx(options) {
   return {
     unequip() {
       if (model) hand.remove(model);
+      if (inLens) setLens(false);
       model = null;
       inHand = null;
       hold = null;
@@ -3325,6 +3423,7 @@ function createBoxFx(options) {
       if (!model || !def || !SPOUTS.has(def.action.kind)) return null;
       hand.updateMatrixWorld(true);
       const at = model.localToWorld(v.copy(frontOf));
+      if (inLens) toWorldLens(camera, at, camera.fov ?? 72, VIEW_HOLD.tool.fov);
       const along = v2.set(1, 0, 0).applyQuaternion(model.getWorldQuaternion(q2)).normalize();
       return { position: [at.x, at.y, at.z], direction: [along.x, along.y, along.z], drawsFlash: false };
     },
@@ -3347,7 +3446,13 @@ function createBoxFx(options) {
     update(dt) {
       kick *= Math.exp(-dt * 14);
       dip += ((reloading ? 1 : 0) - dip) * Math.min(1, dt * 8);
-      if (inHand && model) {
+      if (inHand && model && options.firstPerson?.()) {
+        setLens(true);
+        placeInView({ THREE, hand, holder: model, camera, right: hold?.right ?? null, box: restBox, kind: "tool", aim: 0, offset: noMotion });
+        hand.position.add(v.set(0, -0.12 * dip, 0.05 * kick).applyQuaternion(camera.quaternion));
+        hand.updateMatrixWorld(true);
+      } else if (inHand && model) {
+        if (inLens) setLens(false);
         const handgun = def?.category === "pistol" || def?.category === "revolver";
         placeOnBody({ THREE, hand, holder: model, frame: options.bodyHold?.() ?? eyeFrame(), rear, lengthMetres, handgun, right: hold?.right ?? null, left: hold?.left ?? null });
         hand.position.add(v.set(0, -0.12 * dip, 0.05 * kick).applyQuaternion(camera.quaternion));
@@ -5892,6 +5997,9 @@ function buildHousing(kit, parts, group) {
     cylinderZ(group, 0.016, 0.07, M.poly, 0.06, -0.01, side * 0.2, 14);
   }
   parts.trigger = box2(group, 0.012, 0.02, 0.016, M.dark, 0.1, 0.085, 0.14, 0.3);
+  parts.holdRight = kit.mark(group, 0.06, 6e-3, 0.2);
+  parts.holdLeft = kit.mark(group, 0.22, 0.164, 0);
+  parts.carry = "hip";
   parts.safety = box2(group, 0.014, 6e-3, 0.01, M.dark, 0.2, 0.073, -0.076, 0.4);
 }
 function buildFeed(kit, parts, group) {
@@ -6319,7 +6427,7 @@ function buildWeaponModelById(THREE, id) {
 }
 
 // src/fx/viewmodel.ts
-import { createToolClipPlayer, toolAnimationStep, warnOnce as warnOnce2 } from "@adatechnology/game-contracts";
+import { createToolClipPlayer, FIRST_PERSON_LAYER as FIRST_PERSON_LAYER2, toolAnimationStep, warnOnce as warnOnce2 } from "@adatechnology/game-contracts";
 import { discardObject3D as discardObject3D3 } from "@adatechnology/game-shapes-three";
 import { createRng as createRng2, muzzleEnergy as muzzleEnergy4 } from "@adatechnology/game-weapons";
 
@@ -6329,7 +6437,7 @@ var RELOAD_SAMPLE_HITS2 = reload_sample_hits_default.hits;
 var ROOT = "root";
 var AXIS_INDEX = { x: 0, y: 1, z: 2 };
 var EASE_STEPS = 10;
-var ease = (progress) => progress < 0.5 ? 2 * progress * progress : 1 - (-2 * progress + 2) ** 2 / 2;
+var ease2 = (progress) => progress < 0.5 ? 2 * progress * progress : 1 - (-2 * progress + 2) ** 2 / 2;
 var move = (part, axis, start, duration, from, to) => ({ part, channel: "position", axis, start, duration, from, to });
 var turn = (part, axis, start, duration, from, to) => ({ part, channel: "rotation", axis, start, duration, from, to });
 var cue = (t, type, data) => ({ t, type, ...data ? { data } : {} });
@@ -6343,7 +6451,7 @@ var valueAt = (tweens, t, includeInstants) => {
   for (const tween of tweens) {
     if (tween.start > t || tween.duration === 0 && (tween.start === t ? !includeInstants : false)) continue;
     if (tween.duration === 0 || t >= tween.start + tween.duration) value = tween.to;
-    else value = tween.from + (tween.to - tween.from) * ease((t - tween.start) / tween.duration);
+    else value = tween.from + (tween.to - tween.from) * ease2((t - tween.start) / tween.duration);
   }
   return value;
 };
@@ -7425,38 +7533,6 @@ function createEffects(THREE, sink, random) {
   };
 }
 
-// src/fx/view-hold.ts
-var VIEW_HOLD = {
-  /** The right hand's grip, from the eye. */
-  grip: [0.2, -0.2, -0.3],
-  /** A handgun's grip: higher and nearer the middle, the arms out in front. */
-  handgunGrip: [0.13, -0.15, -0.33],
-  /** A rocket launcher's grip: its tube rides on the shoulder, so the hands are higher. */
-  launcherGrip: [0.2, -0.14, -0.3],
-  /** A gun with no grip anchor: the rear of its bore, from the eye. */
-  rear: [0.2, -0.24, -0.12]
-};
-var scratch2 = { grip: null };
-function placeInView(placement) {
-  const { THREE, hand, holder, camera, right } = placement;
-  holder.scale.setScalar(1);
-  hand.position.copy(camera.position);
-  hand.quaternion.copy(camera.quaternion);
-  hand.scale.setScalar(1);
-  holder.position.set(0, 0, 0);
-  hand.updateMatrixWorld(true);
-  if (!right) {
-    holder.position.set(VIEW_HOLD.rear[0], VIEW_HOLD.rear[1], VIEW_HOLD.rear[2] + placement.rear);
-    hand.updateMatrixWorld(true);
-    return;
-  }
-  scratch2.grip ?? (scratch2.grip = new THREE.Vector3());
-  const grip = hand.worldToLocal(right.part.localToWorld(scratch2.grip.copy(right.offset)));
-  const [x, y, z] = placement.kind === "handgun" ? VIEW_HOLD.handgunGrip : placement.kind === "launcher" ? VIEW_HOLD.launcherGrip : VIEW_HOLD.grip;
-  holder.position.set(x - grip.x, y - grip.y, z - grip.z);
-  hand.updateMatrixWorld(true);
-}
-
 // src/fx/heavy.ts
 import { LIGHT_PRIORITY as LIGHT_PRIORITY2, geometryKey, materialKey } from "@adatechnology/game-render-three";
 import { discardObject3D } from "@adatechnology/game-shapes-three";
@@ -7845,11 +7921,12 @@ function createClipEventHandler(world, session) {
     switch (event.type) {
       case "muzzle_flash":
         if (data.at === "ugl") {
-          if (parts.uglMuzzle && world.layers.muzzleFlash) effects.muzzleFlash(positionOf(parts.uglMuzzle), root.getWorldQuaternion(new THREE.Quaternion()), UGL_FLASH);
+          if (parts.uglMuzzle && world.layers.muzzleFlash) world.afterPose(() => parts.uglMuzzle && effects.muzzleFlash(positionOf(parts.uglMuzzle), root.getWorldQuaternion(new THREE.Quaternion()), UGL_FLASH));
         } else if (parts.muzzle && world.layers.muzzleFlash && (session.def.action.kind === "firearm" || session.def.action.kind === "launcher")) {
           const profile = muzzleSmokeOf({ caliber: session.caliber, weapon: session.def, suppressed: session.suppressed });
           const size = session.def.action.kind === "launcher" ? 2.2 : FLASH_BY_CASE[session.caseType];
-          effects.muzzleFlash(positionOf(parts.muzzle), root.getWorldQuaternion(new THREE.Quaternion()), size, profile);
+          const muzzle = parts.muzzle;
+          world.afterPose(() => effects.muzzleFlash(positionOf(muzzle), root.getWorldQuaternion(new THREE.Quaternion()), size, profile));
         }
         break;
       case "eject_casing":
@@ -8390,7 +8467,9 @@ function workWeights(works, running) {
 
 // src/fx/viewmodel.ts
 var PI14 = Math.PI;
-var HEAT_DISPLAY_MAX_FALLBACK = 120;
+var HEAT_DISPLAY_MAX_FALLBACK = 750;
+var SMOKE_WISPS_PER_SECOND = 10;
+var SMOKE_THICKNESS_GAIN = 1.7;
 var WALL_PULL = { margin: 0.03, max: 1.2, rate: 14, probe: 3 };
 var HAND_IN_VIEW = { floor: -0.88, max: 0.3, rate: 10 };
 var LAUNCH_VOLUME = 0.6;
@@ -8409,6 +8488,7 @@ var indexCurl = (turn2, sinceShot) => {
   const held = sinceShot < TRIGGER_FINGER.burstSeconds ? TRIGGER_FINGER.pulled - TRIGGER_FINGER.tremor * (0.5 + 0.5 * Math.sin(sinceShot * 220)) : 0;
   return Math.max(ready + (TRIGGER_FINGER.pulled - ready) * pull, held);
 };
+var VIEW_MOTION = { sway: 6e-3, swayMax: 0.02, swayRate: 9, bobX: 6e-3, bobY: 8e-3, run: 1.6, fullSpeed: 4, frequency: 3.2 };
 function createViewmodel(options) {
   const { THREE, scene, camera, arsenal, groundAt, audio } = options;
   const kit = modelKit(THREE);
@@ -8416,6 +8496,11 @@ function createViewmodel(options) {
   const layers = options.layers ?? createLayers();
   const distance = () => options.soundDistance?.() ?? 0;
   const particles = createParticles(THREE, scene, groundAt, options.particleLimit);
+  const spawnParticle = particles.spawn.bind(particles);
+  particles.spawn = (object, velocity, particleOptions) => {
+    if (lens) toWorldLens(camera, object.position, worldFovOf(), lens.fov);
+    spawnParticle(object, velocity, particleOptions);
+  };
   particles.onBounce = (kind, hit) => {
     if (!audio || kind !== "casing" && kind !== "magazine") return;
     const surface = hit ? options.surfaceAt?.(hit.object.position.x, hit.object.position.z) : void 0;
@@ -8428,7 +8513,16 @@ function createViewmodel(options) {
   };
   if (!options.effects) warnOnce2("game-weapons-three.own-effects-world", "game-weapons-three made an effects world of its own because the host lent none (options.effects); pass the host effects so the effects share one budget");
   const ownVfx = options.effects ? void 0 : createVfxRenderer(THREE, { scene, camera, vfx: { profile: "medium" }, ...options.lights ? { lights: options.lights } : {} });
-  const effects = createEffects(THREE, options.effects ?? ownVfx, random);
+  const worldSink = options.effects ?? ownVfx;
+  const lensSink = worldSink ? {
+    play: (request) => {
+      if (!lens || !request.point) return worldSink.play(request);
+      const at = toWorldLens(camera, lensPoint.set(...request.point), worldFovOf(), lens.fov);
+      return worldSink.play({ ...request, point: [at.x, at.y, at.z] });
+    },
+    stop: (handle) => worldSink.stop(handle)
+  } : void 0;
+  const effects = createEffects(THREE, lensSink, random);
   const hand = new THREE.Group();
   hand.name = VIEWMODEL_NODE_NAME;
   scene.add(hand);
@@ -8454,6 +8548,7 @@ function createViewmodel(options) {
   const rootQuaternion = new THREE.Quaternion();
   const muzzleAt = new THREE.Vector3();
   const muzzleAlong = new THREE.Vector3();
+  const posed = [];
   const world = {
     kit,
     scene,
@@ -8467,13 +8562,17 @@ function createViewmodel(options) {
       const played = audio?.cue(cue2, profile, lead);
       options.onSound?.({ weapon, cue: cue2, profile, ...played ? { played } : {} });
     },
-    schedule: (delay, seconds, step, done) => void tasks.push({ delay, seconds, elapsed: 0, step: (progress) => step(ease(progress)), done })
+    afterPose: (emit) => void posed.push(emit),
+    schedule: (delay, seconds, step, done) => void tasks.push({ delay, seconds, elapsed: 0, step: (progress) => step(ease2(progress)), done })
   };
   const heatMax = arsenal.rules.heat.displayMax || HEAT_DISPLAY_MAX_FALLBACK;
   const visual = arsenal.rules.heat.visual;
   const hasSuppressor = (parts) => parts.some((part) => arsenal.attachments.get(part.id)?.kind === "suppressor");
   const release = () => {
     if (!session) return;
+    if (lens) options.viewmodelFov?.(null);
+    lens = null;
+    lensLayer = -1;
     session.attachments?.dispose();
     discardObject3D3(session.model.root);
     player = null;
@@ -8513,6 +8612,9 @@ function createViewmodel(options) {
     const modelBox = new THREE.Box3().setFromObject(model.root);
     const length = modelBox.getSize(new THREE.Vector3()).x;
     modelRear = modelBox.min.x;
+    restBox.copy(modelBox);
+    lens = null;
+    lensLayer = -1;
     holder.add(model.root);
     const caliber = caliberOf(arsenal, def);
     const dims = caliber?.cartridge;
@@ -8575,6 +8677,42 @@ function createViewmodel(options) {
   let reach = 0;
   let pull = 0;
   let lift = 0;
+  const restBox = new THREE.Box3();
+  let lens = null;
+  let lensLayer = -1;
+  const lensPoint = new THREE.Vector3();
+  const worldFovOf = () => camera.fov ?? 72;
+  const setLens = (kind) => {
+    const fov = kind ? VIEW_HOLD[kind].fov : null;
+    if ((lens?.fov ?? null) !== fov) options.viewmodelFov?.(fov);
+    lens = kind && fov !== null ? { kind, fov } : null;
+    const layer = lens ? FIRST_PERSON_LAYER2 : 0;
+    if (layer === lensLayer && !lens) return;
+    lensLayer = layer;
+    hand.traverse((node) => node.layers.set(layer));
+  };
+  const motion = { phase: 0, swayX: 0, swayY: 0, lastYaw: Number.NaN, lastPitch: Number.NaN };
+  const motionEuler = new THREE.Euler(0, 0, 0, "YXZ");
+  const motionOffset = new THREE.Vector3();
+  const viewMotion = (dt, aim) => {
+    const moving = options.motion?.() ?? { speed: 0, running: false };
+    const calm = 1 - 0.8 * Math.max(0, Math.min(1, aim));
+    motionEuler.setFromQuaternion(camera.quaternion, "YXZ");
+    const turnYaw = Number.isNaN(motion.lastYaw) || dt <= 0 ? 0 : Math.atan2(Math.sin(motionEuler.y - motion.lastYaw), Math.cos(motionEuler.y - motion.lastYaw)) / dt;
+    const turnPitch = Number.isNaN(motion.lastPitch) || dt <= 0 ? 0 : (motionEuler.x - motion.lastPitch) / dt;
+    motion.lastYaw = motionEuler.y;
+    motion.lastPitch = motionEuler.x;
+    const follow = Math.min(1, dt * VIEW_MOTION.swayRate);
+    motion.swayX += (Math.max(-VIEW_MOTION.swayMax, Math.min(VIEW_MOTION.swayMax, turnYaw * VIEW_MOTION.sway)) - motion.swayX) * follow;
+    motion.swayY += (Math.max(-VIEW_MOTION.swayMax, Math.min(VIEW_MOTION.swayMax, -turnPitch * VIEW_MOTION.sway)) - motion.swayY) * follow;
+    const stride = Math.min(1, moving.speed / VIEW_MOTION.fullSpeed) * (moving.running ? VIEW_MOTION.run : 1);
+    motion.phase += dt * moving.speed * VIEW_MOTION.frequency;
+    return motionOffset.set(
+      (motion.swayX + Math.sin(motion.phase) * VIEW_MOTION.bobX * stride) * calm,
+      (motion.swayY - Math.abs(Math.cos(motion.phase)) * VIEW_MOTION.bobY * stride) * calm,
+      0
+    );
+  };
   const ahead = new THREE.Vector3();
   const up = new THREE.Vector3();
   const seen = new THREE.Vector3();
@@ -8607,13 +8745,17 @@ function createViewmodel(options) {
     const family = session.model.parts.family;
     session.holderScale = 1;
     if (options.firstPerson?.()) {
-      placeInView({ THREE, hand, holder, camera, right: hold?.right ?? null, rear: modelRear, kind: family === "pistol" || family === "revolver" ? "handgun" : family === "rocket" ? "launcher" : "long" });
+      const kind = session.model.parts.carry === "hip" ? "hip" : family === "pistol" || family === "revolver" ? "handgun" : family === "rocket" ? "launcher" : "long";
+      const aim = kind === "hip" ? 0 : options.aim?.() ?? 0;
+      placeInView({ THREE, hand, holder, camera, right: hold?.right ?? null, box: restBox, kind, aim, offset: viewMotion(dt, aim) });
+      setLens(kind);
       lift = 0;
-      pullFromWall(dt);
+      pull = 0;
       return;
     }
+    setLens(null);
     hand.scale.set(1, 1, 1);
-    placeOnBody({ THREE, hand, holder, frame: options.bodyHold?.() ?? eyeFrame(), rear: modelRear, lengthMetres: session.lengthMetres, handgun: family === "pistol" || family === "revolver", right: hold?.right ?? null, left: hold?.left ?? null });
+    placeOnBody({ THREE, hand, holder, frame: options.bodyHold?.() ?? eyeFrame(), rear: modelRear, lengthMetres: session.lengthMetres, handgun: family === "pistol" || family === "revolver", hip: session.model.parts.carry === "hip", right: hold?.right ?? null, left: hold?.left ?? null });
     hand.updateMatrixWorld(true);
     lift += (liftToKeepInView() - lift) * Math.min(1, dt * HAND_IN_VIEW.rate);
     if (lift > 1e-4) hand.position.addScaledVector(up.set(0, 1, 0).applyQuaternion(camera.quaternion), lift);
@@ -8689,6 +8831,10 @@ function createViewmodel(options) {
       if (session) {
         place(dt);
         player?.update(dt);
+        if (posed.length) {
+          hand.updateMatrixWorld(true);
+          for (const emit of posed.splice(0)) emit();
+        }
         const wantsMagazine = reloading || options.tool?.().reloading === true;
         magazineHand += ((wantsMagazine ? 1 : 0) - magazineHand) * Math.min(1, dt * HAND_HOLD.magRate);
         const tool = options.tool?.();
@@ -8704,10 +8850,11 @@ function createViewmodel(options) {
         }
         secondsSinceShot += dt;
         if (tool && tool.heat !== void 0 && tool.heat * heatMax > visual.smokeFrom && secondsSinceShot < visual.smokeSeconds && session.model.parts.muzzle) {
-          smokeDebt += dt * (tool.heat * heatMax - visual.smokeFrom) * 0.1;
+          const smokeLevel = Math.min(1, (tool.heat * heatMax - visual.smokeFrom) / visual.smokeSpan);
+          smokeDebt += dt * smokeLevel * SMOKE_WISPS_PER_SECOND;
           while (smokeDebt > 1) {
             smokeDebt -= 1;
-            const k = 0.5 + (tool.heat * heatMax - visual.smokeFrom) / 60;
+            const k = 0.5 + smokeLevel * SMOKE_THICKNESS_GAIN;
             effects.smoke(worldPositionOf(session, session.model.parts.muzzle, new THREE.Vector3()), new THREE.Vector3((random() - 0.5) * 0.015, 0.07 + random() * 0.08, (random() - 0.5) * 0.015), 4e-3 * k, 1.2 + random() * 0.6, Math.min(0.18, 0.06 + k * 0.04));
           }
         }
@@ -8734,6 +8881,7 @@ function createViewmodel(options) {
       if (!session || !mark) return null;
       hand.updateMatrixWorld(true);
       const at = worldPositionOf(session, mark, muzzleAt);
+      if (lens) toWorldLens(camera, at, worldFovOf(), lens.fov);
       const along = muzzleAlong.set(1, 0, 0).applyQuaternion(session.model.root.getWorldQuaternion(rootQuaternion)).normalize();
       const kind = session.def.action.kind;
       return { position: [at.x, at.y, at.z], direction: [along.x, along.y, along.z], drawsFlash: kind === "firearm" || kind === "launcher" };
@@ -8743,7 +8891,8 @@ function createViewmodel(options) {
       hand.updateMatrixWorld(true);
       const targets = targetsOf(THREE, hold, session.model.root.getWorldQuaternion(rootQuaternion), magazineHand, hold.works ? workWeights(hold.works, player?.running ?? []) : void 0);
       const trigger = session.model.parts.trigger;
-      if (trigger) targets.fingers = { index: indexCurl(trigger.rotation.z - triggerRest, clock - lastShot) };
+      if (session.model.parts.carry === "hip") targets.fingers = { index: 1 };
+      else if (trigger) targets.fingers = { index: indexCurl(trigger.rotation.z - triggerRest, clock - lastShot) };
       return limitSupportSpan(targets);
     },
     get inHand() {
@@ -8793,6 +8942,9 @@ function createWeaponFx(options) {
     ...options.contact ? { contact: options.contact } : {},
     ...options.bodyHold ? { bodyHold: options.bodyHold } : {},
     ...options.firstPerson ? { firstPerson: options.firstPerson } : {},
+    ...options.viewmodelFov ? { viewmodelFov: options.viewmodelFov } : {},
+    ...options.aim ? { aim: options.aim } : {},
+    ...options.motion ? { motion: options.motion } : {},
     ...options.effects ? { effects: options.effects } : {},
     ...options.flyRocket === void 0 ? {} : { flyRocket: options.flyRocket },
     ...options.particleLimit ? { particleLimit: options.particleLimit } : {},
@@ -9910,7 +10062,7 @@ var TEXT = {
     fuseLength: "Dynamite fuse length",
     fuseLengthHint: "Metres of safety fuse (131 s per metre): a long one is set down lit, for a delayed trap",
     layers: { muzzle_flash: "Muzzle flash", casings: "Ejected casings", magazines: "Dropped magazines" },
-    metrics: { casings_live: "Casings in the scene", magazines_live: "Magazines in the scene", heat: "Barrel heat" }
+    metrics: { casings_live: "Casings in the scene", magazines_live: "Magazines in the scene", heat: "Barrel temperature above ambient", rounds_to_warning: "Rounds to the heat warning (cyclic rate, from cold)" }
   },
   "pt-BR": {
     group: "Armas",
@@ -9946,7 +10098,7 @@ var TEXT = {
     fuseLength: "Pavio da dinamite",
     fuseLengthHint: "Metros de pavio de seguran\xE7a (131 s por metro): um longo \xE9 posto no ch\xE3o aceso, para armadilha com atraso",
     layers: { muzzle_flash: "Clar\xE3o do cano", casings: "C\xE1psulas ejetadas", magazines: "Pentes que caem" },
-    metrics: { casings_live: "C\xE1psulas na cena", magazines_live: "Pentes na cena", heat: "Calor do cano" }
+    metrics: { casings_live: "C\xE1psulas na cena", magazines_live: "Pentes na cena", heat: "Temperatura do cano acima do ambiente", rounds_to_warning: "Tiros at\xE9 o aviso de calor (cad\xEAncia, a frio)" }
   }
 };
 var textOf = (locale) => TEXT[locale] ?? TEXT.en;
@@ -10070,7 +10222,12 @@ function createWeaponsTestModule(options = {}) {
   let host = null;
   let soundDistance = 0;
   let soundIndoors = false;
-  const heatPercent = () => Math.min(100, (host?.tool().heat ?? 0) * 100);
+  const barrelCelsius = () => (host?.tool().heat ?? 0) * arsenal.rules.heat.displayMax;
+  const roundsToWarning = () => {
+    const weaponId = host?.tool().weapon;
+    const rounds = weaponId ? roundsToWarningOf(arsenal, weaponId) : Infinity;
+    return Number.isFinite(rounds) ? rounds : "-";
+  };
   return {
     id: "weapons_area",
     name: text.name,
@@ -10123,7 +10280,8 @@ function createWeaponsTestModule(options = {}) {
     metrics: () => [
       { id: "casings_live", name: text.metrics.casings_live, read: () => fx?.casings ?? 0 },
       { id: "magazines_live", name: text.metrics.magazines_live, read: () => fx?.magazines ?? 0 },
-      { id: "heat", name: text.metrics.heat, unit: "%", max: 100, digits: 0, read: heatPercent },
+      { id: "heat", name: text.metrics.heat, unit: "\xB0C", max: arsenal.rules.heat.displayMax, digits: 0, read: barrelCelsius },
+      { id: "rounds_to_warning", name: text.metrics.rounds_to_warning, read: roundsToWarning },
       ...accessoryMetrics(accessoryText, () => host?.tool() ?? EMPTY_TOOL)
     ],
     attach(lent) {
@@ -10166,6 +10324,10 @@ function createWeaponsTestModule(options = {}) {
         contact: createLaserRaycast(lent.THREE, lent.scene, lent.camera, { now: () => simulatedMs }),
         ...lent.holdFrame ? { bodyHold: () => lent.holdFrame?.() ?? null } : {},
         firstPerson: () => lent.player().cameraMode === "first",
+        // the lens of the gun in first person, how far it is brought to the eye (the right button) and how the body moves (the bob and the sway follow it)
+        ...lent.setViewmodelFov ? { viewmodelFov: (degrees) => lent.setViewmodelFov?.(degrees) } : {},
+        aim: () => accessories.aimProgress,
+        motion: () => ({ speed: lent.player().speed, running: lent.player().running }),
         ...lent.effects ? { effects: lent.effects } : {},
         ...lent.particleLimit ? { particleLimit: lent.particleLimit } : {},
         ...isLightBudget(lent.lights) ? { lights: lent.lights } : {},
@@ -11268,6 +11430,8 @@ export {
   weaponSampleDefaults,
   weaponSampleBank,
   createWeaponAudio,
+  VIEW_HOLD,
+  toWorldLens,
   BODY_ACTIONS,
   weaponProp,
   buildProp,
@@ -11302,6 +11466,7 @@ export {
   buildCartridge,
   buildCasing,
   buildRound,
+  VIEW_MOTION,
   createWeaponFx,
   buildModeledProp,
   buildTripodMountedProp,
@@ -11329,4 +11494,4 @@ export {
   DEFAULT_EXPLOSIVES_SCENE,
   createExplosivesTestModule
 };
-//# sourceMappingURL=chunk-KWJQO6JS.js.map
+//# sourceMappingURL=chunk-BDYIF7JD.js.map