@adatechnology/game-fluids-three 0.4.10 → 0.4.12

package/dist/index.global.js

@@ -5680,13 +5680,14 @@ var GameFluidsThree = (() => {
   function composeAfterEffects(context) {
     const { core, def, random, x, y, z } = context;
     const mark = def.mark;
-    if (mark.crater && mark.dent && y < 1.2) {
+    const keepsMarks = !core.marklessAt?.(x, z);
+    if (keepsMarks && mark.crater && mark.dent && y < 1.2) {
       core.emit({ type: "crater", x, z, radius: mark.crater, depth: mark.dent });
       core.trace?.crater?.(x, z, mark.crater, mark.dent);
       addCrater(core.marks, core.ground, random, { x, z, radius: mark.crater, depth: mark.dent, marks: core.layers.mark });
       if (core.layers.shrapnel) composeRimDebris(context);
     }
-    if (mark.scorch && y < 1.2 && core.layers.mark) {
+    if (keepsMarks && mark.scorch && y < 1.2 && core.layers.mark) {
       core.trace?.scorch?.(x, z, mark.scorch);
       addScorch(core.marks, random, x, z, mark.scorch);
     }
@@ -7437,6 +7438,7 @@ var GameFluidsThree = (() => {
       spawned: { puffs: 0, sparks: 0, chunks: 0, lights: 0 },
       clock: { time: 0, lastBlast: -1, lod: 1, forcedLod: null },
       groundAt,
+      ...options.marklessAt ? { marklessAt: options.marklessAt } : {},
       emit: (request) => options.onRequest?.(request)
     };
     function definitionOf(id) {
@@ -7463,6 +7465,7 @@ var GameFluidsThree = (() => {
       return player ?? (player = createEffectPlayer({ engine: workshop(), effects, view }));
     }
     return {
+      hostGroundAt: options.groundAt,
       play(id, point, playOptions = {}) {
         if (!(id in effects)) return null;
         const seed = playOptions.seed ?? (randomMode === "shared" ? void 0 : Math.imul(++handles.events, AUTO_SEED) + (options.seed ?? 0));
@@ -7630,7 +7633,7 @@ var GameFluidsThree = (() => {
   };
   var EFFECT_STEP_SECONDS = 1 / 50;
 
-  // ../game-vfx-three/dist/chunk-ALDCQ5RH.js
+  // ../game-vfx-three/dist/chunk-CPRCWTSQ.js
   var GLOW_VERTEX = `attribute vec4 aP;attribute vec4 aC;varying vec2 vU;varying vec4 vC;
 void main(){vec3 R=vec3(viewMatrix[0][0],viewMatrix[1][0],viewMatrix[2][0]);vec3 Up=vec3(viewMatrix[0][1],viewMatrix[1][1],viewMatrix[2][1]);
 vec3 wp=aP.xyz+(R*position.x+Up*position.y)*aP.w;vU=position.xy;vC=aC;gl_Position=projectionMatrix*viewMatrix*vec4(wp,1.);}`;
@@ -8070,7 +8073,11 @@ void main(){
     const dirt = texture(paint(make, (context, size) => drawDirt(context, size, random)));
     return { scorch, dirt };
   }
-  var MAX_CONFORM_STEPS = 48;
+  var FLAT_STEPS_PER_METRE = 8;
+  var MAX_FLAT_STEPS = 48;
+  var DUG_STEPS_PER_METRE = 20;
+  var MAX_DUG_STEPS = 64;
+  var FLAT_TOLERANCE = 2e-3;
   var MIN_CONFORM_STEPS = 16;
   var BLOOD_GROW_RATE = 1.2;
   var BLOOD_START_GROWTH = 0.05;
@@ -8153,9 +8160,21 @@ void main(){
       spareGeometries.push(oldest.mesh.geometry);
       if (spareGeometries.length > MAX_SPARE_GROUND_GEOMETRIES) spareGeometries.shift().dispose();
     }
+    const heightAt = options.heightAt ?? ((x, z) => options.ground?.heightAt(x, z) ?? 0);
+    function groundDipsUnder(x, z, radius) {
+      const centre = heightAt(x, z);
+      for (const share of [0.25, 0.5, 0.75]) {
+        for (let ray = 0; ray < 8; ray++) {
+          const angle = ray / 8 * Math.PI * 2;
+          if (Math.abs(heightAt(x + Math.cos(angle) * radius * share, z + Math.sin(angle) * radius * share) - centre) > FLAT_TOLERANCE) return true;
+        }
+      }
+      return false;
+    }
     function conform(mark, material) {
       const radius = mark.radius;
-      const steps = Math.max(MIN_CONFORM_STEPS, Math.min(MAX_CONFORM_STEPS, Math.round(radius * 8)));
+      const dug = options.heightAt !== void 0 && groundDipsUnder(mark.x, mark.z, radius);
+      const steps = Math.max(MIN_CONFORM_STEPS, Math.min(dug ? MAX_DUG_STEPS : MAX_FLAT_STEPS, Math.round(radius * (dug ? DUG_STEPS_PER_METRE : FLAT_STEPS_PER_METRE))));
       if (groundMarks.length >= maxGroundMarks) evictOldestGroundMark();
       const geometry = takeSpare((steps + 1) * (steps + 1)) ?? new THREE.PlaneGeometry(2, 2, steps, steps).rotateX(-Math.PI / 2);
       const grid = geometry.attributes.position;
@@ -8167,7 +8186,7 @@ void main(){
         const localZ = Math.fround(Math.floor(index / (steps + 1)) * cell - 1) * radius;
         const worldX = mark.x + localX * cos2 - localZ * sin2;
         const worldZ = mark.z + localX * sin2 + localZ * cos2;
-        grid.setXYZ(index, worldX, (options.ground?.heightAt(worldX, worldZ) ?? 0) + mark.lift, worldZ);
+        grid.setXYZ(index, worldX, heightAt(worldX, worldZ) + mark.lift, worldZ);
       }
       grid.needsUpdate = true;
       geometry.computeVertexNormals();
@@ -8957,7 +8976,7 @@ void main(){vec2 d=gl_PointCoord-.5;float r=length(d)*2.;if(r>1.)discard;float a
     const shocks = createShockLayer(THREE, pools.shocks);
     const sprites = createSpriteLayer(THREE, world.sprites(), options.pointScale ?? 700);
     const lights = createLightLayer(THREE, pools.lights, options.lightScale ?? Math.PI, options.lights);
-    const marks = createMarkLayer(THREE, { ground: pools.ground, createCanvas: options.createCanvas, rockGeometry, plateGeometry, ...options.markLimits });
+    const marks = createMarkLayer(THREE, { ground: pools.ground, ...world.hostGroundAt ? { heightAt: world.hostGroundAt } : {}, createCanvas: options.createCanvas, rockGeometry, plateGeometry, ...options.markLimits });
     root.add(puffs.mesh, sparks.mesh, glows.mesh, chunks.rocks, chunks.plates, shocks.group, lights.group, sprites.additive, sprites.normal, marks.group);
     const stopMarks = world.onMarks((event) => marks.handle(event));
     const overlay = options.overlay ? createScreenOverlay(options.overlay) : void 0;
@@ -9010,6 +9029,7 @@ void main(){vec2 d=gl_PointCoord-.5;float r=length(d)*2.;if(r>1.)discard;float a
       drawCalls = Number(lastDrawn.puffs > 0) + Number(lastDrawn.sparks > 0) + Number(lastDrawn.glows > 0) + Number(chunks.rocks.count > 0) + Number(chunks.plates.count > 0) + Number(sprites.additive.geometry.drawRange.count > 0) + Number(sprites.normal.geometry.drawRange.count > 0) + lastDrawn.shocks * 2 + marks.count() + workshopCalls;
     }
     return {
+      root,
       world,
       play(request) {
         followCamera();