@deck.gl/extensions 8.8.0-alpha.6 → 8.8.0-beta.3
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/dist.dev.js +311 -1166
- package/dist/es5/brushing/brushing.js +19 -15
- package/dist/es5/brushing/brushing.js.map +1 -1
- package/dist/es5/brushing/shader-module.js +1 -1
- package/dist/es5/brushing/shader-module.js.map +1 -1
- package/dist/es5/clip/clip.js +4 -2
- package/dist/es5/clip/clip.js.map +1 -1
- package/dist/es5/data-filter/aggregator.js +1 -1
- package/dist/es5/data-filter/aggregator.js.map +1 -1
- package/dist/es5/data-filter/data-filter.js +9 -9
- package/dist/es5/data-filter/data-filter.js.map +1 -1
- package/dist/es5/data-filter/shader-module.js +22 -13
- package/dist/es5/data-filter/shader-module.js.map +1 -1
- package/dist/es5/fill-style/fill-style.js +13 -11
- package/dist/es5/fill-style/fill-style.js.map +1 -1
- package/dist/es5/fill-style/shaders.glsl.js +8 -6
- package/dist/es5/fill-style/shaders.glsl.js.map +1 -1
- package/dist/es5/fp64/fp64.js +4 -2
- package/dist/es5/fp64/fp64.js.map +1 -1
- package/dist/es5/fp64/project64.glsl.js +1 -1
- package/dist/es5/fp64/project64.js +2 -5
- package/dist/es5/fp64/project64.js.map +1 -1
- package/dist/es5/index.js.map +1 -1
- package/dist/es5/mask/mask.js +7 -4
- package/dist/es5/mask/mask.js.map +1 -1
- package/dist/es5/mask/shader-module.js +6 -7
- package/dist/es5/mask/shader-module.js.map +1 -1
- package/dist/es5/path-style/path-style.js +5 -5
- package/dist/es5/path-style/path-style.js.map +1 -1
- package/dist/es5/path-style/shaders.glsl.js +1 -1
- package/dist/es5/path-style/shaders.glsl.js.map +1 -1
- package/dist/esm/brushing/brushing.js +20 -15
- package/dist/esm/brushing/brushing.js.map +1 -1
- package/dist/esm/brushing/shader-module.js +1 -1
- package/dist/esm/brushing/shader-module.js.map +1 -1
- package/dist/esm/clip/clip.js +5 -2
- package/dist/esm/clip/clip.js.map +1 -1
- package/dist/esm/data-filter/aggregator.js +1 -1
- package/dist/esm/data-filter/aggregator.js.map +1 -1
- package/dist/esm/data-filter/data-filter.js +6 -3
- package/dist/esm/data-filter/data-filter.js.map +1 -1
- package/dist/esm/data-filter/shader-module.js +21 -21
- package/dist/esm/data-filter/shader-module.js.map +1 -1
- package/dist/esm/fill-style/fill-style.js +18 -13
- package/dist/esm/fill-style/fill-style.js.map +1 -1
- package/dist/esm/fill-style/shaders.glsl.js +6 -2
- package/dist/esm/fill-style/shaders.glsl.js.map +1 -1
- package/dist/esm/fp64/fp64.js +4 -2
- package/dist/esm/fp64/fp64.js.map +1 -1
- package/dist/esm/fp64/project64.glsl.js +1 -1
- package/dist/esm/fp64/project64.glsl.js.map +1 -1
- package/dist/esm/fp64/project64.js +2 -3
- package/dist/esm/fp64/project64.js.map +1 -1
- package/dist/esm/index.js.map +1 -1
- package/dist/esm/mask/mask.js +7 -4
- package/dist/esm/mask/mask.js.map +1 -1
- package/dist/esm/mask/shader-module.js +6 -6
- package/dist/esm/mask/shader-module.js.map +1 -1
- package/dist/esm/path-style/path-style.js +6 -5
- package/dist/esm/path-style/path-style.js.map +1 -1
- package/dist/esm/path-style/shaders.glsl.js +1 -1
- package/dist/esm/path-style/shaders.glsl.js.map +1 -1
- package/dist.min.js +1 -1
- package/package.json +5 -3
- package/src/brushing/{brushing.js → brushing.ts} +45 -17
- package/src/brushing/{shader-module.js → shader-module.ts} +13 -3
- package/src/clip/{clip.js → clip.ts} +26 -9
- package/src/data-filter/{aggregator.js → aggregator.ts} +12 -8
- package/src/data-filter/{data-filter.js → data-filter.ts} +90 -13
- package/src/data-filter/{shader-module.js → shader-module.ts} +36 -27
- package/src/fill-style/{fill-style.js → fill-style.ts} +83 -19
- package/src/fill-style/{shaders.glsl.js → shaders.glsl.ts} +24 -4
- package/src/fp64/{fp64.js → fp64.ts} +6 -3
- package/src/fp64/{project64.glsl.js → project64.glsl.ts} +0 -0
- package/src/fp64/{project64.js → project64.ts} +16 -5
- package/src/index.ts +8 -0
- package/src/mask/{mask.js → mask.ts} +25 -8
- package/src/mask/{shader-module.js → shader-module.ts} +14 -6
- package/src/path-style/{path-style.js → path-style.ts} +65 -14
- package/src/path-style/{shaders.glsl.js → shaders.glsl.ts} +0 -0
- package/typed/brushing/brushing.d.ts +37 -16
- package/typed/brushing/brushing.d.ts.map +1 -1
- package/typed/brushing/shader-module.d.ts +9 -24
- package/typed/brushing/shader-module.d.ts.map +1 -1
- package/typed/clip/clip.d.ts +27 -10
- package/typed/clip/clip.d.ts.map +1 -1
- package/typed/data-filter/aggregator.d.ts +10 -9
- package/typed/data-filter/aggregator.d.ts.map +1 -1
- package/typed/data-filter/data-filter.d.ts +87 -29
- package/typed/data-filter/data-filter.d.ts.map +1 -1
- package/typed/data-filter/shader-module.d.ts +7 -24
- package/typed/data-filter/shader-module.d.ts.map +1 -1
- package/typed/fill-style/fill-style.d.ts +74 -41
- package/typed/fill-style/fill-style.d.ts.map +1 -1
- package/typed/fill-style/shaders.glsl.d.ts +8 -33
- package/typed/fill-style/shaders.glsl.d.ts.map +1 -1
- package/typed/fp64/fp64.d.ts +6 -6
- package/typed/fp64/fp64.d.ts.map +1 -1
- package/typed/fp64/project64.d.ts +5 -9
- package/typed/fp64/project64.d.ts.map +1 -1
- package/typed/fp64/project64.glsl.d.ts +1 -1
- package/typed/fp64/project64.glsl.d.ts.map +1 -1
- package/typed/index.d.ts +6 -0
- package/typed/index.d.ts.map +1 -1
- package/typed/mask/mask.d.ts +21 -9
- package/typed/mask/mask.d.ts.map +1 -1
- package/typed/mask/shader-module.d.ts +6 -20
- package/typed/mask/shader-module.d.ts.map +1 -1
- package/typed/path-style/path-style.d.ts +63 -27
- package/typed/path-style/path-style.d.ts.map +1 -1
- package/typed/path-style/shaders.glsl.d.ts +6 -7
- package/typed/path-style/shaders.glsl.d.ts.map +1 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../../src/fp64/project64.glsl.
|
|
1
|
+
{"version":3,"sources":["../../../src/fp64/project64.glsl.ts"],"names":[],"mappings":"AAoBA","sourcesContent":["// Copyright (c) 2015 - 2017 Uber Technologies, Inc.\n//\n// Permission is hereby granted, free of charge, to any person obtaining a copy\n// of this software and associated documentation files (the \"Software\"), to deal\n// in the Software without restriction, including without limitation the rights\n// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell\n// copies of the Software, and to permit persons to whom the Software is\n// furnished to do so, subject to the following conditions:\n//\n// The above copyright notice and this permission notice shall be included in\n// all copies or substantial portions of the Software.\n//\n// THE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\n// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,\n// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE\n// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER\n// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,\n// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN\n// THE SOFTWARE.\n\nexport default `\\\n\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`;\n"],"file":"project64.glsl.js"}
|
|
@@ -11,11 +11,10 @@ export default {
|
|
|
11
11
|
vs: project64Shader,
|
|
12
12
|
getUniforms
|
|
13
13
|
};
|
|
14
|
-
const DEFAULT_MODULE_OPTIONS = {};
|
|
15
14
|
const getMemoizedUniforms = memoize(calculateUniforms);
|
|
16
15
|
|
|
17
|
-
function getUniforms(opts
|
|
18
|
-
if (opts
|
|
16
|
+
function getUniforms(opts) {
|
|
17
|
+
if (opts && 'viewport' in opts) {
|
|
19
18
|
const {
|
|
20
19
|
viewProjectionMatrix,
|
|
21
20
|
scale
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../../src/fp64/project64.
|
|
1
|
+
{"version":3,"sources":["../../../src/fp64/project64.ts"],"names":["fp64","fp64ify","fp64ifyMatrix4","project","_memoize","memoize","project64Shader","name","dependencies","vs","getUniforms","getMemoizedUniforms","calculateUniforms","opts","viewProjectionMatrix","scale","viewport","glViewProjectionMatrixFP64","scaleFP64","project_uViewProjectionMatrixFP64","project64_uViewProjectionMatrix","project64_uScale"],"mappings":"AAqBA,SAAQA,IAAR,QAAmB,sBAAnB;AACA,MAAM;AAACC,EAAAA,OAAD;AAAUC,EAAAA;AAAV,IAA4BF,IAAlC;AACA,SAAQG,OAAR,EAAiBC,QAAQ,IAAIC,OAA7B,QAA2C,eAA3C;AAGA,OAAOC,eAAP,MAA4B,kBAA5B;AAMA,eAAe;AACbC,EAAAA,IAAI,EAAE,WADO;AAEbC,EAAAA,YAAY,EAAE,CAACL,OAAD,EAAUH,IAAV,CAFD;AAGbS,EAAAA,EAAE,EAAEH,eAHS;AAIbI,EAAAA;AAJa,CAAf;AAUA,MAAMC,mBAAmB,GAAGN,OAAO,CAACO,iBAAD,CAAnC;;AAEA,SAASF,WAAT,CAAqBG,IAArB,EAA+E;AAC7E,MAAIA,IAAI,IAAI,cAAcA,IAA1B,EAAgC;AAC9B,UAAM;AAACC,MAAAA,oBAAD;AAAuBC,MAAAA;AAAvB,QAAgCF,IAAI,CAACG,QAA3C;AAEA,WAAOL,mBAAmB,CAAC;AAACG,MAAAA,oBAAD;AAAuBC,MAAAA;AAAvB,KAAD,CAA1B;AACD;;AACD,SAAO,EAAP;AACD;;AAED,SAASH,iBAAT,CAA2B;AACzBE,EAAAA,oBADyB;AAEzBC,EAAAA;AAFyB,CAA3B,EAMG;AACD,QAAME,0BAA0B,GAAGf,cAAc,CAACY,oBAAD,CAAjD;AACA,QAAMI,SAAS,GAAGjB,OAAO,CAACc,KAAD,CAAzB;AAEA,SAAO;AACLI,IAAAA,iCAAiC,EAAEF,0BAD9B;AAELG,IAAAA,+BAA+B,EAAEH,0BAF5B;AAGLI,IAAAA,gBAAgB,EAAEH;AAHb,GAAP;AAKD","sourcesContent":["// Copyright (c) 2015 - 2017 Uber Technologies, Inc.\n//\n// Permission is hereby granted, free of charge, to any person obtaining a copy\n// of this software and associated documentation files (the \"Software\"), to deal\n// in the Software without restriction, including without limitation the rights\n// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell\n// copies of the Software, and to permit persons to whom the Software is\n// furnished to do so, subject to the following conditions:\n//\n// The above copyright notice and this permission notice shall be included in\n// all copies or substantial portions of the Software.\n//\n// THE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\n// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,\n// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE\n// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER\n// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,\n// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN\n// THE SOFTWARE.\n\n/* eslint-disable camelcase */\nimport {fp64} from '@luma.gl/shadertools';\nconst {fp64ify, fp64ifyMatrix4} = fp64;\nimport {project, _memoize as memoize} from '@deck.gl/core';\n\nimport type {Viewport, _ShaderModule as ShaderModule} from '@deck.gl/core';\nimport project64Shader from './project64.glsl';\n\ntype Project64ModuleSettings = {\n viewport: Viewport;\n};\n\nexport default {\n name: 'project64',\n dependencies: [project, fp64],\n vs: project64Shader,\n getUniforms\n} as ShaderModule<Project64ModuleSettings>;\n\n// TODO - this module should calculate the 64 bit uniforms\n// It is currently done by project to minimize duplicated work\n\nconst getMemoizedUniforms = memoize(calculateUniforms);\n\nfunction getUniforms(opts?: Project64ModuleSettings | {}): Record<string, any> {\n if (opts && 'viewport' in opts) {\n const {viewProjectionMatrix, scale} = opts.viewport;\n // We only need to update fp64 uniforms if fp32 projection is being updated\n return getMemoizedUniforms({viewProjectionMatrix, scale});\n }\n return {};\n}\n\nfunction calculateUniforms({\n viewProjectionMatrix,\n scale\n}: {\n viewProjectionMatrix: number[];\n scale: number;\n}) {\n const glViewProjectionMatrixFP64 = fp64ifyMatrix4(viewProjectionMatrix);\n const scaleFP64 = fp64ify(scale);\n\n return {\n project_uViewProjectionMatrixFP64: glViewProjectionMatrixFP64,\n project64_uViewProjectionMatrix: glViewProjectionMatrixFP64,\n project64_uScale: scaleFP64\n };\n}\n"],"file":"project64.js"}
|
package/dist/esm/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../src/index.ts"],"names":["default","BrushingExtension","DataFilterExtension","Fp64Extension","PathStyleExtension","FillStyleExtension","ClipExtension","MaskExtension","project64"],"mappings":"AAAA,SAAQA,OAAO,IAAIC,iBAAnB,QAA2C,qBAA3C;AACA,SAAQD,OAAO,IAAIE,mBAAnB,QAA6C,2BAA7C;AACA,SAAQF,OAAO,IAAIG,aAAnB,QAAuC,aAAvC;AACA,SAAQH,OAAO,IAAII,kBAAnB,QAA4C,yBAA5C;AACA,SAAQJ,OAAO,IAAIK,kBAAnB,QAA4C,yBAA5C;AACA,SAAQL,OAAO,IAAIM,aAAnB,QAAuC,aAAvC;AACA,SAAQN,OAAO,IAAIO,aAAnB,QAAuC,aAAvC;AAGA,SAAQP,OAAO,IAAIQ,SAAnB,QAAmC,kBAAnC","sourcesContent":["export {default as BrushingExtension} from './brushing/brushing';\nexport {default as DataFilterExtension} from './data-filter/data-filter';\nexport {default as Fp64Extension} from './fp64/fp64';\nexport {default as PathStyleExtension} from './path-style/path-style';\nexport {default as FillStyleExtension} from './fill-style/fill-style';\nexport {default as ClipExtension} from './clip/clip';\nexport {default as MaskExtension} from './mask/mask';\n\n// Shader module\nexport {default as project64} from './fp64/project64';\n"],"file":"index.js"}
|
|
1
|
+
{"version":3,"sources":["../../src/index.ts"],"names":["default","BrushingExtension","DataFilterExtension","Fp64Extension","PathStyleExtension","FillStyleExtension","ClipExtension","MaskExtension","project64"],"mappings":"AAAA,SAAQA,OAAO,IAAIC,iBAAnB,QAA2C,qBAA3C;AACA,SAAQD,OAAO,IAAIE,mBAAnB,QAA6C,2BAA7C;AACA,SAAQF,OAAO,IAAIG,aAAnB,QAAuC,aAAvC;AACA,SAAQH,OAAO,IAAII,kBAAnB,QAA4C,yBAA5C;AACA,SAAQJ,OAAO,IAAIK,kBAAnB,QAA4C,yBAA5C;AACA,SAAQL,OAAO,IAAIM,aAAnB,QAAuC,aAAvC;AACA,SAAQN,OAAO,IAAIO,aAAnB,QAAuC,aAAvC;AAGA,SAAQP,OAAO,IAAIQ,SAAnB,QAAmC,kBAAnC","sourcesContent":["export {default as BrushingExtension} from './brushing/brushing';\nexport {default as DataFilterExtension} from './data-filter/data-filter';\nexport {default as Fp64Extension} from './fp64/fp64';\nexport {default as PathStyleExtension} from './path-style/path-style';\nexport {default as FillStyleExtension} from './fill-style/fill-style';\nexport {default as ClipExtension} from './clip/clip';\nexport {default as MaskExtension} from './mask/mask';\n\n// Shader module\nexport {default as project64} from './fp64/project64';\n\n// Types\nexport type {BrushingExtensionProps} from './brushing/brushing';\nexport type {DataFilterExtensionProps} from './data-filter/data-filter';\nexport type {PathStyleExtensionProps} from './path-style/path-style';\nexport type {FillStyleExtensionProps} from './fill-style/fill-style';\nexport type {ClipExtensionProps} from './clip/clip';\nexport type {MaskExtensionProps} from './mask/mask';\n"],"file":"index.js"}
|
package/dist/esm/mask/mask.js
CHANGED
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
|
|
1
2
|
import { COORDINATE_SYSTEM, LayerExtension, log } from '@deck.gl/core';
|
|
2
3
|
import mask from './shader-module';
|
|
3
4
|
const defaultProps = {
|
|
@@ -8,7 +9,7 @@ export default class MaskExtension extends LayerExtension {
|
|
|
8
9
|
let maskByInstance = ('instancePositions' in this.getAttributeManager().attributes);
|
|
9
10
|
|
|
10
11
|
if ('maskByInstance' in this.props) {
|
|
11
|
-
maskByInstance = this.props.maskByInstance;
|
|
12
|
+
maskByInstance = Boolean(this.props.maskByInstance);
|
|
12
13
|
}
|
|
13
14
|
|
|
14
15
|
this.state.maskByInstance = maskByInstance;
|
|
@@ -24,7 +25,7 @@ export default class MaskExtension extends LayerExtension {
|
|
|
24
25
|
}) {
|
|
25
26
|
uniforms.mask_maskByInstance = this.state.maskByInstance;
|
|
26
27
|
const {
|
|
27
|
-
maskId
|
|
28
|
+
maskId = ''
|
|
28
29
|
} = this.props;
|
|
29
30
|
const {
|
|
30
31
|
maskChannels
|
|
@@ -67,6 +68,8 @@ export default class MaskExtension extends LayerExtension {
|
|
|
67
68
|
}
|
|
68
69
|
|
|
69
70
|
}
|
|
70
|
-
|
|
71
|
-
MaskExtension
|
|
71
|
+
|
|
72
|
+
_defineProperty(MaskExtension, "defaultProps", defaultProps);
|
|
73
|
+
|
|
74
|
+
_defineProperty(MaskExtension, "extensionName", 'MaskExtension');
|
|
72
75
|
//# sourceMappingURL=mask.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../../src/mask/mask.
|
|
1
|
+
{"version":3,"sources":["../../../src/mask/mask.ts"],"names":["COORDINATE_SYSTEM","LayerExtension","log","mask","defaultProps","maskId","MaskExtension","getShaders","maskByInstance","getAttributeManager","attributes","props","Boolean","state","modules","draw","uniforms","context","moduleParameters","mask_maskByInstance","maskChannels","viewport","index","bounds","coordinateOrigin","fromCoordinateOrigin","coordinateSystem","fromCoordinateSystem","mask_enabled","mask_channel","DEFAULT","isGeospatial","LNGLAT","CARTESIAN","opts","modelMatrix","bl","projectPosition","tr","mask_bounds","warn"],"mappings":";AAAA,SAAQA,iBAAR,EAA2BC,cAA3B,EAA2CC,GAA3C,QAAqD,eAArD;AACA,OAAOC,IAAP,MAAiB,iBAAjB;AAIA,MAAMC,YAAY,GAAG;AACnBC,EAAAA,MAAM,EAAE;AADW,CAArB;AAkBA,eAAe,MAAMC,aAAN,SAA4BL,cAA5B,CAA2C;AAIxDM,EAAAA,UAAU,GAAuC;AAE/C,QAAIC,cAAc,IAAG,uBAAuB,KAAKC,mBAAL,GAA4BC,UAAtD,CAAlB;;AAEA,QAAI,oBAAoB,KAAKC,KAA7B,EAAoC;AAClCH,MAAAA,cAAc,GAAGI,OAAO,CAAC,KAAKD,KAAL,CAAWH,cAAZ,CAAxB;AACD;;AACD,SAAKK,KAAL,CAAWL,cAAX,GAA4BA,cAA5B;AAEA,WAAO;AACLM,MAAAA,OAAO,EAAE,CAACX,IAAD;AADJ,KAAP;AAGD;;AAGDY,EAAAA,IAAI,CAAkC;AAACC,IAAAA,QAAD;AAAWC,IAAAA,OAAX;AAAoBC,IAAAA;AAApB,GAAlC,EAA8E;AAChFF,IAAAA,QAAQ,CAACG,mBAAT,GAA+B,KAAKN,KAAL,CAAWL,cAA1C;AACA,UAAM;AAACH,MAAAA,MAAM,GAAG;AAAV,QAAgB,KAAKM,KAA3B;AACA,UAAM;AAACS,MAAAA;AAAD,QAAiBF,gBAAvB;AACA,UAAM;AAACG,MAAAA;AAAD,QAAaJ,OAAnB;;AACA,QAAIG,YAAY,IAAIA,YAAY,CAACf,MAAD,CAAhC,EAA0C;AACxC,YAAM;AAACiB,QAAAA,KAAD;AAAQC,QAAAA,MAAR;AAAgBC,QAAAA,gBAAgB,EAAEC;AAAlC,UAA0DL,YAAY,CAACf,MAAD,CAA5E;AACA,UAAI;AAACqB,QAAAA,gBAAgB,EAAEC;AAAnB,UAA2CP,YAAY,CAACf,MAAD,CAA3D;AACAW,MAAAA,QAAQ,CAACY,YAAT,GAAwB,IAAxB;AACAZ,MAAAA,QAAQ,CAACa,YAAT,GAAwBP,KAAxB;;AAEA,UAAIK,oBAAoB,KAAK3B,iBAAiB,CAAC8B,OAA/C,EAAwD;AACtDH,QAAAA,oBAAoB,GAAGN,QAAQ,CAACU,YAAT,GACnB/B,iBAAiB,CAACgC,MADC,GAEnBhC,iBAAiB,CAACiC,SAFtB;AAGD;;AACD,YAAMC,IAAI,GAAG;AAACC,QAAAA,WAAW,EAAE,IAAd;AAAoBV,QAAAA,oBAApB;AAA0CE,QAAAA;AAA1C,OAAb;AACA,YAAMS,EAAE,GAAG,KAAKC,eAAL,CAAqB,CAACd,MAAM,CAAC,CAAD,CAAP,EAAYA,MAAM,CAAC,CAAD,CAAlB,EAAuB,CAAvB,CAArB,EAAgDW,IAAhD,CAAX;AACA,YAAMI,EAAE,GAAG,KAAKD,eAAL,CAAqB,CAACd,MAAM,CAAC,CAAD,CAAP,EAAYA,MAAM,CAAC,CAAD,CAAlB,EAAuB,CAAvB,CAArB,EAAgDW,IAAhD,CAAX;AACAlB,MAAAA,QAAQ,CAACuB,WAAT,GAAuB,CAACH,EAAE,CAAC,CAAD,CAAH,EAAQA,EAAE,CAAC,CAAD,CAAV,EAAeE,EAAE,CAAC,CAAD,CAAjB,EAAsBA,EAAE,CAAC,CAAD,CAAxB,CAAvB;AACD,KAfD,MAeO;AACL,UAAIjC,MAAJ,EAAY;AACVH,QAAAA,GAAG,CAACsC,IAAJ,gDAAiDnC,MAAjD;AACD;;AACDW,MAAAA,QAAQ,CAACY,YAAT,GAAwB,KAAxB;AACD;AACF;;AA7CuD;;gBAArCtB,a,kBACGF,Y;;gBADHE,a,mBAEI,e","sourcesContent":["import {COORDINATE_SYSTEM, LayerExtension, log} from '@deck.gl/core';\nimport mask from './shader-module';\n\nimport type {Layer} from '@deck.gl/core';\n\nconst defaultProps = {\n maskId: ''\n};\n\nexport type MaskExtensionProps = {\n /**\n * Id of the layer that defines the mask. The mask layer must use the prop `operation: 'mask'`.\n * Masking is disabled if `maskId` is empty or no valid mask layer with the specified id is found.\n */\n maskId?: string;\n /**\n * 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).\n * If not specified, it is automatically deduced from the layer.\n */\n maskByInstance?: boolean;\n};\n\n/** Allows layers to show/hide objects by a geofence. */\nexport default class MaskExtension extends LayerExtension {\n static defaultProps = defaultProps;\n static extensionName = 'MaskExtension';\n\n getShaders(this: Layer<MaskExtensionProps>): any {\n // Infer by geometry if 'maskByInstance' prop isn't explictly set\n let maskByInstance = 'instancePositions' in this.getAttributeManager()!.attributes;\n // Users can override by setting the `maskByInstance` prop\n if ('maskByInstance' in this.props) {\n maskByInstance = Boolean(this.props.maskByInstance);\n }\n this.state.maskByInstance = maskByInstance;\n\n return {\n modules: [mask]\n };\n }\n\n /* eslint-disable camelcase */\n draw(this: Layer<MaskExtensionProps>, {uniforms, context, moduleParameters}: any) {\n uniforms.mask_maskByInstance = this.state.maskByInstance;\n const {maskId = ''} = this.props;\n const {maskChannels} = moduleParameters;\n const {viewport} = context;\n if (maskChannels && maskChannels[maskId]) {\n const {index, bounds, coordinateOrigin: fromCoordinateOrigin} = maskChannels[maskId];\n let {coordinateSystem: fromCoordinateSystem} = maskChannels[maskId];\n uniforms.mask_enabled = true;\n uniforms.mask_channel = index;\n\n if (fromCoordinateSystem === COORDINATE_SYSTEM.DEFAULT) {\n fromCoordinateSystem = viewport.isGeospatial\n ? COORDINATE_SYSTEM.LNGLAT\n : COORDINATE_SYSTEM.CARTESIAN;\n }\n const opts = {modelMatrix: null, fromCoordinateOrigin, fromCoordinateSystem};\n const bl = this.projectPosition([bounds[0], bounds[1], 0], opts);\n const tr = this.projectPosition([bounds[2], bounds[3], 0], opts);\n uniforms.mask_bounds = [bl[0], bl[1], tr[0], tr[1]];\n } else {\n if (maskId) {\n log.warn(`Could not find a mask layer with id: ${maskId}`)();\n }\n uniforms.mask_enabled = false;\n }\n }\n}\n"],"file":"mask.js"}
|
|
@@ -8,14 +8,14 @@ const inject = {
|
|
|
8
8
|
'fs:#main-start': "\n if (mask_enabled) {\n bool mask = mask_isInBounds(mask_texCoords);\n\n // Debug: show extent of render target\n // gl_FragColor = vec4(mask_texCoords, 0.0, 1.0);\n gl_FragColor = texture2D(mask_texture, mask_texCoords);\n\n if (!mask) discard;\n }\n"
|
|
9
9
|
};
|
|
10
10
|
|
|
11
|
-
const getMaskUniforms =
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
11
|
+
const getMaskUniforms = opts => {
|
|
12
|
+
if (opts && 'maskMap' in opts) {
|
|
13
|
+
return {
|
|
14
|
+
mask_texture: opts.maskMap
|
|
15
|
+
};
|
|
16
16
|
}
|
|
17
17
|
|
|
18
|
-
return
|
|
18
|
+
return {};
|
|
19
19
|
};
|
|
20
20
|
|
|
21
21
|
export default {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../../src/mask/shader-module.
|
|
1
|
+
{"version":3,"sources":["../../../src/mask/shader-module.ts"],"names":["project","vs","fs","inject","getMaskUniforms","opts","mask_texture","maskMap","name","dependencies","getUniforms"],"mappings":"AAAA,SAAQA,OAAR,QAAsB,eAAtB;AAIA,MAAMC,EAAE,4LAAR;AAQA,MAAMC,EAAE,wiBAAR;AAuBA,MAAMC,MAAM,GAAG;AACb,gDADa;AAIb,oSAJa;AAab,gDAba;AAgBb;AAhBa,CAAf;;AAkCA,MAAMC,eAAe,GAAIC,IAAD,IAAyD;AAC/E,MAAIA,IAAI,IAAI,aAAaA,IAAzB,EAA+B;AAC7B,WAAO;AACLC,MAAAA,YAAY,EAAED,IAAI,CAACE;AADd,KAAP;AAGD;;AACD,SAAO,EAAP;AACD,CAPD;;AASA,eAAe;AACbC,EAAAA,IAAI,EAAE,MADO;AAEbC,EAAAA,YAAY,EAAE,CAACT,OAAD,CAFD;AAGbC,EAAAA,EAHa;AAIbC,EAAAA,EAJa;AAKbC,EAAAA,MALa;AAMbO,EAAAA,WAAW,EAAEN;AANA,CAAf","sourcesContent":["import {project} from '@deck.gl/core';\nimport type {_ShaderModule as ShaderModule} from '@deck.gl/core';\nimport type {Texture2D} from '@luma.gl/webgl';\n\nconst 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`;\n\nconst 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`;\n\nconst inject = {\n 'vs:#decl': `\nvarying vec2 mask_texCoords;\n`,\n 'vs:#main-end': `\n vec4 mask_common_position;\n if (mask_maskByInstance) {\n mask_common_position = project_position(vec4(geometry.worldPosition, 1.0));\n } else {\n mask_common_position = geometry.position;\n }\n mask_texCoords = mask_getCoords(mask_common_position);\n`,\n 'fs:#decl': `\nvarying vec2 mask_texCoords;\n`,\n 'fs:#main-start': `\n if (mask_enabled) {\n bool mask = mask_isInBounds(mask_texCoords);\n\n // Debug: show extent of render target\n // gl_FragColor = vec4(mask_texCoords, 0.0, 1.0);\n gl_FragColor = texture2D(mask_texture, mask_texCoords);\n\n if (!mask) discard;\n }\n`\n};\n\ntype MaskModuleSettings = {\n maskMap?: Texture2D;\n};\n\n/* eslint-disable camelcase */\nconst getMaskUniforms = (opts?: MaskModuleSettings | {}): Record<string, any> => {\n if (opts && 'maskMap' in opts) {\n return {\n mask_texture: opts.maskMap\n };\n }\n return {};\n};\n\nexport default {\n name: 'mask',\n dependencies: [project],\n vs,\n fs,\n inject,\n getUniforms: getMaskUniforms\n} as ShaderModule<MaskModuleSettings>;\n"],"file":"shader-module.js"}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
|
|
1
2
|
import { LayerExtension, _mergeShaders as mergeShaders } from '@deck.gl/core';
|
|
2
3
|
import { dashShaders, offsetShaders } from './shaders.glsl';
|
|
3
4
|
import { dist } from 'gl-matrix/vec3';
|
|
@@ -27,7 +28,7 @@ export default class PathStyleExtension extends LayerExtension {
|
|
|
27
28
|
}
|
|
28
29
|
|
|
29
30
|
isEnabled(layer) {
|
|
30
|
-
return layer.state
|
|
31
|
+
return 'pathTesselator' in layer.state;
|
|
31
32
|
}
|
|
32
33
|
|
|
33
34
|
getShaders(extension) {
|
|
@@ -55,8 +56,6 @@ export default class PathStyleExtension extends LayerExtension {
|
|
|
55
56
|
return;
|
|
56
57
|
}
|
|
57
58
|
|
|
58
|
-
extension.enabled = true;
|
|
59
|
-
|
|
60
59
|
if (extension.opts.dash) {
|
|
61
60
|
attributeManager.addInstanced({
|
|
62
61
|
instanceDashArrays: {
|
|
@@ -124,6 +123,8 @@ export default class PathStyleExtension extends LayerExtension {
|
|
|
124
123
|
}
|
|
125
124
|
|
|
126
125
|
}
|
|
127
|
-
|
|
128
|
-
PathStyleExtension
|
|
126
|
+
|
|
127
|
+
_defineProperty(PathStyleExtension, "defaultProps", defaultProps);
|
|
128
|
+
|
|
129
|
+
_defineProperty(PathStyleExtension, "extensionName", 'PathStyleExtension');
|
|
129
130
|
//# sourceMappingURL=path-style.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../../src/path-style/path-style.
|
|
1
|
+
{"version":3,"sources":["../../../src/path-style/path-style.ts"],"names":["LayerExtension","_mergeShaders","mergeShaders","dashShaders","offsetShaders","dist","defaultProps","getDashArray","type","value","getOffset","dashJustified","dashGapPickable","PathStyleExtension","constructor","dash","offset","highPrecisionDash","isEnabled","layer","state","getShaders","extension","result","opts","initializeState","context","attributeManager","getAttributeManager","addInstanced","instanceDashArrays","size","accessor","instanceDashOffsets","transform","getDashOffsets","bind","instanceOffsets","updateState","params","uniforms","dashAlignMode","props","Boolean","model","setUniforms","path","positionSize","positionFormat","isNested","Array","isArray","geometrySize","length","p","prevP","i","slice","projectPosition"],"mappings":"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","sourcesContent":["// Copyright (c) 2015 - 2017 Uber Technologies, Inc.\n//\n// Permission is hereby granted, free of charge, to any person obtaining a copy\n// of this software and associated documentation files (the \"Software\"), to deal\n// in the Software without restriction, including without limitation the rights\n// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell\n// copies of the Software, and to permit persons to whom the Software is\n// furnished to do so, subject to the following conditions:\n//\n// The above copyright notice and this permission notice shall be included in\n// all copies or substantial portions of the Software.\n//\n// THE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\n// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,\n// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE\n// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER\n// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,\n// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN\n// THE SOFTWARE.\n\nimport {LayerExtension, _mergeShaders as mergeShaders} from '@deck.gl/core';\nimport {dashShaders, offsetShaders} from './shaders.glsl';\nimport {dist} from 'gl-matrix/vec3';\n\nimport type {Layer, LayerContext, Accessor, UpdateParameters} from '@deck.gl/core';\n\nconst defaultProps = {\n getDashArray: {type: 'accessor', value: [0, 0]},\n getOffset: {type: 'accessor', value: 0},\n dashJustified: false,\n dashGapPickable: false\n};\n\nexport type PathStyleExtensionProps<DataT = any> = {\n /**\n * Accessor for the dash array to draw each path with: `[dashSize, gapSize]` relative to the width of the path.\n * Requires the `dash` option to be on.\n */\n getDashArray?: Accessor<DataT, [number, number]>;\n /**\n * Accessor for the offset to draw each path with, relative to the width of the path.\n * Negative offset is to the left hand side, and positive offset is to the right hand side.\n * @default 0\n */\n getOffset?: Accessor<DataT, number>;\n /**\n * If `true`, adjust gaps for the dashes to align at both ends.\n * @default false\n */\n dashJustified?: boolean;\n /**\n * If `true`, gaps between solid strokes are pickable. If `false`, only the solid strokes are pickable.\n * @default false\n */\n dashGapPickable?: boolean;\n};\n\ntype PathStyleExtensionOptions = {\n /**\n * Add capability to render dashed lines.\n * @default false\n */\n dash: boolean;\n /**\n * Add capability to offset lines.\n * @default false\n */\n offset: boolean;\n /**\n * Improve dash rendering quality in certain circumstances. Note that this option introduces additional performance overhead.\n * @default false\n */\n highPrecisionDash: boolean;\n};\n\n/** Adds selected features to the `PathLayer` and composite layers that render the `PathLayer`. */\nexport default class PathStyleExtension extends LayerExtension<PathStyleExtensionOptions> {\n static defaultProps = defaultProps;\n static extensionName = 'PathStyleExtension';\n\n constructor({\n dash = false,\n offset = false,\n highPrecisionDash = false\n }: Partial<PathStyleExtensionOptions> = {}) {\n super({dash: dash || highPrecisionDash, offset, highPrecisionDash});\n }\n\n isEnabled(layer: Layer<PathStyleExtensionProps>): boolean {\n return 'pathTesselator' in layer.state;\n }\n\n getShaders(this: Layer<PathStyleExtensionProps>, extension: this): any {\n if (!extension.isEnabled(this)) {\n return null;\n }\n\n // Merge shader injection\n let result = {};\n if (extension.opts.dash) {\n result = mergeShaders(result, dashShaders);\n }\n if (extension.opts.offset) {\n result = mergeShaders(result, offsetShaders);\n }\n\n return result;\n }\n\n initializeState(this: Layer<PathStyleExtensionProps>, context: LayerContext, extension: this) {\n const attributeManager = this.getAttributeManager();\n if (!attributeManager || !extension.isEnabled(this)) {\n // This extension only works with the PathLayer\n return;\n }\n\n if (extension.opts.dash) {\n attributeManager.addInstanced({\n instanceDashArrays: {size: 2, accessor: 'getDashArray'}\n });\n }\n if (extension.opts.highPrecisionDash) {\n attributeManager.addInstanced({\n instanceDashOffsets: {\n size: 1,\n accessor: 'getPath',\n transform: extension.getDashOffsets.bind(this)\n }\n });\n }\n if (extension.opts.offset) {\n attributeManager.addInstanced({\n instanceOffsets: {size: 1, accessor: 'getOffset'}\n });\n }\n }\n\n updateState(\n this: Layer<PathStyleExtensionProps>,\n params: UpdateParameters<Layer<PathStyleExtensionProps>>,\n extension: this\n ) {\n if (!extension.isEnabled(this)) {\n return;\n }\n\n const uniforms: any = {};\n\n if (extension.opts.dash) {\n uniforms.dashAlignMode = this.props.dashJustified ? 1 : 0;\n uniforms.dashGapPickable = Boolean(this.props.dashGapPickable);\n }\n\n this.state.model.setUniforms(uniforms);\n }\n\n getDashOffsets(this: Layer<PathStyleExtensionProps>, path: number[] | number[][]): number[] {\n const result = [0];\n const positionSize = this.props.positionFormat === 'XY' ? 2 : 3;\n const isNested = Array.isArray(path[0]);\n const geometrySize = isNested ? path.length : path.length / positionSize;\n\n let p;\n let prevP;\n for (let i = 0; i < geometrySize - 1; i++) {\n p = isNested ? path[i] : path.slice(i * positionSize, i * positionSize + positionSize);\n p = this.projectPosition(p);\n\n if (i > 0) {\n result[i] = result[i - 1] + dist(prevP, p);\n }\n\n prevP = p;\n }\n return result;\n }\n}\n"],"file":"path-style.js"}
|
|
@@ -3,7 +3,7 @@ export const dashShaders = {
|
|
|
3
3
|
'vs:#decl': "\nattribute vec2 instanceDashArrays;\nattribute float instanceDashOffsets;\nvarying vec2 vDashArray;\nvarying float vDashOffset;\n",
|
|
4
4
|
'vs:#main-end': "\nvDashArray = instanceDashArrays;\nvDashOffset = instanceDashOffsets / width.x;\n",
|
|
5
5
|
'fs:#decl': "\nuniform float dashAlignMode;\nuniform float capType;\nuniform bool dashGapPickable;\nvarying vec2 vDashArray;\nvarying float vDashOffset;\n\nfloat round(float x) {\n return floor(x + 0.5);\n}\n",
|
|
6
|
-
'fs:#main-start': "\n float solidLength = vDashArray.x;\n float gapLength = vDashArray.y;\n float unitLength = solidLength + gapLength;\n\n float offset;\n\n if (unitLength > 0.0) {\n if (dashAlignMode == 0.0) {\n offset = vDashOffset;\n } else {\n unitLength = vPathLength / round(vPathLength / unitLength);\n offset = solidLength / 2.0;\n }\n\n float unitOffset = mod(clamp(vPathPosition.y, 0.0, vPathLength) + offset, unitLength);\n\n if (gapLength > 0.0 && unitOffset > solidLength) {\n if (capType <= 0.5) {\n if (!(dashGapPickable && picking_uActive)) {\n discard;\n }\n } else {\n float distToEnd = length(vec2(\n min(unitOffset - solidLength, unitLength - unitOffset),\n vPathPosition.x\n ));\n if (distToEnd > 1.0) {\n if (!(dashGapPickable && picking_uActive)) {\n discard;\n }\n }\n }\n }\n }\n"
|
|
6
|
+
'fs:#main-start': "\n float solidLength = vDashArray.x;\n float gapLength = vDashArray.y;\n float unitLength = solidLength + gapLength;\n\n float offset;\n\n if (unitLength > 0.0) {\n if (dashAlignMode == 0.0) {\n offset = vDashOffset;\n } else {\n unitLength = vPathLength / round(vPathLength / unitLength);\n offset = solidLength / 2.0;\n }\n\n float unitOffset = mod(clamp(vPathPosition.y, 0.0, vPathLength) + offset, unitLength);\n\n if (gapLength > 0.0 && unitOffset > solidLength) {\n if (capType <= 0.5) {\n if (!(dashGapPickable && picking_uActive)) {\n discard;\n }\n } else {\n // caps are rounded, test the distance to solid ends\n float distToEnd = length(vec2(\n min(unitOffset - solidLength, unitLength - unitOffset),\n vPathPosition.x\n ));\n if (distToEnd > 1.0) {\n if (!(dashGapPickable && picking_uActive)) {\n discard;\n }\n }\n }\n }\n }\n"
|
|
7
7
|
}
|
|
8
8
|
};
|
|
9
9
|
export const offsetShaders = {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../../src/path-style/shaders.glsl.
|
|
1
|
+
{"version":3,"sources":["../../../src/path-style/shaders.glsl.ts"],"names":["dashShaders","inject","offsetShaders"],"mappings":"AAAA,OAAO,MAAMA,WAAW,GAAG;AACzBC,EAAAA,MAAM,EAAE;AACN,oJADM;AAQN,wGARM;AAaN,sNAbM;AAiCN;AAjCM;AADiB,CAApB;AA0EP,OAAO,MAAMC,aAAa,GAAG;AAC3BD,EAAAA,MAAM,EAAE;AACN,sDADM;AAIN,kHAJM;AAQN,qPARM;AAaN;AAbM;AADmB,CAAtB","sourcesContent":["export const dashShaders = {\n inject: {\n 'vs:#decl': `\nattribute vec2 instanceDashArrays;\nattribute float instanceDashOffsets;\nvarying vec2 vDashArray;\nvarying float vDashOffset;\n`,\n\n 'vs:#main-end': `\nvDashArray = instanceDashArrays;\nvDashOffset = instanceDashOffsets / width.x;\n`,\n\n 'fs:#decl': `\nuniform float dashAlignMode;\nuniform float capType;\nuniform bool dashGapPickable;\nvarying vec2 vDashArray;\nvarying float vDashOffset;\n\nfloat round(float x) {\n return floor(x + 0.5);\n}\n`,\n\n // if given position is in the gap part of the dashed line\n // dashArray.x: solid stroke length, relative to width\n // dashArray.y: gap length, relative to width\n // alignMode:\n // 0 - no adjustment\n // o---- ---- ---- ---- o---- -o---- ---- o\n // 1 - stretch to fit, draw half dash at each end for nicer joints\n // o-- ---- ---- ---- --o-- --o-- ---- --o\n 'fs:#main-start': `\n float solidLength = vDashArray.x;\n float gapLength = vDashArray.y;\n float unitLength = solidLength + gapLength;\n\n float offset;\n\n if (unitLength > 0.0) {\n if (dashAlignMode == 0.0) {\n offset = vDashOffset;\n } else {\n unitLength = vPathLength / round(vPathLength / unitLength);\n offset = solidLength / 2.0;\n }\n\n float unitOffset = mod(clamp(vPathPosition.y, 0.0, vPathLength) + offset, unitLength);\n\n if (gapLength > 0.0 && unitOffset > solidLength) {\n if (capType <= 0.5) {\n if (!(dashGapPickable && picking_uActive)) {\n discard;\n }\n } else {\n // caps are rounded, test the distance to solid ends\n float distToEnd = length(vec2(\n min(unitOffset - solidLength, unitLength - unitOffset),\n vPathPosition.x\n ));\n if (distToEnd > 1.0) {\n if (!(dashGapPickable && picking_uActive)) {\n discard;\n }\n }\n }\n }\n }\n`\n }\n};\n\nexport const offsetShaders = {\n inject: {\n 'vs:#decl': `\nattribute float instanceOffsets;\n`,\n 'vs:DECKGL_FILTER_SIZE': `\n float offsetWidth = abs(instanceOffsets * 2.0) + 1.0;\n size *= offsetWidth;\n`,\n 'vCornerOffset = offsetVec;': `\n float offsetWidth = abs(instanceOffsets * 2.0) + 1.0;\n vec2 offsetCenter = -instanceOffsets * (isCap ? perp : miterVec * miterSize) * 2.0;\n vCornerOffset = vCornerOffset * offsetWidth - offsetCenter;\n`,\n 'fs:#main-start': `\n float isInside;\n isInside = step(-1.0, vPathPosition.x) * step(vPathPosition.x, 1.0);\n if (isInside == 0.0) {\n discard;\n }\n`\n }\n};\n"],"file":"shaders.glsl.js"}
|