mapspinner 0.1.61 → 0.1.63

package/package.json

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

package/src/gl-render.js

@@ -1051,7 +1051,7 @@ export async function initMapspinnerRender(gl, opts = {}) {
     gl.uniform1f(U('oceanAmp'), (oc.oceanAmplitude != null) ? oc.oceanAmplitude : 1.0);
     gl.uniform1f(U('oceanChoppy'), (oc.oceanChoppiness != null) ? oc.oceanChoppiness : 0.5);
     gl.uniform1f(U('oceanFoam'), (oc.oceanFoam != null) ? oc.oceanFoam : 0.5);
-    gl.uniform1f(U('uBeachTopM'), _g('beachTop', 1000.0));   // beach ceiling: grass stops, sand to the waterline + under it. 30->90 (user 2026-06-14: 3x beach width)
+    gl.uniform1f(U('uBeachTopM'), _g('beachTop', 80.0));   // beach ceiling: grass stops, sand to the waterline + under it. 30->90 (user 2026-06-14: 3x beach width)
 
     // SINGLE INSTANCED DRAW: the deform params that were per-quad uniforms (ox,oy,l,level + face)
     // are now PER-INSTANCE attributes. Build one interleaved instance buffer [ox,oy,l,level,face]

package/src/shaders/terrain.glsl

@@ -1395,6 +1395,7 @@ float canyonMask(vec3 worldPos, float h, float temp, float humid, float px, out
 #endif   // biomeClassColor/riverMask/canyonMask: DEBUGVIEW-only (called solely from displayMode blocks) -- excluded from render FS cold-compile (FS-2, workflow w4y1bnrqc)
 
 vec3 terrainAlbedoClimate(float h, float slope, float rockSlope, float temp, float humid, highp vec3 worldPos, float pxWorld) {   // highp: worldPos feeds normalize(worldPos)*freq noise UVs (mottle/river/canyon ridge) -- mediump scrambles the lattice up close
+    highp vec3 nwp = normalize(worldPos);   // hoisted: reused by the mottle + river/canyon ridge dirs (was recomputed)
     vec3 c = terrainAlbedo(h, slope, rockSlope, worldPos, pxWorld);
     if (h < 0.0) {
         // SEA ICE: near-polar ocean (very cold) freezes to white-blue pack ice. Pure fn of the
@@ -1430,7 +1431,7 @@ vec3 terrainAlbedoClimate(float h, float slope, float rockSlope, float temp, flo
     // soil/moisture/vegetation patchiness mottles albedo. Reuse the snoise3 already evaluated for
     // cliffRock (same normalize(worldPos)*~1k pattern, no new octave) as a VALUE-only multiplier (NO
     // hue jitter, low 1200 freq -> does NOT reintroduce the per-pixel swamp moire the pipeline removed).
-    float mot = snoise3(normalize(worldPos) * 120.0);   // detail-tex-rockface-canyon-10x: *1200->*120 (~10x larger mottle features, user 2026-06-06)
+    float mot = snoise3(nwp * 120.0);   // detail-tex-rockface-canyon-10x: *1200->*120 (~10x larger mottle features, user 2026-06-06)
     c *= (1.0 + uVariationAmt * mot);
     // earlier snow/ice on high ground in cold regions.
     float coldSnow = (1.0 - smoothstep(0.30, 0.75, temp)) * smoothstep(snowEdges.x * 0.5, snowEdges.x, h);
@@ -1480,7 +1481,7 @@ vec3 terrainAlbedoClimate(float h, float slope, float rockSlope, float temp, flo
     // the deleted 2026-06-01 detail texturing), value-only (no hue shift), and each octave fades out
     // via a pxWorld Nyquist gate before its features go sub-pixel (no orbit speckle, no leopard band).
     {
-        highp vec3 od = normalize(worldPos);
+        highp vec3 od = nwp;
         float ov = 0.0, oa = 0.0;
         float fq = 75.0, am = 1.0;                 // octaves: ~84km / 17km / 3.4km features (halved to match VS detailFbm)
         int fdOcts = (uFSDetailOcts > 0) ? uFSDetailOcts : 3;
@@ -1538,7 +1539,8 @@ void main() {
     // PER-FRAGMENT tangent frame from vWorld (the sphere position, C0 across quad edges):
     // uz = up (radial), ux = normalize(Y x uz), uy = uz x ux. Continuous across adjacent quads
     // -> no per-quad shading-baseline seam.
-    vec3 uz = normalize(vWorld);
+    highp vec3 nWorld = normalize(vWorld);   // computed ONCE, reused for the tangent up + every band/noise/lighting dir (perf: was ~7 separate normalize() calls)
+    vec3 uz = nWorld;
     // AUDIT FIX 2026-06-06 (audit-tangent-frame-degeneracy): the reference axis was a FIXED vec3(0,1,0),
     // so cross(Y, uz) -> zero-length (NaN normal) wherever uz is parallel to Y -- i.e. the +Y/-Y cube
     // faces and the poles, exactly 'wrong normals in the wrong places'. Pick the world axis LEAST
@@ -1787,7 +1789,7 @@ void main() {
         // SHARED biome-band warp pattern (user 2026-06-14: the SAME warping on snow/rock bands AND the
         // beach->land crossover). 2-oct world-dir noise, 1/4 freq (~13km + ~5km waves). Computed once
         // here; the snow/rock bandWarp below reuses warpN. highp dir for the lattice precision.
-        highp vec3 bwDir = normalize(vWorld);
+        highp vec3 bwDir = nWorld;
         // 3-oct (added the ~1km octave, user 2026-06-14 'make biome bands more interesting') -> the
         // texture-splat rock/snow/beach edges break into finer fingers as you approach, not a hard band.
         float warpN = snoise3(bwDir * 3325.0) + 0.5 * snoise3(bwDir * 7750.0) + 0.35 * snoise3(bwDir * 17000.0);   // ~ +/-1.8
@@ -1877,38 +1879,26 @@ void main() {
         wt += vTexWarp * uTexWarp;
         vec3 tw = abs(n); tw = tw * tw; tw /= (tw.x + tw.y + tw.z + 1e-4);
         const vec3 LUMA = vec3(0.299, 0.587, 0.114);
-        float detailFade = (1.0 - smoothstep(1.0, 12.0, pxWorld));
         float bAB = clamp(wA / max(wA + wB, 1e-4), 0.0, 1.0);
-        // PER-LAYER material = base octave (NORMALS ONLY -> albedo flattened to luma, macro color carries
-        // chroma) + the 4x DETAIL octave (albedo STRUCTURE + strong normal) + a per-layer DISPLACEMENT
-        // (coarse base, refined by the 4x near the deck). Each top-2 layer is built FULLY here, then the
-        // two are HEIGHT-BLENDED (below) -- so the detail never flips at the boundary (the 'hard lines up
-        // close ever since the higher octave' bug = the detail used the dominant layer only).
-        vec4 albA = surfTriTap(uSurfAlb, wt, tw, lA);
-        vec3 cA = vec3(dot(albA.rgb, LUMA)); vec3 nA = surfTriNrm(uSurfNrm, wt, tw, lA, n); float dispA = albA.a;
-        if (detailFade > 0.01) {
-            vec4 dA = surfTriTap(uSurfAlb, wt * 4.0, tw, lA);
-            cA *= mix(1.0, clamp(dot(dA.rgb, LUMA) / max(dot(cA, LUMA), 0.04), 0.35, 2.4), detailFade * 1.3);
-            nA += surfTriNrm(uSurfNrm, wt * 4.0, tw, lA, n) * detailFade * 1.4;
-            dispA = mix(dispA, dA.a, detailFade);   // fine displacement poke near the deck
-        }
+        // SINGLE HIGH-FREQUENCY OCTAVE + MIPS (user 2026-06-14 'instead of swapping out texture octaves,
+        // just use the highest one and let it mip and get rid of the fade-in'): sample the material at the
+        // FINE scale (wt*4, ~0.6m/texel) at EVERY distance and let the GPU mip chain average it down far
+        // off (= the old low-freq look) -- no second octave, no detailFade. Albedo = luma STRUCTURE (macro
+        // color carries chroma); normal strong (x1.4); displacement drives the height-blend (mips soften
+        // the displacement, and thus the blend, at distance automatically).
+        highp vec3 wt4 = wt * 4.0;
+        vec4 albA = surfTriTap(uSurfAlb, wt4, tw, lA);
+        vec3 cA = vec3(dot(albA.rgb, LUMA)); vec3 nA = surfTriNrm(uSurfNrm, wt4, tw, lA, n) * 1.4; float dispA = albA.a;
         vec4 texAlb = vec4(cA, dispA); vec3 texNrm = nA;
+        float splatRock = (abs(lA - 1.0) < 0.5) ? 1.0 : 0.0;   // height-blend rock fraction (layer 1 = rock)
         if (wB > 0.02) {   // second layer only where a real transition exists
-            vec4 albB = surfTriTap(uSurfAlb, wt, tw, lB);
-            vec3 cB = vec3(dot(albB.rgb, LUMA)); vec3 nB = surfTriNrm(uSurfNrm, wt, tw, lB, n); float dispB = albB.a;
-            if (detailFade > 0.01) {
-                vec4 dB = surfTriTap(uSurfAlb, wt * 4.0, tw, lB);
-                cB *= mix(1.0, clamp(dot(dB.rgb, LUMA) / max(dot(cB, LUMA), 0.04), 0.35, 2.4), detailFade * 1.3);
-                nB += surfTriNrm(uSurfNrm, wt * 4.0, tw, lB, n) * detailFade * 1.4;
-                dispB = mix(dispB, dB.a, detailFade);
-            }
-            // HEIGHT-BLEND POKE-THROUGH (user 2026-06-14 'each texture's higher areas should poke through
-            // the other, offset by the ramp'): each layer's height = its DISPLACEMENT + a weight-ramp
-            // offset (so the gate still positions the boundary). The higher height wins, blended over a
-            // soft WIDTH so the loser's high bumps still poke through near the ramp -> interlocking
-            // fingers, never a hard line. This is the ONE blend for ALL pairs (slope-rock, height-snow,
-            // climate/area-biome, beach). bw widens close-up (where the detail is rich) for a softer mesh.
-            float bw = mix(0.12, 0.30, detailFade);
+            vec4 albB = surfTriTap(uSurfAlb, wt4, tw, lB);
+            vec3 cB = vec3(dot(albB.rgb, LUMA)); vec3 nB = surfTriNrm(uSurfNrm, wt4, tw, lB, n) * 1.4; 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
+            // boundary); higher wins over a soft width so the loser's high bumps poke through = fingers,
+            // no hard line. ONE blend for ALL pairs. Mips smooth dispA/dispB at distance -> soft far edge.
+            float bw = 0.25;
             float hA = dispA + (bAB - 0.5) * 1.1;
             float hB = dispB + (0.5 - bAB) * 1.1;
             float mh = max(hA, hB) - bw;
@@ -1916,7 +1906,14 @@ void main() {
             float bSharp = waH / max(waH + wbH, 1e-4);
             texAlb = vec4(mix(cB, cA, bSharp), mix(dispB, dispA, bSharp));
             texNrm = mix(nB, nA, bSharp);
+            splatRock = (abs(lA - 1.0) < 0.5 ? bSharp : 0.0) + (abs(lB - 1.0) < 0.5 ? (1.0 - bSharp) : 0.0);
         }
+        // MATCH COLOR TO NORMAL (user 2026-06-14 'green grassy patches with the rock normals -- should be
+        // rock colored or grass normals'): texNrm follows the displacement height-blend (rock on bumps in
+        // the slope-transition band) but the macro albedo used the slope gate -> grass color under a rock
+        // normal. Push the macro color toward bcRock by the splat's actual rock fraction so the COLOR
+        // follows the same selection the NORMAL does (bounded -- splatRock is 0 where rock isn't in top-2).
+        albedo = mix(albedo, bcRock, splatRock * 0.8);
         float k = uTexMix * texFarFade;
         // macro-tinted detail (user 2026-06-10 'the textured patch must be tinted to the same shade
         // as the spot its replacing'): the texture contributes STRUCTURE + relative chroma only,
@@ -1949,6 +1946,12 @@ void main() {
         // grey). The 4x detail carries the fine structure for every material.
         vec3 texIdent = texC * (albedo / max(texL, 0.02));
         albedo = clamp(mix(albedo, mix(detail, texIdent, photoF), k), 0.0, 1.0);
+        // 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);
+        albedo *= texAO;
         // 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.
@@ -2209,11 +2212,11 @@ void main() {
             // peak at the terminator (N.sun~0), fall off toward both day-center and night-center, and
             // SQUARE it so the warm band is tight at the day/night line instead of a fat ring round the
             // whole limb. Warm amber (not pure red) so it reads as sunset haze, not a bruise.
-            float gz = 1.0 - abs(dot(normalize(vWorld), sunDir));
+            float gz = 1.0 - abs(dot(nWorld, sunDir));
             float graze = smoothstep(0.55, 1.0, gz); graze *= graze;
             // only on the LIT side of the terminator (mu>0) -- past the line the surface is night and
             // additive amber on near-black extinct land reads as a scorched maroon rim. Day-gate kills it.
-            float termDay = smoothstep(-0.02, 0.18, dot(normalize(vWorld), sunDir));
+            float termDay = smoothstep(-0.02, 0.18, dot(nWorld, sunDir));
             hazed += uTerminatorGlow * graze * termDay * vec3(1.0, 0.55, 0.34) * apGate;
             color = mix(lit, hazed, apGate * uHazeMul);   // uHazeMul lever (2026-06-10 'pale hazy': full-strength haze milked the midground)
         }
@@ -2243,7 +2246,7 @@ void main() {
         // SEABED LIGHTING (user 'floor too flat/dim'): the deep floor gets almost no direct sun, so it
         // read dim+flat. Lift the brightness and add an up-facing fill (brighter where the surface faces
         // up, darker on slopes -> 3D relief) + a touch of slope contrast keyed on the lit normal vNrm.
-        float upFill = mix(0.75, 1.35, clamp(dot(vNrm, normalize(vWorld)) * 0.5 + 0.5, 0.0, 1.0));
+        float upFill = mix(0.75, 1.35, clamp(dot(vNrm, nWorld) * 0.5 + 0.5, 0.0, 1.0));
         color *= upFill * 1.5;
         color = mix(color * uwTrans + uwFog * (1.0 - uwTrans), uwFog, smoothstep(100000.0, 500000.0, dKm * 1000.0));
     }
@@ -2311,7 +2314,7 @@ void main() {
     // SPHERE sun angle to EVERY fragment (land + ocean) so the globe reads 3D: bright at the sub-solar
     // point, falling to dark across the day side into the terminator. dayShade = smoothstep over the
     // surface-normal . sun, with a small ambient floor (0.10) so the night/terminator isn't pure black.
-    float macroMu = dot(normalize(vWorld), sunDir);
+    float macroMu = dot(nWorld, sunDir);
     // SOFT FLOORED TERMINATOR (Real-World Look): a wider, smoother twilight band (uTermWidth) with a
     // night floor (uNightFloor) so framed night longitudes keep faint detail instead of crushing to
     // black (defect #4). The old hard 0.10..-0.12,0.55 band was too steep + too dark.
@@ -2320,7 +2323,7 @@ void main() {
     // rounded 3D form instead of a flat disc. viewGraze = surface-normal . view-dir, ->1 facing the
     // camera (disc centre), ->0 at the limb. Only bites near the limb so it does not dim the main face.
     vec3 viewDir = normalize(camWorld - vWorld);
-    float viewGraze = max(dot(normalize(vWorld), viewDir), 0.0);
+    float viewGraze = max(dot(nWorld, viewDir), 0.0);
     float limb = 0.45 + 0.55 * smoothstep(0.0, 0.45, viewGraze);   // 0.45 at the limb -> 1.0 facing camera
     // NIGHT / SHADOW FILL (user 2026-06-09: 'we want night lights in the SHADOW areas, not city lights'):
     // a UNIFORM dim fill that lifts the unlit hemisphere out of pure black -- a cool ambient night light,

package/src/terrain-gen-controls.js

@@ -37,7 +37,7 @@ const DEFAULTS = {
     bcLowland: [0.20,0.34,0.15], bcGrass: [0.26,0.40,0.17], bcRock: [0.52,0.43,0.34],   // bcRock -> a clearly WARMER TAN-GREY (R>G>B) so it reads as ROCK when lit, not olive-green (the [0.46,0.42,0.37] near-grey read green next to the biome). state.biome OVERRIDES gl-render defaults via window.__gen.
     bcSnow: [0.92,0.94,0.97],
     bandEdgesLo: [150.0,1200.0], bandEdgesHi: [3500.0,6500.0], snowEdges: [6000.0,8500.0],   // 8000/10500->6000/8500 (user 2026-06-11 'snowy mountains disappeared' -- see gl-render snowEdges note)   // snowEdges 5200/7000->8000/10500 (user 2026-06-10 'entire terrain white': the rock-by-height fix unmasked snow gates tuned pre-4x; full snow from 5.2km whitened the 11.6km massifs; coldSnow onset = snowEdges.x*0.5 follows)   // bandEdgesHi 1600/3200->3500/6500 (user 2026-06-10 'rockface everywhere'): tuned on the pre-4x terrain; with 11.6km peaks everything above 3200m read rock BY HEIGHT alone -- rescale the treeline to the new elevation range
-    seaDepthM: 3000.0, slopeRock: [0.0,0.22],   // hi 0.3->0.22 (user 2026-06-14 'rock face angle more sensitive, gentler slopes turn to rock'): rock fully engages by ~0.22 slope; lo stays 0.0 so truly-flat (rockSlope~0) keeps grass
+    seaDepthM: 3000.0, slopeRock: [-0.0,0.4],   // [-0.0,0.4] USER-SET 2026-06-14 (wider rock-slope band)
   },
   // REAL-WORLD LOOK overhaul (terraformable lighting/shading levers; applyShaderGlobals sets window
   // globals; gl-render reads them via _g()). Beer-Lambert ocean, biome sat, mottle, sky-fill relief,