@d5techs/3dgs-lib 1.4.60 → 1.4.61

package/dist/3dgs-lib.cjs

@@ -2217,7 +2217,7 @@ struct V { @builtin(position) pos: vec4<f32>, @location(0) dir: vec3<f32> };
 const EQUIRECT_WGSL = (
   /* wgsl */
   `
-struct Uniforms { col0: vec4<f32>, col1: vec4<f32>, col2: vec4<f32>, extra: vec4<f32> };
+struct Uniforms { col0: vec4<f32>, col1: vec4<f32>, col2: vec4<f32>, cam: vec4<f32> };
 @group(0) @binding(0) var<uniform> u: Uniforms;
 @group(0) @binding(1) var envSampler: sampler;
 @group(0) @binding(2) var envTexture: texture_2d<f32>;
@@ -2237,37 +2237,40 @@ 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 R    = u.extra.y;
+    let d  = normalize(i.dir);
+    let cx = u.cam.x;
+    let cy = u.cam.y;
+    let cz = u.cam.z;
+    let R  = u.cam.w;
 
-    // --- sky ---
+    // --- sky (always computed for uniform control flow) ---
     let skyUv = dirToUv(d);
 
-    // --- ground: inverted bowl hemisphere at Y=0 ---
+    // --- ground: ray from camera hits Y=0 plane ---
     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);
+    let t = -cy / dyClamped;
+    // Hit point in WORLD space (not camera-relative)
+    let wx = cx + t * d.x;
+    let wz = cz + t * d.z;
+    let wDist = sqrt(wx * wx + wz * wz);
 
-    // 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²)
+    // Clamp inside the bowl radius (centered at world origin)
+    let s  = min(1.0, R * 0.999 / max(wDist, 0.001));
+    let bx = wx * s;
+    let bz = wz * s;
+    // Inverted bowl: 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);
+    let groundUv  = dirToUv(groundDir);
 
     // --- sample both (uniform control flow) ---
-    let skyColor   = textureSample(envTexture, envSampler, skyUv).rgb;
+    let skyColor    = textureSample(envTexture, envSampler, skyUv).rgb;
     let groundColor = textureSample(envTexture, envSampler, groundUv).rgb;
 
-    // Blend near horizon + fade at bowl edge
+    // Blend: horizon transition + 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 aboveGround  = step(0.01, cy);
+    let edgeFade     = 1.0 - smoothstep(R * 0.7, R, wDist);
     let finalBlend   = horizonBlend * aboveGround * edgeFade;
     let c = mix(skyColor, groundColor, finalBlend);
 
@@ -2292,7 +2295,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", 1e3);
+    __publicField(this, "groundRadius", 100);
     this.device = device;
     const depthStencil = {
       format: depthFormat,
@@ -2429,10 +2432,10 @@ class SkyboxRenderer {
     ud[9] = viewMatrix[9];
     ud[10] = viewMatrix[10];
     ud[11] = 0;
-    ud[12] = cameraPosition ? cameraPosition[1] : 0;
-    ud[13] = this.groundRadius;
-    ud[14] = 0;
-    ud[15] = 0;
+    ud[12] = cameraPosition ? cameraPosition[0] : 0;
+    ud[13] = cameraPosition ? cameraPosition[1] : 0;
+    ud[14] = cameraPosition ? cameraPosition[2] : 0;
+    ud[15] = this.groundRadius;
     this.device.queue.writeBuffer(this.uniformBuffer, 0, ud);
     this.frameReady = true;
   }