mapspinner 0.1.60 → 0.1.62

package/package.json

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

package/src/shaders/terrain.glsl

@@ -1237,7 +1237,11 @@ uniform vec4 uSurfMeanL;     // per-layer mean linear luminance of the photo col
 // binary boundary snaps material across wide areas instead of softly interfingering, and the high-freq
 // octave aliased on bright materials. Reverted to the clean smoothstep boundaries; a non-aliasing
 // 'interesting boundary' technique (e.g. a wide soft transition material band) is a separate future task.
-vec3 terrainAlbedo(float h, float slope, float rockSlope, highp vec3 worldPos) {   // highp: worldPos feeds normalize(worldPos)*freq noise UVs -- mediump would scramble the lattice at close range
+vec3 terrainAlbedo(float h, float slope, float rockSlope, highp vec3 worldPos, float pxW) {   // highp: worldPos feeds normalize(worldPos)*freq noise UVs -- mediump would scramble the lattice at close range
+    // DISTANCE-WIDENED rock-slope band (user 2026-06-14 'hard edge to rock slopes at a distance'): the
+    // close-up height-blend doesn't run far off, so the macro slope gate showed a hard edge. Widen its
+    // upper threshold with distance so the rock->grass slope boundary fades softly when it's far.
+    float rockWiden = smoothstep(20.0, 500.0, pxW) * 0.20;
     vec3 c;
     if (h < 0.0) {
         // SEABED CONTINUES AS LAND MATERIAL (user 2026-06-11 'instead of turning terrain into water,
@@ -1258,7 +1262,7 @@ vec3 terrainAlbedo(float h, float slope, float rockSlope, highp vec3 worldPos) {
         float bandWarp = (snoise3(bww * 210.0) * 1.0 + snoise3(bww * 560.0) * 0.5 + snoise3(bww * 1450.0) * 0.25) * 720.0;
         c = mix(c, bcRock, smoothstep(bandEdgesHi.x + bandWarp, bandEdgesHi.y + bandWarp, h));
         c = mix(c, bcSnow, smoothstep(snowEdges.x + bandWarp, snowEdges.y + bandWarp, h));
-        c = mix(c, bcRock, smoothstep(slopeRock.x, slopeRock.y, rockSlope) * step(0.0, h));
+        c = mix(c, bcRock, smoothstep(slopeRock.x, slopeRock.y + rockWiden, rockSlope) * step(0.0, h));
         // OLD PROCEDURAL GREY ROCKFACE DELETED (max-speed sweep 2026-06-10, user 'replace the original
         // rock completely'): the photo-rock splat owns steep faces; the 3-tap grey fBm fallback is gone.
     }
@@ -1300,7 +1304,7 @@ vec3 biomeColor(float temp, float humid) {
     // FOREST vs MEADOW split (user: they must look distinct, not one green). A CRISPER humidity
     // boundary (0.48->0.56, was 0.46->0.66) so meadow (drier-temperate) and forest (wetter) read
     // as DISTINCT adjacent regions instead of a long ambiguous blend; very-wet deepens to canopy.
-    float wet  = smoothstep(0.48, 0.56, humid);
+    float wet  = smoothstep(0.40, 0.66, humid);   // WIDENED 0.48-0.56 -> 0.40-0.66 (user 2026-06-14 'hard lines between light and dark grass'): soft meadow<->forest blend, not a crisp line
     float veryWet = smoothstep(0.62, 0.80, humid);
     vec3 c = MEADOW;                                          // temperate mid-humidity default
     c = mix(c, FOREST,  wet);                                 // wet -> forest (crisp boundary)
@@ -1391,7 +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
-    vec3 c = terrainAlbedo(h, slope, rockSlope, worldPos);
+    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
         // anchor temp -> seam-safe; the soft threshold gives an irregular (not hard-zonal) margin.
@@ -1873,38 +1877,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;
@@ -1912,7 +1904,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,

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,