mapspinner 0.1.46 → 0.1.48

package/package.json

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

package/src/gl-render.js

@@ -421,7 +421,8 @@ export async function initMapspinnerRender(gl, opts = {}) {
     gl.uniform1f(loc('vtxDetail'),      g('vtxDetail', 1.0));    // DECISIVE: vtxDisplace strength (early-return on 0)
     gl.uniform1f(loc('canyonDepthMul'), g('canyonDepth', 1.0));
     gl.uniform1f(loc('uVsCheap'),       (typeof window!=='undefined' && window.__vsCheap) ? 1.0 : 0.0);   // VS carve-cost profiling A/B
-    gl.uniform1f(loc('uBeachShelfM'),   g('beachShelf', 28000.0));   // land coastal shelf (geometry); probe MUST match render
+    gl.uniform1f(loc('uBeachShelfM'),   g('beachShelf', 0.0));   // land coastal shelf (geometry); probe MUST match render
+    gl.uniform1f(loc('uLandBias'),      g('landBias', 0.0));       // +650m hypsometry bias = ~+30% land:sea (measured: landFrac 0.041 -> 0.054 over a 700-dir sphere grid, user 2026-06-14). window.__landBias dials it live.
     gl.uniform1f(loc('cliffAmt'),       g('cliffAmt', 1.0));
     gl.uniform1i(loc('uFloatLinearOK'), _halfFloatLinearOK ? 1 : 0);
     // FXC unroll-defeat (2026-06-12 AMD d3d11 fix): runtime octave bound for broadShapeM; the shader
@@ -960,7 +961,8 @@ export async function initMapspinnerRender(gl, opts = {}) {
     const _g = (n,d)=> (typeof window!=='undefined' && window['__'+n]!=null) ? +window['__'+n] : d;
     gl.uniform1f(U('canyonDepthMul'), _g('canyonDepth', 1.0));
     gl.uniform1f(U('uVsCheap'),       (typeof window!=='undefined' && window.__vsCheap) ? 1.0 : 0.0);   // VS carve-cost profiling A/B
-    gl.uniform1f(U('uBeachShelfM'),   _g('beachShelf', 28000.0));   // land coastal shelf (geometry): h<S eased h*h/S = wide beach
+    gl.uniform1f(U('uBeachShelfM'),   _g('beachShelf', 0.0));   // land coastal shelf (geometry): h<S eased h*h/S = wide beach
+    gl.uniform1f(U('uLandBias'),      _g('landBias', 0.0));        // +650m hypsometry bias = ~+30% land:sea (window.__landBias); MUST match the probe (setComposeHeightUniforms) for collision parity
     gl.uniform1f(U('uHiFreqCut'),     _g('hiFreqCut', 0.25));   // 0.5->0.25 (2026-06-10 'blotchy' -- see setComposeHeightUniforms)
     gl.uniform1f(U('uVertexAO'),      _g('vertexAO', 1.0));    // per-vertex shading/AO strength (DEFECT 2, 2026-06-06)
     gl.uniform1f(U('cliffAmt'),       _g('cliffAmt', 1.0));

package/src/shaders/terrain.glsl

@@ -210,6 +210,7 @@ uniform float uIsWater;                    // 0 = terrain pass, 1 = water-surfac
 uniform float uUnderwater;                 // 0 = camera above water, 1 = camera below sea level
 uniform float uBeachTopM;                  // beach ceiling (m): below this, grass/snow yield to sand (window.__beachTop; 30 default)
 uniform float uBeachShelfM;                // land coastal-shelf top (m): h<this is eased (h*h/S) so the coast rises gently from the waterline = wide beach (window.__beachShelf; 300 default). GEOMETRY (composeHeight+vH).
+uniform float uLandBias;                    // metres added to h (cbias+bShape) BEFORE the sea/land split -> raises the hypsometry = MORE LAND vs sea (window.__landBias). composeHeight + VS mirror + probe all add it (parity).
 uniform float uHiFreqCut;                  // hi-freq elevation-noise attenuation, applied to ALL hi-freq sources:
                                            // broadShapeM/MD fine octaves (o>=6) + vtxDisplace micro-relief
                                            // (window.__hiFreqCut; default 0.25 = the user's 4x reduction, 2026-06-06)
@@ -615,7 +616,7 @@ highp float composeHeight(vec3 dir0, highp vec2 faceLocal, float tileM){   // W7
     ridgeMul  = mix(ridgeMul, max(ridgeMul, 0.9 * volcanic), isleZone);
   }
   highp float bShape = broadShapeM(dir0, reliefMul, ridgeMul);  // W7: metres
-  highp float h = cbias + bShape;                                // W7: composite elevation metres (~13000)
+  highp float h = cbias + bShape + uLandBias;                    // W7: composite elevation metres (~13000); +uLandBias raises hypsometry = more land
   // REALISTIC BATHYMETRY (user 2026-06-11 'the depth under the water doesnt seem right -- the
   // landscape should continue underwater realistically'): raw cbias+bShape plunges at land-relief
   // gradients, so the seabed hit kilometre depths within sight of the beach. Real margins have a
@@ -626,11 +627,13 @@ highp float composeHeight(vec3 dir0, highp vec2 faceLocal, float tileM){   // W7
       // C1 WATERLINE (user 2026-06-14 'geometry crease + shading/rock hard line where land meets beach'):
       // the land shelf is FLAT at the waterline (slope 0) but the seabed used slope 0.24 from h=0 -> a
       // slope discontinuity = a crease (+ the shading brightness line + rock where steep) right at the
-      // shore. Ease the shallow seabed with the SAME flat-at-waterline shelf curve (mirror of the land
-      // side) before the 0.24/1.19 bathymetry, so BOTH sides meet the waterline with slope 0 = no crease.
-      highp float bShelfS = uBeachShelfM > 1.0 ? uBeachShelfM : 600.0;
+      // shore. Ease ONLY a NARROW band of depth (NOT the 28km land beach width -- that shallowed the
+      // 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 = 300.0;   // metres of depth flattened at the shore (decoupled from the land beach)
       highp float d0 = -h;
-      highp float d = (d0 < bShelfS) ? (d0 * d0 / bShelfS) * (2.0 - d0 / bShelfS) : d0;
+      highp float d = (d0 < SEABED_EASE) ? (d0 * d0 / SEABED_EASE) * (2.0 - d0 / SEABED_EASE) : d0;
       h = -(min(d, 500.0) * 0.24 + max(d - 500.0, 0.0) * 1.19);
       h = max(h, -11000.0);   // cap depth at Mariana Trench (~11km)
   } else {
@@ -855,13 +858,13 @@ void main() {
     // entire silhouette+hypsometry. The old wasm upsample-and-add cascade (zfc.x) was REMOVED -- it
     // was a SECOND shape source that diverged per-LOD (the detail-inversion root). bShape amplitude
     // was retuned (A0 6500, off -900) so this single field hits Earth hypso without the cascade.
-    vH = cbias + bShape;
+    vH = cbias + bShape + uLandBias;   // +uLandBias (mirror composeHeight) -> more land vs sea
     // 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) {
-        highp float bShelfS = uBeachShelfM > 1.0 ? uBeachShelfM : 600.0;   // C1 waterline -- mirror composeHeight exactly
+        const highp float SEABED_EASE = 300.0;   // mirror composeHeight: narrow waterline ease, deep ocean beyond
         highp float dSea0 = -vH;
-        highp float dSea = (dSea0 < bShelfS) ? (dSea0 * dSea0 / bShelfS) * (2.0 - dSea0 / bShelfS) : dSea0;
+        highp float dSea = (dSea0 < SEABED_EASE) ? (dSea0 * dSea0 / SEABED_EASE) * (2.0 - dSea0 / SEABED_EASE) : dSea0;
         vH = -(min(dSea, 500.0) * 0.24 + max(dSea - 500.0, 0.0) * 1.19);
         vH = max(vH, -11000.0);   // cap depth at Mariana Trench (~11km)
     } else {
@@ -2155,11 +2158,14 @@ void main() {
         highp vec3 segKm = pAtm - camA;
         highp float dKm  = length(segKm);
         float depth = max(0.0, terrainR - length(camWorld));
-        // Water absorption coefficients (per km): red attenuates fastest, blue slowest.
-        vec3 absorb = vec3(4.0, 0.8, 0.3) * (1.0 + depth * 0.0003);
+        // CLEARER WATER + LONG VISIBILITY (user 2026-06-14 'fix underwater visibility so we can explore
+        // under the ocean'): the old absorb (4,0.8,0.3)/km + a 50->500m hard fog fade closed the view to
+        // opaque blue within ~500m. Lower the coefficients (still red-first absorption) and push the hard
+        // fade to ~3-15km so the seabed landscape is explorable; red still fades fast (realistic blue cast).
+        vec3 absorb = vec3(1.0, 0.30, 0.15) * (1.0 + depth * 0.0002);
         vec3 uwTrans = exp(-absorb * dKm);
-        vec3 uwFog = vec3(0.002, 0.06, 0.16) + vec3(0.0, 0.02, 0.04) * depth / 1000.0;
-        color = mix(color * uwTrans + uwFog * (1.0 - uwTrans), uwFog, smoothstep(50.0, 500.0, dKm * 1000.0));
+        vec3 uwFog = vec3(0.004, 0.10, 0.22) + vec3(0.0, 0.02, 0.04) * depth / 1000.0;
+        color = mix(color * uwTrans + uwFog * (1.0 - uwTrans), uwFog, smoothstep(3000.0, 15000.0, dKm * 1000.0));
     }
     // RIVERS post-lighting (witnessed browser-2115/2118: the river-blue in ALBEDO is multiplied
     // by the warm sun irradiance (sunIrr.b is low) so land rivers lose their blue in the lit