mapspinner 0.1.31 → 0.1.33

package/package.json

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

package/planet.html

@@ -477,9 +477,9 @@ function frameLoop(){
   // take the existing CPU-mirror fallback. Below 20km (where collision is load-bearing) keep GPU-exact.
   const _altRoughKm = _camLenMv - RADIUS;
   const _gpuGM = (_altRoughKm < 20.0 && _orchMv && _orchMv.render && _orchMv.render.sampleGroundM) ? _orchMv.render.sampleGroundM(_camDirMv) : null;
-  const _surfM = (_gpuGM != null && isFinite(_gpuGM)) ? Math.max(0, _gpuGM)
-               : Math.max(0, jsBroadShape(cam.pos[0],cam.pos[1],cam.pos[2]));
-  const altSurfElev = Math.max(0, Math.min(_surfM, 9500.0)) / WEBGL2_TERRAIN_R_M;
+  const _surfM = (_gpuGM != null && isFinite(_gpuGM)) ? _gpuGM
+               : jsBroadShape(cam.pos[0],cam.pos[1],cam.pos[2]);
+  const altSurfElev = Math.min(_surfM, 9500.0) / WEBGL2_TERRAIN_R_M;
   const altKmAbove = Math.max(1e-3, (Math.hypot(...cam.pos) - RADIUS*(1.0 + altSurfElev)));
   // CAMERA MOVE-STEP. NO ELEVATION SLOWDOWN (user 2026-06-05: 'get rid of the camera slowdown code').
   // The step scales with altitude-above-surface ONLY so the scene still moves at orbit (a constant step
@@ -522,14 +522,12 @@ function frameLoop(){
   // 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.
   if (gpuM != null && isFinite(gpuM)) {
-    renderedM = Math.max(0, gpuM);   // GPU-exact rendered height; no margin
+    renderedM = gpuM;   // GPU-exact rendered height (may be negative = seabed)
   } else {
-    renderedM = Math.max(0, jsBroadShape(cam.pos[0], cam.pos[1], cam.pos[2])) + 3.0;  // mirror fallback (CPU under-predicts)
+    renderedM = jsBroadShape(cam.pos[0], cam.pos[1], cam.pos[2]) + 3.0;  // mirror fallback (CPU under-predicts)
   }
-  // cap = composeHeight's true ceiling CMAX=15000 (terrain.glsl:448), NOT 11000: the GPU probe
-  // renderedM is honest up to 15km, but re-capping at 11000 before minR let the camera floor sit
-  // BELOW visible 11-15km peaks -> tunnel through the rendered geometry (collision-elev-margin, wb4syopmo).
-  const surfElev = Math.max(0.0, Math.min(renderedM, 15000.0)) / WEBGL2_TERRAIN_R_M;  // fraction of R (match CMAX)
+  // 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; }
@@ -537,7 +535,7 @@ function frameLoop(){
   if (r > maxR) { const s = maxR/r; cam.pos[0]*=s; cam.pos[1]*=s; cam.pos[2]*=s; }
 
   // height of the eye above the local ground, in metres (for the HUD readout).
-  const heightAboveGroundM = (Math.hypot(...cam.pos) - RADIUS*(1.0 + Math.max(0,surfElev))) * 1000;
+  const heightAboveGroundM = (Math.hypot(...cam.pos) - RADIUS*(1.0 + surfElev)) * 1000;
   window.__altM = heightAboveGroundM;
 
   // The camera (autopilot + free-fly + clamp) has now been fully updated this frame,

package/src/gl-render.js

@@ -799,7 +799,7 @@ export async function initMapspinnerRender(gl, opts = {}) {
     gl.uniform1f(U('uTexTileM'),   _g('texTile', 2400.0));  // metres per repeat (user: 24m read as noise/rock -- 100x bigger)
     gl.uniform1f(U('uTexNrmK'),    _g('texNrmK', 1.5));     // 0.8 -> 3.0 (user 2026-06-11 'displacement normals must be THE texture normals'), 3.0->1.5 (2026-06-13 'texture displacement far too obvious vs elevation')
     gl.uniform1f(U('uTexMix'),     _g('texMix', 0.85));     // splat blend amount (0 = off)
-    gl.uniform1f(U('uTexWarp'),    _g('texWarp', 0.325));   // anti-repetition warp amplitude (+30% from 0.25, grass needed more visible warping)
+    gl.uniform1f(U('uTexWarp'),    _g('texWarp', 0.23));    // anti-repetition warp amplitude (-30% from 0.325, grass warp too intense)
     gl.uniform1f(U('uTexPhoto'),   _g('texPhoto', 0.0));    // raw photo-color fraction (0 = patch matches the macro shade exactly)
     gl.uniform1f(U('uTexPhotoNear'), _g('texPhotoNear', 0.45));  // near-field material identity (photo hue at macro luminance; user 2026-06-12 'must be either grass or sand')
     gl.uniform4f(U('uSurfMeanL'), _surfMeanL[0], _surfMeanL[1], _surfMeanL[2], _surfMeanL[3]);   // per-layer mean linear luminance (shade-match divisor)
@@ -870,6 +870,10 @@ export async function initMapspinnerRender(gl, opts = {}) {
       gl.enableVertexAttribArray(1); gl.vertexAttribPointer(1, 4, gl.FLOAT, false, STRIDE, 0);          gl.vertexAttribDivisor(1, 1);  // iOffset
       gl.enableVertexAttribArray(2); gl.vertexAttribPointer(2, 1, gl.FLOAT, false, STRIDE, 4 * 4);      gl.vertexAttribDivisor(2, 1);  // iFace
       gl.uniform1f(U('uIsWater'), 0.0);
+      // UNDERWATER DETECTION: camera below sea level enables underwater shading + water surface
+      // rendering from below. Set before the terrain draw so the FS can apply underwater fog.
+      const _uw = camDist < R - 2.0;
+      gl.uniform1f(U('uUnderwater'), _uw ? 1.0 : 0.0);
       gl.drawElementsInstanced(gl.TRIANGLES, indices.length, gl.UNSIGNED_INT, 0, n);
       // SEPARATE WATER SURFACE (user 2026-06-11): second instanced draw with uIsWater=1 -- the VS
       // pins the mesh to sea level, the FS shades animated water and alpha-blends it over the
@@ -901,9 +905,14 @@ export async function initMapspinnerRender(gl, opts = {}) {
         gl.bufferData(gl.ARRAY_BUFFER, new Float32Array(wl), gl.DYNAMIC_DRAW);
         gl.enableVertexAttribArray(1); gl.vertexAttribPointer(1, 4, gl.FLOAT, false, STRIDE, 0);     gl.vertexAttribDivisor(1, 1);
         gl.enableVertexAttribArray(2); gl.vertexAttribPointer(2, 1, gl.FLOAT, false, STRIDE, 4 * 4); gl.vertexAttribDivisor(2, 1);
-        gl.enable(gl.BLEND);
-        gl.blendFunc(gl.SRC_ALPHA, gl.ONE_MINUS_SRC_ALPHA);
-        gl.depthMask(false);
+        if (_uw) {
+          gl.disable(gl.BLEND);
+          gl.depthMask(true);
+        } else {
+          gl.enable(gl.BLEND);
+          gl.blendFunc(gl.SRC_ALPHA, gl.ONE_MINUS_SRC_ALPHA);
+          gl.depthMask(false);
+        }
         gl.uniform1f(U('uIsWater'), 1.0);
         gl.drawElementsInstanced(gl.TRIANGLES, indices.length, gl.UNSIGNED_INT, 0, wn);
         gl.uniform1f(U('uIsWater'), 0.0);

package/src/shaders/terrain.glsl

@@ -206,6 +206,7 @@ uniform float uVertexAO;                   // per-vertex shading/AO strength lev
 // blended over the seabed). One program + a uniform flag = no second cold compile, no duplicated
 // per-frame uniform churn, and the branch is uniform-coherent (free on the GPU).
 uniform float uIsWater;                    // 0 = terrain pass, 1 = water-surface pass
+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 uHiFreqCut;                  // hi-freq elevation-noise attenuation, applied to ALL hi-freq sources:
                                            // broadShapeM/MD fine octaves (o>=6) + vtxDisplace micro-relief
@@ -1452,6 +1453,34 @@ void main() {
     // none of the terrain material/atmosphere work below runs for water fragments.
     if (uIsWater > 0.5) {
         if (vH > 1.0) discard;                       // surface under land: depth test culls it anyway; discard kills shoreline shimmer
+        // UNDERWATER WATER SURFACE (camera below sea level): render the surface from below as
+        // opaque deep blue with Gerstner wave animation. No sky reflection, no Fresnel (TIR from
+        // below = mostly opaque deep water), no Beer-Lambert (there is no seabed above the camera).
+        if (uUnderwater > 0.5) {
+            highp vec3 wOriginW = floor(camWorld / 1024.0) * 1024.0;
+            highp vec2 wpW = vec2(dot(vWorld - wOriginW, ux), dot(vWorld - wOriginW, uy));
+            vec2 slopeW = oceanWaveSlope(wpW, oceanTime);
+            highp float wDistW = length(camWorld - vWorld);
+            slopeW *= clamp(1.0 - wDistW / 4000.0, 0.0, 1.0);
+            vec3 wn = normalize(uz - ux * slopeW.x - uy * slopeW.y);
+            vec3 viewW = normalize(camWorld - vWorld);
+            float ndl = max(dot(wn, sunDir), 0.0);
+            // Sunlight attenuated through the water column; deep blue ambient
+            float depthAtten = exp(-max(0.0, terrainR - length(camWorld)) * 0.0005);
+            vec3 sunUnder = vec3(1.0, 0.6, 0.3) * depthAtten * ndl;
+            vec3 deepBlue = vec3(0.005, 0.06, 0.18);
+            vec3 waveBright = vec3(0.0, 0.02, 0.06) * length(slopeW);
+            vec3 wcol = deepBlue + sunUnder * 0.4 + waveBright;
+            float macroMuW = dot(uz, sunDir);
+            float dayShadeW = mix(uNightFloor, 1.0, smoothstep(-uTermWidth, uTermWidth, macroMuW));
+            vec3 cW = wcol * dayShadeW * uExposure;
+            vec3 mappedW = clamp((cW * (2.51 * cW + 0.03)) / (cW * (2.43 * cW + 0.59) + 0.14), 0.0, 1.0);
+            float lumW = dot(mappedW, vec3(0.2126, 0.7152, 0.0722));
+            mappedW = mix(vec3(lumW), mappedW, uLookSat);
+            mappedW = clamp((mappedW - 0.5) * uLookContrast + 0.5, 0.0, 1.0);
+            fragColor = vec4(pow(mappedW, vec3(1.0 / 2.2)), 1.0);
+            return;
+        }
         highp float depthM = max(-vH, 0.0);
         highp vec3 wOriginW = floor(camWorld / 1024.0) * 1024.0;   // snapped anchor (fp32 wave-phase fix, same as the old branch)
         highp vec2 wpW = vec2(dot(vWorld - wOriginW, ux), dot(vWorld - wOriginW, uy));
@@ -1840,7 +1869,18 @@ void main() {
     // blended over this seabed. Sea ice still keys the seabed albedo near the poles.
 
     vec3 skyIrr;
-    vec3 sunIrr = atm_sunSkyIrradiance(pAtm, nAtm, sunDir, skyIrr);
+    vec3 sunIrr;
+    if (uUnderwater > 0.5) {
+        // Underwater terrain (seabed): sun attenuated through water column, blue ambient, no
+        // atmospheric Rayleigh/Mie scattering. Sun colour shifts toward green-blue with depth.
+        float depth = max(0.0, terrainR - length(camWorld));
+        float atten = exp(-depth * 0.0004);
+        float ndl = max(dot(nAtm, sunDir), 0.0);
+        sunIrr = vec3(1.0, 0.65, 0.35) * atten * ndl * 0.7;
+        skyIrr = vec3(0.02, 0.07, 0.18);
+    } else {
+        sunIrr = atm_sunSkyIrradiance(pAtm, nAtm, sunDir, skyIrr);
+    }
     // The Rayleigh sky irradiance is strongly blue; at full strength it tints the lit
     // CONTINENTS blue-grey from orbit (witnessed: lit mean [83,95,112] vs warm albedo
     // [90,83,74] at 2000km -- the blue is the sky-irradiance term, NOT aerial inscatter).
@@ -1987,6 +2027,20 @@ void main() {
             color = mix(lit, hazed, apGate * uHazeMul);   // uHazeMul lever (2026-06-10 'pale hazy': full-strength haze milked the midground)
         }
     }
+    // UNDERWATER FOG (camera below sea level): replace the air-based Aerial Perspective with
+    // absorption/scattering through water. Fog colour deepens with camera depth so the seabed
+    // fades to blue-green with distance, red absorbed first. Applied only to terrain (uIsWater<0.5).
+    if (uUnderwater > 0.5 && uIsWater < 0.5) {
+        highp vec3 camA  = atmPos(camWorld, terrainR);
+        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);
+        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));
+    }
     // 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
     // result -- 15k blue albedo px -> 0 lit px, even with the sun HIGH (sunDotUp 0.85). Ocean