@d5techs/3dgs-lib 1.4.55 → 1.4.57

package/dist/3dgs-lib.cjs

@@ -2244,33 +2244,35 @@ fn dirToUv(d: vec3<f32>) -> vec2<f32> {
     // --- sky UV (always computed) ---
     let skyUv = dirToUv(d);
 
-    // --- ground projection UV (always computed to satisfy uniform control flow) ---
-    // ray-plane intersection: camera at height camY, plane y=0
-    let dySafe = select(d.y, -0.0001, d.y > -0.0001);
-    let t = -camY / dySafe;
+    // --- ground projection (always computed for uniform control flow) ---
+    // Ray from camera (0, camY, 0) in direction d hits plane y=0 at t
+    let dyClamped = min(d.y, -0.0001);
+    let t = -camY / dyClamped;
     let hitX = t * d.x;
     let hitZ = t * d.z;
-    let hitDist2 = hitX * hitX + hitZ * hitZ;
-    let R2 = sphereR * sphereR;
-    // clamp hit to sphere radius to avoid extreme stretching at edges
-    let needClamp = hitDist2 > R2;
-    let clampScale = select(1.0, sphereR / sqrt(max(hitDist2, 0.0001)), needClamp);
-    let pX = hitX * clampScale;
-    let pZ = hitZ * clampScale;
-    // project back onto sphere: y = -sqrt(R^2 - x^2 - z^2)
-    let projY = -sqrt(max(R2 - pX * pX - pZ * pZ, 0.0));
-    let groundDir = normalize(vec3(pX, projY, pZ));
+    let hitDist = sqrt(hitX * hitX + hitZ * hitZ);
+
+    // Project the ground hit point back onto a sphere of radius R
+    // centered at the camera projection on y=0 (i.e. center = origin).
+    // For points beyond R, fade to horizon sampling.
+    let ratio = min(hitDist, sphereR) / max(hitDist, 0.001);
+    let pX = hitX * ratio;
+    let pZ = hitZ * ratio;
+    let pY = -sqrt(max(sphereR * sphereR - pX * pX - pZ * pZ, 0.0));
+    let groundDir = normalize(vec3(pX, pY, pZ));
     let groundUv = dirToUv(groundDir);
 
     // --- sample both (unconditional = uniform control flow) ---
     let skyColor = textureSample(envTexture, envSampler, skyUv).rgb;
     let groundColor = textureSample(envTexture, envSampler, groundUv).rgb;
 
-    // blend near horizon for smooth transition
-    let blend = smoothstep(0.0, -0.08, d.y);
-    let mixed = mix(skyColor, groundColor, blend);
-    let useGround = d.y < 0.0 && camY > 0.01;
-    let c = select(skyColor, mixed, useGround);
+    // Blend: smooth transition near horizon
+    // step(0.01, camY) disables ground projection when camera is at/below ground
+    let groundFactor = smoothstep(0.01, -0.15, d.y) * step(0.01, camY);
+    // Fade out ground color at the sphere edge to avoid hard seam
+    let edgeFade = 1.0 - smoothstep(sphereR * 0.7, sphereR * 0.99, hitDist);
+    let finalBlend = groundFactor * edgeFade;
+    let c = mix(skyColor, groundColor, finalBlend);
 
     // Reinhard tone mapping + gamma
     let mapped = c / (c + vec3(1.));
@@ -2292,8 +2294,8 @@ class SkyboxRenderer {
     __publicField(this, "bindGroup", null);
     __publicField(this, "frameReady", false);
     __publicField(this, "mode", "none");
-    /** Ground projection sphere radius (world units). Larger = ground extends further. */
-    __publicField(this, "groundRadius", 32);
+    /** Ground projection sphere radius (world units). Larger = ground extends further, flatter. */
+    __publicField(this, "groundRadius", 500);
     this.device = device;
     const depthStencil = {
       format: depthFormat,
@@ -2412,7 +2414,7 @@ class SkyboxRenderer {
     this.mode = "equirect";
   }
   // ---- common ----
-  prepareFrame(viewMatrix, projectionMatrix, cameraPosition) {
+  prepareFrame(viewMatrix, projectionMatrix, cameraPosition, groundY) {
     if (!this.isActive) {
       this.frameReady = false;
       return;
@@ -2430,7 +2432,9 @@ class SkyboxRenderer {
     ud[9] = viewMatrix[9];
     ud[10] = viewMatrix[10];
     ud[11] = 0;
-    ud[12] = cameraPosition ? cameraPosition[1] : 0;
+    const camWorldY = cameraPosition ? cameraPosition[1] : 0;
+    const gndY = groundY ?? 0;
+    ud[12] = camWorldY - gndY;
     ud[13] = this.groundRadius;
     ud[14] = 0;
     ud[15] = 0;
@@ -19071,10 +19075,22 @@ 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();
+          const minLocalY = bbox.center[1] - bbox.radius;
+          groundY = minLocalY * m[5] + bbox.center[1] * (m[5] - m[5]) + m[13];
+          groundY = (bbox.center[1] - bbox.radius) * m[5] + m[13];
+        }
+      }
       this.skyboxRenderer.prepareFrame(
         this.camera.viewMatrix,
         this.camera.projectionMatrix,
-        [cam[0], cam[1], cam[2]]
+        [cam[0], cam[1], cam[2]],
+        groundY
       );
     }
     const pass = this.renderer.beginFrame();