mapspinner 0.1.43 → 0.1.45

package/package.json

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

package/src/gl-render.js

@@ -421,7 +421,7 @@ 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', 2400.0));   // land coastal shelf (geometry); probe MUST match render
+    gl.uniform1f(loc('uBeachShelfM'),   g('beachShelf', 12000.0));   // land coastal shelf (geometry); probe MUST match render
     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 +960,7 @@ 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', 2400.0));   // land coastal shelf (geometry): h<S eased h*h/S = wide beach
+    gl.uniform1f(U('uBeachShelfM'),   _g('beachShelf', 12000.0));   // land coastal shelf (geometry): h<S eased h*h/S = wide beach
     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));
@@ -1039,7 +1039,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', 140.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', 420.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]
@@ -1109,7 +1109,12 @@ export async function initMapspinnerRender(gl, opts = {}) {
         // seabed, so the depth test culled the water across entire shorelines. Level-9 cells
         // (~1.6km) sag ~5cm, far under any visible bathymetry, still ~16-64x fewer water verts
         // than the deep terrain leaves.
-        const WCAP = 9;
+        // WCAP 9 -> 11 (user 2026-06-14 'water lines still jagged and square, doesnt meet land properly'):
+        // the water-pass `if(vH>1.0) discard` keys off the water mesh's COARSE interpolated seabed height,
+        // so the discarded waterline stepped at ~1.6km (level-9) cells = square/jagged edges that didn't
+        // follow the fine seabed coastline. Level-11 cells (~400m) -> ~4x finer waterline. Water-vertex
+        // cost rises (watch FPS); still far fewer verts than the full-LOD terrain leaves.
+        const WCAP = 11;
         // OWN persistent buffer (instBufWater) + static-frame skip: on an unchanged quad set, reuse the
         // cached water instances (skip the dedup Set-loop + Float32Array + bufferData). Separate buffer
         // means the terrain pass never clobbers it (the prior water-as-terrain regression root).

package/src/shaders/terrain.glsl

@@ -623,7 +623,14 @@ highp float composeHeight(vec3 dir0, highp vec2 faceLocal, float tileM){   // W7
   // SLOPE down to the abyssal plain (which keeps its raw depth). Monotone remap of h, pure fn of
   // the field -> seam-safe, LOD-invariant, and the collision probe shares it by construction.
   if (h < 0.0) {
-      highp float d = -h;
+      // 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;
+      highp float d0 = -h;
+      highp float d = (d0 < bShelfS) ? (d0 * d0 / bShelfS) * (2.0 - d0 / bShelfS) : 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 {
@@ -852,7 +859,9 @@ 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) {
-        highp float dSea = -vH;
+        highp float bShelfS = uBeachShelfM > 1.0 ? uBeachShelfM : 600.0;   // C1 waterline -- mirror composeHeight exactly
+        highp float dSea0 = -vH;
+        highp float dSea = (dSea0 < bShelfS) ? (dSea0 * dSea0 / bShelfS) * (2.0 - dSea0 / bShelfS) : 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 {
@@ -1579,8 +1588,13 @@ void main() {
         mappedW = clamp((mappedW - 0.5) * uLookContrast + 0.5, 0.0, 1.0);
         // coverage: optically thick water -> opaque; first metres see-through; grazing fresnel and
         // foam are opaque regardless of depth; feather the exact waterline contact.
+        // THIN WATER STAYS CLEAR (user 2026-06-14 'water isnt transparent where its thin'): the grazing
+        // fresnel forced shallow water OPAQUE even looking across a shoreline. Gate fresnel opacity by a
+        // depth ramp so thin water shows the bed regardless of view angle; foam + Beer-Lambert depth
+        // opacity stay so deep/foamy water still reads solid.
+        float shallowClear = smoothstep(0.0, 6.0, depthM);   // 0 in thin water -> clear; 1 by ~6m -> full fresnel
         float alphaW = clamp(1.0 - Tavg, 0.0, 1.0);
-        alphaW = max(alphaW, fres * 0.9);
+        alphaW = max(alphaW, fres * 0.9 * shallowClear);
         alphaW = max(alphaW, foamAmt * 0.8);
         // SHALLOW-SURFACE FLOOR (2026-06-11, found by the coast witness after the shelf landed):
         // the continental shelf keeps water metres-deep for kilometres, where Beer-Lambert alpha