@d5techs/3dgs-lib 1.4.48 → 1.4.50

package/dist/3dgs-lib.cjs

@@ -2117,12 +2117,6 @@ struct VSOut {
     @location(0) dir: vec3<f32>,
 };
 
-fn rotateX(d: vec3<f32>, angle: f32) -> vec3<f32> {
-    let c = cos(angle);
-    let s = sin(angle);
-    return vec3<f32>(d.x, c * d.y - s * d.z, s * d.y + c * d.z);
-}
-
 @vertex
 fn vs(@builtin(vertex_index) vi: u32) -> VSOut {
     let positions = array<vec2<f32>, 3>(
@@ -2136,21 +2130,39 @@ fn vs(@builtin(vertex_index) vi: u32) -> VSOut {
 
     let eyeDir = vec3<f32>(p.x * u.col0.w, p.y * u.col1.w, -1.0);
 
-    var worldDir = vec3<f32>(
+    out.dir = vec3<f32>(
         dot(u.col0.xyz, eyeDir),
         dot(u.col1.xyz, eyeDir),
         dot(u.col2.xyz, eyeDir),
     );
-
-    worldDir = rotateX(worldDir, u.extra.x);
-
-    out.dir = worldDir;
     return out;
 }
 
 @fragment
 fn fs(input: VSOut) -> @location(0) vec4<f32> {
-    let color = textureSample(cubeTexture, cubeSampler, normalize(input.dir));
+    let dir = normalize(input.dir);
+
+    let alignGround = u.extra.x > 0.5;
+    let camY = u.extra.z;
+
+    if (alignGround && dir.y < -0.001 && camY > 0.01) {
+        let camX = u.extra.y;
+        let camZ = u.extra.w;
+
+        let t = camY / (-dir.y);
+        let gx = camX + dir.x * t;
+        let gz = camZ + dir.z * t;
+
+        let scale = max(camY, 1.0) * 5.0;
+        let groundDir = normalize(vec3<f32>(gx / max(scale, 0.01), -1.0, gz / max(scale, 0.01)));
+        let groundColor = textureSample(cubeTexture, cubeSampler, groundDir);
+        let skyColor = textureSample(cubeTexture, cubeSampler, dir);
+
+        let blend = smoothstep(0.0, -0.12, dir.y);
+        return vec4<f32>(mix(skyColor.rgb, groundColor.rgb, blend), 1.0);
+    }
+
+    let color = textureSample(cubeTexture, cubeSampler, dir);
     return vec4<f32>(color.rgb, 1.0);
 }
 `
@@ -2173,7 +2185,7 @@ class SkyboxRenderer {
       entries: [
         {
           binding: 0,
-          visibility: GPUShaderStage.VERTEX,
+          visibility: GPUShaderStage.VERTEX | GPUShaderStage.FRAGMENT,
           buffer: { type: "uniform" }
         },
         {
@@ -2263,12 +2275,7 @@ class SkyboxRenderer {
     });
     this.cubeTexture = tex;
   }
-  /**
-   * Write uniforms BEFORE beginFrame().
-   * pitchOffset: radians to rotate sampling direction around world X axis,
-   * used to align skybox horizon with model ground plane.
-   */
-  prepareFrame(viewMatrix, projectionMatrix, pitchOffset = 0) {
+  prepareFrame(viewMatrix, projectionMatrix, cameraPosition) {
     if (!this.isActive) {
       this.frameReady = false;
       return;
@@ -2286,10 +2293,17 @@ class SkyboxRenderer {
     ud[9] = viewMatrix[9];
     ud[10] = viewMatrix[10];
     ud[11] = 0;
-    ud[12] = pitchOffset;
-    ud[13] = 0;
-    ud[14] = 0;
-    ud[15] = 0;
+    if (this.alignToGround && cameraPosition) {
+      ud[12] = 1;
+      ud[13] = cameraPosition[0];
+      ud[14] = cameraPosition[1];
+      ud[15] = cameraPosition[2];
+    } else {
+      ud[12] = 0;
+      ud[13] = 0;
+      ud[14] = 0;
+      ud[15] = 0;
+    }
     this.device.queue.writeBuffer(this.uniformBuffer, 0, ud);
     this.frameReady = true;
   }
@@ -18924,23 +18938,11 @@ class App {
     this.updateAdaptivePerformance();
     this.hotspotManager.updateBillboards();
     if ((_a2 = this.skyboxRenderer) == null ? void 0 : _a2.isActive) {
-      let pitchOffset = 0;
-      if (this.skyboxRenderer.alignToGround) {
-        const cam = this.camera.position;
-        const mc = this.controls.modelCenter;
-        const mr = this.controls.modelRadius;
-        if (mr !== Infinity) {
-          const dx = cam[0] - mc[0];
-          const dz = cam[2] - mc[2];
-          const hDist = Math.sqrt(dx * dx + dz * dz);
-          const fullAngle = Math.atan2(cam[1], Math.max(hDist, 0.01));
-          pitchOffset = Math.max(-0.5, Math.min(0.5, -fullAngle * 0.35));
-        }
-      }
+      const cam = this.camera.position;
       this.skyboxRenderer.prepareFrame(
         this.camera.viewMatrix,
         this.camera.projectionMatrix,
-        pitchOffset
+        [cam[0], cam[1], cam[2]]
       );
     }
     const pass = this.renderer.beginFrame();