mapspinner 0.1.67 → 0.1.69

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mapspinner",
-  "version": "0.1.67",
+  "version": "0.1.69",
   "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', 80.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', 640.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

@@ -1812,7 +1812,7 @@ void main() {
         // displacement height-blend (small bw below) so sand vs grass is a sharp choice distributed by
         // texture relief = interlocking fingers that thin out with height, never a blendy fade.
         float beachW = warpN * uBeachTopM * 0.30;   // warp amplitude scales with the beach band height
-        float beach = (1.0 - smoothstep(beachW, uBeachTopM * 2.5 + beachW, vH))
+        float beach = (1.0 - smoothstep(beachW, uBeachTopM * 0.5 + beachW, vH))   // 2.0->0.5x: 4x narrower grass<->sand crossover band (user 2026-06-14)
                     * (1.0 - smoothstep(0.18, 0.55, slope));
         // SAND BLEED (2026-06-13): patchy sand spills above the main beach line, modulated by VS
         // warp noise so the edge reads as wind-blown pockets, not a strict elevation cut. At peak it
@@ -1905,6 +1905,11 @@ void main() {
         vec3 cA = vec3(dot(albA.rgb, LUMA));
         vec3 nA = surfTriNrm(uSurfNrm, wt4, tw, lA, n) * 1.4 + surfTriNrm(uSurfNrm, wt, tw, lA, n) * 0.8;   // high + low-octave normal
         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
+        // color (grass/rock/sand/snow), NOT the macro biome color. mcA = layer A's base color.
+        vec3 mcA = lA < 0.5 ? bcGrass : (lA < 1.5 ? bcRock : (lA < 2.5 ? bcShore : bcSnow));
+        vec3 texMatColor = mcA;
         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
@@ -1921,21 +1926,32 @@ void main() {
             // crossovers'): a weaker weight ramp lets the DISPLACEMENT decide the winner over a WIDER
             // weight range, so the near-hard displacement-driven distribution spans a broad margin for
             // EVERY pair (rock-slope, snow, biome...), not just the explicitly-widened beach gate.
-            float hA = dispA + (bAB - 0.5) * 0.5;
-            float hB = dispB + (0.5 - bAB) * 0.5;
+            // AMPLIFY the displacement's influence (user 2026-06-14 'the high-freq textures arent
+            // affecting the crossover point yet'): the raw displacement sits near its 0.5 mean so the
+            // per-layer DIFFERENCE was tiny -> the crossover was weight-driven, not texture-driven. Center
+            // + scale it (x3) so the high-freq relief clearly decides the boundary; the weight just
+            // positions it. (Mips average the displacement to ~0.5 at distance -> auto-smooth far edge.)
+            // NON-LINEAR weight ramp (user 2026-06-14 'the ramp isnt complete enough between sections ->
+            // cutoff lines at the end'): a CONSTANT weight bias let displacement fingers survive right up
+            // to where the gate drops the layer = a hard cutoff line. Make the bias WEAK mid-ramp (wide
+            // displacement crossover) and STRONG at the ends so the fingers taper to nothing before the
+            // gate cuts off -> the ramp completes smoothly, no end line.
+            float wRamp = (bAB - 0.5) * mix(1.4, 4.0, clamp(abs(bAB - 0.5) * 2.0, 0.0, 1.0));   // mid 0.6->1.4 (user 2026-06-14 'all crossover bands a bit wide, rock too'): stronger weight bias = NARROWER displacement crossover on every pair
+            float hA = (dispA - 0.5) * 3.0 + wRamp;
+            float hB = (dispB - 0.5) * 3.0 - wRamp;
             float mh = max(hA, hB) - bw;
             float waH = max(hA - mh, 0.0), wbH = max(hB - mh, 0.0);
             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);
+            vec3 mcB = lB < 0.5 ? bcGrass : (lB < 1.5 ? bcRock : (lB < 2.5 ? bcShore : bcSnow));
+            texMatColor = mix(mcB, mcA, bSharp);   // height-blended MATERIAL color (no biome)
         }
         // 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,7 +1965,7 @@ void main() {
         // deviation visible while the patch average lands exactly on the macro shade.
         float mA = uSurfMeanL[int(lA + 0.5)];
         float texL = wB > 0.02 ? mix(uSurfMeanL[int(lB + 0.5)], mA, bAB) : mA;
-        vec3 detail = texC * (albedo / max(texL, 0.02));
+        vec3 detail = texC * (texMatColor / max(texL, 0.02));   // MATERIAL color * structure (no biome inheritance)
         // ROCK SHOWS THE TRUE PHOTO (user 2026-06-10 'we still see the original rock texture --
         // replace completely'): tinting rock to the macro shade just reproduced the old grey/tan,
         // so the rock layer takes the raw photo color; grass/sand/snow stay shade-matched.
@@ -1966,8 +1982,9 @@ void main() {
         // low-freq albedo is now NORMALS-ONLY (texC is luma structure), so the old raw-photo 'identity'
         // hue is gone; texIdent == detail = MACRO color * structure (keeps rock its macro tan-grey, not
         // 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);
+        // 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);
         // 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.