@ifc-lite/renderer 1.28.3 → 1.28.5

package/dist/shaders/main.wgsl.js.map

@@ -1 +1 @@
-{"version":3,"file":"main.wgsl.js","sourceRoot":"","sources":["../../src/shaders/main.wgsl.ts"],"names":[],"mappings":"AAAA;;+DAE+D;AAE/D;;;;GAIG;AACH,MAAM,CAAC,MAAM,gBAAgB,GAAG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;OA8XzB,CAAC"}
+{"version":3,"file":"main.wgsl.js","sourceRoot":"","sources":["../../src/shaders/main.wgsl.ts"],"names":[],"mappings":"AAAA;;+DAE+D;AAE/D;;;;GAIG;AACH,MAAM,CAAC,MAAM,gBAAgB,GAAG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;OAodzB,CAAC"}

package/dist/shaders/textured.wgsl.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"textured.wgsl.d.ts","sourceRoot":"","sources":["../../src/shaders/textured.wgsl.ts"],"names":[],"mappings":"AA4FA,eAAO,MAAM,oBAAoB,QAAyB,CAAC"}
+{"version":3,"file":"textured.wgsl.d.ts","sourceRoot":"","sources":["../../src/shaders/textured.wgsl.ts"],"names":[],"mappings":"AAuGA,eAAO,MAAM,oBAAoB,QAAyB,CAAC"}

package/dist/shaders/textured.wgsl.js

@@ -36,10 +36,17 @@ function deriveTexturedShader() {
     s = replaceOnce(s, '@binding(0) @group(0) var<uniform> uniforms: Uniforms;', '@binding(0) @group(0) var<uniform> uniforms: Uniforms;\n' +
         '        @binding(1) @group(0) var albedoTex: texture_2d<f32>;\n' +
         '        @binding(2) @group(0) var albedoSampler: sampler;', 'uniform binding');
-    // 2. UV vertex attribute on VertexInput.
-    s = replaceOnce(s, '          @location(2) entityId: u32,\n        }\n\n        struct VertexOutput {', '          @location(2) entityId: u32,\n          @location(3) uv: vec2<f32>,\n        }\n\n        struct VertexOutput {', 'VertexInput uv');
-    // 3. UV interpolant on VertexOutput.
-    s = replaceOnce(s, '          @location(3) viewPos: vec3<f32>,  // For edge detection\n        }', '          @location(3) viewPos: vec3<f32>,  // For edge detection\n          @location(4) uv: vec2<f32>,\n        }', 'VertexOutput uv');
+    // 2. UV vertex attribute on VertexInput. Placed at @location(10), NOT 3-9:
+    //    main.wgsl also declares vs_instanced + InstanceInput at vertex-input
+    //    @location 3..9 (mat4 3-6, entityId 7, colour 8, selected flag 9), which
+    //    this derived module still contains (unused by the textured pipeline). A uv
+    //    in 3..9 would collide with InstanceInput in vs_instanced's input interface
+    //    = a shader-creation error. @10 is clear of both the per-vertex inputs
+    //    (0..2) and the per-instance inputs (3..9). The textured pipeline's slot-0
+    //    uv attribute uses shaderLocation 10 to match.
+    s = replaceOnce(s, '          @location(2) entityId: u32,\n        }\n\n        struct VertexOutput {', '          @location(2) entityId: u32,\n          @location(10) uv: vec2<f32>,\n        }\n\n        struct VertexOutput {', 'VertexInput uv');
+    // 3. UV interpolant on VertexOutput (after the @location(5) instSelected varying).
+    s = replaceOnce(s, '          @location(5) @interpolate(flat) instSelected: u32,\n        }', '          @location(5) @interpolate(flat) instSelected: u32,\n          @location(6) uv: vec2<f32>,\n        }', 'VertexOutput uv');
     // 4. Pass UV through the vertex shader.
     s = replaceOnce(s, '          output.entityId = input.entityId;', '          output.entityId = input.entityId;\n          output.uv = input.uv;', 'vs_main uv passthrough');
     // 5. Sample the texture; multiply by the authored tint (white = passthrough).
@@ -48,9 +55,13 @@ function deriveTexturedShader() {
     //    so without this RGBA textures with transparent regions would render
     //    fully opaque. (Partial translucency would need a transparent textured
     //    pipeline — out of scope for the cutout case.)
-    s = replaceOnce(s, 'var baseColor = uniforms.baseColor.rgb;', 'let albedoTexel = textureSample(albedoTex, albedoSampler, input.uv);\n' +
+    // main.wgsl now reads the per-draw albedo from the `input.color` varying
+    // (vs_main writes uniforms.baseColor into it). For textured meshes input.color
+    // == uniforms.baseColor (drawn via vs_main, never instanced), so multiplying
+    // the texel by input.color keeps the authored-tint semantics.
+    s = replaceOnce(s, 'var baseColor = input.color.rgb;', 'let albedoTexel = textureSample(albedoTex, albedoSampler, input.uv);\n' +
         '          if (albedoTexel.a < 0.004) { discard; }\n' +
-        '          var baseColor = albedoTexel.rgb * uniforms.baseColor.rgb;', 'albedo sample');
+        '          var baseColor = albedoTexel.rgb * input.color.rgb;', 'albedo sample');
     return s;
 }
 export const texturedShaderSource = deriveTexturedShader();

package/dist/shaders/textured.wgsl.js.map

@@ -1 +1 @@
-{"version":3,"file":"textured.wgsl.js","sourceRoot":"","sources":["../../src/shaders/textured.wgsl.ts"],"names":[],"mappings":"AAAA;;+DAE+D;AAE/D;;;;;;;;;;;;;;;;;GAiBG;AACH,OAAO,EAAE,gBAAgB,EAAE,MAAM,gBAAgB,CAAC;AAElD,SAAS,WAAW,CAAC,GAAW,EAAE,IAAY,EAAE,IAAY,EAAE,KAAa;IACzE,MAAM,GAAG,GAAG,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;IAC9B,IAAI,GAAG,KAAK,CAAC,CAAC,EAAE,CAAC;QACf,MAAM,IAAI,KAAK,CACb,0BAA0B,KAAK,4EAA4E,CAC5G,CAAC;IACJ,CAAC;IACD,IAAI,GAAG,CAAC,OAAO,CAAC,IAAI,EAAE,GAAG,GAAG,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC;QAChD,MAAM,IAAI,KAAK,CAAC,0BAA0B,KAAK,2CAA2C,CAAC,CAAC;IAC9F,CAAC;IACD,OAAO,GAAG,CAAC,KAAK,CAAC,CAAC,EAAE,GAAG,CAAC,GAAG,IAAI,GAAG,GAAG,CAAC,KAAK,CAAC,GAAG,GAAG,IAAI,CAAC,MAAM,CAAC,CAAC;AACjE,CAAC;AAED,SAAS,oBAAoB;IAC3B,IAAI,CAAC,GAAG,gBAAgB,CAAC;IAEzB,uEAAuE;IACvE,CAAC,GAAG,WAAW,CACb,CAAC,EACD,wDAAwD,EACxD,0DAA0D;QACxD,iEAAiE;QACjE,2DAA2D,EAC7D,iBAAiB,CAClB,CAAC;IAEF,yCAAyC;IACzC,CAAC,GAAG,WAAW,CACb,CAAC,EACD,mFAAmF,EACnF,0HAA0H,EAC1H,gBAAgB,CACjB,CAAC;IAEF,qCAAqC;IACrC,CAAC,GAAG,WAAW,CACb,CAAC,EACD,8EAA8E,EAC9E,qHAAqH,EACrH,iBAAiB,CAClB,CAAC;IAEF,wCAAwC;IACxC,CAAC,GAAG,WAAW,CACb,CAAC,EACD,6CAA6C,EAC7C,8EAA8E,EAC9E,wBAAwB,CACzB,CAAC;IAEF,8EAA8E;IAC9E,6EAA6E;IAC7E,+EAA+E;IAC/E,yEAAyE;IACzE,2EAA2E;IAC3E,mDAAmD;IACnD,CAAC,GAAG,WAAW,CACb,CAAC,EACD,yCAAyC,EACzC,wEAAwE;QACtE,qDAAqD;QACrD,qEAAqE,EACvE,eAAe,CAChB,CAAC;IAEF,OAAO,CAAC,CAAC;AACX,CAAC;AAED,MAAM,CAAC,MAAM,oBAAoB,GAAG,oBAAoB,EAAE,CAAC"}
+{"version":3,"file":"textured.wgsl.js","sourceRoot":"","sources":["../../src/shaders/textured.wgsl.ts"],"names":[],"mappings":"AAAA;;+DAE+D;AAE/D;;;;;;;;;;;;;;;;;GAiBG;AACH,OAAO,EAAE,gBAAgB,EAAE,MAAM,gBAAgB,CAAC;AAElD,SAAS,WAAW,CAAC,GAAW,EAAE,IAAY,EAAE,IAAY,EAAE,KAAa;IACzE,MAAM,GAAG,GAAG,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;IAC9B,IAAI,GAAG,KAAK,CAAC,CAAC,EAAE,CAAC;QACf,MAAM,IAAI,KAAK,CACb,0BAA0B,KAAK,4EAA4E,CAC5G,CAAC;IACJ,CAAC;IACD,IAAI,GAAG,CAAC,OAAO,CAAC,IAAI,EAAE,GAAG,GAAG,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC;QAChD,MAAM,IAAI,KAAK,CAAC,0BAA0B,KAAK,2CAA2C,CAAC,CAAC;IAC9F,CAAC;IACD,OAAO,GAAG,CAAC,KAAK,CAAC,CAAC,EAAE,GAAG,CAAC,GAAG,IAAI,GAAG,GAAG,CAAC,KAAK,CAAC,GAAG,GAAG,IAAI,CAAC,MAAM,CAAC,CAAC;AACjE,CAAC;AAED,SAAS,oBAAoB;IAC3B,IAAI,CAAC,GAAG,gBAAgB,CAAC;IAEzB,uEAAuE;IACvE,CAAC,GAAG,WAAW,CACb,CAAC,EACD,wDAAwD,EACxD,0DAA0D;QACxD,iEAAiE;QACjE,2DAA2D,EAC7D,iBAAiB,CAClB,CAAC;IAEF,2EAA2E;IAC3E,0EAA0E;IAC1E,6EAA6E;IAC7E,gFAAgF;IAChF,gFAAgF;IAChF,2EAA2E;IAC3E,+EAA+E;IAC/E,mDAAmD;IACnD,CAAC,GAAG,WAAW,CACb,CAAC,EACD,mFAAmF,EACnF,2HAA2H,EAC3H,gBAAgB,CACjB,CAAC;IAEF,mFAAmF;IACnF,CAAC,GAAG,WAAW,CACb,CAAC,EACD,yEAAyE,EACzE,gHAAgH,EAChH,iBAAiB,CAClB,CAAC;IAEF,wCAAwC;IACxC,CAAC,GAAG,WAAW,CACb,CAAC,EACD,6CAA6C,EAC7C,8EAA8E,EAC9E,wBAAwB,CACzB,CAAC;IAEF,8EAA8E;IAC9E,6EAA6E;IAC7E,+EAA+E;IAC/E,yEAAyE;IACzE,2EAA2E;IAC3E,mDAAmD;IACnD,yEAAyE;IACzE,+EAA+E;IAC/E,6EAA6E;IAC7E,8DAA8D;IAC9D,CAAC,GAAG,WAAW,CACb,CAAC,EACD,kCAAkC,EAClC,wEAAwE;QACtE,qDAAqD;QACrD,8DAA8D,EAChE,eAAe,CAChB,CAAC;IAEF,OAAO,CAAC,CAAC;AACX,CAAC;AAED,MAAM,CAAC,MAAM,oBAAoB,GAAG,oBAAoB,EAAE,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ifc-lite/renderer",
-  "version": "1.28.3",
+  "version": "1.28.5",
   "description": "WebGPU renderer for IFC-Lite",
   "type": "module",
   "main": "./dist/index.js",
@@ -13,7 +13,7 @@
     }
   },
   "dependencies": {
-    "@ifc-lite/geometry": "^2.7.6",
+    "@ifc-lite/geometry": "^2.9.1",
     "@ifc-lite/spatial": "^1.14.9"
   },
   "devDependencies": {