@woosh/meep-engine 3.53.0 → 3.55.0

package/src/generation/foliage/material/make_bark_material.js

@@ -1,6 +1,7 @@
 import { PI2 } from "../../../core/math/PI2.js";
 import { clamp } from "../../../core/math/clamp.js";
 import { lerp } from "../../../core/math/lerp.js";
+import { worley_noise_2d } from "../../../core/math/noise/worley_noise_2d.js";
 import { seededRandom } from "../../../core/math/random/seededRandom.js";
 import { smoothStep } from "../../../core/math/smoothStep.js";
 import { Sampler2D } from "../../../engine/graphics/texture/sampler/Sampler2D.js";
@@ -13,84 +14,12 @@ import { TextureFilterType } from "../../../shade/renderer/texture/TextureFilter
 import { TextureWrapType } from "../../../shade/renderer/texture/TextureWrapType.js";
 import { AlphaMode } from "../../../shade/renderer/texture/source/AlphaMode.js";
 import { ShadeImage } from "../../../shade/renderer/texture/source/ShadeImage.js";
-import { BarkMaterialConfig } from "../config/BarkMaterialConfig.js";
+import { BarkMaterialConfig } from "../config/BarkMaterialConfig.js";
+import { FoliageBarkType } from "../config/FoliageBarkType.js";
 
 const SCRATCH_WORLEY = new Float32Array(3);
 const SCRATCH_WORLEY2 = new Float32Array(3);
 
-/**
- * Fast deterministic integer hash in [0, 1).
- * @param {number} ix
- * @param {number} iy
- * @param {number} seed
- * @returns {number}
- */
-function cell_hash_01(ix, iy, seed) {
-    let h = (ix * 374761393 + iy * 668265263 + seed * 1442695041) | 0;
-    h = Math.imul(h ^ (h >>> 13), 1274126177);
-    h = (h ^ (h >>> 16)) >>> 0;
-    return h / 4294967296.0;
-}
-
-/**
- * Evaluates a seamlessly tileable 2D cellular Worley (Voronoi) noise on `[0, 1)^2`
- * with periodic lattice dimensions `(cells_u, cells_v)`.
- * Writes `[F1, F2 - F1, cell_id]` into `out`.
- *
- * @param {Float32Array|number[]} out
- * @param {number} u
- * @param {number} v
- * @param {number} cells_u
- * @param {number} cells_v
- * @param {number} seed
- */
-function sample_tileable_worley(out, u, v, cells_u, cells_v, seed) {
-    const cu = Math.max(1, cells_u | 0);
-    const cv = Math.max(1, cells_v | 0);
-    const u_wrap = ((u % 1.0) + 1.0) % 1.0;
-    const v_wrap = ((v % 1.0) + 1.0) % 1.0;
-
-    const gx = u_wrap * cu;
-    const gy = v_wrap * cv;
-    const ix0 = Math.floor(gx);
-    const iy0 = Math.floor(gy);
-
-    let d1 = 1e9;
-    let d2 = 1e9;
-    let best_id = 0.0;
-
-    for (let dy = -1; dy <= 1; dy++) {
-        const ny = iy0 + dy;
-        const wy = ((ny % cv) + cv) % cv;
-        for (let dx = -1; dx <= 1; dx++) {
-            const nx = ix0 + dx;
-            const wx = ((nx % cu) + cu) % cu;
-
-            const jx = cell_hash_01(wx, wy, seed);
-            const jy = cell_hash_01(wx, wy, seed ^ 0x6C8E9CF5);
-            const cid = cell_hash_01(wx, wy, seed ^ 0xB5297A4D);
-
-            const px = nx + 0.15 + 0.70 * jx - gx;
-            const py = ny + 0.15 + 0.70 * jy - gy;
-            const dist2 = px * px + py * py;
-
-            if (dist2 < d1) {
-                d2 = d1;
-                d1 = dist2;
-                best_id = cid;
-            } else if (dist2 < d2) {
-                d2 = dist2;
-            }
-        }
-    }
-
-    const f1 = Math.sqrt(d1);
-    const f2 = Math.sqrt(d2);
-    out[0] = f1;
-    out[1] = clamp(f2 - f1, 0.0, 1.0);
-    out[2] = best_id;
-}
-
 /**
  * Evaluates a seamlessly tileable 2D periodic gradient noise value on `[0, 1)^2`
  * with integer periods `(freq_u, freq_v)` and zero allocation overhead.
@@ -160,7 +89,7 @@ function sample_tileable_bark_noise(u, v, freq_u, freq_v, ox, oy, oz) {
  *
  * @param {number} seed
  * @param {number} count
- * @param {string} bark_type
+ * @param {FoliageBarkType|number} bark_type
  * @returns {Array<{u: number, v: number, rx: number, ry: number, phase: number}>}
  */
 function build_bark_knot_sites(seed, count, bark_type) {
@@ -170,8 +99,8 @@ function build_bark_knot_sites(seed, count, bark_type) {
         sites.push({
             u: ((k + 0.22 + 0.55 * rng()) / Math.max(1, count)) % 1.0,
             v: 0.18 + (k + 0.18 + 0.60 * rng()) / Math.max(1, count) * 0.44,
-            rx: bark_type === "birch" ? (0.075 + 0.030 * rng()) : (0.055 + 0.025 * rng()),
-            ry: bark_type === "birch" ? (0.008 + 0.004 * rng()) : (0.011 + 0.005 * rng()),
+            rx: bark_type === FoliageBarkType.Birch ? (0.075 + 0.030 * rng()) : (0.055 + 0.025 * rng()),
+            ry: bark_type === FoliageBarkType.Birch ? (0.008 + 0.004 * rng()) : (0.011 + 0.005 * rng()),
             phase: rng() * PI2
         });
     }
@@ -200,7 +129,7 @@ export function evaluate_bark_relief(out, u, v, cfg, seed = 1) {
     const oz = (((seed ^ 0x2DDFA232) * 1664525) & 0xFFFF) * 0.003 - 98.0;
 
     const knot_amt = clamp(cfg.knot_amount ?? 0.55, 0.0, 1.0);
-    const bark_type = (cfg.bark_type || "fissured").toLowerCase();
+    const bark_type = cfg.bark_type ?? FoliageBarkType.Fissured;
 
     // Ontogenetic attenuation: old basal/mid bark has macro-relief, young upper twigs are smooth
     const young_fade = 1.0 - 0.82 * smoothStep(0.60, 0.84, v0);
@@ -248,7 +177,7 @@ export function evaluate_bark_relief(out, u, v, cfg, seed = 1) {
 
     const n_macro1 = sample_tileable_bark_noise(u0, v_tile, 2, 7, ox, oy, oz);
     const n_macro2 = sample_tileable_bark_noise(u0, v_tile, 3, 12, ox + 37.0, oy + 19.0, oz + 53.0);
-    const amp = bark_type === "birch" ? 0.34 : 0.46;
+    const amp = bark_type === FoliageBarkType.Birch ? 0.34 : 0.46;
     const h = clamp(0.5 + (0.58 * n_macro1 + 0.42 * n_macro2) * amp * young_fade + knot_height, 0.0, 1.0);
 
     const eps = 0.02;
@@ -312,9 +241,9 @@ export function make_bark_material(config = new BarkMaterialConfig(), seed = 1)
     const base_rough = clamp(Math.max(0.86, cfg.roughness), 0.86, 0.98);
 
     // Determine effective archetype
-    let bark_type = (cfg.bark_type || "fissured").toLowerCase();
-    if (bark_type === "fissured" && lenticel > 0.55 && cfg.primary_color.r > 0.72) {
-        bark_type = "birch";
+    let bark_type = cfg.bark_type ?? FoliageBarkType.Fissured;
+    if (bark_type === FoliageBarkType.Fissured && lenticel > 0.55 && cfg.primary_color.r > 0.72) {
+        bark_type = FoliageBarkType.Birch;
     }
 
     const r1 = cfg.primary_color.r, g1 = cfg.primary_color.g, b1 = cfg.primary_color.b;
@@ -324,7 +253,7 @@ export function make_bark_material(config = new BarkMaterialConfig(), seed = 1)
     const bi = cfg.inner_bark_color?.b ?? 0.22;
     const rm = cfg.moss_color.r, gm = cfg.moss_color.g, bm = cfg.moss_color.b;
 
-    const knot_sites = build_bark_knot_sites(seed, bark_type === "birch" ? 6 : 5, bark_type);
+    const knot_sites = build_bark_knot_sites(seed, bark_type === FoliageBarkType.Birch ? 6 : 5, bark_type);
 
     // Pass 1: Synthesize species-specific ontogenetic bark heightfield and albedo
     for (let y = 0; y < height; y++) {
@@ -364,7 +293,7 @@ export function make_bark_material(config = new BarkMaterialConfig(), seed = 1)
 
                     u_flow += -du * 0.20 * Math.exp(-0.55 * rho2) * knot_amt * mature_w;
 
-                    if (bark_type === "birch") {
+                    if (bark_type === FoliageBarkType.Birch) {
                         // Characteristic dark craggy chevron "Birch Eye" branch-collar scar
                         const y_chev = yk + 0.45 * Math.pow(Math.abs(xk), 1.15);
                         const chev_ridge = Math.exp(-3.4 * y_chev * y_chev) * Math.exp(-1.10 * xk * xk);
@@ -390,7 +319,7 @@ export function make_bark_material(config = new BarkMaterialConfig(), seed = 1)
             let cr = r1, cg = g1, cb = b1;
             let rough = base_rough;
 
-            if (bark_type === "birch") {
+            if (bark_type === FoliageBarkType.Birch) {
                 // --- ARCHETYPE 2: SILVER / PAPER BIRCH (WORLD-ASPECT CALIBRATED) ---
                 const n_low = sample_tileable_bark_noise(u, v, 2, 16, ox, oy, oz);
                 const n_med = sample_tileable_bark_noise(u, v, 4, 64, ox + 37.0, oy + 19.0, oz + 53.0);
@@ -413,8 +342,8 @@ export function make_bark_material(config = new BarkMaterialConfig(), seed = 1)
                 const fine_horiz = 0.5 + 0.5 * Math.sin(v * PI2 * 280.0 + n_med * 0.7);
 
                 // Crisp thin horizontal lenticel dashes (3x220 and 6x360 cells so dashes are thin in world Y!)
-                sample_tileable_worley(SCRATCH_WORLEY, u + n_low * 0.012, v, 3, 220, seed ^ 0x13579BDF);
-                sample_tileable_worley(SCRATCH_WORLEY2, u + n_med * 0.008, v, 6, 360, seed ^ 0x2468ACE0);
+                worley_noise_2d(SCRATCH_WORLEY, u + n_low * 0.012, v, 3, 220, seed ^ 0x13579BDF);
+                worley_noise_2d(SCRATCH_WORLEY2, u + n_med * 0.008, v, 6, 360, seed ^ 0x2468ACE0);
                 const lent_dash1 = smoothStep(0.28, 0.07, SCRATCH_WORLEY[0]) * (SCRATCH_WORLEY[2] < lenticel * 0.55 ? 1.0 : 0.0);
                 const lent_dash2 = smoothStep(0.25, 0.06, SCRATCH_WORLEY2[0]) * (SCRATCH_WORLEY2[2] < lenticel * 0.65 ? 1.0 : 0.0);
                 const lent_line = Math.pow(Math.max(0.0, Math.sin(v * PI2 * 180.0 + n_low * 1.4)), 7.0)
@@ -499,7 +428,7 @@ export function make_bark_material(config = new BarkMaterialConfig(), seed = 1)
                 }
 
                 rough = clamp(base_rough + 0.05 * birch_basal_mask - 0.02 * birch_young_mask, 0.85, 0.97);
-            } else if (bark_type === "plated") {
+            } else if (bark_type === FoliageBarkType.Plated) {
                 // --- ARCHETYPE 3: RAGGED FLAKY CONIFER SCALE BARK (PINE / SPRUCE, WORLD-ASPECT CALIBRATED) ---
                 const warp_u = (
                     sample_tileable_bark_noise(u, v, 3, 20, ox + 11.3, oy + 7.1, oz + 3.7) * 0.042
@@ -515,8 +444,8 @@ export function make_bark_material(config = new BarkMaterialConfig(), seed = 1)
 
                 // World-aspect-calibrated scale lattice: 6x28 primary scales + 12x56 secondary scales
                 const cells_v = Math.max(12, Math.round(freq_u * 4.5));
-                sample_tileable_worley(SCRATCH_WORLEY, uw, vw, freq_u, cells_v, seed);
-                sample_tileable_worley(SCRATCH_WORLEY2, uw, vw, freq_u * 2, cells_v * 2, seed ^ 0x9E3779B9);
+                worley_noise_2d(SCRATCH_WORLEY, uw, vw, freq_u, cells_v, seed);
+                worley_noise_2d(SCRATCH_WORLEY2, uw, vw, freq_u * 2, cells_v * 2, seed ^ 0x9E3779B9);
 
                 const df1 = SCRATCH_WORLEY[1];
                 const cid1 = SCRATCH_WORLEY[2];
@@ -566,7 +495,7 @@ export function make_bark_material(config = new BarkMaterialConfig(), seed = 1)
                 cg = lerp(mg, yg, young_w);
                 cb = lerp(mb, yb, young_w);
                 rough = clamp(lerp(0.95, base_rough, crevice_mix) * (1.0 - 0.03 * young_w), 0.86, 0.98);
-            } else if (bark_type === "ringed") {
+            } else if (bark_type === FoliageBarkType.Ringed) {
                 // --- ARCHETYPE 4: RINGED / FIBROUS TRUNK BARK (PALM / SHRUB / FERN) ---
                 const n1 = sample_tileable_bark_noise(u, v, 2, 24, ox, oy, oz);
                 const n2 = sample_tileable_bark_noise(u, v, 12, 48, ox + 41.0, oy + 29.0, oz + 73.0);
@@ -597,8 +526,8 @@ export function make_bark_material(config = new BarkMaterialConfig(), seed = 1)
 
                 // Braided cellular Voronoi ridges + multi-harmonic vertical canyons + craggy transverse breaks
                 const cells_v = Math.max(10, Math.round(freq_u * 3.6));
-                sample_tileable_worley(SCRATCH_WORLEY, uw, vw, freq_u, cells_v, seed);
-                sample_tileable_worley(SCRATCH_WORLEY2, uw, vw, freq_u * 2, cells_v * 2, seed ^ 0x5A3C9E17);
+                worley_noise_2d(SCRATCH_WORLEY, uw, vw, freq_u, cells_v, seed);
+                worley_noise_2d(SCRATCH_WORLEY2, uw, vw, freq_u * 2, cells_v * 2, seed ^ 0x5A3C9E17);
 
                 const detail_n1 = sample_tileable_bark_noise(uw, vw, freq_u, 24, ox, oy, oz);
                 const detail_n2 = sample_tileable_bark_noise(uw, vw, freq_u * 2, 48, ox + 37.0, oy + 19.0, oz + 53.0);
@@ -684,7 +613,7 @@ export function make_bark_material(config = new BarkMaterialConfig(), seed = 1)
 
     // Pass 2: 3x3 rotationally invariant Scharr normal map + multi-radius Laplacian cavity AO
     const res_scale = Math.max(1.0, width / 64.0);
-    const base_slope = (bark_type === "birch"
+    const base_slope = (bark_type === FoliageBarkType.Birch
         ? (2.10 * depth + 0.45)
         : (2.35 * depth + 0.52)) * res_scale;
     const r_ao = Math.max(1, Math.round(width / 64));
@@ -795,7 +724,6 @@ export function make_bark_material(config = new BarkMaterialConfig(), seed = 1)
     material.ambient_factors.a = 1.0;
     material.ambient_factors.b = 0.0;
     material.transparency_mode = TransparencyMode.Opaque;
-    material.transparency = TransparencyMode.Opaque;
     material.draw_side = ShadeDrawSide.Front;
 
     return material;

package/src/generation/foliage/material/make_foliage_material.d.ts

@@ -1,14 +1,40 @@
+/**
+ * Packs `variant_count` square foliage card tiles of size `resolution x resolution` into a 2D atlas
+ * using the engine's `MaxRectanglesPacker` (`pack_max_rectangles`), returning the atlas dimensions,
+ * pixel-space `AABB2` boxes, and normalized `[u0, v0, u1, v1]` UV rectangles.
+ *
+ * @param {number} [resolution=128]
+ * @param {number} [variant_count=4]
+ * @returns {{
+ *   resolution: number,
+ *   variant_count: number,
+ *   atlas_w: number,
+ *   atlas_h: number,
+ *   boxes: AABB2[],
+ *   uv_rects: Float32Array
+ * }}
+ */
+export function compute_foliage_variant_atlas_layout(resolution?: number, variant_count?: number): {
+    resolution: number;
+    variant_count: number;
+    atlas_w: number;
+    atlas_h: number;
+    boxes: AABB2[];
+    uv_rects: Float32Array;
+};
 /**
  * Synthesizes a turn-key procedural PBR cutout `StandardShadeMaterial` (`TransparencyMode.AlphaTested`,
- * `ShadeDrawSide.Double`) for botanical foliage cards, with dilated straight-alpha Albedo
- * (`AlphaMode.Straight`, `ColorSpace.SRGB`), 2-channel Normal map (`ColorSpace.LinearSRGB`),
- * and ORM (`ColorSpace.LinearSRGB`).
+ * `ShadeDrawSide.Double`) for botanical foliage cards, packing `config.variant_count` ontogenetic and
+ * biochemically senescent leaf cluster variants into the texture atlas via `MaxRectanglesPacker`
+ * (`pack_max_rectangles`), with dilated straight-alpha Albedo (`AlphaMode.Straight`, `ColorSpace.SRGB`),
+ * 2-channel Normal map (`ColorSpace.LinearSRGB`), and ORM (`ColorSpace.LinearSRGB`).
  *
  * @param {FoliageMaterialConfig|Object} [config]
  * @param {number} [seed=1]
  * @returns {StandardShadeMaterial}
  */
 export function make_foliage_material(config?: FoliageMaterialConfig | any, seed?: number): StandardShadeMaterial;
+import AABB2 from "../../../core/geom/2d/aabb/AABB2.js";
 import { FoliageMaterialConfig } from "../config/FoliageMaterialConfig.js";
 import { StandardShadeMaterial } from "../../../shade/renderer/material/StandardShadeMaterial.js";
 //# sourceMappingURL=make_foliage_material.d.ts.map

package/src/generation/foliage/material/make_foliage_material.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"make_foliage_material.d.ts","sourceRoot":"","sources":["../../../../../src/generation/foliage/material/make_foliage_material.js"],"names":[],"mappings":"AAgGA;;;;;;;;;GASG;AACH,+CAJW,qBAAqB,MAAO,SAC5B,MAAM,GACJ,qBAAqB,CA8PjC;sCAvVqC,oCAAoC;sCARpC,2DAA2D"}
+{"version":3,"file":"make_foliage_material.d.ts","sourceRoot":"","sources":["../../../../../src/generation/foliage/material/make_foliage_material.js"],"names":[],"mappings":"AAqBA;;;;;;;;;;;;;;;GAeG;AACH,kEAXW,MAAM,kBACN,MAAM,GACJ;IACZ,UAAc,EAAE,MAAM,CAAC;IACvB,aAAiB,EAAE,MAAM,CAAC;IAC1B,OAAW,EAAE,MAAM,CAAC;IACpB,OAAW,EAAE,MAAM,CAAC;IACpB,KAAS,EAAE,KAAK,EAAE,CAAC;IACnB,QAAY,EAAE,YAAY,CAAA;CACvB,CA4CH;AAuGD;;;;;;;;;;GAUG;AACH,+CAJW,qBAAqB,MAAO,SAC5B,MAAM,GACJ,qBAAqB,CA6ZjC;kBA5lBiB,qCAAqC;sCAiBjB,oCAAoC;sCARpC,2DAA2D"}