@deck.gl/extensions 8.8.0-alpha.6 → 8.8.0-beta.1

package/typed/fp64/project64.glsl.d.ts

@@ -1,3 +1,3 @@
-declare var _default: "\nconst vec2 WORLD_SCALE_FP64 = vec2(81.4873275756836, 0.0000032873668232014097);\n\nuniform vec2 project_uViewProjectionMatrixFP64[16];\n\n// longitude: lnglat_fp64.xy; latitude: lnglat_fp64.zw\nvoid mercatorProject_fp64(vec4 lnglat_fp64, out vec2 out_val[2]) {\n\n#if defined(NVIDIA_FP64_WORKAROUND)\n  out_val[0] = sum_fp64(radians_fp64(lnglat_fp64.xy), PI_FP64 * ONE);\n#else\n  out_val[0] = sum_fp64(radians_fp64(lnglat_fp64.xy), PI_FP64);\n#endif\n  out_val[1] = sum_fp64(PI_FP64,\n    log_fp64(tan_fp64(sum_fp64(PI_4_FP64, radians_fp64(lnglat_fp64.zw) / 2.0))));\n  return;\n}\n\nvoid project_position_fp64(vec4 position_fp64, out vec2 out_val[2]) {\n  vec2 pos_fp64[2];\n  mercatorProject_fp64(position_fp64, pos_fp64);\n  out_val[0] = mul_fp64(pos_fp64[0], WORLD_SCALE_FP64);\n  out_val[1] = mul_fp64(pos_fp64[1], WORLD_SCALE_FP64);\n\n  return;\n}\n\nvoid project_position_fp64(vec2 position, vec2 position64xyLow, out vec2 out_val[2]) {\n  vec4 position64xy = vec4(\n    position.x, position64xyLow.x,\n    position.y, position64xyLow.y);\n\n  project_position_fp64(position64xy, out_val);\n}\n\nvec4 project_common_position_to_clipspace_fp64(vec2 vertex_pos_modelspace[4]) {\n  vec2 vertex_pos_clipspace[4];\n  mat4_vec4_mul_fp64(project_uViewProjectionMatrixFP64, vertex_pos_modelspace,\n    vertex_pos_clipspace);\n  return vec4(\n    vertex_pos_clipspace[0].x,\n    vertex_pos_clipspace[1].x,\n    vertex_pos_clipspace[2].x,\n    vertex_pos_clipspace[3].x\n    );\n}\n\nvec4 project_position_to_clipspace(\n  vec3 position, vec3 position64xyLow, vec3 offset, out vec4 commonPosition\n) {\n  // This is the local offset to the instance position\n  vec2 offset64[4];\n  vec4_fp64(vec4(offset, 0.0), offset64);\n\n  float z = project_size(position.z);\n\n  // Apply web mercator projection (depends on coordinate system imn use)\n  vec2 projectedPosition64xy[2];\n  project_position_fp64(position.xy, position64xyLow.xy, projectedPosition64xy);\n\n  vec2 commonPosition64[4];\n  commonPosition64[0] = sum_fp64(offset64[0], projectedPosition64xy[0]);\n  commonPosition64[1] = sum_fp64(offset64[1], projectedPosition64xy[1]);\n  commonPosition64[2] = sum_fp64(offset64[2], vec2(z, 0.0));\n  commonPosition64[3] = vec2(1.0, 0.0);\n\n  commonPosition = vec4(projectedPosition64xy[0].x, projectedPosition64xy[1].x, z, 1.0);\n\n  return project_common_position_to_clipspace_fp64(commonPosition64);\n}\n\nvec4 project_position_to_clipspace(\n  vec3 position, vec3 position64xyLow, vec3 offset\n) {\n  vec4 commonPosition;\n  return project_position_to_clipspace(\n    position, position64xyLow, offset, commonPosition\n  );\n}\n";
+declare const _default: "\nconst vec2 WORLD_SCALE_FP64 = vec2(81.4873275756836, 0.0000032873668232014097);\n\nuniform vec2 project_uViewProjectionMatrixFP64[16];\n\n// longitude: lnglat_fp64.xy; latitude: lnglat_fp64.zw\nvoid mercatorProject_fp64(vec4 lnglat_fp64, out vec2 out_val[2]) {\n\n#if defined(NVIDIA_FP64_WORKAROUND)\n  out_val[0] = sum_fp64(radians_fp64(lnglat_fp64.xy), PI_FP64 * ONE);\n#else\n  out_val[0] = sum_fp64(radians_fp64(lnglat_fp64.xy), PI_FP64);\n#endif\n  out_val[1] = sum_fp64(PI_FP64,\n    log_fp64(tan_fp64(sum_fp64(PI_4_FP64, radians_fp64(lnglat_fp64.zw) / 2.0))));\n  return;\n}\n\nvoid project_position_fp64(vec4 position_fp64, out vec2 out_val[2]) {\n  vec2 pos_fp64[2];\n  mercatorProject_fp64(position_fp64, pos_fp64);\n  out_val[0] = mul_fp64(pos_fp64[0], WORLD_SCALE_FP64);\n  out_val[1] = mul_fp64(pos_fp64[1], WORLD_SCALE_FP64);\n\n  return;\n}\n\nvoid project_position_fp64(vec2 position, vec2 position64xyLow, out vec2 out_val[2]) {\n  vec4 position64xy = vec4(\n    position.x, position64xyLow.x,\n    position.y, position64xyLow.y);\n\n  project_position_fp64(position64xy, out_val);\n}\n\nvec4 project_common_position_to_clipspace_fp64(vec2 vertex_pos_modelspace[4]) {\n  vec2 vertex_pos_clipspace[4];\n  mat4_vec4_mul_fp64(project_uViewProjectionMatrixFP64, vertex_pos_modelspace,\n    vertex_pos_clipspace);\n  return vec4(\n    vertex_pos_clipspace[0].x,\n    vertex_pos_clipspace[1].x,\n    vertex_pos_clipspace[2].x,\n    vertex_pos_clipspace[3].x\n    );\n}\n\nvec4 project_position_to_clipspace(\n  vec3 position, vec3 position64xyLow, vec3 offset, out vec4 commonPosition\n) {\n  // This is the local offset to the instance position\n  vec2 offset64[4];\n  vec4_fp64(vec4(offset, 0.0), offset64);\n\n  float z = project_size(position.z);\n\n  // Apply web mercator projection (depends on coordinate system imn use)\n  vec2 projectedPosition64xy[2];\n  project_position_fp64(position.xy, position64xyLow.xy, projectedPosition64xy);\n\n  vec2 commonPosition64[4];\n  commonPosition64[0] = sum_fp64(offset64[0], projectedPosition64xy[0]);\n  commonPosition64[1] = sum_fp64(offset64[1], projectedPosition64xy[1]);\n  commonPosition64[2] = sum_fp64(offset64[2], vec2(z, 0.0));\n  commonPosition64[3] = vec2(1.0, 0.0);\n\n  commonPosition = vec4(projectedPosition64xy[0].x, projectedPosition64xy[1].x, z, 1.0);\n\n  return project_common_position_to_clipspace_fp64(commonPosition64);\n}\n\nvec4 project_position_to_clipspace(\n  vec3 position, vec3 position64xyLow, vec3 offset\n) {\n  vec4 commonPosition;\n  return project_position_to_clipspace(\n    position, position64xyLow, offset, commonPosition\n  );\n}\n";
 export default _default;
 //# sourceMappingURL=project64.glsl.d.ts.map

package/typed/fp64/project64.glsl.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"project64.glsl.d.ts","sourceRoot":"","sources":["../../src/fp64/project64.glsl.js"],"names":[],"mappings":""}
+{"version":3,"file":"project64.glsl.d.ts","sourceRoot":"","sources":["../../src/fp64/project64.glsl.ts"],"names":[],"mappings":";AAoBA,wBAgFE"}

package/typed/fp64/project64.glsl.js

@@ -0,0 +1,100 @@
+// Copyright (c) 2015 - 2017 Uber Technologies, Inc.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+export default `\
+
+const vec2 WORLD_SCALE_FP64 = vec2(81.4873275756836, 0.0000032873668232014097);
+
+uniform vec2 project_uViewProjectionMatrixFP64[16];
+
+// longitude: lnglat_fp64.xy; latitude: lnglat_fp64.zw
+void mercatorProject_fp64(vec4 lnglat_fp64, out vec2 out_val[2]) {
+
+#if defined(NVIDIA_FP64_WORKAROUND)
+  out_val[0] = sum_fp64(radians_fp64(lnglat_fp64.xy), PI_FP64 * ONE);
+#else
+  out_val[0] = sum_fp64(radians_fp64(lnglat_fp64.xy), PI_FP64);
+#endif
+  out_val[1] = sum_fp64(PI_FP64,
+    log_fp64(tan_fp64(sum_fp64(PI_4_FP64, radians_fp64(lnglat_fp64.zw) / 2.0))));
+  return;
+}
+
+void project_position_fp64(vec4 position_fp64, out vec2 out_val[2]) {
+  vec2 pos_fp64[2];
+  mercatorProject_fp64(position_fp64, pos_fp64);
+  out_val[0] = mul_fp64(pos_fp64[0], WORLD_SCALE_FP64);
+  out_val[1] = mul_fp64(pos_fp64[1], WORLD_SCALE_FP64);
+
+  return;
+}
+
+void project_position_fp64(vec2 position, vec2 position64xyLow, out vec2 out_val[2]) {
+  vec4 position64xy = vec4(
+    position.x, position64xyLow.x,
+    position.y, position64xyLow.y);
+
+  project_position_fp64(position64xy, out_val);
+}
+
+vec4 project_common_position_to_clipspace_fp64(vec2 vertex_pos_modelspace[4]) {
+  vec2 vertex_pos_clipspace[4];
+  mat4_vec4_mul_fp64(project_uViewProjectionMatrixFP64, vertex_pos_modelspace,
+    vertex_pos_clipspace);
+  return vec4(
+    vertex_pos_clipspace[0].x,
+    vertex_pos_clipspace[1].x,
+    vertex_pos_clipspace[2].x,
+    vertex_pos_clipspace[3].x
+    );
+}
+
+vec4 project_position_to_clipspace(
+  vec3 position, vec3 position64xyLow, vec3 offset, out vec4 commonPosition
+) {
+  // This is the local offset to the instance position
+  vec2 offset64[4];
+  vec4_fp64(vec4(offset, 0.0), offset64);
+
+  float z = project_size(position.z);
+
+  // Apply web mercator projection (depends on coordinate system imn use)
+  vec2 projectedPosition64xy[2];
+  project_position_fp64(position.xy, position64xyLow.xy, projectedPosition64xy);
+
+  vec2 commonPosition64[4];
+  commonPosition64[0] = sum_fp64(offset64[0], projectedPosition64xy[0]);
+  commonPosition64[1] = sum_fp64(offset64[1], projectedPosition64xy[1]);
+  commonPosition64[2] = sum_fp64(offset64[2], vec2(z, 0.0));
+  commonPosition64[3] = vec2(1.0, 0.0);
+
+  commonPosition = vec4(projectedPosition64xy[0].x, projectedPosition64xy[1].x, z, 1.0);
+
+  return project_common_position_to_clipspace_fp64(commonPosition64);
+}
+
+vec4 project_position_to_clipspace(
+  vec3 position, vec3 position64xyLow, vec3 offset
+) {
+  vec4 commonPosition;
+  return project_position_to_clipspace(
+    position, position64xyLow, offset, commonPosition
+  );
+}
+`;

package/typed/fp64/project64.js

@@ -0,0 +1,50 @@
+// Copyright (c) 2015 - 2017 Uber Technologies, Inc.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+import { fp64 } from '@luma.gl/shadertools';
+const { fp64ify, fp64ifyMatrix4 } = fp64;
+import { project, _memoize as memoize } from '@deck.gl/core';
+import project64Shader from './project64.glsl';
+export default {
+    name: 'project64',
+    dependencies: [project, fp64],
+    vs: project64Shader,
+    getUniforms
+};
+// TODO - this module should calculate the 64 bit uniforms
+// It is currently done by project to minimize duplicated work
+const DEFAULT_MODULE_OPTIONS = {};
+const getMemoizedUniforms = memoize(calculateUniforms);
+function getUniforms(opts = DEFAULT_MODULE_OPTIONS) {
+    if (opts.viewport) {
+        const { viewProjectionMatrix, scale } = opts.viewport;
+        // We only need to update fp64 uniforms if fp32 projection is being updated
+        return getMemoizedUniforms({ viewProjectionMatrix, scale });
+    }
+    return {};
+}
+function calculateUniforms({ viewProjectionMatrix, scale }) {
+    const glViewProjectionMatrixFP64 = fp64ifyMatrix4(viewProjectionMatrix);
+    const scaleFP64 = fp64ify(scale);
+    return {
+        project_uViewProjectionMatrixFP64: glViewProjectionMatrixFP64,
+        project64_uViewProjectionMatrix: glViewProjectionMatrixFP64,
+        project64_uScale: scaleFP64
+    };
+}

package/typed/index.d.ts

@@ -6,4 +6,10 @@ export { default as FillStyleExtension } from './fill-style/fill-style';
 export { default as ClipExtension } from './clip/clip';
 export { default as MaskExtension } from './mask/mask';
 export { default as project64 } from './fp64/project64';
+export type { BrushingExtensionProps } from './brushing/brushing';
+export type { DataFilterExtensionProps } from './data-filter/data-filter';
+export type { PathStyleExtensionProps } from './path-style/path-style';
+export type { FillStyleExtensionProps } from './fill-style/fill-style';
+export type { ClipExtensionProps } from './clip/clip';
+export type { MaskExtensionProps } from './mask/mask';
 //# sourceMappingURL=index.d.ts.map

package/typed/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,OAAO,IAAI,iBAAiB,EAAC,MAAM,qBAAqB,CAAC;AACjE,OAAO,EAAC,OAAO,IAAI,mBAAmB,EAAC,MAAM,2BAA2B,CAAC;AACzE,OAAO,EAAC,OAAO,IAAI,aAAa,EAAC,MAAM,aAAa,CAAC;AACrD,OAAO,EAAC,OAAO,IAAI,kBAAkB,EAAC,MAAM,yBAAyB,CAAC;AACtE,OAAO,EAAC,OAAO,IAAI,kBAAkB,EAAC,MAAM,yBAAyB,CAAC;AACtE,OAAO,EAAC,OAAO,IAAI,aAAa,EAAC,MAAM,aAAa,CAAC;AACrD,OAAO,EAAC,OAAO,IAAI,aAAa,EAAC,MAAM,aAAa,CAAC;AAGrD,OAAO,EAAC,OAAO,IAAI,SAAS,EAAC,MAAM,kBAAkB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,OAAO,IAAI,iBAAiB,EAAC,MAAM,qBAAqB,CAAC;AACjE,OAAO,EAAC,OAAO,IAAI,mBAAmB,EAAC,MAAM,2BAA2B,CAAC;AACzE,OAAO,EAAC,OAAO,IAAI,aAAa,EAAC,MAAM,aAAa,CAAC;AACrD,OAAO,EAAC,OAAO,IAAI,kBAAkB,EAAC,MAAM,yBAAyB,CAAC;AACtE,OAAO,EAAC,OAAO,IAAI,kBAAkB,EAAC,MAAM,yBAAyB,CAAC;AACtE,OAAO,EAAC,OAAO,IAAI,aAAa,EAAC,MAAM,aAAa,CAAC;AACrD,OAAO,EAAC,OAAO,IAAI,aAAa,EAAC,MAAM,aAAa,CAAC;AAGrD,OAAO,EAAC,OAAO,IAAI,SAAS,EAAC,MAAM,kBAAkB,CAAC;AAGtD,YAAY,EAAC,sBAAsB,EAAC,MAAM,qBAAqB,CAAC;AAChE,YAAY,EAAC,wBAAwB,EAAC,MAAM,2BAA2B,CAAC;AACxE,YAAY,EAAC,uBAAuB,EAAC,MAAM,yBAAyB,CAAC;AACrE,YAAY,EAAC,uBAAuB,EAAC,MAAM,yBAAyB,CAAC;AACrE,YAAY,EAAC,kBAAkB,EAAC,MAAM,aAAa,CAAC;AACpD,YAAY,EAAC,kBAAkB,EAAC,MAAM,aAAa,CAAC"}

package/typed/index.js

@@ -0,0 +1,9 @@
+export { default as BrushingExtension } from './brushing/brushing';
+export { default as DataFilterExtension } from './data-filter/data-filter';
+export { default as Fp64Extension } from './fp64/fp64';
+export { default as PathStyleExtension } from './path-style/path-style';
+export { default as FillStyleExtension } from './fill-style/fill-style';
+export { default as ClipExtension } from './clip/clip';
+export { default as MaskExtension } from './mask/mask';
+// Shader module
+export { default as project64 } from './fp64/project64';

package/typed/mask/mask.d.ts

@@ -1,12 +1,24 @@
-declare class MaskExtension extends LayerExtension {
-}
-declare namespace MaskExtension {
-    export const extensionName: string;
-    export { defaultProps };
-}
-export default MaskExtension;
 import { LayerExtension } from '@deck.gl/core/typed';
-declare namespace defaultProps {
-    const maskId: string;
+import type { Layer } from '@deck.gl/core/typed';
+export declare type MaskExtensionProps = {
+    /**
+     * Id of the layer that defines the mask. The mask layer must use the prop `operation: 'mask'`.
+     * Masking is disabled if `maskId` is empty or no valid mask layer with the specified id is found.
+     */
+    maskId?: string;
+    /**
+     * controls whether an object is clipped by its anchor (usually defined by an accessor called `getPosition`, e.g. icon, scatterplot) or by its geometry (e.g. path, polygon).
+     * If not specified, it is automatically deduced from the layer.
+     */
+    maskByInstance?: boolean;
+};
+/** Allows layers to show/hide objects by a geofence. */
+export default class MaskExtension extends LayerExtension {
+    static defaultProps: {
+        maskId: string;
+    };
+    static extensionName: string;
+    getShaders(this: Layer<MaskExtensionProps>): any;
+    draw(this: Layer<MaskExtensionProps>, { uniforms, context, moduleParameters }: any): void;
 }
 //# sourceMappingURL=mask.d.ts.map

package/typed/mask/mask.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"mask.d.ts","sourceRoot":"","sources":["../../src/mask/mask.js"],"names":[],"mappings":"AAOA;CA0CC"}
+{"version":3,"file":"mask.d.ts","sourceRoot":"","sources":["../../src/mask/mask.ts"],"names":[],"mappings":"AAAA,OAAO,EAAoB,cAAc,EAAM,MAAM,eAAe,CAAC;AAGrE,OAAO,KAAK,EAAC,KAAK,EAAC,MAAM,eAAe,CAAC;AAMzC,oBAAY,kBAAkB,GAAG;IAC/B;;;OAGG;IACH,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB;;;OAGG;IACH,cAAc,CAAC,EAAE,OAAO,CAAC;CAC1B,CAAC;AAEF,wDAAwD;AACxD,MAAM,CAAC,OAAO,OAAO,aAAc,SAAQ,cAAc;IACvD,MAAM,CAAC,YAAY;;MAAgB;IACnC,MAAM,CAAC,aAAa,SAAmB;IAEvC,UAAU,CAAC,IAAI,EAAE,KAAK,CAAC,kBAAkB,CAAC,GAAG,GAAG;IAehD,IAAI,CAAC,IAAI,EAAE,KAAK,CAAC,kBAAkB,CAAC,EAAE,EAAC,QAAQ,EAAE,OAAO,EAAE,gBAAgB,EAAC,EAAE,GAAG;CA2BjF"}

package/typed/mask/mask.js

@@ -0,0 +1,48 @@
+import { COORDINATE_SYSTEM, LayerExtension, log } from '@deck.gl/core';
+import mask from './shader-module';
+const defaultProps = {
+    maskId: ''
+};
+export default class MaskExtension extends LayerExtension {
+    getShaders() {
+        // Infer by geometry if 'maskByInstance' prop isn't explictly set
+        let maskByInstance = 'instancePositions' in this.getAttributeManager().attributes;
+        // Users can override by setting the `maskByInstance` prop
+        if ('maskByInstance' in this.props) {
+            maskByInstance = this.props.maskByInstance;
+        }
+        this.state.maskByInstance = maskByInstance;
+        return {
+            modules: [mask]
+        };
+    }
+    draw({ uniforms, context, moduleParameters }) {
+        uniforms.mask_maskByInstance = this.state.maskByInstance;
+        const { maskId } = this.props;
+        const { maskChannels } = moduleParameters;
+        const { viewport } = context;
+        if (maskChannels && maskChannels[maskId]) {
+            const { index, bounds, coordinateOrigin: fromCoordinateOrigin } = maskChannels[maskId];
+            let { coordinateSystem: fromCoordinateSystem } = maskChannels[maskId];
+            uniforms.mask_enabled = true;
+            uniforms.mask_channel = index;
+            if (fromCoordinateSystem === COORDINATE_SYSTEM.DEFAULT) {
+                fromCoordinateSystem = viewport.isGeospatial
+                    ? COORDINATE_SYSTEM.LNGLAT
+                    : COORDINATE_SYSTEM.CARTESIAN;
+            }
+            const opts = { modelMatrix: null, fromCoordinateOrigin, fromCoordinateSystem };
+            const bl = this.projectPosition([bounds[0], bounds[1], 0], opts);
+            const tr = this.projectPosition([bounds[2], bounds[3], 0], opts);
+            uniforms.mask_bounds = [bl[0], bl[1], tr[0], tr[1]];
+        }
+        else {
+            if (maskId) {
+                log.warn(`Could not find a mask layer with id: ${maskId}`)();
+            }
+            uniforms.mask_enabled = false;
+        }
+    }
+}
+MaskExtension.extensionName = 'MaskExtension';
+MaskExtension.defaultProps = defaultProps;

package/typed/mask/shader-module.d.ts

@@ -1,22 +1,8 @@
-declare namespace _default {
-    export const name: string;
-    export const dependencies: (typeof project)[];
-    export { vs };
-    export { fs };
-    export { inject };
-    export { getMaskUniforms as getUniforms };
-}
-export default _default;
-import { project } from '@deck.gl/core/typed';
-declare const vs: "\nuniform vec4 mask_bounds;\nuniform bool mask_maskByInstance;\nvec2 mask_getCoords(vec4 position) {\n  return (position.xy - mask_bounds.xy) / (mask_bounds.zw - mask_bounds.xy);\n}\n";
-declare const fs: "\nuniform sampler2D mask_texture;\nuniform int mask_channel;\nuniform bool mask_enabled;\nbool mask_isInBounds(vec2 texCoords) {\n  if (!mask_enabled) {\n    return true;\n  }\n  vec4 maskColor = texture2D(mask_texture, texCoords);\n  float maskValue = 1.0;\n  if (mask_channel == 0) {\n    maskValue = maskColor.r;\n  } else if (mask_channel == 1) {\n    maskValue = maskColor.g;\n  } else if (mask_channel == 2) {\n    maskValue = maskColor.b;\n  } else if (mask_channel == 3) {\n    maskValue = maskColor.a;\n  }\n  return maskValue < 0.5;\n}\n";
-declare const inject: {
-    'vs:#decl': string;
-    'vs:#main-end': string;
-    'fs:#decl': string;
-    'fs:#main-start': string;
-};
-declare function getMaskUniforms(opts?: {}): {
-    mask_texture: any;
+import type { _ShaderModule as ShaderModule } from '@deck.gl/core/typed';
+import type { Texture2D } from '@luma.gl/webgl';
+declare type MaskModuleSettings = {
+    maskMap?: Texture2D;
 };
+declare const _default: ShaderModule<MaskModuleSettings>;
+export default _default;
 //# sourceMappingURL=shader-module.d.ts.map

package/typed/mask/shader-module.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"shader-module.d.ts","sourceRoot":"","sources":["../../src/mask/shader-module.js"],"names":[],"mappings":";;;;;;;;;;AAEA,4MAME;AAEF,wjBAqBE;AAEF;;;;;EA2BE;AAEF;;EAMC"}
+{"version":3,"file":"shader-module.d.ts","sourceRoot":"","sources":["../../src/mask/shader-module.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAC,aAAa,IAAI,YAAY,EAAC,MAAM,eAAe,CAAC;AACjE,OAAO,KAAK,EAAC,SAAS,EAAC,MAAM,gBAAgB,CAAC;AA8D9C,aAAK,kBAAkB,GAAG;IACxB,OAAO,CAAC,EAAE,SAAS,CAAC;CACrB,CAAC;;AAYF,wBAOsC"}

package/{src → typed}/mask/shader-module.js

@@ -1,5 +1,4 @@
-import {project} from '@deck.gl/core';
-
+import { project } from '@deck.gl/core';
 const vs = `
 uniform vec4 mask_bounds;
 uniform bool mask_maskByInstance;
@@ -7,7 +6,6 @@ vec2 mask_getCoords(vec4 position) {
   return (position.xy - mask_bounds.xy) / (mask_bounds.zw - mask_bounds.xy);
 }
 `;
-
 const fs = `
 uniform sampler2D mask_texture;
 uniform int mask_channel;
@@ -30,12 +28,11 @@ bool mask_isInBounds(vec2 texCoords) {
   return maskValue < 0.5;
 }
 `;
-
 const inject = {
-  'vs:#decl': `
+    'vs:#decl': `
 varying vec2 mask_texCoords;
 `,
-  'vs:#main-end': `
+    'vs:#main-end': `
    vec4 mask_common_position;
    if (mask_maskByInstance) {
      mask_common_position = project_position(vec4(geometry.worldPosition, 1.0));
@@ -44,10 +41,10 @@ varying vec2 mask_texCoords;
    }
    mask_texCoords = mask_getCoords(mask_common_position);
 `,
-  'fs:#decl': `
+    'fs:#decl': `
 varying vec2 mask_texCoords;
 `,
-  'fs:#main-start': `
+    'fs:#main-start': `
   if (mask_enabled) {
     bool mask = mask_isInBounds(mask_texCoords);
 
@@ -59,20 +56,18 @@ varying vec2 mask_texCoords;
   }
 `
 };
-
 const getMaskUniforms = (opts = {}) => {
-  const uniforms = {};
-  if (opts.maskMap) {
-    uniforms.mask_texture = opts.maskMap;
-  }
-  return uniforms;
+    const uniforms = {};
+    if (opts.maskMap) {
+        uniforms.mask_texture = opts.maskMap;
+    }
+    return uniforms;
 };
-
 export default {
-  name: 'mask',
-  dependencies: [project],
-  vs,
-  fs,
-  inject,
-  getUniforms: getMaskUniforms
+    name: 'mask',
+    dependencies: [project],
+    vs,
+    fs,
+    inject,
+    getUniforms: getMaskUniforms
 };

package/typed/path-style/path-style.d.ts

@@ -1,30 +1,66 @@
-declare class PathStyleExtension extends LayerExtension {
-    constructor({ dash, offset, highPrecisionDash }?: {
-        dash?: boolean | undefined;
-        offset?: boolean | undefined;
-        highPrecisionDash?: boolean | undefined;
-    });
-    isEnabled(layer: any): any;
-    getDashOffsets(path: any): number[];
-}
-declare namespace PathStyleExtension {
-    export const extensionName: string;
-    export { defaultProps };
-}
-export default PathStyleExtension;
 import { LayerExtension } from '@deck.gl/core/typed';
-declare namespace defaultProps {
-    namespace getDashArray {
-        const type: string;
-        const value: number[];
-    }
-    namespace getOffset {
-        const type_1: string;
-        export { type_1 as type };
-        const value_1: number;
-        export { value_1 as value };
-    }
-    const dashJustified: boolean;
-    const dashGapPickable: boolean;
+import type { Layer, LayerContext, Accessor, UpdateParameters } from '@deck.gl/core/typed';
+export declare type PathStyleExtensionProps<DataT = any> = {
+    /**
+     * Accessor for the dash array to draw each path with: `[dashSize, gapSize]` relative to the width of the path.
+     * Requires the `dash` option to be on.
+     */
+    getDashArray?: Accessor<DataT, [number, number]>;
+    /**
+     * Accessor for the offset to draw each path with, relative to the width of the path.
+     * Negative offset is to the left hand side, and positive offset is to the right hand side.
+     * @default 0
+     */
+    getOffset?: Accessor<DataT, number>;
+    /**
+     * If `true`, adjust gaps for the dashes to align at both ends.
+     * @default false
+     */
+    dashJustified?: boolean;
+    /**
+     * If `true`, gaps between solid strokes are pickable. If `false`, only the solid strokes are pickable.
+     * @default false
+     */
+    dashGapPickable?: boolean;
+};
+declare type PathStyleExtensionOptions = {
+    /**
+     * Add capability to render dashed lines.
+     * @default false
+     */
+    dash: boolean;
+    /**
+     * Add capability to offset lines.
+     * @default false
+     */
+    offset: boolean;
+    /**
+     * Improve dash rendering quality in certain circumstances. Note that this option introduces additional performance overhead.
+     * @default false
+     */
+    highPrecisionDash: boolean;
+};
+/** Adds selected features to the `PathLayer` and composite layers that render the `PathLayer`. */
+export default class PathStyleExtension extends LayerExtension<PathStyleExtensionOptions> {
+    static defaultProps: {
+        getDashArray: {
+            type: string;
+            value: number[];
+        };
+        getOffset: {
+            type: string;
+            value: number;
+        };
+        dashJustified: boolean;
+        dashGapPickable: boolean;
+    };
+    static extensionName: string;
+    constructor({ dash, offset, highPrecisionDash }?: Partial<PathStyleExtensionOptions>);
+    isEnabled(layer: Layer<PathStyleExtensionProps>): boolean;
+    getShaders(this: Layer<PathStyleExtensionProps>, extension: this): any;
+    initializeState(this: Layer<PathStyleExtensionProps>, context: LayerContext, extension: this): void;
+    updateState(this: Layer<PathStyleExtensionProps>, params: UpdateParameters<Layer<PathStyleExtensionProps>>, extension: this): void;
+    getDashOffsets(this: Layer<PathStyleExtensionProps>, path: number[] | number[][]): number[];
 }
+export {};
 //# sourceMappingURL=path-style.d.ts.map

package/typed/path-style/path-style.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"path-style.d.ts","sourceRoot":"","sources":["../../src/path-style/path-style.js"],"names":[],"mappings":"AA+BA;IACE;;;;OAEC;IAED,2BAEC;IAgED,oCAmBC;CACF"}
+{"version":3,"file":"path-style.d.ts","sourceRoot":"","sources":["../../src/path-style/path-style.ts"],"names":[],"mappings":"AAoBA,OAAO,EAAC,cAAc,EAAgC,MAAM,eAAe,CAAC;AAI5E,OAAO,KAAK,EAAC,KAAK,EAAE,YAAY,EAAE,QAAQ,EAAE,gBAAgB,EAAC,MAAM,eAAe,CAAC;AASnF,oBAAY,uBAAuB,CAAC,KAAK,GAAG,GAAG,IAAI;IACjD;;;OAGG;IACH,YAAY,CAAC,EAAE,QAAQ,CAAC,KAAK,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC;IACjD;;;;OAIG;IACH,SAAS,CAAC,EAAE,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;IACpC;;;OAGG;IACH,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB;;;OAGG;IACH,eAAe,CAAC,EAAE,OAAO,CAAC;CAC3B,CAAC;AAEF,aAAK,yBAAyB,GAAG;IAC/B;;;OAGG;IACH,IAAI,EAAE,OAAO,CAAC;IACd;;;OAGG;IACH,MAAM,EAAE,OAAO,CAAC;IAChB;;;OAGG;IACH,iBAAiB,EAAE,OAAO,CAAC;CAC5B,CAAC;AAEF,kGAAkG;AAClG,MAAM,CAAC,OAAO,OAAO,kBAAmB,SAAQ,cAAc,CAAC,yBAAyB,CAAC;IACvF,MAAM,CAAC,YAAY;;;;;;;;;;;MAAgB;IACnC,MAAM,CAAC,aAAa,SAAwB;gBAEhC,EACV,IAAY,EACZ,MAAc,EACd,iBAAyB,EAC1B,GAAE,OAAO,CAAC,yBAAyB,CAAM;IAI1C,SAAS,CAAC,KAAK,EAAE,KAAK,CAAC,uBAAuB,CAAC,GAAG,OAAO;IAIzD,UAAU,CAAC,IAAI,EAAE,KAAK,CAAC,uBAAuB,CAAC,EAAE,SAAS,EAAE,IAAI,GAAG,GAAG;IAiBtE,eAAe,CAAC,IAAI,EAAE,KAAK,CAAC,uBAAuB,CAAC,EAAE,OAAO,EAAE,YAAY,EAAE,SAAS,EAAE,IAAI;IA4B5F,WAAW,CACT,IAAI,EAAE,KAAK,CAAC,uBAAuB,CAAC,EACpC,MAAM,EAAE,gBAAgB,CAAC,KAAK,CAAC,uBAAuB,CAAC,CAAC,EACxD,SAAS,EAAE,IAAI;IAgBjB,cAAc,CAAC,IAAI,EAAE,KAAK,CAAC,uBAAuB,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,MAAM,EAAE,EAAE,GAAG,MAAM,EAAE;CAoB5F"}

package/typed/path-style/path-style.js

@@ -0,0 +1,107 @@
+// Copyright (c) 2015 - 2017 Uber Technologies, Inc.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+import { LayerExtension, _mergeShaders as mergeShaders } from '@deck.gl/core';
+import { dashShaders, offsetShaders } from './shaders.glsl';
+import { dist } from 'gl-matrix/vec3';
+const defaultProps = {
+    getDashArray: { type: 'accessor', value: [0, 0] },
+    getOffset: { type: 'accessor', value: 0 },
+    dashJustified: false,
+    dashGapPickable: false
+};
+export default class PathStyleExtension extends LayerExtension {
+    constructor({ dash = false, offset = false, highPrecisionDash = false } = {}) {
+        super({ dash: dash || highPrecisionDash, offset, highPrecisionDash });
+    }
+    isEnabled(layer) {
+        return layer.state.pathTesselator;
+    }
+    getShaders(extension) {
+        if (!extension.isEnabled(this)) {
+            return null;
+        }
+        // Merge shader injection
+        let result = {};
+        if (extension.opts.dash) {
+            result = mergeShaders(result, dashShaders);
+        }
+        if (extension.opts.offset) {
+            result = mergeShaders(result, offsetShaders);
+        }
+        return result;
+    }
+    initializeState(context, extension) {
+        const attributeManager = this.getAttributeManager();
+        if (!attributeManager || !extension.isEnabled(this)) {
+            // This extension only works with the PathLayer
+            return;
+        }
+        extension.enabled = true;
+        if (extension.opts.dash) {
+            attributeManager.addInstanced({
+                instanceDashArrays: { size: 2, accessor: 'getDashArray' }
+            });
+        }
+        if (extension.opts.highPrecisionDash) {
+            attributeManager.addInstanced({
+                instanceDashOffsets: {
+                    size: 1,
+                    accessor: 'getPath',
+                    transform: extension.getDashOffsets.bind(this)
+                }
+            });
+        }
+        if (extension.opts.offset) {
+            attributeManager.addInstanced({
+                instanceOffsets: { size: 1, accessor: 'getOffset' }
+            });
+        }
+    }
+    updateState(params, extension) {
+        if (!extension.isEnabled(this)) {
+            return;
+        }
+        const uniforms = {};
+        if (extension.opts.dash) {
+            uniforms.dashAlignMode = this.props.dashJustified ? 1 : 0;
+            uniforms.dashGapPickable = Boolean(this.props.dashGapPickable);
+        }
+        this.state.model.setUniforms(uniforms);
+    }
+    getDashOffsets(path) {
+        const result = [0];
+        const positionSize = this.props.positionFormat === 'XY' ? 2 : 3;
+        const isNested = Array.isArray(path[0]);
+        const geometrySize = isNested ? path.length : path.length / positionSize;
+        let p;
+        let prevP;
+        for (let i = 0; i < geometrySize - 1; i++) {
+            p = isNested ? path[i] : path.slice(i * positionSize, i * positionSize + positionSize);
+            p = this.projectPosition(p);
+            if (i > 0) {
+                result[i] = result[i - 1] + dist(prevP, p);
+            }
+            prevP = p;
+        }
+        return result;
+    }
+}
+PathStyleExtension.extensionName = 'PathStyleExtension';
+PathStyleExtension.defaultProps = defaultProps;

package/typed/path-style/shaders.glsl.d.ts

@@ -1,18 +1,17 @@
-export namespace dashShaders {
-    const inject: {
+export declare const dashShaders: {
+    inject: {
         'vs:#decl': string;
         'vs:#main-end': string;
         'fs:#decl': string;
         'fs:#main-start': string;
     };
-}
-export namespace offsetShaders {
-    const inject_1: {
+};
+export declare const offsetShaders: {
+    inject: {
         'vs:#decl': string;
         'vs:DECKGL_FILTER_SIZE': string;
         'vCornerOffset = offsetVec;': string;
         'fs:#main-start': string;
     };
-    export { inject_1 as inject };
-}
+};
 //# sourceMappingURL=shaders.glsl.d.ts.map

package/typed/path-style/shaders.glsl.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"shaders.glsl.d.ts","sourceRoot":"","sources":["../../src/path-style/shaders.glsl.js"],"names":[],"mappings":""}
+{"version":3,"file":"shaders.glsl.d.ts","sourceRoot":"","sources":["../../src/path-style/shaders.glsl.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,WAAW;;;;;;;CAwEvB,CAAC;AAEF,eAAO,MAAM,aAAa;;;;;;;CAsBzB,CAAC"}