mapspinner 0.1.54 → 0.1.56

package/package.json

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

package/src/shaders/terrain.glsl

@@ -143,7 +143,7 @@ float snoise3(highp vec3 P){ highp vec3 i=floor(P),f=fract(P); highp vec3 u=f*f*
 // the same class as the historical snoise3-in-VS-only bug). Pure fn of world dir -> seam-safe +
 // LOD-invariant. Each has an EROSION profile: a wide graded shoulder/valley/bench that blends into
 // terrain plus a deeper core, and returns a wet/depth mask the FS colours.
-const float LAKE_CARVE_DEPTH = 90.0;   // metres of bowl depth at basin centre
+const float LAKE_CARVE_DEPTH = 220.0;   // 90->220 metres of bowl depth (user 2026-06-14 'lakes super shallow+flat'): deeper basins
 float lakeBasinField(vec3 dir){ return 0.5 + 0.5 * snoise3(dir * 55.0 + vec3(4.0, 9.0, 1.0)); }
 float lakeCarveM(vec3 dir, out float wet){
     float basin = lakeBasinField(dir);
@@ -186,7 +186,7 @@ float inciseRidgeField(vec3 d, float baseFreq, float freqMul){
     }
     return sum / norm;                                         // ->1 on the channel network
 }
-const float RIVER_INCISE_DEPTH = 120.0;   // metres at the channel thalweg
+const float RIVER_INCISE_DEPTH = 280.0;   // 120->280 metres at the channel thalweg (user 2026-06-14 'rivers/channels super shallow+flat'): deeper incision
 float riverRidgeField(vec3 dir){ return inciseRidgeField(normalize(dir), 40.0, 2.03); }
 float riverCarveM(vec3 dir, out float wet){
     float ridge = riverRidgeField(dir);
@@ -631,14 +631,16 @@ highp float composeHeight(vec3 dir0, highp vec2 faceLocal, float tileM){   // W7
       // whole ocean into 'almost-land everywhere', user 2026-06-14) with the flat-at-waterline curve so
       // both sides meet the waterline at slope 0 (no crease); beyond SEABED_EASE the true bathymetry
       // resumes so the ocean goes DEEP.
-      const highp float SEABED_EASE = 120.0;   // metres of depth flattened at the shore (decoupled from the land beach)
+      const highp float SEABED_EASE = 25.0;   // metres of depth flattened at the shore (decoupled from the land beach)
       highp float d0 = -h;
       highp float d = (d0 < SEABED_EASE) ? (d0 * d0 / SEABED_EASE) * (2.0 - d0 / SEABED_EASE) : d0;
-      // STEEPER DROP-OFF (user 2026-06-14 'seabed flat/close to waterline; steeper + more relief'):
-      // narrow shelf 500->150m raw, steeper shelf 0.24->0.6, steeper continental slope 1.19->1.5 so the
+      // NO 'SECOND BEACH' (user 2026-06-14 'shallow ring of water around land / making a second beach'):
+      // the wide flat shelf read as a shallow underwater beach ring. Shelf cut to a tiny 25m-raw lip then
+      // a STEEP 1.9 plunge so the water drops to real depth immediately off the actual beach -- no shelf.
+      // (former: narrow shelf 500->150m raw, steeper shelf 0.24->0.6, steeper continental slope 1.19->1.5 so the
       // seabed plunges to deep water just offshore (less flat shallow shelf) and the deep bathymetry
       // carries 1.5x the bShape relief = more dramatic underwater terrain to explore.
-      h = -(min(d, 150.0) * 0.6 + max(d - 150.0, 0.0) * 1.5);
+      h = -(min(d, 25.0) * 0.4 + max(d - 25.0, 0.0) * 1.9);
       h = max(h, -11000.0);   // cap depth at Mariana Trench (~11km)
   } else {
       // LAND COASTAL SHELF (user 2026-06-14: 'beaches not wide enough'): the underwater shelf above
@@ -869,10 +871,10 @@ void main() {
     // shelf/slope bathymetry remap + underwater displacement -- MUST mirror composeHeight exactly
     // (this is the FS-material running value; composeHeight is the geometry/probe height).
     if (vH < 0.0) {
-        const highp float SEABED_EASE = 120.0;   // mirror composeHeight: narrow waterline ease, deep ocean beyond
+        const highp float SEABED_EASE = 25.0;   // mirror composeHeight: tiny waterline lip, steep plunge (no 'second beach')
         highp float dSea0 = -vH;
         highp float dSea = (dSea0 < SEABED_EASE) ? (dSea0 * dSea0 / SEABED_EASE) * (2.0 - dSea0 / SEABED_EASE) : dSea0;
-        vH = -(min(dSea, 150.0) * 0.6 + max(dSea - 150.0, 0.0) * 1.5);   // steeper drop-off (mirror composeHeight)
+        vH = -(min(dSea, 25.0) * 0.4 + max(dSea - 25.0, 0.0) * 1.9);   // steep drop-off (mirror composeHeight)
         vH = max(vH, -11000.0);   // cap depth at Mariana Trench (~11km)
     } else {
         highp float bShelf = uBeachShelfM > 1.0 ? uBeachShelfM : 600.0;   // LAND COASTAL SHELF -- mirror composeHeight exactly (wide beach, user 2026-06-14); guard stale/unset uniform
@@ -1879,6 +1881,23 @@ void main() {
             texAlb = mix(albB, albA, bSharp);
             texNrm = mix(nrmB, nrmA, bSharp);
         }
+        // FINE DETAIL OCTAVE (user 2026-06-14 'add one octave at 4x smaller -> world better scaled at
+        // 2m'): the base photo tiles at uTexTileM (~2.4km = ~2.3m/texel, smeared at the deck). Sample the
+        // SAME dominant material at 4x frequency (~0.6m/texel) and overlay its luminance + normal so
+        // close-up the ground gains sub-metre structure. Faded out by ~12m px so it never moires far off.
+        float detailFade = (1.0 - smoothstep(1.0, 12.0, pxWorld));
+        if (detailFade > 0.01) {
+            vec4 dA = surfTriTap(uSurfAlb, wt * 4.0, tw, lA);
+            float dl = dot(dA.rgb, vec3(0.299, 0.587, 0.114));
+            float bl = dot(texAlb.rgb, vec3(0.299, 0.587, 0.114));
+            texAlb.rgb *= mix(1.0, clamp(dl / max(bl, 0.04), 0.55, 1.7), detailFade * 0.6);
+            // detail NORMAL: surfTriNrm returns a PERTURBATION vector (texNrm feeds texDn = texNrm*uTexNrmK*k
+            // at the apply site, NOT a unit normal), so the detail is simply ADDED in the same space -- no
+            // normalize (normalizing the perturbation scrambled its magnitude = the 'weird highest-octave
+            // normals'). Half-weight so the fine octave textures relief without overpowering the base.
+            vec3 dN = surfTriNrm(uSurfNrm, wt * 4.0, tw, lA, n);
+            texNrm = texNrm + dN * detailFade * 0.5;
+        }
         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,
@@ -2220,8 +2239,10 @@ void main() {
     // bypasses it via vH<0). Gating on vWaterDepth (NOT the whole carve mask) makes the water LINE UP
     // with the flat carved surface -- the graded erosion banks above the waterline stay dry land.
     if (vH >= 0.0 && vWaterDepth > 0.0) {
-        // submergence 0..1 over ~0..40m -> shoreline (thin water, terrain shows through) to deep.
-        float sub = clamp(vWaterDepth / 40.0, 0.0, 1.0);
+        // submergence 0..1 over ~0..160m (40->160, user 2026-06-14 'water super shallow+flat'): the color
+        // saturated at 40m so every deeper lake/river read one flat tone; stretch it so depth shows as a
+        // shallow-edge -> deep-center gradient (thin transparent rim, deep dark center).
+        float sub = clamp(vWaterDepth / 160.0, 0.0, 1.0);
         // wave-perturbed water normal (small inland ripple), same tangent frame as the ground.
         highp vec3 wOriginL = floor(camWorld / 1024.0) * 1024.0;   // W7: ~6.4e6 m snapped anchor -> highp
         highp vec2 wpL = vec2(dot(vWorld - wOriginL, ux), dot(vWorld - wOriginL, uy));   // W7: highp camera-relative wave coord

package/src/terrain-gen-controls.js

@@ -46,7 +46,7 @@ const DEFAULTS = {
     exposure: 1.0, skyFill: 0.45, biomeSat: 0.72, variationAmt: 0.04, colorVar: 0.5, vertexAO: 1.0,     reliefShade: 2.5,   // variationAmt 0.08->0.04 (user 2026-06-10 'blotchy': the ~50km value mottle painted light/dark patches across the massifs)
     nightFloor: 0.16, termWidth: 0.25, terminatorGlow: 0.30, lookSat: 1.15, lookContrast: 1.08,   // nightFloor 0.05->0.16: no black night terrain (2026-06-09)
     detailOverlay: 6.0, hazeMul: 0.65,   // 2026-06-10 'pale hazy + featureless': perlin-everywhere albedo+elevation fbm (user-tuned 6) + aerial-perspective strength cut
-    ocean: { deep: [0.008,0.025,0.06], shallow: [0.07,0.22,0.26], k: [0.016,0.007,0.0028] },   // k halved (user 2026-06-14 'see the land under the water'): clearer water, bed visible through shallow/medium depth. OVERRIDES the gl-render uOceanK default via window.__uOceanK.
+    ocean: { deep: [0.008,0.025,0.06], shallow: [0.07,0.22,0.26], k: [0.009,0.004,0.0018] },   // k lowered again (user 2026-06-14 'water properly transparent so we see the surface under it'): clearer, the seabed shows through shallow/medium water; deep basins still opaque. OVERRIDES gl-render via window.__uOceanK.
   },
   // HPF band scales (multipliers on the anchor-field band base values; anchor-field.setBandScales).
   hpf: {