@adatechnology/game-test-room 0.26.0 → 0.28.0

package/dist/index.js

@@ -1,8 +1,9 @@
 // src/room.ts
 import { createDestruction, JOINT_DEFAULTS, resolveStrings as resolveDestructionStrings } from "@adatechnology/game-destruction";
 import { createAudioEngine, createAudioSink, loadKitSamples, loadUserSamples } from "@adatechnology/game-audio";
-import { createDestructionRenderer, createDestructionSound, dragSoundKey, impactKey, impactSoundKeys, specFromObject3D } from "@adatechnology/game-destruction-three";
-import { bodyMass, KNOCK_CHEST, KNOCK_DOWN_SPEED, knockOf, surfaceOfMaterial } from "@adatechnology/game-contracts";
+import { registerFittedSounds } from "@adatechnology/game-audio/fitted";
+import { createDestructionRenderer, createDestructionSound, dragSoundKey, impactKey, impactSoundIds, impactSoundKeys, specFromObject3D } from "@adatechnology/game-destruction-three";
+import { bodyMass, FIRST_PERSON_LAYER, KNOCK_CHEST, KNOCK_DOWN_SPEED, knockOf, surfaceOfMaterial } from "@adatechnology/game-contracts";
 
 // src/body-sounds.ts
 import { BODY_FOLEY_BANK } from "@adatechnology/game-audio";
@@ -2153,6 +2154,7 @@ function createNarrator(c) {
 
 // src/player.ts
 import { stepKnock } from "@adatechnology/game-contracts";
+var RECOIL_RETURN = { share: 0.7, seconds: 0.25 };
 var SLAM_MIN_SPEED = 1.5;
 var LANDING_MIN_SPEED = 1;
 var EYE = 1.7;
@@ -2182,6 +2184,18 @@ function createPlayer(THREE, o) {
   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;
@@ -2523,6 +2537,7 @@ function createPlayer(THREE, o) {
       return stunLeft;
     },
     update(dt) {
+      returnRecoil(dt);
       if (stunLeft > 0) {
         stunLeft = Math.max(0, stunLeft - dt);
         stunPhase += dt * 2.4;
@@ -2571,6 +2586,8 @@ function createPlayer(THREE, o) {
     },
     setPose(position, yw, pt) {
       knocked = null;
+      recoilDebt.pitch = 0;
+      recoilDebt.yaw = 0;
       px.x = position[0];
       px.z = position[2];
       floorLevel = floorHere();
@@ -2583,6 +2600,8 @@ function createPlayer(THREE, o) {
     },
     look(position, target) {
       knocked = null;
+      recoilDebt.pitch = 0;
+      recoilDebt.yaw = 0;
       px.x = position[0];
       px.z = position[2];
       floorLevel = floorHere();
@@ -2597,8 +2616,11 @@ function createPlayer(THREE, o) {
       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) {
@@ -5498,6 +5520,7 @@ function createTestRoom(options) {
   const scene = options.scene ?? new THREE.Scene();
   const camera = options.camera ?? new THREE.PerspectiveCamera(72, width() / height(), 0.05, 140);
   if (!options.camera) scene.add(camera);
+  camera.layers.disable(FIRST_PERSON_LAYER);
   const resize = () => {
     const w = width();
     const h = height();
@@ -5577,13 +5600,14 @@ function createTestRoom(options) {
       const preload = () => {
         window.removeEventListener("keydown", preload, true);
         window.removeEventListener("pointerdown", preload, true);
-        void audio.loadSamples([...HAND_RECORDED_IDS]).catch(() => void 0);
+        void audio.loadSamples([...HAND_RECORDED_IDS, ...impactSoundIds()]).catch(() => void 0);
       };
       window.addEventListener("keydown", preload, true);
       window.addEventListener("pointerdown", preload, true);
     });
   }
   const bodySounds = createBodySounds(audio);
+  if (audio && options.fittedSounds !== false) registerFittedSounds(audio);
   const playSound = (key2, point, volume, detail) => {
     destructionSound?.onSound(key2, point, volume, detail);
     if (detail) options.onSound?.(key2, point, volume, detail);
@@ -6588,10 +6612,21 @@ function createTestRoom(options) {
     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";
+    scene.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, camera);
+    avatar.setView?.(cameraMode, camera, { arms: firstPersonArms !== null });
+  };
+  const updateFirstPersonArms = (dt) => {
+    if (!firstPersonArms || cameraMode !== "first") return;
+    firstPersonArms.update(dt, { camera, 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;
@@ -6675,6 +6710,39 @@ function createTestRoom(options) {
   };
   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) {
+      scene.traverse((node) => {
+        if (node.isLight) node.layers.enable(FIRST_PERSON_LAYER);
+      });
+    }
+    firstPersonCamera.position.copy(camera.position);
+    firstPersonCamera.quaternion.copy(camera.quaternion);
+    const fov = viewmodelFov ?? camera.fov;
+    if (firstPersonCamera.fov !== fov || firstPersonCamera.aspect !== camera.aspect) {
+      firstPersonCamera.fov = fov;
+      firstPersonCamera.aspect = camera.aspect;
+      firstPersonCamera.updateProjectionMatrix();
+    }
+    firstPersonCamera.updateMatrixWorld();
+    const { autoClear } = renderer2;
+    const { background, fog } = scene;
+    renderer2.autoClear = false;
+    scene.background = null;
+    scene.fog = null;
+    renderer2.clearDepth();
+    renderer2.render(scene, firstPersonCamera);
+    scene.background = background;
+    scene.fog = fog;
+    renderer2.autoClear = autoClear ?? true;
+  };
   let debugView = null;
   let lastHand = { stance: "relaxed", triggerFinger: null, targets: null };
   const strikeClips = options.strikeClips ?? DEFAULT_STRIKE_CLIPS;
@@ -6822,7 +6890,7 @@ function createTestRoom(options) {
       const line = new THREE.Line(g, tracerMat);
       line.frustumCulled = false;
       scene.add(line);
-      tr = { line, life: 0 };
+      tr = { line, life: 0, follows: false };
       tracers.push(tr);
     }
     const attr = tr.line.geometry.getAttribute("position");
@@ -6831,6 +6899,7 @@ function createTestRoom(options) {
     attr.needsUpdate = true;
     tr.line.visible = true;
     tr.life = 0.07;
+    tr.follows = muzzleSource !== null;
   };
   const fireZones = [];
   const burningStains = [];
@@ -8146,10 +8215,16 @@ function createTestRoom(options) {
     }
   };
   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();
@@ -8183,6 +8258,7 @@ function createTestRoom(options) {
   };
   const updatePresent = (dt) => {
     reachAvatar();
+    updateFirstPersonArms(dt);
     if (progress && simTime - progress.at > 0.25) progress = null;
     ui?.flushLog();
     hudAcc += dt;
@@ -8532,6 +8608,9 @@ function createTestRoom(options) {
         if (handSource === source) handSource = null;
       };
     },
+    setViewmodelFov(degrees) {
+      viewmodelFov = degrees;
+    },
     setMuzzleSource(source) {
       muzzleSource = source;
       return () => {
@@ -9263,7 +9342,9 @@ function createTestRoom(options) {
         for (const batcher of batchers.values()) batcher.update();
         const restoreCamera = room.applyCamera();
         graphics?.beforeRender(camera);
-        gl.render(scene, debugView ?? moduleViews.main(camera));
+        const view = debugView ?? moduleViews.main(camera);
+        gl.render(scene, view);
+        if (view === camera && cameraMode === "first") drawFirstPersonLayer();
         moduleViews.render(scene);
         graphics?.afterRender();
         restoreCamera();