@woosh/meep-engine 2.169.1 → 2.169.3

package/src/engine/graphics/impostors/voxel/bake/read_atlas_to_samples.js

@@ -45,36 +45,33 @@ function read_atlas_texture_rgba_u8(renderer, texture) {
 
 
 /**
- * Decode the bake-time view-space normal back into the impostor's local
- * (object) space. Inverse of the encode side in BakeShaderStandard.
- *
- * The baker placed an OrthographicCamera at
+ * Number of values in a bake frame basis: right.xyz, up.xyz, D.xyz.
+ * @type {number}
+ */
+const BAKE_FRAME_STRIDE = 9;
+
+/**
+ * Rebuild the bake camera's orthonormal basis for one atlas frame.
  *
- *     camera_pos = centre + radius * D_frame
+ * The baker placed an OrthographicCamera at `centre + radius * D_frame` and
+ * pointed it at `centre` with three.js's `lookAt` using world-up = (0,1,0).
+ * That gives the object-space basis `(bake_right, bake_up, +D)`. Both the
+ * normal decode and the position reconstruction have to rebuild EXACTLY that
+ * basis, including the polar nudge, or they disagree with each other and with
+ * the baker — which is why this is one function rather than the two copies it
+ * replaces. The copies even said so ("Same polar nudge as the normal decoder,
+ * so right/up agree") without being able to enforce it.
  *
- * with three.js's lookAt(centre) using world-up = (0,1,0). That gives a
- * camera basis (bake_right, bake_up, +D_frame) in object space. The
- * baker wrote the surface normal as (normal.x = dot(n, right),
- * normal.y = dot(n, up), normal.z = dot(n, D_frame)) and packed it into
- * the atlas RGB channels as (* 0.5 + 0.5). So to reverse, decode the RGB
- * back to ±1 and recombine through the same basis.
+ * `D` is written into the output too: the nudge can change it, and every
+ * consumer needs the nudged value, not the caller's original.
  *
- * @param {number[]} out          length-3 output, object-space normal
- * @param {number} nr             encoded R in [0,1]
- * @param {number} ng             encoded G in [0,1]
- * @param {number} nb             encoded B in [0,1]
- * @param {number[]} D_frame      bake direction in object space (unit)
+ * @param {number[]} out_frame length {@link BAKE_FRAME_STRIDE}: [right.xyz, up.xyz, D.xyz]
+ * @param {number[]} D_frame bake direction in object space (unit)
  */
-function decode_normal_to_object_space(out, nr, ng, nb, D_frame) {
-    // 1. Decode bake-view-space normal from [0,1] to [-1,1]
-    const nx = nr * 2 - 1;
-    const ny = ng * 2 - 1;
-    const nz = nb * 2 - 1;
-
-    // 2. Mirror three.js Camera.lookAt's polar nudge — when D_frame is
-    //    parallel to world-up, lookAt jiggles +Z slightly to avoid a
-    //    degenerate cross product. We have to do the same so our basis
-    //    matches the baker's.
+function bake_frame_from_direction(out_frame, D_frame) {
+    // Mirror three.js Camera.lookAt's polar nudge — when D_frame is parallel
+    // to world-up, lookAt jiggles +Z slightly to avoid a degenerate cross
+    // product. We have to do the same so our basis matches the baker's.
     let Dx = D_frame[0], Dy = D_frame[1], Dz = D_frame[2];
     if (Math.abs(Dy) > 0.99999) {
         // Normalise (D + (0, 0, 0.0001)) — same nudge the lit shader uses.
@@ -85,8 +82,8 @@ function decode_normal_to_object_space(out, nr, ng, nb, D_frame) {
         Dz = dz_n / len;
     }
 
-    // 3. bake_right = normalize(cross((0,1,0), D))
-    //    Cross product: (0,1,0) × (Dx,Dy,Dz) = (Dz, 0, -Dx)
+    // bake_right = normalize(cross((0,1,0), D))
+    // Cross product: (0,1,0) × (Dx,Dy,Dz) = (Dz, 0, -Dx)
     let rx = Dz;
     let ry = 0;
     let rz = -Dx;
@@ -94,13 +91,49 @@ function decode_normal_to_object_space(out, nr, ng, nb, D_frame) {
         const len = Math.sqrt(rx * rx + ry * ry + rz * rz);
         rx /= len; ry /= len; rz /= len;
     }
-    // 4. bake_up = cross(D, right) — no normalise needed, D and right
-    //    are already orthonormal.
-    const ux = Dy * rz - Dz * ry;
-    const uy = Dz * rx - Dx * rz;
-    const uz = Dx * ry - Dy * rx;
 
-    // 5. Recompose in object space.
+    // bake_up = cross(D, right) — no normalise needed, D and right are
+    // already orthonormal.
+    out_frame[0] = rx;
+    out_frame[1] = ry;
+    out_frame[2] = rz;
+
+    out_frame[3] = Dy * rz - Dz * ry;
+    out_frame[4] = Dz * rx - Dx * rz;
+    out_frame[5] = Dx * ry - Dy * rx;
+
+    out_frame[6] = Dx;
+    out_frame[7] = Dy;
+    out_frame[8] = Dz;
+}
+
+
+/**
+ * Decode the bake-time view-space normal back into the impostor's local
+ * (object) space. Inverse of the encode side in BakeShaderStandard.
+ *
+ * The baker wrote the surface normal as (normal.x = dot(n, right),
+ * normal.y = dot(n, up), normal.z = dot(n, D_frame)) and packed it into
+ * the atlas RGB channels as (* 0.5 + 0.5). So to reverse, decode the RGB
+ * back to ±1 and recombine through the same basis.
+ *
+ * @param {number[]} out          length-3 output, object-space normal
+ * @param {number} nr             encoded R in [0,1]
+ * @param {number} ng             encoded G in [0,1]
+ * @param {number} nb             encoded B in [0,1]
+ * @param {number[]} frame        bake basis from {@link bake_frame_from_direction}
+ */
+function decode_normal_to_object_space(out, nr, ng, nb, frame) {
+    // Decode bake-view-space normal from [0,1] to [-1,1]
+    const nx = nr * 2 - 1;
+    const ny = ng * 2 - 1;
+    const nz = nb * 2 - 1;
+
+    const rx = frame[0], ry = frame[1], rz = frame[2];
+    const ux = frame[3], uy = frame[4], uz = frame[5];
+    const Dx = frame[6], Dy = frame[7], Dz = frame[8];
+
+    // Recompose in object space.
     out[0] = rx * nx + ux * ny + Dx * nz;
     out[1] = ry * nx + uy * ny + Dy * nz;
     out[2] = rz * nx + uz * ny + Dz * nz;
@@ -137,31 +170,14 @@ function decode_normal_to_object_space(out, nr, ng, nb, D_frame) {
  * @param {number} depth01       depth in [0,1] as stored in atlas alpha
  * @param {number} frame_u_local frame-local X in [-1, +1]
  * @param {number} frame_v_local frame-local Y in [-1, +1]
- * @param {number[]} D_frame     bake direction in object space (unit)
+ * @param {number[]} frame       bake basis from {@link bake_frame_from_direction}
  * @param {number} radius        bounding sphere radius
  * @param {number[]} centre      bounding sphere centre (object space)
  */
-function reconstruct_position(out, depth01, frame_u_local, frame_v_local, D_frame, radius, centre) {
-    // Same polar nudge as the normal decoder, so right/up agree.
-    let Dx = D_frame[0], Dy = D_frame[1], Dz = D_frame[2];
-    if (Math.abs(Dy) > 0.99999) {
-        const dz_n = Dz + 0.0001;
-        const len = Math.sqrt(Dx * Dx + Dy * Dy + dz_n * dz_n);
-        Dx /= len;
-        Dy /= len;
-        Dz = dz_n / len;
-    }
-
-    // Same basis as decode_normal_to_object_space; see the cross-product
-    // derivation there.
-    let rx = Dz, ry = 0, rz = -Dx;
-    {
-        const len = Math.sqrt(rx * rx + ry * ry + rz * rz);
-        rx /= len; ry /= len; rz /= len;
-    }
-    const ux = Dy * rz - Dz * ry;
-    const uy = Dz * rx - Dx * rz;
-    const uz = Dx * ry - Dy * rx;
+function reconstruct_position(out, depth01, frame_u_local, frame_v_local, frame, radius, centre) {
+    const rx = frame[0], ry = frame[1], rz = frame[2];
+    const ux = frame[3], uy = frame[4], uz = frame[5];
+    const Dx = frame[6], Dy = frame[7], Dz = frame[8];
 
     // C = centre + radius * D
     const cx = centre[0] + radius * Dx;
@@ -235,6 +251,9 @@ export function read_atlas_to_samples({ impostor, renderer }) {
     const D_frame = [0, 0, 0];
     const pos_scratch = [0, 0, 0];
     const nrm_scratch = [0, 0, 0];
+    // The bake basis is constant across a whole frame tile, so it is built
+    // once per tile rather than twice per covered pixel.
+    const frame_basis = new Array(BAKE_FRAME_STRIDE).fill(0);
 
     const max_frame_index = frame_count - 1;
     const inv_255 = 1 / 255;
@@ -261,6 +280,8 @@ export function read_atlas_to_samples({ impostor, renderer }) {
 
             encoder.uv_to_unit(D_frame, [frame_u, frame_v]);
 
+            bake_frame_from_direction(frame_basis, D_frame);
+
             // Per-pixel decode within this frame tile.
             const px_end = Math.ceil(frame_size);
             for (let py = 0; py < px_end; py++) {
@@ -286,14 +307,14 @@ export function read_atlas_to_samples({ impostor, renderer }) {
                     const frame_u_local = ((px + 0.5) * inv_frame_size) * 2 - 1;
 
                     const depth01 = geometry_bytes[pixel + 3] * inv_255;
-                    reconstruct_position(pos_scratch, depth01, frame_u_local, frame_v_local, D_frame, radius, centre);
+                    reconstruct_position(pos_scratch, depth01, frame_u_local, frame_v_local, frame_basis, radius, centre);
 
                     decode_normal_to_object_space(
                         nrm_scratch,
                         geometry_bytes[pixel] * inv_255,
                         geometry_bytes[pixel + 1] * inv_255,
                         geometry_bytes[pixel + 2] * inv_255,
-                        D_frame
+                        frame_basis
                     );
 
                     const out_offset = sample_count * ATLAS_SAMPLE_STRIDE;

package/src/engine/graphics/impostors/voxel/shader/VoxelImpostorShaderDepthV0.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"VoxelImpostorShaderDepthV0.d.ts","sourceRoot":"","sources":["../../../../../../../src/engine/graphics/impostors/voxel/shader/VoxelImpostorShaderDepthV0.js"],"names":[],"mappings":"AA4EA;;;;;;;GAOG;AACH;IACI,cAYC;CACJ;kCAlGoD,OAAO"}
+{"version":3,"file":"VoxelImpostorShaderDepthV0.d.ts","sourceRoot":"","sources":["../../../../../../../src/engine/graphics/impostors/voxel/shader/VoxelImpostorShaderDepthV0.js"],"names":[],"mappings":"AAiEA;;;;;;;GAOG;AACH;IACI,cAYC;CACJ;kCAvFoD,OAAO"}

package/src/engine/graphics/impostors/voxel/shader/VoxelImpostorShaderDepthV0.js

@@ -1,4 +1,8 @@
 import { GLSL3, NoBlending, RawShaderMaterial } from "three";
+import {
+    GLSL_VOXEL_IMPOSTOR_SPLAT_EXPAND_VERTEX
+} from "../../../shaders/chunks/glsl_voxel_impostor_splat.js";
+import { GLSL_PACKING } from "../../../shaders/chunks/glsl_packing.js";
 
 
 // Shadow-pass depth material for voxel impostors. World-space-sized
@@ -10,8 +14,10 @@ import { GLSL3, NoBlending, RawShaderMaterial } from "three";
 // view-XY only), so gl_FragCoord.z directly gives the splat's distance
 // from the light.
 //
-// Mirrors three.js's packDepthToRGBA so the PCF shadow sampler can
-// unpack our output; identical encoding to ImpostorShaderDepthV0.
+// Depth is RGBA-packed with three.js's own <packing> chunk (interpolated by
+// hand — RawShaderMaterial does not resolve #include), so the PCF shadow
+// sampler decodes exactly what we encoded. ImpostorShaderDepthV0 uses the same
+// chunk.
 const shader_vx = `
     in vec3 position;
     in vec2 uv;
@@ -28,17 +34,8 @@ const shader_vx = `
     void main() {
         vUv = uv;
 
-        float model_scale = length(modelMatrix[0].xyz);
-        float world_diameter = uPointDiameter * model_scale;
-        float radius_OS = uPointDiameter * 0.5;
-
-        // Inward-shift must match the colour pass exactly so the
-        // cast silhouette agrees with the visible one — see
-        // VoxelImpostorShaderV0 for the rationale.
-        vec3 centre_OS = iPosition - iNormal * radius_OS;
-        vec4 centre_view = modelViewMatrix * vec4(centre_OS, 1.0);
-        vec2 corner = position.xy * world_diameter;
-        gl_Position = projectionMatrix * (centre_view + vec4(corner, 0.0, 0.0));
+${GLSL_VOXEL_IMPOSTOR_SPLAT_EXPAND_VERTEX}
+        gl_Position = projectionMatrix * pos_view;
     }
 `;
 
@@ -52,15 +49,7 @@ const shader_fg = `
 
     uniform bool uDiscMask;
 
-    const float PackUpscale = 256.0 / 255.0;
-    const vec3 PackFactors = vec3(256.0 * 256.0 * 256.0, 256.0 * 256.0, 256.0);
-    const float ShiftRight8 = 1.0 / 256.0;
-
-    vec4 packDepthToRGBA(const in float v) {
-        vec4 r = vec4(fract(v * PackFactors), v);
-        r.yzw -= r.xyz * ShiftRight8;
-        return r * PackUpscale;
-    }
+${GLSL_PACKING}
 
     void main() {
         if (uDiscMask) {

package/src/engine/graphics/impostors/voxel/shader/VoxelImpostorShaderLitV0.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"VoxelImpostorShaderLitV0.d.ts","sourceRoot":"","sources":["../../../../../../../src/engine/graphics/impostors/voxel/shader/VoxelImpostorShaderLitV0.js"],"names":[],"mappings":"AA+LA;;;;;;;;;;;;;GAaG;AACH;IACI,cAuBC;CACJ;+BAtOiE,OAAO"}
+{"version":3,"file":"VoxelImpostorShaderLitV0.d.ts","sourceRoot":"","sources":["../../../../../../../src/engine/graphics/impostors/voxel/shader/VoxelImpostorShaderLitV0.js"],"names":[],"mappings":"AAsLA;;;;;;;;;;;;;GAaG;AACH;IACI,cAuBC;CACJ;+BA7NiE,OAAO"}

package/src/engine/graphics/impostors/voxel/shader/VoxelImpostorShaderLitV0.js

@@ -1,4 +1,7 @@
 import { Color, ShaderMaterial, UniformsLib, UniformsUtils } from "three";
+import {
+    GLSL_VOXEL_IMPOSTOR_SPLAT_EXPAND_VERTEX
+} from "../../../shaders/chunks/glsl_voxel_impostor_splat.js";
 
 
 // PBR-lit variant of {@link VoxelImpostorShaderV0}. Each voxel renders
@@ -51,22 +54,10 @@ const shader_vx = `
         vORM = iORM;
         vNormal_OS = iNormal;
 
-        // World-sized camera-facing billboard. Same as the unlit V0:
-        // expand the quad in view space (which is rigid w.r.t. world)
-        // by the OS diameter scaled into world units.
-        float model_scale = length(modelMatrix[0].xyz);
-        float world_diameter = uPointDiameter * model_scale;
-        float world_radius   = world_diameter * 0.5;
-        float radius_OS      = uPointDiameter * 0.5;
-
-        // Inward-shift the splat centre so its outer edge sits at
-        // the original surface. iPosition from the voxeliser is the
-        // surface centroid (un-shifted) — see voxelize_samples.js.
-        vec3 centre_OS = iPosition - iNormal * radius_OS;
-
-        vec4 centre_view = modelViewMatrix * vec4(centre_OS, 1.0);
-        vec2 corner = position.xy * world_diameter;
-        vec4 pos_view = centre_view + vec4(corner, 0.0, 0.0);
+        // World-sized camera-facing billboard, identical to every other
+        // voxel-impostor pass.
+${GLSL_VOXEL_IMPOSTOR_SPLAT_EXPAND_VERTEX}
+        float world_radius = world_diameter * 0.5;
 
         vViewPosition = -pos_view.xyz;
         gl_Position = projectionMatrix * pos_view;

package/src/engine/graphics/impostors/voxel/shader/VoxelImpostorShaderNormalsV0.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"VoxelImpostorShaderNormalsV0.d.ts","sourceRoot":"","sources":["../../../../../../../src/engine/graphics/impostors/voxel/shader/VoxelImpostorShaderNormalsV0.js"],"names":[],"mappings":"AAyDA;IACI,cAUC;CACJ;kCArEwC,OAAO"}
+{"version":3,"file":"VoxelImpostorShaderNormalsV0.d.ts","sourceRoot":"","sources":["../../../../../../../src/engine/graphics/impostors/voxel/shader/VoxelImpostorShaderNormalsV0.js"],"names":[],"mappings":"AAqDA;IACI,cAUC;CACJ;kCAjEwC,OAAO"}

package/src/engine/graphics/impostors/voxel/shader/VoxelImpostorShaderNormalsV0.js

@@ -1,4 +1,7 @@
 import { GLSL3, RawShaderMaterial } from "three";
+import {
+    GLSL_VOXEL_IMPOSTOR_SPLAT_EXPAND_VERTEX
+} from "../../../shaders/chunks/glsl_voxel_impostor_splat.js";
 
 
 // Debug visualisation: shows each voxel's baked OBJECT-space normal as
@@ -21,15 +24,8 @@ const shader_vx = `
         vUv = uv;
         vNormal_OS = iNormal;
 
-        float model_scale = length(modelMatrix[0].xyz);
-        float world_diameter = uPointDiameter * model_scale;
-        float radius_OS = uPointDiameter * 0.5;
-
-        // Inward-shift; see VoxelImpostorShaderV0 for rationale.
-        vec3 centre_OS = iPosition - iNormal * radius_OS;
-        vec4 centre_view = modelViewMatrix * vec4(centre_OS, 1.0);
-        vec2 corner = position.xy * world_diameter;
-        gl_Position = projectionMatrix * (centre_view + vec4(corner, 0.0, 0.0));
+${GLSL_VOXEL_IMPOSTOR_SPLAT_EXPAND_VERTEX}
+        gl_Position = projectionMatrix * pos_view;
     }
 `;
 

package/src/engine/graphics/impostors/voxel/shader/VoxelImpostorShaderV0.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"VoxelImpostorShaderV0.d.ts","sourceRoot":"","sources":["../../../../../../../src/engine/graphics/impostors/voxel/shader/VoxelImpostorShaderV0.js"],"names":[],"mappings":"AA4FA;;;;;;;GAOG;AACH;IACI,cAwBC;CACJ;kCA9HwC,OAAO"}
+{"version":3,"file":"VoxelImpostorShaderV0.d.ts","sourceRoot":"","sources":["../../../../../../../src/engine/graphics/impostors/voxel/shader/VoxelImpostorShaderV0.js"],"names":[],"mappings":"AA6EA;;;;;;;GAOG;AACH;IACI,cAwBC;CACJ;kCA/GwC,OAAO"}

package/src/engine/graphics/impostors/voxel/shader/VoxelImpostorShaderV0.js

@@ -1,4 +1,7 @@
 import { GLSL3, RawShaderMaterial } from "three";
+import {
+    GLSL_VOXEL_IMPOSTOR_SPLAT_EXPAND_VERTEX
+} from "../../../shaders/chunks/glsl_voxel_impostor_splat.js";
 
 
 // Unlit voxel-impostor shader.
@@ -42,25 +45,7 @@ const shader_vx = `
         vORM = iORM;
         vNormalView = normalize(normalMatrix * iNormal);
 
-        float model_scale = length(modelMatrix[0].xyz);
-        float world_diameter = uPointDiameter * model_scale;
-        float radius_OS = uPointDiameter * 0.5;
-
-        // Inward-shift along the surface normal so the splat's OUTER
-        // edge (= centre + radius along normal) lands at the original
-        // surface position (iPosition is the un-shifted surface
-        // centroid the voxeliser produced). Without the shift, a
-        // camera-facing quad of diameter D centred at the surface
-        // extends D/2 past it on silhouette voxels, inflating the
-        // outline. With the shift, silhouette voxels render edge-on
-        // exactly at the mesh outline; inside voxels are pushed
-        // slightly below the surface (sub-pixel at design distance).
-        vec3 centre_OS = iPosition - iNormal * radius_OS;
-
-        vec4 centre_view = modelViewMatrix * vec4(centre_OS, 1.0);
-        vec2 corner = position.xy * world_diameter;
-        vec4 pos_view = centre_view + vec4(corner, 0.0, 0.0);
-
+${GLSL_VOXEL_IMPOSTOR_SPLAT_EXPAND_VERTEX}
         gl_Position = projectionMatrix * pos_view;
     }
 `;

package/src/engine/graphics/impostors/voxel/shader/VoxelImpostorShaderViewportDepthV0.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"VoxelImpostorShaderViewportDepthV0.d.ts","sourceRoot":"","sources":["../../../../../../../src/engine/graphics/impostors/voxel/shader/VoxelImpostorShaderViewportDepthV0.js"],"names":[],"mappings":"AAuDA;IACI,cAUC;CACJ;kCAnEwC,OAAO"}
+{"version":3,"file":"VoxelImpostorShaderViewportDepthV0.d.ts","sourceRoot":"","sources":["../../../../../../../src/engine/graphics/impostors/voxel/shader/VoxelImpostorShaderViewportDepthV0.js"],"names":[],"mappings":"AAmDA;IACI,cAUC;CACJ;kCA/DwC,OAAO"}

package/src/engine/graphics/impostors/voxel/shader/VoxelImpostorShaderViewportDepthV0.js

@@ -1,4 +1,7 @@
 import { GLSL3, RawShaderMaterial } from "three";
+import {
+    GLSL_VOXEL_IMPOSTOR_SPLAT_EXPAND_VERTEX
+} from "../../../shaders/chunks/glsl_voxel_impostor_splat.js";
 
 
 // Debug visualisation: viewport depth of each voxel as grayscale.
@@ -19,15 +22,8 @@ const shader_vx = `
     void main() {
         vUv = uv;
 
-        float model_scale = length(modelMatrix[0].xyz);
-        float world_diameter = uPointDiameter * model_scale;
-        float radius_OS = uPointDiameter * 0.5;
-
-        // Inward-shift; see VoxelImpostorShaderV0 for rationale.
-        vec3 centre_OS = iPosition - iNormal * radius_OS;
-        vec4 centre_view = modelViewMatrix * vec4(centre_OS, 1.0);
-        vec2 corner = position.xy * world_diameter;
-        gl_Position = projectionMatrix * (centre_view + vec4(corner, 0.0, 0.0));
+${GLSL_VOXEL_IMPOSTOR_SPLAT_EXPAND_VERTEX}
+        gl_Position = projectionMatrix * pos_view;
     }
 `;
 

package/src/engine/graphics/material/SplatMaterial.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"SplatMaterial.d.ts","sourceRoot":"","sources":["../../../../../src/engine/graphics/material/SplatMaterial.js"],"names":[],"mappings":"AAgBA;;;;;;;;GAQG;AACH,oFAPW,OAAO,GAIN,cAAc,CAgIzB;;IAtID;;;;;;;;OAQG;IACH,kEAPW,OAAO,EAoIjB;;wBA1IM,OAAO;+BAAP,OAAO"}
+{"version":3,"file":"SplatMaterial.d.ts","sourceRoot":"","sources":["../../../../../src/engine/graphics/material/SplatMaterial.js"],"names":[],"mappings":"AAiBA;;;;;;;;GAQG;AACH,oFAPW,OAAO,GAIN,cAAc,CAgHzB;;IAtHD;;;;;;;;OAQG;IACH,kEAPW,OAAO,EAoHjB;;wBA3HM,OAAO;+BAAP,OAAO"}

package/src/engine/graphics/material/SplatMaterial.js

@@ -11,6 +11,7 @@ import {
     Vector2,
     Vector4 as ThreeVector4
 } from 'three';
+import { make_clouds_uniforms } from "../shaders/lib/make_clouds_uniforms.js";
 import TerrainShader from "../shaders/TerrainShader.js";
 import { whitePixelTexture } from "../texture/whitePixelTexture.js";
 
@@ -77,23 +78,7 @@ export function SplatMaterial(
             "shininess": { type: "f", value: 0 },
             "envMapIntensity": { value: 1 } // temporary
         },
-        {
-            "f_CloudsTime": { type: "f", value: 0 },
-            "f_CloudsAmount": { type: "f", value: 0.9 },
-            "f_CloudsIntensity": { type: "f", value: 0.3 },
-
-            "v_CloudsSpeed_0": { type: "v2", value: new Vector2(0.03, -0.03) },
-            "v_CloudsSpeed_1": { type: "v2", value: new Vector2(0.011, -0.011) },
-            "v_CloudsSpeed_2": { type: "v2", value: new Vector2(0.023, -0.023) },
-
-            "v_CloudsSize_0": { type: "v2", value: new Vector2(40, 40) },
-            "v_CloudsSize_1": { type: "v2", value: new Vector2(20, 20) },
-            "v_CloudsSize_2": { type: "v2", value: new Vector2(10, 10) },
-
-            "t_Clouds_0": { type: "t", value: null },
-            "t_Clouds_1": { type: "t", value: null },
-            "t_Clouds_2": { type: "t", value: null }
-        }
+        make_clouds_uniforms(0.3)
     ]);
 
     if (gridResolution !== undefined) {

package/src/engine/graphics/material/WaterMaterial.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"WaterMaterial.d.ts","sourceRoot":"","sources":["../../../../../src/engine/graphics/material/WaterMaterial.js"],"names":[],"mappings":";AAIA,6DAgEC;+BApEqG,OAAO"}
+{"version":3,"file":"WaterMaterial.d.ts","sourceRoot":"","sources":["../../../../../src/engine/graphics/material/WaterMaterial.js"],"names":[],"mappings":";AAKA,6DAgDC;+BArD4F,OAAO"}

package/src/engine/graphics/material/WaterMaterial.js

@@ -1,5 +1,6 @@
-import { Color, FrontSide, NormalBlending, ShaderMaterial, UniformsLib, UniformsUtils, Vector2 } from 'three';
+import { Color, FrontSide, NormalBlending, ShaderMaterial, UniformsLib, UniformsUtils } from 'three';
 
+import { make_clouds_uniforms } from "../shaders/lib/make_clouds_uniforms.js";
 import WaterShader from "../shaders/WaterShader.js";
 
 const WaterMaterial = function (options) {
@@ -19,23 +20,7 @@ const WaterMaterial = function (options) {
             "specular": { type: "c", value: new Color(0x111111) },
             "shininess": { type: "f", value: 30 }
         },
-        {
-            "f_CloudsTime": { type: "f", value: 0 },
-            "f_CloudsAmount": { type: "f", value: 0.9 },
-            "f_CloudsIntensity": { type: "f", value: 0.5 },
-
-            "v_CloudsSpeed_0": { type: "v2", value: new Vector2(0.03, -0.03) },
-            "v_CloudsSpeed_1": { type: "v2", value: new Vector2(0.011, -0.011) },
-            "v_CloudsSpeed_2": { type: "v2", value: new Vector2(0.023, -0.023) },
-
-            "v_CloudsSize_0": { type: "v2", value: new Vector2(40, 40) },
-            "v_CloudsSize_1": { type: "v2", value: new Vector2(20, 20) },
-            "v_CloudsSize_2": { type: "v2", value: new Vector2(10, 10) },
-
-            "t_Clouds_0": { type: "t", value: null },
-            "t_Clouds_1": { type: "t", value: null },
-            "t_Clouds_2": { type: "t", value: null }
-        }
+        make_clouds_uniforms(0.5)
     ]);
 
     const sm = new ShaderMaterial({

package/src/engine/graphics/material/manager/compilers/CoalesceTextures.d.ts

@@ -1,11 +1,11 @@
 export class CoalesceTextures extends AbstractMaterialTransformer {
     /**
-     *
-     * @type {Cache<Texture, Texture>}
+     * Cache of retained textures
+     * @returns {Cache<Texture, Texture>}
      */
-    textureCache: Cache<Texture, Texture>;
+    get textureCache(): any;
     transform(material: any): any;
+    #private;
 }
 import { AbstractMaterialTransformer } from "../AbstractMaterialTransformer.js";
-import { Cache } from "../../../../../core/cache/Cache.js";
 //# sourceMappingURL=CoalesceTextures.d.ts.map

package/src/engine/graphics/material/manager/compilers/CoalesceTextures.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"CoalesceTextures.d.ts","sourceRoot":"","sources":["../../../../../../../src/engine/graphics/material/manager/compilers/CoalesceTextures.js"],"names":[],"mappings":"AAQA;IAKQ;;;OAGG;IACH,cAFU,uBAAuB,CAM/B;IAGN,8BA4CC;CACJ;4CArE2C,mCAAmC;sBACzD,oCAAoC"}
+{"version":3,"file":"CoalesceTextures.d.ts","sourceRoot":"","sources":["../../../../../../../src/engine/graphics/material/manager/compilers/CoalesceTextures.js"],"names":[],"mappings":"AAGA;IAQI;;;OAGG;IACH,wBAEC;IAED,8BAIC;;CACJ;4CAvB2C,mCAAmC"}

package/src/engine/graphics/material/manager/compilers/CoalesceTextures.js

@@ -1,70 +1,25 @@
-import { AbstractMaterialTransformer } from "../AbstractMaterialTransformer.js";
-import { Cache } from "../../../../../core/cache/Cache.js";
-import { computeTextureHash } from "../../../../asset/loaders/material/computeTextureHash.js";
-import { computeTextureEquality } from "../../../../asset/loaders/material/computeTextureEquality.js";
-import {
-    TextureAttachmentsByMaterialType
-} from "../../../../asset/loaders/material/TextureAttachmensByMaterialType.js";
-
-export class CoalesceTextures extends AbstractMaterialTransformer {
-    constructor() {
-        super();
-
-
-        /**
-         *
-         * @type {Cache<Texture, Texture>}
-         */
-        this.textureCache = new Cache({
-            maxWeight: 1000,
-            keyHashFunction: computeTextureHash,
-            keyEqualityFunction: computeTextureEquality
-        });
-    }
-
-    transform(material) {
-        const textureCache = this.textureCache;
-
-        //patch textures
-        const materialType = material.type;
-
-        /**
-         *
-         * @type {TextureAttachment[]}
-         */
-        const attachments = TextureAttachmentsByMaterialType[materialType];
-
-        if (attachments !== undefined) {
-            const attachment_count = attachments.length;
-
-            for (let i = 0; i < attachment_count; i++) {
-                const attachment = attachments[i];
-
-                const texture = attachment.read(material);
-
-                if (texture === null || texture === undefined) {
-                    continue;
-                }
-
-                //check cache
-                const existingTexture = textureCache.get(texture);
-
-                if (existingTexture !== null) {
-
-                    //console.log('Re-using texture', existingTexture);
-
-                    attachment.write(material, existingTexture);
-
-                } else {
-
-                    //texture was not in cache, cache it
-                    textureCache.put(texture, texture);
-
-                }
-
-            }
-        }
-
-        return material;
-    }
-}
+import { TextureCoalescer } from "../../../../asset/loaders/material/TextureCoalescer.js";
+import { AbstractMaterialTransformer } from "../AbstractMaterialTransformer.js";
+
+export class CoalesceTextures extends AbstractMaterialTransformer {
+
+    /**
+     *
+     * @type {TextureCoalescer}
+     */
+    #coalescer = new TextureCoalescer();
+
+    /**
+     * Cache of retained textures
+     * @returns {Cache<Texture, Texture>}
+     */
+    get textureCache() {
+        return this.#coalescer.cache;
+    }
+
+    transform(material) {
+        this.#coalescer.coalesce(material);
+
+        return material;
+    }
+}

package/src/engine/graphics/particles/ecs/ParticleEmitterSystem.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ParticleEmitterSystem.d.ts","sourceRoot":"","sources":["../../../../../../src/engine/graphics/particles/ecs/ParticleEmitterSystem.js"],"names":[],"mappings":"AAaA;IA6BI;;;;;OAKG;IACH,4BAwBC;IA1DD,4DAA4C;IAE5C,uEAEE;IAEF;;;OAGG;IACH,aAFU,cAAY,IAAI,CAEP;IAEnB,kBAAgB;IAEhB;;;;OAIG;IACH,2BAA0B;IAE1B;;;;OAIG;IACH,wBAAuB;IAcnB;;;OAGG;IACH,+BAAqC;IAErC;;;OAGG;IACH,2BAAuC;IAEvC;;;OAGG;IACH,gBAFU,gBAAgB,CAE2E;IAIzG,2CAiIC;IAED,4CAsBC;IAED;;;;;OAKG;IACH,cAJW,eAAe,aACf,SAAS,qBAoCnB;IAED;;;;;OAKG;IACH,gBAJW,eAAe,aACf,SAAS,qBAenB;IAED,6BAEC;CACJ;uBAhSsB,wBAAwB;0BACrB,qCAAqC;gCAG/B,iDAAiD;4CANrC,uDAAuD;iCAQlE,0CAA0C"}
+{"version":3,"file":"ParticleEmitterSystem.d.ts","sourceRoot":"","sources":["../../../../../../src/engine/graphics/particles/ecs/ParticleEmitterSystem.js"],"names":[],"mappings":"AAaA;IA6BI;;;;;OAKG;IACH,4BAwBC;IA1DD,4DAA4C;IAE5C,uEAEE;IAEF;;;OAGG;IACH,aAFU,cAAY,IAAI,CAEP;IAEnB,kBAAgB;IAEhB;;;;OAIG;IACH,2BAA0B;IAE1B;;;;OAIG;IACH,wBAAuB;IAcnB;;;OAGG;IACH,+BAAqC;IAErC;;;OAGG;IACH,2BAAuC;IAEvC;;;OAGG;IACH,gBAFU,gBAAgB,CAE2E;IAIzG,2CA8HC;IAED,4CAsBC;IAED;;;;;OAKG;IACH,cAJW,eAAe,aACf,SAAS,qBAoCnB;IAED;;;;;OAKG;IACH,gBAJW,eAAe,aACf,SAAS,qBAenB;IAED,6BAEC;CACJ;uBA7RsB,wBAAwB;0BACrB,qCAAqC;gCAG/B,iDAAiD;4CANrC,uDAAuD;iCAQlE,0CAA0C"}

package/src/engine/graphics/particles/ecs/ParticleEmitterSystem.js

@@ -1,5 +1,5 @@
 import { assert } from "../../../../core/assert.js";
-import { bvh_query_depth_range_in_frustum } from "../../../../core/bvh2/bvh3/query/bvh_query_depth_range_in_frustum.js";
+import { make_bvh_depth_range_computer } from "../../ecs/make_bvh_depth_range_computer.js";
 import { ResourceAccessKind } from "../../../../core/model/ResourceAccessKind.js";
 import { ResourceAccessSpecification } from "../../../../core/model/ResourceAccessSpecification.js";
 import { ImageRGBADataLoader } from "../../../asset/loaders/image/ImageRGBADataLoader.js";
@@ -100,10 +100,7 @@ export class ParticleEmitterSystem extends System {
             }
         );
 
-        const bvh = this.particleEngine.bvh;
-        renderLayer.compute_depth_range = (result, frustum, nx, ny, nz, c) => {
-            bvh_query_depth_range_in_frustum(result, bvh, frustum, nx, ny, nz, c);
-        };
+        renderLayer.compute_depth_range = make_bvh_depth_range_computer(this.particleEngine.bvh);
 
         renderLayer.visibleSet.onAdded.add((points) => {
             /**