@kepler.gl/deckgl-layers 3.3.0-alpha.1 → 3.3.0-alpha.11
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/cjs/3d-building-layer/3d-building-layer.js +66 -0
- package/dist/cjs/3d-building-layer/3d-building-utils.js +166 -0
- package/dist/cjs/3d-building-layer/types.js +6 -0
- package/dist/cjs/cluster-layer/cluster-layer.js +292 -0
- package/dist/cjs/column-layer/enhanced-column-layer.js +160 -0
- package/dist/{deckgl-extensions → cjs/deckgl-extensions}/filter-arrow-layer.js +1 -1
- package/dist/cjs/deckgl-extensions/filter-shader-module.js +26 -0
- package/dist/cjs/globe/atmosphere-layer.js +341 -0
- package/dist/cjs/globe/enhanced-multi-icon-layer.js +63 -0
- package/dist/cjs/globe/globe-depth-disk-layer.js +145 -0
- package/dist/cjs/globe/globe-layers.js +574 -0
- package/dist/cjs/globe/globe-stars-layer.js +99 -0
- package/dist/cjs/globe/globe-stars-layer.spec.js +42 -0
- package/dist/cjs/globe/globe-view.js +404 -0
- package/dist/cjs/globe/index.js +140 -0
- package/dist/cjs/globe/mvt-label-layer.js +190 -0
- package/dist/cjs/grid-layer/enhanced-cpu-grid-layer.js +116 -0
- package/dist/cjs/hexagon-layer/enhanced-hexagon-layer.js +134 -0
- package/dist/cjs/index.js +163 -0
- package/dist/cjs/layer-utils/aggregation-utils.js +181 -0
- package/dist/cjs/layer-utils/cluster-utils.js +95 -0
- package/dist/cjs/layer-utils/cpu-aggregator.js +798 -0
- package/dist/cjs/layer-utils/globe-cell-utils.js +203 -0
- package/dist/cjs/layer-utils/globe-cell-utils.spec.js +118 -0
- package/dist/cjs/layer-utils/shader-utils.js +38 -0
- package/dist/cjs/line-layer/line-layer.js +95 -0
- package/dist/cjs/raster/images.js +271 -0
- package/dist/cjs/raster/pipeline-validation-patch.js +101 -0
- package/dist/cjs/raster/raster-layer/raster-layer-shaders.js +163 -0
- package/dist/cjs/raster/raster-layer/raster-layer-webgl1.fs.js +10 -0
- package/dist/cjs/raster/raster-layer/raster-layer-webgl1.vs.js +10 -0
- package/dist/cjs/raster/raster-layer/raster-layer-webgl2.fs.js +10 -0
- package/dist/cjs/raster/raster-layer/raster-layer-webgl2.vs.js +10 -0
- package/dist/cjs/raster/raster-layer/raster-layer.js +287 -0
- package/dist/cjs/raster/raster-mesh-layer/raster-mesh-layer-shaders.js +38 -0
- package/dist/cjs/raster/raster-mesh-layer/raster-mesh-layer-webgl1.fs.js +10 -0
- package/dist/cjs/raster/raster-mesh-layer/raster-mesh-layer-webgl1.vs.js +10 -0
- package/dist/cjs/raster/raster-mesh-layer/raster-mesh-layer-webgl2.fs.js +10 -0
- package/dist/cjs/raster/raster-mesh-layer/raster-mesh-layer-webgl2.vs.js +10 -0
- package/dist/cjs/raster/raster-mesh-layer/raster-mesh-layer.js +321 -0
- package/dist/cjs/raster/raster-processing-uniforms.js +124 -0
- package/dist/cjs/raster/types.js +6 -0
- package/dist/cjs/raster/util.js +139 -0
- package/dist/cjs/raster/webgl/color/colormap.js +45 -0
- package/dist/cjs/raster/webgl/color/filter.js +58 -0
- package/dist/cjs/raster/webgl/color/gamma-contrast.js +68 -0
- package/dist/cjs/raster/webgl/color/linear-rescale.js +35 -0
- package/dist/cjs/raster/webgl/color/saturation.js +42 -0
- package/dist/cjs/raster/webgl/color/sigmoidal-contrast.js +68 -0
- package/dist/{raster → cjs/raster}/webgl/index.js +1 -1
- package/dist/cjs/raster/webgl/pansharpen/pansharpen-brovey.js +46 -0
- package/dist/cjs/raster/webgl/spectral-indices/evi.js +26 -0
- package/dist/cjs/raster/webgl/spectral-indices/msavi.js +25 -0
- package/dist/cjs/raster/webgl/spectral-indices/normalized-difference.js +19 -0
- package/dist/cjs/raster/webgl/spectral-indices/savi.js +21 -0
- package/dist/cjs/raster/webgl/texture/combine-bands.js +65 -0
- package/dist/{raster → cjs/raster}/webgl/texture/mask.js +5 -2
- package/dist/cjs/raster/webgl/texture/reorder-bands.js +72 -0
- package/dist/cjs/raster/webgl/texture/rgba-image.js +34 -0
- package/dist/cjs/raster/webgl/types.js +6 -0
- package/dist/cjs/svg-icon-layer/scatterplot-icon-layer.js +88 -0
- package/dist/cjs/svg-icon-layer/svg-icon-layer.js +104 -0
- package/dist/cjs/wms/wms-layer.js +624 -0
- package/dist/esm/3d-building-layer/3d-building-layer.js +62 -0
- package/dist/esm/3d-building-layer/3d-building-utils.js +157 -0
- package/dist/esm/3d-building-layer/types.js +3 -0
- package/dist/esm/cluster-layer/cluster-layer.js +286 -0
- package/dist/esm/column-layer/enhanced-column-layer.js +156 -0
- package/dist/esm/deckgl-extensions/filter-arrow-layer.js +64 -0
- package/dist/esm/deckgl-extensions/filter-shader-module.js +20 -0
- package/dist/esm/globe/atmosphere-layer.js +335 -0
- package/dist/esm/globe/enhanced-multi-icon-layer.js +60 -0
- package/dist/esm/globe/globe-depth-disk-layer.js +140 -0
- package/dist/esm/globe/globe-layers.js +566 -0
- package/dist/esm/globe/globe-stars-layer.js +92 -0
- package/dist/esm/globe/globe-stars-layer.spec.js +40 -0
- package/dist/esm/globe/globe-view.js +398 -0
- package/dist/esm/globe/index.js +26 -0
- package/dist/esm/globe/mvt-label-layer.js +187 -0
- package/dist/esm/grid-layer/enhanced-cpu-grid-layer.js +112 -0
- package/dist/esm/hexagon-layer/enhanced-hexagon-layer.js +130 -0
- package/dist/esm/index.js +22 -0
- package/dist/esm/layer-utils/aggregation-utils.js +172 -0
- package/dist/esm/layer-utils/cluster-utils.js +89 -0
- package/dist/esm/layer-utils/cpu-aggregator.js +788 -0
- package/dist/esm/layer-utils/globe-cell-utils.js +197 -0
- package/dist/esm/layer-utils/globe-cell-utils.spec.js +115 -0
- package/dist/esm/layer-utils/shader-utils.js +32 -0
- package/dist/esm/line-layer/line-layer.js +91 -0
- package/dist/esm/raster/images.js +267 -0
- package/dist/esm/raster/pipeline-validation-patch.js +94 -0
- package/dist/esm/raster/raster-layer/raster-layer-shaders.js +153 -0
- package/dist/esm/raster/raster-layer/raster-layer-webgl1.fs.js +5 -0
- package/dist/esm/raster/raster-layer/raster-layer-webgl1.vs.js +5 -0
- package/dist/esm/raster/raster-layer/raster-layer-webgl2.fs.js +5 -0
- package/dist/esm/raster/raster-layer/raster-layer-webgl2.vs.js +5 -0
- package/dist/esm/raster/raster-layer/raster-layer.js +283 -0
- package/dist/esm/raster/raster-mesh-layer/raster-mesh-layer-shaders.js +30 -0
- package/dist/esm/raster/raster-mesh-layer/raster-mesh-layer-webgl1.fs.js +5 -0
- package/dist/esm/raster/raster-mesh-layer/raster-mesh-layer-webgl1.vs.js +5 -0
- package/dist/esm/raster/raster-mesh-layer/raster-mesh-layer-webgl2.fs.js +5 -0
- package/dist/esm/raster/raster-mesh-layer/raster-mesh-layer-webgl2.vs.js +5 -0
- package/dist/esm/raster/raster-mesh-layer/raster-mesh-layer.js +318 -0
- package/dist/esm/raster/raster-processing-uniforms.js +118 -0
- package/dist/esm/raster/types.js +3 -0
- package/dist/esm/raster/util.js +134 -0
- package/dist/esm/raster/webgl/color/colormap.js +39 -0
- package/dist/esm/raster/webgl/color/filter.js +52 -0
- package/dist/esm/raster/webgl/color/gamma-contrast.js +62 -0
- package/dist/esm/raster/webgl/color/linear-rescale.js +29 -0
- package/dist/esm/raster/webgl/color/saturation.js +36 -0
- package/dist/esm/raster/webgl/color/sigmoidal-contrast.js +62 -0
- package/dist/esm/raster/webgl/index.js +26 -0
- package/dist/esm/raster/webgl/pansharpen/pansharpen-brovey.js +40 -0
- package/dist/esm/raster/webgl/spectral-indices/evi.js +20 -0
- package/dist/esm/raster/webgl/spectral-indices/msavi.js +19 -0
- package/dist/esm/raster/webgl/spectral-indices/normalized-difference.js +13 -0
- package/dist/esm/raster/webgl/spectral-indices/savi.js +15 -0
- package/dist/esm/raster/webgl/texture/combine-bands.js +58 -0
- package/dist/esm/raster/webgl/texture/mask.js +47 -0
- package/dist/esm/raster/webgl/texture/reorder-bands.js +65 -0
- package/dist/esm/raster/webgl/texture/rgba-image.js +28 -0
- package/dist/esm/raster/webgl/types.js +3 -0
- package/dist/esm/svg-icon-layer/scatterplot-icon-layer.js +84 -0
- package/dist/esm/svg-icon-layer/svg-icon-layer.js +101 -0
- package/dist/esm/wms/wms-layer.js +619 -0
- package/dist/globe/atmosphere-layer.d.ts +58 -0
- package/dist/globe/enhanced-multi-icon-layer.d.ts +6 -0
- package/dist/globe/globe-depth-disk-layer.d.ts +19 -0
- package/dist/globe/globe-layers.d.ts +108 -0
- package/dist/globe/globe-stars-layer.d.ts +10 -0
- package/dist/globe/globe-stars-layer.spec.d.ts +1 -0
- package/dist/globe/globe-view.d.ts +23 -0
- package/dist/globe/index.d.ts +8 -0
- package/dist/globe/mvt-label-layer.d.ts +7928 -0
- package/dist/grid-layer/enhanced-cpu-grid-layer.d.ts +138 -56
- package/dist/hexagon-layer/enhanced-hexagon-layer.d.ts +138 -56
- package/dist/index.d.ts +1 -0
- package/dist/layer-utils/cluster-utils.d.ts +6 -1
- package/dist/layer-utils/globe-cell-utils.d.ts +30 -0
- package/dist/layer-utils/globe-cell-utils.spec.d.ts +1 -0
- package/dist/raster/images.d.ts +10 -1
- package/dist/raster/raster-layer/raster-layer.d.ts +4 -0
- package/dist/raster/raster-mesh-layer/raster-mesh-layer.d.ts +4 -0
- package/dist/svg-icon-layer/scatterplot-icon-layer.d.ts +4 -1
- package/dist/wms/wms-layer.d.ts +27 -0
- package/package.json +22 -13
- package/dist/3d-building-layer/3d-building-layer.js +0 -66
- package/dist/3d-building-layer/3d-building-utils.js +0 -166
- package/dist/3d-building-layer/types.js +0 -6
- package/dist/cluster-layer/cluster-layer.js +0 -293
- package/dist/column-layer/enhanced-column-layer.js +0 -135
- package/dist/deckgl-extensions/filter-shader-module.js +0 -26
- package/dist/grid-layer/enhanced-cpu-grid-layer.js +0 -90
- package/dist/hexagon-layer/enhanced-hexagon-layer.js +0 -108
- package/dist/index.js +0 -152
- package/dist/layer-utils/aggregation-utils.js +0 -181
- package/dist/layer-utils/cluster-utils.js +0 -93
- package/dist/layer-utils/cpu-aggregator.js +0 -798
- package/dist/layer-utils/shader-utils.js +0 -38
- package/dist/line-layer/line-layer.js +0 -95
- package/dist/raster/images.js +0 -259
- package/dist/raster/pipeline-validation-patch.js +0 -101
- package/dist/raster/raster-layer/raster-layer-shaders.js +0 -163
- package/dist/raster/raster-layer/raster-layer-webgl1.fs.js +0 -10
- package/dist/raster/raster-layer/raster-layer-webgl1.vs.js +0 -10
- package/dist/raster/raster-layer/raster-layer-webgl2.fs.js +0 -10
- package/dist/raster/raster-layer/raster-layer-webgl2.vs.js +0 -10
- package/dist/raster/raster-layer/raster-layer.js +0 -237
- package/dist/raster/raster-mesh-layer/matrix.d.ts +0 -4
- package/dist/raster/raster-mesh-layer/matrix.js +0 -18
- package/dist/raster/raster-mesh-layer/raster-mesh-layer-shaders.js +0 -38
- package/dist/raster/raster-mesh-layer/raster-mesh-layer-webgl1.fs.js +0 -10
- package/dist/raster/raster-mesh-layer/raster-mesh-layer-webgl1.vs.js +0 -10
- package/dist/raster/raster-mesh-layer/raster-mesh-layer-webgl2.fs.js +0 -10
- package/dist/raster/raster-mesh-layer/raster-mesh-layer-webgl2.vs.js +0 -10
- package/dist/raster/raster-mesh-layer/raster-mesh-layer.js +0 -271
- package/dist/raster/raster-processing-uniforms.js +0 -124
- package/dist/raster/types.js +0 -6
- package/dist/raster/util.js +0 -139
- package/dist/raster/webgl/color/colormap.js +0 -45
- package/dist/raster/webgl/color/filter.js +0 -58
- package/dist/raster/webgl/color/gamma-contrast.js +0 -68
- package/dist/raster/webgl/color/linear-rescale.js +0 -35
- package/dist/raster/webgl/color/saturation.js +0 -42
- package/dist/raster/webgl/color/sigmoidal-contrast.js +0 -68
- package/dist/raster/webgl/pansharpen/pansharpen-brovey.js +0 -46
- package/dist/raster/webgl/spectral-indices/evi.js +0 -26
- package/dist/raster/webgl/spectral-indices/msavi.js +0 -25
- package/dist/raster/webgl/spectral-indices/normalized-difference.js +0 -19
- package/dist/raster/webgl/spectral-indices/savi.js +0 -21
- package/dist/raster/webgl/texture/combine-bands.js +0 -65
- package/dist/raster/webgl/texture/reorder-bands.js +0 -72
- package/dist/raster/webgl/texture/rgba-image.js +0 -34
- package/dist/raster/webgl/types.js +0 -6
- package/dist/svg-icon-layer/scatterplot-icon-layer.js +0 -51
- package/dist/svg-icon-layer/svg-icon-layer.js +0 -104
- package/dist/wms/wms-layer.js +0 -424
|
@@ -0,0 +1,203 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
|
|
3
|
+
var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
|
|
4
|
+
Object.defineProperty(exports, "__esModule", {
|
|
5
|
+
value: true
|
|
6
|
+
});
|
|
7
|
+
exports.addGlobeCellProjection = addGlobeCellProjection;
|
|
8
|
+
exports.makeGlobeCellLayerClass = makeGlobeCellLayerClass;
|
|
9
|
+
exports.runBinOptionsWithMercatorViewport = runBinOptionsWithMercatorViewport;
|
|
10
|
+
var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
|
|
11
|
+
var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
|
|
12
|
+
var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
|
|
13
|
+
var _possibleConstructorReturn2 = _interopRequireDefault(require("@babel/runtime/helpers/possibleConstructorReturn"));
|
|
14
|
+
var _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime/helpers/getPrototypeOf"));
|
|
15
|
+
var _get2 = _interopRequireDefault(require("@babel/runtime/helpers/get"));
|
|
16
|
+
var _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits"));
|
|
17
|
+
var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
|
|
18
|
+
var _core = require("@deck.gl/core");
|
|
19
|
+
function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
|
|
20
|
+
function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { (0, _defineProperty2["default"])(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
|
|
21
|
+
function _callSuper(t, o, e) { return o = (0, _getPrototypeOf2["default"])(o), (0, _possibleConstructorReturn2["default"])(t, _isNativeReflectConstruct() ? Reflect.construct(o, e || [], (0, _getPrototypeOf2["default"])(t).constructor) : o.apply(t, e)); }
|
|
22
|
+
function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); } catch (t) {} return (_isNativeReflectConstruct = function _isNativeReflectConstruct() { return !!t; })(); }
|
|
23
|
+
function _superPropGet(t, o, e, r) { var p = (0, _get2["default"])((0, _getPrototypeOf2["default"])(1 & r ? t.prototype : t), o, e); return 2 & r && "function" == typeof p ? function (t) { return p.apply(e, t); } : p; } // SPDX-License-Identifier: MIT
|
|
24
|
+
// Copyright contributors to the kepler.gl project
|
|
25
|
+
/**
|
|
26
|
+
* deck.gl's aggregation cell layers (GridCellLayer / HexagonCellLayer) position
|
|
27
|
+
* each cell in flat mercator "common space" (a 2D XY plane) and then draw it with
|
|
28
|
+
* `project_common_position_to_clipspace`, which only multiplies by the
|
|
29
|
+
* view-projection matrix. Under `_GlobeView` this leaves the cells on the flat XY
|
|
30
|
+
* plane that passes through the center of the globe instead of on its surface
|
|
31
|
+
* (the base ColumnLayer works on the globe because it feeds real lng/lat through
|
|
32
|
+
* `project_position` -> `project_globe_`; the aggregation cell shaders skip that).
|
|
33
|
+
*
|
|
34
|
+
* To fix this we remap the already-computed flat common-space vertex position back
|
|
35
|
+
* to lng/lat (inverse Web Mercator) and then onto the sphere with the same math
|
|
36
|
+
* `project_globe_` uses for geographic layers. Because we remap every vertex of the
|
|
37
|
+
* cell footprint (not just the centroid), the flat quad/hexagon naturally curves
|
|
38
|
+
* onto the surface. Elevation (extruded cells, stored in `geometry.position.z` in
|
|
39
|
+
* common units) is added along the radius so columns rise radially off the globe.
|
|
40
|
+
*
|
|
41
|
+
* The remap is gated by a `globeMode` uniform so 2D/3D mercator rendering is
|
|
42
|
+
* byte-for-byte unchanged.
|
|
43
|
+
*
|
|
44
|
+
* `WORLD_SCALE`, `PI`, `GLOBE_RADIUS` and `project.commonOrigin` are all provided
|
|
45
|
+
* by deck.gl's project shader module which these layers include.
|
|
46
|
+
*/
|
|
47
|
+
|
|
48
|
+
// deck.gl 9 / luma 9 sets custom uniforms via UBO-backed shader modules (there is
|
|
49
|
+
// no Model.setUniforms). This minimal module exposes the globe-mode flag.
|
|
50
|
+
var globeCellUniforms = {
|
|
51
|
+
name: 'globeCell',
|
|
52
|
+
vs: "layout(std140) uniform globeCellUniforms {\n float globeMode;\n} globeCellProps;\n",
|
|
53
|
+
uniformTypes: {
|
|
54
|
+
globeMode: 'f32'
|
|
55
|
+
}
|
|
56
|
+
};
|
|
57
|
+
var GLOBE_CELL_DECL = /* glsl */"\n// Inverse of deck.gl project_mercator_: flat common XY -> lng/lat (degrees).\nvec2 kepler_commonToLngLat(vec2 commonXY) {\n float lng = degrees(commonXY.x / WORLD_SCALE - PI);\n float lat = degrees(2.0 * atan(exp(commonXY.y / WORLD_SCALE - PI)) - PI * 0.5);\n return vec2(lng, lat);\n}\n\n// Same math as deck.gl project_globe_. elevationCommon is in common units already\n// (GLOBE_RADIUS space), matching how project_globe_ scales z off EARTH_RADIUS.\nvec3 kepler_lngLatToGlobe(vec2 lngLat, float elevationCommon) {\n float lambda = radians(lngLat.x);\n float phi = radians(lngLat.y);\n float cosPhi = cos(phi);\n float D = GLOBE_RADIUS + elevationCommon;\n return vec3(\n sin(lambda) * cosPhi,\n -cos(lambda) * cosPhi,\n sin(phi)\n ) * D;\n}\n";
|
|
58
|
+
|
|
59
|
+
/**
|
|
60
|
+
* Rewrites a grid/hexagon cell vertex shader so that, in globe mode, the final
|
|
61
|
+
* clip-space position is derived from the sphere surface instead of the flat XY
|
|
62
|
+
* plane. In 2D/3D mode the original path is kept unchanged.
|
|
63
|
+
*/
|
|
64
|
+
function addGlobeCellProjection(vs, type) {
|
|
65
|
+
var decl = "".concat(GLOBE_CELL_DECL, "\nvoid main(void) {");
|
|
66
|
+
var withDecl = vs.includes('void main(void) {') ? vs.replace('void main(void) {', decl) : vs;
|
|
67
|
+
var target = 'gl_Position = project_common_position_to_clipspace(geometry.position);';
|
|
68
|
+
if (!withDecl.includes(target)) {
|
|
69
|
+
// Shader shape changed in a deck.gl update; leave the original so we don't crash.
|
|
70
|
+
// eslint-disable-next-line no-console
|
|
71
|
+
console.error("Cannot edit ".concat(type, " globe cell shader"));
|
|
72
|
+
return withDecl;
|
|
73
|
+
}
|
|
74
|
+
return withDecl.replace(target, "if (globeCellProps.globeMode > 0.5) {\n vec2 lngLat = kepler_commonToLngLat(geometry.position.xy + project.commonOrigin.xy);\n vec3 globePos = kepler_lngLatToGlobe(lngLat, geometry.position.z);\n geometry.position = vec4(globePos, 1.0);\n }\n gl_Position = project_common_position_to_clipspace(geometry.position);");
|
|
75
|
+
}
|
|
76
|
+
|
|
77
|
+
/**
|
|
78
|
+
* deck.gl 9's Grid/Hexagon aggregation compute bin positions and the cell layer's
|
|
79
|
+
* "common space" from `this.context.viewport`. Under `_GlobeView` that common space
|
|
80
|
+
* is the globe's 3D-projected space (projectFlat is identity on lng/lat, positions
|
|
81
|
+
* bin off the sphere-projected XY), which both mis-bins data and — combined with the
|
|
82
|
+
* flat cell shader — drops cells onto the plane through the globe center.
|
|
83
|
+
*
|
|
84
|
+
* We sidestep this by running `_updateBinOptions` with a WebMercatorViewport that
|
|
85
|
+
* matches the current globe camera. That makes binning, `cellOriginCommon` /
|
|
86
|
+
* `cellSizeCommon` (or `radiusCommon` / `hexOriginCommon`) and the cell shader's
|
|
87
|
+
* flat position all live in genuine Web Mercator common space, which the cell shader
|
|
88
|
+
* remap (`addGlobeCellProjection`) then curves back onto the sphere. In 2D/3D mode
|
|
89
|
+
* this is a no-op.
|
|
90
|
+
*
|
|
91
|
+
* `callSuper` runs deck.gl's original `_updateBinOptions` while the viewport is
|
|
92
|
+
* temporarily swapped. The swap is synchronous and restored in `finally`.
|
|
93
|
+
*/
|
|
94
|
+
function runBinOptionsWithMercatorViewport(layer, callSuper) {
|
|
95
|
+
var _layer$context;
|
|
96
|
+
var viewport = (_layer$context = layer.context) === null || _layer$context === void 0 ? void 0 : _layer$context.viewport;
|
|
97
|
+
var isGlobe = Boolean(viewport === null || viewport === void 0 ? void 0 : viewport.resolution);
|
|
98
|
+
if (!isGlobe) {
|
|
99
|
+
callSuper();
|
|
100
|
+
return;
|
|
101
|
+
}
|
|
102
|
+
var mercatorViewport = new _core.WebMercatorViewport({
|
|
103
|
+
width: viewport.width,
|
|
104
|
+
height: viewport.height,
|
|
105
|
+
longitude: viewport.longitude,
|
|
106
|
+
latitude: viewport.latitude,
|
|
107
|
+
zoom: viewport.zoom
|
|
108
|
+
});
|
|
109
|
+
var originalViewport = layer.context.viewport;
|
|
110
|
+
layer.context.viewport = mercatorViewport;
|
|
111
|
+
try {
|
|
112
|
+
callSuper();
|
|
113
|
+
} finally {
|
|
114
|
+
layer.context.viewport = originalViewport;
|
|
115
|
+
}
|
|
116
|
+
}
|
|
117
|
+
|
|
118
|
+
/**
|
|
119
|
+
* Wraps a deck.gl aggregation cell layer class (GridCellLayer / HexagonCellLayer)
|
|
120
|
+
* with a subclass that injects the globe surface remap into its vertex shader.
|
|
121
|
+
*
|
|
122
|
+
* We create the subclass dynamically from whatever default class deck.gl provides
|
|
123
|
+
* to `getSubLayerClass` so we don't have to import the (non-public) cell layer
|
|
124
|
+
* classes directly. Results are cached per base class so deck.gl sees a stable
|
|
125
|
+
* layer class across renders (layers are recreated every frame) and shader
|
|
126
|
+
* compilation / sublayer diffing stays stable.
|
|
127
|
+
*/
|
|
128
|
+
var globeCellClassCache = new WeakMap();
|
|
129
|
+
/**
|
|
130
|
+
* deck.gl's GridCellLayer / HexagonCellLayer bind the `colorRange` palette
|
|
131
|
+
* texture only when the `colorRange` *prop* changes. ColumnLayer (the parent)
|
|
132
|
+
* destroys and recreates `fillModel` whenever `extensionsChanged` fires —
|
|
133
|
+
* which happens when Light & Shadow registers the shadow shader module.
|
|
134
|
+
* The new model starts with empty bindings, the colorRange check is a no-op,
|
|
135
|
+
* and luma.gl skips the draw: "Binding colorRange not found in …-cells-fill-cached".
|
|
136
|
+
* Recreating the Kepler layer "fixes" it because initialize/update then sees a
|
|
137
|
+
* colorRange change against empty oldProps and binds the texture again.
|
|
138
|
+
*
|
|
139
|
+
* Re-bind the existing texture onto whatever fillModel is current. Harmless
|
|
140
|
+
* when the parent already bound it; required after a model rebuild.
|
|
141
|
+
*/
|
|
142
|
+
function bindColorRangeTexture(layer, moduleName) {
|
|
143
|
+
var _layer$state, _layer$state2;
|
|
144
|
+
var model = (_layer$state = layer.state) === null || _layer$state === void 0 ? void 0 : _layer$state.fillModel;
|
|
145
|
+
var colorTexture = (_layer$state2 = layer.state) === null || _layer$state2 === void 0 ? void 0 : _layer$state2.colorTexture;
|
|
146
|
+
if (model !== null && model !== void 0 && model.shaderInputs && colorTexture) {
|
|
147
|
+
model.shaderInputs.setProps((0, _defineProperty2["default"])({}, moduleName, {
|
|
148
|
+
colorRange: colorTexture
|
|
149
|
+
}));
|
|
150
|
+
}
|
|
151
|
+
}
|
|
152
|
+
function makeGlobeCellLayerClass(BaseCellLayer, type) {
|
|
153
|
+
var cached = globeCellClassCache.get(BaseCellLayer);
|
|
154
|
+
if (cached) {
|
|
155
|
+
return cached;
|
|
156
|
+
}
|
|
157
|
+
var GlobeCellLayer = /*#__PURE__*/function (_ref) {
|
|
158
|
+
function GlobeCellLayer() {
|
|
159
|
+
(0, _classCallCheck2["default"])(this, GlobeCellLayer);
|
|
160
|
+
return _callSuper(this, GlobeCellLayer, arguments);
|
|
161
|
+
}
|
|
162
|
+
(0, _inherits2["default"])(GlobeCellLayer, _ref);
|
|
163
|
+
return (0, _createClass2["default"])(GlobeCellLayer, [{
|
|
164
|
+
key: "getShaders",
|
|
165
|
+
value: function getShaders() {
|
|
166
|
+
var shaders = _superPropGet(GlobeCellLayer, "getShaders", this, 3)([]);
|
|
167
|
+
return _objectSpread(_objectSpread({}, shaders), {}, {
|
|
168
|
+
vs: addGlobeCellProjection(shaders.vs, type),
|
|
169
|
+
modules: [].concat((0, _toConsumableArray2["default"])(shaders.modules || []), [globeCellUniforms])
|
|
170
|
+
});
|
|
171
|
+
}
|
|
172
|
+
}, {
|
|
173
|
+
key: "updateState",
|
|
174
|
+
value: function updateState(params) {
|
|
175
|
+
_superPropGet(GlobeCellLayer, "updateState", this, 3)([params]);
|
|
176
|
+
bindColorRangeTexture(this, type);
|
|
177
|
+
}
|
|
178
|
+
}, {
|
|
179
|
+
key: "draw",
|
|
180
|
+
value: function draw(opts) {
|
|
181
|
+
var globeMode = this.context.viewport.resolution ? 1.0 : 0.0;
|
|
182
|
+
// GridCellLayer / HexagonCellLayer render through a single fillModel and set
|
|
183
|
+
// their own module props in draw(); set ours first so it merges (setProps is
|
|
184
|
+
// per-module). deck.gl 9 has no Model.setUniforms — uniforms go through
|
|
185
|
+
// shaderInputs UBO modules.
|
|
186
|
+
var model = this.state.fillModel;
|
|
187
|
+
if (model !== null && model !== void 0 && model.shaderInputs) {
|
|
188
|
+
model.shaderInputs.setProps({
|
|
189
|
+
globeCell: {
|
|
190
|
+
globeMode: globeMode
|
|
191
|
+
}
|
|
192
|
+
});
|
|
193
|
+
}
|
|
194
|
+
bindColorRangeTexture(this, type);
|
|
195
|
+
_superPropGet(GlobeCellLayer, "draw", this, 3)([opts]);
|
|
196
|
+
}
|
|
197
|
+
}]);
|
|
198
|
+
}(BaseCellLayer);
|
|
199
|
+
GlobeCellLayer.layerName = "Globe".concat(type, "CellLayer");
|
|
200
|
+
globeCellClassCache.set(BaseCellLayer, GlobeCellLayer);
|
|
201
|
+
return GlobeCellLayer;
|
|
202
|
+
}
|
|
203
|
+
//# sourceMappingURL=data:application/json;charset=utf-8;base64,{"version":3,"names":["_core","require","ownKeys","e","r","t","Object","keys","getOwnPropertySymbols","o","filter","getOwnPropertyDescriptor","enumerable","push","apply","_objectSpread","arguments","length","forEach","_defineProperty2","getOwnPropertyDescriptors","defineProperties","defineProperty","_callSuper","_getPrototypeOf2","_possibleConstructorReturn2","_isNativeReflectConstruct","Reflect","construct","constructor","Boolean","prototype","valueOf","call","_superPropGet","p","_get2","globeCellUniforms","name","vs","uniformTypes","globeMode","GLOBE_CELL_DECL","addGlobeCellProjection","type","decl","concat","withDecl","includes","replace","target","console","error","runBinOptionsWithMercatorViewport","layer","callSuper","_layer$context","viewport","context","isGlobe","resolution","mercatorViewport","WebMercatorViewport","width","height","longitude","latitude","zoom","originalViewport","globeCellClassCache","WeakMap","bindColorRangeTexture","moduleName","_layer$state","_layer$state2","model","state","fillModel","colorTexture","shaderInputs","setProps","colorRange","makeGlobeCellLayerClass","BaseCellLayer","cached","get","GlobeCellLayer","_ref","_classCallCheck2","_inherits2","_createClass2","key","value","getShaders","shaders","modules","_toConsumableArray2","updateState","params","draw","opts","globeCell","layerName","set"],"sources":["../../../src/layer-utils/globe-cell-utils.ts"],"sourcesContent":["// SPDX-License-Identifier: MIT\n// Copyright contributors to the kepler.gl project\n\nimport {WebMercatorViewport} from '@deck.gl/core';\n\n/**\n * deck.gl's aggregation cell layers (GridCellLayer / HexagonCellLayer) position\n * each cell in flat mercator \"common space\" (a 2D XY plane) and then draw it with\n * `project_common_position_to_clipspace`, which only multiplies by the\n * view-projection matrix. Under `_GlobeView` this leaves the cells on the flat XY\n * plane that passes through the center of the globe instead of on its surface\n * (the base ColumnLayer works on the globe because it feeds real lng/lat through\n * `project_position` -> `project_globe_`; the aggregation cell shaders skip that).\n *\n * To fix this we remap the already-computed flat common-space vertex position back\n * to lng/lat (inverse Web Mercator) and then onto the sphere with the same math\n * `project_globe_` uses for geographic layers. Because we remap every vertex of the\n * cell footprint (not just the centroid), the flat quad/hexagon naturally curves\n * onto the surface. Elevation (extruded cells, stored in `geometry.position.z` in\n * common units) is added along the radius so columns rise radially off the globe.\n *\n * The remap is gated by a `globeMode` uniform so 2D/3D mercator rendering is\n * byte-for-byte unchanged.\n *\n * `WORLD_SCALE`, `PI`, `GLOBE_RADIUS` and `project.commonOrigin` are all provided\n * by deck.gl's project shader module which these layers include.\n */\n\n// deck.gl 9 / luma 9 sets custom uniforms via UBO-backed shader modules (there is\n// no Model.setUniforms). This minimal module exposes the globe-mode flag.\nconst globeCellUniforms = {\n  name: 'globeCell',\n  vs: `layout(std140) uniform globeCellUniforms {\n  float globeMode;\n} globeCellProps;\n`,\n  uniformTypes: {\n    globeMode: 'f32'\n  }\n} as const;\n\nconst GLOBE_CELL_DECL = /* glsl */ `\n// Inverse of deck.gl project_mercator_: flat common XY -> lng/lat (degrees).\nvec2 kepler_commonToLngLat(vec2 commonXY) {\n  float lng = degrees(commonXY.x / WORLD_SCALE - PI);\n  float lat = degrees(2.0 * atan(exp(commonXY.y / WORLD_SCALE - PI)) - PI * 0.5);\n  return vec2(lng, lat);\n}\n\n// Same math as deck.gl project_globe_. elevationCommon is in common units already\n// (GLOBE_RADIUS space), matching how project_globe_ scales z off EARTH_RADIUS.\nvec3 kepler_lngLatToGlobe(vec2 lngLat, float elevationCommon) {\n  float lambda = radians(lngLat.x);\n  float phi = radians(lngLat.y);\n  float cosPhi = cos(phi);\n  float D = GLOBE_RADIUS + elevationCommon;\n  return vec3(\n    sin(lambda) * cosPhi,\n    -cos(lambda) * cosPhi,\n    sin(phi)\n  ) * D;\n}\n`;\n\n/**\n * Rewrites a grid/hexagon cell vertex shader so that, in globe mode, the final\n * clip-space position is derived from the sphere surface instead of the flat XY\n * plane. In 2D/3D mode the original path is kept unchanged.\n */\nexport function addGlobeCellProjection(vs: string, type: string): string {\n  const decl = `${GLOBE_CELL_DECL}\\nvoid main(void) {`;\n  const withDecl = vs.includes('void main(void) {') ? vs.replace('void main(void) {', decl) : vs;\n\n  const target = 'gl_Position = project_common_position_to_clipspace(geometry.position);';\n  if (!withDecl.includes(target)) {\n    // Shader shape changed in a deck.gl update; leave the original so we don't crash.\n    // eslint-disable-next-line no-console\n    console.error(`Cannot edit ${type} globe cell shader`);\n    return withDecl;\n  }\n\n  return withDecl.replace(\n    target,\n    `if (globeCellProps.globeMode > 0.5) {\n      vec2 lngLat = kepler_commonToLngLat(geometry.position.xy + project.commonOrigin.xy);\n      vec3 globePos = kepler_lngLatToGlobe(lngLat, geometry.position.z);\n      geometry.position = vec4(globePos, 1.0);\n    }\n    gl_Position = project_common_position_to_clipspace(geometry.position);`\n  );\n}\n\n/**\n * deck.gl 9's Grid/Hexagon aggregation compute bin positions and the cell layer's\n * \"common space\" from `this.context.viewport`. Under `_GlobeView` that common space\n * is the globe's 3D-projected space (projectFlat is identity on lng/lat, positions\n * bin off the sphere-projected XY), which both mis-bins data and — combined with the\n * flat cell shader — drops cells onto the plane through the globe center.\n *\n * We sidestep this by running `_updateBinOptions` with a WebMercatorViewport that\n * matches the current globe camera. That makes binning, `cellOriginCommon` /\n * `cellSizeCommon` (or `radiusCommon` / `hexOriginCommon`) and the cell shader's\n * flat position all live in genuine Web Mercator common space, which the cell shader\n * remap (`addGlobeCellProjection`) then curves back onto the sphere. In 2D/3D mode\n * this is a no-op.\n *\n * `callSuper` runs deck.gl's original `_updateBinOptions` while the viewport is\n * temporarily swapped. The swap is synchronous and restored in `finally`.\n */\nexport function runBinOptionsWithMercatorViewport(layer: any, callSuper: () => void): void {\n  const viewport = layer.context?.viewport;\n  const isGlobe = Boolean(viewport?.resolution);\n  if (!isGlobe) {\n    callSuper();\n    return;\n  }\n\n  const mercatorViewport = new WebMercatorViewport({\n    width: viewport.width,\n    height: viewport.height,\n    longitude: viewport.longitude,\n    latitude: viewport.latitude,\n    zoom: viewport.zoom\n  });\n\n  const originalViewport = layer.context.viewport;\n  layer.context.viewport = mercatorViewport;\n  try {\n    callSuper();\n  } finally {\n    layer.context.viewport = originalViewport;\n  }\n}\n\n/**\n * Wraps a deck.gl aggregation cell layer class (GridCellLayer / HexagonCellLayer)\n * with a subclass that injects the globe surface remap into its vertex shader.\n *\n * We create the subclass dynamically from whatever default class deck.gl provides\n * to `getSubLayerClass` so we don't have to import the (non-public) cell layer\n * classes directly. Results are cached per base class so deck.gl sees a stable\n * layer class across renders (layers are recreated every frame) and shader\n * compilation / sublayer diffing stays stable.\n */\nconst globeCellClassCache = new WeakMap<object, object>();\n\ntype LayerConstructor = {new (...args: any[]): any; layerName?: string};\n\n/**\n * deck.gl's GridCellLayer / HexagonCellLayer bind the `colorRange` palette\n * texture only when the `colorRange` *prop* changes. ColumnLayer (the parent)\n * destroys and recreates `fillModel` whenever `extensionsChanged` fires —\n * which happens when Light & Shadow registers the shadow shader module.\n * The new model starts with empty bindings, the colorRange check is a no-op,\n * and luma.gl skips the draw: \"Binding colorRange not found in …-cells-fill-cached\".\n * Recreating the Kepler layer \"fixes\" it because initialize/update then sees a\n * colorRange change against empty oldProps and binds the texture again.\n *\n * Re-bind the existing texture onto whatever fillModel is current. Harmless\n * when the parent already bound it; required after a model rebuild.\n */\nfunction bindColorRangeTexture(layer: any, moduleName: string): void {\n  const model = layer.state?.fillModel;\n  const colorTexture = layer.state?.colorTexture;\n  if (model?.shaderInputs && colorTexture) {\n    model.shaderInputs.setProps({[moduleName]: {colorRange: colorTexture}});\n  }\n}\n\nexport function makeGlobeCellLayerClass<T extends LayerConstructor>(\n  BaseCellLayer: T,\n  type: string\n): T {\n  const cached = globeCellClassCache.get(BaseCellLayer);\n  if (cached) {\n    return cached as T;\n  }\n\n  class GlobeCellLayer extends (BaseCellLayer as {new (...args: any[]): any}) {\n    getShaders() {\n      const shaders = super.getShaders();\n      return {\n        ...shaders,\n        vs: addGlobeCellProjection(shaders.vs, type),\n        modules: [...(shaders.modules || []), globeCellUniforms]\n      };\n    }\n\n    updateState(params: any) {\n      super.updateState(params);\n      bindColorRangeTexture(this, type);\n    }\n\n    draw(opts: any) {\n      const globeMode = (this.context.viewport as any).resolution ? 1.0 : 0.0;\n      // GridCellLayer / HexagonCellLayer render through a single fillModel and set\n      // their own module props in draw(); set ours first so it merges (setProps is\n      // per-module). deck.gl 9 has no Model.setUniforms — uniforms go through\n      // shaderInputs UBO modules.\n      const model = (this.state as any).fillModel;\n      if (model?.shaderInputs) {\n        model.shaderInputs.setProps({globeCell: {globeMode}});\n      }\n      bindColorRangeTexture(this, type);\n      super.draw(opts);\n    }\n  }\n  (GlobeCellLayer as unknown as {layerName: string}).layerName = `Globe${type}CellLayer`;\n  globeCellClassCache.set(BaseCellLayer, GlobeCellLayer);\n  return GlobeCellLayer as unknown as T;\n}\n"],"mappings":"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","ignoreList":[]}
|
|
@@ -0,0 +1,118 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
|
|
3
|
+
var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
|
|
4
|
+
var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
|
|
5
|
+
var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
|
|
6
|
+
var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
|
|
7
|
+
var _globeCellUtils = require("./globe-cell-utils");
|
|
8
|
+
// SPDX-License-Identifier: MIT
|
|
9
|
+
// Copyright contributors to the kepler.gl project
|
|
10
|
+
|
|
11
|
+
function makeFakeCellLayerClass() {
|
|
12
|
+
return /*#__PURE__*/function () {
|
|
13
|
+
function FakeCellLayer() {
|
|
14
|
+
(0, _classCallCheck2["default"])(this, FakeCellLayer);
|
|
15
|
+
(0, _defineProperty2["default"])(this, "state", {});
|
|
16
|
+
(0, _defineProperty2["default"])(this, "context", {
|
|
17
|
+
viewport: {}
|
|
18
|
+
});
|
|
19
|
+
}
|
|
20
|
+
return (0, _createClass2["default"])(FakeCellLayer, [{
|
|
21
|
+
key: "getShaders",
|
|
22
|
+
value: function getShaders() {
|
|
23
|
+
return {
|
|
24
|
+
vs: 'void main(void) { gl_Position = project_common_position_to_clipspace(geometry.position); }',
|
|
25
|
+
modules: []
|
|
26
|
+
};
|
|
27
|
+
}
|
|
28
|
+
|
|
29
|
+
// deck.gl ColumnLayer recreates fillModel on extensionsChanged and does not
|
|
30
|
+
// copy over the colorRange texture binding. GridCellLayer / HexagonCellLayer
|
|
31
|
+
// only bind that texture when the colorRange *prop* changes.
|
|
32
|
+
}, {
|
|
33
|
+
key: "updateState",
|
|
34
|
+
value: function updateState(_params) {
|
|
35
|
+
this.state.fillModel = {
|
|
36
|
+
shaderInputs: {
|
|
37
|
+
setProps: jest.fn()
|
|
38
|
+
}
|
|
39
|
+
};
|
|
40
|
+
}
|
|
41
|
+
}, {
|
|
42
|
+
key: "draw",
|
|
43
|
+
value: function draw(_opts) {
|
|
44
|
+
// no-op stub so GlobeCellLayer.draw can call super.draw()
|
|
45
|
+
}
|
|
46
|
+
}]);
|
|
47
|
+
}();
|
|
48
|
+
}
|
|
49
|
+
describe('globe-cell-utils colorRange rebind', function () {
|
|
50
|
+
test('rebinds colorRange onto a rebuilt fillModel (grid)', function () {
|
|
51
|
+
var _layer$state$fillMode;
|
|
52
|
+
var GlobeGridCell = (0, _globeCellUtils.makeGlobeCellLayerClass)(makeFakeCellLayerClass(), 'grid');
|
|
53
|
+
var layer = new GlobeGridCell();
|
|
54
|
+
layer.state.colorTexture = {
|
|
55
|
+
id: 'color-range-tex'
|
|
56
|
+
};
|
|
57
|
+
layer.updateState({
|
|
58
|
+
changeFlags: {
|
|
59
|
+
extensionsChanged: true
|
|
60
|
+
},
|
|
61
|
+
props: {
|
|
62
|
+
colorRange: ['#fff']
|
|
63
|
+
},
|
|
64
|
+
oldProps: {
|
|
65
|
+
colorRange: ['#fff']
|
|
66
|
+
}
|
|
67
|
+
});
|
|
68
|
+
expect((_layer$state$fillMode = layer.state.fillModel) === null || _layer$state$fillMode === void 0 ? void 0 : _layer$state$fillMode.shaderInputs.setProps).toHaveBeenCalledWith({
|
|
69
|
+
grid: {
|
|
70
|
+
colorRange: layer.state.colorTexture
|
|
71
|
+
}
|
|
72
|
+
});
|
|
73
|
+
});
|
|
74
|
+
test('rebinds colorRange onto a rebuilt fillModel (hexagon)', function () {
|
|
75
|
+
var _layer$state$fillMode2;
|
|
76
|
+
var GlobeHexCell = (0, _globeCellUtils.makeGlobeCellLayerClass)(makeFakeCellLayerClass(), 'hexagon');
|
|
77
|
+
var layer = new GlobeHexCell();
|
|
78
|
+
layer.state.colorTexture = {
|
|
79
|
+
id: 'color-range-tex'
|
|
80
|
+
};
|
|
81
|
+
layer.updateState({
|
|
82
|
+
changeFlags: {
|
|
83
|
+
extensionsChanged: true
|
|
84
|
+
},
|
|
85
|
+
props: {
|
|
86
|
+
colorRange: ['#fff']
|
|
87
|
+
},
|
|
88
|
+
oldProps: {
|
|
89
|
+
colorRange: ['#fff']
|
|
90
|
+
}
|
|
91
|
+
});
|
|
92
|
+
expect((_layer$state$fillMode2 = layer.state.fillModel) === null || _layer$state$fillMode2 === void 0 ? void 0 : _layer$state$fillMode2.shaderInputs.setProps).toHaveBeenCalledWith({
|
|
93
|
+
hexagon: {
|
|
94
|
+
colorRange: layer.state.colorTexture
|
|
95
|
+
}
|
|
96
|
+
});
|
|
97
|
+
});
|
|
98
|
+
test('draw also rebinds colorRange so the first frame after rebuild is valid', function () {
|
|
99
|
+
var GlobeGridCell = (0, _globeCellUtils.makeGlobeCellLayerClass)(makeFakeCellLayerClass(), 'grid');
|
|
100
|
+
var layer = new GlobeGridCell();
|
|
101
|
+
var setProps = jest.fn();
|
|
102
|
+
layer.state.colorTexture = {
|
|
103
|
+
id: 'color-range-tex'
|
|
104
|
+
};
|
|
105
|
+
layer.state.fillModel = {
|
|
106
|
+
shaderInputs: {
|
|
107
|
+
setProps: setProps
|
|
108
|
+
}
|
|
109
|
+
};
|
|
110
|
+
layer.draw({});
|
|
111
|
+
expect(setProps).toHaveBeenCalledWith({
|
|
112
|
+
grid: {
|
|
113
|
+
colorRange: layer.state.colorTexture
|
|
114
|
+
}
|
|
115
|
+
});
|
|
116
|
+
});
|
|
117
|
+
});
|
|
118
|
+
//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJuYW1lcyI6WyJfZ2xvYmVDZWxsVXRpbHMiLCJyZXF1aXJlIiwibWFrZUZha2VDZWxsTGF5ZXJDbGFzcyIsIkZha2VDZWxsTGF5ZXIiLCJfY2xhc3NDYWxsQ2hlY2syIiwiX2RlZmluZVByb3BlcnR5MiIsInZpZXdwb3J0IiwiX2NyZWF0ZUNsYXNzMiIsImtleSIsInZhbHVlIiwiZ2V0U2hhZGVycyIsInZzIiwibW9kdWxlcyIsInVwZGF0ZVN0YXRlIiwiX3BhcmFtcyIsInN0YXRlIiwiZmlsbE1vZGVsIiwic2hhZGVySW5wdXRzIiwic2V0UHJvcHMiLCJqZXN0IiwiZm4iLCJkcmF3IiwiX29wdHMiLCJkZXNjcmliZSIsInRlc3QiLCJfbGF5ZXIkc3RhdGUkZmlsbE1vZGUiLCJHbG9iZUdyaWRDZWxsIiwibWFrZUdsb2JlQ2VsbExheWVyQ2xhc3MiLCJsYXllciIsImNvbG9yVGV4dHVyZSIsImlkIiwiY2hhbmdlRmxhZ3MiLCJleHRlbnNpb25zQ2hhbmdlZCIsInByb3BzIiwiY29sb3JSYW5nZSIsIm9sZFByb3BzIiwiZXhwZWN0IiwidG9IYXZlQmVlbkNhbGxlZFdpdGgiLCJncmlkIiwiX2xheWVyJHN0YXRlJGZpbGxNb2RlMiIsIkdsb2JlSGV4Q2VsbCIsImhleGFnb24iXSwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvbGF5ZXItdXRpbHMvZ2xvYmUtY2VsbC11dGlscy5zcGVjLnRzIl0sInNvdXJjZXNDb250ZW50IjpbIi8vIFNQRFgtTGljZW5zZS1JZGVudGlmaWVyOiBNSVRcbi8vIENvcHlyaWdodCBjb250cmlidXRvcnMgdG8gdGhlIGtlcGxlci5nbCBwcm9qZWN0XG5cbmltcG9ydCB7bWFrZUdsb2JlQ2VsbExheWVyQ2xhc3N9IGZyb20gJy4vZ2xvYmUtY2VsbC11dGlscyc7XG5cbmZ1bmN0aW9uIG1ha2VGYWtlQ2VsbExheWVyQ2xhc3MoKSB7XG4gIHJldHVybiBjbGFzcyBGYWtlQ2VsbExheWVyIHtcbiAgICBzdGF0ZToge1xuICAgICAgZmlsbE1vZGVsPzoge3NoYWRlcklucHV0czoge3NldFByb3BzOiBqZXN0Lk1vY2t9fTtcbiAgICAgIGNvbG9yVGV4dHVyZT86IHtpZDogc3RyaW5nfTtcbiAgICB9ID0ge307XG4gICAgY29udGV4dCA9IHt2aWV3cG9ydDoge319O1xuXG4gICAgZ2V0U2hhZGVycygpIHtcbiAgICAgIHJldHVybiB7XG4gICAgICAgIHZzOiAndm9pZCBtYWluKHZvaWQpIHsgZ2xfUG9zaXRpb24gPSBwcm9qZWN0X2NvbW1vbl9wb3NpdGlvbl90b19jbGlwc3BhY2UoZ2VvbWV0cnkucG9zaXRpb24pOyB9JyxcbiAgICAgICAgbW9kdWxlczogW11cbiAgICAgIH07XG4gICAgfVxuXG4gICAgLy8gZGVjay5nbCBDb2x1bW5MYXllciByZWNyZWF0ZXMgZmlsbE1vZGVsIG9uIGV4dGVuc2lvbnNDaGFuZ2VkIGFuZCBkb2VzIG5vdFxuICAgIC8vIGNvcHkgb3ZlciB0aGUgY29sb3JSYW5nZSB0ZXh0dXJlIGJpbmRpbmcuIEdyaWRDZWxsTGF5ZXIgLyBIZXhhZ29uQ2VsbExheWVyXG4gICAgLy8gb25seSBiaW5kIHRoYXQgdGV4dHVyZSB3aGVuIHRoZSBjb2xvclJhbmdlICpwcm9wKiBjaGFuZ2VzLlxuICAgIHVwZGF0ZVN0YXRlKF9wYXJhbXM/OiB1bmtub3duKSB7XG4gICAgICB0aGlzLnN0YXRlLmZpbGxNb2RlbCA9IHtzaGFkZXJJbnB1dHM6IHtzZXRQcm9wczogamVzdC5mbigpfX07XG4gICAgfVxuXG4gICAgZHJhdyhfb3B0cz86IHVua25vd24pIHtcbiAgICAgIC8vIG5vLW9wIHN0dWIgc28gR2xvYmVDZWxsTGF5ZXIuZHJhdyBjYW4gY2FsbCBzdXBlci5kcmF3KClcbiAgICB9XG4gIH07XG59XG5cbmRlc2NyaWJlKCdnbG9iZS1jZWxsLXV0aWxzIGNvbG9yUmFuZ2UgcmViaW5kJywgKCkgPT4ge1xuICB0ZXN0KCdyZWJpbmRzIGNvbG9yUmFuZ2Ugb250byBhIHJlYnVpbHQgZmlsbE1vZGVsIChncmlkKScsICgpID0+IHtcbiAgICBjb25zdCBHbG9iZUdyaWRDZWxsID0gbWFrZUdsb2JlQ2VsbExheWVyQ2xhc3MobWFrZUZha2VDZWxsTGF5ZXJDbGFzcygpLCAnZ3JpZCcpO1xuICAgIGNvbnN0IGxheWVyID0gbmV3IEdsb2JlR3JpZENlbGwoKTtcbiAgICBsYXllci5zdGF0ZS5jb2xvclRleHR1cmUgPSB7aWQ6ICdjb2xvci1yYW5nZS10ZXgnfTtcblxuICAgIGxheWVyLnVwZGF0ZVN0YXRlKHtcbiAgICAgIGNoYW5nZUZsYWdzOiB7ZXh0ZW5zaW9uc0NoYW5nZWQ6IHRydWV9LFxuICAgICAgcHJvcHM6IHtjb2xvclJhbmdlOiBbJyNmZmYnXX0sXG4gICAgICBvbGRQcm9wczoge2NvbG9yUmFuZ2U6IFsnI2ZmZiddfVxuICAgIH0pO1xuXG4gICAgZXhwZWN0KGxheWVyLnN0YXRlLmZpbGxNb2RlbD8uc2hhZGVySW5wdXRzLnNldFByb3BzKS50b0hhdmVCZWVuQ2FsbGVkV2l0aCh7XG4gICAgICBncmlkOiB7Y29sb3JSYW5nZTogbGF5ZXIuc3RhdGUuY29sb3JUZXh0dXJlfVxuICAgIH0pO1xuICB9KTtcblxuICB0ZXN0KCdyZWJpbmRzIGNvbG9yUmFuZ2Ugb250byBhIHJlYnVpbHQgZmlsbE1vZGVsIChoZXhhZ29uKScsICgpID0+IHtcbiAgICBjb25zdCBHbG9iZUhleENlbGwgPSBtYWtlR2xvYmVDZWxsTGF5ZXJDbGFzcyhtYWtlRmFrZUNlbGxMYXllckNsYXNzKCksICdoZXhhZ29uJyk7XG4gICAgY29uc3QgbGF5ZXIgPSBuZXcgR2xvYmVIZXhDZWxsKCk7XG4gICAgbGF5ZXIuc3RhdGUuY29sb3JUZXh0dXJlID0ge2lkOiAnY29sb3ItcmFuZ2UtdGV4J307XG5cbiAgICBsYXllci51cGRhdGVTdGF0ZSh7XG4gICAgICBjaGFuZ2VGbGFnczoge2V4dGVuc2lvbnNDaGFuZ2VkOiB0cnVlfSxcbiAgICAgIHByb3BzOiB7Y29sb3JSYW5nZTogWycjZmZmJ119LFxuICAgICAgb2xkUHJvcHM6IHtjb2xvclJhbmdlOiBbJyNmZmYnXX1cbiAgICB9KTtcblxuICAgIGV4cGVjdChsYXllci5zdGF0ZS5maWxsTW9kZWw/LnNoYWRlcklucHV0cy5zZXRQcm9wcykudG9IYXZlQmVlbkNhbGxlZFdpdGgoe1xuICAgICAgaGV4YWdvbjoge2NvbG9yUmFuZ2U6IGxheWVyLnN0YXRlLmNvbG9yVGV4dHVyZX1cbiAgICB9KTtcbiAgfSk7XG5cbiAgdGVzdCgnZHJhdyBhbHNvIHJlYmluZHMgY29sb3JSYW5nZSBzbyB0aGUgZmlyc3QgZnJhbWUgYWZ0ZXIgcmVidWlsZCBpcyB2YWxpZCcsICgpID0+IHtcbiAgICBjb25zdCBHbG9iZUdyaWRDZWxsID0gbWFrZUdsb2JlQ2VsbExheWVyQ2xhc3MobWFrZUZha2VDZWxsTGF5ZXJDbGFzcygpLCAnZ3JpZCcpO1xuICAgIGNvbnN0IGxheWVyID0gbmV3IEdsb2JlR3JpZENlbGwoKTtcbiAgICBjb25zdCBzZXRQcm9wcyA9IGplc3QuZm4oKTtcbiAgICBsYXllci5zdGF0ZS5jb2xvclRleHR1cmUgPSB7aWQ6ICdjb2xvci1yYW5nZS10ZXgnfTtcbiAgICBsYXllci5zdGF0ZS5maWxsTW9kZWwgPSB7c2hhZGVySW5wdXRzOiB7c2V0UHJvcHN9fTtcblxuICAgIGxheWVyLmRyYXcoe30pO1xuXG4gICAgZXhwZWN0KHNldFByb3BzKS50b0hhdmVCZWVuQ2FsbGVkV2l0aCh7XG4gICAgICBncmlkOiB7Y29sb3JSYW5nZTogbGF5ZXIuc3RhdGUuY29sb3JUZXh0dXJlfVxuICAgIH0pO1xuICB9KTtcbn0pO1xuIl0sIm1hcHBpbmdzIjoiOzs7Ozs7QUFHQSxJQUFBQSxlQUFBLEdBQUFDLE9BQUE7QUFIQTtBQUNBOztBQUlBLFNBQVNDLHNCQUFzQkEsQ0FBQSxFQUFHO0VBQ2hDO0lBQUEsU0FBQUMsY0FBQTtNQUFBLElBQUFDLGdCQUFBLG1CQUFBRCxhQUFBO01BQUEsSUFBQUUsZ0JBQUEsNEJBSU0sQ0FBQyxDQUFDO01BQUEsSUFBQUEsZ0JBQUEsOEJBQ0k7UUFBQ0MsUUFBUSxFQUFFLENBQUM7TUFBQyxDQUFDO0lBQUE7SUFB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
|
|
@@ -0,0 +1,38 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
|
|
3
|
+
Object.defineProperty(exports, "__esModule", {
|
|
4
|
+
value: true
|
|
5
|
+
});
|
|
6
|
+
exports.editShader = editShader;
|
|
7
|
+
exports.insertBefore = insertBefore;
|
|
8
|
+
var _window = require("global/window");
|
|
9
|
+
// SPDX-License-Identifier: MIT
|
|
10
|
+
// Copyright contributors to the kepler.gl project
|
|
11
|
+
|
|
12
|
+
/*
|
|
13
|
+
* Amendment to default layer vertex shader
|
|
14
|
+
* @param {string} vs
|
|
15
|
+
* @param {string} type
|
|
16
|
+
* @param {string} originalText
|
|
17
|
+
* @param {string} testToReplace
|
|
18
|
+
* @return {string} output shader
|
|
19
|
+
*
|
|
20
|
+
*/
|
|
21
|
+
function editShader(vs, type, originalText, testToReplace) {
|
|
22
|
+
if (!vs.includes(originalText)) {
|
|
23
|
+
// Here we call Console.error when we fail to edit deck.gl shader
|
|
24
|
+
// This should be caught by layer test
|
|
25
|
+
_window.console.error("Cannot edit ".concat(type, " layer shader"));
|
|
26
|
+
return vs;
|
|
27
|
+
}
|
|
28
|
+
return vs.replace(originalText, testToReplace);
|
|
29
|
+
}
|
|
30
|
+
function insertBefore(vs, type, insertBeforeText, textToInsert) {
|
|
31
|
+
var at = vs.indexOf(insertBeforeText);
|
|
32
|
+
if (at < 0) {
|
|
33
|
+
_window.console.error("Cannot edit ".concat(type, " layer shader"));
|
|
34
|
+
return vs;
|
|
35
|
+
}
|
|
36
|
+
return vs.slice(0, at) + textToInsert + vs.slice(at);
|
|
37
|
+
}
|
|
38
|
+
//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJuYW1lcyI6WyJfd2luZG93IiwicmVxdWlyZSIsImVkaXRTaGFkZXIiLCJ2cyIsInR5cGUiLCJvcmlnaW5hbFRleHQiLCJ0ZXN0VG9SZXBsYWNlIiwiaW5jbHVkZXMiLCJDb25zb2xlIiwiZXJyb3IiLCJjb25jYXQiLCJyZXBsYWNlIiwiaW5zZXJ0QmVmb3JlIiwiaW5zZXJ0QmVmb3JlVGV4dCIsInRleHRUb0luc2VydCIsImF0IiwiaW5kZXhPZiIsInNsaWNlIl0sInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL2xheWVyLXV0aWxzL3NoYWRlci11dGlscy50cyJdLCJzb3VyY2VzQ29udGVudCI6WyIvLyBTUERYLUxpY2Vuc2UtSWRlbnRpZmllcjogTUlUXG4vLyBDb3B5cmlnaHQgY29udHJpYnV0b3JzIHRvIHRoZSBrZXBsZXIuZ2wgcHJvamVjdFxuXG5pbXBvcnQge2NvbnNvbGUgYXMgQ29uc29sZX0gZnJvbSAnZ2xvYmFsL3dpbmRvdyc7XG5cbi8qXG4gKiBBbWVuZG1lbnQgdG8gZGVmYXVsdCBsYXllciB2ZXJ0ZXggc2hhZGVyXG4gKiBAcGFyYW0ge3N0cmluZ30gdnNcbiAqIEBwYXJhbSB7c3RyaW5nfSB0eXBlXG4gKiBAcGFyYW0ge3N0cmluZ30gb3JpZ2luYWxUZXh0XG4gKiBAcGFyYW0ge3N0cmluZ30gdGVzdFRvUmVwbGFjZVxuICogQHJldHVybiB7c3RyaW5nfSBvdXRwdXQgc2hhZGVyXG4gKlxuICovXG5leHBvcnQgZnVuY3Rpb24gZWRpdFNoYWRlcih2czogc3RyaW5nLCB0eXBlOiBzdHJpbmcsIG9yaWdpbmFsVGV4dDogc3RyaW5nLCB0ZXN0VG9SZXBsYWNlOiBzdHJpbmcpIHtcbiAgaWYgKCF2cy5pbmNsdWRlcyhvcmlnaW5hbFRleHQpKSB7XG4gICAgLy8gSGVyZSB3ZSBjYWxsIENvbnNvbGUuZXJyb3Igd2hlbiB3ZSBmYWlsIHRvIGVkaXQgZGVjay5nbCBzaGFkZXJcbiAgICAvLyBUaGlzIHNob3VsZCBiZSBjYXVnaHQgYnkgbGF5ZXIgdGVzdFxuICAgIENvbnNvbGUuZXJyb3IoYENhbm5vdCBlZGl0ICR7dHlwZX0gbGF5ZXIgc2hhZGVyYCk7XG4gICAgcmV0dXJuIHZzO1xuICB9XG5cbiAgcmV0dXJuIHZzLnJlcGxhY2Uob3JpZ2luYWxUZXh0LCB0ZXN0VG9SZXBsYWNlKTtcbn1cblxuZXhwb3J0IGZ1bmN0aW9uIGluc2VydEJlZm9yZShcbiAgdnM6IHN0cmluZyxcbiAgdHlwZTogc3RyaW5nLFxuICBpbnNlcnRCZWZvcmVUZXh0OiBzdHJpbmcsXG4gIHRleHRUb0luc2VydDogc3RyaW5nXG4pIHtcbiAgY29uc3QgYXQgPSB2cy5pbmRleE9mKGluc2VydEJlZm9yZVRleHQpO1xuICBpZiAoYXQgPCAwKSB7XG4gICAgQ29uc29sZS5lcnJvcihgQ2Fubm90IGVkaXQgJHt0eXBlfSBsYXllciBzaGFkZXJgKTtcbiAgICByZXR1cm4gdnM7XG4gIH1cblxuICByZXR1cm4gdnMuc2xpY2UoMCwgYXQpICsgdGV4dFRvSW5zZXJ0ICsgdnMuc2xpY2UoYXQpO1xufVxuIl0sIm1hcHBpbmdzIjoiOzs7Ozs7O0FBR0EsSUFBQUEsT0FBQSxHQUFBQyxPQUFBO0FBSEE7QUFDQTs7QUFJQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDTyxTQUFTQyxVQUFVQSxDQUFDQyxFQUFVLEVBQUVDLElBQVksRUFBRUMsWUFBb0IsRUFBRUMsYUFBcUIsRUFBRTtFQUNoRyxJQUFJLENBQUNILEVBQUUsQ0FBQ0ksUUFBUSxDQUFDRixZQUFZLENBQUMsRUFBRTtJQUM5QjtJQUNBO0lBQ0FHLGVBQU8sQ0FBQ0MsS0FBSyxnQkFBQUMsTUFBQSxDQUFnQk4sSUFBSSxrQkFBZSxDQUFDO0lBQ2pELE9BQU9ELEVBQUU7RUFDWDtFQUVBLE9BQU9BLEVBQUUsQ0FBQ1EsT0FBTyxDQUFDTixZQUFZLEVBQUVDLGFBQWEsQ0FBQztBQUNoRDtBQUVPLFNBQVNNLFlBQVlBLENBQzFCVCxFQUFVLEVBQ1ZDLElBQVksRUFDWlMsZ0JBQXdCLEVBQ3hCQyxZQUFvQixFQUNwQjtFQUNBLElBQU1DLEVBQUUsR0FBR1osRUFBRSxDQUFDYSxPQUFPLENBQUNILGdCQUFnQixDQUFDO0VBQ3ZDLElBQUlFLEVBQUUsR0FBRyxDQUFDLEVBQUU7SUFDVlAsZUFBTyxDQUFDQyxLQUFLLGdCQUFBQyxNQUFBLENBQWdCTixJQUFJLGtCQUFlLENBQUM7SUFDakQsT0FBT0QsRUFBRTtFQUNYO0VBRUEsT0FBT0EsRUFBRSxDQUFDYyxLQUFLLENBQUMsQ0FBQyxFQUFFRixFQUFFLENBQUMsR0FBR0QsWUFBWSxHQUFHWCxFQUFFLENBQUNjLEtBQUssQ0FBQ0YsRUFBRSxDQUFDO0FBQ3REIiwiaWdub3JlTGlzdCI6W119
|
|
@@ -0,0 +1,95 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
|
|
3
|
+
var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
|
|
4
|
+
Object.defineProperty(exports, "__esModule", {
|
|
5
|
+
value: true
|
|
6
|
+
});
|
|
7
|
+
exports["default"] = void 0;
|
|
8
|
+
var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
|
|
9
|
+
var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
|
|
10
|
+
var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
|
|
11
|
+
var _possibleConstructorReturn2 = _interopRequireDefault(require("@babel/runtime/helpers/possibleConstructorReturn"));
|
|
12
|
+
var _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime/helpers/getPrototypeOf"));
|
|
13
|
+
var _get2 = _interopRequireDefault(require("@babel/runtime/helpers/get"));
|
|
14
|
+
var _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits"));
|
|
15
|
+
var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
|
|
16
|
+
var _layers = require("@deck.gl/layers");
|
|
17
|
+
var _ = require("../");
|
|
18
|
+
function _callSuper(t, o, e) { return o = (0, _getPrototypeOf2["default"])(o), (0, _possibleConstructorReturn2["default"])(t, _isNativeReflectConstruct() ? Reflect.construct(o, e || [], (0, _getPrototypeOf2["default"])(t).constructor) : o.apply(t, e)); }
|
|
19
|
+
function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); } catch (t) {} return (_isNativeReflectConstruct = function _isNativeReflectConstruct() { return !!t; })(); }
|
|
20
|
+
function _superPropGet(t, o, e, r) { var p = (0, _get2["default"])((0, _getPrototypeOf2["default"])(1 & r ? t.prototype : t), o, e); return 2 & r && "function" == typeof p ? function (t) { return p.apply(e, t); } : p; }
|
|
21
|
+
function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
|
|
22
|
+
function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { (0, _defineProperty2["default"])(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; } // SPDX-License-Identifier: MIT
|
|
23
|
+
// Copyright contributors to the kepler.gl project
|
|
24
|
+
var elevationScaleUniforms = {
|
|
25
|
+
name: 'elevationScale',
|
|
26
|
+
vs: "uniform elevationScaleUniforms {\n float elevationScale;\n} elevationScaleProps;\n",
|
|
27
|
+
uniformTypes: {
|
|
28
|
+
elevationScale: 'f32'
|
|
29
|
+
}
|
|
30
|
+
};
|
|
31
|
+
var defaultProps = _objectSpread(_objectSpread({}, _layers.LineLayer.defaultProps), {}, {
|
|
32
|
+
getTargetColor: function getTargetColor(x) {
|
|
33
|
+
return x.color || [0, 0, 0, 255];
|
|
34
|
+
}
|
|
35
|
+
});
|
|
36
|
+
function addInstanceColorShader(vs) {
|
|
37
|
+
var targetColorVs = (0, _.editShader)(vs, 'line target color vs', 'in vec4 instanceColors;', 'in vec4 instanceColors; in vec4 instanceTargetColors;');
|
|
38
|
+
return (0, _.editShader)(targetColorVs, 'line color vs', 'vColor = vec4(instanceColors.rgb, instanceColors.a * layer.opacity);', "vec4 color = mix(instanceColors, instanceTargetColors, positions.x);" + "vColor = vec4(color.rgb, color.a * layer.opacity);");
|
|
39
|
+
}
|
|
40
|
+
function addElevationScale(vs) {
|
|
41
|
+
return (0, _.editShader)(vs, 'line elevation scale vs - multiply by elevation scale', "geometry.worldPosition = instanceSourcePositions;\ngeometry.worldPositionAlt = instanceTargetPositions;\nvec3 source_world = instanceSourcePositions;\nvec3 target_world = instanceTargetPositions;", "vec3 source_world = instanceSourcePositions;\nvec3 target_world = instanceTargetPositions;\nsource_world.z *= elevationScaleProps.elevationScale;\ntarget_world.z *= elevationScaleProps.elevationScale;\ngeometry.worldPosition = source_world;\ngeometry.worldPositionAlt = target_world;");
|
|
42
|
+
}
|
|
43
|
+
var EnhancedLineLayer = exports["default"] = /*#__PURE__*/function (_LineLayer) {
|
|
44
|
+
function EnhancedLineLayer() {
|
|
45
|
+
(0, _classCallCheck2["default"])(this, EnhancedLineLayer);
|
|
46
|
+
return _callSuper(this, EnhancedLineLayer, arguments);
|
|
47
|
+
}
|
|
48
|
+
(0, _inherits2["default"])(EnhancedLineLayer, _LineLayer);
|
|
49
|
+
return (0, _createClass2["default"])(EnhancedLineLayer, [{
|
|
50
|
+
key: "getShaders",
|
|
51
|
+
value: function getShaders() {
|
|
52
|
+
var shaders = _superPropGet(EnhancedLineLayer, "getShaders", this, 3)([]);
|
|
53
|
+
var vs = addInstanceColorShader(shaders.vs);
|
|
54
|
+
vs = addElevationScale(vs);
|
|
55
|
+
return _objectSpread(_objectSpread({}, shaders), {}, {
|
|
56
|
+
vs: vs,
|
|
57
|
+
modules: [].concat((0, _toConsumableArray2["default"])(shaders.modules || []), [elevationScaleUniforms])
|
|
58
|
+
});
|
|
59
|
+
}
|
|
60
|
+
}, {
|
|
61
|
+
key: "draw",
|
|
62
|
+
value: function draw(opts) {
|
|
63
|
+
var model = this.state.model;
|
|
64
|
+
if (model) {
|
|
65
|
+
var _this$props$elevation;
|
|
66
|
+
model.shaderInputs.setProps({
|
|
67
|
+
elevationScale: {
|
|
68
|
+
elevationScale: (_this$props$elevation = this.props.elevationScale) !== null && _this$props$elevation !== void 0 ? _this$props$elevation : 1
|
|
69
|
+
}
|
|
70
|
+
});
|
|
71
|
+
}
|
|
72
|
+
_superPropGet(EnhancedLineLayer, "draw", this, 3)([opts]);
|
|
73
|
+
}
|
|
74
|
+
}, {
|
|
75
|
+
key: "initializeState",
|
|
76
|
+
value: function initializeState() {
|
|
77
|
+
var _this$props$colorForm;
|
|
78
|
+
_superPropGet(EnhancedLineLayer, "initializeState", this, 3)([]);
|
|
79
|
+
var _ref = this.state,
|
|
80
|
+
attributeManager = _ref.attributeManager;
|
|
81
|
+
attributeManager.addInstanced({
|
|
82
|
+
instanceTargetColors: {
|
|
83
|
+
size: (_this$props$colorForm = this.props.colorFormat) === null || _this$props$colorForm === void 0 ? void 0 : _this$props$colorForm.length,
|
|
84
|
+
type: 'unorm8',
|
|
85
|
+
transition: true,
|
|
86
|
+
accessor: 'getTargetColor',
|
|
87
|
+
defaultValue: [0, 0, 0, 255]
|
|
88
|
+
}
|
|
89
|
+
});
|
|
90
|
+
}
|
|
91
|
+
}]);
|
|
92
|
+
}(_layers.LineLayer);
|
|
93
|
+
EnhancedLineLayer.layerName = 'EnhancedLineLayer';
|
|
94
|
+
EnhancedLineLayer.defaultProps = defaultProps;
|
|
95
|
+
//# sourceMappingURL=data:application/json;charset=utf-8;base64,{"version":3,"names":["_layers","require","_","_callSuper","t","o","e","_getPrototypeOf2","_possibleConstructorReturn2","_isNativeReflectConstruct","Reflect","construct","constructor","apply","Boolean","prototype","valueOf","call","_superPropGet","r","p","_get2","ownKeys","Object","keys","getOwnPropertySymbols","filter","getOwnPropertyDescriptor","enumerable","push","_objectSpread","arguments","length","forEach","_defineProperty2","getOwnPropertyDescriptors","defineProperties","defineProperty","elevationScaleUniforms","name","vs","uniformTypes","elevationScale","defaultProps","LineLayer","getTargetColor","x","color","addInstanceColorShader","targetColorVs","editShader","addElevationScale","EnhancedLineLayer","exports","_LineLayer","_classCallCheck2","_inherits2","_createClass2","key","value","getShaders","shaders","modules","concat","_toConsumableArray2","draw","opts","model","state","_this$props$elevation","shaderInputs","setProps","props","initializeState","_this$props$colorForm","_ref","attributeManager","addInstanced","instanceTargetColors","size","colorFormat","type","transition","accessor","defaultValue","layerName"],"sources":["../../../src/line-layer/line-layer.ts"],"sourcesContent":["// SPDX-License-Identifier: MIT\n// Copyright contributors to the kepler.gl project\n\nimport {LineLayer, LineLayerProps} from '@deck.gl/layers';\nimport type {Color, AttributeManager} from '@deck.gl/core';\nimport {editShader} from '../';\n\ntype RGBAColor = Color;\n\nconst elevationScaleUniforms = {\n  name: 'elevationScale',\n  vs: `uniform elevationScaleUniforms {\n  float elevationScale;\n} elevationScaleProps;\n`,\n  uniformTypes: {\n    elevationScale: 'f32'\n  }\n};\n\nconst defaultProps = {\n  ...LineLayer.defaultProps,\n  getTargetColor: x => x.color || [0, 0, 0, 255]\n};\n\nfunction addInstanceColorShader(vs) {\n  const targetColorVs = editShader(\n    vs,\n    'line target color vs',\n    'in vec4 instanceColors;',\n    'in vec4 instanceColors; in vec4 instanceTargetColors;'\n  );\n\n  return editShader(\n    targetColorVs,\n    'line color vs',\n    'vColor = vec4(instanceColors.rgb, instanceColors.a * layer.opacity);',\n    `vec4 color = mix(instanceColors, instanceTargetColors, positions.x);` +\n      `vColor = vec4(color.rgb, color.a * layer.opacity);`\n  );\n}\n\nfunction addElevationScale(vs) {\n  return editShader(\n    vs,\n    'line elevation scale vs - multiply by elevation scale',\n    `geometry.worldPosition = instanceSourcePositions;\ngeometry.worldPositionAlt = instanceTargetPositions;\nvec3 source_world = instanceSourcePositions;\nvec3 target_world = instanceTargetPositions;`,\n    `vec3 source_world = instanceSourcePositions;\nvec3 target_world = instanceTargetPositions;\nsource_world.z *= elevationScaleProps.elevationScale;\ntarget_world.z *= elevationScaleProps.elevationScale;\ngeometry.worldPosition = source_world;\ngeometry.worldPositionAlt = target_world;`\n  );\n}\n\nexport default class EnhancedLineLayer extends LineLayer<\n  any,\n  LineLayerProps<any> & {elevationScale: number; getTargetColor: RGBAColor}\n> {\n  getShaders() {\n    const shaders = super.getShaders();\n\n    let vs = addInstanceColorShader(shaders.vs);\n    vs = addElevationScale(vs);\n\n    return {\n      ...shaders,\n      vs,\n      modules: [...(shaders.modules || []), elevationScaleUniforms]\n    };\n  }\n\n  draw(opts) {\n    const model = this.state.model;\n    if (model) {\n      model.shaderInputs.setProps({\n        elevationScale: {\n          elevationScale: this.props.elevationScale ?? 1\n        }\n      });\n    }\n    super.draw(opts);\n  }\n\n  initializeState() {\n    super.initializeState();\n    const {attributeManager} = this.state as {attributeManager: AttributeManager};\n    attributeManager.addInstanced({\n      instanceTargetColors: {\n        size: this.props.colorFormat?.length,\n        type: 'unorm8',\n        transition: true,\n        accessor: 'getTargetColor',\n        defaultValue: [0, 0, 0, 255]\n      }\n    });\n  }\n}\n\nEnhancedLineLayer.layerName = 'EnhancedLineLayer';\nEnhancedLineLayer.defaultProps = defaultProps;\n"],"mappings":"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","ignoreList":[]}
|