@deck.gl/geo-layers 9.0.0-beta.5 → 9.0.0-beta.7

package/dist/mesh-layer/mesh-layer-fragment.glsl.d.ts

@@ -1,3 +1,3 @@
-declare const _default: "#version 300 es\n#define SHADER_NAME simple-mesh-layer-fs\n\nprecision highp float;\n\nuniform bool hasTexture;\nuniform sampler2D sampler;\nuniform bool flatShading;\nuniform float opacity;\n\nin vec2 vTexCoord;\nin vec3 cameraPosition;\nin vec3 normals_commonspace;\nin vec4 position_commonspace;\nin vec4 vColor;\n\nout vec4 fragColor;\n\nvoid main(void) {\n  \n#ifdef MODULE_PBR\n\n  fragColor = vColor * pbr_filterColor(vec4(0));\n  geometry.uv = pbr_vUV;\n  fragColor.a *= opacity;\n\n#else\n\n  geometry.uv = vTexCoord;\n\n  vec3 normal;\n  if (flatShading) {\n\n// NOTE(Tarek): This is necessary because\n// headless.gl reports the extension as\n// available but does not support it in\n// the shader.\n#ifdef DERIVATIVES_AVAILABLE\n    normal = normalize(cross(dFdx(position_commonspace.xyz), dFdy(position_commonspace.xyz)));\n#else\n    normal = vec3(0.0, 0.0, 1.0);\n#endif\n  } else {\n    normal = normals_commonspace;\n  }\n\n  vec4 color = hasTexture ? texture(sampler, vTexCoord) : vColor;\n  vec3 lightColor = lighting_getLightColor(color.rgb, cameraPosition, position_commonspace.xyz, normal);\n  fragColor = vec4(lightColor, color.a * opacity);\n\n#endif\n\n  DECKGL_FILTER_COLOR(fragColor, geometry);\n}\n";
+declare const _default: "#version 300 es\n#define SHADER_NAME simple-mesh-layer-fs\n\nprecision highp float;\n\nuniform bool hasTexture;\nuniform sampler2D sampler;\nuniform bool flatShading;\nuniform float opacity;\n\nin vec2 vTexCoord;\nin vec3 cameraPosition;\nin vec3 normals_commonspace;\nin vec4 position_commonspace;\nin vec4 vColor;\n\nout vec4 fragColor;\n\nvoid main(void) {\n  \n#ifdef MODULE_PBR\n\n  fragColor = vColor * pbr_filterColor(vec4(0));\n  geometry.uv = pbr_vUV;\n  fragColor.a *= opacity;\n\n#else\n\n  geometry.uv = vTexCoord;\n\n  vec3 normal;\n  if (flatShading) {\n\n  normal = normalize(cross(dFdx(position_commonspace.xyz), dFdy(position_commonspace.xyz)));\n  } else {\n    normal = normals_commonspace;\n  }\n\n  vec4 color = hasTexture ? texture(sampler, vTexCoord) : vColor;\n  vec3 lightColor = lighting_getLightColor(color.rgb, cameraPosition, position_commonspace.xyz, normal);\n  fragColor = vec4(lightColor, color.a * opacity);\n\n#endif\n\n  DECKGL_FILTER_COLOR(fragColor, geometry);\n}\n";
 export default _default;
 //# sourceMappingURL=mesh-layer-fragment.glsl.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"mesh-layer-fragment.glsl.d.ts","sourceRoot":"","sources":["../../src/mesh-layer/mesh-layer-fragment.glsl.ts"],"names":[],"mappings":";AAAA,wBAsDE"}
+{"version":3,"file":"mesh-layer-fragment.glsl.d.ts","sourceRoot":"","sources":["../../src/mesh-layer/mesh-layer-fragment.glsl.ts"],"names":[],"mappings":";AAAA,wBA8CE"}

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

@@ -1,55 +1,33 @@
 export default `#version 300 es
 #define SHADER_NAME simple-mesh-layer-fs
-
 precision highp float;
-
 uniform bool hasTexture;
 uniform sampler2D sampler;
 uniform bool flatShading;
 uniform float opacity;
-
 in vec2 vTexCoord;
 in vec3 cameraPosition;
 in vec3 normals_commonspace;
 in vec4 position_commonspace;
 in vec4 vColor;
-
 out vec4 fragColor;
-
 void main(void) {
-  
 #ifdef MODULE_PBR
-
-  fragColor = vColor * pbr_filterColor(vec4(0));
-  geometry.uv = pbr_vUV;
-  fragColor.a *= opacity;
-
+fragColor = vColor * pbr_filterColor(vec4(0));
+geometry.uv = pbr_vUV;
+fragColor.a *= opacity;
 #else
-
-  geometry.uv = vTexCoord;
-
-  vec3 normal;
-  if (flatShading) {
-
-// NOTE(Tarek): This is necessary because
-// headless.gl reports the extension as
-// available but does not support it in
-// the shader.
-#ifdef DERIVATIVES_AVAILABLE
-    normal = normalize(cross(dFdx(position_commonspace.xyz), dFdy(position_commonspace.xyz)));
-#else
-    normal = vec3(0.0, 0.0, 1.0);
-#endif
-  } else {
-    normal = normals_commonspace;
-  }
-
-  vec4 color = hasTexture ? texture(sampler, vTexCoord) : vColor;
-  vec3 lightColor = lighting_getLightColor(color.rgb, cameraPosition, position_commonspace.xyz, normal);
-  fragColor = vec4(lightColor, color.a * opacity);
-
+geometry.uv = vTexCoord;
+vec3 normal;
+if (flatShading) {
+normal = normalize(cross(dFdx(position_commonspace.xyz), dFdy(position_commonspace.xyz)));
+} else {
+normal = normals_commonspace;
+}
+vec4 color = hasTexture ? texture(sampler, vTexCoord) : vColor;
+vec3 lightColor = lighting_getLightColor(color.rgb, cameraPosition, position_commonspace.xyz, normal);
+fragColor = vec4(lightColor, color.a * opacity);
 #endif
-
-  DECKGL_FILTER_COLOR(fragColor, geometry);
+DECKGL_FILTER_COLOR(fragColor, geometry);
 }
 `;

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

@@ -1,84 +1,63 @@
 export default `#version 300 es
 #define SHADER_NAME simple-mesh-layer-vs
-
-// Scale the model
 uniform float sizeScale;
 uniform bool composeModelMatrix;
 uniform bool pickFeatureIds;
-
-// Primitive attributes
 in vec3 positions;
 in vec3 normals;
 in vec3 colors;
 in vec2 texCoords;
 in vec4 uvRegions;
 in vec3 featureIdsPickingColors;
-
-// Instance attributes
 in vec4 instanceColors;
 in vec3 instancePickingColors;
 in vec3 instanceModelMatrixCol0;
 in vec3 instanceModelMatrixCol1;
 in vec3 instanceModelMatrixCol2;
-
-// Outputs to fragment shader
 out vec2 vTexCoord;
 out vec3 cameraPosition;
 out vec3 normals_commonspace;
 out vec4 position_commonspace;
 out vec4 vColor;
-
 vec2 applyUVRegion(vec2 uv) {
-  #ifdef HAS_UV_REGIONS
-    // https://github.com/Esri/i3s-spec/blob/master/docs/1.7/geometryUVRegion.cmn.md
-    return fract(uv) * (uvRegions.zw - uvRegions.xy) + uvRegions.xy;
-  #else
-    return uv;
-  #endif
+#ifdef HAS_UV_REGIONS
+return fract(uv) * (uvRegions.zw - uvRegions.xy) + uvRegions.xy;
+#else
+return uv;
+#endif
 }
-
 void main(void) {
-  vec2 uv = applyUVRegion(texCoords);
-  geometry.uv = uv;
-
-  if (pickFeatureIds) {
-    geometry.pickingColor = featureIdsPickingColors;
-  } else {
-    geometry.pickingColor = instancePickingColors;
-  }
-
-  mat3 instanceModelMatrix = mat3(instanceModelMatrixCol0, instanceModelMatrixCol1, instanceModelMatrixCol2);
-
-  vTexCoord = uv;
-  cameraPosition = project_uCameraPosition;
-  vColor = vec4(colors * instanceColors.rgb, instanceColors.a);
-
-  vec3 pos = (instanceModelMatrix * positions) * sizeScale;
-  vec3 projectedPosition = project_position(positions);
-  position_commonspace = vec4(projectedPosition, 1.0);
-  gl_Position = project_common_position_to_clipspace(position_commonspace);
-
-  geometry.position = position_commonspace;
-  normals_commonspace = project_normal(instanceModelMatrix * normals);
-  geometry.normal = normals_commonspace;
-
-  DECKGL_FILTER_GL_POSITION(gl_Position, geometry);
-
-  #ifdef MODULE_PBR
-    // set PBR data
-    pbr_vPosition = geometry.position.xyz;
-    #ifdef HAS_NORMALS
-      pbr_vNormal = geometry.normal;
-    #endif
-
-    #ifdef HAS_UV
-      pbr_vUV = uv;
-    #else
-      pbr_vUV = vec2(0., 0.);
-    #endif
-    geometry.uv = pbr_vUV;
-  #endif
-
-  DECKGL_FILTER_COLOR(vColor, geometry);
+vec2 uv = applyUVRegion(texCoords);
+geometry.uv = uv;
+if (pickFeatureIds) {
+geometry.pickingColor = featureIdsPickingColors;
+} else {
+geometry.pickingColor = instancePickingColors;
+}
+mat3 instanceModelMatrix = mat3(instanceModelMatrixCol0, instanceModelMatrixCol1, instanceModelMatrixCol2);
+vTexCoord = uv;
+cameraPosition = project_uCameraPosition;
+vColor = vec4(colors * instanceColors.rgb, instanceColors.a);
+vec3 pos = (instanceModelMatrix * positions) * sizeScale;
+vec3 projectedPosition = project_position(positions);
+position_commonspace = vec4(projectedPosition, 1.0);
+gl_Position = project_common_position_to_clipspace(position_commonspace);
+geometry.position = position_commonspace;
+normals_commonspace = project_normal(instanceModelMatrix * normals);
+geometry.normal = normals_commonspace;
+DECKGL_FILTER_GL_POSITION(gl_Position, geometry);
+#ifdef MODULE_PBR
+pbr_vPosition = geometry.position.xyz;
+#ifdef HAS_NORMALS
+pbr_vNormal = geometry.normal;
+#endif
+#ifdef HAS_UV
+pbr_vUV = uv;
+#else
+pbr_vUV = vec2(0., 0.);
+#endif
+geometry.uv = pbr_vUV;
+#endif
+DECKGL_FILTER_COLOR(vColor, geometry);
 }
 `;

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":"AAAA,OAAO,KAAK,EAAC,YAAY,EAAC,MAAM,eAAe,CAAC;AAChD,OAAO,EAAmB,iBAAiB,EAAC,MAAM,eAAe,CAAC;AAElE,OAAO,EAAC,KAAK,EAAC,MAAM,iBAAiB,CAAC;AAEtC,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;AAK3E,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;IAmBf,WAAW,CAAC,MAAM,EAAE,gBAAgB,CAAC,IAAI,CAAC;IAS1C,IAAI,CAAC,IAAI,KAAA;IAeT,SAAS,CAAC,QAAQ,CAAC,IAAI,EAAE,IAAI,GAAG,KAAK;IAwBrC,yBAAyB,CAAC,WAAW,KAAA;IAYrC,aAAa,CAAC,WAAW,KAAA,EAAE,IAAI,EAAE,IAAI,GAAG,iBAAiB;IAiBzD,gCAAgC,CAAC,SAAS,KAAA;IAiB1C,aAAa,CAAC,OAAO,EAAE,YAAY;CAKpC"}
+{"version":3,"file":"mesh-layer.d.ts","sourceRoot":"","sources":["../../src/mesh-layer/mesh-layer.ts"],"names":[],"mappings":"AAAA,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;AAK3E,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;IAmBf,WAAW,CAAC,MAAM,EAAE,gBAAgB,CAAC,IAAI,CAAC;IAS1C,IAAI,CAAC,IAAI,KAAA;IAeT,SAAS,CAAC,QAAQ,CAAC,IAAI,EAAE,IAAI,GAAG,KAAK;IAwBrC,yBAAyB,CAAC,WAAW,KAAA;IAYrC,aAAa,CAAC,WAAW,KAAA,EAAE,IAAI,EAAE,IAAI,GAAG,iBAAiB;IAiBzD,gCAAgC,CAAC,SAAS,KAAA;IAiB1C,aAAa,CAAC,OAAO,EAAE,YAAY;CAKpC"}

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

@@ -1,7 +1,6 @@
 import { parsePBRMaterial } from '@luma.gl/gltf';
 import { pbr } from '@luma.gl/shadertools';
 import { Model } from '@luma.gl/engine';
-import { GL } from '@luma.gl/constants';
 import { SimpleMeshLayer } from '@deck.gl/mesh-layers';
 import vs from "./mesh-layer-vertex.glsl.js";
 import fs from "./mesh-layer-fragment.glsl.js";
@@ -38,7 +37,7 @@ export default class MeshLayer extends SimpleMeshLayer {
             // attributeManager is always defined in a primitive layer
             attributeManager.add({
                 featureIdsPickingColors: {
-                    type: GL.UNSIGNED_BYTE,
+                    type: 'uint8',
                     size: 3,
                     noAlloc: true,
                     // eslint-disable-next-line @typescript-eslint/unbound-method

package/dist/trips-layer/trips-layer.d.ts

@@ -26,7 +26,7 @@ type _TripsLayerProps<DataT = unknown> = {
     getTimestamps?: AccessorFunction<DataT, NumericArray>;
 };
 /** Render animated paths that represent vehicle trips. */
-export default class TripsLayer<DataT = any, ExtraProps extends {} = {}> extends PathLayer<DataT, Required<_TripsLayerProps> & ExtraProps> {
+export default class TripsLayer<DataT = any, ExtraProps extends {} = {}> extends PathLayer<DataT, Required<_TripsLayerProps<DataT>> & ExtraProps> {
     static layerName: string;
     static defaultProps: DefaultProps<TripsLayerProps<unknown>>;
     getShaders(): any;

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

@@ -1 +1 @@
-{"version":3,"file":"trips-layer.d.ts","sourceRoot":"","sources":["../../src/trips-layer/trips-layer.ts"],"names":[],"mappings":"AAoBA,OAAO,KAAK,EAAC,YAAY,EAAC,MAAM,eAAe,CAAC;AAChD,OAAO,EAAC,gBAAgB,EAAE,YAAY,EAAC,MAAM,eAAe,CAAC;AAC7D,OAAO,EAAC,SAAS,EAAE,cAAc,EAAC,MAAM,iBAAiB,CAAC;AAS1D,8CAA8C;AAC9C,MAAM,MAAM,eAAe,CAAC,KAAK,GAAG,OAAO,IAAI,gBAAgB,CAAC,KAAK,CAAC,GAAG,cAAc,CAAC,KAAK,CAAC,CAAC;AAE/F,sCAAsC;AACtC,KAAK,gBAAgB,CAAC,KAAK,GAAG,OAAO,IAAI;IACvC;;;OAGG;IACH,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB;;;OAGG;IACH,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB;;;OAGG;IACH,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB;;OAEG;IACH,aAAa,CAAC,EAAE,gBAAgB,CAAC,KAAK,EAAE,YAAY,CAAC,CAAC;CACvD,CAAC;AAEF,0DAA0D;AAC1D,MAAM,CAAC,OAAO,OAAO,UAAU,CAAC,KAAK,GAAG,GAAG,EAAE,UAAU,SAAS,EAAE,GAAG,EAAE,CAAE,SAAQ,SAAS,CACxF,KAAK,EACL,QAAQ,CAAC,gBAAgB,CAAC,GAAG,UAAU,CACxC;IACC,MAAM,CAAC,SAAS,SAAgB;IAChC,MAAM,CAAC,YAAY,yCAAgB;IAEnC,UAAU;IAmCV,eAAe;IAoBf,IAAI,CAAC,MAAM,KAAA;CAYZ"}
+{"version":3,"file":"trips-layer.d.ts","sourceRoot":"","sources":["../../src/trips-layer/trips-layer.ts"],"names":[],"mappings":"AAoBA,OAAO,KAAK,EAAC,YAAY,EAAC,MAAM,eAAe,CAAC;AAChD,OAAO,EAAC,gBAAgB,EAAE,YAAY,EAAC,MAAM,eAAe,CAAC;AAC7D,OAAO,EAAC,SAAS,EAAE,cAAc,EAAC,MAAM,iBAAiB,CAAC;AAS1D,8CAA8C;AAC9C,MAAM,MAAM,eAAe,CAAC,KAAK,GAAG,OAAO,IAAI,gBAAgB,CAAC,KAAK,CAAC,GAAG,cAAc,CAAC,KAAK,CAAC,CAAC;AAE/F,sCAAsC;AACtC,KAAK,gBAAgB,CAAC,KAAK,GAAG,OAAO,IAAI;IACvC;;;OAGG;IACH,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB;;;OAGG;IACH,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB;;;OAGG;IACH,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB;;OAEG;IACH,aAAa,CAAC,EAAE,gBAAgB,CAAC,KAAK,EAAE,YAAY,CAAC,CAAC;CACvD,CAAC;AAEF,0DAA0D;AAC1D,MAAM,CAAC,OAAO,OAAO,UAAU,CAAC,KAAK,GAAG,GAAG,EAAE,UAAU,SAAS,EAAE,GAAG,EAAE,CAAE,SAAQ,SAAS,CACxF,KAAK,EACL,QAAQ,CAAC,gBAAgB,CAAC,KAAK,CAAC,CAAC,GAAG,UAAU,CAC/C;IACC,MAAM,CAAC,SAAS,SAAgB;IAChC,MAAM,CAAC,YAAY,yCAAgB;IAEnC,UAAU;IAmCV,eAAe;IAoBf,IAAI,CAAC,MAAM,KAAA;CAYZ"}