mapspinner 0.1.72 → 0.1.74

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mapspinner",
-  "version": "0.1.72",
+  "version": "0.1.74",
   "description": "WebGL2 Earth-scale terrain rendering SDK for interactive globe applications",
   "main": "src/index.js",
   "exports": {

package/src/shaders/terrain.glsl

@@ -223,7 +223,7 @@ uniform float uMtnBandWide;                // widen mtn=smoothstep(16.8,18.6,ele
 uniform float uClimateRelief;              // widen wetLowFlat(0.66,0.9,humid) + coldFlat(0.18,0.34,temp) reliefMul gates
 uniform float uIsleWide;                    // widen isleZone seaBias gates (50,350)+(900,1600) -> (30,600)+(600,2200)
 uniform float uCarveWide;                   // widen the river/canyon/lake/dune CLIMATE gates so carve depth fades in over a wide span
-float canyonRidgeField(vec3 dir){ return inciseRidgeField(normalize(dir) + vec3(13.7, -4.2, 8.9), 380.0, 2.07); }  // phase offset matches FS canyonMask. baseFreq 380 = ~100km gorge network (user 2026-06-14: doubled 380->760 to restore deck-visible canyons after a 380->96 regression that put gorges ~400km apart = 'missing', then HALVED 760->380 back to the ~100km baseline). Shared VS carve + FS mask -> congruent by construction.
+float canyonRidgeField(vec3 dir){ return inciseRidgeField(normalize(dir) + vec3(13.7, -4.2, 8.9), 190.0, 2.07); }  // phase offset matches FS canyonMask. baseFreq 190 = ~200km gorge network (user 2026-06-14: HALVED 380->190 = fewer, wider-spaced gorges, easier for the coarse grid to represent). Shared VS carve + FS mask -> congruent by construction.
 // CANYON cross-section now reads as a CANYON, not a V-notch: STEEP WALLS + a FLAT FLOOR.
 //   wall = a sharp smoothstep band -> the carve drops fast over a narrow ridge interval (the cliff
 //          walls), instead of the old gentle bench+gorge blend that made shallow V-troughs.
@@ -235,9 +235,12 @@ float canyonCarveM(vec3 dir, out float depth){
     // WIDENED bands (user 2026-06-02 deepen+widen): the old .78/.86/.905/.93 intervals were a very
     // narrow ridge slice -> thin hairline gorges. Widen so the canyon reads as a BROAD gorge: a wide
     // eroded rim shoulder, a steep but visible wall, and a wide flat floor that the gorge bottoms out on.
-    float bench = smoothstep(0.62, 0.78, ridge);               // wide eroded rim shoulder
-    float wall  = smoothstep(0.70, 0.86, ridge);               // STEEP cliff wall (wider band)
-    float floorF= smoothstep(0.80, 0.93, ridge);               // reach the flat gorge floor, then clamp
+    // GENTLER WALLS (user 2026-06-14 'make canyon slopes more gentle, easier for the rough grid to
+    // represent'): widen every band so the same depth descends over a wider ridge interval = lower
+    // gradient -> the coarse LOD grid samples the wall without aliasing the cliff.
+    float bench = smoothstep(0.50, 0.74, ridge);               // wide eroded rim shoulder
+    float wall  = smoothstep(0.58, 0.90, ridge);               // gentle cliff wall (wide band)
+    float floorF= smoothstep(0.72, 0.96, ridge);               // reach the flat gorge floor, then clamp
     depth = max(wall, floorF);
     // 0.18 rim shoulder + 0.82 wall-to-floor; floorF clamps so the bottom is flat (no infinite V).
     float profile = 0.18 * bench + 0.82 * max(wall, floorF);
@@ -703,7 +706,11 @@ highp float composeHeight(vec3 dir0, highp vec2 faceLocal, float tileM){   // W7
   h += cliffCarveV;
   // FLAT RIVER WATER
   float riverWetLine = riverWetMask * riverWet * step(0.0, h);
-  if (riverWetLine > 0.0) { float rWaterLevel = h - 20.0; h = mix(h, rWaterLevel, riverWetLine); vDisp *= (1.0 - riverWetLine); }
+  // DEEPER, GENTLER-APPROACH CHANNEL WATER (user 2026-06-14 'water in canyons very shallow, base flat,
+  // angle of approach to the base far too sharp'): drop the channel bed 20->70m so the water is deep
+  // enough to read, and use riverWetLine^0.6 as the carve weight so the bed eases DOWN over a wider
+  // margin (concave approach) instead of plunging at the wet edge.
+  if (riverWetLine > 0.0) { float rw = pow(riverWetLine, 0.6); float rWaterLevel = h - 70.0; h = mix(h, rWaterLevel, rw); vDisp *= (1.0 - rw); }
   // DUNES on the low sand desert
   float duneSand = smoothstep(mix(0.62, 0.50, uCarveWide), mix(0.85, 0.95, uCarveWide), 1.0 - hpf0.a) * smoothstep(mix(0.40, 0.30, uCarveWide), mix(0.58, 0.68, uCarveWide), hpf0.b) * (1.0 - smoothstep(40.0, 160.0, h));
   float duneCrest; float duneV = duneFieldM(dir0, duneCrest) * duneSand * step(0.0, h);
@@ -753,6 +760,7 @@ out float vLakeWet;     // lake open-water mask (carve basin)
 out float vRiverWet;    // river thalweg wet line
 out float vWaterDepth;  // metres the flat inland-water plane sits ABOVE the local terrain floor (>0 = submerged)
 out float vCanyonDep;   // canyon gorge depth [0,1]
+out float vConcavity;   // height-field Laplacian / step^2 (1/m, +ve = concave valley/pit) -- ELEVATION AO signal (free from the normal central-diff taps)
 out float vCliffFace;   // cliff/escarpment riser face [0,1] (1 = steep terrace face)
 out float vDuneCrest;   // dune crest [0,1]
 out float vLevel;       // quad LOD level (per-instance iOffset.w) for the patches debug view
@@ -938,12 +946,14 @@ void main() {
     // water level + suppress the micro-displacement on the wet line. riverWetMask is the thalweg mask.
     float riverWetLine = riverWetMask * riverWet * step(0.0, vH);
     if (riverWetLine > 0.0) {
-        highp float rWaterLevel = vH - 20.0;         // W7: metres
+        // MIRROR of composeHeight (deeper 20->70m channel + pow(.,0.6) gentler concave approach)
+        float rw = pow(riverWetLine, 0.6);
+        highp float rWaterLevel = vH - 70.0;         // W7: metres
         highp float rFloorBefore = vH;
-        vH = mix(vH, rWaterLevel, riverWetLine);
-        vDisp *= (1.0 - riverWetLine);               // no micro-bumps on the river surface
+        vH = mix(vH, rWaterLevel, rw);
+        vDisp *= (1.0 - rw);                          // no micro-bumps on the river surface
         // record the deeper/stronger of lake|river as the water surface for vWaterDepth
-        if (riverWetLine > haveWater) { waterPlane = rWaterLevel; floorBefore = rFloorBefore; haveWater = riverWetLine; }
+        if (rw > haveWater) { waterPlane = rWaterLevel; floorBefore = rFloorBefore; haveWater = rw; }
     }
     // DUNES on the SAND DESERT (very dry + warm + LOW land): rolling dune relief replaces harsh rock
     // here (ref: webgl-dunes). Gated opposite to canyons (which want elevated arid plateaus) -- dunes
@@ -994,6 +1004,7 @@ void main() {
     // sides of a seam share the same dir0/tangent frame -> consistent normals, no row artifact.
     highp float hN0 = 0.0;
     highp vec3 vN = dir0;
+    highp float concavRaw = 0.0;   // height Laplacian / step^2 (+ve = concave) -- set in the land branches, free from the normal taps
     if (uIsWater < 0.5 && uThc > 0.5) {
         // THC FAST PATH: height + symmetric central-diff normal from the baked pool. 5 bilinear texture
         // taps replace 5 full composeHeight evals (the VS-bound cost). The 4 normal taps use the SAME
@@ -1049,6 +1060,23 @@ void main() {
         vN = normalize(cross(wPU - wMU, wPV - wMV));
         if (dot(vN, dir0) < 0.0) vN = -vN;   // keep it outward (terrain has no overhangs)
     }
+    // ELEVATION-AO CONCAVITY at LARGE scale (user 2026-06-14 'AO is focused on features too small, must
+    // AO the larger features'): the 300m normal-step Laplacian keyed on small/sharp relief (canyons). Take
+    // the Laplacian of broadShapeLowM (the cheap 8-oct LARGE-SCALE shape, no small carves) over a WIDE ~2km
+    // step instead, so the AO darkens broad valleys/basins. broadShapeLowM is the same field the mesa
+    // slope gate uses at a 1.2km step -> a known-cheap large-feature probe. Land only (water needs none).
+    if (uIsWater < 0.5) {
+        const highp float ecM = 2000.0;   // wide finite-diff step = large-feature scale
+        highp vec3 ux = normalize(cross(abs(dir0.y) < 0.99 ? vec3(0.0,1.0,0.0) : vec3(1.0,0.0,0.0), dir0));
+        highp vec3 uy = cross(dir0, ux);
+        highp float h0c = broadShapeLowM(dir0);
+        highp float hxp = broadShapeLowM(normalize(dir0 + ux * (ecM / defRadius)));
+        highp float hxm = broadShapeLowM(normalize(dir0 - ux * (ecM / defRadius)));
+        highp float hyp = broadShapeLowM(normalize(dir0 + uy * (ecM / defRadius)));
+        highp float hym = broadShapeLowM(normalize(dir0 - uy * (ecM / defRadius)));
+        concavRaw = (hxp + hxm + hyp + hym - 4.0 * h0c) / (ecM * ecM);   // 1/m large-scale curvature, +ve = broad valley/basin
+    }
+    vConcavity = concavRaw;
     highp float h = hN0;
     // OCEAN TOP = A SEPARATE, ELEVATION-BASED SURFACE (user 2026-06-10: 'terrain should extend into
     // the ocean, the ocean top separate and elevation based'). composeHeight keeps carrying the TRUE
@@ -1126,6 +1154,7 @@ in float vLakeWet;    // carve masks computed in the VS, interpolated (no per-pi
 in float vRiverWet;
 in float vWaterDepth; // metres of submerged water (>0 = real open inland water at the flat plane)
 in float vCanyonDep;
+in float vConcavity;   // elevation-AO concavity (1/m, +ve = valley/pit)
 in float vCliffFace;
 in float vDuneCrest;
 in float vLevel;          // quad LOD level (patches view)
@@ -1912,7 +1941,7 @@ void main() {
         // 3 normal octaves (user 2026-06-14 'add an even lower freq octave, displacement/normals only,
         // 4x less frequent'): wt4 high (detail) + wt low (2.4km) + wt*0.25 VERY-low (9.6km) -- the very-
         // low one breaks the far repetition even more. Normals/displacement only (no albedo).
-        vec3 nA = surfTriNrm(uSurfNrm, wt4, tw, lA, n) * 1.4 + surfTriNrm(uSurfNrm, wt, tw, lA, n) * 0.8 + surfTriNrm(uSurfNrm, wt * 0.25, tw, lA, n) * 0.55;
+        vec3 nA = surfTriNrm(uSurfNrm, wt4, tw, lA, n) * 2.0 + surfTriNrm(uSurfNrm, wt, tw, lA, n) * 0.9 + surfTriNrm(uSurfNrm, wt * 0.25, tw, lA, n) * 1.1;   // REBALANCED (user 2026-06-14 'higher octaves appear gone'): very-low 2.4 swamped the detail -> high (wt4) UP to 2.0 (dominant detail), very-low DOWN to 1.1 (still visible broad) (user 2026-06-14 'dont really see the lower freq octave yet'): at a 9.6km period its slope is gentle, so it needs more weight to read as broad undulation
         float dispA = albA.a;
         // NO BIOME COLOR INHERITANCE (user 2026-06-14 'take away all biome color inheritance, it will
         // speed it up' -- and fixes 'sand near grass tinted green'): each layer wears its OWN material
@@ -1924,7 +1953,7 @@ void main() {
         if (wB > 0.02) {   // second layer only where a real transition exists
             vec4 albB = surfTriTap(uSurfAlb, wt4, tw, lB);
             vec3 cB = vec3(dot(albB.rgb, LUMA));
-            vec3 nB = surfTriNrm(uSurfNrm, wt4, tw, lB, n) * 1.4 + surfTriNrm(uSurfNrm, wt, tw, lB, n) * 0.8 + surfTriNrm(uSurfNrm, wt * 0.25, tw, lB, n) * 0.55;   // + very-low octave
+            vec3 nB = surfTriNrm(uSurfNrm, wt4, tw, lB, n) * 2.0 + surfTriNrm(uSurfNrm, wt, tw, lB, n) * 0.9 + surfTriNrm(uSurfNrm, wt * 0.25, tw, lB, n) * 1.1;   // REBALANCED (match nA)
             float dispB = albB.a;
             // HEIGHT-BLEND POKE-THROUGH (user 'each texture's higher areas should poke through the other,
             // offset by the ramp'): height = displacement + a weight-ramp offset (gate positions the
@@ -2012,13 +2041,27 @@ void main() {
         // base = flat MATERIAL color (far/low-k); near = structured detail. The macro biome albedo is no
         // longer the base, so NO biome color bleeds into the ground (user 'take away all biome inheritance').
         albedo = clamp(mix(texMatColor, detail, k), 0.0, 1.0);
-        albedo = mix(albedo, biomeC, 0.16);   // subtle climate/biome tint back on top of the material color (deserts tanner, forests greener) -- at all distances for landscape variety
+        albedo = mix(albedo, biomeC, 0.68);   // climate/biome tint back on top of the material color (deserts tanner, forests greener) -- UP 0.16->0.68 (user 2026-06-14 x2 'tinting-according-to-landscape can be intensified, not really visible yet')
         // FAKE MIDDAY AO from the displacement (user 2026-06-14 'darken the deepest parts of the
         // displacement textures a little'): the texture's LOWEST displacement = crevices/pits; darken
         // them ~18% so the surface reads as sunlit-from-above with soft self-occlusion in the lows.
         // Faded by k so the far field (where the texture mips out) is untouched.
-        float texAO = mix(1.0, mix(0.82, 1.0, smoothstep(0.0, 0.5, texAlb.a)), k);
+        // STRONGER fake-midday AO (user 2026-06-14 'should be more intense, we dont really see it'):
+        // darken the recesses harder (0.82->0.5 = up to 50%) over a wider low-displacement range so the
+        // crevices/pits read clearly. Still faded by k so the mipped far field is untouched.
+        float texAO = mix(1.0, mix(0.5, 1.0, smoothstep(0.05, 0.6, texAlb.a)), k);
         albedo *= texAO;
+        // ELEVATION AO (user 2026-06-14 x3 'similar AO on elevation / still not visible'): the screen-space
+        // curvature of vNrm was ~0 (vNrm is a per-vertex analytic normal, linearly interpolated -> its
+        // fwidth is tiny on the coarse grid = invisible). Replaced with vConcavity = the height-field
+        // LAPLACIAN computed FREE from the VS normal central-diff taps (1/m, +ve = concave valley/pit),
+        // a real object-space relief signal that survives interpolation. Darken concavities up to 65%.
+        // VERY GRADUAL response (user 2026-06-14 'ao works but not gradiated, must be very gradual'): the
+        // hard clamp(.,0.6) flat-topped every valley past a threshold = a visible AO edge + no gradation
+        // between medium and deep concavity. Exponential SOFT saturation instead -- monotonic, smooth
+        // onset AND smooth approach to the 0.6 floor, so darkening grades continuously with depth, no edge.
+        float elevAO = 1.0 - 0.6 * (1.0 - exp(-max(vConcavity, 0.0) * 2500.0));   // concavRaw ~=1/Rc of the LARGE shape (~3-7e-4 for km-scale basins): broad valley eases in, asymptotes to -60%
+        albedo *= elevAO;
         // displacement-normal relief: WORLD-SPACE UDN perturbation from surfTriNrm (each projection
         // plane's tangent axes, not the radial frame). Amplitude capped low (scramble lesson d262b5e);
         // applied AFTER the uReliefShade exaggeration below so the exaggeration never amplifies it.