mapspinner 0.1.48 → 0.1.50

package/package.json

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

package/planet.html

@@ -531,16 +531,24 @@ function frameLoop(){
   // the eye lands exactly eyeHeight (2.0m) above it. (The old +130m, then +3m, margin made __altM read
   // a height above an inflated reference -> the eye was really ground+margin+2m, not 2m.) The mirror
   // fallback keeps a small +3m only because the CPU jsBroadShape can under-predict vs the GPU.
+  let doClamp = true;
   if (gpuM != null && isFinite(gpuM)) {
     renderedM = gpuM + 1.0;   // +1m margin for sub-vertex micro-relief (vtxDisplace peaks exceed 2m in rugged terrain)
+  } else if (r >= RADIUS) {
+    renderedM = jsBroadShape(cam.pos[0], cam.pos[1], cam.pos[2]) + 3.0;  // above sea level: mirror is fine for land
   } else {
-    renderedM = jsBroadShape(cam.pos[0], cam.pos[1], cam.pos[2]) + 3.0;  // mirror fallback (CPU under-predicts)
+    // UNDERWATER DIVE FIX (user 2026-06-14 'camera stops at sea level'): below sea level with NO GPU
+    // probe this frame, the CPU mirror (jsBroadShape) OMITS the seaBias/bathymetry remap, so it reports
+    // ~sea-level over ocean and the clamp would shove the camera back up to the surface = 'stuck at sea
+    // level'. Skip the clamp this frame; the GPU probe (the only thing that knows the seabed) resumes
+    // collision next frame, so you can descend through the surface and explore the seabed.
+    doClamp = false; renderedM = -11000.0;
   }
   // cap to composeHeight's CMAX=15000; allow negative for seabed
   const surfElev = Math.min(renderedM, 15000.0) / WEBGL2_TERRAIN_R_M;
   const eyeHeight = 2.0 / WEBGL2_M_PER_UNIT;   // EXACTLY 2.0 m above ground (km-units = 2m / m-per-unit)
   const minR = RADIUS * (1.0 + surfElev) + eyeHeight;
-  if (r < minR) { const s = minR/r; cam.pos[0]*=s; cam.pos[1]*=s; cam.pos[2]*=s; }
+  if (doClamp && r < minR) { const s = minR/r; cam.pos[0]*=s; cam.pos[1]*=s; cam.pos[2]*=s; }
   const maxR = RADIUS * 50;
   if (r > maxR) { const s = maxR/r; cam.pos[0]*=s; cam.pos[1]*=s; cam.pos[2]*=s; }
 

package/src/gl-render.js

@@ -1105,7 +1105,11 @@ export async function initMapspinnerRender(gl, opts = {}) {
       // shows. Cap every visible leaf at level WCAP and DEDUP to its ancestor tile: a coarse,
       // LOD-churn-free cover of the same footprint, typically ~10-50x fewer water vertices.
       // __waterSurface=0 disables live.
-      if (typeof window === 'undefined' || window.__waterSurface !== false) {
+      // UNDERWATER: skip the sea-level water surface entirely (user 2026-06-14 'underwater looks weird,
+      // we cant see anything / it must draw the sea bed'). The surface mesh drawn from below was an
+      // opaque sheet that occluded the seabed; with it gone, the underwater camera sees the seabed
+      // terrain directly (with the underwater fog). Above water it draws normally.
+      if ((typeof window === 'undefined' || window.__waterSurface !== false) && !_uw) {
         // WCAP 7 -> 9 (coast witness caught it: a level-7 tile's 16-cell mesh chord sags
         // A_cell^2/(8R) ~ 0.8m below the true sphere mid-cell -- BELOW the metres-deep shelf
         // seabed, so the depth test culled the water across entire shorelines. Level-9 cells

package/src/shaders/terrain.glsl

@@ -631,10 +631,14 @@ 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 = 300.0;   // metres of depth flattened at the shore (decoupled from the land beach)
+      const highp float SEABED_EASE = 120.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;
-      h = -(min(d, 500.0) * 0.24 + max(d - 500.0, 0.0) * 1.19);
+      // 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
+      // 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 = 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
@@ -652,7 +656,10 @@ highp float composeHeight(vec3 dir0, highp vec2 faceLocal, float tileM){   // W7
   }
   // 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.
-  h += vDisp;
+  // SEABED RELIEF BOOST (user 2026-06-14 'more relief' to explore): amplify the micro-relief with DEPTH
+  // (1x at the shore -> 2.2x by 600m down) so the deep seabed is rugged/interesting, while shallow water
+  // stays calm so the boost never lifts the bed toward sea level (no 'almost-land').
+  h += vDisp * mix(1.0, 2.2, clamp((h + 50.0) / -550.0, 0.0, 1.0));
   // PERLIN-EVERYWHERE ELEVATION (user 2026-06-10 'it must also affect elevation'): the same detailFbm
   // the FS albedo overlay shows, as real relief (~30m per lever unit -> ~180m at the user-tuned 6).
   // Shore-gated (fades in over the first 250m of land) so the coastline and the flat water planes are
@@ -862,17 +869,17 @@ 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 = 300.0;   // mirror composeHeight: narrow waterline ease, deep ocean beyond
+        const highp float SEABED_EASE = 120.0;   // mirror composeHeight: narrow waterline ease, deep ocean beyond
         highp float dSea0 = -vH;
         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 = -(min(dSea, 150.0) * 0.6 + max(dSea - 150.0, 0.0) * 1.5);   // steeper 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
         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 += vDisp * mix(1.0, 2.2, clamp((vH + 50.0) / -550.0, 0.0, 1.0));   // seabed relief boost (mirror composeHeight)
     vH += detailFbm(dir0) * uDetailOverlay * 30.0 * step(0.0, vH);
     // FLAT-AREA VALLEY NETWORKS + LAKES (user 2026-06-13): incised valley systems in low-relief
     // plains -- must mirror composeHeight for FS material consistency.
@@ -1067,7 +1074,11 @@ void main() {
     // water pass: NO skirt (user 2026-06-11) -- the surface is an exact sphere at R, so adjacent
     // LODs agree exactly and there are no T-junction cracks to hide; a skirt would only drape a
     // visible curtain through the transparent shallows.
-    highp float skirt = (vertex.z > 0.5 && uIsWater < 0.5) ? max(defOffset.z * 0.12, 60.0) : 0.0;   // W7: metres (tile-size scaled) -> highp
+    // SKIRT halved (user 2026-06-14 'we keep seeing skirts' -- visible underwater/through the now-clear
+    // water): 0.12->0.06 tile-scaled + floor 60->30. Still reaches below a coarser neighbor to hide the
+    // LOD T-junction crack (the real discontinuity is tens of m, far under 0.06*tilespan), but the
+    // vertical curtain is half as tall = far less visible when the seabed is seen through clear water.
+    highp float skirt = (vertex.z > 0.5 && uIsWater < 0.5) ? max(defOffset.z * 0.06, 30.0) : 0.0;   // W7: metres (tile-size scaled) -> highp
     vWorld = dir0 * (R + hR - skirt);   // ABSOLUTE world pos (RENDER height: ocean top flat) -> FS lighting/atmosphere
     // TEXTURE DOMAIN WARP -- VS-side, DOUBLED BACK (user 2026-06-12): 225/900/3500 -> 450/1800/7000.
     {