@adatechnology/game-weather-three 0.2.1 → 0.3.0

package/README.md

@@ -33,8 +33,9 @@ picture.update(dt)
 ## Bench
 
 `createWeatherTestModule({ visual: createWeatherVisual({ vfx: room.vfx }) })` (the module of `game-weather`) adds the picture to the weather bench: seven layers
-(rain curtain, near rain and splashes, mist and ash, sky, lightning, headlights, heat haze; names in pt-BR and en), and a lamp rig (two lamps on a block, the
-Workshop's `hlMat` lenses) in front of the camera to show the headlights. `layers: { sky: false }` keeps a room's own sky; the bench's own `fog` layer reaches the
+(rain curtain, near rain and splashes, mist and ash, sky, lightning, headlights, heat haze; names in pt-BR and en), and a lamp rig in front of the camera to show the headlights. The rig's car is not drawn here: pass
+`vehicles: (THREE) => createVehiclesThree(THREE, { kit })` (game-vehicles-three, with the fleet installed) and it builds a fleet car (`rigVehicle`, default
+`midsize_sedan`) under the lamps, so it follows the vehicles SDK; without it the rig has only the lamps and their beams. `layers: { sky: false }` keeps a room's own sky; the bench's own `fog` layer reaches the
 renderer too. The fog layer gives back the fog the host had when it is switched off.
 
 ## Proof

package/dist/index.d.ts

@@ -313,9 +313,26 @@ type WeatherVisualOptions = Pick<WeatherRendererOptions, 'profile' | 'random' |
     readonly vfx?: VfxWorld;
     /** Where the lamp rig stands (the two headlights of the Workshop's car, to see the beams); `false` leaves it out. Default 2.5 m ahead of the test room camera, lamps toward it. */
     readonly rig?: readonly [x: number, z: number, turn: number] | false;
+    /**
+     * The car the lamps are mounted on, built by the vehicles SDK for the host's three.js (`createVehiclesThree` of game-vehicles-three with the fleet installed), so the rig follows the fleet when it
+     * changes. Without it the rig has only the lamps and their beams: no car drawn here.
+     */
+    readonly vehicles?: (THREE: ThreeLib) => RigVehicles;
+    /** Fleet id of the rig's car (default `midsize_sedan`). */
+    readonly rigVehicle?: string;
     /** Which layers start on (all do by default); the room that is not about weather starts the sky and the fog off to keep its own look. */
     readonly layers?: Partial<Record<WeatherLayerId, boolean>>;
 };
+/** What the rig needs of the vehicles SDK (`VehiclesThree` of game-vehicles-three): a car in the game frame (front on +z, wheels on y = 0) and its length. */
+interface RigVehicles {
+    build(key: string, options?: {
+        quality?: 'high' | 'lite';
+    }): {
+        readonly group: THREE_NS.Object3D;
+        readonly length: number;
+        dispose(): void;
+    };
+}
 /**
  * The picture of the weather for the weather bench: `createWeatherTestModule({ visual: createWeatherVisual({ vfx: room.vfx }) })`. It draws the weather the bench shows with
  * `createWeatherRenderer` on the room's scene and camera, switches each part with the bench layers and puts a lamp rig in front of the camera for the headlights.
@@ -328,4 +345,4 @@ type WeatherVisualText = {
 };
 declare const weatherVisualTextOf: (locale: string) => WeatherVisualText;
 
-export { ASH, FOG_EXP_FROM, FOG_NEAR, FOG_ZONE_NEAR, type Fog, type FogValues, HEADLIGHTS, HEAT_HAZE, HEAT_HAZE_FRAGMENT, HEAT_HAZE_VERTEX, type HeadlightRules, type Headlights, type HeatHaze, LIGHTNING, type Lightning, MIST, type NearRain, type NearRainOptions, RAIN_CURTAIN, RAIN_CURTAIN_FRAGMENT, RAIN_CURTAIN_FULL_AT, RAIN_CURTAIN_PROFILES, RAIN_CURTAIN_VERTEX, type RainCurtain, type RainCurtainOptions, SKY_DAY, SKY_NIGHT, SPLASH_FROM_MM, type Sky, type ThreeLib, type Vec3, WEATHER_LAYERS, type WeatherLayerId, type WeatherProfileName, type WeatherRenderer, type WeatherRendererOptions, type WeatherSource, type WeatherVisualOptions, type WeatherVisualText, ZONE_FOG_DEFAULTS, ZONE_LIGHT, type ZoneFog, createFog, createHeadlights, createHeatHaze, createLightning, createNearRain, createRainCurtain, createSky, createWeatherRenderer, createWeatherVisual, defaultHeadlightRule, densityForFar, emitAirborne, fogOf, rainCurtainPositions, weatherVisualTextOf };
+export { ASH, FOG_EXP_FROM, FOG_NEAR, FOG_ZONE_NEAR, type Fog, type FogValues, HEADLIGHTS, HEAT_HAZE, HEAT_HAZE_FRAGMENT, HEAT_HAZE_VERTEX, type HeadlightRules, type Headlights, type HeatHaze, LIGHTNING, type Lightning, MIST, type NearRain, type NearRainOptions, RAIN_CURTAIN, RAIN_CURTAIN_FRAGMENT, RAIN_CURTAIN_FULL_AT, RAIN_CURTAIN_PROFILES, RAIN_CURTAIN_VERTEX, type RainCurtain, type RainCurtainOptions, type RigVehicles, SKY_DAY, SKY_NIGHT, SPLASH_FROM_MM, type Sky, type ThreeLib, type Vec3, WEATHER_LAYERS, type WeatherLayerId, type WeatherProfileName, type WeatherRenderer, type WeatherRendererOptions, type WeatherSource, type WeatherVisualOptions, type WeatherVisualText, ZONE_FOG_DEFAULTS, ZONE_LIGHT, type ZoneFog, createFog, createHeadlights, createHeatHaze, createLightning, createNearRain, createRainCurtain, createSky, createWeatherRenderer, createWeatherVisual, defaultHeadlightRule, densityForFar, emitAirborne, fogOf, rainCurtainPositions, weatherVisualTextOf };

package/dist/index.global.js

@@ -1658,6 +1658,17 @@ var GameWeatherThree = (() => {
       ])
     ]
   };
+  var FUEL_LEAK_ONLY = {
+    id: "fuel_leak_only",
+    pageId: "vazamento",
+    team: "vehicles",
+    budget: { particles: 200, lights: 0 },
+    loop: 11,
+    view: FUEL_LEAK.view,
+    setup: FUEL_LEAK.setup,
+    timeline: [decal(POOL[0], 0, POOL[2], 2.2, 2040368, { grow: 3, life: 60, ar: 0.6, fluid: "oil" })],
+    tick: [emit("drip", "normal", 12, { p: TANK, box: [0.05, 0, 0.05], sp: 0, life: 1, size: 0.03, c0: 5921402, a: 0.9, g: 9.8, fi: 0, gnd: 1 })]
+  };
   var CAR_EXPLOSION = {
     id: "car_explosion",
     pageId: "explosao",
@@ -2011,6 +2022,8 @@ var GameWeatherThree = (() => {
   ];
   var PI = Math.PI;
   var SMOKE = { color: 9079430, width: 10, height: 8, gravity: -0.08, drag: 2.2, growth: 2.1 };
+  var DEFAULT_SMOKE = { puffs: 2, radius: 0.01, opacity: 0.14, life: 0.7, drift: 0.2, rise: 0.06, growth: 2.1, flash: 1 };
+  var DEFAULT_SPREAD = { drift: 0.1, rise: 0.04, side: 0.06 };
   var FLASH_SECONDS = 0.055;
   var FLASH_RAMP = [0.6, 0.9];
   var FLASH_OPACITY = 0.95;
@@ -2018,8 +2031,10 @@ var GameWeatherThree = (() => {
   var FLAME_ADDITIVE = 3;
   var ORIGIN2 = [0, 0, 0];
   var SIZE = variable("size");
+  var FLASH_SCALE = variable("flash");
+  var fallback = (name, defaultValue) => ite(ne(variable(name), void 0), variable(name), defaultValue);
   var wide = (width) => mul(sub(rand(), 0.5), width);
-  var puff2 = (point, velocity, world, radius, life, opacity) => mesh({
+  var puff2 = (point, velocity, world, radius, life, opacity, growth = SMOKE.growth) => mesh({
     shape: "sphere",
     p: point,
     v: velocity,
@@ -2034,7 +2049,7 @@ var GameWeatherThree = (() => {
     lit: true,
     g: SMOKE.gravity,
     drag: SMOKE.drag,
-    grow: SMOKE.growth
+    grow: growth
   });
   var flameBit = (point, velocity, world, radius, life) => [
     set("bitPoint", point),
@@ -2067,37 +2082,55 @@ var GameWeatherThree = (() => {
     id: "viewmodel_muzzle_flash",
     pageId: "event:viewmodel_muzzle_flash",
     team: "weapons",
-    budget: { particles: 12, lights: 1 },
+    budget: { particles: 14, lights: 1 },
     loop: 0.1,
+    setup: [
+      set("size", fallback("size", 1)),
+      set("puffs", fallback("puffs", DEFAULT_SMOKE.puffs)),
+      set("radius", fallback("radius", DEFAULT_SMOKE.radius)),
+      set("opacity", fallback("opacity", DEFAULT_SMOKE.opacity)),
+      set("life", fallback("life", DEFAULT_SMOKE.life)),
+      set("drift", fallback("drift", DEFAULT_SMOKE.drift)),
+      set("rise", fallback("rise", DEFAULT_SMOKE.rise)),
+      set("growth", fallback("growth", DEFAULT_SMOKE.growth)),
+      set("flash", fallback("flash", DEFAULT_SMOKE.flash)),
+      set("driftSpread", fallback("driftSpread", DEFAULT_SPREAD.drift)),
+      set("riseSpread", fallback("riseSpread", DEFAULT_SPREAD.rise)),
+      set("sideSpread", fallback("sideSpread", DEFAULT_SPREAD.side)),
+      set("lifeSpread", ite(ne(variable("lifeSpread"), void 0), variable("lifeSpread"), mul(variable("life"), 0.3)))
+    ],
     timeline: [
       set("angles", []),
       repeat(4, append("angles", add(div(mul(INDEX, PI), 2), mul(rand(), 0.6)))),
       set("roll", mul(rand(), PI)),
-      flash(ORIGIN2, 16756832, mul(4, SIZE), FLASH_SECONDS, mul(2, SIZE), true, true),
-      flashPiece("cone_open", mul(0.013, SIZE), mul(0.085, SIZE), 10, [mul(0.042, SIZE), 0, 0], [0, 0, -PI / 2], 16757575),
-      repeat(
-        4,
-        set("angle", pick(variable("angles"), INDEX)),
-        flashPiece(
-          "cone",
-          mul(5e-3, SIZE),
-          mul(0.04, SIZE),
-          6,
-          [mul(0.012, SIZE), mul(cos(variable("angle")), 0.016, SIZE), mul(sin(variable("angle")), 0.016, SIZE)],
-          [variable("angle"), 0, -PI / 2],
-          16757575
-        )
-      ),
-      flashPiece("sphere", mul(0.016, SIZE), void 0, 12, [mul(8e-3, SIZE), 0, 0], [0, 0, 0], 16773568),
+      when(gt(FLASH_SCALE, 0), [
+        flash(ORIGIN2, 16756832, mul(4, SIZE, FLASH_SCALE), FLASH_SECONDS, mul(2, SIZE, FLASH_SCALE), true, true),
+        flashPiece("cone_open", mul(0.013, SIZE, FLASH_SCALE), mul(0.085, SIZE, FLASH_SCALE), 10, [mul(0.042, SIZE, FLASH_SCALE), 0, 0], [0, 0, -PI / 2], 16757575),
+        repeat(
+          4,
+          set("angle", pick(variable("angles"), INDEX)),
+          flashPiece(
+            "cone",
+            mul(5e-3, SIZE, FLASH_SCALE),
+            mul(0.04, SIZE, FLASH_SCALE),
+            6,
+            [mul(0.012, SIZE, FLASH_SCALE), mul(cos(variable("angle")), 0.016, SIZE, FLASH_SCALE), mul(sin(variable("angle")), 0.016, SIZE, FLASH_SCALE)],
+            [variable("angle"), 0, -PI / 2],
+            16757575
+          )
+        ),
+        flashPiece("sphere", mul(0.016, SIZE, FLASH_SCALE), void 0, 12, [mul(8e-3, SIZE, FLASH_SCALE), 0, 0], [0, 0, 0], 16773568)
+      ]),
       repeat(
-        6,
+        variable("puffs"),
         puff2(
           ORIGIN2,
-          [add(0.15, mul(rand(), 0.35)), add(0.03, mul(rand(), 0.12)), mul(sub(rand(), 0.5), 0.14)],
+          [add(variable("drift"), mul(rand(), variable("driftSpread"))), add(variable("rise"), mul(rand(), variable("riseSpread"))), mul(sub(rand(), 0.5), variable("sideSpread"))],
           [0, 0, 0],
-          mul(0.013, SIZE),
-          add(1.3, mul(rand(), 0.6)),
-          0.45
+          mul(variable("radius"), SIZE),
+          add(variable("life"), mul(rand(), variable("lifeSpread"))),
+          variable("opacity"),
+          variable("growth")
         )
       )
     ]
@@ -2151,8 +2184,10 @@ var GameWeatherThree = (() => {
     aliasOf(ENGINE_SMOKE, "vehicle_fire", { params: { id: "condition", options: ["100", "60", "30", "10"], default: 3 }, loop: 12 }),
     /** The exhaust of a car under way: `engine_smoke` in the best condition, for half a second so a moving car asks again. */
     aliasOf(ENGINE_SMOKE, "vehicle_exhaust", { params: { id: "condition", options: ["100", "60", "30", "10"], default: 0 }, loop: 0.5 }),
-    /** A hole in the tank: the page's own petrol leak (drips, pool, sparks, fire running to the tank). */
-    aliasOf(FUEL_LEAK, "vehicle_leak", {})
+    /** A hole in the tank: the page's petrol leak without the fire and the blast (the pool and the drips). A normal bullet does only this. */
+    aliasOf(FUEL_LEAK_ONLY, "vehicle_leak", {}),
+    /** The leak caught fire (an incendiary or tracer round, a spark, a fire near): the page's whole sequence, the fire running along the pool to the tank and the blast. */
+    aliasOf(FUEL_LEAK, "vehicle_leak_ignited", {})
   ];
   var ALL_EFFECTS = [BLOOD_HIT, HEADSHOT, DISMEMBER, BLOATER_CLOUD, SCREAMER_SHRIEK, CORPSE_DECAY, REANIMATION, EYES_IN_FOG, MUZZLE_FLASH, IMPACT_BY_MATERIAL, PENETRATION, CASINGS_AND_MAGAZINE, MOLOTOV, GRENADE, EXPLOSIVE_BARREL, SHOPFRONT_GLASS, DOOR_STAGES, BUILDING_COLLAPSE, BLOCK_WALL, METAL_DOOR_EFFECT, IRON_RAILING, WOODEN_FENCE, HIT_POINT_BREAKAGE, PRESSURE_CYLINDERS, BUILDING_FIRE, RAIN_AND_PUDDLES, FOG_AND_ASH, SCRAPING_SPARKS, ENGINE_SMOKE, FUEL_LEAK, CAR_EXPLOSION, WINDSHIELD, HEADLIGHTS_IN_RAIN, DAMAGE_AND_BITE, INFECTION_PHASES, PANIC, BLOATER_BLINDNESS, CAMPFIRE, COUGH_AND_BREATH];
   var WORKSHOP_EFFECTS = Object.fromEntries(ALL_EFFECTS.map((effect) => [effect.id, effect]));
@@ -2321,29 +2356,21 @@ var GameWeatherThree = (() => {
   var weatherVisualTextOf = (locale) => TEXTS[locale] ?? TEXTS[locale.split("-")[0] ?? "en"] ?? TEXTS.en;
 
   // src/bench/visual.ts
+  var RIG_VEHICLE = "midsize_sedan";
   var LAYER_ORDER = ["far_rain", "near_rain", "mist", "sky", "lightning", "headlights", "haze"];
   var RIG_DEFAULT = [1.6, -2.5, 0];
-  function buildRig(THREE) {
+  function buildRig(THREE, vehicles, key) {
     const group = new THREE.Group();
     group.name = "weather-lamp-rig";
-    const body = new THREE.Mesh(new THREE.BoxGeometry(1.8, 0.7, 4.2), new THREE.MeshBasicMaterial({ color: 1776928 }));
-    body.position.set(0, 0.5, 0);
-    const lens2 = new THREE.MeshBasicMaterial({ color: HEADLIGHTS.lens.off });
-    const lampGeometry = new THREE.BoxGeometry(0.35, 0.15, 0.05);
-    for (const side of [-1, 1]) {
-      const lamp = new THREE.Mesh(lampGeometry, lens2);
-      lamp.position.set(side * HEADLIGHTS.lamp[0], HEADLIGHTS.lamp[1], 2.11);
-      group.add(lamp);
+    const car = vehicles?.build(key, { quality: "lite" });
+    if (car) {
+      car.group.position.z = HEADLIGHTS.lamp[2] + 0.1 - car.length / 2;
+      group.add(car.group);
     }
-    group.add(body);
     return {
       group,
-      lens: lens2,
       dispose() {
-        body.geometry.dispose();
-        body.material.dispose();
-        lampGeometry.dispose();
-        lens2.dispose();
+        car?.dispose();
       }
     };
   }
@@ -2368,19 +2395,19 @@ var GameWeatherThree = (() => {
           ...options.headlights ? { headlights: options.headlights } : {},
           ...options.layers ? { layers: options.layers } : {}
         });
-        return attachRig(THREE, host, renderer, options.rig === void 0 ? RIG_DEFAULT : options.rig);
+        return attachRig(THREE, host, renderer, options.rig === void 0 ? RIG_DEFAULT : options.rig, options.vehicles?.(THREE), options.rigVehicle ?? RIG_VEHICLE);
       }
     };
   }
-  function attachRig(THREE, host, renderer, place) {
+  function attachRig(THREE, host, renderer, place, vehicles, key) {
     const scene = host.scene;
-    const rig = place === false ? void 0 : buildRig(THREE);
+    const rig = place === false ? void 0 : buildRig(THREE, vehicles, key);
     let detach;
     if (rig && place) {
       rig.group.position.set(place[0], 0, place[1]);
       rig.group.rotation.y = place[2];
       scene.add(rig.group);
-      detach = renderer.headlights.attach(rig.group, rig.lens);
+      detach = renderer.headlights.attach(rig.group);
     }
     return {
       update: (dt) => renderer.update(dt),