@deck.gl/geo-layers 9.4.0-alpha.2 → 9.4.0-beta.1

package/dist/mesh-layer/mesh-layer-uniforms.d.ts

@@ -5,6 +5,7 @@ export declare const meshUniforms: {
     readonly name: "mesh";
     readonly vs: "layout(std140) uniform meshUniforms {\n  bool pickFeatureIds;\n} mesh;\n";
     readonly fs: "layout(std140) uniform meshUniforms {\n  bool pickFeatureIds;\n} mesh;\n";
+    readonly source: "struct MeshUniforms {\n  pickFeatureIds: f32,\n};\n\n@group(0) @binding(auto) var<uniform> mesh: MeshUniforms;\n";
     readonly uniformTypes: {
         readonly pickFeatureIds: "f32";
     };

package/dist/mesh-layer/mesh-layer-uniforms.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"mesh-layer-uniforms.d.ts","sourceRoot":"","sources":["../../src/mesh-layer/mesh-layer-uniforms.ts"],"names":[],"mappings":"AAYA,MAAM,MAAM,SAAS,GAAG;IACtB,cAAc,EAAE,OAAO,CAAC;CACzB,CAAC;AAEF,eAAO,MAAM,YAAY;;;;;;;CAOmB,CAAC"}
+{"version":3,"file":"mesh-layer-uniforms.d.ts","sourceRoot":"","sources":["../../src/mesh-layer/mesh-layer-uniforms.ts"],"names":[],"mappings":"AAoBA,MAAM,MAAM,SAAS,GAAG;IACtB,cAAc,EAAE,OAAO,CAAC;CACzB,CAAC;AAEF,eAAO,MAAM,YAAY;;;;;;;;CAQmB,CAAC"}

package/dist/mesh-layer/mesh-layer-uniforms.js

@@ -6,10 +6,18 @@ layout(std140) uniform meshUniforms {
   bool pickFeatureIds;
 } mesh;
 `;
+const source = /* wgsl */ `\
+struct MeshUniforms {
+  pickFeatureIds: f32,
+};
+
+@group(0) @binding(auto) var<uniform> mesh: MeshUniforms;
+`;
 export const meshUniforms = {
     name: 'mesh',
     vs: uniformBlock,
     fs: uniformBlock,
+    source,
     uniformTypes: {
         pickFeatureIds: 'f32'
     }

package/dist/mesh-layer/mesh-layer-uniforms.js.map

@@ -1 +1 @@
-{"version":3,"file":"mesh-layer-uniforms.js","sourceRoot":"","sources":["../../src/mesh-layer/mesh-layer-uniforms.ts"],"names":[],"mappings":"AAAA,UAAU;AACV,+BAA+B;AAC/B,oCAAoC;AAIpC,MAAM,YAAY,GAAG;;;;CAIpB,CAAC;AAMF,MAAM,CAAC,MAAM,YAAY,GAAG;IAC1B,IAAI,EAAE,MAAM;IACZ,EAAE,EAAE,YAAY;IAChB,EAAE,EAAE,YAAY;IAChB,YAAY,EAAE;QACZ,cAAc,EAAE,KAAK;KACtB;CACyC,CAAC"}
+{"version":3,"file":"mesh-layer-uniforms.js","sourceRoot":"","sources":["../../src/mesh-layer/mesh-layer-uniforms.ts"],"names":[],"mappings":"AAAA,UAAU;AACV,+BAA+B;AAC/B,oCAAoC;AAIpC,MAAM,YAAY,GAAG;;;;CAIpB,CAAC;AAEF,MAAM,MAAM,GAAG,UAAU,CAAC;;;;;;CAMzB,CAAC;AAMF,MAAM,CAAC,MAAM,YAAY,GAAG;IAC1B,IAAI,EAAE,MAAM;IACZ,EAAE,EAAE,YAAY;IAChB,EAAE,EAAE,YAAY;IAChB,MAAM;IACN,YAAY,EAAE;QACZ,cAAc,EAAE,KAAK;KACtB;CACyC,CAAC"}

package/dist/mesh-layer/mesh-layer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"mesh-layer.d.ts","sourceRoot":"","sources":["../../src/mesh-layer/mesh-layer.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAC,YAAY,EAAC,MAAM,eAAe,CAAC;AAChD,OAAO,EAAmB,iBAAiB,EAAC,MAAM,eAAe,CAAC;AAElE,OAAO,EAAC,KAAK,EAAC,MAAM,iBAAiB,CAAC;AACtC,OAAO,KAAK,EAAC,aAAa,EAAE,cAAc,EAAC,MAAM,oBAAoB,CAAC;AACtE,OAAO,KAAK,EAAC,gBAAgB,EAAE,YAAY,EAAE,YAAY,EAAC,MAAM,eAAe,CAAC;AAChF,OAAO,EAAC,eAAe,EAAE,oBAAoB,EAAC,MAAM,sBAAsB,CAAC;AAM3E,MAAM,MAAM,IAAI,GAAG;IACjB,UAAU,EAAE,cAAc,CAAC;IAC3B,OAAO,CAAC,EAAE,aAAa,CAAC;CACzB,CAAC;AAoBF,6CAA6C;AAC7C,MAAM,MAAM,cAAc,CAAC,KAAK,GAAG,OAAO,IAAI,eAAe,GAAG,oBAAoB,CAAC,KAAK,CAAC,CAAC;AAE5F,qCAAqC;AACrC,KAAK,eAAe,GAAG;IACrB;;OAEG;IACH,WAAW,CAAC,EAAE,GAAG,CAAC;IAElB;;OAEG;IACH,UAAU,CAAC,EAAE,YAAY,GAAG,IAAI,CAAC;CAClC,CAAC;AAEF,MAAM,CAAC,OAAO,OAAO,SAAS,CAAC,KAAK,GAAG,GAAG,EAAE,UAAU,SAAS,EAAE,GAAG,EAAE,CAAE,SAAQ,eAAe,CAC7F,KAAK,EACL,QAAQ,CAAC,eAAe,CAAC,GAAG,UAAU,CACvC;IACC,MAAM,CAAC,SAAS,SAAe;IAC/B,MAAM,CAAC,YAAY,wCAAgB;IAEnC,UAAU;IAOV,eAAe;IAoBf,WAAW,CAAC,MAAM,EAAE,gBAAgB,CAAC,IAAI,CAAC;IAS1C,IAAI,CAAC,IAAI,KAAA;IAoBT,SAAS,CAAC,QAAQ,CAAC,IAAI,EAAE,IAAI,GAAG,KAAK;IAwBrC,yBAAyB,CAAC,QAAQ,KAAA;IAuBlC,aAAa,CAAC,QAAQ,KAAA,EAAE,IAAI,EAAE,IAAI,GAAG,iBAAiB;IAiBtD,iCAAiC,CAAC,SAAS,KAAA;IAM3C,aAAa,CAAC,OAAO,EAAE,YAAY;CAKpC"}
+{"version":3,"file":"mesh-layer.d.ts","sourceRoot":"","sources":["../../src/mesh-layer/mesh-layer.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAC,YAAY,EAAC,MAAM,eAAe,CAAC;AAChD,OAAO,EAAmB,iBAAiB,EAAC,MAAM,eAAe,CAAC;AAClE,OAAO,EAAC,KAAK,EAAC,MAAM,iBAAiB,CAAC;AACtC,OAAO,KAAK,EAAC,aAAa,EAAE,cAAc,EAAC,MAAM,oBAAoB,CAAC;AACtE,OAAO,KAAK,EAAC,gBAAgB,EAAE,YAAY,EAAE,YAAY,EAAC,MAAM,eAAe,CAAC;AAChF,OAAO,EAAC,eAAe,EAAE,oBAAoB,EAAC,MAAM,sBAAsB,CAAC;AAQ3E,MAAM,MAAM,IAAI,GAAG;IACjB,UAAU,EAAE,cAAc,CAAC;IAC3B,OAAO,CAAC,EAAE,aAAa,CAAC;CACzB,CAAC;AAoBF,6CAA6C;AAC7C,MAAM,MAAM,cAAc,CAAC,KAAK,GAAG,OAAO,IAAI,eAAe,GAAG,oBAAoB,CAAC,KAAK,CAAC,CAAC;AAE5F,qCAAqC;AACrC,KAAK,eAAe,GAAG;IACrB;;OAEG;IACH,WAAW,CAAC,EAAE,GAAG,CAAC;IAElB;;OAEG;IACH,UAAU,CAAC,EAAE,YAAY,GAAG,IAAI,CAAC;CAClC,CAAC;AAEF,MAAM,CAAC,OAAO,OAAO,SAAS,CAAC,KAAK,GAAG,GAAG,EAAE,UAAU,SAAS,EAAE,GAAG,EAAE,CAAE,SAAQ,eAAe,CAC7F,KAAK,EACL,QAAQ,CAAC,eAAe,CAAC,GAAG,UAAU,CACvC;IACC,MAAM,CAAC,SAAS,SAAe;IAC/B,MAAM,CAAC,YAAY,wCAAgB;IAEnC,UAAU;IAWV,eAAe;IAoBf,WAAW,CAAC,MAAM,EAAE,gBAAgB,CAAC,IAAI,CAAC;IAS1C,IAAI,CAAC,IAAI,KAAA;IAoBT,SAAS,CAAC,QAAQ,CAAC,IAAI,EAAE,IAAI,GAAG,KAAK;IAyBrC,yBAAyB,CAAC,QAAQ,KAAA;IA0BlC,aAAa,CAAC,QAAQ,KAAA,EAAE,IAAI,EAAE,IAAI,GAAG,iBAAiB;IAiBtD,iCAAiC,CAAC,SAAS,KAAA;IAM3C,aAAa,CAAC,OAAO,EAAE,YAAY;CAKpC"}

package/dist/mesh-layer/mesh-layer.js

@@ -2,12 +2,13 @@
 // SPDX-License-Identifier: MIT
 // Copyright (c) vis.gl contributors
 import { parsePBRMaterial } from '@luma.gl/gltf';
-import { pbrMaterial } from '@luma.gl/shadertools';
 import { Model } from '@luma.gl/engine';
 import { SimpleMeshLayer } from '@deck.gl/mesh-layers';
 import { meshUniforms } from "./mesh-layer-uniforms.js";
+import { meshPbrMaterial } from "./mesh-pbr-material.js";
 import vs from "./mesh-layer-vertex.glsl.js";
 import fs from "./mesh-layer-fragment.glsl.js";
+import source from "./mesh-layer.wgsl.js";
 function validateGeometryAttributes(attributes) {
     const positionAttribute = attributes.positions || attributes.POSITION;
     const vertexCount = positionAttribute.value.length / positionAttribute.size;
@@ -27,9 +28,13 @@ const defaultProps = {
 class MeshLayer extends SimpleMeshLayer {
     getShaders() {
         const shaders = super.getShaders();
-        const modules = shaders.modules;
-        modules.push(pbrMaterial, meshUniforms);
-        return { ...shaders, vs, fs };
+        return {
+            ...shaders,
+            vs,
+            fs,
+            source,
+            modules: [...shaders.modules, meshPbrMaterial, meshUniforms]
+        };
     }
     initializeState() {
         const { featureIds } = this.props;
@@ -89,7 +94,8 @@ class MeshLayer extends SimpleMeshLayer {
             defines: {
                 ...shaders.defines,
                 ...parsedPBRMaterial?.defines,
-                HAS_UV_REGIONS: mesh.attributes.uvRegions ? 1 : 0
+                HAS_UV_REGIONS: mesh.attributes.uvRegions ? 1 : 0,
+                HAS_FEATURE_IDS: this.props.featureIds ? 1 : 0
             },
             parameters: parsedPBRMaterial?.parameters,
             isInstanced: true
@@ -105,8 +111,11 @@ class MeshLayer extends SimpleMeshLayer {
             this.setState({ parsedPBRMaterial });
             const { pbr_baseColorSampler } = parsedPBRMaterial.bindings;
             const { emptyTexture } = this.state;
+            const meshTexture = pbr_baseColorSampler || emptyTexture;
             const simpleMeshProps = {
-                sampler: pbr_baseColorSampler || emptyTexture,
+                ...(this.context.device.type === 'webgpu'
+                    ? { simpleMeshTexture: meshTexture }
+                    : { sampler: meshTexture }),
                 hasTexture: Boolean(pbr_baseColorSampler)
             };
             // eslint-disable-next-line @typescript-eslint/no-unused-vars

package/dist/mesh-layer/mesh-layer.js.map

@@ -1 +1 @@
-{"version":3,"file":"mesh-layer.js","sourceRoot":"","sources":["../../src/mesh-layer/mesh-layer.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"mesh-layer.js","sourceRoot":"","sources":["../../src/mesh-layer/mesh-layer.ts"],"names":[],"mappings":"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"}

package/dist/mesh-layer/mesh-layer.wgsl.d.ts

@@ -0,0 +1,3 @@
+declare const _default: "struct VertexInputs {\n  @location(0) positions: vec3<f32>,\n#ifdef HAS_NORMALS\n  @location(1) normals: vec3<f32>,\n#endif\n  @location(2) colors: vec4<f32>,\n#ifdef HAS_UV\n  @location(3) texCoords: vec2<f32>,\n#endif\n#ifdef HAS_UV_REGIONS\n  @location(4) uvRegions: vec4<f32>,\n#endif\n#ifdef HAS_FEATURE_IDS\n  @location(5) rowIndexes: u32,\n#endif\n  @location(6) instanceColors: vec4<f32>,\n  @location(7) instanceModelMatrixCol0: vec3<f32>,\n  @location(8) instanceModelMatrixCol1: vec3<f32>,\n  @location(9) instanceModelMatrixCol2: vec3<f32>,\n};\n\nstruct FragmentInputs {\n  @builtin(position) position: vec4<f32>,\n  @location(0) color: vec4<f32>,\n  @location(1) texCoord: vec2<f32>,\n  @location(2) pbrPosition: vec3<f32>,\n  @location(3) pbrNormal: vec3<f32>,\n  @location(4) pickingColor: vec3<f32>,\n};\n\nfn applyUVRegion(uv: vec2<f32>, uvRegion: vec4<f32>) -> vec2<f32> {\n#ifdef HAS_UV_REGIONS\n  // https://github.com/Esri/i3s-spec/blob/master/docs/1.7/geometryUVRegion.cmn.md\n  return fract(uv) * (uvRegion.zw - uvRegion.xy) + uvRegion.xy;\n#else\n  return uv;\n#endif\n}\n\n@vertex\nfn vertexMain(\n  inputs: VertexInputs,\n  @builtin(instance_index) instanceIndex: u32\n) -> FragmentInputs {\n  var outputs: FragmentInputs;\n  var texCoord = vec2<f32>(0.0);\n  var normal = vec3<f32>(0.0, 0.0, 1.0);\n  var uvRegion = vec4<f32>(0.0);\n\n#ifdef HAS_UV\n  texCoord = inputs.texCoords;\n#endif\n#ifdef HAS_NORMALS\n  normal = inputs.normals;\n#endif\n#ifdef HAS_UV_REGIONS\n  uvRegion = inputs.uvRegions;\n#endif\n\n  texCoord = applyUVRegion(texCoord, uvRegion);\n  geometry.uv = texCoord;\n#ifdef HAS_FEATURE_IDS\n  geometry.pickingColor = picking_getPickingColorFromIndex(inputs.rowIndexes);\n#else\n  geometry.pickingColor = picking_getPickingColorFromIndex(instanceIndex);\n#endif\n\n  let instanceModelMatrix = mat3x3<f32>(\n    inputs.instanceModelMatrixCol0,\n    inputs.instanceModelMatrixCol1,\n    inputs.instanceModelMatrixCol2\n  );\n  let commonPosition = vec4<f32>(project_position_vec3_f32(inputs.positions), 1.0);\n\n  geometry.position = commonPosition;\n  geometry.normal = project_normal(instanceModelMatrix * normal);\n\n  outputs.position = project_common_position_to_clipspace(commonPosition);\n  outputs.color = vec4<f32>(\n    inputs.colors.rgb * inputs.instanceColors.rgb,\n    inputs.instanceColors.a\n  );\n  outputs.texCoord = texCoord;\n  outputs.pbrPosition = commonPosition.xyz;\n  outputs.pbrNormal = geometry.normal;\n  outputs.pickingColor = geometry.pickingColor;\n  return outputs;\n}\n\n@fragment\nfn fragmentMain(inputs: FragmentInputs) -> @location(0) vec4<f32> {\n  fragmentGeometry.uv = inputs.texCoord;\n\n  if (picking.isActive > 0.5) {\n    if (!picking_isColorValid(inputs.pickingColor)) {\n      discard;\n    }\n    return vec4<f32>(inputs.pickingColor, 1.0);\n  }\n\n  fragmentInputs.pbr_vPosition = inputs.pbrPosition;\n  fragmentInputs.pbr_vUV0 = inputs.texCoord;\n  fragmentInputs.pbr_vUV1 = vec2<f32>(0.0);\n  fragmentInputs.pbr_vNormal = inputs.pbrNormal;\n\n  var color = inputs.color * pbr_filterColor(vec4<f32>(0.0));\n  color.a *= layer.opacity;\n\n  if (picking.isHighlightActive > 0.5) {\n    let highlightedObjectColor = picking_normalizeColor(picking.highlightedObjectColor);\n    if (picking_isColorZero(abs(inputs.pickingColor - highlightedObjectColor))) {\n      let highlightAlpha = picking.highlightColor.a;\n      let blendedAlpha = highlightAlpha + color.a * (1.0 - highlightAlpha);\n      if (blendedAlpha > 0.0) {\n        color = vec4<f32>(\n          mix(color.rgb, picking.highlightColor.rgb, highlightAlpha / blendedAlpha),\n          blendedAlpha\n        );\n      }\n    }\n  }\n\n  return deckgl_premultiplied_alpha(color);\n}\n";
+export default _default;
+//# sourceMappingURL=mesh-layer.wgsl.d.ts.map

package/dist/mesh-layer/mesh-layer.wgsl.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"mesh-layer.wgsl.d.ts","sourceRoot":"","sources":["../../src/mesh-layer/mesh-layer.wgsl.ts"],"names":[],"mappings":";AAIA,wBA6HE"}

package/dist/mesh-layer/mesh-layer.wgsl.js

@@ -0,0 +1,130 @@
+// deck.gl
+// SPDX-License-Identifier: MIT
+// Copyright (c) vis.gl contributors
+export default /* wgsl */ `\
+struct VertexInputs {
+  @location(0) positions: vec3<f32>,
+#ifdef HAS_NORMALS
+  @location(1) normals: vec3<f32>,
+#endif
+  @location(2) colors: vec4<f32>,
+#ifdef HAS_UV
+  @location(3) texCoords: vec2<f32>,
+#endif
+#ifdef HAS_UV_REGIONS
+  @location(4) uvRegions: vec4<f32>,
+#endif
+#ifdef HAS_FEATURE_IDS
+  @location(5) rowIndexes: u32,
+#endif
+  @location(6) instanceColors: vec4<f32>,
+  @location(7) instanceModelMatrixCol0: vec3<f32>,
+  @location(8) instanceModelMatrixCol1: vec3<f32>,
+  @location(9) instanceModelMatrixCol2: vec3<f32>,
+};
+
+struct FragmentInputs {
+  @builtin(position) position: vec4<f32>,
+  @location(0) color: vec4<f32>,
+  @location(1) texCoord: vec2<f32>,
+  @location(2) pbrPosition: vec3<f32>,
+  @location(3) pbrNormal: vec3<f32>,
+  @location(4) pickingColor: vec3<f32>,
+};
+
+fn applyUVRegion(uv: vec2<f32>, uvRegion: vec4<f32>) -> vec2<f32> {
+#ifdef HAS_UV_REGIONS
+  // https://github.com/Esri/i3s-spec/blob/master/docs/1.7/geometryUVRegion.cmn.md
+  return fract(uv) * (uvRegion.zw - uvRegion.xy) + uvRegion.xy;
+#else
+  return uv;
+#endif
+}
+
+@vertex
+fn vertexMain(
+  inputs: VertexInputs,
+  @builtin(instance_index) instanceIndex: u32
+) -> FragmentInputs {
+  var outputs: FragmentInputs;
+  var texCoord = vec2<f32>(0.0);
+  var normal = vec3<f32>(0.0, 0.0, 1.0);
+  var uvRegion = vec4<f32>(0.0);
+
+#ifdef HAS_UV
+  texCoord = inputs.texCoords;
+#endif
+#ifdef HAS_NORMALS
+  normal = inputs.normals;
+#endif
+#ifdef HAS_UV_REGIONS
+  uvRegion = inputs.uvRegions;
+#endif
+
+  texCoord = applyUVRegion(texCoord, uvRegion);
+  geometry.uv = texCoord;
+#ifdef HAS_FEATURE_IDS
+  geometry.pickingColor = picking_getPickingColorFromIndex(inputs.rowIndexes);
+#else
+  geometry.pickingColor = picking_getPickingColorFromIndex(instanceIndex);
+#endif
+
+  let instanceModelMatrix = mat3x3<f32>(
+    inputs.instanceModelMatrixCol0,
+    inputs.instanceModelMatrixCol1,
+    inputs.instanceModelMatrixCol2
+  );
+  let commonPosition = vec4<f32>(project_position_vec3_f32(inputs.positions), 1.0);
+
+  geometry.position = commonPosition;
+  geometry.normal = project_normal(instanceModelMatrix * normal);
+
+  outputs.position = project_common_position_to_clipspace(commonPosition);
+  outputs.color = vec4<f32>(
+    inputs.colors.rgb * inputs.instanceColors.rgb,
+    inputs.instanceColors.a
+  );
+  outputs.texCoord = texCoord;
+  outputs.pbrPosition = commonPosition.xyz;
+  outputs.pbrNormal = geometry.normal;
+  outputs.pickingColor = geometry.pickingColor;
+  return outputs;
+}
+
+@fragment
+fn fragmentMain(inputs: FragmentInputs) -> @location(0) vec4<f32> {
+  fragmentGeometry.uv = inputs.texCoord;
+
+  if (picking.isActive > 0.5) {
+    if (!picking_isColorValid(inputs.pickingColor)) {
+      discard;
+    }
+    return vec4<f32>(inputs.pickingColor, 1.0);
+  }
+
+  fragmentInputs.pbr_vPosition = inputs.pbrPosition;
+  fragmentInputs.pbr_vUV0 = inputs.texCoord;
+  fragmentInputs.pbr_vUV1 = vec2<f32>(0.0);
+  fragmentInputs.pbr_vNormal = inputs.pbrNormal;
+
+  var color = inputs.color * pbr_filterColor(vec4<f32>(0.0));
+  color.a *= layer.opacity;
+
+  if (picking.isHighlightActive > 0.5) {
+    let highlightedObjectColor = picking_normalizeColor(picking.highlightedObjectColor);
+    if (picking_isColorZero(abs(inputs.pickingColor - highlightedObjectColor))) {
+      let highlightAlpha = picking.highlightColor.a;
+      let blendedAlpha = highlightAlpha + color.a * (1.0 - highlightAlpha);
+      if (blendedAlpha > 0.0) {
+        color = vec4<f32>(
+          mix(color.rgb, picking.highlightColor.rgb, highlightAlpha / blendedAlpha),
+          blendedAlpha
+        );
+      }
+    }
+  }
+
+  return deckgl_premultiplied_alpha(color);
+}
+`;
+//# sourceMappingURL=mesh-layer.wgsl.js.map

package/dist/mesh-layer/mesh-layer.wgsl.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"mesh-layer.wgsl.js","sourceRoot":"","sources":["../../src/mesh-layer/mesh-layer.wgsl.ts"],"names":[],"mappings":"AAAA,UAAU;AACV,+BAA+B;AAC/B,oCAAoC;AAEpC,eAAe,UAAU,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CA6HzB,CAAC"}