@d5techs/3dgs-lib 1.4.54 → 1.4.55

package/dist/3dgs-lib.js

@@ -2196,7 +2196,7 @@ function float32ToFloat16(val) {
 const CUBE_WGSL = (
   /* wgsl */
   `
-struct Uniforms { col0: vec4<f32>, col1: vec4<f32>, col2: vec4<f32> };
+struct Uniforms { col0: vec4<f32>, col1: vec4<f32>, col2: vec4<f32>, extra: vec4<f32> };
 @group(0) @binding(0) var<uniform> u: Uniforms;
 @group(0) @binding(1) var cubeSampler: sampler;
 @group(0) @binding(2) var cubeTexture: texture_cube<f32>;
@@ -2215,12 +2215,17 @@ 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> };
+struct Uniforms { col0: vec4<f32>, col1: vec4<f32>, col2: vec4<f32>, extra: 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>;
 struct V { @builtin(position) pos: vec4<f32>, @location(0) dir: vec3<f32> };
 const PI: f32 = 3.14159265358979;
+
+fn dirToUv(d: vec3<f32>) -> vec2<f32> {
+    return vec2(atan2(d.z, d.x) / (2.*PI) + .5, 1. - (asin(clamp(d.y,-1.,1.)) / PI + .5));
+}
+
 @vertex fn vs(@builtin(vertex_index) vi: u32) -> V {
     let ps = array<vec2<f32>,3>(vec2(-1.,-1.),vec2(3.,-1.),vec2(-1.,3.));
     var o: V; let p = ps[vi]; o.pos = vec4(p, 0., 1.);
@@ -2228,10 +2233,44 @@ const PI: f32 = 3.14159265358979;
     o.dir = vec3(dot(u.col0.xyz,e), dot(u.col1.xyz,e), dot(u.col2.xyz,e));
     return o;
 }
+
 @fragment fn fs(i: V) -> @location(0) vec4<f32> {
     let d = normalize(i.dir);
-    let uv = vec2(atan2(d.z, d.x) / (2.*PI) + .5, asin(clamp(d.y,-1.,1.)) / PI + .5);
-    let c = textureSample(envTexture, envSampler, vec2(uv.x, 1. - uv.y)).rgb;
+    let camY = u.extra.x;
+    let sphereR = u.extra.y;
+
+    // --- sky UV (always computed) ---
+    let skyUv = dirToUv(d);
+
+    // --- ground projection UV (always computed to satisfy uniform control flow) ---
+    // ray-plane intersection: camera at height camY, plane y=0
+    let dySafe = select(d.y, -0.0001, d.y > -0.0001);
+    let t = -camY / dySafe;
+    let hitX = t * d.x;
+    let hitZ = t * d.z;
+    let hitDist2 = hitX * hitX + hitZ * hitZ;
+    let R2 = sphereR * sphereR;
+    // clamp hit to sphere radius to avoid extreme stretching at edges
+    let needClamp = hitDist2 > R2;
+    let clampScale = select(1.0, sphereR / sqrt(max(hitDist2, 0.0001)), needClamp);
+    let pX = hitX * clampScale;
+    let pZ = hitZ * clampScale;
+    // project back onto sphere: y = -sqrt(R^2 - x^2 - z^2)
+    let projY = -sqrt(max(R2 - pX * pX - pZ * pZ, 0.0));
+    let groundDir = normalize(vec3(pX, projY, pZ));
+    let groundUv = dirToUv(groundDir);
+
+    // --- sample both (unconditional = uniform control flow) ---
+    let skyColor = textureSample(envTexture, envSampler, skyUv).rgb;
+    let groundColor = textureSample(envTexture, envSampler, groundUv).rgb;
+
+    // blend near horizon for smooth transition
+    let blend = smoothstep(0.0, -0.08, d.y);
+    let mixed = mix(skyColor, groundColor, blend);
+    let useGround = d.y < 0.0 && camY > 0.01;
+    let c = select(skyColor, mixed, useGround);
+
+    // Reinhard tone mapping + gamma
     let mapped = c / (c + vec3(1.));
     let gamma = pow(mapped, vec3(1./2.2));
     return vec4(gamma, 1.);
@@ -2242,7 +2281,7 @@ class SkyboxRenderer {
     __publicField(this, "device");
     __publicField(this, "uniformBuffer");
     __publicField(this, "sampler");
-    __publicField(this, "uniformData", new Float32Array(12));
+    __publicField(this, "uniformData", new Float32Array(16));
     __publicField(this, "cubePipeline");
     __publicField(this, "cubeBindGroupLayout");
     __publicField(this, "equirectPipeline");
@@ -2251,6 +2290,8 @@ class SkyboxRenderer {
     __publicField(this, "bindGroup", null);
     __publicField(this, "frameReady", false);
     __publicField(this, "mode", "none");
+    /** Ground projection sphere radius (world units). Larger = ground extends further. */
+    __publicField(this, "groundRadius", 32);
     this.device = device;
     const depthStencil = {
       format: depthFormat,
@@ -2259,7 +2300,7 @@ class SkyboxRenderer {
     };
     this.cubeBindGroupLayout = device.createBindGroupLayout({
       entries: [
-        { binding: 0, visibility: GPUShaderStage.VERTEX, buffer: { type: "uniform" } },
+        { binding: 0, visibility: GPUShaderStage.VERTEX | GPUShaderStage.FRAGMENT, buffer: { type: "uniform" } },
         { binding: 1, visibility: GPUShaderStage.FRAGMENT, sampler: { type: "filtering" } },
         { binding: 2, visibility: GPUShaderStage.FRAGMENT, texture: { sampleType: "float", viewDimension: "cube" } }
       ]
@@ -2273,7 +2314,7 @@ class SkyboxRenderer {
     });
     this.equirectBindGroupLayout = device.createBindGroupLayout({
       entries: [
-        { binding: 0, visibility: GPUShaderStage.VERTEX, buffer: { type: "uniform" } },
+        { binding: 0, visibility: GPUShaderStage.VERTEX | GPUShaderStage.FRAGMENT, buffer: { type: "uniform" } },
         { binding: 1, visibility: GPUShaderStage.FRAGMENT, sampler: { type: "filtering" } },
         { binding: 2, visibility: GPUShaderStage.FRAGMENT, texture: { sampleType: "float", viewDimension: "2d" } }
       ]
@@ -2286,7 +2327,7 @@ class SkyboxRenderer {
       depthStencil
     });
     this.uniformBuffer = device.createBuffer({
-      size: 48,
+      size: 64,
       usage: GPUBufferUsage.UNIFORM | GPUBufferUsage.COPY_DST
     });
     this.sampler = device.createSampler({ magFilter: "linear", minFilter: "linear" });
@@ -2369,7 +2410,7 @@ class SkyboxRenderer {
     this.mode = "equirect";
   }
   // ---- common ----
-  prepareFrame(viewMatrix, projectionMatrix) {
+  prepareFrame(viewMatrix, projectionMatrix, cameraPosition) {
     if (!this.isActive) {
       this.frameReady = false;
       return;
@@ -2387,6 +2428,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;
     this.device.queue.writeBuffer(this.uniformBuffer, 0, ud);
     this.frameReady = true;
   }
@@ -19023,9 +19068,11 @@ 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
+        this.camera.projectionMatrix,
+        [cam[0], cam[1], cam[2]]
       );
     }
     const pass = this.renderer.beginFrame();
@@ -19220,6 +19267,11 @@ class App {
     }
     await this.skyboxRenderer.loadEquirectangular(url);
   }
+  setHdrGroundRadius(radius) {
+    if (this.skyboxRenderer) {
+      this.skyboxRenderer.groundRadius = radius;
+    }
+  }
   clearSkybox() {
     var _a2;
     (_a2 = this.skyboxRenderer) == null ? void 0 : _a2.clear();