mapspinner 0.1.42 → 0.1.44

package/package.json

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

package/src/gl-render.js

@@ -780,7 +780,14 @@ export async function initMapspinnerRender(gl, opts = {}) {
     const camDist = Math.hypot(cam.eye[0], cam.eye[1], cam.eye[2]);
     const alt = Math.max(0.0, camDist - R);
     const altAboveTerrain = Math.max(0.001, alt - R * (cam.surfElev || 0));
-    const horizon = Math.sqrt(Math.max(0.0, camDist*camDist - R*R));
+    // FAR-PLANE HORIZON RADIUS = R - 500m (user 2026-06-14: 'nearby mountains disappear at water level;
+    // adjust that level to 500m under water'). The far plane tracks the sea-level horizon = sqrt(camDist^2
+    // - R^2), which at the deck (camDist~=R) collapses to a few hundred metres -> coastal mountains a km
+    // out fall beyond the far plane and vanish. Dropping the horizon reference radius 500m below sea level
+    // extends the horizon to tens of km at low altitude so near-shore relief stays in view (negligible
+    // depth-precision cost: 500m vs R~6.37e6). Both the cull and the draw use this (single source).
+    const RHORIZON = R - 500.0;
+    const horizon = Math.sqrt(Math.max(0.0, camDist*camDist - RHORIZON*RHORIZON));
     // MATCH render()'s near exactly (2026-06-14 jank fix): the cull frustum must use the SAME near
     // as the draw frustum, else behind-limb/screen-AABB culling diverges from what is actually drawn
     // at the deck (cull near was max(*0.1,0.1) while render used the <2m 0.05 branch).
@@ -816,7 +823,14 @@ export async function initMapspinnerRender(gl, opts = {}) {
     const camDist = Math.hypot(cam.eye[0], cam.eye[1], cam.eye[2]);
     const alt = Math.max(0.0, camDist - R);
     const altAboveTerrain = Math.max(0.001, alt - R * (cam.surfElev || 0));
-    const horizon = Math.sqrt(Math.max(0.0, camDist*camDist - R*R));
+    // FAR-PLANE HORIZON RADIUS = R - 500m (user 2026-06-14: 'nearby mountains disappear at water level;
+    // adjust that level to 500m under water'). The far plane tracks the sea-level horizon = sqrt(camDist^2
+    // - R^2), which at the deck (camDist~=R) collapses to a few hundred metres -> coastal mountains a km
+    // out fall beyond the far plane and vanish. Dropping the horizon reference radius 500m below sea level
+    // extends the horizon to tens of km at low altitude so near-shore relief stays in view (negligible
+    // depth-precision cost: 500m vs R~6.37e6). Both the cull and the draw use this (single source).
+    const RHORIZON = R - 500.0;
+    const horizon = Math.sqrt(Math.max(0.0, camDist*camDist - RHORIZON*RHORIZON));
     const near = altAboveTerrain < 2.0 ? 0.05 : Math.max(altAboveTerrain * 0.1, 0.05);
     const _fBlend = Math.min(1.0, Math.max(0.0, (alt - 500000.0) / 4500000.0));
     const farGround = Math.max(horizon, alt * 8.0);
@@ -1095,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

@@ -634,7 +634,11 @@ highp float composeHeight(vec3 dir0, highp vec2 faceLocal, float tileM){   // W7
       // the field -> seam-safe + the collision probe shares it. GUARD: a stale/unset uniform (0) would
       // disable the shelf -> default 600 so it always applies. window.__beachShelf dials S live.
       highp float bShelf = uBeachShelfM > 1.0 ? uBeachShelfM : 600.0;
-      if (h < bShelf) h = h * h / bShelf;
+      // C1-CONTINUOUS shelf (user 2026-06-14 'hard shading line where landscape meets beach'): the old
+      // h*h/S met the identity at h=S with SLOPE 2 (vs 1) -> a derivative kink -> the slope-keyed shading
+      // (rock/AO/material) SNAPPED into a hard line at the shelf top. f = (h*h/S)*(2 - h/S) keeps f(0)=0,
+      // f'(0)=0 (flat at the waterline = wide beach) AND f(S)=S, f'(S)=1 (smooth join to natural land).
+      if (h < bShelf) h = (h * h / bShelf) * (2.0 - h / bShelf);
   }
   // displacement now continues UNDERWATER (the old land-only gate served the flat-clamped ocean,
   // gone since 026d530): the seabed carries the same micro-relief as land = realistic continuation.
@@ -853,7 +857,8 @@ void main() {
         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
-        if (vH < bShelf) vH = vH * vH / bShelf;
+        if (vH < bShelf) vH = (vH * vH / bShelf) * (2.0 - vH / bShelf);   // C1-continuous (mirror composeHeight) -- removes the beach-top slope kink / hard shading line
+
     }
     vH += vDisp;
     vH += detailFbm(dir0) * uDetailOverlay * 30.0 * step(0.0, vH);
@@ -1574,8 +1579,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