@d5techs/3dgs-lib 1.4.51 → 1.4.52

package/dist/3dgs-lib.cjs

@@ -2105,7 +2105,6 @@ struct Uniforms {
     col0: vec4<f32>,
     col1: vec4<f32>,
     col2: vec4<f32>,
-    extra: vec4<f32>,
 };
 
 @group(0) @binding(0) var<uniform> u: Uniforms;
@@ -2140,28 +2139,8 @@ fn vs(@builtin(vertex_index) vi: u32) -> VSOut {
 
 @fragment
 fn fs(input: VSOut) -> @location(0) vec4<f32> {
-    let dir = normalize(input.dir);
-
-    let camX = u.extra.y;
-    let camY = u.extra.z;
-    let camZ = u.extra.w;
-
-    let doGround = u.extra.x > 0.5 && dir.y < -0.001 && camY > 0.01;
-    let safeDirY = select(dir.y, -0.01, dir.y > -0.001);
-    let t = camY / (-safeDirY);
-    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 skyColor = textureSample(cubeTexture, cubeSampler, dir);
-    let groundColor = textureSample(cubeTexture, cubeSampler, groundDir);
-
-    let blend = smoothstep(0.0, -0.12, dir.y);
-    let mixed = mix(skyColor.rgb, groundColor.rgb, blend);
-
-    let final_color = select(skyColor.rgb, mixed, doGround);
-    return vec4<f32>(final_color, 1.0);
+    let color = textureSample(cubeTexture, cubeSampler, normalize(input.dir));
+    return vec4<f32>(color.rgb, 1.0);
 }
 `
 );
@@ -2172,18 +2151,17 @@ class SkyboxRenderer {
     __publicField(this, "uniformBuffer");
     __publicField(this, "sampler");
     __publicField(this, "bindGroupLayout");
-    __publicField(this, "uniformData", new Float32Array(16));
+    __publicField(this, "uniformData", new Float32Array(12));
     __publicField(this, "cubeTexture", null);
     __publicField(this, "cubeBindGroup", null);
     __publicField(this, "frameReady", false);
-    __publicField(this, "alignToGround", true);
     this.device = device;
     const shaderModule = device.createShaderModule({ code: WGSL });
     this.bindGroupLayout = device.createBindGroupLayout({
       entries: [
         {
           binding: 0,
-          visibility: GPUShaderStage.VERTEX | GPUShaderStage.FRAGMENT,
+          visibility: GPUShaderStage.VERTEX,
           buffer: { type: "uniform" }
         },
         {
@@ -2216,7 +2194,7 @@ class SkyboxRenderer {
       }
     });
     this.uniformBuffer = device.createBuffer({
-      size: 64,
+      size: 48,
       usage: GPUBufferUsage.UNIFORM | GPUBufferUsage.COPY_DST
     });
     this.sampler = device.createSampler({
@@ -2273,7 +2251,7 @@ class SkyboxRenderer {
     });
     this.cubeTexture = tex;
   }
-  prepareFrame(viewMatrix, projectionMatrix, cameraPosition) {
+  prepareFrame(viewMatrix, projectionMatrix) {
     if (!this.isActive) {
       this.frameReady = false;
       return;
@@ -2291,17 +2269,6 @@ class SkyboxRenderer {
     ud[9] = viewMatrix[9];
     ud[10] = viewMatrix[10];
     ud[11] = 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;
   }
@@ -18936,11 +18903,9 @@ class App {
     this.updateAdaptivePerformance();
     this.hotspotManager.updateBillboards();
     if ((_a2 = this.skyboxRenderer) == null ? void 0 : _a2.isActive) {
-      const cam = this.camera.position;
       this.skyboxRenderer.prepareFrame(
         this.camera.viewMatrix,
-        this.camera.projectionMatrix,
-        [cam[0], cam[1], cam[2]]
+        this.camera.projectionMatrix
       );
     }
     const pass = this.renderer.beginFrame();
@@ -19133,11 +19098,6 @@ class App {
     var _a2;
     return ((_a2 = this.skyboxRenderer) == null ? void 0 : _a2.isActive) ?? false;
   }
-  setSkyboxAlignToGround(value) {
-    if (this.skyboxRenderer) {
-      this.skyboxRenderer.alignToGround = value;
-    }
-  }
   // ============================================
   // Gizmo（委托给 GizmoManager）
   // ============================================