@adatechnology/game-test-room 0.27.0 → 0.28.0

package/dist/index.d.ts

@@ -485,7 +485,9 @@ interface RoomAvatar {
      */
     eye?(out?: THREE_NS.Vector3): THREE_NS.Vector3;
     /** Hides the head and neck from `camera` while the view is `first` (shadows, mirrors and other cameras keep seeing them). */
-    setView?(mode: CameraMode, camera: THREE_NS.Object3D | null): void;
+    setView?(mode: CameraMode, camera: THREE_NS.Object3D | null, options?: {
+        readonly arms?: boolean;
+    }): void;
     /**
      * Plays the strike `clipId` (on the body, in both views) and answers the seconds until its impact, or null when this avatar has no such clip. The room then waits that long
      * before the blow lands (`strikeClips`); an avatar without `strike`, or one that answers null, gets the blow at the click.
@@ -704,6 +706,19 @@ interface SceneryTap {
     /** Turn about the vertical axis, radians (default 0). */
     rotationY?: number;
 }
+/** What the room needs of first-person arms: a root it puts in the scene, and the pose of each frame (the eye, the hand targets of the tool and the stance, how fast the body moves). */
+interface RoomFirstPersonArms {
+    readonly root: THREE_NS.Object3D;
+    update(dt: number, state: {
+        camera: THREE_NS.Object3D;
+        targets?: HandTargets | null;
+        stance?: string;
+        speed?: number;
+        running?: boolean;
+        crouch?: boolean;
+    }): void;
+    dispose(): void;
+}
 interface TestRoomOptions {
     THREE: ThreeNamespace;
     /** Element the bench fills (canvas + HUD). */
@@ -790,6 +805,11 @@ interface TestRoomOptions {
     ui?: boolean;
     /** The player's body (see `TestRoom.setAvatar`). */
     avatar?: RoomAvatar;
+    /**
+     * Arms drawn for the first-person view (the viewmodel arms, `createFirstPersonArms` of game-characters-three fits it): in first person the room hides the body's arms from the eye, draws
+     * these on `FIRST_PERSON_LAYER` with the tool in the hands, and brings their hands to the tool's grips. Absent: the body's arms are the ones seen.
+     */
+    firstPersonArms?: RoomFirstPersonArms;
     /** The view the room starts in (default `first`; the V key and `TestRoom.setCameraMode` change it). */
     cameraMode?: CameraMode;
     /**
@@ -1299,4 +1319,4 @@ declare function encodeBenchState(controls: readonly BenchControl[], layers: rea
 /** Reads an encoded state as hostile input: unknown ids, NaN, options not offered and malformed pairs are dropped; numbers are clamped. */
 declare function decodeBenchState(encoded: string, controls: readonly ModuleControl[], layers: readonly ModuleLayer[]): Map<string, ControlValue>;
 
-export { type AnimationInfo, type BenchControl, type BenchHandle, type BenchLayer, type BuildFromSpecOptions, type CameraMode, DEFAULT_HAND_STANCES, DEFAULT_STRIKE_CLIPS, DEFAULT_TRIALS, type HudState, type InspectInfo, type KickLeg, LOADING_CLASS, LOADING_CSS, type LoadingOptions, type LoadingState, type LogEntry, MATERIAL_COLORS, type ModuleReport, type NewEntry, type NewLogEntry, type ProjectileModel, type ProjectileQuery, type PunchHand, type RoomAvatar, type RoomAvatarState, type RoomDoorEvent, type RoomDoorState, type RoomFirstPersonState, type RoomGraphicsOptions, type RoomLoading, type RoomMetricId, type RoomPushEvent, type RoomPushState, type RoomReachView, type RoomSeat, type RoomStrings, type ScenarioContext, type ScenarioReport, type SceneryObject, type SceneryTap, type SpawnedObject, type StrikeComboOption, TRIAL_KINDS, type TestRoom, type TestRoomItem, type TestRoomLocale, type TestRoomLog, type TestRoomOptions, type TestRoomScenario, type TestTable, type TestTableContext, type TestTableObject, type TestTableOptions, type TestTablePage, type ThirdPersonOptions, type ThreeNamespace, type ToolMenuGroup, type ToolMenuSection, type ToolMenuTool, type TrialKind, type TrialTool, type UseStatus, type WritableLog, brickWallSpec, buildFromSpec, createLoading, createLog, createTestRoom, createTestTable, decodeBenchState, encodeBenchState, fitRow, loadingMarkup, locales, nextPaint, resolveStrings, rowCentres, trialView };
+export { type AnimationInfo, type BenchControl, type BenchHandle, type BenchLayer, type BuildFromSpecOptions, type CameraMode, DEFAULT_HAND_STANCES, DEFAULT_STRIKE_CLIPS, DEFAULT_TRIALS, type HudState, type InspectInfo, type KickLeg, LOADING_CLASS, LOADING_CSS, type LoadingOptions, type LoadingState, type LogEntry, MATERIAL_COLORS, type ModuleReport, type NewEntry, type NewLogEntry, type ProjectileModel, type ProjectileQuery, type PunchHand, type RoomAvatar, type RoomAvatarState, type RoomDoorEvent, type RoomDoorState, type RoomFirstPersonArms, type RoomFirstPersonState, type RoomGraphicsOptions, type RoomLoading, type RoomMetricId, type RoomPushEvent, type RoomPushState, type RoomReachView, type RoomSeat, type RoomStrings, type ScenarioContext, type ScenarioReport, type SceneryObject, type SceneryTap, type SpawnedObject, type StrikeComboOption, TRIAL_KINDS, type TestRoom, type TestRoomItem, type TestRoomLocale, type TestRoomLog, type TestRoomOptions, type TestRoomScenario, type TestTable, type TestTableContext, type TestTableObject, type TestTableOptions, type TestTablePage, type ThirdPersonOptions, type ThreeNamespace, type ToolMenuGroup, type ToolMenuSection, type ToolMenuTool, type TrialKind, type TrialTool, type UseStatus, type WritableLog, brickWallSpec, buildFromSpec, createLoading, createLog, createTestRoom, createTestTable, decodeBenchState, encodeBenchState, fitRow, loadingMarkup, locales, nextPaint, resolveStrings, rowCentres, trialView };

package/dist/index.global.js

@@ -473,6 +473,7 @@ var GameTestRoom = (() => {
     if (!state.opened) return "sealed";
     return void 0;
   };
+  var FIRST_PERSON_LAYER = 9;
   var TWIST_LIFT = 0.012;
   var TURNING = 0.7;
   var smooth = (k) => k * k * (3 - 2 * k);
@@ -38174,7 +38175,9 @@ void main(){vec2 d=gl_PointCoord-.5;float r=length(d)*2.;if(r>1.)discard;float a
       dimensions: {
         length: 0.801,
         barrel: 0.559,
-        emptyMass: 39
+        emptyMass: 39,
+        barrels: 6,
+        barrelMass: 2
       },
       archetype: "rifle_7_62x39",
       sources: [
@@ -39154,19 +39157,41 @@ void main(){vec2 d=gl_PointCoord-.5;float r=length(d)*2.;if(r>1.)discard;float a
     }
   };
   var DEFAULT_HEAT = {
-    cap: 140,
-    displayMax: 120,
-    decayBase: 1.6,
-    decayPerPoint: 0.03,
-    faultFrom: 60,
-    faultSpan: 40,
-    perShot: { shell: 3, big: 6, tiny: 0.5, pistol: 1.2, rifle: 2 },
+    cap: 900,
+    displayMax: 750,
+    faultFrom: 350,
+    faultSpan: 200,
+    specificHeat: 490,
+    barrelShare: { shell: 0.48, big: 0.48, tiny: 0.3, pistol: 0.3, rifle: 0.48 },
+    barrelKilogramsPerMetre: {
+      pistol: 1,
+      revolver: 1.4,
+      smg: 1.2,
+      carbine: 1.6,
+      rifle: 1.6,
+      dmr: 2.4,
+      sniper: 2.4,
+      hunting: 2.4,
+      machine_gun: 3,
+      shotgun: 1.1
+    },
+    barrelFallback: { metres: 0.4, kilogramsPerMetre: 1.6 },
+    cooling: { baseSeconds: 30, secondsPerKilogram: 250 },
     perRocket: 35,
-    visual: { smokeFrom: 70, smokeSeconds: 2.5, glowFrom: 80, glowSpan: 40 }
+    visual: { smokeFrom: 250, smokeSpan: 300, smokeSeconds: 2.5, glowFrom: 450, glowSpan: 300 }
   };
   var GALLERY_HEAT = {
     ...DEFAULT_HEAT,
-    perShot: { shell: 6, big: 9, tiny: 1.2, pistol: 3, rifle: 4.5 }
+    cap: 140,
+    displayMax: 120,
+    faultFrom: 60,
+    faultSpan: 40,
+    visual: { smokeFrom: 70, smokeSpan: 100, smokeSeconds: 2.5, glowFrom: 80, glowSpan: 40 },
+    gallery: {
+      perShot: { shell: 6, big: 9, tiny: 1.2, pistol: 3, rifle: 4.5 },
+      decayBase: 1.6,
+      decayPerPoint: 0.03
+    }
   };
   var defaultFaultChance = (context) => {
     const factor = context.def.action.kind === "firearm" ? context.def.action.faultFactor ?? 1 : 1;
@@ -39449,17 +39474,55 @@ void main(){vec2 d=gl_PointCoord-.5;float r=length(d)*2.;if(r>1.)discard;float a
       ...explosive.stunSeconds !== void 0 ? { stunSeconds: explosive.stunSeconds } : {}
     };
   };
+  var EPS22 = 1e-9;
+  var MANUAL_MODES = /* @__PURE__ */ new Set(["pump", "bolt", "lever"]);
+  var weaponSpeed = (action, caliber) => action.muzzleSpeed ?? caliber.muzzleSpeed * (action.barrel ?? 1);
+  var weaponNoise = (action, caliber) => action.noise ?? caliber.noise ?? 0;
+  var timingsOf = (action) => "timings" in action ? action.timings : void 0;
+  var drawSeconds = (action, rules) => timingsOf(action)?.draw ?? rules.draw;
+  var clearSeconds = (action, rules) => timingsOf(action)?.clear ?? rules.clear;
+  var manualCycleSeconds = (action, mode) => MANUAL_MODES.has(mode) ? action.timings?.cycle ?? 0 : 0;
+  var planRounds = (action, mode, ammo, firstAt, frameEnd) => {
+    const interval = 60 / action.rpm;
+    const times = [];
+    if (mode === "auto") {
+      for (let t = firstAt; times.length < ammo && (times.length === 0 ? t <= frameEnd + EPS22 : t < frameEnd - EPS22); t += interval) times.push(t);
+      return times;
+    }
+    if (mode === "burst") {
+      const count = Math.min(action.burst ?? 3, ammo);
+      for (let k = 0; k < count; k++) times.push(firstAt + k * interval);
+      return times;
+    }
+    if (mode === "volley") return Array.from({ length: Math.min(action.magazine, ammo) }, () => firstAt);
+    return [firstAt];
+  };
   var SUBSTEP_SECONDS = 1 / 60;
-  var decayHeat = (heat, seconds, rules) => {
+  var barrelMassOf = (def, rules) => {
+    const dimensions = def.dimensions;
+    const kilogramsPerMetre = rules.barrelKilogramsPerMetre[def.category] ?? rules.barrelFallback.kilogramsPerMetre;
+    const single = dimensions?.barrelMass ?? (dimensions?.barrel ?? rules.barrelFallback.metres) * kilogramsPerMetre;
+    return single * (dimensions?.barrels ?? 1);
+  };
+  var coolingTimeConstant = (barrelMass, rules) => rules.cooling.baseSeconds + rules.cooling.secondsPerKilogram * barrelMass;
+  var decayHeat = (heat, seconds, barrelMass, rules) => {
+    if (heat <= 0) return 0;
+    if (rules.gallery) return decayGallery(heat, seconds, rules.gallery);
+    return heat * Math.exp(-seconds / coolingTimeConstant(barrelMass, rules));
+  };
+  var decayGallery = (heat, seconds, gallery) => {
     const steps = Math.max(1, Math.ceil(seconds / SUBSTEP_SECONDS - 1e-9));
     const step = seconds / steps;
     let current = heat;
-    for (let i = 0; i < steps && current > 0; i++) current = Math.max(0, current - step * (rules.decayBase + current * rules.decayPerPoint));
+    for (let i = 0; i < steps && current > 0; i++) current = Math.max(0, current - step * (gallery.decayBase + current * gallery.decayPerPoint));
     return current;
   };
-  var heatPerRound = (action, caliber, rules) => {
+  var heatPerRound = ({ action, caliber, energy, barrelMass, rules }) => {
     if (action.kind === "launcher") return rules.perRocket;
-    return caliber?.caseType ? rules.perShot[caliber.caseType] : 0;
+    const caseType = caliber?.caseType;
+    if (!caseType) return 0;
+    if (rules.gallery) return rules.gallery.perShot[caseType];
+    return rules.barrelShare[caseType] * energy / (barrelMass * rules.specificHeat);
   };
   var burstNoise = (base, recentShots, rules) => base * (1 + Math.min(rules.cap, rules.step * recentShots));
   var magazineOut = { stage: "magazine_out", at: 0 };
@@ -39586,29 +39649,6 @@ void main(){vec2 d=gl_PointCoord-.5;float r=length(d)*2.;if(r>1.)discard;float a
     return roll.ammoQuality.faultChance > 0 && roll.random() < roll.ammoQuality.faultChance ? "misfire" : null;
   };
   var isDudWithoutJam = (action, fault) => fault === "misfire" && action.kind === "firearm" && MISFIRE_ONLY.has(action.family);
-  var EPS22 = 1e-9;
-  var MANUAL_MODES = /* @__PURE__ */ new Set(["pump", "bolt", "lever"]);
-  var weaponSpeed = (action, caliber) => action.muzzleSpeed ?? caliber.muzzleSpeed * (action.barrel ?? 1);
-  var weaponNoise = (action, caliber) => action.noise ?? caliber.noise ?? 0;
-  var timingsOf = (action) => "timings" in action ? action.timings : void 0;
-  var drawSeconds = (action, rules) => timingsOf(action)?.draw ?? rules.draw;
-  var clearSeconds = (action, rules) => timingsOf(action)?.clear ?? rules.clear;
-  var manualCycleSeconds = (action, mode) => MANUAL_MODES.has(mode) ? action.timings?.cycle ?? 0 : 0;
-  var planRounds = (action, mode, ammo, firstAt, frameEnd) => {
-    const interval = 60 / action.rpm;
-    const times = [];
-    if (mode === "auto") {
-      for (let t = firstAt; times.length < ammo && (times.length === 0 ? t <= frameEnd + EPS22 : t < frameEnd - EPS22); t += interval) times.push(t);
-      return times;
-    }
-    if (mode === "burst") {
-      const count = Math.min(action.burst ?? 3, ammo);
-      for (let k = 0; k < count; k++) times.push(firstAt + k * interval);
-      return times;
-    }
-    if (mode === "volley") return Array.from({ length: Math.min(action.magazine, ammo) }, () => firstAt);
-    return [firstAt];
-  };
   var activeParts = (fitted, catalogue) => fitted.flatMap((part) => {
     const def = catalogue.get(part.id);
     const isOn = def?.kind !== "light" && def?.kind !== "laser" ? true : part.on === true;
@@ -39841,6 +39881,10 @@ void main(){vec2 d=gl_PointCoord-.5;float r=length(d)*2.;if(r>1.)discard;float a
     get safety() {
       return this._safety;
     }
+    /** Kg of steel that heat up with the shots. */
+    get barrelMass() {
+      return barrelMassOf(this.def, this.rules.heat);
+    }
     get heat() {
       return this._heat;
     }
@@ -39893,7 +39937,7 @@ void main(){vec2 d=gl_PointCoord-.5;float r=length(d)*2.;if(r>1.)discard;float a
     }
     advance(seconds) {
       if (seconds <= 0) return;
-      this._heat = decayHeat(this._heat, seconds, this.rules.heat);
+      this._heat = decayHeat(this._heat, seconds, this.barrelMass, this.rules.heat);
       this.clock += seconds;
     }
     /** Complete what falls at or before `t`: scheduled events and the reload steps. */
@@ -40445,7 +40489,7 @@ void main(){vec2 d=gl_PointCoord-.5;float r=length(d)*2.;if(r>1.)discard;float a
         res.shots.push(shot);
       }
       this._ammo -= 1;
-      this._heat = Math.min(this.rules.heat.cap, this._heat + heatPerRound(a, cal, this.rules.heat) * this.load.heatFactor);
+      this._heat = Math.min(this.rules.heat.cap, this._heat + heatPerRound({ action: a, caliber: cal, energy: energy * pellets, barrelMass: this.barrelMass, rules: this.rules.heat }) * this.load.heatFactor);
       this.readyAt = t + 60 / a.rpm;
       this.extra = Math.min(bloomNow + (a.bloomDeg ?? 0), a.spreadDeg * (BLOOM_CAP - 1));
       this.extraClock = t;
@@ -40534,7 +40578,7 @@ void main(){vec2 d=gl_PointCoord-.5;float r=length(d)*2.;if(r>1.)discard;float a
       }
       const t = Math.max(start, this.readyAt);
       this._ammo -= 1;
-      this._heat = Math.min(this.rules.heat.cap, this._heat + heatPerRound(a, null, this.rules.heat));
+      this._heat = Math.min(this.rules.heat.cap, this._heat + heatPerRound({ action: a, caliber: null, energy: 0, barrelMass: this.barrelMass, rules: this.rules.heat }));
       this.emit({ type: "shot", shots: 0, rounds: 1, mode: this.mode, at: t });
       return result("ok", { uses: launcherUses(a, this.explosive, origin, dir), recoil: [a.recoil[0], a.recoil[1]], noise: a.noise ?? 0, rounds: 1, roundTimes: [t - start] });
     }
@@ -49409,6 +49453,7 @@ void main(){
   }
 
   // src/player.ts
+  var RECOIL_RETURN = { share: 0.7, seconds: 0.25 };
   var SLAM_MIN_SPEED2 = 1.5;
   var LANDING_MIN_SPEED = 1;
   var EYE = 1.7;
@@ -49438,6 +49483,18 @@ void main(){
     const cam = o.camera;
     let yaw = 0;
     let pitch = 0;
+    const recoilReturn = o.recoilReturn ?? RECOIL_RETURN;
+    const recoilDebt = { pitch: 0, yaw: 0 };
+    const returnRecoil = (dt) => {
+      if (Math.abs(recoilDebt.pitch) + Math.abs(recoilDebt.yaw) < 1e-6) return;
+      const k = 1 - Math.exp(-3 * dt / Math.max(1e-3, recoilReturn.seconds));
+      const back = { pitch: recoilDebt.pitch * k, yaw: recoilDebt.yaw * k };
+      recoilDebt.pitch -= back.pitch;
+      recoilDebt.yaw -= back.yaw;
+      pitch = Math.max(-1.5, Math.min(1.5, pitch - back.pitch));
+      yaw -= back.yaw;
+      apply();
+    };
     let y = 0;
     let eye = EYE;
     let crouch = 0;
@@ -49779,6 +49836,7 @@ void main(){
         return stunLeft;
       },
       update(dt) {
+        returnRecoil(dt);
         if (stunLeft > 0) {
           stunLeft = Math.max(0, stunLeft - dt);
           stunPhase += dt * 2.4;
@@ -49827,6 +49885,8 @@ void main(){
       },
       setPose(position, yw, pt2) {
         knocked = null;
+        recoilDebt.pitch = 0;
+        recoilDebt.yaw = 0;
         px.x = position[0];
         px.z = position[2];
         floorLevel = floorHere();
@@ -49839,6 +49899,8 @@ void main(){
       },
       look(position, target) {
         knocked = null;
+        recoilDebt.pitch = 0;
+        recoilDebt.yaw = 0;
         px.x = position[0];
         px.z = position[2];
         floorLevel = floorHere();
@@ -49853,8 +49915,11 @@ void main(){
         apply();
       },
       kick(pitchDeg, yawDeg) {
+        const before = pitch;
         pitch = Math.max(-1.5, Math.min(1.5, pitch + pitchDeg * Math.PI / 180));
         yaw += yawDeg * Math.PI / 180;
+        recoilDebt.pitch += (pitch - before) * recoilReturn.share;
+        recoilDebt.yaw += yawDeg * Math.PI / 180 * recoilReturn.share;
         apply();
       },
       moveBy(dx, dz) {
@@ -55519,6 +55584,7 @@ ${SURFACE_GLSL}`).replace("#include <color_fragment>", "#include <color_fragment
     const scene2 = options.scene ?? new THREE.Scene();
     const camera2 = options.camera ?? new THREE.PerspectiveCamera(72, width() / height(), 0.05, 140);
     if (!options.camera) scene2.add(camera2);
+    camera2.layers.disable(FIRST_PERSON_LAYER);
     const resize = () => {
       const w = width();
       const h = height();
@@ -56610,10 +56676,21 @@ ${SURFACE_GLSL}`).replace("#include <color_fragment>", "#include <color_fragment
       return { ...pose, position: pose.at(camDistance), free: camDistance };
     };
     const thirdActive = () => cameraMode === "third" && avatar !== null;
+    const firstPersonArms = options.firstPersonArms ?? null;
+    if (firstPersonArms) {
+      firstPersonArms.root.visible = cameraMode === "first";
+      scene2.add(firstPersonArms.root);
+    }
     const syncAvatarVisible = () => {
+      if (firstPersonArms) firstPersonArms.root.visible = cameraMode === "first";
       if (!avatar) return;
       avatar.root.visible = cameraMode === "third" || !!avatar.eye;
-      avatar.setView?.(cameraMode, camera2);
+      avatar.setView?.(cameraMode, camera2, { arms: firstPersonArms !== null });
+    };
+    const updateFirstPersonArms = (dt) => {
+      if (!firstPersonArms || cameraMode !== "first") return;
+      firstPersonArms.update(dt, { camera: camera2, targets: lastHand.targets, stance: lastHand.stance, speed: player.speed, running: avatarState.running, crouch: avatarState.crouch });
+      firstPersonArms.root.traverse((node) => node.layers.set(FIRST_PERSON_LAYER));
     };
     const setCameraMode = (mode) => {
       if (mode !== "first" && mode !== "third") return;
@@ -56697,6 +56774,39 @@ ${SURFACE_GLSL}`).replace("#include <color_fragment>", "#include <color_fragment
     };
     let handSource = null;
     let muzzleSource = null;
+    let viewmodelFov = null;
+    const firstPersonCamera = new THREE.PerspectiveCamera(72, 1, 0.01, 30);
+    firstPersonCamera.layers.set(FIRST_PERSON_LAYER);
+    let firstPersonPasses = 0;
+    const drawFirstPersonLayer = () => {
+      if (!firstPersonArms && viewmodelFov === null) return;
+      const renderer2 = gl;
+      if (typeof renderer2.clearDepth !== "function" || typeof renderer2.render !== "function") return;
+      if (firstPersonPasses++ % 60 === 0) {
+        scene2.traverse((node) => {
+          if (node.isLight) node.layers.enable(FIRST_PERSON_LAYER);
+        });
+      }
+      firstPersonCamera.position.copy(camera2.position);
+      firstPersonCamera.quaternion.copy(camera2.quaternion);
+      const fov = viewmodelFov ?? camera2.fov;
+      if (firstPersonCamera.fov !== fov || firstPersonCamera.aspect !== camera2.aspect) {
+        firstPersonCamera.fov = fov;
+        firstPersonCamera.aspect = camera2.aspect;
+        firstPersonCamera.updateProjectionMatrix();
+      }
+      firstPersonCamera.updateMatrixWorld();
+      const { autoClear } = renderer2;
+      const { background, fog } = scene2;
+      renderer2.autoClear = false;
+      scene2.background = null;
+      scene2.fog = null;
+      renderer2.clearDepth();
+      renderer2.render(scene2, firstPersonCamera);
+      scene2.background = background;
+      scene2.fog = fog;
+      renderer2.autoClear = autoClear ?? true;
+    };
     let debugView = null;
     let lastHand = { stance: "relaxed", triggerFinger: null, targets: null };
     const strikeClips = options.strikeClips ?? DEFAULT_STRIKE_CLIPS;
@@ -56844,7 +56954,7 @@ ${SURFACE_GLSL}`).replace("#include <color_fragment>", "#include <color_fragment
         const line = new THREE.Line(g, tracerMat);
         line.frustumCulled = false;
         scene2.add(line);
-        tr = { line, life: 0 };
+        tr = { line, life: 0, follows: false };
         tracers.push(tr);
       }
       const attr = tr.line.geometry.getAttribute("position");
@@ -56853,6 +56963,7 @@ ${SURFACE_GLSL}`).replace("#include <color_fragment>", "#include <color_fragment
       attr.needsUpdate = true;
       tr.line.visible = true;
       tr.life = 0.07;
+      tr.follows = muzzleSource !== null;
     };
     const fireZones = [];
     const burningStains = [];
@@ -58168,10 +58279,16 @@ ${SURFACE_GLSL}`).replace("#include <color_fragment>", "#include <color_fragment
       }
     };
     const simulateAfterModules = (dt) => {
+      const drawn = tracers.some((tr) => tr.life > 0 && tr.follows) ? muzzleSource?.() ?? null : null;
       for (const tr of tracers) {
         if (tr.life > 0) {
           tr.life -= dt;
           if (tr.life <= 0) tr.line.visible = false;
+          else if (tr.follows && drawn) {
+            const attr = tr.line.geometry.getAttribute("position");
+            attr.setXYZ(0, drawn.position[0], drawn.position[1], drawn.position[2]);
+            attr.needsUpdate = true;
+          }
         }
       }
       flush();
@@ -58205,6 +58322,7 @@ ${SURFACE_GLSL}`).replace("#include <color_fragment>", "#include <color_fragment
     };
     const updatePresent = (dt) => {
       reachAvatar();
+      updateFirstPersonArms(dt);
       if (progress && simTime - progress.at > 0.25) progress = null;
       ui?.flushLog();
       hudAcc += dt;
@@ -58554,6 +58672,9 @@ ${SURFACE_GLSL}`).replace("#include <color_fragment>", "#include <color_fragment
           if (handSource === source) handSource = null;
         };
       },
+      setViewmodelFov(degrees) {
+        viewmodelFov = degrees;
+      },
       setMuzzleSource(source) {
         muzzleSource = source;
         return () => {
@@ -59285,7 +59406,9 @@ ${SURFACE_GLSL}`).replace("#include <color_fragment>", "#include <color_fragment
           for (const batcher of batchers.values()) batcher.update();
           const restoreCamera = room.applyCamera();
           graphics?.beforeRender(camera2);
-          gl.render(scene2, debugView ?? moduleViews.main(camera2));
+          const view = debugView ?? moduleViews.main(camera2);
+          gl.render(scene2, view);
+          if (view === camera2 && cameraMode === "first") drawFirstPersonLayer();
           moduleViews.render(scene2);
           graphics?.afterRender();
           restoreCamera();