@d5techs/3dgs-lib 1.4.58 → 1.4.60

package/dist/3dgs-lib.js

@@ -2237,40 +2237,41 @@ fn dirToUv(d: vec3<f32>) -> vec2<f32> {
 @fragment fn fs(i: V) -> @location(0) vec4<f32> {
     let d = normalize(i.dir);
     let camH = u.extra.x;
-    let projR = u.extra.y;
+    let R    = u.extra.y;
 
-    // --- sky UV (always computed for uniform control flow) ---
+    // --- sky ---
     let skyUv = dirToUv(d);
 
-    // --- flat ground projection ---
-    // Ray from camera at height camH above ground, direction d,
-    // hits ground plane at t = -camH / d.y
+    // --- ground: inverted bowl hemisphere at Y=0 ---
     let dyClamped = min(d.y, -0.0001);
     let t = -camH / dyClamped;
     let hitX = t * d.x;
     let hitZ = t * d.z;
     let hitDist = sqrt(hitX * hitX + hitZ * hitZ);
 
-    // Reconstruct a sampling direction as if looking from HDR capture
-    // height (1.7m) straight down at the hit point → FLAT ground
-    let captureH = 1.7;
-    let groundDir = normalize(vec3(hitX, -captureH, hitZ));
+    // Clamp hit point inside the bowl radius
+    let s = min(1.0, R * 0.999 / max(hitDist, 0.001));
+    let bx = hitX * s;
+    let bz = hitZ * s;
+    // Project onto the lower hemisphere: y = -sqrt(R² - x² - z²)
+    let bowlY = -sqrt(max(R * R - bx * bx - bz * bz, 0.0));
+    let groundDir = normalize(vec3(bx, bowlY, bz));
     let groundUv = dirToUv(groundDir);
 
-    // --- sample both unconditionally (uniform control flow) ---
-    let skyColor = textureSample(envTexture, envSampler, skyUv).rgb;
+    // --- sample both (uniform control flow) ---
+    let skyColor   = textureSample(envTexture, envSampler, skyUv).rgb;
     let groundColor = textureSample(envTexture, envSampler, groundUv).rgb;
 
-    // Blend: smooth transition near horizon
-    let horizonBlend = smoothstep(0.0, -0.12, d.y);
-    let aboveGround = step(0.01, camH);
-    let edgeFade = 1.0 - smoothstep(projR * 0.6, projR, hitDist);
-    let finalBlend = horizonBlend * aboveGround * edgeFade;
+    // Blend near horizon + fade at bowl edge
+    let horizonBlend = smoothstep(0.0, -0.08, d.y);
+    let aboveGround  = step(0.01, camH);
+    let edgeFade     = 1.0 - smoothstep(R * 0.7, R, hitDist);
+    let finalBlend   = horizonBlend * aboveGround * edgeFade;
     let c = mix(skyColor, groundColor, finalBlend);
 
     // Reinhard tone mapping + gamma
     let mapped = c / (c + vec3(1.));
-    let gamma = pow(mapped, vec3(1./2.2));
+    let gamma  = pow(mapped, vec3(1./2.2));
     return vec4(gamma, 1.);
 }`
 );
@@ -2289,7 +2290,7 @@ class SkyboxRenderer {
     __publicField(this, "frameReady", false);
     __publicField(this, "mode", "none");
     /** Ground projection sphere radius (world units). Larger = ground extends further, flatter. */
-    __publicField(this, "groundRadius", 500);
+    __publicField(this, "groundRadius", 1e3);
     this.device = device;
     const depthStencil = {
       format: depthFormat,
@@ -2408,7 +2409,7 @@ class SkyboxRenderer {
     this.mode = "equirect";
   }
   // ---- common ----
-  prepareFrame(viewMatrix, projectionMatrix, cameraPosition, groundY) {
+  prepareFrame(viewMatrix, projectionMatrix, cameraPosition) {
     if (!this.isActive) {
       this.frameReady = false;
       return;
@@ -2426,9 +2427,7 @@ class SkyboxRenderer {
     ud[9] = viewMatrix[9];
     ud[10] = viewMatrix[10];
     ud[11] = 0;
-    const camWorldY = cameraPosition ? cameraPosition[1] : 0;
-    const gndY = groundY ?? 0;
-    ud[12] = camWorldY - gndY;
+    ud[12] = cameraPosition ? cameraPosition[1] : 0;
     ud[13] = this.groundRadius;
     ud[14] = 0;
     ud[15] = 0;
@@ -19069,20 +19068,10 @@ class App {
     this.hotspotManager.updateBillboards();
     if ((_a2 = this.skyboxRenderer) == null ? void 0 : _a2.isActive) {
       const cam = this.camera.position;
-      let groundY = 0;
-      const gsRenderer2 = this.sceneManager.getGSRenderer();
-      if (gsRenderer2) {
-        const bbox = gsRenderer2.getBoundingBox();
-        if (bbox) {
-          const m = gsRenderer2.getModelMatrix();
-          groundY = m[5] * bbox.min[1] + m[13];
-        }
-      }
       this.skyboxRenderer.prepareFrame(
         this.camera.viewMatrix,
         this.camera.projectionMatrix,
-        [cam[0], cam[1], cam[2]],
-        groundY
+        [cam[0], cam[1], cam[2]]
       );
     }
     const pass = this.renderer.beginFrame();