@adatechnology/game-weapons-three 0.5.0 → 0.6.1

package/dist/index.js

@@ -290,16 +290,26 @@ var ACCESSORY_TEXT = {
 var accessoryTextOf = (locale) => ACCESSORY_TEXT[locale] ?? ACCESSORY_TEXT.en;
 
 // src/audio.ts
-import { createRng } from "@adatechnology/game-weapons";
+import { MIX_PROFILES, createAudioEngine } from "@adatechnology/game-audio";
 
 // src/audio/mechanical-sounds.ts
 var metal = (at, frequency, gain) => ({ layer: "metal", at, frequency, gain });
 var sound = (at, soundClass, volume) => ({ layer: "class", at, soundClass, volume });
 var thud = (at, gain, frequency) => ({ layer: "thud", at, gain, frequency });
+var sceneClick = (at, f, vol) => [
+  { layer: "scene_tone", at, wave: "square", f, f2: f * 0.7, d: 0.02, vol },
+  { layer: "scene_noise", at, type: "highpass", f: 3e3, q: 0.7, d: 0.03, vol: vol * 0.8 }
+];
+var sceneNoise = (at, type, f, q, d, vol) => ({ layer: "scene_noise", at, type, f, q, d, vol });
+var sceneEmpty = sceneClick(0, 3200, 0.35);
+var sceneMagOut = [...sceneClick(0, 1600, 0.4), sceneNoise(0.03, "bandpass", 900, 2, 0.08, 0.3)];
+var sceneMagIn = [...sceneClick(0, 1100, 0.5), { layer: "scene_tone", at: 0, wave: "sine", f: 320, f2: 200, d: 0.05, vol: 0.35 }];
+var sceneBolt = [...sceneClick(0, 2200, 0.4), ...sceneClick(0.12, 2700, 0.4)];
+var sceneShell = [...sceneClick(0, 1400, 0.35), sceneNoise(0.02, "bandpass", 1200, 3, 0.05, 0.25)];
 var slide = [metal(0, 900, 0.35), metal(0.14, 1300, 0.35)];
 var seat = [metal(0, 1100, 0.45), sound(0, "reload", 0.8)];
 var MECHANICAL_SOUNDS = {
-  dry_fire: [sound(0, "empty", 1), metal(0, 2600, 0.25)],
+  dry_fire: [sound(0, "empty", 1), ...sceneEmpty],
   misfire: [sound(0, "empty", 0.8), metal(0, 2200, 0.2)],
   feed: [metal(0, 1900, 0.2)],
   cycle: [metal(0.22, 900, 0.35), metal(0.36, 1300, 0.35)],
@@ -312,11 +322,11 @@ var MECHANICAL_SOUNDS = {
   stock_fold: [metal(0, 800, 0.3), metal(0.18, 1200, 0.3), thud(0.3, 0.2, 600)],
   light_click: [metal(0, 2400, 0.2), metal(0.03, 1800, 0.12)],
   attach: [metal(0, 1400, 0.35), thud(0.04, 0.2, 700), metal(0.12, 1900, 0.25)],
-  magazine_out: [metal(0, 1500, 0.35), sound(0, "reload", 0.6)],
-  magazine_in: seat,
-  charge: slide,
+  magazine_out: [...sceneMagOut, sound(0, "reload", 0.6)],
+  magazine_in: [...sceneMagIn, sound(0, "reload", 0.8)],
+  charge: sceneBolt,
   bolt_open: [metal(0, 900, 0.35)],
-  round_in: [metal(0, 2e3, 0.2), sound(0, "reload", 0.6)],
+  round_in: [...sceneShell, sound(0, "reload", 0.6)],
   bolt_close: [metal(0, 1300, 0.35)],
   pump_cycle: slide,
   lever_cycle: [metal(0, 1e3, 0.35), metal(0.12, 1500, 0.35)],
@@ -371,6 +381,9 @@ var mechanicalSoundOf = (event) => {
   }
 };
 
+// src/audio/recipes.ts
+import { DISTANCE_CURVES } from "@adatechnology/game-audio";
+
 // src/audio/shot-sound.ts
 import { muzzleEnergy } from "@adatechnology/game-weapons";
 var GAME_SOUND_CLASSES = {
@@ -457,100 +470,185 @@ var computeShotSound = (input, options = {}) => {
   };
 };
 
+// src/audio/recipes.ts
+var CLASS_BURST_ID = "weapon_class_burst";
+var BURST_IDS = { lowpass: "weapon_burst_lowpass", highpass: "weapon_burst_highpass" };
+var SCENE_NOISE_IDS = { lowpass: "scene_noise_lowpass", highpass: "scene_noise_highpass", bandpass: "scene_noise_bandpass" };
+var SCENE_TONE_IDS = { sine: "scene_tone_sine", square: "scene_tone_square" };
+var TONE_IDS = { sine: "weapon_tone_sine", sine_sweep: "weapon_tone_sine_sweep", square: "weapon_tone_square" };
+var SOURCE_CLASS_BURST = "jogo:L62097-62110 sfx: lowpass noise, gain set at once, exponential fall to 0.001, stopped 0.05 s later";
+var SOURCE_SDK = "sdk: the weapon synth of weapons-three (burst and tone), moved onto game-audio with the same nodes";
+var FIT = { kind: "noise", offset: "fit" };
+function classBurstId(curve) {
+  const same = curve.gainFalloff === GAME_DISTANCE_CURVE.gainFalloff && curve.cutoffFalloff === GAME_DISTANCE_CURVE.cutoffFalloff && curve.minGain === GAME_DISTANCE_CURVE.minGain;
+  return same ? CLASS_BURST_ID : `${CLASS_BURST_ID}@${curve.gainFalloff},${curve.cutoffFalloff},${curve.minGain}`;
+}
+function classBurstRecipe(curve) {
+  return {
+    id: classBurstId(curve),
+    bus: "weapons",
+    order: "weapon",
+    duration: { param: "seconds" },
+    layers: [
+      {
+        gain: { param: "gain" },
+        source: FIT,
+        filters: { mode: "serial", bank: [{ type: "lowpass", frequency: { set: { param: "cutoff" } } }] },
+        envelope: [
+          [0, 1, "set"],
+          ["1d", 1e-3, "exp", "fixed"]
+        ]
+      }
+    ],
+    falloff: { model: "inverse_square", k: curve.gainFalloff, cutoffK: curve.cutoffFalloff, minGain: curve.minGain },
+    sources: [SOURCE_CLASS_BURST]
+  };
+}
+var burstLayer = (type) => ({
+  gain: { param: "gain" },
+  source: FIT,
+  filters: { mode: "serial", bank: [{ type, frequency: { set: { param: "frequency" } }, q: { param: "q" } }] },
+  envelope: [
+    [0, 1e-4, "set", "fixed"],
+    [4e-3, 1, "exp"],
+    ["1d", 1e-4, "exp", "fixed"]
+  ]
+});
+var burstRecipe = (type) => ({
+  id: BURST_IDS[type],
+  bus: "weapons",
+  order: "weapon",
+  duration: { param: "seconds" },
+  layers: [burstLayer(type)],
+  falloff: { model: "none" },
+  sources: [SOURCE_SDK]
+});
+var toneLayer = (wave, sweep) => ({
+  gain: { param: "gain" },
+  source: { kind: "osc", wave, frequency: sweep ? { from: { param: "frequency" }, to: { param: "to" }, curve: "exp", over: "duration" } : { from: { param: "frequency" } } },
+  envelope: [
+    [0, 1e-4, "set", "fixed"],
+    [3e-3, 1, "exp"],
+    ["1d", 1e-4, "exp", "fixed"]
+  ]
+});
+var toneRecipe = (id, wave, sweep) => ({
+  id,
+  bus: "weapons",
+  order: "weapon",
+  duration: { param: "seconds" },
+  layers: [toneLayer(wave, sweep)],
+  falloff: { model: "none" },
+  sources: [SOURCE_SDK]
+});
+var SOURCE_SCENE = "cena:L1323-L1324 sNoise and sTone, played at the listener (distance 0), through the art scene output stage";
+var SCENE_ATTACK = 2e-3;
+var sceneNoiseRecipe = (type, slide2) => ({
+  id: slide2 ? `${SCENE_NOISE_IDS[type]}_slide` : SCENE_NOISE_IDS[type],
+  bus: "weapons",
+  order: "layered",
+  duration: { param: "d", add: SCENE_ATTACK },
+  pan: true,
+  layers: [
+    {
+      gain: { param: "vol" },
+      source: { kind: "noise", offset: "random", offsetScale: 1.5, loop: true },
+      filters: { mode: "serial", bank: [{ type, frequency: slide2 ? { set: { param: "f" }, to: { param: "f2" }, curve: "exp", over: { param: "d" } } : { set: { param: "f" } }, q: { param: "q" } }] },
+      envelope: [
+        [0, 1e-4, "set", "fixed"],
+        [SCENE_ATTACK, 1, "exp"],
+        ["1d", 1e-4, "exp", "fixed"]
+      ]
+    }
+  ],
+  falloff: DISTANCE_CURVES.art_scene,
+  sources: [SOURCE_SCENE]
+});
+var sceneToneRecipe = (wave) => ({
+  id: SCENE_TONE_IDS[wave],
+  bus: "weapons",
+  order: "layered",
+  duration: { param: "d", add: SCENE_ATTACK },
+  pan: true,
+  layers: [
+    {
+      gain: { param: "vol" },
+      source: { kind: "osc", wave, frequency: { from: { param: "f" }, to: { param: "f2" }, curve: "exp", over: "duration" } },
+      envelope: [
+        [0, 1e-4, "set", "fixed"],
+        [SCENE_ATTACK, 1, "exp"],
+        ["1d", 1e-4, "exp", "fixed"]
+      ]
+    }
+  ],
+  falloff: DISTANCE_CURVES.art_scene,
+  sources: [SOURCE_SCENE]
+});
+function weaponRecipes(curve) {
+  return [
+    classBurstRecipe(curve),
+    burstRecipe("lowpass"),
+    burstRecipe("highpass"),
+    toneRecipe(TONE_IDS.sine, "sine", false),
+    toneRecipe(TONE_IDS.sine_sweep, "sine", true),
+    toneRecipe(TONE_IDS.square, "square", false),
+    ...["lowpass", "highpass", "bandpass"].flatMap((type) => [sceneNoiseRecipe(type, false), sceneNoiseRecipe(type, true)]),
+    sceneToneRecipe("sine"),
+    sceneToneRecipe("square")
+  ];
+}
+
 // src/audio.ts
 var NOISE_SECONDS = 1.5;
-var globalContext = () => {
-  const scope2 = globalThis;
-  const Ctor = scope2.AudioContext ?? scope2.webkitAudioContext;
-  return Ctor ? new Ctor() : null;
-};
+var DEFAULT_SEED = 1;
 function createWeaponAudio(volume = 0.6, options = {}) {
-  const makeContext = options.createContext ?? globalContext;
-  const rng = createRng(options.seed ?? 1);
+  const seed = options.seed ?? DEFAULT_SEED;
   const classes = { ...GAME_SOUND_CLASSES, ...options.classes };
   const distanceCurve = { ...GAME_DISTANCE_CURVE, ...options.distance };
   const mechanicalTable = { ...MECHANICAL_SOUNDS, ...options.mechanical };
-  let ctx = null;
-  let master = null;
-  let noise = null;
-  let level = volume;
-  const ready = () => {
-    if (!ctx) {
-      const created = makeContext();
-      if (!created) return null;
-      ctx = created;
-      master = ctx.createGain();
-      master.gain.value = level;
-      master.connect(ctx.destination);
-      noise = ctx.createBuffer(1, Math.floor(ctx.sampleRate * NOISE_SECONDS), ctx.sampleRate);
-      const data = noise.getChannelData(0);
-      for (let i = 0; i < data.length; i++) data[i] = rng() * 2 - 1;
-    }
-    if (ctx.state === "suspended") void ctx.resume();
-    return ctx;
-  };
+  const shared = options.engine;
+  const engine = shared ?? createAudioEngine({
+    seed,
+    mix: { ...MIX_PROFILES.game, master: volume, noise: { seconds: NOISE_SECONDS, create: "eager" } },
+    maxVoices: Number.POSITIVE_INFINITY,
+    ...options.createContext ? { createContext: options.createContext } : {}
+  });
+  const channel = shared && options.seed !== void 0 ? shared.channel({ seed }) : engine.channel({});
+  engine.register({ id: `weapons_three@${classBurstId(distanceCurve)}`, sounds: weaponRecipes(distanceCurve) });
+  const classBurst = classBurstId(distanceCurve);
   const burst = (config) => {
-    const audio = ready();
-    if (!audio || !noise || !master) return;
-    const start = audio.currentTime + (config.at ?? 0);
-    const source = audio.createBufferSource();
-    source.buffer = noise;
-    const filter = audio.createBiquadFilter();
-    filter.type = config.filter;
-    filter.frequency.value = config.frequency;
-    filter.Q.value = config.q ?? 0.8;
-    const gain = audio.createGain();
-    gain.gain.setValueAtTime(1e-4, start);
-    gain.gain.exponentialRampToValueAtTime(Math.max(config.gain, 2e-4), start + 4e-3);
-    gain.gain.exponentialRampToValueAtTime(1e-4, start + config.seconds);
-    source.connect(filter).connect(gain).connect(master);
-    source.start(start, rng() * Math.max(0, NOISE_SECONDS - config.seconds));
-    source.stop(start + config.seconds + 0.05);
+    const id = config.filter === "highpass" ? BURST_IDS.highpass : BURST_IDS.lowpass;
+    const params = { frequency: config.frequency, q: config.q ?? 0.8, gain: Math.max(config.gain, 2e-4), seconds: config.seconds };
+    channel.play(id, { params, ...config.at ? { delay: config.at } : {} });
   };
-  const classBurst = (at, cutoff, gain, seconds) => {
-    const audio = ready();
-    if (!audio || !noise || !master) return;
-    const start = audio.currentTime + at;
-    const source = audio.createBufferSource();
-    source.buffer = noise;
-    const filter = audio.createBiquadFilter();
-    filter.type = "lowpass";
-    filter.frequency.value = cutoff;
-    const envelope = audio.createGain();
-    envelope.gain.setValueAtTime(gain, start);
-    envelope.gain.exponentialRampToValueAtTime(1e-3, start + seconds);
-    source.connect(filter).connect(envelope).connect(master);
-    source.start(start, rng() * Math.max(0, NOISE_SECONDS - seconds));
-    source.stop(start + seconds + 0.05);
+  const classBurstAt = (at, cutoff, gain, seconds) => {
+    channel.play(classBurst, { params: { cutoff, gain, seconds }, ...at ? { delay: at } : {} });
   };
   const tone = (config) => {
-    const audio = ready();
-    if (!audio || !master) return;
-    const start = audio.currentTime + (config.at ?? 0);
-    const osc = audio.createOscillator();
-    osc.type = config.type ?? "sine";
-    osc.frequency.setValueAtTime(config.frequency, start);
-    if (config.to) osc.frequency.exponentialRampToValueAtTime(config.to, start + config.seconds);
-    const gain = audio.createGain();
-    gain.gain.setValueAtTime(1e-4, start);
-    gain.gain.exponentialRampToValueAtTime(Math.max(config.gain, 2e-4), start + 3e-3);
-    gain.gain.exponentialRampToValueAtTime(1e-4, start + config.seconds);
-    osc.connect(gain).connect(master);
-    osc.start(start);
-    osc.stop(start + config.seconds + 0.05);
+    const id = config.to ? TONE_IDS.sine_sweep : config.type === "square" ? TONE_IDS.square : TONE_IDS.sine;
+    const params = { frequency: config.frequency, gain: Math.max(config.gain, 2e-4), seconds: config.seconds, ...config.to ? { to: config.to } : {} };
+    channel.play(id, { params, ...config.at ? { delay: config.at } : {} });
   };
   const metal2 = (at, frequency, gain) => {
     burst({ at, seconds: 0.05, gain, filter: "highpass", frequency, q: 2 });
     tone({ at, seconds: 0.04, gain: gain * 0.6, frequency: frequency * 0.6, type: "square" });
   };
   const play = (soundClass, classVolume = 1, distance = 0, at = 0) => {
-    const attenuation = classVolume / (1 + distance * distance * distanceCurve.gainFalloff);
-    if (attenuation < distanceCurve.minGain) return;
     const [cutoff, gain, seconds] = classes[soundClass] ?? FALLBACK_SOUND_CLASS;
-    classBurst(at, cutoff / (1 + distance * distanceCurve.cutoffFalloff), gain * attenuation, seconds);
+    channel.play(classBurst, { volume: classVolume, distance, params: { cutoff, gain, seconds }, ...at ? { delay: at } : {} });
+  };
+  const sceneTone = (entry) => {
+    channel.play(SCENE_TONE_IDS[entry.wave], { params: { f: entry.f, f2: entry.f2 ?? entry.f, d: entry.d, vol: entry.vol }, ...entry.at ? { delay: entry.at } : {} });
+  };
+  const sceneNoise2 = (entry) => {
+    const slide2 = entry.f2 !== void 0;
+    const id = slide2 ? `${SCENE_NOISE_IDS[entry.type]}_slide` : SCENE_NOISE_IDS[entry.type];
+    channel.play(id, { params: { f: entry.f, ...slide2 ? { f2: entry.f2 } : {}, q: entry.q, d: entry.d, vol: entry.vol }, ...entry.at ? { delay: entry.at } : {} });
   };
   const step = (entry) => {
     if (entry.layer === "metal") metal2(entry.at, entry.frequency, entry.gain);
+    else if (entry.layer === "scene_tone") sceneTone(entry);
+    else if (entry.layer === "scene_noise") sceneNoise2(entry);
     else if (entry.layer === "class") play(entry.soundClass, entry.volume, 0, entry.at);
     else burst({ at: entry.at, seconds: 0.09, gain: entry.gain, filter: "lowpass", frequency: entry.frequency });
   };
@@ -562,7 +660,7 @@ function createWeaponAudio(volume = 0.6, options = {}) {
     shot(energyJ, category, extras = {}) {
       const sound2 = shotSound({ ...extras, energyJ, category });
       if (!sound2.audible) return;
-      classBurst(0, sound2.cutoff, sound2.gain, sound2.duration);
+      classBurstAt(0, sound2.cutoff, sound2.gain, sound2.duration);
       if (sound2.crack.gain > 0) burst({ seconds: sound2.crack.duration, gain: sound2.crack.gain, filter: "highpass", frequency: sound2.crack.cutoff });
       tone({ seconds: sound2.body.duration, gain: sound2.body.gain, frequency: sound2.body.frequency, to: sound2.body.to });
     },
@@ -590,28 +688,26 @@ function createWeaponAudio(volume = 0.6, options = {}) {
       mechanical("cycle");
     },
     clink() {
-      const f = 3200 + rng() * 2e3;
-      tone({ seconds: 0.09, gain: 0.12, frequency: f });
-      tone({ seconds: 0.06, gain: 0.06, frequency: f * 2.7 });
+      const f = 4200 + channel.random() * 1500;
+      const at = 0.25 + channel.random() * 0.2;
+      sceneTone({ layer: "scene_tone", at, wave: "sine", f, f2: 3800, d: 0.06, vol: 0.06 });
     },
     thud() {
       burst({ seconds: 0.09, gain: 0.35, filter: "lowpass", frequency: 380 });
     },
     setVolume(next) {
-      level = Math.max(0, Math.min(1, next));
-      if (master) master.gain.value = level;
+      const level = Math.max(0, Math.min(1, next));
+      if (shared) shared.setBus("weapons", { gain: level });
+      else engine.setMaster(level);
     },
     dispose() {
-      void ctx?.close();
-      ctx = null;
-      master = null;
-      noise = null;
+      if (!shared) engine.dispose();
     }
   };
 }
 
 // src/box-fx.ts
-import { createRng as createRng2, muzzleEnergy as muzzleEnergy2 } from "@adatechnology/game-weapons";
+import { createRng, muzzleEnergy as muzzleEnergy2 } from "@adatechnology/game-weapons";
 
 // src/fx/layers.ts
 var createLayers = () => ({ casings: true, magazines: true, muzzleFlash: true, attachments: true, beams: true });
@@ -3862,7 +3958,7 @@ var GRAVITY = 9.81;
 function createBoxFx(options) {
   const { THREE, scene, camera, arsenal, groundAt } = options;
   const audio = options.audio ?? null;
-  const random = createRng2(options.seed ?? 1);
+  const random = createRng(options.seed ?? 1);
   const layers = options.layers ?? createLayers();
   const bodies = [];
   const brass = new THREE.MeshStandardMaterial({ color: 13214282, metalness: 0.8, roughness: 0.35 });
@@ -4029,7 +4125,7 @@ function createBoxFx(options) {
 
 // src/fx/viewmodel.ts
 import { createToolClipPlayer, toolAnimationStep } from "@adatechnology/game-contracts";
-import { createRng as createRng3, muzzleEnergy as muzzleEnergy3 } from "@adatechnology/game-weapons";
+import { createRng as createRng2, muzzleEnergy as muzzleEnergy3 } from "@adatechnology/game-weapons";
 
 // src/animation/clip-builder.ts
 import { STAGE_EVENT } from "@adatechnology/game-contracts";
@@ -5520,7 +5616,7 @@ var caliberOf = (arsenal, def) => def.action.kind === "firearm" ? arsenal.calibe
 function createViewmodel(options) {
   const { THREE, scene, camera, arsenal, groundAt, audio } = options;
   const kit = modelKit(THREE);
-  const random = createRng3(options.seed ?? 1);
+  const random = createRng2(options.seed ?? 1);
   const layers = options.layers ?? createLayers();
   const distance = () => options.soundDistance?.() ?? 0;
   const particles = createParticles(THREE, scene, groundAt);
@@ -6769,7 +6865,8 @@ function createWeaponsTestModule(options = {}) {
   const arsenal = options.arsenal ?? createArsenal({ locale });
   const text = textOf(locale);
   const accessoryText = accessoryTextOf(locale);
-  const audio = options.sound === false ? null : createWeaponAudio(void 0, options.seed === void 0 ? {} : { seed: options.seed });
+  const seedOption = options.seed === void 0 ? {} : { seed: options.seed };
+  let audio = options.sound === false ? null : createWeaponAudio(void 0, seedOption);
   const weaponDefs = [...arsenal.weapons.values()].filter((def) => !BODY_ACTIONS.has(def.id));
   const thumbnailBase = options.thumbnailBase ?? DEFAULT_THUMBNAIL_BASE;
   const withThumbnail = (item, key) => {
@@ -6796,7 +6893,9 @@ function createWeaponsTestModule(options = {}) {
     id: "weapons_area",
     name: text.name,
     group: text.group,
-    audio,
+    get audio() {
+      return audio;
+    },
     get fx() {
       return fx;
     },
@@ -6844,6 +6943,11 @@ function createWeaponsTestModule(options = {}) {
     ],
     attach(lent) {
       host = lent;
+      const lentEngine = lent.audio?.engine;
+      if (audio && lentEngine) {
+        audio.dispose();
+        audio = createWeaponAudio(void 0, { ...seedOption, engine: lentEngine });
+      }
       const created = createWeaponFx({
         THREE: lent.THREE,
         scene: lent.scene,