@adatechnology/game-weapons-three 0.6.2 → 0.7.1

package/dist/index.js

@@ -5127,83 +5127,35 @@ function buildRound(kit, dims, shape) {
   return { group, radius: dims.caseDiameter / 2e3 };
 }
 
+// src/fx/viewmodel.ts
+import { createVfxRenderer } from "@adatechnology/game-vfx-three";
+
 // src/fx/effects.ts
-var PI12 = Math.PI;
 var FLASH_BY_CASE = { shell: 1.6, big: 2.6, tiny: 0.5, pistol: 0.8, rifle: 1.2 };
-var FLASH_SECONDS = 0.055;
-function createEffects(kit, scene, particles, random) {
-  const { THREE, M } = kit;
-  const light = new THREE.PointLight(16756832, 0, 3, 2);
-  scene.add(light);
-  let flash = null;
-  const buildFlash = (size) => {
-    const group = new THREE.Group();
-    const cone = new THREE.Mesh(new THREE.ConeGeometry(0.013 * size, 0.085 * size, 10, 1, true), M.flashA);
-    cone.rotation.z = -PI12 / 2;
-    cone.position.x = 0.042 * size;
-    group.add(cone);
-    for (let i = 0; i < 4; i++) {
-      const angle = i * PI12 / 2 + random() * 0.6;
-      const spike = new THREE.Mesh(new THREE.ConeGeometry(5e-3 * size, 0.04 * size, 6), M.flashA);
-      spike.position.set(0.012 * size, Math.cos(angle) * 0.016 * size, Math.sin(angle) * 0.016 * size);
-      spike.rotation.set(angle, 0, 0);
-      spike.rotateZ(-PI12 / 2);
-      group.add(spike);
-    }
-    const core = new THREE.Mesh(new THREE.SphereGeometry(0.016 * size, 12, 8), M.flashB);
-    core.position.x = 8e-3 * size;
-    group.add(core);
-    return group;
-  };
-  const endFlash = () => {
-    if (!flash) return;
-    flash.group.removeFromParent();
-    flash.group.traverse((child) => {
-      const mesh = child;
-      if (mesh.isMesh) mesh.geometry.dispose();
-    });
-    flash = null;
-    light.intensity = 0;
-  };
-  const effects = {
+var VIEWMODEL_EFFECT_IDS = { flash: "viewmodel_muzzle_flash", smoke: "weapon_smoke_puff", backblast: "launcher_backblast", flameJet: "flame_jet" };
+var vec = (vector) => [vector.x, vector.y, vector.z];
+var quaternion = (q) => [q.x, q.y, q.z, q.w];
+function createEffects(THREE, sink, random) {
+  const seed = () => 1 + Math.floor(random() * 2147483646);
+  const barrel = (orientation) => vec(new THREE.Vector3(1, 0, 0).applyQuaternion(orientation));
+  return {
     muzzleFlash(position, orientation, size) {
-      endFlash();
-      const group = buildFlash(size);
-      group.position.copy(position);
-      group.quaternion.copy(orientation);
-      group.rotateX(random() * PI12);
-      scene.add(group);
-      flash = { group, age: 0 };
-      light.position.copy(position);
-      light.intensity = 4 * size;
-      light.distance = 2 * size;
-      for (let i = 0; i < 6; i++) {
-        const velocity = new THREE.Vector3(0.15 + random() * 0.35, 0.03 + random() * 0.12, (random() - 0.5) * 0.14).applyQuaternion(orientation);
-        effects.smoke(position, velocity, 0.013 * size, 1.3 + random() * 0.6, 0.45);
-      }
+      sink?.play({ effect: VIEWMODEL_EFFECT_IDS.flash, point: vec(position), direction: barrel(orientation), orientation: quaternion(orientation), seed: seed(), values: { size } });
     },
     smoke(position, velocity, size, life, opacity) {
-      const puff = new THREE.Mesh(new THREE.SphereGeometry(size, 10, 8), M.smokeP.clone());
-      puff.position.copy(position);
-      particles.spawn(puff, velocity, { gravity: -0.08, life, fadeFrom: opacity, grow: 2.1, drag: 2.2, radius: -1, ownsGeometry: true });
+      sink?.play({ effect: VIEWMODEL_EFFECT_IDS.smoke, point: vec(position), seed: seed(), values: { vx: velocity.x, vy: velocity.y, vz: velocity.z, radius: size, life, opacity } });
     },
-    update(dt) {
-      if (!flash) return;
-      flash.age += dt;
-      flash.group.scale.setScalar(0.6 + Math.min(1, flash.age / FLASH_SECONDS) * 0.9);
-      if (flash.age >= FLASH_SECONDS) endFlash();
+    backblast(rear, orientation) {
+      sink?.play({ effect: VIEWMODEL_EFFECT_IDS.backblast, point: vec(rear), direction: barrel(orientation), orientation: quaternion(orientation), seed: seed() });
     },
-    dispose() {
-      endFlash();
-      light.removeFromParent();
-      light.dispose();
+    flameJet(muzzle, orientation, dt, scale) {
+      sink?.play({ effect: VIEWMODEL_EFFECT_IDS.flameJet, point: vec(muzzle), direction: barrel(orientation), orientation: quaternion(orientation), seed: seed(), values: { dt, scale } });
     }
   };
-  return effects;
 }
 
 // src/fx/heavy.ts
-var PI13 = Math.PI;
+var PI12 = Math.PI;
 var flameMaterials = (kit) => {
   const { THREE } = kit;
   return [
@@ -5213,40 +5165,20 @@ var flameMaterials = (kit) => {
     new THREE.MeshBasicMaterial({ color: 16773296, transparent: true, opacity: 0.9, blending: THREE.AdditiveBlending, depthWrite: false })
   ];
 };
-var spread = (context, x, y, z) => new context.kit.THREE.Vector3((context.random() - 0.5) * x, (context.random() - 0.5) * y, (context.random() - 0.5) * z);
-function createBits(context) {
-  const { kit, particles, random } = context;
-  const { THREE } = kit;
-  const palette = flameMaterials(kit);
-  return {
-    flame(position, velocity, size, life) {
-      const bit = new THREE.Mesh(new THREE.IcosahedronGeometry(size, 1), palette[Math.floor(random() * 4)].clone());
-      bit.position.copy(position);
-      bit.rotation.set(random() * 3, random() * 3, 0);
-      particles.spawn(bit, velocity, { gravity: -1.4, life, fadeFrom: 0.9, grow: 2.2, drag: 1.4, radius: -1, spin: new THREE.Vector3(3, 4, 2), ownsGeometry: true });
-    },
-    smoke(position, velocity, size, life, opacity) {
-      context.effects.smoke(position, velocity, size, life, opacity);
-    },
-    dispose: () => palette.forEach((material) => material.dispose())
-  };
-}
 function launchRocket(context) {
   const { kit, scene, parts, random } = context;
   const { THREE } = kit;
-  const bits = createBits(context);
   const forward = context.forward();
   const muzzle = context.positionOf(parts.muzzle);
   const rear = context.positionOf(parts.rear);
-  for (let i = 0; i < 26; i++) bits.smoke(rear.clone(), forward.clone().multiplyScalar(-(1.5 + random() * 3)).add(spread(context, 1.4, 0.8, 1.4)), 0.03 + random() * 0.03, 1.8 + random() * 1.4, 0.5);
-  for (let i = 0; i < 14; i++) bits.flame(rear.clone(), forward.clone().multiplyScalar(-(2 + random() * 2)).add(spread(context, 1, 0.6, 1)), 0.02, 0.25);
+  context.effects.backblast(rear, context.orientation());
   const rocket = parts.makeRound ? parts.makeRound() : buildFlyingRocket(kit, parts.launcherType);
   if (parts.round) parts.round.visible = false;
   rocket.quaternion.copy(context.orientation());
   rocket.position.copy(muzzle);
   scene.add(rocket);
   const exhaust = new THREE.Mesh(new THREE.ConeGeometry(0.018, 0.12, 8, 1, true), new THREE.MeshBasicMaterial({ color: 16760896, transparent: true, opacity: 0.9, depthWrite: false }));
-  exhaust.rotation.z = PI13 / 2;
+  exhaust.rotation.z = PI12 / 2;
   exhaust.position.x = -0.08;
   rocket.add(exhaust);
   const light = new THREE.PointLight(16751168, 3, 2.5);
@@ -5259,37 +5191,29 @@ function launchRocket(context) {
       rocket.position.copy(muzzle).addScaledVector(forward, distance);
       rocket.rotation.x += 0.25 * dt * 60;
       exhaust.scale.set(1, 0.6 + random() * 0.8, 1);
-      if (random() < 0.9) bits.smoke(rocket.position.clone().addScaledVector(forward, -0.12), spread(context, 0.1, 0, 0.1).setY(0.05), 0.02 + random() * 0.015, 2.2, 0.5);
+      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();
       exhaust.geometry.dispose();
       exhaust.material.dispose();
       light.dispose();
-      bits.dispose();
     }
   );
 }
 function flameJet(context, dt, scale) {
   const { kit, particles, random, parts } = context;
   const { THREE } = kit;
-  const bits = createBits(context);
   const forward = context.forward();
   const muzzle = context.positionOf(parts.muzzle);
-  const count = Math.floor(dt * 420 * scale);
-  for (let i = 0; i < count; i++) {
-    const speed = (2.2 + random() * 1.1) * scale;
-    bits.flame(muzzle.clone().addScaledVector(forward, random() * speed * Math.min(dt, 0.3)), forward.clone().multiplyScalar(speed).add(new THREE.Vector3((random() - 0.5) * 0.35, (random() - 0.3) * 0.3, (random() - 0.5) * 0.35)), 0.02 + random() * 0.022, 0.4 + random() * 0.35);
-  }
-  if (random() < 0.5) bits.smoke(muzzle.clone().addScaledVector(forward, 1.1 * scale + random() * 0.4), new THREE.Vector3(forward.x * 0.6, 0.35, forward.z * 0.6), 0.03, 1.6, 0.4);
+  context.effects.flameJet(muzzle, context.orientation(), dt, scale);
   if (random() < 0.18) {
     const droplet = new THREE.Mesh(new THREE.SphereGeometry(6e-3, 6, 4), new THREE.MeshBasicMaterial({ color: 16742946 }));
     droplet.position.copy(muzzle).addScaledVector(forward, 0.3 + random() * 0.5);
-    particles.spawn(droplet, forward.clone().multiplyScalar(1.2 * scale).add(new THREE.Vector3(0, 0.2, 0)), { life: 3, radius: 3e-3, ownsGeometry: true, onGround: (position) => groundFire(context, bits, position) });
+    particles.spawn(droplet, forward.clone().multiplyScalar(1.2 * scale).add(new THREE.Vector3(0, 0.2, 0)), { life: 3, radius: 3e-3, ownsGeometry: true, onGround: (position) => groundFire(context, position) });
   }
-  bits.dispose();
 }
-function groundFire(context, bits, position) {
+function groundFire(context, position) {
   const { kit, scene, random } = context;
   const { THREE } = kit;
   const fire = new THREE.Group();
@@ -5308,7 +5232,7 @@ function groundFire(context, bits, position) {
     (progress, dt) => {
       clock += dt;
       flames.forEach((flame, index) => flame.scale.set(1 - progress * 0.7, (0.6 + Math.sin(clock * 20 + index * 2) * 0.35) * (1 - progress), 1 - progress * 0.7));
-      if (random() < 0.08) bits.smoke(fire.position.clone().add(new THREE.Vector3(0, 0.08, 0)), new THREE.Vector3(0, 0.15, 0), 0.015, 1.2, 0.25);
+      if (random() < 0.08) context.effects.smoke(fire.position.clone().add(new THREE.Vector3(0, 0.08, 0)), new THREE.Vector3(0, 0.15, 0), 0.015, 1.2, 0.25);
     },
     () => {
       fire.removeFromParent();
@@ -5436,13 +5360,13 @@ var worldPositionOf = (session, part, out) => {
   return part.getWorldPosition(out);
 };
 var toWorld = (session, vector, scaled = false) => {
-  const quaternion = session.model.root.getWorldQuaternion(new session.kit.THREE.Quaternion());
-  const world = vector.clone().applyQuaternion(quaternion);
+  const quaternion2 = session.model.root.getWorldQuaternion(new session.kit.THREE.Quaternion());
+  const world = vector.clone().applyQuaternion(quaternion2);
   return scaled ? world.multiplyScalar(session.holderScale) : world;
 };
 
 // src/fx/viewmodel-events.ts
-var PI14 = Math.PI;
+var PI13 = Math.PI;
 var UGL_FLASH = 1.6;
 var restFlat = (object) => {
   object.rotation.x = 0;
@@ -5516,14 +5440,14 @@ function createClipEventHandler(world, session) {
     root.updateWorldMatrix(true, true);
     const copy = parts.mag.clone(true);
     parts.mag.matrixWorld.decompose(copy.position, copy.quaternion, copy.scale);
-    particles.spawn(copy, toWorld(session, vector(up ? -0.25 : 0.05, up ? 0.9 : -0.3, 0.18)), { kind: "magazine", life: 25, radius: 0.014, bounce: 0.15, spin: vector(1.5, 0.5, 2.5), onRest: (object) => object.rotation.set(0, object.rotation.y, PI14 / 2) });
+    particles.spawn(copy, toWorld(session, vector(up ? -0.25 : 0.05, up ? 0.9 : -0.3, 0.18)), { kind: "magazine", life: 25, radius: 0.014, bounce: 0.15, spin: vector(1.5, 0.5, 2.5), onRest: (object) => object.rotation.set(0, object.rotation.y, PI13 / 2) });
   };
   const stuckCase = () => {
     if (!session.cartridge || !parts.eject) return;
     const casing = buildCasing(kit, session.cartridge.dims, session.cartridge.shape);
     const at = root.worldToLocal(offsetFrom(positionOf(parts.eject), 0, casing.length * 0.35, 0));
     casing.group.position.copy(at);
-    casing.group.rotation.set(0, 0, PI14 / 2 - 0.25);
+    casing.group.rotation.set(0, 0, PI13 / 2 - 0.25);
     root.add(casing.group);
     session.stuckCase = casing.group;
   };
@@ -5602,14 +5526,14 @@ function createClipEventHandler(world, session) {
 }
 
 // src/fx/viewmodel.ts
-var PI15 = Math.PI;
+var PI14 = Math.PI;
 var HAND_OFFSET2 = [0.2, -0.2, -0.42];
 var HEAT_DISPLAY_MAX_FALLBACK = 120;
 var LAUNCH_VOLUME = 0.6;
 var fittedOf2 = (parts) => parts.map((part) => ({ id: part.id, mount: part.mount, ...part.integral ? { integral: true } : {}, ...part.on === void 0 ? {} : { on: part.on } }));
 var collapsedStockPose = (move2) => {
   if (move2.kind === "retract") return { position: [move2.travel, 0, 0] };
-  return { rotation: [move2.axis === "x" ? PI15 : 0, move2.axis === "y" ? PI15 : 0, move2.axis === "z" ? PI15 : 0] };
+  return { rotation: [move2.axis === "x" ? PI14 : 0, move2.axis === "y" ? PI14 : 0, move2.axis === "z" ? PI14 : 0] };
 };
 var underbarrelStep = (step, tool) => tool.underbarrelActive && step.type === "play" && (step.clip === "shot" || step.clip === "reload") ? { ...step, variant: "ugl" } : step;
 var caliberOf = (arsenal, def) => def.action.kind === "firearm" ? arsenal.calibers.get(def.action.caliber) : void 0;
@@ -5621,12 +5545,13 @@ function createViewmodel(options) {
   const distance = () => options.soundDistance?.() ?? 0;
   const particles = createParticles(THREE, scene, groundAt);
   particles.onBounce = (kind) => kind === "casing" ? audio?.clink() : kind === "magazine" ? audio?.thud() : void 0;
-  const effects = createEffects(kit, scene, particles, random);
+  const ownVfx = options.effects ? void 0 : createVfxRenderer(THREE, { scene, camera, vfx: { profile: "medium" } });
+  const effects = createEffects(THREE, options.effects ?? ownVfx, random);
   const hand = new THREE.Group();
   hand.name = VIEWMODEL_NODE_NAME;
   scene.add(hand);
   const holder = new THREE.Group();
-  holder.quaternion.setFromAxisAngle(new THREE.Vector3(0, 1, 0), PI15 / 2);
+  holder.quaternion.setFromAxisAngle(new THREE.Vector3(0, 1, 0), PI14 / 2);
   hand.add(holder);
   let tasks = [];
   let session = null;
@@ -5802,8 +5727,8 @@ function createViewmodel(options) {
           tasks = tasks.filter((other) => other !== task);
         }
       }
-      effects.update(dt);
       particles.update(dt);
+      ownVfx?.update(dt);
     },
     setCondition(next) {
       condition = next;
@@ -5821,7 +5746,7 @@ function createViewmodel(options) {
     dispose() {
       release();
       particles.dispose();
-      effects.dispose();
+      ownVfx?.dispose();
       hand.removeFromParent();
     }
   };
@@ -5844,7 +5769,8 @@ function createWeaponFx(options) {
     ...options.tool ? { tool: options.tool } : {},
     ...options.condition ? { condition: options.condition } : {},
     ...options.attachmentModels ? { attachmentModels: options.attachmentModels } : {},
-    ...options.raycast ? { raycast: options.raycast } : {}
+    ...options.raycast ? { raycast: options.raycast } : {},
+    ...options.effects ? { effects: options.effects } : {}
   });
   return {
     handle(event, tool) {
@@ -6958,6 +6884,7 @@ function createWeaponsTestModule(options = {}) {
         tool: lent.tool,
         soundDistance: () => soundDistance,
         raycast: createLaserRaycast(lent.THREE, lent.scene, lent.camera),
+        ...lent.effects ? { effects: lent.effects } : {},
         ...options.attachmentModels ? { attachmentModels: options.attachmentModels } : {},
         ...options.condition ? { condition: options.condition } : {},
         ...options.seed === void 0 ? {} : { seed: options.seed }