@d5techs/3dgs-lib 1.4.39 → 1.4.41

package/dist/3dgs-lib.cjs

@@ -2111,7 +2111,8 @@ fn vs(@builtin(vertex_index) vi: u32) -> VSOut {
 
 @fragment
 fn fs(input: VSOut) -> @location(0) vec4<f32> {
-    return textureSample(cubeTexture, cubeSampler, normalize(input.dir));
+    let color = textureSample(cubeTexture, cubeSampler, normalize(input.dir));
+    return vec4<f32>(color.rgb, 1.0);
 }
 `
 );
@@ -2131,6 +2132,7 @@ class SkyboxRenderer {
     __publicField(this, "scratchInv", new Float32Array(16));
     __publicField(this, "cubeTexture", null);
     __publicField(this, "cubeBindGroup", null);
+    __publicField(this, "uniformDirty", false);
     this.device = device;
     this.format = format;
     this.depthFormat = depthFormat;
@@ -2214,7 +2216,7 @@ class SkyboxRenderer {
       dimension: "2d",
       size: [width, height, 6],
       format: "rgba8unorm",
-      usage: GPUTextureUsage.TEXTURE_BINDING | GPUTextureUsage.COPY_DST
+      usage: GPUTextureUsage.TEXTURE_BINDING | GPUTextureUsage.COPY_DST | GPUTextureUsage.RENDER_ATTACHMENT
     });
     for (let layer = 0; layer < 6; layer++) {
       this.device.queue.copyExternalImageToTexture(
@@ -2236,19 +2238,28 @@ class SkyboxRenderer {
     this.cubeTexture = tex;
     this.cubeBindGroup = bindGroup;
   }
-  render(pass, viewMatrix, projectionMatrix) {
-    if (!this.isActive || !this.cubeBindGroup) {
-      return;
-    }
+  /**
+   * Must be called BEFORE beginFrame() to write uniform data outside the render pass.
+   */
+  prepareFrame(viewMatrix, projectionMatrix) {
+    if (!this.isActive) return;
     this.scratchViewNoTrans.set(viewMatrix);
     this.scratchViewNoTrans[12] = 0;
     this.scratchViewNoTrans[13] = 0;
     this.scratchViewNoTrans[14] = 0;
     SkyboxRenderer.multiplyMat4(this.scratchVp, projectionMatrix, this.scratchViewNoTrans);
     if (!SkyboxRenderer.invertMat4(this.scratchInv, this.scratchVp)) {
+      this.uniformDirty = false;
       return;
     }
     this.device.queue.writeBuffer(this.uniformBuffer, 0, this.scratchInv);
+    this.uniformDirty = true;
+  }
+  /**
+   * Draw the skybox into the given render pass. Call prepareFrame() first.
+   */
+  draw(pass) {
+    if (!this.uniformDirty || !this.cubeBindGroup) return;
     pass.setPipeline(this.pipeline);
     pass.setBindGroup(0, this.cubeBindGroup);
     pass.draw(3);
@@ -2259,6 +2270,7 @@ class SkyboxRenderer {
       this.cubeTexture = null;
     }
     this.cubeBindGroup = null;
+    this.uniformDirty = false;
   }
   destroy() {
     this.clear();
@@ -18906,14 +18918,17 @@ class App {
     }
   }
   render() {
-    var _a2;
+    var _a2, _b2;
     this.camera.setAspect(this.renderer.getAspectRatio());
     this.controls.update();
     this.updateAdaptivePerformance();
     this.hotspotManager.updateBillboards();
-    const pass = this.renderer.beginFrame();
     if ((_a2 = this.skyboxRenderer) == null ? void 0 : _a2.isActive) {
-      this.skyboxRenderer.render(pass, this.camera.viewMatrix, this.camera.projectionMatrix);
+      this.skyboxRenderer.prepareFrame(this.camera.viewMatrix, this.camera.projectionMatrix);
+    }
+    const pass = this.renderer.beginFrame();
+    if ((_b2 = this.skyboxRenderer) == null ? void 0 : _b2.isActive) {
+      this.skyboxRenderer.draw(pass);
     }
     const gsRenderer = this.sceneManager.getGSRenderer();
     if (gsRenderer) {