ugly-game 0.5.17 → 0.5.18

package/dist/assets/gpuSkin.js

@@ -21,10 +21,12 @@ fn rot(m: mat4x4f, v: vec3f) -> vec3f { return mat3x3f(m[0].xyz, m[1].xyz, m[2].
   deformed[i]=vec4f(a.xyz,1.0); defN[i]=vec4f(normalize(b),0.0);
 }`;
 const DRAW = /* wgsl */ `
-struct U { mvp: mat4x4<f32>, sun: vec4<f32>, sunCol: vec4<f32>, amb: vec4<f32>, cam: vec4<f32>, fog: vec4<f32> };
+struct U { mvp: mat4x4<f32>, sun: vec4<f32>, sunCol: vec4<f32>, amb: vec4<f32>, cam: vec4<f32>, fog: vec4<f32>, model: mat4x4<f32> };
 @group(0) @binding(0) var<uniform> u: U;
 struct VOut { @builtin(position) pos: vec4<f32>, @location(0) world: vec3<f32>, @location(1) col: vec3<f32>, @location(2) n: vec3<f32> };
-@vertex fn vs(@location(0) p: vec3<f32>, @location(1) c: vec3<f32>, @location(2) nrm: vec3<f32>) -> VOut { var o: VOut; o.pos=u.mvp*vec4(p,1.0); o.world=p; o.col=c; o.n=nrm; return o; }
+// o.world must be the WORLD position (model·p), not the local deformed p — else the fog distance is computed
+// against the world-space camera and blows up on a planet surface (huge coords), washing creatures into the fog.
+@vertex fn vs(@location(0) p: vec3<f32>, @location(1) c: vec3<f32>, @location(2) nrm: vec3<f32>) -> VOut { var o: VOut; o.pos=u.mvp*vec4(p,1.0); o.world=(u.model*vec4(p,1.0)).xyz; o.col=c; o.n=nrm; return o; }
 @fragment fn fs(i: VOut) -> @location(0) vec4<f32> {
   let d = clamp(dot(normalize(i.n), -normalize(u.sun.xyz)), 0.0, 1.0);
   let lit = i.col * (u.amb.xyz + d * u.sunCol.xyz);
@@ -93,7 +95,7 @@ export class GpuSkinRenderer {
                     { binding: 3, resource: { buffer: palB } }, { binding: 4, resource: { buffer: defB } }, { binding: 5, resource: { buffer: pB } },
                     { binding: 6, resource: { buffer: restNB } }, { binding: 7, resource: { buffer: defNB } }
                 ] });
-            const uBuf = dev.createBuffer({ size: 96 + 16 * 5, usage: U.UNIFORM | U.COPY_DST });
+            const uBuf = dev.createBuffer({ size: 96 + 16 * 7, usage: U.UNIFORM | U.COPY_DST });
             const uBG = dev.createBindGroup({ layout: this.drawPipe.getBindGroupLayout(0), entries: [{ binding: 0, resource: { buffer: uBuf } }] });
             return { defB, defNB, colB, idxB, idxCount: c.indices.length, skinBG, uBuf, uBG, palB, n, model: c.model };
         });
@@ -109,13 +111,14 @@ export class GpuSkinRenderer {
         }
         cp.end();
         for (const p of this.packed) {
-            const u = new Float32Array(24 + 20);
+            const u = new Float32Array(24 + 28);
             u.set(mul16(camVP, p.model), 0);
             u.set([sunDir[0], sunDir[1], sunDir[2], 0], 16);
             u.set([sunCol[0], sunCol[1], sunCol[2], 0], 20);
             u.set([amb[0], amb[1], amb[2], 0], 24);
             u.set([camPos[0], camPos[1], camPos[2], 0], 28);
             u.set([fog[0], fog[1], fog[2], fogDensity], 32);
+            u.set(p.model, 36); // world model matrix (for correct fog distance in the vs)
             this.device.queue.writeBuffer(p.uBuf, 0, u);
         }
         const rp = enc.beginRenderPass({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ugly-game",
-  "version": "0.5.17",
+  "version": "0.5.18",
   "type": "module",
   "exports": {
     ".": {