@deck.gl/extensions 8.9.0-beta.2 → 8.9.0-beta.4
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 +281 -460
- package/dist/es5/{collide/collide-effect.js → collision-filter/collision-filter-effect.js} +79 -72
- package/dist/es5/collision-filter/collision-filter-effect.js.map +1 -0
- package/dist/es5/{collide/collide-pass.js → collision-filter/collision-filter-pass.js} +13 -13
- package/dist/es5/collision-filter/collision-filter-pass.js.map +1 -0
- package/dist/es5/{collide/collide.js → collision-filter/collision-filter.js} +30 -30
- package/dist/es5/collision-filter/collision-filter.js.map +1 -0
- package/dist/es5/collision-filter/shader-module.js +39 -0
- package/dist/es5/collision-filter/shader-module.js.map +1 -0
- package/dist/es5/data-filter/data-filter.js +1 -1
- package/dist/es5/data-filter/data-filter.js.map +1 -1
- package/dist/es5/index.js +4 -4
- package/dist/es5/index.js.map +1 -1
- package/dist/es5/mask/mask-effect.js +17 -8
- package/dist/es5/mask/mask-effect.js.map +1 -1
- package/dist/es5/terrain/height-map-builder.js +1 -1
- package/dist/es5/terrain/height-map-builder.js.map +1 -1
- package/dist/es5/terrain/shader-module.js.map +1 -1
- package/dist/es5/terrain/terrain-cover.js +1 -1
- package/dist/es5/terrain/terrain-cover.js.map +1 -1
- package/dist/es5/terrain/terrain-effect.js +5 -5
- package/dist/es5/terrain/terrain-effect.js.map +1 -1
- package/dist/es5/terrain/terrain.js +7 -7
- package/dist/es5/terrain/terrain.js.map +1 -1
- package/dist/es5/{common → utils}/projection-utils.js +3 -1
- package/dist/es5/utils/projection-utils.js.map +1 -0
- package/dist/esm/{collide/collide-effect.js → collision-filter/collision-filter-effect.js} +69 -64
- package/dist/esm/collision-filter/collision-filter-effect.js.map +1 -0
- package/dist/esm/{collide/collide-pass.js → collision-filter/collision-filter-pass.js} +5 -5
- package/dist/esm/collision-filter/collision-filter-pass.js.map +1 -0
- package/dist/esm/collision-filter/collision-filter.js +78 -0
- package/dist/esm/collision-filter/collision-filter.js.map +1 -0
- package/dist/esm/collision-filter/shader-module.js +32 -0
- package/dist/esm/collision-filter/shader-module.js.map +1 -0
- package/dist/esm/data-filter/data-filter.js +1 -1
- package/dist/esm/data-filter/data-filter.js.map +1 -1
- package/dist/esm/index.js +2 -2
- package/dist/esm/index.js.map +1 -1
- package/dist/esm/mask/mask-effect.js +14 -8
- package/dist/esm/mask/mask-effect.js.map +1 -1
- package/dist/esm/terrain/height-map-builder.js +1 -1
- package/dist/esm/terrain/height-map-builder.js.map +1 -1
- package/dist/esm/terrain/shader-module.js.map +1 -1
- package/dist/esm/terrain/terrain-cover.js +1 -1
- package/dist/esm/terrain/terrain-cover.js.map +1 -1
- package/dist/esm/terrain/terrain-effect.js +5 -5
- package/dist/esm/terrain/terrain-effect.js.map +1 -1
- package/dist/esm/terrain/terrain.js +7 -7
- package/dist/esm/terrain/terrain.js.map +1 -1
- package/dist/esm/{common → utils}/projection-utils.js +3 -1
- package/dist/esm/utils/projection-utils.js.map +1 -0
- package/dist.min.js +59 -62
- package/package.json +2 -2
- package/src/{collide/collide-effect.ts → collision-filter/collision-filter-effect.ts} +81 -78
- package/src/{collide/collide-pass.ts → collision-filter/collision-filter-pass.ts} +6 -6
- package/src/collision-filter/collision-filter.ts +83 -0
- package/src/collision-filter/shader-module.ts +113 -0
- package/src/data-filter/data-filter.ts +1 -1
- package/src/index.ts +3 -3
- package/src/mask/mask-effect.ts +32 -13
- package/src/terrain/height-map-builder.ts +2 -2
- package/src/terrain/shader-module.ts +4 -1
- package/src/terrain/terrain-cover.ts +2 -2
- package/src/terrain/terrain-effect.ts +5 -5
- package/src/terrain/terrain.ts +10 -10
- package/src/{common → utils}/projection-utils.ts +4 -2
- package/typed/collision-filter/collision-filter-effect.d.ts +28 -0
- package/typed/collision-filter/collision-filter-effect.d.ts.map +1 -0
- package/typed/collision-filter/collision-filter-pass.d.ts +14 -0
- package/typed/collision-filter/collision-filter-pass.d.ts.map +1 -0
- package/typed/collision-filter/collision-filter.d.ts +41 -0
- package/typed/collision-filter/collision-filter.d.ts.map +1 -0
- package/typed/collision-filter/shader-module.d.ts +4 -0
- package/typed/collision-filter/shader-module.d.ts.map +1 -0
- package/typed/data-filter/data-filter.d.ts +1 -1
- package/typed/index.d.ts +3 -3
- package/typed/index.d.ts.map +1 -1
- package/typed/mask/mask-effect.d.ts +2 -2
- package/typed/mask/mask-effect.d.ts.map +1 -1
- package/typed/terrain/height-map-builder.d.ts +2 -2
- package/typed/terrain/height-map-builder.d.ts.map +1 -1
- package/typed/terrain/shader-module.d.ts +1 -1
- package/typed/terrain/shader-module.d.ts.map +1 -1
- package/typed/terrain/terrain-cover.d.ts +2 -2
- package/typed/terrain/terrain-cover.d.ts.map +1 -1
- package/typed/terrain/terrain.d.ts +2 -2
- package/typed/terrain/terrain.d.ts.map +1 -1
- package/typed/utils/projection-utils.d.ts +27 -0
- package/typed/utils/projection-utils.d.ts.map +1 -0
- package/dist/es5/collide/collide-effect.js.map +0 -1
- package/dist/es5/collide/collide-pass.js.map +0 -1
- package/dist/es5/collide/collide.js.map +0 -1
- package/dist/es5/collide/shader-module.js +0 -39
- package/dist/es5/collide/shader-module.js.map +0 -1
- package/dist/es5/common/projection-utils.js.map +0 -1
- package/dist/es5/mask/utils.js +0 -136
- package/dist/es5/mask/utils.js.map +0 -1
- package/dist/esm/collide/collide-effect.js.map +0 -1
- package/dist/esm/collide/collide-pass.js.map +0 -1
- package/dist/esm/collide/collide.js +0 -78
- package/dist/esm/collide/collide.js.map +0 -1
- package/dist/esm/collide/shader-module.js +0 -32
- package/dist/esm/collide/shader-module.js.map +0 -1
- package/dist/esm/common/projection-utils.js.map +0 -1
- package/dist/esm/mask/utils.js +0 -109
- package/dist/esm/mask/utils.js.map +0 -1
- package/src/collide/collide.ts +0 -79
- package/src/collide/shader-module.ts +0 -113
- package/src/mask/utils.ts +0 -148
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../../src/data-filter/data-filter.ts"],"names":["LayerExtension","shaderModule","shaderModule64","aggregator","readPixelsToArray","clear","defaultProps","getFilterValue","type","value","onFilteredItemsChange","compare","filterEnabled","filterRange","filterSoftRange","filterTransformSize","filterTransformColor","DATA_TYPE_FROM_SIZE","DataFilterExtension","constructor","filterSize","fp64","countItems","Error","getShaders","extension","opts","modules","defines","DATAFILTER_TYPE","DATAFILTER_DOUBLE","Boolean","initializeState","context","attributeManager","getAttributeManager","add","filterValues","size","accessor","shaderAttributes","divisor","instanceFilterValues","gl","useFloatTarget","supportsFloatTarget","filterIndices","vertexOffset","normalized","object","index","i","__source","Math","floor","filterPrevIndices","filterFBO","getFramebuffer","filterModel","getModel","call","setState","updateState","props","oldProps","state","filterNeedsUpdate","attributes","needsUpdate","draw","params","setVertexCount","getNumInstances","framebuffer","color","updateModuleSettings","moduleParameters","setAttributes","getShaderAttributes","parameters","viewport","width","height","count","length","id","finalizeState","delete"],"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} from '@deck.gl/core';\nimport {shaderModule, shaderModule64} from './shader-module';\nimport * as aggregator from './aggregator';\nimport {readPixelsToArray, clear} from '@luma.gl/core';\nimport GL from '@luma.gl/constants';\n\nimport type {Layer, LayerContext, Accessor, UpdateParameters} from '@deck.gl/core';\n\nconst defaultProps = {\n getFilterValue: {type: 'accessor', value: 0},\n onFilteredItemsChange: {type: 'function', value: null, compare: false},\n\n filterEnabled: true,\n filterRange: [-1, 1],\n filterSoftRange: null,\n filterTransformSize: true,\n filterTransformColor: true\n};\n\nexport type DataFilterExtensionProps<DataT = any> = {\n /**\n * Accessor to retrieve the value for each object that it will be filtered by.\n * Returns either a number (if `filterSize: 1`) or an array of numbers.\n */\n getFilterValue?: Accessor<DataT, number | number[]>;\n /**\n * Enable/disable the data filter. If the data filter is disabled, all objects are rendered.\n * @default true\n */\n filterEnabled?: boolean;\n /**\n * The [min, max] bounds which defines whether an object should be rendered.\n * If an object's filtered value is within the bounds, the object will be rendered; otherwise it will be hidden.\n * @default [-1, 1]\n */\n filterRange?: [number, number] | [number, number][];\n /**\n * If specified, objects will be faded in/out instead of abruptly shown/hidden.\n * When the filtered value is outside of the bounds defined by `filterSoftRange` but still within the bounds defined by `filterRange`, the object will be rendered as \"faded.\"\n * @default null\n */\n filterSoftRange?: [number, number] | [number, number][] | null;\n /**\n * When an object is \"faded\", manipulate its size so that it appears smaller or thinner. Only works if `filterSoftRange` is specified.\n * @default true\n */\n filterTransformSize?: boolean;\n /**\n * When an object is \"faded\", manipulate its opacity so that it appears more translucent. Only works if `filterSoftRange` is specified.\n * @default true\n */\n filterTransformColor?: boolean;\n /**\n * Only called if the `countItems` option is enabled.\n */\n onFilteredItemsChange?: (evt: {\n /** The id of the source layer. */\n id: string;\n /** The number of data objects that pass the filter. */\n count: number;\n }) => void;\n};\n\ntype DataFilterExtensionOptions = {\n /**\n * The size of the filter (number of columns to filter by). The data filter can show/hide data based on 1-4 numeric properties of each object.\n * @default 1\n */\n filterSize: number;\n /**\n * Use 64-bit precision instead of 32-bit.\n * @default false\n */\n fp64: boolean;\n /**\n * If `true`, reports the number of filtered objects with the `onFilteredItemsChange` callback.\n * @default `false`.\n */\n countItems: boolean;\n};\n\nconst DATA_TYPE_FROM_SIZE = {\n 1: 'float',\n 2: 'vec2',\n 3: 'vec3',\n 4: 'vec4'\n};\n\n/** Adds GPU-based data filtering functionalities to layers. It allows the layer to show/hide objects based on user-defined properties. */\nexport default class DataFilterExtension extends LayerExtension<DataFilterExtensionOptions> {\n static defaultProps = defaultProps;\n static extensionName = 'DataFilterExtension';\n\n constructor({\n filterSize = 1,\n fp64 = false,\n countItems = false\n }: Partial<DataFilterExtensionOptions> = {}) {\n if (!DATA_TYPE_FROM_SIZE[filterSize]) {\n throw new Error('filterSize out of range');\n }\n\n super({filterSize, fp64, countItems});\n }\n\n getShaders(this: Layer<DataFilterExtensionProps>, extension: this): any {\n const {filterSize, fp64} = extension.opts;\n\n return {\n modules: [fp64 ? shaderModule64 : shaderModule],\n defines: {\n DATAFILTER_TYPE: DATA_TYPE_FROM_SIZE[filterSize],\n DATAFILTER_DOUBLE: Boolean(fp64)\n }\n };\n }\n\n initializeState(this: Layer<DataFilterExtensionProps>, context: LayerContext, extension: this) {\n const attributeManager = this.getAttributeManager();\n if (attributeManager) {\n attributeManager.add({\n filterValues: {\n size: extension.opts.filterSize,\n type: extension.opts.fp64 ? GL.DOUBLE : GL.FLOAT,\n accessor: 'getFilterValue',\n shaderAttributes: {\n filterValues: {\n divisor: 0\n },\n instanceFilterValues: {\n divisor: 1\n }\n }\n }\n });\n }\n\n const {gl} = this.context;\n if (attributeManager && extension.opts.countItems) {\n const useFloatTarget = aggregator.supportsFloatTarget(gl);\n // This attribute is needed for variable-width data, e.g. Path, SolidPolygon, Text\n // The vertex shader checks if a vertex has the same \"index\" as the previous vertex\n // so that we only write one count cross multiple vertices of the same object\n attributeManager.add({\n filterIndices: {\n size: useFloatTarget ? 1 : 2,\n vertexOffset: 1,\n type: GL.UNSIGNED_BYTE,\n normalized: true,\n accessor: (object, {index}) => {\n const i = object && object.__source ? object.__source.index : index;\n return useFloatTarget ? (i + 1) % 255 : [(i + 1) % 255, Math.floor(i / 255) % 255];\n },\n shaderAttributes: {\n filterPrevIndices: {\n vertexOffset: 0\n },\n filterIndices: {\n vertexOffset: 1\n }\n }\n }\n });\n\n const filterFBO = aggregator.getFramebuffer(gl, useFloatTarget);\n const filterModel = aggregator.getModel(\n gl,\n extension.getShaders.call(this, extension),\n useFloatTarget\n );\n this.setState({filterFBO, filterModel});\n }\n }\n\n updateState(\n this: Layer<DataFilterExtensionProps>,\n {props, oldProps}: UpdateParameters<Layer<DataFilterExtensionProps>>\n ) {\n if (this.state.filterModel) {\n const attributeManager = this.getAttributeManager();\n const filterNeedsUpdate =\n // attributeManager must be defined for filterModel to be set\n attributeManager!.attributes.filterValues.needsUpdate() ||\n props.filterEnabled !== oldProps.filterEnabled ||\n props.filterRange !== oldProps.filterRange ||\n props.filterSoftRange !== oldProps.filterSoftRange;\n if (filterNeedsUpdate) {\n this.setState({filterNeedsUpdate});\n }\n }\n }\n\n draw(this: Layer<DataFilterExtensionProps>, params: any, extension: this) {\n const {filterFBO, filterModel, filterNeedsUpdate} = this.state;\n const {onFilteredItemsChange} = this.props;\n if (filterNeedsUpdate && onFilteredItemsChange && filterModel) {\n const {\n attributes: {filterValues, filterIndices}\n } = this.getAttributeManager()!;\n filterModel.setVertexCount(this.getNumInstances());\n\n const {gl} = this.context;\n clear(gl, {framebuffer: filterFBO, color: [0, 0, 0, 0]});\n\n filterModel\n .updateModuleSettings(params.moduleParameters)\n .setAttributes({\n ...filterValues.getShaderAttributes(),\n ...(filterIndices && filterIndices.getShaderAttributes())\n })\n .draw({\n framebuffer: filterFBO,\n parameters: {\n ...aggregator.parameters,\n viewport: [0, 0, filterFBO.width, filterFBO.height]\n }\n });\n const color = readPixelsToArray(filterFBO);\n let count = 0;\n for (let i = 0; i < color.length; i++) {\n count += color[i];\n }\n onFilteredItemsChange({id: this.id, count});\n\n this.state.filterNeedsUpdate = false;\n }\n }\n\n finalizeState(this: Layer<DataFilterExtensionProps>) {\n const {filterFBO, filterModel} = this.state;\n if (filterFBO) {\n filterFBO.color.delete();\n filterFBO.delete();\n filterModel.delete();\n }\n }\n}\n"],"file":"data-filter.js"}
|
|
1
|
+
{"version":3,"sources":["../../../src/data-filter/data-filter.ts"],"names":["LayerExtension","shaderModule","shaderModule64","aggregator","readPixelsToArray","clear","defaultProps","getFilterValue","type","value","onFilteredItemsChange","optional","filterEnabled","filterRange","filterSoftRange","filterTransformSize","filterTransformColor","DATA_TYPE_FROM_SIZE","DataFilterExtension","constructor","filterSize","fp64","countItems","Error","getShaders","extension","opts","modules","defines","DATAFILTER_TYPE","DATAFILTER_DOUBLE","Boolean","initializeState","context","attributeManager","getAttributeManager","add","filterValues","size","accessor","shaderAttributes","divisor","instanceFilterValues","gl","useFloatTarget","supportsFloatTarget","filterIndices","vertexOffset","normalized","object","index","i","__source","Math","floor","filterPrevIndices","filterFBO","getFramebuffer","filterModel","getModel","call","setState","updateState","props","oldProps","state","filterNeedsUpdate","attributes","needsUpdate","draw","params","setVertexCount","getNumInstances","framebuffer","color","updateModuleSettings","moduleParameters","setAttributes","getShaderAttributes","parameters","viewport","width","height","count","length","id","finalizeState","delete"],"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} from '@deck.gl/core';\nimport {shaderModule, shaderModule64} from './shader-module';\nimport * as aggregator from './aggregator';\nimport {readPixelsToArray, clear} from '@luma.gl/core';\nimport GL from '@luma.gl/constants';\n\nimport type {Layer, LayerContext, Accessor, UpdateParameters} from '@deck.gl/core';\n\nconst defaultProps = {\n getFilterValue: {type: 'accessor', value: 0},\n onFilteredItemsChange: {type: 'function', value: null, optional: true},\n\n filterEnabled: true,\n filterRange: [-1, 1],\n filterSoftRange: null,\n filterTransformSize: true,\n filterTransformColor: true\n};\n\nexport type DataFilterExtensionProps<DataT = any> = {\n /**\n * Accessor to retrieve the value for each object that it will be filtered by.\n * Returns either a number (if `filterSize: 1`) or an array of numbers.\n */\n getFilterValue?: Accessor<DataT, number | number[]>;\n /**\n * Enable/disable the data filter. If the data filter is disabled, all objects are rendered.\n * @default true\n */\n filterEnabled?: boolean;\n /**\n * The [min, max] bounds which defines whether an object should be rendered.\n * If an object's filtered value is within the bounds, the object will be rendered; otherwise it will be hidden.\n * @default [-1, 1]\n */\n filterRange?: [number, number] | [number, number][];\n /**\n * If specified, objects will be faded in/out instead of abruptly shown/hidden.\n * When the filtered value is outside of the bounds defined by `filterSoftRange` but still within the bounds defined by `filterRange`, the object will be rendered as \"faded.\"\n * @default null\n */\n filterSoftRange?: [number, number] | [number, number][] | null;\n /**\n * When an object is \"faded\", manipulate its size so that it appears smaller or thinner. Only works if `filterSoftRange` is specified.\n * @default true\n */\n filterTransformSize?: boolean;\n /**\n * When an object is \"faded\", manipulate its opacity so that it appears more translucent. Only works if `filterSoftRange` is specified.\n * @default true\n */\n filterTransformColor?: boolean;\n /**\n * Only called if the `countItems` option is enabled.\n */\n onFilteredItemsChange?: (evt: {\n /** The id of the source layer. */\n id: string;\n /** The number of data objects that pass the filter. */\n count: number;\n }) => void;\n};\n\ntype DataFilterExtensionOptions = {\n /**\n * The size of the filter (number of columns to filter by). The data filter can show/hide data based on 1-4 numeric properties of each object.\n * @default 1\n */\n filterSize: number;\n /**\n * Use 64-bit precision instead of 32-bit.\n * @default false\n */\n fp64: boolean;\n /**\n * If `true`, reports the number of filtered objects with the `onFilteredItemsChange` callback.\n * @default `false`.\n */\n countItems: boolean;\n};\n\nconst DATA_TYPE_FROM_SIZE = {\n 1: 'float',\n 2: 'vec2',\n 3: 'vec3',\n 4: 'vec4'\n};\n\n/** Adds GPU-based data filtering functionalities to layers. It allows the layer to show/hide objects based on user-defined properties. */\nexport default class DataFilterExtension extends LayerExtension<DataFilterExtensionOptions> {\n static defaultProps = defaultProps;\n static extensionName = 'DataFilterExtension';\n\n constructor({\n filterSize = 1,\n fp64 = false,\n countItems = false\n }: Partial<DataFilterExtensionOptions> = {}) {\n if (!DATA_TYPE_FROM_SIZE[filterSize]) {\n throw new Error('filterSize out of range');\n }\n\n super({filterSize, fp64, countItems});\n }\n\n getShaders(this: Layer<DataFilterExtensionProps>, extension: this): any {\n const {filterSize, fp64} = extension.opts;\n\n return {\n modules: [fp64 ? shaderModule64 : shaderModule],\n defines: {\n DATAFILTER_TYPE: DATA_TYPE_FROM_SIZE[filterSize],\n DATAFILTER_DOUBLE: Boolean(fp64)\n }\n };\n }\n\n initializeState(this: Layer<DataFilterExtensionProps>, context: LayerContext, extension: this) {\n const attributeManager = this.getAttributeManager();\n if (attributeManager) {\n attributeManager.add({\n filterValues: {\n size: extension.opts.filterSize,\n type: extension.opts.fp64 ? GL.DOUBLE : GL.FLOAT,\n accessor: 'getFilterValue',\n shaderAttributes: {\n filterValues: {\n divisor: 0\n },\n instanceFilterValues: {\n divisor: 1\n }\n }\n }\n });\n }\n\n const {gl} = this.context;\n if (attributeManager && extension.opts.countItems) {\n const useFloatTarget = aggregator.supportsFloatTarget(gl);\n // This attribute is needed for variable-width data, e.g. Path, SolidPolygon, Text\n // The vertex shader checks if a vertex has the same \"index\" as the previous vertex\n // so that we only write one count cross multiple vertices of the same object\n attributeManager.add({\n filterIndices: {\n size: useFloatTarget ? 1 : 2,\n vertexOffset: 1,\n type: GL.UNSIGNED_BYTE,\n normalized: true,\n accessor: (object, {index}) => {\n const i = object && object.__source ? object.__source.index : index;\n return useFloatTarget ? (i + 1) % 255 : [(i + 1) % 255, Math.floor(i / 255) % 255];\n },\n shaderAttributes: {\n filterPrevIndices: {\n vertexOffset: 0\n },\n filterIndices: {\n vertexOffset: 1\n }\n }\n }\n });\n\n const filterFBO = aggregator.getFramebuffer(gl, useFloatTarget);\n const filterModel = aggregator.getModel(\n gl,\n extension.getShaders.call(this, extension),\n useFloatTarget\n );\n this.setState({filterFBO, filterModel});\n }\n }\n\n updateState(\n this: Layer<DataFilterExtensionProps>,\n {props, oldProps}: UpdateParameters<Layer<DataFilterExtensionProps>>\n ) {\n if (this.state.filterModel) {\n const attributeManager = this.getAttributeManager();\n const filterNeedsUpdate =\n // attributeManager must be defined for filterModel to be set\n attributeManager!.attributes.filterValues.needsUpdate() ||\n props.filterEnabled !== oldProps.filterEnabled ||\n props.filterRange !== oldProps.filterRange ||\n props.filterSoftRange !== oldProps.filterSoftRange;\n if (filterNeedsUpdate) {\n this.setState({filterNeedsUpdate});\n }\n }\n }\n\n draw(this: Layer<DataFilterExtensionProps>, params: any, extension: this) {\n const {filterFBO, filterModel, filterNeedsUpdate} = this.state;\n const {onFilteredItemsChange} = this.props;\n if (filterNeedsUpdate && onFilteredItemsChange && filterModel) {\n const {\n attributes: {filterValues, filterIndices}\n } = this.getAttributeManager()!;\n filterModel.setVertexCount(this.getNumInstances());\n\n const {gl} = this.context;\n clear(gl, {framebuffer: filterFBO, color: [0, 0, 0, 0]});\n\n filterModel\n .updateModuleSettings(params.moduleParameters)\n .setAttributes({\n ...filterValues.getShaderAttributes(),\n ...(filterIndices && filterIndices.getShaderAttributes())\n })\n .draw({\n framebuffer: filterFBO,\n parameters: {\n ...aggregator.parameters,\n viewport: [0, 0, filterFBO.width, filterFBO.height]\n }\n });\n const color = readPixelsToArray(filterFBO);\n let count = 0;\n for (let i = 0; i < color.length; i++) {\n count += color[i];\n }\n onFilteredItemsChange({id: this.id, count});\n\n this.state.filterNeedsUpdate = false;\n }\n }\n\n finalizeState(this: Layer<DataFilterExtensionProps>) {\n const {filterFBO, filterModel} = this.state;\n if (filterFBO) {\n filterFBO.color.delete();\n filterFBO.delete();\n filterModel.delete();\n }\n }\n}\n"],"file":"data-filter.js"}
|
package/dist/esm/index.js
CHANGED
|
@@ -4,8 +4,8 @@ export { default as Fp64Extension } from './fp64/fp64';
|
|
|
4
4
|
export { default as PathStyleExtension } from './path-style/path-style';
|
|
5
5
|
export { default as FillStyleExtension } from './fill-style/fill-style';
|
|
6
6
|
export { default as ClipExtension } from './clip/clip';
|
|
7
|
-
export { default as
|
|
7
|
+
export { default as CollisionFilterExtension } from './collision-filter/collision-filter';
|
|
8
8
|
export { default as MaskExtension } from './mask/mask';
|
|
9
|
-
export { default as
|
|
9
|
+
export { default as _TerrainExtension } from './terrain/terrain';
|
|
10
10
|
export { default as project64 } from './fp64/project64';
|
|
11
11
|
//# sourceMappingURL=index.js.map
|
package/dist/esm/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../src/index.ts"],"names":["default","BrushingExtension","DataFilterExtension","Fp64Extension","PathStyleExtension","FillStyleExtension","ClipExtension","
|
|
1
|
+
{"version":3,"sources":["../../src/index.ts"],"names":["default","BrushingExtension","DataFilterExtension","Fp64Extension","PathStyleExtension","FillStyleExtension","ClipExtension","CollisionFilterExtension","MaskExtension","_TerrainExtension","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,wBAAnB,QAAkD,qCAAlD;AACA,SAAQP,OAAO,IAAIQ,aAAnB,QAAuC,aAAvC;AACA,SAAQR,OAAO,IAAIS,iBAAnB,QAA2C,mBAA3C;AAGA,SAAQT,OAAO,IAAIU,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 CollisionFilterExtension} from './collision-filter/collision-filter';\nexport {default as MaskExtension} from './mask/mask';\nexport {default as _TerrainExtension} from './terrain/terrain';\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 {CollisionFilterExtensionProps} from './collision-filter/collision-filter';\nexport type {MaskExtensionProps} from './mask/mask';\nexport type {TerrainExtensionProps} from './terrain/terrain';\n"],"file":"index.js"}
|
|
@@ -3,7 +3,7 @@ import { log } from '@deck.gl/core';
|
|
|
3
3
|
import { Texture2D } from '@luma.gl/core';
|
|
4
4
|
import { equals } from '@math.gl/core';
|
|
5
5
|
import MaskPass from './mask-pass';
|
|
6
|
-
import {
|
|
6
|
+
import { joinLayerBounds, getRenderBounds, makeViewport } from '../utils/projection-utils';
|
|
7
7
|
export default class MaskEffect {
|
|
8
8
|
constructor() {
|
|
9
9
|
_defineProperty(this, "id", 'mask-effect');
|
|
@@ -74,6 +74,13 @@ export default class MaskEffect {
|
|
|
74
74
|
const viewport = viewports[0];
|
|
75
75
|
const viewportChanged = !this.lastViewport || !this.lastViewport.equals(viewport);
|
|
76
76
|
|
|
77
|
+
if (viewport.resolution !== undefined) {
|
|
78
|
+
log.warn('MaskExtension is not supported in GlobeView')();
|
|
79
|
+
return {
|
|
80
|
+
didRender
|
|
81
|
+
};
|
|
82
|
+
}
|
|
83
|
+
|
|
77
84
|
for (const maskId in channelMap) {
|
|
78
85
|
const result = this._renderChannel(channelMap[maskId], {
|
|
79
86
|
layerFilter,
|
|
@@ -105,28 +112,27 @@ export default class MaskEffect {
|
|
|
105
112
|
return didRender;
|
|
106
113
|
}
|
|
107
114
|
|
|
108
|
-
const maskChanged = channelInfo === oldChannelInfo ||
|
|
115
|
+
const maskChanged = channelInfo === oldChannelInfo || channelInfo.layers.length !== oldChannelInfo.layers.length || channelInfo.layers.some((layer, i) => layer !== oldChannelInfo.layers[i] || layer.props.transitions) || channelInfo.layerBounds.some((b, i) => b !== oldChannelInfo.layerBounds[i]);
|
|
109
116
|
channelInfo.bounds = oldChannelInfo.bounds;
|
|
110
117
|
channelInfo.maskBounds = oldChannelInfo.maskBounds;
|
|
111
118
|
this.channels[channelInfo.index] = channelInfo;
|
|
112
119
|
|
|
113
120
|
if (maskChanged || viewportChanged) {
|
|
114
121
|
this.lastViewport = viewport;
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
viewport
|
|
118
|
-
});
|
|
122
|
+
const layerBounds = joinLayerBounds(channelInfo.layers, viewport);
|
|
123
|
+
channelInfo.bounds = layerBounds && getRenderBounds(layerBounds, viewport);
|
|
119
124
|
|
|
120
125
|
if (maskChanged || !equals(channelInfo.bounds, oldChannelInfo.bounds)) {
|
|
121
126
|
const {
|
|
122
127
|
maskPass,
|
|
123
128
|
maskMap
|
|
124
129
|
} = this;
|
|
125
|
-
const maskViewport =
|
|
130
|
+
const maskViewport = layerBounds && makeViewport({
|
|
126
131
|
bounds: channelInfo.bounds,
|
|
127
132
|
viewport,
|
|
128
133
|
width: maskMap.width,
|
|
129
|
-
height: maskMap.height
|
|
134
|
+
height: maskMap.height,
|
|
135
|
+
border: 1
|
|
130
136
|
});
|
|
131
137
|
channelInfo.maskBounds = maskViewport ? maskViewport.getBounds() : [0, 0, 1, 1];
|
|
132
138
|
maskPass.render({
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../../src/mask/mask-effect.ts"],"names":["log","Texture2D","equals","MaskPass","getMaskBounds","getMaskViewport","MaskEffect","preRender","gl","layers","layerFilter","viewports","onViewportActive","views","isPicking","didRender","dummyMaskMap","width","height","maskLayers","filter","l","props","visible","operation","includes","length","masks","channels","maskPass","id","maskMap","channelMap","_sortMaskChannels","viewport","viewportChanged","lastViewport","maskId","result","_renderChannel","channelInfo","oldChannelInfo","index","maskChanged","layerBounds","some","b","i","bounds","maskBounds","maskViewport","getBounds","render","pass","channel","moduleParameters","devicePixelRatio","coordinateOrigin","coordinateSystem","channelCount","layer","root","warn","findIndex","c","push","getModuleParameters","maskChannels","cleanup","delete","undefined"],"mappings":";AAAA,SAAqEA,GAArE,QAA+E,eAA/E;AACA,SAAQC,SAAR,QAAwB,eAAxB;AACA,SAAQC,MAAR,QAAqB,eAArB;AACA,OAAOC,QAAP,MAAqB,aAArB;AACA,SAAQC,aAAR,EAAuBC,eAAvB,QAAyD,SAAzD;AA2BA,eAAe,MAAMC,UAAN,CAAmC;AAAA;AAAA,gCAC3C,aAD2C;;AAAA,mCAExC,IAFwC;;AAAA,0CAGjC,IAHiC;;AAAA,mCAIxC,CAJwC;;AAAA;;AAAA,sCAOT,EAPS;;AAAA,mCAQH,IARG;;AAAA;;AAAA;;AAAA;AAAA;;AAahDC,EAAAA,SAAS,CACPC,EADO,EAEP;AAACC,IAAAA,MAAD;AAASC,IAAAA,WAAT;AAAsBC,IAAAA,SAAtB;AAAiCC,IAAAA,gBAAjC;AAAmDC,IAAAA,KAAnD;AAA0DC,IAAAA;AAA1D,GAFO,EAGa;AACpB,QAAIC,SAAS,GAAG,KAAhB;;AACA,QAAI,CAAC,KAAKC,YAAV,EAAwB;AACtB,WAAKA,YAAL,GAAoB,IAAIf,SAAJ,CAAcO,EAAd,EAAkB;AACpCS,QAAAA,KAAK,EAAE,CAD6B;AAEpCC,QAAAA,MAAM,EAAE;AAF4B,OAAlB,CAApB;AAID;;AAED,QAAIJ,SAAJ,EAAe;AAEb,aAAO;AAACC,QAAAA;AAAD,OAAP;AACD;;AAED,UAAMI,UAAU,GAAGV,MAAM,CAACW,MAAP,CAAcC,CAAC,IAAIA,CAAC,CAACC,KAAF,CAAQC,OAAR,IAAmBF,CAAC,CAACC,KAAF,CAAQE,SAAR,CAAkBC,QAAlB,CAA2B,MAA3B,CAAtC,CAAnB;;AACA,QAAIN,UAAU,CAACO,MAAX,KAAsB,CAA1B,EAA6B;AAC3B,WAAKC,KAAL,GAAa,IAAb;AACA,WAAKC,QAAL,CAAcF,MAAd,GAAuB,CAAvB;AACA,aAAO;AAACX,QAAAA;AAAD,OAAP;AACD;;AACD,SAAKY,KAAL,GAAa,EAAb;;AAEA,QAAI,CAAC,KAAKE,QAAV,EAAoB;AAClB,WAAKA,QAAL,GAAgB,IAAI1B,QAAJ,CAAaK,EAAb,EAAiB;AAACsB,QAAAA,EAAE,EAAE;AAAL,OAAjB,CAAhB;AACA,WAAKC,OAAL,GAAe,KAAKF,QAAL,CAAcE,OAA7B;AACD;;AAGD,UAAMC,UAAU,GAAG,KAAKC,iBAAL,CAAuBd,UAAvB,CAAnB;;AAEA,UAAMe,QAAQ,GAAGvB,SAAS,CAAC,CAAD,CAA1B;AACA,UAAMwB,eAAe,GAAG,CAAC,KAAKC,YAAN,IAAsB,CAAC,KAAKA,YAAL,CAAkBlC,MAAlB,CAAyBgC,QAAzB,CAA/C;;AAEA,SAAK,MAAMG,MAAX,IAAqBL,UAArB,EAAiC;AAC/B,YAAMM,MAAM,GAAG,KAAKC,cAAL,CAAoBP,UAAU,CAACK,MAAD,CAA9B,EAAwC;AACrD3B,QAAAA,WADqD;AAErDE,QAAAA,gBAFqD;AAGrDC,QAAAA,KAHqD;AAIrDqB,QAAAA,QAJqD;AAKrDC,QAAAA;AALqD,OAAxC,CAAf;;AAOApB,MAAAA,SAAS,KAATA,SAAS,GAAKuB,MAAL,CAAT;AACD;;AAGD,WAAO;AAACvB,MAAAA;AAAD,KAAP;AACD;;AAEOwB,EAAAA,cAAc,CACpBC,WADoB,EAEpB;AACE9B,IAAAA,WADF;AAEEE,IAAAA,gBAFF;AAGEC,IAAAA,KAHF;AAIEqB,IAAAA,QAJF;AAKEC,IAAAA;AALF,GAFoB,EAeX;AACT,QAAIpB,SAAS,GAAG,KAAhB;AACA,UAAM0B,cAAc,GAAG,KAAKb,QAAL,CAAcY,WAAW,CAACE,KAA1B,CAAvB;;AACA,QAAI,CAACD,cAAL,EAAqB;AACnB,aAAO1B,SAAP;AACD;;AAED,UAAM4B,WAAW,GAEfH,WAAW,KAAKC,cAAhB,IAEAA,cAAc,CAAChC,MAAf,CAAsBiB,MAAtB,KAAiCc,WAAW,CAAC/B,MAAZ,CAAmBiB,MAFpD,IAIAc,WAAW,CAACI,WAAZ,CAAwBC,IAAxB,CAA6B,CAACC,CAAD,EAAIC,CAAJ,KAAUD,CAAC,KAAKL,cAAc,CAACG,WAAf,CAA2BG,CAA3B,CAA7C,CANF;AAQAP,IAAAA,WAAW,CAACQ,MAAZ,GAAqBP,cAAc,CAACO,MAApC;AACAR,IAAAA,WAAW,CAACS,UAAZ,GAAyBR,cAAc,CAACQ,UAAxC;AACA,SAAKrB,QAAL,CAAcY,WAAW,CAACE,KAA1B,IAAmCF,WAAnC;;AAEA,QAAIG,WAAW,IAAIR,eAAnB,EAAoC;AAElC,WAAKC,YAAL,GAAoBF,QAApB;AAEAM,MAAAA,WAAW,CAACQ,MAAZ,GAAqB5C,aAAa,CAAC;AAACK,QAAAA,MAAM,EAAE+B,WAAW,CAAC/B,MAArB;AAA6ByB,QAAAA;AAA7B,OAAD,CAAlC;;AAEA,UAAIS,WAAW,IAAI,CAACzC,MAAM,CAACsC,WAAW,CAACQ,MAAb,EAAqBP,cAAc,CAACO,MAApC,CAA1B,EAAuE;AAErE,cAAM;AAACnB,UAAAA,QAAD;AAAWE,UAAAA;AAAX,YAAsB,IAA5B;AAEA,cAAMmB,YAAY,GAAG7C,eAAe,CAAC;AACnC2C,UAAAA,MAAM,EAAER,WAAW,CAACQ,MADe;AAEnCd,UAAAA,QAFmC;AAGnCjB,UAAAA,KAAK,EAAEc,OAAO,CAACd,KAHoB;AAInCC,UAAAA,MAAM,EAAEa,OAAO,CAACb;AAJmB,SAAD,CAApC;AAOAsB,QAAAA,WAAW,CAACS,UAAZ,GAAyBC,YAAY,GAAGA,YAAY,CAACC,SAAb,EAAH,GAA8B,CAAC,CAAD,EAAI,CAAJ,EAAO,CAAP,EAAU,CAAV,CAAnE;AAGAtB,QAAAA,QAAQ,CAACuB,MAAT,CAAgB;AACdC,UAAAA,IAAI,EAAE,MADQ;AAEdC,UAAAA,OAAO,EAAEd,WAAW,CAACE,KAFP;AAGdjC,UAAAA,MAAM,EAAE+B,WAAW,CAAC/B,MAHN;AAIdC,UAAAA,WAJc;AAKdC,UAAAA,SAAS,EAAEuC,YAAY,GAAG,CAACA,YAAD,CAAH,GAAoB,EAL7B;AAMdtC,UAAAA,gBANc;AAOdC,UAAAA,KAPc;AAQd0C,UAAAA,gBAAgB,EAAE;AAChBC,YAAAA,gBAAgB,EAAE;AADF;AARJ,SAAhB;AAaAzC,QAAAA,SAAS,GAAG,IAAZ;AACD;AACF;;AAGD,SAAKY,KAAL,CAAWa,WAAW,CAACV,EAAvB,IAA6B;AAC3BY,MAAAA,KAAK,EAAEF,WAAW,CAACE,KADQ;AAE3BM,MAAAA,MAAM,EAAER,WAAW,CAACS,UAFO;AAG3BQ,MAAAA,gBAAgB,EAAEjB,WAAW,CAACiB,gBAHH;AAI3BC,MAAAA,gBAAgB,EAAElB,WAAW,CAACkB;AAJH,KAA7B;AAOA,WAAO3C,SAAP;AACD;;AASOkB,EAAAA,iBAAiB,CAACd,UAAD,EAA+C;AACtE,UAAMa,UAAU,GAAG,EAAnB;AACA,QAAI2B,YAAY,GAAG,CAAnB;;AACA,SAAK,MAAMC,KAAX,IAAoBzC,UAApB,EAAgC;AAC9B,YAAM;AAACW,QAAAA;AAAD,UAAO8B,KAAK,CAACC,IAAnB;AACA,UAAIrB,WAAW,GAAGR,UAAU,CAACF,EAAD,CAA5B;;AACA,UAAI,CAACU,WAAL,EAAkB;AAChB,YAAI,EAAEmB,YAAF,GAAiB,CAArB,EAAwB;AACtB3D,UAAAA,GAAG,CAAC8D,IAAJ,CAAS,8CAAT;AACA;AACD;;AACDtB,QAAAA,WAAW,GAAG;AACZV,UAAAA,EADY;AAEZY,UAAAA,KAAK,EAAE,KAAKd,QAAL,CAAcmC,SAAd,CAAwBC,CAAC,IAAI,CAAAA,CAAC,SAAD,IAAAA,CAAC,WAAD,YAAAA,CAAC,CAAElC,EAAH,MAAUA,EAAvC,CAFK;AAGZrB,UAAAA,MAAM,EAAE,EAHI;AAIZmC,UAAAA,WAAW,EAAE,EAJD;AAKZa,UAAAA,gBAAgB,EAAEG,KAAK,CAACC,IAAN,CAAWvC,KAAX,CAAiBmC,gBALvB;AAMZC,UAAAA,gBAAgB,EAAEE,KAAK,CAACC,IAAN,CAAWvC,KAAX,CAAiBoC;AANvB,SAAd;AAQA1B,QAAAA,UAAU,CAACF,EAAD,CAAV,GAAiBU,WAAjB;AACD;;AACDA,MAAAA,WAAW,CAAC/B,MAAZ,CAAmBwD,IAAnB,CAAwBL,KAAxB;AACApB,MAAAA,WAAW,CAACI,WAAZ,CAAwBqB,IAAxB,CAA6BL,KAAK,CAACT,SAAN,EAA7B;AACD;;AAED,SAAK,IAAIJ,CAAC,GAAG,CAAb,EAAgBA,CAAC,GAAG,CAApB,EAAuBA,CAAC,EAAxB,EAA4B;AAC1B,YAAMP,WAAW,GAAG,KAAKZ,QAAL,CAAcmB,CAAd,CAApB;;AACA,UAAI,CAACP,WAAD,IAAgB,EAAEA,WAAW,CAACV,EAAZ,IAAkBE,UAApB,CAApB,EAAqD;AAEnD,aAAKJ,QAAL,CAAcmB,CAAd,IAAmB,IAAnB;AACD;AACF;;AAED,SAAK,MAAMV,MAAX,IAAqBL,UAArB,EAAiC;AAC/B,YAAMQ,WAAW,GAAGR,UAAU,CAACK,MAAD,CAA9B;;AAEA,UAAIG,WAAW,CAACE,KAAZ,GAAoB,CAAxB,EAA2B;AACzBF,QAAAA,WAAW,CAACE,KAAZ,GAAoB,KAAKd,QAAL,CAAcmC,SAAd,CAAwBC,CAAC,IAAI,CAACA,CAA9B,CAApB;AACA,aAAKpC,QAAL,CAAcY,WAAW,CAACE,KAA1B,IAAmCF,WAAnC;AACD;AACF;;AACD,WAAOR,UAAP;AACD;;AAEDkC,EAAAA,mBAAmB,GAGjB;AACA,WAAO;AACLnC,MAAAA,OAAO,EAAE,KAAKJ,KAAL,GAAa,KAAKI,OAAlB,GAA4B,KAAKf,YADrC;AAELmD,MAAAA,YAAY,EAAE,KAAKxC;AAFd,KAAP;AAID;;AAEDyC,EAAAA,OAAO,GAAS;AACd,QAAI,KAAKpD,YAAT,EAAuB;AACrB,WAAKA,YAAL,CAAkBqD,MAAlB;AACA,WAAKrD,YAAL,GAAoBsD,SAApB;AACD;;AAED,QAAI,KAAKzC,QAAT,EAAmB;AACjB,WAAKA,QAAL,CAAcwC,MAAd;AACA,WAAKxC,QAAL,GAAgByC,SAAhB;AACA,WAAKvC,OAAL,GAAeuC,SAAf;AACD;;AAED,SAAKlC,YAAL,GAAoBkC,SAApB;AACA,SAAK3C,KAAL,GAAa,IAAb;AACA,SAAKC,QAAL,CAAcF,MAAd,GAAuB,CAAvB;AACD;;AA9N+C","sourcesContent":["import {Layer, Viewport, Effect, PreRenderOptions, CoordinateSystem, log} from '@deck.gl/core';\nimport {Texture2D} from '@luma.gl/core';\nimport {equals} from '@math.gl/core';\nimport MaskPass from './mask-pass';\nimport {getMaskBounds, getMaskViewport, MaskBounds} from './utils';\n// import {debugFBO} from '../utils/debug';\n\ntype Mask = {\n /** The channel index */\n index: number;\n bounds: MaskBounds;\n coordinateOrigin: [number, number, number];\n coordinateSystem: CoordinateSystem;\n};\n\ntype Channel = {\n id: string;\n index: number;\n layers: Layer[];\n bounds: MaskBounds;\n maskBounds: MaskBounds;\n layerBounds: MaskBounds[];\n coordinateOrigin: [number, number, number];\n coordinateSystem: CoordinateSystem;\n};\n\nexport type MaskPreRenderStats = {\n didRender: boolean;\n};\n\n// Class to manage mask effect\nexport default class MaskEffect implements Effect {\n id = 'mask-effect';\n props = null;\n useInPicking = true;\n order = 0;\n\n private dummyMaskMap?: Texture2D;\n private channels: (Channel | null)[] = [];\n private masks: Record<string, Mask> | null = null;\n private maskPass?: MaskPass;\n private maskMap?: Texture2D;\n private lastViewport?: Viewport;\n\n preRender(\n gl: WebGLRenderingContext,\n {layers, layerFilter, viewports, onViewportActive, views, isPicking}: PreRenderOptions\n ): MaskPreRenderStats {\n let didRender = false;\n if (!this.dummyMaskMap) {\n this.dummyMaskMap = new Texture2D(gl, {\n width: 1,\n height: 1\n });\n }\n\n if (isPicking) {\n // Do not update on picking pass\n return {didRender};\n }\n\n const maskLayers = layers.filter(l => l.props.visible && l.props.operation.includes('mask'));\n if (maskLayers.length === 0) {\n this.masks = null;\n this.channels.length = 0;\n return {didRender};\n }\n this.masks = {};\n\n if (!this.maskPass) {\n this.maskPass = new MaskPass(gl, {id: 'default-mask'});\n this.maskMap = this.maskPass.maskMap;\n }\n\n // Map layers to channels\n const channelMap = this._sortMaskChannels(maskLayers);\n // TODO - support multiple views\n const viewport = viewports[0];\n const viewportChanged = !this.lastViewport || !this.lastViewport.equals(viewport);\n\n for (const maskId in channelMap) {\n const result = this._renderChannel(channelMap[maskId], {\n layerFilter,\n onViewportActive,\n views,\n viewport,\n viewportChanged\n });\n didRender ||= result;\n }\n\n // debugFBO(this.maskMap, {opaque: true});\n return {didRender};\n }\n\n private _renderChannel(\n channelInfo: Channel,\n {\n layerFilter,\n onViewportActive,\n views,\n viewport,\n viewportChanged\n }: {\n layerFilter: PreRenderOptions['layerFilter'];\n onViewportActive: PreRenderOptions['onViewportActive'];\n views: PreRenderOptions['views'];\n viewport: Viewport;\n viewportChanged: boolean;\n }\n ): boolean {\n let didRender = false;\n const oldChannelInfo = this.channels[channelInfo.index];\n if (!oldChannelInfo) {\n return didRender;\n }\n\n const maskChanged =\n // If a channel is new\n channelInfo === oldChannelInfo ||\n // If sublayers have changed\n oldChannelInfo.layers.length !== channelInfo.layers.length ||\n // If a sublayer's positions have been updated, the cached bounds will change shallowly\n channelInfo.layerBounds.some((b, i) => b !== oldChannelInfo.layerBounds[i]);\n\n channelInfo.bounds = oldChannelInfo.bounds;\n channelInfo.maskBounds = oldChannelInfo.maskBounds;\n this.channels[channelInfo.index] = channelInfo;\n\n if (maskChanged || viewportChanged) {\n // Recalculate mask bounds\n this.lastViewport = viewport;\n\n channelInfo.bounds = getMaskBounds({layers: channelInfo.layers, viewport});\n\n if (maskChanged || !equals(channelInfo.bounds, oldChannelInfo.bounds)) {\n // Rerender mask FBO\n const {maskPass, maskMap} = this;\n\n const maskViewport = getMaskViewport({\n bounds: channelInfo.bounds,\n viewport,\n width: maskMap.width,\n height: maskMap.height\n });\n\n channelInfo.maskBounds = maskViewport ? maskViewport.getBounds() : [0, 0, 1, 1];\n\n // @ts-ignore (2532) This method is only called from preRender where maskPass is defined\n maskPass.render({\n pass: 'mask',\n channel: channelInfo.index,\n layers: channelInfo.layers,\n layerFilter,\n viewports: maskViewport ? [maskViewport] : [],\n onViewportActive,\n views,\n moduleParameters: {\n devicePixelRatio: 1\n }\n });\n\n didRender = true;\n }\n }\n\n // @ts-ignore (2532) This method is only called from preRender where masks is defined\n this.masks[channelInfo.id] = {\n index: channelInfo.index,\n bounds: channelInfo.maskBounds,\n coordinateOrigin: channelInfo.coordinateOrigin,\n coordinateSystem: channelInfo.coordinateSystem\n };\n\n return didRender;\n }\n\n /**\n * Find a channel to render each mask into\n * If a maskId already exists, diff and update the existing channel\n * Otherwise replace a removed mask\n * Otherwise create a new channel\n * Returns a map from mask layer id to channel info\n */\n private _sortMaskChannels(maskLayers: Layer[]): Record<string, Channel> {\n const channelMap = {};\n let channelCount = 0;\n for (const layer of maskLayers) {\n const {id} = layer.root;\n let channelInfo = channelMap[id];\n if (!channelInfo) {\n if (++channelCount > 4) {\n log.warn('Too many mask layers. The max supported is 4')();\n continue; // eslint-disable-line no-continue\n }\n channelInfo = {\n id,\n index: this.channels.findIndex(c => c?.id === id),\n layers: [],\n layerBounds: [],\n coordinateOrigin: layer.root.props.coordinateOrigin,\n coordinateSystem: layer.root.props.coordinateSystem\n };\n channelMap[id] = channelInfo;\n }\n channelInfo.layers.push(layer);\n channelInfo.layerBounds.push(layer.getBounds());\n }\n\n for (let i = 0; i < 4; i++) {\n const channelInfo = this.channels[i];\n if (!channelInfo || !(channelInfo.id in channelMap)) {\n // The mask id at this channel no longer exists\n this.channels[i] = null;\n }\n }\n\n for (const maskId in channelMap) {\n const channelInfo = channelMap[maskId];\n\n if (channelInfo.index < 0) {\n channelInfo.index = this.channels.findIndex(c => !c);\n this.channels[channelInfo.index] = channelInfo;\n }\n }\n return channelMap;\n }\n\n getModuleParameters(): {\n maskMap: Texture2D;\n maskChannels: Record<string, Mask> | null;\n } {\n return {\n maskMap: this.masks ? this.maskMap : this.dummyMaskMap,\n maskChannels: this.masks\n };\n }\n\n cleanup(): void {\n if (this.dummyMaskMap) {\n this.dummyMaskMap.delete();\n this.dummyMaskMap = undefined;\n }\n\n if (this.maskPass) {\n this.maskPass.delete();\n this.maskPass = undefined;\n this.maskMap = undefined;\n }\n\n this.lastViewport = undefined;\n this.masks = null;\n this.channels.length = 0;\n }\n}\n"],"file":"mask-effect.js"}
|
|
1
|
+
{"version":3,"sources":["../../../src/mask/mask-effect.ts"],"names":["log","Texture2D","equals","MaskPass","joinLayerBounds","getRenderBounds","makeViewport","MaskEffect","preRender","gl","layers","layerFilter","viewports","onViewportActive","views","isPicking","didRender","dummyMaskMap","width","height","maskLayers","filter","l","props","visible","operation","includes","length","masks","channels","maskPass","id","maskMap","channelMap","_sortMaskChannels","viewport","viewportChanged","lastViewport","resolution","undefined","warn","maskId","result","_renderChannel","channelInfo","oldChannelInfo","index","maskChanged","some","layer","i","transitions","layerBounds","b","bounds","maskBounds","maskViewport","border","getBounds","render","pass","channel","moduleParameters","devicePixelRatio","coordinateOrigin","coordinateSystem","channelCount","root","findIndex","c","push","getModuleParameters","maskChannels","cleanup","delete"],"mappings":"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","sourcesContent":["import {Layer, Viewport, Effect, PreRenderOptions, CoordinateSystem, log} from '@deck.gl/core';\nimport {Texture2D} from '@luma.gl/core';\nimport {equals} from '@math.gl/core';\nimport MaskPass from './mask-pass';\nimport {joinLayerBounds, getRenderBounds, makeViewport, Bounds} from '../utils/projection-utils';\n// import {debugFBO} from '../utils/debug';\n\ntype Mask = {\n /** The channel index */\n index: number;\n bounds: Bounds;\n coordinateOrigin: [number, number, number];\n coordinateSystem: CoordinateSystem;\n};\n\ntype Channel = {\n id: string;\n index: number;\n layers: Layer[];\n bounds: Bounds | null;\n maskBounds: Bounds;\n layerBounds: Bounds[];\n coordinateOrigin: [number, number, number];\n coordinateSystem: CoordinateSystem;\n};\n\nexport type MaskPreRenderStats = {\n didRender: boolean;\n};\n\n// Class to manage mask effect\nexport default class MaskEffect implements Effect {\n id = 'mask-effect';\n props = null;\n useInPicking = true;\n order = 0;\n\n private dummyMaskMap?: Texture2D;\n private channels: (Channel | null)[] = [];\n private masks: Record<string, Mask> | null = null;\n private maskPass?: MaskPass;\n private maskMap?: Texture2D;\n private lastViewport?: Viewport;\n\n preRender(\n gl: WebGLRenderingContext,\n {layers, layerFilter, viewports, onViewportActive, views, isPicking}: PreRenderOptions\n ): MaskPreRenderStats {\n let didRender = false;\n if (!this.dummyMaskMap) {\n this.dummyMaskMap = new Texture2D(gl, {\n width: 1,\n height: 1\n });\n }\n\n if (isPicking) {\n // Do not update on picking pass\n return {didRender};\n }\n\n const maskLayers = layers.filter(l => l.props.visible && l.props.operation.includes('mask'));\n if (maskLayers.length === 0) {\n this.masks = null;\n this.channels.length = 0;\n return {didRender};\n }\n this.masks = {};\n\n if (!this.maskPass) {\n this.maskPass = new MaskPass(gl, {id: 'default-mask'});\n this.maskMap = this.maskPass.maskMap;\n }\n\n // Map layers to channels\n const channelMap = this._sortMaskChannels(maskLayers);\n // TODO - support multiple views\n const viewport = viewports[0];\n const viewportChanged = !this.lastViewport || !this.lastViewport.equals(viewport);\n\n if (viewport.resolution !== undefined) {\n log.warn('MaskExtension is not supported in GlobeView')();\n return {didRender};\n }\n\n for (const maskId in channelMap) {\n const result = this._renderChannel(channelMap[maskId], {\n layerFilter,\n onViewportActive,\n views,\n viewport,\n viewportChanged\n });\n didRender ||= result;\n }\n\n // debugFBO(this.maskMap, {opaque: true});\n return {didRender};\n }\n\n private _renderChannel(\n channelInfo: Channel,\n {\n layerFilter,\n onViewportActive,\n views,\n viewport,\n viewportChanged\n }: {\n layerFilter: PreRenderOptions['layerFilter'];\n onViewportActive: PreRenderOptions['onViewportActive'];\n views: PreRenderOptions['views'];\n viewport: Viewport;\n viewportChanged: boolean;\n }\n ): boolean {\n let didRender = false;\n const oldChannelInfo = this.channels[channelInfo.index];\n if (!oldChannelInfo) {\n return didRender;\n }\n\n const maskChanged =\n // If a channel is new\n channelInfo === oldChannelInfo ||\n // If sublayers have changed\n channelInfo.layers.length !== oldChannelInfo.layers.length ||\n channelInfo.layers.some(\n (layer, i) =>\n // Layer instance is updated\n // Layer props might have changed\n // Undetermined props could have an effect on the output geometry of a mask layer,\n // for example getRadius+updateTriggers, radiusScale, modelMatrix\n layer !== oldChannelInfo.layers[i] ||\n // Some prop is in transition\n layer.props.transitions\n ) ||\n // If a sublayer's positions have been updated, the cached bounds will change shallowly\n channelInfo.layerBounds.some((b, i) => b !== oldChannelInfo.layerBounds[i]);\n\n channelInfo.bounds = oldChannelInfo.bounds;\n channelInfo.maskBounds = oldChannelInfo.maskBounds;\n this.channels[channelInfo.index] = channelInfo;\n\n if (maskChanged || viewportChanged) {\n // Recalculate mask bounds\n this.lastViewport = viewport;\n\n const layerBounds = joinLayerBounds(channelInfo.layers, viewport);\n channelInfo.bounds = layerBounds && getRenderBounds(layerBounds, viewport);\n\n if (maskChanged || !equals(channelInfo.bounds, oldChannelInfo.bounds)) {\n // Rerender mask FBO\n const {maskPass, maskMap} = this;\n\n const maskViewport =\n layerBounds &&\n makeViewport({\n bounds: channelInfo.bounds!,\n viewport,\n width: maskMap.width,\n height: maskMap.height,\n border: 1\n });\n\n channelInfo.maskBounds = maskViewport ? maskViewport.getBounds() : [0, 0, 1, 1];\n\n // @ts-ignore (2532) This method is only called from preRender where maskPass is defined\n maskPass.render({\n pass: 'mask',\n channel: channelInfo.index,\n layers: channelInfo.layers,\n layerFilter,\n viewports: maskViewport ? [maskViewport] : [],\n onViewportActive,\n views,\n moduleParameters: {\n devicePixelRatio: 1\n }\n });\n\n didRender = true;\n }\n }\n\n // @ts-ignore (2532) This method is only called from preRender where masks is defined\n this.masks[channelInfo.id] = {\n index: channelInfo.index,\n bounds: channelInfo.maskBounds,\n coordinateOrigin: channelInfo.coordinateOrigin,\n coordinateSystem: channelInfo.coordinateSystem\n };\n\n return didRender;\n }\n\n /**\n * Find a channel to render each mask into\n * If a maskId already exists, diff and update the existing channel\n * Otherwise replace a removed mask\n * Otherwise create a new channel\n * Returns a map from mask layer id to channel info\n */\n private _sortMaskChannels(maskLayers: Layer[]): Record<string, Channel> {\n const channelMap = {};\n let channelCount = 0;\n for (const layer of maskLayers) {\n const {id} = layer.root;\n let channelInfo = channelMap[id];\n if (!channelInfo) {\n if (++channelCount > 4) {\n log.warn('Too many mask layers. The max supported is 4')();\n continue; // eslint-disable-line no-continue\n }\n channelInfo = {\n id,\n index: this.channels.findIndex(c => c?.id === id),\n layers: [],\n layerBounds: [],\n coordinateOrigin: layer.root.props.coordinateOrigin,\n coordinateSystem: layer.root.props.coordinateSystem\n };\n channelMap[id] = channelInfo;\n }\n channelInfo.layers.push(layer);\n channelInfo.layerBounds.push(layer.getBounds());\n }\n\n for (let i = 0; i < 4; i++) {\n const channelInfo = this.channels[i];\n if (!channelInfo || !(channelInfo.id in channelMap)) {\n // The mask id at this channel no longer exists\n this.channels[i] = null;\n }\n }\n\n for (const maskId in channelMap) {\n const channelInfo = channelMap[maskId];\n\n if (channelInfo.index < 0) {\n channelInfo.index = this.channels.findIndex(c => !c);\n this.channels[channelInfo.index] = channelInfo;\n }\n }\n return channelMap;\n }\n\n getModuleParameters(): {\n maskMap: Texture2D;\n maskChannels: Record<string, Mask> | null;\n } {\n return {\n maskMap: this.masks ? this.maskMap : this.dummyMaskMap,\n maskChannels: this.masks\n };\n }\n\n cleanup(): void {\n if (this.dummyMaskMap) {\n this.dummyMaskMap.delete();\n this.dummyMaskMap = undefined;\n }\n\n if (this.maskPass) {\n this.maskPass.delete();\n this.maskPass = undefined;\n this.maskMap = undefined;\n }\n\n this.lastViewport = undefined;\n this.masks = null;\n this.channels.length = 0;\n }\n}\n"],"file":"mask-effect.js"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
|
|
2
2
|
import { Framebuffer } from '@luma.gl/core';
|
|
3
|
-
import { joinLayerBounds, getRenderBounds, makeViewport } from '../
|
|
3
|
+
import { joinLayerBounds, getRenderBounds, makeViewport } from '../utils/projection-utils';
|
|
4
4
|
import { createRenderTarget } from './utils';
|
|
5
5
|
const MAP_MAX_SIZE = 2048;
|
|
6
6
|
export class HeightMapBuilder {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../../src/terrain/height-map-builder.ts"],"names":["Framebuffer","joinLayerBounds","getRenderBounds","makeViewport","createRenderTarget","MAP_MAX_SIZE","HeightMapBuilder","isSupported","gl","colorBufferFloat","constructor","getRenderFramebuffer","renderViewport","fbo","id","float","shouldUpdate","layers","viewport","layersChanged","length","some","layer","i","props","transitions","getBounds","layersBounds","map","layersBoundsCommon","viewportChanged","lastViewport","equals","bounds","scale","pixelWidth","pixelHeight","center","zoom","width","Math","min","height","delete","color"],"mappings":";AAAA,SAAQA,WAAR,QAA0B,eAA1B;AACA,SAAQC,eAAR,EAAyBC,eAAzB,EAA0CC,YAA1C,QAAqE,
|
|
1
|
+
{"version":3,"sources":["../../../src/terrain/height-map-builder.ts"],"names":["Framebuffer","joinLayerBounds","getRenderBounds","makeViewport","createRenderTarget","MAP_MAX_SIZE","HeightMapBuilder","isSupported","gl","colorBufferFloat","constructor","getRenderFramebuffer","renderViewport","fbo","id","float","shouldUpdate","layers","viewport","layersChanged","length","some","layer","i","props","transitions","getBounds","layersBounds","map","layersBoundsCommon","viewportChanged","lastViewport","equals","bounds","scale","pixelWidth","pixelHeight","center","zoom","width","Math","min","height","delete","color"],"mappings":"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","sourcesContent":["import {Framebuffer} from '@luma.gl/core';\nimport {joinLayerBounds, getRenderBounds, makeViewport, Bounds} from '../utils/projection-utils';\nimport {createRenderTarget} from './utils';\n\nimport type {Viewport, Layer} from '@deck.gl/core';\n\nconst MAP_MAX_SIZE = 2048;\n\n/**\n * Manages the lifecycle of the height map (a framebuffer that encodes elevation).\n * One instance of height map is is shared across all layers. It is updated when the viewport changes\n * or when some terrain source layer's data changes.\n * During the draw call of any terrainDrawMode:offset layers,\n * the vertex shader reads from this framebuffer to retrieve its z offset.\n */\nexport class HeightMapBuilder {\n /** Viewport used to draw into the texture */\n renderViewport: Viewport | null = null;\n /** Bounds of the height map texture, in cartesian space */\n bounds: Bounds | null = null;\n\n protected fbo?: Framebuffer;\n protected gl: WebGLRenderingContext;\n /** Last rendered layers */\n private layers: Layer[] = [];\n /** Last layer.getBounds() */\n private layersBounds: ([number[], number[]] | null)[] = [];\n /** The union of layersBounds in cartesian space */\n private layersBoundsCommon: Bounds | null = null;\n private lastViewport: Viewport | null = null;\n\n static isSupported(gl: WebGLRenderingContext): boolean {\n return Framebuffer.isSupported(gl, {colorBufferFloat: true});\n }\n\n constructor(gl: WebGLRenderingContext) {\n this.gl = gl;\n }\n\n /** Returns the height map framebuffer for read/write access.\n * Returns null when the texture is invalid.\n */\n getRenderFramebuffer(): Framebuffer | null {\n if (!this.renderViewport) {\n return null;\n }\n if (!this.fbo) {\n this.fbo = createRenderTarget(this.gl, {id: 'height-map', float: true});\n }\n return this.fbo;\n }\n\n /** Called every render cycle to check if the framebuffer needs update */\n shouldUpdate({layers, viewport}: {layers: Layer[]; viewport: Viewport}): boolean {\n const layersChanged =\n layers.length !== this.layers.length ||\n layers.some(\n (layer, i) =>\n // Layer instance is updated\n // Layer props might have changed\n // Undetermined props could have an effect on the output geometry of a terrain source,\n // for example getElevation+updateTriggers, elevationScale, modelMatrix\n layer !== this.layers[i] ||\n // Some prop is in transition\n layer.props.transitions ||\n // Layer's geometry bounds have changed\n layer.getBounds() !== this.layersBounds[i]\n );\n\n if (layersChanged) {\n // Recalculate cached bounds\n this.layers = layers;\n this.layersBounds = layers.map(layer => layer.getBounds());\n this.layersBoundsCommon = joinLayerBounds(layers, viewport);\n }\n\n const viewportChanged = !this.lastViewport || !viewport.equals(this.lastViewport);\n\n if (!this.layersBoundsCommon) {\n this.renderViewport = null;\n } else if (layersChanged || viewportChanged) {\n const bounds = getRenderBounds(this.layersBoundsCommon, viewport);\n this.bounds = bounds;\n this.lastViewport = viewport;\n\n const scale = viewport.scale;\n const pixelWidth = (bounds[2] - bounds[0]) * scale;\n const pixelHeight = (bounds[3] - bounds[1]) * scale;\n\n this.renderViewport =\n pixelWidth > 0 || pixelHeight > 0\n ? makeViewport({\n // It's not important whether the geometry is visible in this viewport, because\n // vertices will not use the standard project_to_clipspace in the DRAW_TO_HEIGHT_MAP shader\n // However the viewport must have the same center and zoom as the screen viewport\n // So that projection uniforms used for calculating z are the same\n bounds: [\n viewport.center[0] - 1,\n viewport.center[1] - 1,\n viewport.center[0] + 1,\n viewport.center[1] + 1\n ],\n zoom: viewport.zoom,\n width: Math.min(pixelWidth, MAP_MAX_SIZE),\n height: Math.min(pixelHeight, MAP_MAX_SIZE),\n viewport\n })\n : null;\n return true;\n }\n return false;\n }\n\n delete() {\n if (this.fbo) {\n this.fbo.color.delete();\n this.fbo.delete();\n }\n }\n}\n"],"file":"height-map-builder.js"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../../src/terrain/shader-module.ts"],"names":["project","TERRAIN_MODE","NONE","WRITE_HEIGHT_MAP","USE_HEIGHT_MAP","USE_COVER","USE_COVER_ONLY","SKIP","TERRAIN_MODE_CONSTANTS","Object","keys","map","key","join","terrainModule","name","dependencies","inject","getUniforms","opts","uniforms","drawToTerrainHeightMap","heightMap","heightMapBounds","dummyHeightMap","terrainCover","useTerrainHeightMap","terrainSkipRender","project_uCommonOrigin","mode","sampler","bounds","isPicking","pickingActive","getPickingFramebuffer","getRenderFramebuffer","terrain_mode","terrain_map","terrain_bounds"],"mappings":"
|
|
1
|
+
{"version":3,"sources":["../../../src/terrain/shader-module.ts"],"names":["project","TERRAIN_MODE","NONE","WRITE_HEIGHT_MAP","USE_HEIGHT_MAP","USE_COVER","USE_COVER_ONLY","SKIP","TERRAIN_MODE_CONSTANTS","Object","keys","map","key","join","terrainModule","name","dependencies","inject","getUniforms","opts","uniforms","drawToTerrainHeightMap","heightMap","heightMapBounds","dummyHeightMap","terrainCover","useTerrainHeightMap","terrainSkipRender","project_uCommonOrigin","mode","sampler","bounds","isPicking","pickingActive","getPickingFramebuffer","getRenderFramebuffer","terrain_mode","terrain_map","terrain_bounds"],"mappings":"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","sourcesContent":["/* eslint-disable camelcase */\n\nimport {project} from '@deck.gl/core';\nimport type {_ShaderModule as ShaderModule} from '@deck.gl/core';\n\nimport type {Texture2D} from '@luma.gl/core';\nimport type {Bounds} from '../utils/projection-utils';\nimport type {TerrainCover} from './terrain-cover';\n\n/** Module parameters expected by the terrain shader module */\nexport type TerrainModuleSettings = {\n pickingActive?: boolean;\n heightMap: Texture2D | null;\n heightMapBounds?: Bounds | null;\n dummyHeightMap: Texture2D;\n terrainCover?: TerrainCover | null;\n drawToTerrainHeightMap?: boolean;\n useTerrainHeightMap?: boolean;\n terrainSkipRender?: boolean;\n};\n\n/** A model can have one of the following modes */\nexport const TERRAIN_MODE = {\n NONE: 0,\n /** A terrain layer rendering encoded ground elevation into the height map */\n WRITE_HEIGHT_MAP: 1,\n /** An offset layer reading encoded ground elevation from the height map */\n USE_HEIGHT_MAP: 2,\n /** A terrain layer rendering to screen, using the cover fbo overlaid with its own texture */\n USE_COVER: 3,\n /** A terrain layer rendering to screen, using the cover fbo as texture */\n USE_COVER_ONLY: 4,\n /** Draped layer is rendered into a texture, and never to screen */\n SKIP: 5\n};\n\nconst TERRAIN_MODE_CONSTANTS = Object.keys(TERRAIN_MODE)\n .map(key => `const float TERRAIN_MODE_${key} = ${TERRAIN_MODE[key]}.0;`)\n .join('\\n');\n\nexport const terrainModule = {\n name: 'terrain',\n dependencies: [project],\n inject: {\n 'vs:#decl': `\nuniform float terrain_mode;\nuniform sampler2D terrain_map;\nuniform vec4 terrain_bounds;\nvarying vec3 commonPos;\n${TERRAIN_MODE_CONSTANTS}\n `,\n 'vs:#main-start': `\nif (terrain_mode == TERRAIN_MODE_SKIP) {\n gl_Position = vec4(0.0);\n return;\n}\n`,\n 'vs:DECKGL_FILTER_GL_POSITION': `\ncommonPos = geometry.position.xyz;\nif (terrain_mode == TERRAIN_MODE_WRITE_HEIGHT_MAP) {\n vec2 texCoords = (commonPos.xy - terrain_bounds.xy) / terrain_bounds.zw;\n position = vec4(texCoords * 2.0 - 1.0, 0.0, 1.0);\n}\nif (terrain_mode == TERRAIN_MODE_USE_HEIGHT_MAP) {\n vec3 anchor = geometry.worldPosition;\n anchor.z = 0.0;\n vec3 anchorCommon = project_position(anchor);\n vec2 texCoords = (anchorCommon.xy - terrain_bounds.xy) / terrain_bounds.zw;\n if (texCoords.x >= 0.0 && texCoords.y >= 0.0 && texCoords.x <= 1.0 && texCoords.y <= 1.0) {\n float terrainZ = texture2D(terrain_map, texCoords).r;\n geometry.position.z += terrainZ;\n position = project_common_position_to_clipspace(geometry.position);\n }\n}\n `,\n 'fs:#decl': `\nuniform float terrain_mode;\nuniform sampler2D terrain_map;\nuniform vec4 terrain_bounds;\nvarying vec3 commonPos;\n${TERRAIN_MODE_CONSTANTS}\n `,\n 'fs:#main-start': `\nif (terrain_mode == TERRAIN_MODE_WRITE_HEIGHT_MAP) {\n gl_FragColor = vec4(commonPos.z, 0.0, 0.0, 1.0);\n return;\n}\n `,\n 'fs:DECKGL_FILTER_COLOR': `\nif ((terrain_mode == TERRAIN_MODE_USE_COVER) || (terrain_mode == TERRAIN_MODE_USE_COVER_ONLY)) {\n vec2 texCoords = (commonPos.xy - terrain_bounds.xy) / terrain_bounds.zw;\n vec4 pixel = texture2D(terrain_map, texCoords);\n if (terrain_mode == TERRAIN_MODE_USE_COVER_ONLY) {\n color = pixel;\n } else {\n // pixel is premultiplied\n color = pixel + color * (1.0 - pixel.a);\n }\n return;\n}\n `\n },\n // eslint-disable-next-line complexity\n getUniforms: (opts = {}, uniforms) => {\n if ('dummyHeightMap' in opts) {\n const {\n drawToTerrainHeightMap,\n heightMap,\n heightMapBounds,\n dummyHeightMap,\n terrainCover,\n useTerrainHeightMap,\n terrainSkipRender\n } = opts;\n const {project_uCommonOrigin} = uniforms;\n\n let mode: number = terrainSkipRender ? TERRAIN_MODE.SKIP : TERRAIN_MODE.NONE;\n // height map if case USE_HEIGHT_MAP, terrain cover if USE_COVER, otherwise empty\n let sampler: Texture2D = dummyHeightMap;\n // height map bounds if case USE_HEIGHT_MAP, terrain cover bounds if USE_COVER, otherwise null\n let bounds: number[] | null = null;\n if (drawToTerrainHeightMap) {\n mode = TERRAIN_MODE.WRITE_HEIGHT_MAP;\n bounds = heightMapBounds!;\n } else if (useTerrainHeightMap && heightMap) {\n mode = TERRAIN_MODE.USE_HEIGHT_MAP;\n sampler = heightMap;\n bounds = heightMapBounds!;\n } else if (terrainCover) {\n // This is a terrain layer\n const isPicking = opts.pickingActive;\n sampler = isPicking\n ? terrainCover.getPickingFramebuffer()\n : terrainCover.getRenderFramebuffer();\n if (isPicking) {\n // Never render the layer itself in picking pass\n mode = TERRAIN_MODE.SKIP;\n }\n if (sampler) {\n mode = mode === TERRAIN_MODE.SKIP ? TERRAIN_MODE.USE_COVER_ONLY : TERRAIN_MODE.USE_COVER;\n bounds = terrainCover.bounds;\n } else {\n sampler = dummyHeightMap;\n }\n }\n\n /* eslint-disable camelcase */\n return {\n terrain_mode: mode,\n terrain_map: sampler,\n // Convert bounds to the common space, as [minX, minY, width, height]\n terrain_bounds: bounds\n ? [\n bounds[0] - project_uCommonOrigin[0],\n bounds[1] - project_uCommonOrigin[1],\n bounds[2] - bounds[0],\n bounds[3] - bounds[1]\n ]\n : [0, 0, 0, 0]\n };\n }\n return null;\n }\n} as ShaderModule<TerrainModuleSettings>;\n"],"file":"shader-module.js"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
|
|
2
2
|
import { createRenderTarget } from './utils';
|
|
3
|
-
import { joinLayerBounds, makeViewport, getRenderBounds } from '../
|
|
3
|
+
import { joinLayerBounds, makeViewport, getRenderBounds } from '../utils/projection-utils';
|
|
4
4
|
export class TerrainCover {
|
|
5
5
|
constructor(targetLayer) {
|
|
6
6
|
_defineProperty(this, "isDirty", true);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../../src/terrain/terrain-cover.ts"],"names":["createRenderTarget","joinLayerBounds","makeViewport","getRenderBounds","TerrainCover","constructor","targetLayer","tile","getTile","id","isActive","Boolean","getCurrentLayer","shouldUpdate","viewport","layers","layerNeedsRedraw","sizeChanged","_updateViewport","layersChanged","_updateLayers","needsRedraw","getIntersectingLayers","length","i","map","layer","shouldRedraw","targetBounds","getBounds","targetBoundsCommon","newZoom","Math","ceil","zoom","bounds","oldZoom","renderViewport","newBounds","oldBounds","some","x","getRenderFramebuffer","fbo","context","gl","getPickingFramebuffer","props","pickable","pickingFbo","filterLayers","filter","includes","delete","texture","sourceTile","intersect","bbox","parent","b1","b2","west","east","south","north","left","right","top","bottom"],"mappings":"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","sourcesContent":["import {Framebuffer} from '@luma.gl/core';\n\nimport type {Layer, Viewport} from '@deck.gl/core';\n\nimport {createRenderTarget} from './utils';\nimport {joinLayerBounds, makeViewport, getRenderBounds, Bounds} from '../common/projection-utils';\n\n// TODO - import from loaders when Tileset2D is split out\ntype GeoBoundingBox = {west: number; north: number; east: number; south: number};\ntype NonGeoBoundingBox = {left: number; top: number; right: number; bottom: number};\ntype Tile2DHeader = {\n bbox: GeoBoundingBox | NonGeoBoundingBox;\n};\n\n/**\n * Manages the lifecycle of the terrain cover (draped textures over a terrain mesh).\n * One terrain cover is created for each unique terrain layer (primitive layer with operation:terrain).\n * It is updated when the terrain source layer's mesh changes or when any of the terrainFittingMode:drape\n * layers requires redraw.\n * During the draw call of a terrain layer, the drape texture is overlaid on top of the layer's own color.\n */\nexport class TerrainCover {\n isDirty: boolean = true;\n /** The terrain layer that this instance belongs to */\n targetLayer: Layer;\n /** Viewport used to draw into the texture */\n renderViewport: Viewport | null = null;\n /** Bounds of the terrain cover texture, in cartesian space */\n bounds: Bounds | null = null;\n\n private fbo?: Framebuffer;\n private pickingFbo?: Framebuffer;\n private layers: string[] = [];\n private tile: Tile2DHeader | null;\n /** Cached version of targetLayer.getBounds() */\n private targetBounds: [number[], number[]] | null = null;\n /** targetBounds in cartesian space */\n private targetBoundsCommon: Bounds | null = null;\n\n constructor(targetLayer: Layer) {\n this.targetLayer = targetLayer;\n this.tile = getTile(targetLayer);\n }\n\n get id() {\n return this.targetLayer.id;\n }\n\n /** returns true if the target layer is still in use (i.e. not finalized) */\n get isActive(): boolean {\n return Boolean(this.targetLayer.getCurrentLayer());\n }\n\n shouldUpdate({\n targetLayer,\n viewport,\n layers,\n layerNeedsRedraw\n }: {\n targetLayer?: Layer;\n viewport?: Viewport;\n layers?: Layer[];\n layerNeedsRedraw?: Record<string, boolean>;\n }): boolean {\n if (targetLayer) {\n this.targetLayer = targetLayer;\n }\n const sizeChanged = viewport ? this._updateViewport(viewport) : false;\n\n let layersChanged = layers ? this._updateLayers(layers) : false;\n\n if (layerNeedsRedraw) {\n for (const id of this.layers) {\n if (layerNeedsRedraw[id]) {\n layersChanged = true;\n // console.log('layer needs redraw', id);\n break;\n }\n }\n }\n\n return layersChanged || sizeChanged;\n }\n\n /** Compare layers with the last version. Only rerender if necessary. */\n private _updateLayers(layers: Layer[]): boolean {\n let needsRedraw = false;\n layers = this.tile ? getIntersectingLayers(this.tile, layers) : layers;\n\n if (layers.length !== this.layers.length) {\n needsRedraw = true;\n // console.log('layers count changed', this.layers.length, '>>', layers.length);\n } else {\n for (let i = 0; i < layers.length; i++) {\n const id = layers[i].id;\n if (id !== this.layers[i]) {\n needsRedraw = true;\n // console.log('layer added/removed', id);\n break;\n }\n }\n }\n if (needsRedraw) {\n this.layers = layers.map(layer => layer.id);\n }\n return needsRedraw;\n }\n\n /** Compare viewport and terrain bounds with the last version. Only rerender if necesary. */\n private _updateViewport(viewport: Viewport): boolean {\n const targetLayer = this.targetLayer;\n let shouldRedraw = false;\n\n if (this.targetBounds !== targetLayer.getBounds()) {\n // console.log('bounds changed', this.bounds, '>>', newBounds);\n shouldRedraw = true;\n this.targetBounds = targetLayer.getBounds();\n this.targetBoundsCommon = joinLayerBounds([targetLayer], viewport);\n }\n\n if (!this.targetBoundsCommon) {\n return false;\n }\n\n const newZoom = Math.ceil(viewport.zoom + 0.5);\n // If the terrain layer is bound to a tile, always render a texture that cover the whole tile.\n // Otherwise, use the smaller of layer bounds and the viewport bounds.\n if (this.tile) {\n this.bounds = this.targetBoundsCommon;\n } else {\n const oldZoom = this.renderViewport?.zoom;\n shouldRedraw = shouldRedraw || newZoom !== oldZoom;\n const newBounds = getRenderBounds(this.targetBoundsCommon, viewport);\n const oldBounds = this.bounds;\n shouldRedraw = shouldRedraw || !oldBounds || newBounds.some((x, i) => x !== oldBounds[i]);\n this.bounds = newBounds;\n }\n\n if (shouldRedraw) {\n this.renderViewport = makeViewport({\n bounds: this.bounds,\n zoom: newZoom,\n viewport\n });\n }\n\n return shouldRedraw;\n }\n\n getRenderFramebuffer(): Framebuffer | null {\n if (!this.renderViewport || this.layers.length === 0) {\n return null;\n }\n if (!this.fbo) {\n this.fbo = createRenderTarget(this.targetLayer.context.gl, {id: this.id});\n }\n return this.fbo;\n }\n\n getPickingFramebuffer(): Framebuffer | null {\n if (!this.renderViewport || (this.layers.length === 0 && !this.targetLayer.props.pickable)) {\n return null;\n }\n if (!this.pickingFbo) {\n this.pickingFbo = createRenderTarget(this.targetLayer.context.gl, {id: `${this.id}-picking`});\n }\n return this.pickingFbo;\n }\n\n filterLayers(layers: Layer[]) {\n return layers.filter(({id}) => this.layers.includes(id));\n }\n\n delete() {\n const {fbo, pickingFbo} = this;\n if (fbo) {\n fbo.texture.delete();\n fbo.delete();\n }\n if (pickingFbo) {\n pickingFbo.texture.delete();\n pickingFbo.delete();\n }\n }\n}\n\n/**\n * Remove layers that do not overlap with the current terrain cover.\n * This implementation only has effect when a TileLayer is overlaid on top of a TileLayer\n */\nfunction getIntersectingLayers(sourceTile: Tile2DHeader, layers: Layer[]): Layer[] {\n return layers.filter(layer => {\n const tile = getTile(layer);\n if (tile) {\n return intersect(sourceTile.bbox, tile.bbox);\n }\n return true;\n });\n}\n\n/** If layer is the descendent of a TileLayer, return the corresponding tile. */\nfunction getTile(layer: Layer): Tile2DHeader | null {\n while (layer) {\n // @ts-expect-error tile may not exist\n const {tile} = layer.props;\n if (tile) {\n return tile;\n }\n layer = layer.parent as Layer;\n }\n return null;\n}\n\nfunction intersect(\n b1: GeoBoundingBox | NonGeoBoundingBox,\n b2: GeoBoundingBox | NonGeoBoundingBox\n): boolean {\n if ('west' in b1 && 'west' in b2) {\n return b1.west < b2.east && b2.west < b1.east && b1.south < b2.north && b2.south < b1.north;\n }\n if ('left' in b1 && 'left' in b2) {\n return b1.left < b2.right && b2.left < b1.right && b1.top < b2.bottom && b2.top < b1.bottom;\n }\n return false;\n}\n"],"file":"terrain-cover.js"}
|
|
1
|
+
{"version":3,"sources":["../../../src/terrain/terrain-cover.ts"],"names":["createRenderTarget","joinLayerBounds","makeViewport","getRenderBounds","TerrainCover","constructor","targetLayer","tile","getTile","id","isActive","Boolean","getCurrentLayer","shouldUpdate","viewport","layers","layerNeedsRedraw","sizeChanged","_updateViewport","layersChanged","_updateLayers","needsRedraw","getIntersectingLayers","length","i","map","layer","shouldRedraw","targetBounds","getBounds","targetBoundsCommon","newZoom","Math","ceil","zoom","bounds","oldZoom","renderViewport","newBounds","oldBounds","some","x","getRenderFramebuffer","fbo","context","gl","getPickingFramebuffer","props","pickable","pickingFbo","filterLayers","filter","includes","delete","texture","sourceTile","intersect","bbox","parent","b1","b2","west","east","south","north","left","right","top","bottom"],"mappings":"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","sourcesContent":["import {Framebuffer} from '@luma.gl/core';\n\nimport type {Layer, Viewport} from '@deck.gl/core';\n\nimport {createRenderTarget} from './utils';\nimport {joinLayerBounds, makeViewport, getRenderBounds, Bounds} from '../utils/projection-utils';\n\n// TODO - import from loaders when Tileset2D is split out\ntype GeoBoundingBox = {west: number; north: number; east: number; south: number};\ntype NonGeoBoundingBox = {left: number; top: number; right: number; bottom: number};\ntype Tile2DHeader = {\n bbox: GeoBoundingBox | NonGeoBoundingBox;\n};\n\n/**\n * Manages the lifecycle of the terrain cover (draped textures over a terrain mesh).\n * One terrain cover is created for each unique terrain layer (primitive layer with operation:terrain).\n * It is updated when the terrain source layer's mesh changes or when any of the terrainDrawMode:drape\n * layers requires redraw.\n * During the draw call of a terrain layer, the drape texture is overlaid on top of the layer's own color.\n */\nexport class TerrainCover {\n isDirty: boolean = true;\n /** The terrain layer that this instance belongs to */\n targetLayer: Layer;\n /** Viewport used to draw into the texture */\n renderViewport: Viewport | null = null;\n /** Bounds of the terrain cover texture, in cartesian space */\n bounds: Bounds | null = null;\n\n private fbo?: Framebuffer;\n private pickingFbo?: Framebuffer;\n private layers: string[] = [];\n private tile: Tile2DHeader | null;\n /** Cached version of targetLayer.getBounds() */\n private targetBounds: [number[], number[]] | null = null;\n /** targetBounds in cartesian space */\n private targetBoundsCommon: Bounds | null = null;\n\n constructor(targetLayer: Layer) {\n this.targetLayer = targetLayer;\n this.tile = getTile(targetLayer);\n }\n\n get id() {\n return this.targetLayer.id;\n }\n\n /** returns true if the target layer is still in use (i.e. not finalized) */\n get isActive(): boolean {\n return Boolean(this.targetLayer.getCurrentLayer());\n }\n\n shouldUpdate({\n targetLayer,\n viewport,\n layers,\n layerNeedsRedraw\n }: {\n targetLayer?: Layer;\n viewport?: Viewport;\n layers?: Layer[];\n layerNeedsRedraw?: Record<string, boolean>;\n }): boolean {\n if (targetLayer) {\n this.targetLayer = targetLayer;\n }\n const sizeChanged = viewport ? this._updateViewport(viewport) : false;\n\n let layersChanged = layers ? this._updateLayers(layers) : false;\n\n if (layerNeedsRedraw) {\n for (const id of this.layers) {\n if (layerNeedsRedraw[id]) {\n layersChanged = true;\n // console.log('layer needs redraw', id);\n break;\n }\n }\n }\n\n return layersChanged || sizeChanged;\n }\n\n /** Compare layers with the last version. Only rerender if necessary. */\n private _updateLayers(layers: Layer[]): boolean {\n let needsRedraw = false;\n layers = this.tile ? getIntersectingLayers(this.tile, layers) : layers;\n\n if (layers.length !== this.layers.length) {\n needsRedraw = true;\n // console.log('layers count changed', this.layers.length, '>>', layers.length);\n } else {\n for (let i = 0; i < layers.length; i++) {\n const id = layers[i].id;\n if (id !== this.layers[i]) {\n needsRedraw = true;\n // console.log('layer added/removed', id);\n break;\n }\n }\n }\n if (needsRedraw) {\n this.layers = layers.map(layer => layer.id);\n }\n return needsRedraw;\n }\n\n /** Compare viewport and terrain bounds with the last version. Only rerender if necesary. */\n private _updateViewport(viewport: Viewport): boolean {\n const targetLayer = this.targetLayer;\n let shouldRedraw = false;\n\n if (this.targetBounds !== targetLayer.getBounds()) {\n // console.log('bounds changed', this.bounds, '>>', newBounds);\n shouldRedraw = true;\n this.targetBounds = targetLayer.getBounds();\n this.targetBoundsCommon = joinLayerBounds([targetLayer], viewport);\n }\n\n if (!this.targetBoundsCommon) {\n return false;\n }\n\n const newZoom = Math.ceil(viewport.zoom + 0.5);\n // If the terrain layer is bound to a tile, always render a texture that cover the whole tile.\n // Otherwise, use the smaller of layer bounds and the viewport bounds.\n if (this.tile) {\n this.bounds = this.targetBoundsCommon;\n } else {\n const oldZoom = this.renderViewport?.zoom;\n shouldRedraw = shouldRedraw || newZoom !== oldZoom;\n const newBounds = getRenderBounds(this.targetBoundsCommon, viewport);\n const oldBounds = this.bounds;\n shouldRedraw = shouldRedraw || !oldBounds || newBounds.some((x, i) => x !== oldBounds[i]);\n this.bounds = newBounds;\n }\n\n if (shouldRedraw) {\n this.renderViewport = makeViewport({\n bounds: this.bounds,\n zoom: newZoom,\n viewport\n });\n }\n\n return shouldRedraw;\n }\n\n getRenderFramebuffer(): Framebuffer | null {\n if (!this.renderViewport || this.layers.length === 0) {\n return null;\n }\n if (!this.fbo) {\n this.fbo = createRenderTarget(this.targetLayer.context.gl, {id: this.id});\n }\n return this.fbo;\n }\n\n getPickingFramebuffer(): Framebuffer | null {\n if (!this.renderViewport || (this.layers.length === 0 && !this.targetLayer.props.pickable)) {\n return null;\n }\n if (!this.pickingFbo) {\n this.pickingFbo = createRenderTarget(this.targetLayer.context.gl, {id: `${this.id}-picking`});\n }\n return this.pickingFbo;\n }\n\n filterLayers(layers: Layer[]) {\n return layers.filter(({id}) => this.layers.includes(id));\n }\n\n delete() {\n const {fbo, pickingFbo} = this;\n if (fbo) {\n fbo.texture.delete();\n fbo.delete();\n }\n if (pickingFbo) {\n pickingFbo.texture.delete();\n pickingFbo.delete();\n }\n }\n}\n\n/**\n * Remove layers that do not overlap with the current terrain cover.\n * This implementation only has effect when a TileLayer is overlaid on top of a TileLayer\n */\nfunction getIntersectingLayers(sourceTile: Tile2DHeader, layers: Layer[]): Layer[] {\n return layers.filter(layer => {\n const tile = getTile(layer);\n if (tile) {\n return intersect(sourceTile.bbox, tile.bbox);\n }\n return true;\n });\n}\n\n/** If layer is the descendent of a TileLayer, return the corresponding tile. */\nfunction getTile(layer: Layer): Tile2DHeader | null {\n while (layer) {\n // @ts-expect-error tile may not exist\n const {tile} = layer.props;\n if (tile) {\n return tile;\n }\n layer = layer.parent as Layer;\n }\n return null;\n}\n\nfunction intersect(\n b1: GeoBoundingBox | NonGeoBoundingBox,\n b2: GeoBoundingBox | NonGeoBoundingBox\n): boolean {\n if ('west' in b1 && 'west' in b2) {\n return b1.west < b2.east && b2.west < b1.east && b1.south < b2.north && b2.south < b1.north;\n }\n if ('left' in b1 && 'left' in b2) {\n return b1.left < b2.right && b2.left < b1.right && b1.top < b2.bottom && b2.top < b1.bottom;\n }\n return false;\n}\n"],"file":"terrain-cover.js"}
|
|
@@ -84,14 +84,14 @@ export class TerrainEffect {
|
|
|
84
84
|
}
|
|
85
85
|
|
|
86
86
|
if (!isPicking) {
|
|
87
|
-
const offsetLayers = layers.filter(l => l.state.
|
|
87
|
+
const offsetLayers = layers.filter(l => l.state.terrainDrawMode === 'offset');
|
|
88
88
|
|
|
89
89
|
if (offsetLayers.length > 0) {
|
|
90
90
|
this._updateHeightMap(terrainLayers, viewport, opts);
|
|
91
91
|
}
|
|
92
92
|
}
|
|
93
93
|
|
|
94
|
-
const drapeLayers = layers.filter(l => l.state.
|
|
94
|
+
const drapeLayers = layers.filter(l => l.state.terrainDrawMode === 'drape');
|
|
95
95
|
|
|
96
96
|
this._updateTerrainCovers(terrainLayers, drapeLayers, viewport, opts);
|
|
97
97
|
}
|
|
@@ -100,15 +100,15 @@ export class TerrainEffect {
|
|
|
100
100
|
var _this$heightMap, _this$heightMap2;
|
|
101
101
|
|
|
102
102
|
const {
|
|
103
|
-
|
|
103
|
+
terrainDrawMode
|
|
104
104
|
} = layer.state;
|
|
105
105
|
return {
|
|
106
106
|
heightMap: (_this$heightMap = this.heightMap) === null || _this$heightMap === void 0 ? void 0 : _this$heightMap.getRenderFramebuffer(),
|
|
107
107
|
heightMapBounds: (_this$heightMap2 = this.heightMap) === null || _this$heightMap2 === void 0 ? void 0 : _this$heightMap2.bounds,
|
|
108
108
|
dummyHeightMap: this.dummyHeightMap,
|
|
109
109
|
terrainCover: this.isDrapingEnabled ? this.terrainCovers.get(layer.id) : null,
|
|
110
|
-
useTerrainHeightMap:
|
|
111
|
-
terrainSkipRender:
|
|
110
|
+
useTerrainHeightMap: terrainDrawMode === 'offset',
|
|
111
|
+
terrainSkipRender: terrainDrawMode === 'drape' || !layer.props.operation.includes('draw')
|
|
112
112
|
};
|
|
113
113
|
}
|
|
114
114
|
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../../src/terrain/terrain-effect.ts"],"names":["Texture2D","ProgramManager","log","terrainModule","TerrainCover","TerrainPass","TerrainPickingPass","HeightMapBuilder","TerrainEffect","Map","initialize","gl","dummyHeightMap","width","height","data","Uint8Array","terrainPass","id","terrainPickingPass","isSupported","heightMap","warn","getDefaultProgramManager","addDefaultModule","preRender","opts","layer","layers","props","operation","includes","setChangeFlags","extensionsChanged","pickZ","isDrapingEnabled","viewports","isPicking","viewport","getRenderableLayers","terrainLayers","filter","l","length","offsetLayers","state","terrainFittingMode","_updateHeightMap","drapeLayers","_updateTerrainCovers","getModuleParameters","getRenderFramebuffer","heightMapBounds","bounds","terrainCover","terrainCovers","get","useTerrainHeightMap","terrainSkipRender","cleanup","delete","undefined","values","clear","shouldUpdate","renderHeightMap","moduleParameters","devicePixelRatio","drawToTerrainHeightMap","layerNeedsRedraw","terrainCoverNeedsRedraw","isDirty","_updateTerrainCover","_pruneTerrainCovers","terrainLayer","renderPass","set","targetLayer","renderTerrainCover","err","raiseError","idsToRemove","isActive","push"],"mappings":"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","sourcesContent":["import {Texture2D, ProgramManager} from '@luma.gl/core';\nimport {log} from '@deck.gl/core';\n\nimport {terrainModule, TerrainModuleSettings} from './shader-module';\nimport {TerrainCover} from './terrain-cover';\nimport {TerrainPass} from './terrain-pass';\nimport {TerrainPickingPass, TerrainPickingPassRenderOptions} from './terrain-picking-pass';\nimport {HeightMapBuilder} from './height-map-builder';\n\nimport type {Effect, PreRenderOptions, Layer, Viewport} from '@deck.gl/core';\n\n/** Class to manage terrain effect */\nexport class TerrainEffect implements Effect {\n id = 'terrain-effect';\n props = null;\n useInPicking = true;\n\n /** true if picking in the current pass */\n private isPicking: boolean = false;\n /** true if should use in the current pass */\n private isDrapingEnabled: boolean = false;\n /** An empty texture as placeholder */\n private dummyHeightMap: Texture2D;\n /** A texture encoding the ground elevation, updated once per redraw. Used by layers with offset mode */\n private heightMap?: HeightMapBuilder;\n private terrainPass!: TerrainPass;\n private terrainPickingPass!: TerrainPickingPass;\n /** One texture for each primitive terrain layer, into which the draped layers render */\n private terrainCovers: Map<string, TerrainCover> = new Map();\n\n initialize(gl: WebGLRenderingContext) {\n this.dummyHeightMap = new Texture2D(gl, {\n width: 1,\n height: 1,\n data: new Uint8Array([0, 0, 0, 0])\n });\n this.terrainPass = new TerrainPass(gl, {id: 'terrain'});\n this.terrainPickingPass = new TerrainPickingPass(gl, {id: 'terrain-picking'});\n\n if (HeightMapBuilder.isSupported(gl)) {\n this.heightMap = new HeightMapBuilder(gl);\n } else {\n log.warn('Terrain offset mode is not supported by this browser')();\n }\n\n ProgramManager.getDefaultProgramManager(gl).addDefaultModule(terrainModule);\n }\n\n preRender(gl: WebGLRenderingContext, opts: PreRenderOptions): void {\n if (!this.dummyHeightMap) {\n // First time this effect is in use, initialize resources and register the shader module\n this.initialize(gl);\n for (const layer of opts.layers) {\n // Force the terrain layer (and its descendents) to rebuild their models with the new shader\n if (layer.props.operation.includes('terrain')) {\n layer.setChangeFlags({extensionsChanged: true});\n }\n }\n }\n\n // @ts-expect-error pickZ only defined in picking pass\n if (opts.pickZ) {\n // Do not update if picking attributes\n this.isDrapingEnabled = false;\n return;\n }\n\n const {viewports, isPicking = false} = opts;\n this.isPicking = isPicking;\n this.isDrapingEnabled = true;\n\n // TODO - support multiple views?\n const viewport = viewports[0];\n const layers = (isPicking ? this.terrainPickingPass : this.terrainPass).getRenderableLayers(\n viewport,\n opts as TerrainPickingPassRenderOptions\n );\n\n const terrainLayers = layers.filter(l => l.props.operation.includes('terrain'));\n if (terrainLayers.length === 0) {\n return;\n }\n\n if (!isPicking) {\n const offsetLayers = layers.filter(l => l.state.terrainFittingMode === 'offset');\n if (offsetLayers.length > 0) {\n this._updateHeightMap(terrainLayers, viewport, opts);\n }\n }\n\n const drapeLayers = layers.filter(l => l.state.terrainFittingMode === 'drape');\n this._updateTerrainCovers(terrainLayers, drapeLayers, viewport, opts);\n }\n\n getModuleParameters(layer: Layer): TerrainModuleSettings {\n const {terrainFittingMode} = layer.state;\n\n return {\n heightMap: this.heightMap?.getRenderFramebuffer(),\n heightMapBounds: this.heightMap?.bounds,\n dummyHeightMap: this.dummyHeightMap,\n terrainCover: this.isDrapingEnabled ? this.terrainCovers.get(layer.id) : null,\n useTerrainHeightMap: terrainFittingMode === 'offset',\n terrainSkipRender: terrainFittingMode === 'drape' || !layer.props.operation.includes('draw')\n };\n }\n\n cleanup(): void {\n if (this.dummyHeightMap) {\n this.dummyHeightMap.delete();\n this.dummyHeightMap = undefined;\n }\n\n if (this.heightMap) {\n this.heightMap.delete();\n this.heightMap = undefined;\n }\n\n for (const terrainCover of this.terrainCovers.values()) {\n terrainCover.delete();\n }\n this.terrainCovers.clear();\n }\n\n private _updateHeightMap(terrainLayers: Layer[], viewport: Viewport, opts: PreRenderOptions) {\n if (!this.heightMap) {\n // Not supported\n return;\n }\n\n const shouldUpdate = this.heightMap.shouldUpdate({layers: terrainLayers, viewport});\n if (!shouldUpdate) {\n return;\n }\n\n this.terrainPass.renderHeightMap(this.heightMap, {\n ...opts,\n layers: terrainLayers,\n moduleParameters: {\n heightMapBounds: this.heightMap.bounds,\n dummyHeightMap: this.dummyHeightMap,\n devicePixelRatio: 1,\n drawToTerrainHeightMap: true\n }\n });\n }\n\n private _updateTerrainCovers(\n terrainLayers: Layer[],\n drapeLayers: Layer[],\n viewport: Viewport,\n opts: PreRenderOptions\n ) {\n // Mark a terrain cover as dirty if one of the drape layers needs redraw\n const layerNeedsRedraw: Record<string, boolean> = {};\n for (const layer of drapeLayers) {\n if (layer.state.terrainCoverNeedsRedraw) {\n layerNeedsRedraw[layer.id] = true;\n layer.state.terrainCoverNeedsRedraw = false;\n }\n }\n for (const terrainCover of this.terrainCovers.values()) {\n terrainCover.isDirty = terrainCover.isDirty || terrainCover.shouldUpdate({layerNeedsRedraw});\n }\n\n for (const layer of terrainLayers) {\n this._updateTerrainCover(layer, drapeLayers, viewport, opts);\n }\n\n if (!this.isPicking) {\n this._pruneTerrainCovers();\n }\n }\n\n private _updateTerrainCover(\n terrainLayer: Layer,\n drapeLayers: Layer[],\n viewport: Viewport,\n opts: PreRenderOptions\n ) {\n const renderPass = this.isPicking ? this.terrainPickingPass : this.terrainPass;\n let terrainCover = this.terrainCovers.get(terrainLayer.id);\n if (!terrainCover) {\n terrainCover = new TerrainCover(terrainLayer);\n this.terrainCovers.set(terrainLayer.id, terrainCover);\n }\n try {\n const isDirty = terrainCover.shouldUpdate({\n targetLayer: terrainLayer,\n viewport,\n layers: drapeLayers\n });\n if (this.isPicking || terrainCover.isDirty || isDirty) {\n renderPass.renderTerrainCover(terrainCover, {\n ...opts,\n layers: drapeLayers,\n moduleParameters: {\n dummyHeightMap: this.dummyHeightMap,\n terrainSkipRender: false,\n devicePixelRatio: 1\n }\n });\n terrainCover.isDirty = false;\n }\n } catch (err) {\n terrainLayer.raiseError(err as Error, `Error rendering terrain cover ${terrainCover.id}`);\n }\n }\n\n private _pruneTerrainCovers() {\n /** Prune the cache, remove textures for layers that have been removed */\n const idsToRemove: string[] = [];\n for (const [id, terrainCover] of this.terrainCovers) {\n if (!terrainCover.isActive) {\n idsToRemove.push(id);\n }\n }\n for (const id of idsToRemove) {\n this.terrainCovers.delete(id);\n }\n }\n}\n"],"file":"terrain-effect.js"}
|
|
1
|
+
{"version":3,"sources":["../../../src/terrain/terrain-effect.ts"],"names":["Texture2D","ProgramManager","log","terrainModule","TerrainCover","TerrainPass","TerrainPickingPass","HeightMapBuilder","TerrainEffect","Map","initialize","gl","dummyHeightMap","width","height","data","Uint8Array","terrainPass","id","terrainPickingPass","isSupported","heightMap","warn","getDefaultProgramManager","addDefaultModule","preRender","opts","layer","layers","props","operation","includes","setChangeFlags","extensionsChanged","pickZ","isDrapingEnabled","viewports","isPicking","viewport","getRenderableLayers","terrainLayers","filter","l","length","offsetLayers","state","terrainDrawMode","_updateHeightMap","drapeLayers","_updateTerrainCovers","getModuleParameters","getRenderFramebuffer","heightMapBounds","bounds","terrainCover","terrainCovers","get","useTerrainHeightMap","terrainSkipRender","cleanup","delete","undefined","values","clear","shouldUpdate","renderHeightMap","moduleParameters","devicePixelRatio","drawToTerrainHeightMap","layerNeedsRedraw","terrainCoverNeedsRedraw","isDirty","_updateTerrainCover","_pruneTerrainCovers","terrainLayer","renderPass","set","targetLayer","renderTerrainCover","err","raiseError","idsToRemove","isActive","push"],"mappings":"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","sourcesContent":["import {Texture2D, ProgramManager} from '@luma.gl/core';\nimport {log} from '@deck.gl/core';\n\nimport {terrainModule, TerrainModuleSettings} from './shader-module';\nimport {TerrainCover} from './terrain-cover';\nimport {TerrainPass} from './terrain-pass';\nimport {TerrainPickingPass, TerrainPickingPassRenderOptions} from './terrain-picking-pass';\nimport {HeightMapBuilder} from './height-map-builder';\n\nimport type {Effect, PreRenderOptions, Layer, Viewport} from '@deck.gl/core';\n\n/** Class to manage terrain effect */\nexport class TerrainEffect implements Effect {\n id = 'terrain-effect';\n props = null;\n useInPicking = true;\n\n /** true if picking in the current pass */\n private isPicking: boolean = false;\n /** true if should use in the current pass */\n private isDrapingEnabled: boolean = false;\n /** An empty texture as placeholder */\n private dummyHeightMap: Texture2D;\n /** A texture encoding the ground elevation, updated once per redraw. Used by layers with offset mode */\n private heightMap?: HeightMapBuilder;\n private terrainPass!: TerrainPass;\n private terrainPickingPass!: TerrainPickingPass;\n /** One texture for each primitive terrain layer, into which the draped layers render */\n private terrainCovers: Map<string, TerrainCover> = new Map();\n\n initialize(gl: WebGLRenderingContext) {\n this.dummyHeightMap = new Texture2D(gl, {\n width: 1,\n height: 1,\n data: new Uint8Array([0, 0, 0, 0])\n });\n this.terrainPass = new TerrainPass(gl, {id: 'terrain'});\n this.terrainPickingPass = new TerrainPickingPass(gl, {id: 'terrain-picking'});\n\n if (HeightMapBuilder.isSupported(gl)) {\n this.heightMap = new HeightMapBuilder(gl);\n } else {\n log.warn('Terrain offset mode is not supported by this browser')();\n }\n\n ProgramManager.getDefaultProgramManager(gl).addDefaultModule(terrainModule);\n }\n\n preRender(gl: WebGLRenderingContext, opts: PreRenderOptions): void {\n if (!this.dummyHeightMap) {\n // First time this effect is in use, initialize resources and register the shader module\n this.initialize(gl);\n for (const layer of opts.layers) {\n // Force the terrain layer (and its descendents) to rebuild their models with the new shader\n if (layer.props.operation.includes('terrain')) {\n layer.setChangeFlags({extensionsChanged: true});\n }\n }\n }\n\n // @ts-expect-error pickZ only defined in picking pass\n if (opts.pickZ) {\n // Do not update if picking attributes\n this.isDrapingEnabled = false;\n return;\n }\n\n const {viewports, isPicking = false} = opts;\n this.isPicking = isPicking;\n this.isDrapingEnabled = true;\n\n // TODO - support multiple views?\n const viewport = viewports[0];\n const layers = (isPicking ? this.terrainPickingPass : this.terrainPass).getRenderableLayers(\n viewport,\n opts as TerrainPickingPassRenderOptions\n );\n\n const terrainLayers = layers.filter(l => l.props.operation.includes('terrain'));\n if (terrainLayers.length === 0) {\n return;\n }\n\n if (!isPicking) {\n const offsetLayers = layers.filter(l => l.state.terrainDrawMode === 'offset');\n if (offsetLayers.length > 0) {\n this._updateHeightMap(terrainLayers, viewport, opts);\n }\n }\n\n const drapeLayers = layers.filter(l => l.state.terrainDrawMode === 'drape');\n this._updateTerrainCovers(terrainLayers, drapeLayers, viewport, opts);\n }\n\n getModuleParameters(layer: Layer): TerrainModuleSettings {\n const {terrainDrawMode} = layer.state;\n\n return {\n heightMap: this.heightMap?.getRenderFramebuffer(),\n heightMapBounds: this.heightMap?.bounds,\n dummyHeightMap: this.dummyHeightMap,\n terrainCover: this.isDrapingEnabled ? this.terrainCovers.get(layer.id) : null,\n useTerrainHeightMap: terrainDrawMode === 'offset',\n terrainSkipRender: terrainDrawMode === 'drape' || !layer.props.operation.includes('draw')\n };\n }\n\n cleanup(): void {\n if (this.dummyHeightMap) {\n this.dummyHeightMap.delete();\n this.dummyHeightMap = undefined;\n }\n\n if (this.heightMap) {\n this.heightMap.delete();\n this.heightMap = undefined;\n }\n\n for (const terrainCover of this.terrainCovers.values()) {\n terrainCover.delete();\n }\n this.terrainCovers.clear();\n }\n\n private _updateHeightMap(terrainLayers: Layer[], viewport: Viewport, opts: PreRenderOptions) {\n if (!this.heightMap) {\n // Not supported\n return;\n }\n\n const shouldUpdate = this.heightMap.shouldUpdate({layers: terrainLayers, viewport});\n if (!shouldUpdate) {\n return;\n }\n\n this.terrainPass.renderHeightMap(this.heightMap, {\n ...opts,\n layers: terrainLayers,\n moduleParameters: {\n heightMapBounds: this.heightMap.bounds,\n dummyHeightMap: this.dummyHeightMap,\n devicePixelRatio: 1,\n drawToTerrainHeightMap: true\n }\n });\n }\n\n private _updateTerrainCovers(\n terrainLayers: Layer[],\n drapeLayers: Layer[],\n viewport: Viewport,\n opts: PreRenderOptions\n ) {\n // Mark a terrain cover as dirty if one of the drape layers needs redraw\n const layerNeedsRedraw: Record<string, boolean> = {};\n for (const layer of drapeLayers) {\n if (layer.state.terrainCoverNeedsRedraw) {\n layerNeedsRedraw[layer.id] = true;\n layer.state.terrainCoverNeedsRedraw = false;\n }\n }\n for (const terrainCover of this.terrainCovers.values()) {\n terrainCover.isDirty = terrainCover.isDirty || terrainCover.shouldUpdate({layerNeedsRedraw});\n }\n\n for (const layer of terrainLayers) {\n this._updateTerrainCover(layer, drapeLayers, viewport, opts);\n }\n\n if (!this.isPicking) {\n this._pruneTerrainCovers();\n }\n }\n\n private _updateTerrainCover(\n terrainLayer: Layer,\n drapeLayers: Layer[],\n viewport: Viewport,\n opts: PreRenderOptions\n ) {\n const renderPass = this.isPicking ? this.terrainPickingPass : this.terrainPass;\n let terrainCover = this.terrainCovers.get(terrainLayer.id);\n if (!terrainCover) {\n terrainCover = new TerrainCover(terrainLayer);\n this.terrainCovers.set(terrainLayer.id, terrainCover);\n }\n try {\n const isDirty = terrainCover.shouldUpdate({\n targetLayer: terrainLayer,\n viewport,\n layers: drapeLayers\n });\n if (this.isPicking || terrainCover.isDirty || isDirty) {\n renderPass.renderTerrainCover(terrainCover, {\n ...opts,\n layers: drapeLayers,\n moduleParameters: {\n dummyHeightMap: this.dummyHeightMap,\n terrainSkipRender: false,\n devicePixelRatio: 1\n }\n });\n terrainCover.isDirty = false;\n }\n } catch (err) {\n terrainLayer.raiseError(err as Error, `Error rendering terrain cover ${terrainCover.id}`);\n }\n }\n\n private _pruneTerrainCovers() {\n /** Prune the cache, remove textures for layers that have been removed */\n const idsToRemove: string[] = [];\n for (const [id, terrainCover] of this.terrainCovers) {\n if (!terrainCover.isActive) {\n idsToRemove.push(id);\n }\n }\n for (const id of idsToRemove) {\n this.terrainCovers.delete(id);\n }\n }\n}\n"],"file":"terrain-effect.js"}
|
|
@@ -3,7 +3,7 @@ import { LayerExtension } from '@deck.gl/core';
|
|
|
3
3
|
import { TerrainEffect } from './terrain-effect';
|
|
4
4
|
import { terrainModule } from './shader-module';
|
|
5
5
|
const defaultProps = {
|
|
6
|
-
|
|
6
|
+
terrainDrawMode: undefined
|
|
7
7
|
};
|
|
8
8
|
export default class TerrainExtension extends LayerExtension {
|
|
9
9
|
getShaders() {
|
|
@@ -24,32 +24,32 @@ export default class TerrainExtension extends LayerExtension {
|
|
|
24
24
|
oldProps
|
|
25
25
|
} = params;
|
|
26
26
|
|
|
27
|
-
if (this.state.
|
|
27
|
+
if (this.state.terrainDrawMode && props.terrainDrawMode === oldProps.terrainDrawMode && props.extruded === oldProps.extruded) {
|
|
28
28
|
return;
|
|
29
29
|
}
|
|
30
30
|
|
|
31
31
|
let {
|
|
32
|
-
|
|
32
|
+
terrainDrawMode
|
|
33
33
|
} = props;
|
|
34
34
|
|
|
35
|
-
if (!
|
|
35
|
+
if (!terrainDrawMode) {
|
|
36
36
|
var _this$getAttributeMan;
|
|
37
37
|
|
|
38
38
|
const is3d = this.props.extruded;
|
|
39
39
|
const attributes = (_this$getAttributeMan = this.getAttributeManager()) === null || _this$getAttributeMan === void 0 ? void 0 : _this$getAttributeMan.attributes;
|
|
40
40
|
const hasAnchor = attributes && 'instancePositions' in attributes;
|
|
41
|
-
|
|
41
|
+
terrainDrawMode = is3d || hasAnchor ? 'offset' : 'drape';
|
|
42
42
|
}
|
|
43
43
|
|
|
44
44
|
this.setState({
|
|
45
|
-
|
|
45
|
+
terrainDrawMode
|
|
46
46
|
});
|
|
47
47
|
}
|
|
48
48
|
|
|
49
49
|
onNeedsRedraw() {
|
|
50
50
|
const state = this.state;
|
|
51
51
|
|
|
52
|
-
if (state.
|
|
52
|
+
if (state.terrainDrawMode === 'drape') {
|
|
53
53
|
state.terrainCoverNeedsRedraw = true;
|
|
54
54
|
}
|
|
55
55
|
}
|