@d5techs/3dgs-lib 1.4.65 → 1.4.67

package/dist/3dgs-lib.cjs

@@ -2239,38 +2239,23 @@ fn dirToUv(d: vec3<f32>) -> vec2<f32> {
 @fragment fn fs(i: V) -> @location(0) vec4<f32> {
     let d  = normalize(i.dir);
     let cx = u.cam.x;
-    let cy = u.cam.y;
+    let cy = max(u.cam.y, 0.1);
     let cz = u.cam.z;
     let R  = u.cam.w;
 
-    // --- sky: sample HDR with original direction ---
-    let skyUv = dirToUv(d);
+    // Ray-sphere intersection: camera at (cx, cy, cz), sphere radius R at origin
+    let origin = vec3(cx, cy, cz);
+    let halfB  = dot(origin, d);
+    let cVal   = dot(origin, origin) - R * R;
+    let disc   = halfB * halfB - cVal;
 
-    // --- ground: ray from camera hits ground plane ---
-    let dyClamped = min(d.y, -0.0001);
-    let t = -cy / dyClamped;
-    let wx = cx + t * d.x;
-    let wz = cz + t * d.z;
-    let wDist = sqrt(wx * wx + wz * wz);
+    // Far intersection (camera is inside sphere)
+    let t = -halfB + sqrt(max(disc, 0.0));
+    let hitPoint  = origin + t * d;
+    let sampleDir = normalize(hitPoint);
 
-    // Bowl projection centered at world origin
-    let s  = min(1.0, R * 0.999 / max(wDist, 0.001));
-    let bx = wx * s;
-    let bz = wz * s;
-    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 (uniform control flow) ---
-    let skyColor    = textureSample(envTexture, envSampler, skyUv).rgb;
-    let groundColor = textureSample(envTexture, envSampler, groundUv).rgb;
-
-    // Sharp blend right at the horizon (d.y = 0)
-    let horizonBlend = smoothstep(0.002, -0.002, d.y);
-    let aboveGround  = step(0.01, cy);
-    let edgeFade     = 1.0 - smoothstep(R * 0.85, R, wDist);
-    let finalBlend   = horizonBlend * aboveGround * edgeFade;
-    let c = mix(skyColor, groundColor, finalBlend);
+    let uv = dirToUv(sampleDir);
+    let c  = textureSample(envTexture, envSampler, uv).rgb;
 
     // Reinhard tone mapping + gamma
     let mapped = c / (c + vec3(1.));
@@ -2292,7 +2277,7 @@ class SkyboxRenderer {
     __publicField(this, "bindGroup", null);
     __publicField(this, "frameReady", false);
     __publicField(this, "mode", "none");
-    /** Ground projection sphere radius (world units). Larger = ground extends further, flatter. */
+    /** Virtual HDR capture height (world units). Controls ground texture spread. */
     __publicField(this, "groundRadius", 50);
     this.device = device;
     const depthStencil = {
@@ -19095,7 +19080,8 @@ class App {
         );
       }
       const camH = cam[1] - groundLevel;
-      this.skyboxRenderer.groundRadius = Math.max(200, camH * 3);
+      const camDist = Math.sqrt(cam[0] * cam[0] + camH * camH + cam[2] * cam[2]);
+      this.skyboxRenderer.groundRadius = Math.max(500, camDist + 200);
       this.skyboxRenderer.prepareFrame(
         this.camera.viewMatrix,
         this.camera.projectionMatrix,