@kepler.gl/deckgl-layers 3.2.6 → 3.3.0-alpha.1
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/3d-building-layer/3d-building-layer.d.ts +3 -3
- package/dist/3d-building-layer/3d-building-layer.js +9 -12
- package/dist/3d-building-layer/types.d.ts +8 -8
- package/dist/cluster-layer/cluster-layer.d.ts +16 -26
- package/dist/cluster-layer/cluster-layer.js +19 -33
- package/dist/column-layer/enhanced-column-layer.d.ts +4 -4
- package/dist/column-layer/enhanced-column-layer.js +39 -35
- package/dist/deckgl-extensions/filter-arrow-layer.d.ts +33 -6
- package/dist/deckgl-extensions/filter-arrow-layer.js +4 -12
- package/dist/deckgl-extensions/filter-shader-module.d.ts +32 -4
- package/dist/deckgl-extensions/filter-shader-module.js +3 -4
- package/dist/grid-layer/enhanced-cpu-grid-layer.d.ts +4913 -6
- package/dist/grid-layer/enhanced-cpu-grid-layer.js +67 -44
- package/dist/hexagon-layer/enhanced-hexagon-layer.d.ts +4910 -4
- package/dist/hexagon-layer/enhanced-hexagon-layer.js +82 -41
- package/dist/index.d.ts +1 -0
- package/dist/index.js +13 -1
- package/dist/layer-utils/aggregation-utils.d.ts +44 -0
- package/dist/layer-utils/aggregation-utils.js +181 -0
- package/dist/layer-utils/cpu-aggregator.d.ts +74 -27
- package/dist/layer-utils/cpu-aggregator.js +224 -19
- package/dist/layer-utils/shader-utils.d.ts +1 -0
- package/dist/layer-utils/shader-utils.js +10 -1
- package/dist/line-layer/line-layer.d.ts +4 -4
- package/dist/line-layer/line-layer.js +29 -21
- package/dist/raster/images.d.ts +10 -3
- package/dist/raster/images.js +154 -60
- package/dist/raster/pipeline-validation-patch.d.ts +1 -0
- package/dist/raster/pipeline-validation-patch.js +101 -0
- package/dist/raster/raster-layer/raster-layer-shaders.d.ts +56 -0
- package/dist/raster/raster-layer/raster-layer-shaders.js +163 -0
- package/dist/raster/raster-layer/raster-layer.d.ts +6 -6
- package/dist/raster/raster-layer/raster-layer.js +90 -88
- package/dist/raster/raster-mesh-layer/matrix.d.ts +3 -1
- package/dist/raster/raster-mesh-layer/matrix.js +3 -3
- package/dist/raster/raster-mesh-layer/raster-mesh-layer-shaders.d.ts +19 -0
- package/dist/raster/raster-mesh-layer/raster-mesh-layer-shaders.js +38 -0
- package/dist/raster/raster-mesh-layer/raster-mesh-layer.d.ts +7 -6
- package/dist/raster/raster-mesh-layer/raster-mesh-layer.js +97 -83
- package/dist/raster/raster-processing-uniforms.d.ts +38 -0
- package/dist/raster/raster-processing-uniforms.js +124 -0
- package/dist/raster/types.d.ts +8 -8
- package/dist/raster/types.js +1 -1
- package/dist/raster/util.d.ts +15 -0
- package/dist/raster/util.js +113 -3
- package/dist/raster/webgl/color/colormap.js +13 -7
- package/dist/raster/webgl/color/filter.js +22 -12
- package/dist/raster/webgl/color/gamma-contrast.js +9 -3
- package/dist/raster/webgl/color/linear-rescale.js +9 -5
- package/dist/raster/webgl/color/saturation.js +7 -4
- package/dist/raster/webgl/color/sigmoidal-contrast.js +9 -5
- package/dist/raster/webgl/pansharpen/pansharpen-brovey.js +7 -4
- package/dist/raster/webgl/texture/combine-bands.js +1 -1
- package/dist/raster/webgl/texture/mask.js +27 -35
- package/dist/raster/webgl/texture/reorder-bands.js +8 -5
- package/dist/raster/webgl/texture/rgba-image.js +1 -1
- package/dist/raster/webgl/types.d.ts +11 -6
- package/dist/raster/webgl/types.js +1 -1
- package/dist/svg-icon-layer/scatterplot-icon-layer.d.ts +2 -4
- package/dist/svg-icon-layer/scatterplot-icon-layer.js +19 -25
- package/dist/svg-icon-layer/svg-icon-layer.d.ts +4 -6
- package/dist/svg-icon-layer/svg-icon-layer.js +5 -3
- package/dist/wms/wms-layer.d.ts +8 -5
- package/dist/wms/wms-layer.js +100 -27
- package/package.json +21 -17
|
@@ -0,0 +1,101 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
|
|
3
|
+
Object.defineProperty(exports, "__esModule", {
|
|
4
|
+
value: true
|
|
5
|
+
});
|
|
6
|
+
exports.patchPipelineValidation = patchPipelineValidation;
|
|
7
|
+
var _webgl = require("@luma.gl/webgl");
|
|
8
|
+
// SPDX-License-Identifier: MIT
|
|
9
|
+
// Copyright contributors to the kepler.gl project
|
|
10
|
+
|
|
11
|
+
/**
|
|
12
|
+
* Patch luma.gl 9's pipeline validation to tolerate mixed-sampler-type
|
|
13
|
+
* validation errors in _getLinkStatus().
|
|
14
|
+
*
|
|
15
|
+
* WebGL2's validateProgram checks that sampler uniforms of different types
|
|
16
|
+
* (sampler2D, usampler2D, isampler2D) are not assigned to the same texture
|
|
17
|
+
* unit. Programs that mix sampler types (e.g. raster band data as usampler2D +
|
|
18
|
+
* shadow maps as sampler2D) may fail validation even though they linked
|
|
19
|
+
* successfully and work correctly once texture units are assigned at draw time.
|
|
20
|
+
*
|
|
21
|
+
* In luma.gl ≥9.3 the _getLinkStatus method moved from WEBGLRenderPipeline to
|
|
22
|
+
* WEBGLSharedRenderPipeline and now calls _initializeSamplerUniforms() before
|
|
23
|
+
* validateProgram, which fixes most false positives. However, some WebGL
|
|
24
|
+
* drivers still report errors even with unique units, so we keep suppressing
|
|
25
|
+
* the known false-positive about mixed sampler types. We patch _getLinkStatus
|
|
26
|
+
* on whichever pipeline class owns it.
|
|
27
|
+
*/
|
|
28
|
+
|
|
29
|
+
// @ts-ignore resolution depends on moduleResolution setting
|
|
30
|
+
|
|
31
|
+
var MIXED_SAMPLER_RE = /different type[s]? use the same sampler location/i;
|
|
32
|
+
var _patched = false;
|
|
33
|
+
function createPatchedLinkStatus(_original) {
|
|
34
|
+
return function _patchedGetLinkStatus() {
|
|
35
|
+
var gl = this.device.gl;
|
|
36
|
+
var linked = gl.getProgramParameter(this.handle, 0x8b82 /* LINK_STATUS */);
|
|
37
|
+
if (!linked) {
|
|
38
|
+
this.linkStatus = 'error';
|
|
39
|
+
return 'link-error';
|
|
40
|
+
}
|
|
41
|
+
|
|
42
|
+
// luma.gl ≥9.3 assigns unique texture units to samplers before
|
|
43
|
+
// validation via _initializeSamplerUniforms. Call it here so that
|
|
44
|
+
// the sampler-to-unit mapping is populated through our patched path.
|
|
45
|
+
if (typeof this._initializeSamplerUniforms === 'function') {
|
|
46
|
+
this._initializeSamplerUniforms();
|
|
47
|
+
}
|
|
48
|
+
gl.validateProgram(this.handle);
|
|
49
|
+
var validated = gl.getProgramParameter(this.handle, 0x8b83 /* VALIDATE_STATUS */);
|
|
50
|
+
if (!validated) {
|
|
51
|
+
var infoLog = gl.getProgramInfoLog(this.handle) || '';
|
|
52
|
+
if (!MIXED_SAMPLER_RE.test(infoLog)) {
|
|
53
|
+
this.linkStatus = 'error';
|
|
54
|
+
return 'validation-error';
|
|
55
|
+
}
|
|
56
|
+
}
|
|
57
|
+
this.linkStatus = 'success';
|
|
58
|
+
return 'success';
|
|
59
|
+
};
|
|
60
|
+
}
|
|
61
|
+
function patchPipelineValidation() {
|
|
62
|
+
if (_patched) return;
|
|
63
|
+
_patched = true;
|
|
64
|
+
|
|
65
|
+
// Strategy 1: luma.gl <9.3 — _getLinkStatus on WEBGLRenderPipeline
|
|
66
|
+
if (_webgl.WEBGLRenderPipeline !== null && _webgl.WEBGLRenderPipeline !== void 0 && _webgl.WEBGLRenderPipeline.prototype && typeof _webgl.WEBGLRenderPipeline.prototype._getLinkStatus === 'function') {
|
|
67
|
+
var original = _webgl.WEBGLRenderPipeline.prototype._getLinkStatus;
|
|
68
|
+
_webgl.WEBGLRenderPipeline.prototype._getLinkStatus = createPatchedLinkStatus(original);
|
|
69
|
+
return;
|
|
70
|
+
}
|
|
71
|
+
|
|
72
|
+
// Strategy 2: luma.gl ≥9.3 — _getLinkStatus moved to WEBGLSharedRenderPipeline.
|
|
73
|
+
// That class is not publicly exported, so we hook the factory on WebGLDevice
|
|
74
|
+
// that creates shared pipelines. The first invocation discovers the class,
|
|
75
|
+
// patches its prototype, then re-validates the instance.
|
|
76
|
+
var deviceProto = _webgl.WebGLDevice === null || _webgl.WebGLDevice === void 0 ? void 0 : _webgl.WebGLDevice.prototype;
|
|
77
|
+
var origFactory = deviceProto === null || deviceProto === void 0 ? void 0 : deviceProto._createSharedRenderPipelineWebGL;
|
|
78
|
+
if (typeof origFactory !== 'function') return;
|
|
79
|
+
deviceProto._createSharedRenderPipelineWebGL = function () {
|
|
80
|
+
for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
|
|
81
|
+
args[_key] = arguments[_key];
|
|
82
|
+
}
|
|
83
|
+
var instance = origFactory.apply(this, args);
|
|
84
|
+
var SharedCtor = Object.getPrototypeOf(instance).constructor;
|
|
85
|
+
if (SharedCtor && SharedCtor !== _webgl.WEBGLRenderPipeline && typeof SharedCtor.prototype._getLinkStatus === 'function') {
|
|
86
|
+
var _original2 = SharedCtor.prototype._getLinkStatus;
|
|
87
|
+
SharedCtor.prototype._getLinkStatus = createPatchedLinkStatus(_original2);
|
|
88
|
+
|
|
89
|
+
// Re-validate this first instance since its _getLinkStatus already ran
|
|
90
|
+
// with the unpatched version during construction.
|
|
91
|
+
if (instance.linkStatus !== 'success') {
|
|
92
|
+
instance._getLinkStatus();
|
|
93
|
+
}
|
|
94
|
+
}
|
|
95
|
+
|
|
96
|
+
// Restore original factory — future instances will use the patched prototype
|
|
97
|
+
deviceProto._createSharedRenderPipelineWebGL = origFactory;
|
|
98
|
+
return instance;
|
|
99
|
+
};
|
|
100
|
+
}
|
|
101
|
+
//# sourceMappingURL=data:application/json;charset=utf-8;base64,{"version":3,"names":["_webgl","require","MIXED_SAMPLER_RE","_patched","createPatchedLinkStatus","_original","_patchedGetLinkStatus","gl","device","linked","getProgramParameter","handle","linkStatus","_initializeSamplerUniforms","validateProgram","validated","infoLog","getProgramInfoLog","test","patchPipelineValidation","WEBGLRenderPipeline","prototype","_getLinkStatus","original","deviceProto","WebGLDevice","origFactory","_createSharedRenderPipelineWebGL","_len","arguments","length","args","Array","_key","instance","apply","SharedCtor","Object","getPrototypeOf","constructor"],"sources":["../../src/raster/pipeline-validation-patch.ts"],"sourcesContent":["// SPDX-License-Identifier: MIT\n// Copyright contributors to the kepler.gl project\n\n/**\n * Patch luma.gl 9's pipeline validation to tolerate mixed-sampler-type\n * validation errors in _getLinkStatus().\n *\n * WebGL2's validateProgram checks that sampler uniforms of different types\n * (sampler2D, usampler2D, isampler2D) are not assigned to the same texture\n * unit. Programs that mix sampler types (e.g. raster band data as usampler2D +\n * shadow maps as sampler2D) may fail validation even though they linked\n * successfully and work correctly once texture units are assigned at draw time.\n *\n * In luma.gl ≥9.3 the _getLinkStatus method moved from WEBGLRenderPipeline to\n * WEBGLSharedRenderPipeline and now calls _initializeSamplerUniforms() before\n * validateProgram, which fixes most false positives. However, some WebGL\n * drivers still report errors even with unique units, so we keep suppressing\n * the known false-positive about mixed sampler types. We patch _getLinkStatus\n * on whichever pipeline class owns it.\n */\n\n// @ts-ignore resolution depends on moduleResolution setting\nimport {WEBGLRenderPipeline, WebGLDevice} from '@luma.gl/webgl';\n\nconst MIXED_SAMPLER_RE = /different type[s]? use the same sampler location/i;\n\nlet _patched = false;\n\nfunction createPatchedLinkStatus(_original: (...args: unknown[]) => unknown) {\n  return function _patchedGetLinkStatus(this: any) {\n    const {gl} = this.device;\n    const linked = gl.getProgramParameter(this.handle, 0x8b82 /* LINK_STATUS */);\n    if (!linked) {\n      this.linkStatus = 'error';\n      return 'link-error';\n    }\n\n    // luma.gl ≥9.3 assigns unique texture units to samplers before\n    // validation via _initializeSamplerUniforms. Call it here so that\n    // the sampler-to-unit mapping is populated through our patched path.\n    if (typeof this._initializeSamplerUniforms === 'function') {\n      this._initializeSamplerUniforms();\n    }\n\n    gl.validateProgram(this.handle);\n    const validated = gl.getProgramParameter(this.handle, 0x8b83 /* VALIDATE_STATUS */);\n    if (!validated) {\n      const infoLog = gl.getProgramInfoLog(this.handle) || '';\n      if (!MIXED_SAMPLER_RE.test(infoLog)) {\n        this.linkStatus = 'error';\n        return 'validation-error';\n      }\n    }\n\n    this.linkStatus = 'success';\n    return 'success';\n  };\n}\n\nexport function patchPipelineValidation(): void {\n  if (_patched) return;\n  _patched = true;\n\n  // Strategy 1: luma.gl <9.3 — _getLinkStatus on WEBGLRenderPipeline\n  if (\n    WEBGLRenderPipeline?.prototype &&\n    typeof (WEBGLRenderPipeline.prototype as any)._getLinkStatus === 'function'\n  ) {\n    const original = (WEBGLRenderPipeline.prototype as any)._getLinkStatus;\n    (WEBGLRenderPipeline.prototype as any)._getLinkStatus = createPatchedLinkStatus(original);\n    return;\n  }\n\n  // Strategy 2: luma.gl ≥9.3 — _getLinkStatus moved to WEBGLSharedRenderPipeline.\n  // That class is not publicly exported, so we hook the factory on WebGLDevice\n  // that creates shared pipelines. The first invocation discovers the class,\n  // patches its prototype, then re-validates the instance.\n  const deviceProto = WebGLDevice?.prototype as any;\n  const origFactory = deviceProto?._createSharedRenderPipelineWebGL;\n  if (typeof origFactory !== 'function') return;\n\n  deviceProto._createSharedRenderPipelineWebGL = function (this: any, ...args: any[]) {\n    const instance = origFactory.apply(this, args);\n    const SharedCtor = Object.getPrototypeOf(instance).constructor;\n\n    if (\n      SharedCtor &&\n      SharedCtor !== WEBGLRenderPipeline &&\n      typeof SharedCtor.prototype._getLinkStatus === 'function'\n    ) {\n      const original = SharedCtor.prototype._getLinkStatus;\n      SharedCtor.prototype._getLinkStatus = createPatchedLinkStatus(original);\n\n      // Re-validate this first instance since its _getLinkStatus already ran\n      // with the unpatched version during construction.\n      if (instance.linkStatus !== 'success') {\n        instance._getLinkStatus();\n      }\n    }\n\n    // Restore original factory — future instances will use the patched prototype\n    deviceProto._createSharedRenderPipelineWebGL = origFactory;\n    return instance;\n  };\n}\n"],"mappings":"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","ignoreList":[]}
|
|
@@ -0,0 +1,56 @@
|
|
|
1
|
+
import type { ShaderModule as LumaShaderModule } from '../webgl/types';
|
|
2
|
+
export declare const rasterUniforms: {
|
|
3
|
+
name: string;
|
|
4
|
+
vs: string;
|
|
5
|
+
fs: string;
|
|
6
|
+
uniformTypes: {
|
|
7
|
+
bounds: string;
|
|
8
|
+
coordinateConversion: string;
|
|
9
|
+
desaturate: string;
|
|
10
|
+
opacity: string;
|
|
11
|
+
tintColor: string;
|
|
12
|
+
transparentColor: string;
|
|
13
|
+
};
|
|
14
|
+
};
|
|
15
|
+
/**
|
|
16
|
+
* Register custom DECKGL_CREATE_COLOR and DECKGL_MUTATE_COLOR shader hooks
|
|
17
|
+
* with the default ShaderAssembler. These hooks are used by the raster layer's
|
|
18
|
+
* custom shader modules (rgbaImage, combineBands, colormap, etc.).
|
|
19
|
+
*
|
|
20
|
+
* In luma.gl 8.x these were registered via ProgramManager; in luma.gl 9.x
|
|
21
|
+
* we register them with the ShaderAssembler singleton.
|
|
22
|
+
*
|
|
23
|
+
* NOTE: We must check the assembler's hook list every time rather than using
|
|
24
|
+
* a module-level boolean guard, because deck.gl's getShaderAssembler() clears
|
|
25
|
+
* _hookFunctions when a new Deck instance is created (e.g. during image export).
|
|
26
|
+
*/
|
|
27
|
+
export declare function ensureRasterHooksRegistered(): void;
|
|
28
|
+
/**
|
|
29
|
+
* Convert kepler.gl's custom raster shader modules into luma.gl 9 compatible
|
|
30
|
+
* format. Ensures fs2 (WebGL2) shaders are used and texture2D -> texture.
|
|
31
|
+
*/
|
|
32
|
+
interface LumaModuleOutput {
|
|
33
|
+
name: string;
|
|
34
|
+
fs: string;
|
|
35
|
+
vs?: string;
|
|
36
|
+
defines?: Record<string, string>;
|
|
37
|
+
getUniforms?: (opts: object) => Record<string, unknown> | null;
|
|
38
|
+
uniforms?: Record<string, unknown>;
|
|
39
|
+
uniformTypes?: Record<string, string>;
|
|
40
|
+
inject?: Record<string, string>;
|
|
41
|
+
dependencies?: unknown[];
|
|
42
|
+
deprecations?: unknown[];
|
|
43
|
+
}
|
|
44
|
+
export declare function prepareLumaModules(modules: LumaShaderModule[]): LumaModuleOutput[];
|
|
45
|
+
/**
|
|
46
|
+
* Build the vertex shader for the raster layer.
|
|
47
|
+
* References raster.coordinateConversion from the UBO.
|
|
48
|
+
*/
|
|
49
|
+
export declare function buildRasterVertexShader(): string;
|
|
50
|
+
/**
|
|
51
|
+
* Build the fragment shader for the raster layer.
|
|
52
|
+
* Uses DECKGL_CREATE_COLOR and DECKGL_MUTATE_COLOR hooks which are now
|
|
53
|
+
* registered with the ShaderAssembler and populated by module injections.
|
|
54
|
+
*/
|
|
55
|
+
export declare function buildRasterFragmentShader(): string;
|
|
56
|
+
export {};
|
|
@@ -0,0 +1,163 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
|
|
3
|
+
var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
|
|
4
|
+
Object.defineProperty(exports, "__esModule", {
|
|
5
|
+
value: true
|
|
6
|
+
});
|
|
7
|
+
exports.buildRasterFragmentShader = buildRasterFragmentShader;
|
|
8
|
+
exports.buildRasterVertexShader = buildRasterVertexShader;
|
|
9
|
+
exports.ensureRasterHooksRegistered = ensureRasterHooksRegistered;
|
|
10
|
+
exports.prepareLumaModules = prepareLumaModules;
|
|
11
|
+
exports.rasterUniforms = void 0;
|
|
12
|
+
var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
|
|
13
|
+
var _shadertools = require("@luma.gl/shadertools");
|
|
14
|
+
var _rasterProcessingUniforms = require("../raster-processing-uniforms");
|
|
15
|
+
// SPDX-License-Identifier: MIT
|
|
16
|
+
// Copyright contributors to the kepler.gl project
|
|
17
|
+
|
|
18
|
+
/**
|
|
19
|
+
* UBO-based shader module for raster layer uniforms.
|
|
20
|
+
* Replaces the old standalone `uniform float desaturate` etc.
|
|
21
|
+
*/
|
|
22
|
+
var rasterUniformBlock = "uniform rasterUniforms {\n vec4 bounds;\n float coordinateConversion;\n float desaturate;\n float opacity;\n vec3 tintColor;\n vec4 transparentColor;\n} raster;\n";
|
|
23
|
+
var rasterUniforms = exports.rasterUniforms = {
|
|
24
|
+
name: 'raster',
|
|
25
|
+
vs: rasterUniformBlock,
|
|
26
|
+
fs: rasterUniformBlock,
|
|
27
|
+
uniformTypes: {
|
|
28
|
+
bounds: 'vec4<f32>',
|
|
29
|
+
coordinateConversion: 'f32',
|
|
30
|
+
desaturate: 'f32',
|
|
31
|
+
opacity: 'f32',
|
|
32
|
+
tintColor: 'vec3<f32>',
|
|
33
|
+
transparentColor: 'vec4<f32>'
|
|
34
|
+
}
|
|
35
|
+
};
|
|
36
|
+
|
|
37
|
+
/**
|
|
38
|
+
* Register custom DECKGL_CREATE_COLOR and DECKGL_MUTATE_COLOR shader hooks
|
|
39
|
+
* with the default ShaderAssembler. These hooks are used by the raster layer's
|
|
40
|
+
* custom shader modules (rgbaImage, combineBands, colormap, etc.).
|
|
41
|
+
*
|
|
42
|
+
* In luma.gl 8.x these were registered via ProgramManager; in luma.gl 9.x
|
|
43
|
+
* we register them with the ShaderAssembler singleton.
|
|
44
|
+
*
|
|
45
|
+
* NOTE: We must check the assembler's hook list every time rather than using
|
|
46
|
+
* a module-level boolean guard, because deck.gl's getShaderAssembler() clears
|
|
47
|
+
* _hookFunctions when a new Deck instance is created (e.g. during image export).
|
|
48
|
+
*/
|
|
49
|
+
function ensureRasterHooksRegistered() {
|
|
50
|
+
var assembler = _shadertools.ShaderAssembler.getDefaultShaderAssembler();
|
|
51
|
+
// @ts-expect-error _hookFunctions is private in ShaderAssembler
|
|
52
|
+
var existingHooks = assembler._hookFunctions || [];
|
|
53
|
+
var hookNames = existingHooks.map(function (h) {
|
|
54
|
+
return typeof h === 'string' ? h : h.hook;
|
|
55
|
+
});
|
|
56
|
+
if (!hookNames.some(function (h) {
|
|
57
|
+
return h === null || h === void 0 ? void 0 : h.includes('DECKGL_CREATE_COLOR');
|
|
58
|
+
})) {
|
|
59
|
+
assembler.addShaderHook('fs:DECKGL_CREATE_COLOR(inout vec4 image, vec2 coord)');
|
|
60
|
+
}
|
|
61
|
+
if (!hookNames.some(function (h) {
|
|
62
|
+
return h === null || h === void 0 ? void 0 : h.includes('DECKGL_MUTATE_COLOR');
|
|
63
|
+
})) {
|
|
64
|
+
assembler.addShaderHook('fs:DECKGL_MUTATE_COLOR(inout vec4 image, vec2 coord)');
|
|
65
|
+
}
|
|
66
|
+
}
|
|
67
|
+
|
|
68
|
+
/**
|
|
69
|
+
* Convert kepler.gl's custom raster shader modules into luma.gl 9 compatible
|
|
70
|
+
* format. Ensures fs2 (WebGL2) shaders are used and texture2D -> texture.
|
|
71
|
+
*/
|
|
72
|
+
|
|
73
|
+
function prepareLumaModules(modules) {
|
|
74
|
+
return modules.map(function (mod) {
|
|
75
|
+
var fs = mod.fs2 || mod.fs || '';
|
|
76
|
+
// Replace texture2D with texture for GLSL 300 es
|
|
77
|
+
fs = fs.replace(/texture2D\(/g, 'texture(');
|
|
78
|
+
var nameMap = _rasterProcessingUniforms.UNIFORM_NAME_MAP[mod.name];
|
|
79
|
+
var consolidate = Boolean(nameMap && mod.uniformTypes);
|
|
80
|
+
if (mod.uniformTypes && !nameMap) {
|
|
81
|
+
console.warn("[raster] Module \"".concat(mod.name, "\" has uniformTypes but no UNIFORM_NAME_MAP entry. ") + 'Its UBO will not be consolidated and may push the fragment uniform block count over the WebGL2 limit.');
|
|
82
|
+
}
|
|
83
|
+
if (consolidate) {
|
|
84
|
+
// Strip only this module's uniform block declaration so it doesn't
|
|
85
|
+
// create its own UBO.
|
|
86
|
+
var blockPattern = new RegExp("uniform\\s+".concat(mod.name, "Uniforms\\s*\\{[^}]*\\}\\s*").concat(mod.name, "\\s*;"), 'gs');
|
|
87
|
+
fs = fs.replace(blockPattern, '');
|
|
88
|
+
|
|
89
|
+
// Rewrite moduleName.fieldName references to the shared UBO aliases
|
|
90
|
+
for (var _i = 0, _Object$entries = Object.entries(nameMap); _i < _Object$entries.length; _i++) {
|
|
91
|
+
var _Object$entries$_i = (0, _slicedToArray2["default"])(_Object$entries[_i], 2),
|
|
92
|
+
origField = _Object$entries$_i[0],
|
|
93
|
+
prefixedField = _Object$entries$_i[1];
|
|
94
|
+
var pattern = new RegExp("\\b".concat(mod.name, "\\.").concat(origField, "\\b"), 'g');
|
|
95
|
+
fs = fs.replace(pattern, "".concat(prefixedField, "_ALIAS"));
|
|
96
|
+
}
|
|
97
|
+
}
|
|
98
|
+
var result = {
|
|
99
|
+
name: mod.name,
|
|
100
|
+
fs: fs,
|
|
101
|
+
dependencies: mod.dependencies,
|
|
102
|
+
deprecations: mod.deprecations
|
|
103
|
+
};
|
|
104
|
+
if (mod.vs) {
|
|
105
|
+
result.vs = mod.vs.replace(/texture2D\(/g, 'texture(');
|
|
106
|
+
}
|
|
107
|
+
if (mod.defines) {
|
|
108
|
+
result.defines = mod.defines;
|
|
109
|
+
}
|
|
110
|
+
if (mod.getUniforms) {
|
|
111
|
+
result.getUniforms = mod.getUniforms;
|
|
112
|
+
}
|
|
113
|
+
if (mod.uniforms) {
|
|
114
|
+
result.uniforms = mod.uniforms;
|
|
115
|
+
}
|
|
116
|
+
|
|
117
|
+
// Only keep uniformTypes for modules NOT consolidated into the shared UBO
|
|
118
|
+
if (mod.uniformTypes && !consolidate) {
|
|
119
|
+
result.uniformTypes = mod.uniformTypes;
|
|
120
|
+
}
|
|
121
|
+
|
|
122
|
+
// Convert inject code, replacing texture2D -> texture and UBO references
|
|
123
|
+
if (mod.inject) {
|
|
124
|
+
result.inject = {};
|
|
125
|
+
for (var _i2 = 0, _Object$entries2 = Object.entries(mod.inject); _i2 < _Object$entries2.length; _i2++) {
|
|
126
|
+
var _Object$entries2$_i = (0, _slicedToArray2["default"])(_Object$entries2[_i2], 2),
|
|
127
|
+
hook = _Object$entries2$_i[0],
|
|
128
|
+
code = _Object$entries2$_i[1];
|
|
129
|
+
var codeStr = typeof code === 'string' ? code : code.injection || '';
|
|
130
|
+
codeStr = codeStr.replace(/texture2D\(/g, 'texture(');
|
|
131
|
+
if (consolidate && nameMap) {
|
|
132
|
+
for (var _i3 = 0, _Object$entries3 = Object.entries(nameMap); _i3 < _Object$entries3.length; _i3++) {
|
|
133
|
+
var _Object$entries3$_i = (0, _slicedToArray2["default"])(_Object$entries3[_i3], 2),
|
|
134
|
+
_origField = _Object$entries3$_i[0],
|
|
135
|
+
_prefixedField = _Object$entries3$_i[1];
|
|
136
|
+
var _pattern = new RegExp("\\b".concat(mod.name, "\\.").concat(_origField, "\\b"), 'g');
|
|
137
|
+
codeStr = codeStr.replace(_pattern, "".concat(_prefixedField, "_ALIAS"));
|
|
138
|
+
}
|
|
139
|
+
}
|
|
140
|
+
result.inject[hook] = codeStr;
|
|
141
|
+
}
|
|
142
|
+
}
|
|
143
|
+
return result;
|
|
144
|
+
});
|
|
145
|
+
}
|
|
146
|
+
|
|
147
|
+
/**
|
|
148
|
+
* Build the vertex shader for the raster layer.
|
|
149
|
+
* References raster.coordinateConversion from the UBO.
|
|
150
|
+
*/
|
|
151
|
+
function buildRasterVertexShader() {
|
|
152
|
+
return "#version 300 es\n#define SHADER_NAME raster-layer-vertex-shader\n\nprecision mediump float;\n\nin vec2 texCoords;\nin vec3 positions;\nin vec3 positions64Low;\n\nout vec2 vTexCoord;\nout vec2 vTexPos;\n\nconst vec3 pickingColor = vec3(1.0, 0.0, 0.0);\n\nvoid main(void) {\n geometry.worldPosition = positions;\n geometry.uv = texCoords;\n geometry.pickingColor = pickingColor;\n\n gl_Position = project_position_to_clipspace(positions, positions64Low, vec3(0.0), geometry.position);\n DECKGL_FILTER_GL_POSITION(gl_Position, geometry);\n\n vTexCoord = texCoords;\n\n if (raster.coordinateConversion < -0.5) {\n vTexPos = geometry.position.xy + project.commonOrigin.xy;\n } else if (raster.coordinateConversion > 0.5) {\n vTexPos = geometry.worldPosition.xy;\n }\n\n vec4 color = vec4(0.0);\n DECKGL_FILTER_COLOR(color, geometry);\n}\n";
|
|
153
|
+
}
|
|
154
|
+
|
|
155
|
+
/**
|
|
156
|
+
* Build the fragment shader for the raster layer.
|
|
157
|
+
* Uses DECKGL_CREATE_COLOR and DECKGL_MUTATE_COLOR hooks which are now
|
|
158
|
+
* registered with the ShaderAssembler and populated by module injections.
|
|
159
|
+
*/
|
|
160
|
+
function buildRasterFragmentShader() {
|
|
161
|
+
return "#version 300 es\n#define SHADER_NAME raster-layer-fragment-shader\n\nprecision mediump float;\nprecision mediump int;\nprecision mediump usampler2D;\n\nin vec2 vTexCoord;\nin vec2 vTexPos;\n\nout vec4 fragColor;\n\n/* projection utils */\nconst float TILE_SIZE = 512.0;\nconst float PI = 3.1415926536;\nconst float WORLD_SCALE = TILE_SIZE / PI / 2.0;\n\nvec2 lnglat_to_mercator(vec2 lnglat) {\n float x = lnglat.x;\n float y = clamp(lnglat.y, -89.9, 89.9);\n return vec2(\n radians(x) + PI,\n PI + log(tan(PI * 0.25 + radians(y) * 0.5))\n ) * WORLD_SCALE;\n}\n\nvec2 mercator_to_lnglat(vec2 xy) {\n xy /= WORLD_SCALE;\n return degrees(vec2(\n xy.x - PI,\n atan(exp(xy.y - PI)) * 2.0 - PI * 0.5\n ));\n}\n\nvec3 color_desaturate(vec3 color) {\n float luminance = (color.r + color.g + color.b) * 0.333333333;\n return mix(color, vec3(luminance), raster.desaturate);\n}\n\nvec3 color_tint(vec3 color) {\n return color * raster.tintColor;\n}\n\nvec4 apply_opacity(vec3 color, float alpha) {\n if (raster.transparentColor.a == 0.0) {\n return vec4(color, alpha);\n }\n float blendedAlpha = alpha + raster.transparentColor.a * (1.0 - alpha);\n float highLightRatio = alpha / blendedAlpha;\n vec3 blendedRGB = mix(raster.transparentColor.rgb, color, highLightRatio);\n return vec4(blendedRGB, blendedAlpha);\n}\n\nvec2 getUV(vec2 pos) {\n return vec2(\n (pos.x - raster.bounds[0]) / (raster.bounds[2] - raster.bounds[0]),\n (pos.y - raster.bounds[3]) / (raster.bounds[1] - raster.bounds[3])\n );\n}\n\nvoid main(void) {\n vec2 uv = vTexCoord;\n if (raster.coordinateConversion < -0.5) {\n vec2 lnglat = mercator_to_lnglat(vTexPos);\n uv = getUV(lnglat);\n } else if (raster.coordinateConversion > 0.5) {\n vec2 commonPos = lnglat_to_mercator(vTexPos);\n uv = getUV(commonPos);\n }\n\n vec4 image = vec4(0.0);\n DECKGL_CREATE_COLOR(image, uv);\n\n DECKGL_MUTATE_COLOR(image, uv);\n\n fragColor = apply_opacity(color_tint(color_desaturate(image.rgb)), raster.opacity);\n\n geometry.uv = uv;\n DECKGL_FILTER_COLOR(fragColor, geometry);\n}\n";
|
|
162
|
+
}
|
|
163
|
+
//# sourceMappingURL=data:application/json;charset=utf-8;base64,{"version":3,"names":["_shadertools","require","_rasterProcessingUniforms","rasterUniformBlock","rasterUniforms","exports","name","vs","fs","uniformTypes","bounds","coordinateConversion","desaturate","opacity","tintColor","transparentColor","ensureRasterHooksRegistered","assembler","ShaderAssembler","getDefaultShaderAssembler","existingHooks","_hookFunctions","hookNames","map","h","hook","some","includes","addShaderHook","prepareLumaModules","modules","mod","fs2","replace","nameMap","UNIFORM_NAME_MAP","consolidate","Boolean","console","warn","concat","blockPattern","RegExp","_i","_Object$entries","Object","entries","length","_Object$entries$_i","_slicedToArray2","origField","prefixedField","pattern","result","dependencies","deprecations","defines","getUniforms","uniforms","inject","_i2","_Object$entries2","_Object$entries2$_i","code","codeStr","injection","_i3","_Object$entries3","_Object$entries3$_i","buildRasterVertexShader","buildRasterFragmentShader"],"sources":["../../../src/raster/raster-layer/raster-layer-shaders.ts"],"sourcesContent":["// SPDX-License-Identifier: MIT\n// Copyright contributors to the kepler.gl project\n\nimport {ShaderAssembler} from '@luma.gl/shadertools';\nimport type {ShaderModule as LumaShaderModule} from '../webgl/types';\nimport {UNIFORM_NAME_MAP} from '../raster-processing-uniforms';\n\n/**\n * UBO-based shader module for raster layer uniforms.\n * Replaces the old standalone `uniform float desaturate` etc.\n */\nconst rasterUniformBlock = `\\\nuniform rasterUniforms {\n  vec4 bounds;\n  float coordinateConversion;\n  float desaturate;\n  float opacity;\n  vec3 tintColor;\n  vec4 transparentColor;\n} raster;\n`;\n\nexport const rasterUniforms = {\n  name: 'raster',\n  vs: rasterUniformBlock,\n  fs: rasterUniformBlock,\n  uniformTypes: {\n    bounds: 'vec4<f32>',\n    coordinateConversion: 'f32',\n    desaturate: 'f32',\n    opacity: 'f32',\n    tintColor: 'vec3<f32>',\n    transparentColor: 'vec4<f32>'\n  }\n};\n\n/**\n * Register custom DECKGL_CREATE_COLOR and DECKGL_MUTATE_COLOR shader hooks\n * with the default ShaderAssembler. These hooks are used by the raster layer's\n * custom shader modules (rgbaImage, combineBands, colormap, etc.).\n *\n * In luma.gl 8.x these were registered via ProgramManager; in luma.gl 9.x\n * we register them with the ShaderAssembler singleton.\n *\n * NOTE: We must check the assembler's hook list every time rather than using\n * a module-level boolean guard, because deck.gl's getShaderAssembler() clears\n * _hookFunctions when a new Deck instance is created (e.g. during image export).\n */\nexport function ensureRasterHooksRegistered(): void {\n  const assembler = ShaderAssembler.getDefaultShaderAssembler();\n  // @ts-expect-error _hookFunctions is private in ShaderAssembler\n  const existingHooks = assembler._hookFunctions || [];\n  const hookNames = existingHooks.map(h => (typeof h === 'string' ? h : h.hook));\n\n  if (!hookNames.some(h => h?.includes('DECKGL_CREATE_COLOR'))) {\n    assembler.addShaderHook('fs:DECKGL_CREATE_COLOR(inout vec4 image, vec2 coord)');\n  }\n  if (!hookNames.some(h => h?.includes('DECKGL_MUTATE_COLOR'))) {\n    assembler.addShaderHook('fs:DECKGL_MUTATE_COLOR(inout vec4 image, vec2 coord)');\n  }\n}\n\n/**\n * Convert kepler.gl's custom raster shader modules into luma.gl 9 compatible\n * format. Ensures fs2 (WebGL2) shaders are used and texture2D -> texture.\n */\ninterface LumaModuleOutput {\n  name: string;\n  fs: string;\n  vs?: string;\n  defines?: Record<string, string>;\n  getUniforms?: (opts: object) => Record<string, unknown> | null;\n  uniforms?: Record<string, unknown>;\n  uniformTypes?: Record<string, string>;\n  inject?: Record<string, string>;\n  dependencies?: unknown[];\n  deprecations?: unknown[];\n}\n\nexport function prepareLumaModules(modules: LumaShaderModule[]): LumaModuleOutput[] {\n  return modules.map(mod => {\n    let fs = mod.fs2 || mod.fs || '';\n    // Replace texture2D with texture for GLSL 300 es\n    fs = fs.replace(/texture2D\\(/g, 'texture(');\n\n    const nameMap = UNIFORM_NAME_MAP[mod.name];\n    const consolidate = Boolean(nameMap && mod.uniformTypes);\n\n    if (mod.uniformTypes && !nameMap) {\n      console.warn(\n        `[raster] Module \"${mod.name}\" has uniformTypes but no UNIFORM_NAME_MAP entry. ` +\n          'Its UBO will not be consolidated and may push the fragment uniform block count over the WebGL2 limit.'\n      );\n    }\n\n    if (consolidate) {\n      // Strip only this module's uniform block declaration so it doesn't\n      // create its own UBO.\n      const blockPattern = new RegExp(\n        `uniform\\\\s+${mod.name}Uniforms\\\\s*\\\\{[^}]*\\\\}\\\\s*${mod.name}\\\\s*;`,\n        'gs'\n      );\n      fs = fs.replace(blockPattern, '');\n\n      // Rewrite moduleName.fieldName references to the shared UBO aliases\n      for (const [origField, prefixedField] of Object.entries(nameMap)) {\n        const pattern = new RegExp(`\\\\b${mod.name}\\\\.${origField}\\\\b`, 'g');\n        fs = fs.replace(pattern, `${prefixedField}_ALIAS`);\n      }\n    }\n\n    const result: LumaModuleOutput = {\n      name: mod.name,\n      fs,\n      dependencies: mod.dependencies,\n      deprecations: mod.deprecations\n    };\n\n    if (mod.vs) {\n      result.vs = mod.vs.replace(/texture2D\\(/g, 'texture(');\n    }\n\n    if (mod.defines) {\n      result.defines = mod.defines;\n    }\n\n    if (mod.getUniforms) {\n      result.getUniforms = mod.getUniforms;\n    }\n\n    if (mod.uniforms) {\n      result.uniforms = mod.uniforms;\n    }\n\n    // Only keep uniformTypes for modules NOT consolidated into the shared UBO\n    if (mod.uniformTypes && !consolidate) {\n      result.uniformTypes = mod.uniformTypes;\n    }\n\n    // Convert inject code, replacing texture2D -> texture and UBO references\n    if (mod.inject) {\n      result.inject = {};\n      for (const [hook, code] of Object.entries(mod.inject)) {\n        let codeStr =\n          typeof code === 'string' ? code : (code as {injection?: string}).injection || '';\n        codeStr = codeStr.replace(/texture2D\\(/g, 'texture(');\n\n        if (consolidate && nameMap) {\n          for (const [origField, prefixedField] of Object.entries(nameMap)) {\n            const pattern = new RegExp(`\\\\b${mod.name}\\\\.${origField}\\\\b`, 'g');\n            codeStr = codeStr.replace(pattern, `${prefixedField}_ALIAS`);\n          }\n        }\n\n        result.inject[hook] = codeStr;\n      }\n    }\n\n    return result;\n  });\n}\n\n/**\n * Build the vertex shader for the raster layer.\n * References raster.coordinateConversion from the UBO.\n */\nexport function buildRasterVertexShader(): string {\n  return `\\\n#version 300 es\n#define SHADER_NAME raster-layer-vertex-shader\n\nprecision mediump float;\n\nin vec2 texCoords;\nin vec3 positions;\nin vec3 positions64Low;\n\nout vec2 vTexCoord;\nout vec2 vTexPos;\n\nconst vec3 pickingColor = vec3(1.0, 0.0, 0.0);\n\nvoid main(void) {\n  geometry.worldPosition = positions;\n  geometry.uv = texCoords;\n  geometry.pickingColor = pickingColor;\n\n  gl_Position = project_position_to_clipspace(positions, positions64Low, vec3(0.0), geometry.position);\n  DECKGL_FILTER_GL_POSITION(gl_Position, geometry);\n\n  vTexCoord = texCoords;\n\n  if (raster.coordinateConversion < -0.5) {\n    vTexPos = geometry.position.xy + project.commonOrigin.xy;\n  } else if (raster.coordinateConversion > 0.5) {\n    vTexPos = geometry.worldPosition.xy;\n  }\n\n  vec4 color = vec4(0.0);\n  DECKGL_FILTER_COLOR(color, geometry);\n}\n`;\n}\n\n/**\n * Build the fragment shader for the raster layer.\n * Uses DECKGL_CREATE_COLOR and DECKGL_MUTATE_COLOR hooks which are now\n * registered with the ShaderAssembler and populated by module injections.\n */\nexport function buildRasterFragmentShader(): string {\n  return `\\\n#version 300 es\n#define SHADER_NAME raster-layer-fragment-shader\n\nprecision mediump float;\nprecision mediump int;\nprecision mediump usampler2D;\n\nin vec2 vTexCoord;\nin vec2 vTexPos;\n\nout vec4 fragColor;\n\n/* projection utils */\nconst float TILE_SIZE = 512.0;\nconst float PI = 3.1415926536;\nconst float WORLD_SCALE = TILE_SIZE / PI / 2.0;\n\nvec2 lnglat_to_mercator(vec2 lnglat) {\n  float x = lnglat.x;\n  float y = clamp(lnglat.y, -89.9, 89.9);\n  return vec2(\n    radians(x) + PI,\n    PI + log(tan(PI * 0.25 + radians(y) * 0.5))\n  ) * WORLD_SCALE;\n}\n\nvec2 mercator_to_lnglat(vec2 xy) {\n  xy /= WORLD_SCALE;\n  return degrees(vec2(\n    xy.x - PI,\n    atan(exp(xy.y - PI)) * 2.0 - PI * 0.5\n  ));\n}\n\nvec3 color_desaturate(vec3 color) {\n  float luminance = (color.r + color.g + color.b) * 0.333333333;\n  return mix(color, vec3(luminance), raster.desaturate);\n}\n\nvec3 color_tint(vec3 color) {\n  return color * raster.tintColor;\n}\n\nvec4 apply_opacity(vec3 color, float alpha) {\n  if (raster.transparentColor.a == 0.0) {\n    return vec4(color, alpha);\n  }\n  float blendedAlpha = alpha + raster.transparentColor.a * (1.0 - alpha);\n  float highLightRatio = alpha / blendedAlpha;\n  vec3 blendedRGB = mix(raster.transparentColor.rgb, color, highLightRatio);\n  return vec4(blendedRGB, blendedAlpha);\n}\n\nvec2 getUV(vec2 pos) {\n  return vec2(\n    (pos.x - raster.bounds[0]) / (raster.bounds[2] - raster.bounds[0]),\n    (pos.y - raster.bounds[3]) / (raster.bounds[1] - raster.bounds[3])\n  );\n}\n\nvoid main(void) {\n  vec2 uv = vTexCoord;\n  if (raster.coordinateConversion < -0.5) {\n    vec2 lnglat = mercator_to_lnglat(vTexPos);\n    uv = getUV(lnglat);\n  } else if (raster.coordinateConversion > 0.5) {\n    vec2 commonPos = lnglat_to_mercator(vTexPos);\n    uv = getUV(commonPos);\n  }\n\n  vec4 image = vec4(0.0);\n  DECKGL_CREATE_COLOR(image, uv);\n\n  DECKGL_MUTATE_COLOR(image, uv);\n\n  fragColor = apply_opacity(color_tint(color_desaturate(image.rgb)), raster.opacity);\n\n  geometry.uv = uv;\n  DECKGL_FILTER_COLOR(fragColor, geometry);\n}\n`;\n}\n"],"mappings":"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","ignoreList":[]}
|
|
@@ -1,16 +1,16 @@
|
|
|
1
|
-
import { UpdateParameters } from '@deck.gl/core
|
|
2
|
-
import { BitmapLayer } from '@deck.gl/layers
|
|
1
|
+
import { UpdateParameters } from '@deck.gl/core';
|
|
2
|
+
import { BitmapLayer } from '@deck.gl/layers';
|
|
3
3
|
import type { RasterLayerAddedProps, ImageState } from '../types';
|
|
4
4
|
export default class RasterLayer extends BitmapLayer<RasterLayerAddedProps> {
|
|
5
5
|
state: BitmapLayer<RasterLayerAddedProps>['state'] & {
|
|
6
6
|
images: ImageState;
|
|
7
7
|
};
|
|
8
|
+
_redrawScheduled: boolean;
|
|
8
9
|
initializeState(): void;
|
|
9
|
-
draw(
|
|
10
|
-
|
|
11
|
-
[key: string]: any;
|
|
12
|
-
};
|
|
10
|
+
draw(_opts: {
|
|
11
|
+
shaderModuleProps: Record<string, unknown>;
|
|
13
12
|
}): void;
|
|
13
|
+
_scheduleRedraw(): void;
|
|
14
14
|
getShaders(): any;
|
|
15
15
|
updateState(params: UpdateParameters<BitmapLayer<RasterLayerAddedProps>>): void;
|
|
16
16
|
updateImages({ props, oldProps }: {
|