@d5techs/3dgs-lib 1.4.57 → 1.4.59

package/dist/3dgs-lib.cjs

@@ -2238,40 +2238,37 @@ fn dirToUv(d: vec3<f32>) -> vec2<f32> {
 
 @fragment fn fs(i: V) -> @location(0) vec4<f32> {
     let d = normalize(i.dir);
-    let camY = u.extra.x;
-    let sphereR = u.extra.y;
+    let camH = u.extra.x;
+    let projR = u.extra.y;
 
-    // --- sky UV (always computed) ---
+    // --- sky UV (always computed for uniform control flow) ---
     let skyUv = dirToUv(d);
 
-    // --- ground projection (always computed for uniform control flow) ---
-    // Ray from camera (0, camY, 0) in direction d hits plane y=0 at t
+    // --- flat ground projection ---
+    // Ray from camera at height camH above ground, direction d,
+    // hits ground plane at t = -camH / d.y
     let dyClamped = min(d.y, -0.0001);
-    let t = -camY / dyClamped;
+    let t = -camH / dyClamped;
     let hitX = t * d.x;
     let hitZ = t * d.z;
     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));
+    // Re-map to a direction on the HDR sphere from a virtual capture
+    // height above ground. Larger = more ground texture visible,
+    // smaller = more horizon. 15 matches Three.js GroundProjectedEnv default.
+    let captureH = 15.0;
+    let groundDir = normalize(vec3(hitX, -captureH, hitZ));
     let groundUv = dirToUv(groundDir);
 
-    // --- sample both (unconditional = uniform control flow) ---
+    // --- sample both unconditionally (uniform control flow) ---
     let skyColor = textureSample(envTexture, envSampler, skyUv).rgb;
     let groundColor = textureSample(envTexture, envSampler, groundUv).rgb;
 
     // 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 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;
     let c = mix(skyColor, groundColor, finalBlend);
 
     // Reinhard tone mapping + gamma
@@ -2295,7 +2292,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,
@@ -2414,7 +2411,7 @@ class SkyboxRenderer {
     this.mode = "equirect";
   }
   // ---- common ----
-  prepareFrame(viewMatrix, projectionMatrix, cameraPosition, groundY) {
+  prepareFrame(viewMatrix, projectionMatrix, cameraPosition) {
     if (!this.isActive) {
       this.frameReady = false;
       return;
@@ -2432,9 +2429,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;
@@ -19075,22 +19070,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();
-          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]],
-        groundY
+        [cam[0], cam[1], cam[2]]
       );
     }
     const pass = this.renderer.beginFrame();