@webviz/subsurface-viewer 0.28.1 → 0.28.2
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/DashSubsurfaceViewer.js +1 -1
- package/dist/DashSubsurfaceViewer.js.map +1 -1
- package/dist/SubsurfaceViewer.d.ts +1 -1
- package/dist/components/ColorLegend.d.ts +1 -1
- package/dist/components/ColorLegend.js.map +1 -1
- package/dist/components/Map.d.ts +1 -1
- package/dist/components/Map.js +7 -7
- package/dist/components/Map.js.map +1 -1
- package/dist/extensions/side-projection-extension.d.ts +4 -3
- package/dist/extensions/side-projection-extension.js +7 -6
- package/dist/extensions/side-projection-extension.js.map +1 -1
- package/dist/layers/BoxSelectionLayer/boxSelectionLayer.d.ts +3 -4
- package/dist/layers/BoxSelectionLayer/boxSelectionLayer.js +4 -7
- package/dist/layers/BoxSelectionLayer/boxSelectionLayer.js.map +1 -1
- package/dist/layers/axes/axesLayer.d.ts +3 -3
- package/dist/layers/axes/axesLayer.js +6 -4
- package/dist/layers/axes/axesLayer.js.map +1 -1
- package/dist/layers/axes/boxLayer.d.ts +2 -2
- package/dist/layers/axes/boxLayer.js +5 -8
- package/dist/layers/axes/boxLayer.js.map +1 -1
- package/dist/layers/axes2d/axes2DLayer.d.ts +4 -5
- package/dist/layers/axes2d/axes2DLayer.js +23 -23
- package/dist/layers/axes2d/axes2DLayer.js.map +1 -1
- package/dist/layers/colormap/colormap.fs.glsl.d.ts +1 -1
- package/dist/layers/colormap/colormap.fs.glsl.js +11 -10
- package/dist/layers/colormap/colormap.fs.glsl.js.map +1 -1
- package/dist/layers/colormap/colormapLayer.d.ts +6 -6
- package/dist/layers/colormap/colormapLayer.js +14 -28
- package/dist/layers/colormap/colormapLayer.js.map +1 -1
- package/dist/layers/drawing/drawingLayer.d.ts +3 -3
- package/dist/layers/drawing/drawingLayer.js +8 -7
- package/dist/layers/drawing/drawingLayer.js.map +1 -1
- package/dist/layers/fault_polygons/faultPolygonsLayer.d.ts +3 -3
- package/dist/layers/fault_polygons/faultPolygonsLayer.js +3 -4
- package/dist/layers/fault_polygons/faultPolygonsLayer.js.map +1 -1
- package/dist/layers/grid3d/fragment.fs.glsl.d.ts +1 -1
- package/dist/layers/grid3d/fragment.fs.glsl.js +11 -9
- package/dist/layers/grid3d/fragment.fs.glsl.js.map +1 -1
- package/dist/layers/grid3d/fragment_lines.glsl.d.ts +1 -1
- package/dist/layers/grid3d/fragment_lines.glsl.js +0 -7
- package/dist/layers/grid3d/fragment_lines.glsl.js.map +1 -1
- package/dist/layers/grid3d/grid3dLayer.d.ts +3 -3
- package/dist/layers/grid3d/grid3dLayer.js +2 -2
- package/dist/layers/grid3d/grid3dLayer.js.map +1 -1
- package/dist/layers/grid3d/privateGrid3dLayer.d.ts +10 -4
- package/dist/layers/grid3d/privateGrid3dLayer.js +73 -56
- package/dist/layers/grid3d/privateGrid3dLayer.js.map +1 -1
- package/dist/layers/grid3d/typeDefs.d.ts +4 -2
- package/dist/layers/grid3d/vertex.glsl.d.ts +1 -1
- package/dist/layers/grid3d/vertex.glsl.js +3 -3
- package/dist/layers/grid3d/webworker.js +6 -4
- package/dist/layers/grid3d/webworker.js.map +1 -1
- package/dist/layers/hillshading2d/hillshading2d.fs.glsl.d.ts +1 -1
- package/dist/layers/hillshading2d/hillshading2d.fs.glsl.js +13 -11
- package/dist/layers/hillshading2d/hillshading2d.fs.glsl.js.map +1 -1
- package/dist/layers/hillshading2d/hillshading2dLayer.d.ts +7 -7
- package/dist/layers/hillshading2d/hillshading2dLayer.js +5 -11
- package/dist/layers/hillshading2d/hillshading2dLayer.js.map +1 -1
- package/dist/layers/intersection/unfoldedGeoJsonLayer.d.ts +2 -2
- package/dist/layers/intersection/unfoldedGeoJsonLayer.js +1 -1
- package/dist/layers/intersection/unfoldedGeoJsonLayer.js.map +1 -1
- package/dist/layers/map/fragment.fs.glsl.d.ts +1 -1
- package/dist/layers/map/fragment.fs.glsl.js +13 -19
- package/dist/layers/map/fragment.fs.glsl.js.map +1 -1
- package/dist/layers/map/mapLayer.d.ts +4 -4
- package/dist/layers/map/mapLayer.js +1 -1
- package/dist/layers/map/mapLayer.js.map +1 -1
- package/dist/layers/map/privateMapLayer.d.ts +10 -5
- package/dist/layers/map/privateMapLayer.js +73 -72
- package/dist/layers/map/privateMapLayer.js.map +1 -1
- package/dist/layers/map/webworker.d.ts +1 -1
- package/dist/layers/map/webworker.js +4 -4
- package/dist/layers/map/webworker.js.map +1 -1
- package/dist/layers/northarrow/northArrow3DLayer.d.ts +4 -4
- package/dist/layers/northarrow/northArrow3DLayer.js +7 -10
- package/dist/layers/northarrow/northArrow3DLayer.js.map +1 -1
- package/dist/layers/piechart/fragment.glsl.d.ts +1 -1
- package/dist/layers/piechart/fragment.glsl.js +1 -1
- package/dist/layers/piechart/pieChartLayer.d.ts +3 -4
- package/dist/layers/piechart/pieChartLayer.js +10 -9
- package/dist/layers/piechart/pieChartLayer.js.map +1 -1
- package/dist/layers/points/pointsLayer.d.ts +3 -3
- package/dist/layers/points/pointsLayer.js +1 -1
- package/dist/layers/points/pointsLayer.js.map +1 -1
- package/dist/layers/points/privatePointsLayer.d.ts +4 -13
- package/dist/layers/points/privatePointsLayer.js +5 -5
- package/dist/layers/points/privatePointsLayer.js.map +1 -1
- package/dist/layers/points/vertex.glsl.d.ts +1 -1
- package/dist/layers/points/vertex.glsl.js +14 -13
- package/dist/layers/points/vertex.glsl.js.map +1 -1
- package/dist/layers/polylines/polylinesLayer.d.ts +3 -3
- package/dist/layers/polylines/polylinesLayer.js +5 -3
- package/dist/layers/polylines/polylinesLayer.js.map +1 -1
- package/dist/layers/polylines/privatePolylinesLayer.d.ts +37 -9
- package/dist/layers/polylines/privatePolylinesLayer.js +6 -6
- package/dist/layers/polylines/privatePolylinesLayer.js.map +1 -1
- package/dist/layers/selectable_geojson/selectableGeoJsonLayer.d.ts +2 -2
- package/dist/layers/selectable_geojson/selectableGeoJsonLayer.js +1 -1
- package/dist/layers/selectable_geojson/selectableGeoJsonLayer.js.map +1 -1
- package/dist/layers/shader_modules/localPhongLighting.d.ts +19 -1
- package/dist/layers/triangle/fragment.fs.glsl.d.ts +1 -1
- package/dist/layers/triangle/fragment.fs.glsl.js +4 -3
- package/dist/layers/triangle/fragment.fs.glsl.js.map +1 -1
- package/dist/layers/triangle/fragment_lines.glsl.d.ts +1 -1
- package/dist/layers/triangle/fragment_lines.glsl.js +2 -2
- package/dist/layers/triangle/privateTriangleLayer.d.ts +9 -8
- package/dist/layers/triangle/privateTriangleLayer.js +21 -16
- package/dist/layers/triangle/privateTriangleLayer.js.map +1 -1
- package/dist/layers/triangle/triangleLayer.d.ts +4 -4
- package/dist/layers/triangle/triangleLayer.js +5 -3
- package/dist/layers/triangle/triangleLayer.js.map +1 -1
- package/dist/layers/triangle/webworker.js +2 -2
- package/dist/layers/triangle/webworker.js.map +1 -1
- package/dist/layers/utils/layerTools.d.ts +3 -3
- package/dist/layers/utils/propertyMapTools.d.ts +1 -1
- package/dist/layers/well_markers/fragment.glsl.d.ts +1 -1
- package/dist/layers/well_markers/fragment.glsl.js +4 -3
- package/dist/layers/well_markers/fragment.glsl.js.map +1 -1
- package/dist/layers/well_markers/vertex.glsl.d.ts +1 -1
- package/dist/layers/well_markers/vertex.glsl.js +10 -14
- package/dist/layers/well_markers/vertex.glsl.js.map +1 -1
- package/dist/layers/well_markers/wellMarkersLayer.d.ts +6 -4
- package/dist/layers/well_markers/wellMarkersLayer.js +43 -50
- package/dist/layers/well_markers/wellMarkersLayer.js.map +1 -1
- package/dist/layers/wells/wellsLayer.d.ts +2 -2
- package/dist/layers/wells/wellsLayer.js +4 -4
- package/dist/layers/wells/wellsLayer.js.map +1 -1
- package/dist/utils/configuration.d.ts +0 -616
- package/dist/utils/configuration.js +6 -11
- package/dist/utils/configuration.js.map +1 -1
- package/dist/utils/measurement.d.ts +1 -1
- package/dist/utils/measurement.js +1 -1
- package/dist/utils/measurement.js.map +1 -1
- package/dist/utils/specExtractor.d.ts +1 -1
- package/dist/viewports/intersectionViewport.d.ts +1 -1
- package/dist/viewports/intersectionViewport.js +1 -1
- package/dist/viewports/intersectionViewport.js.map +1 -1
- package/dist/views/intersectionView.d.ts +4 -3
- package/dist/views/intersectionView.js +1 -1
- package/dist/views/intersectionView.js.map +1 -1
- package/package.json +13 -11
- package/dist/layers/points/fragment.glsl.d.ts +0 -2
- package/dist/layers/points/fragment.glsl.js +0 -69
- package/dist/layers/points/fragment.glsl.js.map +0 -1
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { CompositeLayer } from "@deck.gl/core
|
|
1
|
+
import { CompositeLayer } from "@deck.gl/core";
|
|
2
2
|
import { isEqual } from "lodash";
|
|
3
3
|
import { createPropertyData, defineBoundingBox } from "../utils/layerTools";
|
|
4
4
|
import { PrivatePointsLayer } from "./privatePointsLayer";
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pointsLayer.js","sourceRoot":"","sources":["../../../src/layers/points/pointsLayer.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"pointsLayer.js","sourceRoot":"","sources":["../../../src/layers/points/pointsLayer.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
|
-
import type { ScatterplotLayerProps } from "@deck.gl/layers
|
|
2
|
-
import { ScatterplotLayer } from "@deck.gl/layers
|
|
1
|
+
import type { ScatterplotLayerProps } from "@deck.gl/layers";
|
|
2
|
+
import { ScatterplotLayer } from "@deck.gl/layers";
|
|
3
3
|
import type { NumericArray } from "@math.gl/types";
|
|
4
|
-
import type { LayerContext } from "@deck.gl/core
|
|
4
|
+
import type { LayerContext } from "@deck.gl/core";
|
|
5
5
|
type UniformValue = number | boolean | Readonly<NumericArray>;
|
|
6
6
|
export interface ExtendedScatterplotLayerProps {
|
|
7
7
|
depthTest: boolean;
|
|
@@ -9,16 +9,7 @@ export interface ExtendedScatterplotLayerProps {
|
|
|
9
9
|
}
|
|
10
10
|
export declare class PrivatePointsLayer extends ScatterplotLayer<unknown, ExtendedScatterplotLayerProps> {
|
|
11
11
|
constructor(props: ScatterplotLayerProps);
|
|
12
|
-
getShaders():
|
|
13
|
-
vs: string;
|
|
14
|
-
fs: string;
|
|
15
|
-
modules: import("@deck.gl/core/typed")._ShaderModule<{
|
|
16
|
-
pickingSelectedColor?: [number, number, number] | null | undefined;
|
|
17
|
-
pickingHighlightColor?: [number, number, number, number] | undefined;
|
|
18
|
-
pickingActive?: boolean | undefined;
|
|
19
|
-
pickingAttribute?: boolean | undefined;
|
|
20
|
-
}>[];
|
|
21
|
-
};
|
|
12
|
+
getShaders(): any;
|
|
22
13
|
draw(args: {
|
|
23
14
|
moduleParameters?: unknown;
|
|
24
15
|
uniforms: Record<string, UniformValue>;
|
|
@@ -1,14 +1,14 @@
|
|
|
1
|
-
import { ScatterplotLayer } from "@deck.gl/layers
|
|
2
|
-
import GL from "@luma.gl/constants";
|
|
3
|
-
import { project32, picking } from "@deck.gl/core/typed";
|
|
1
|
+
import { ScatterplotLayer } from "@deck.gl/layers";
|
|
2
|
+
import { GL } from "@luma.gl/constants";
|
|
4
3
|
import vs from "./vertex.glsl";
|
|
5
|
-
import fs from "./fragment.glsl";
|
|
6
4
|
export class PrivatePointsLayer extends ScatterplotLayer {
|
|
7
5
|
constructor(props) {
|
|
8
6
|
super(props);
|
|
9
7
|
}
|
|
10
8
|
getShaders() {
|
|
11
|
-
|
|
9
|
+
const defaultShaders = super.getShaders();
|
|
10
|
+
// Inject custom vertex shader.
|
|
11
|
+
return Object.assign(Object.assign({}, defaultShaders), { vs });
|
|
12
12
|
}
|
|
13
13
|
draw(args) {
|
|
14
14
|
args.uniforms["ZIncreasingDownwards"] = this.props.ZIncreasingDownwards;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"privatePointsLayer.js","sourceRoot":"","sources":["../../../src/layers/points/privatePointsLayer.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,gBAAgB,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"privatePointsLayer.js","sourceRoot":"","sources":["../../../src/layers/points/privatePointsLayer.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAC;AAEnD,OAAO,EAAE,EAAE,EAAE,MAAM,oBAAoB,CAAC;AAKxC,OAAO,EAAE,MAAM,eAAe,CAAC;AAS/B,MAAM,OAAO,kBAAmB,SAAQ,gBAGvC;IACG,YAAY,KAA4B;QACpC,KAAK,CAAC,KAAK,CAAC,CAAC;IACjB,CAAC;IAED,UAAU;QACN,MAAM,cAAc,GAAG,KAAK,CAAC,UAAU,EAAE,CAAC;QAE1C,+BAA+B;QAC/B,uCAAY,cAAc,KAAE,EAAE,IAAG;IACrC,CAAC;IAED,IAAI,CAAC,IAIJ;QACG,IAAI,CAAC,QAAQ,CAAC,sBAAsB,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,oBAAoB,CAAC;QAExE,IAAI,gBAAgB,GAAG,KAAK,CAAC;QAC7B,IACI,OAAO,IAAI,CAAC,KAAK,CAAC,SAAS,KAAK,SAAS;YACzC,CAAC,IAAI,CAAC,KAAK,CAAC,SAAS,EACvB,CAAC;YACC,gBAAgB,GAAG,IAAI,CAAC;YACxB,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,OAAO,CAAC,EAAE,CAAC,UAAU,CAAC,CAAC;QAC3C,CAAC;QACD,KAAK,CAAC,IAAI,CAAC,EAAE,QAAQ,EAAE,IAAI,CAAC,QAAQ,EAAE,CAAC,CAAC;QACxC,IAAI,gBAAgB,EAAE,CAAC;YACnB,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,MAAM,CAAC,EAAE,CAAC,UAAU,CAAC,CAAC;QAC1C,CAAC;IACL,CAAC;CACJ;AAED,kBAAkB,CAAC,SAAS,GAAG,oBAAoB,CAAC"}
|
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
declare const _default: "#define SHADER_NAME points-layer-vertex-shader\n\
|
|
1
|
+
declare const _default: "#version 300 es\n#define SHADER_NAME points-layer-vertex-shader\n\nin vec3 positions;\n\nin vec3 instancePositions;\nin vec3 instancePositions64Low;\nin float instanceRadius;\nin float instanceLineWidths;\nin vec4 instanceFillColors;\nin vec4 instanceLineColors;\nin vec3 instancePickingColors;\n\nuniform float opacity;\nuniform float radiusScale;\nuniform float radiusMinPixels;\nuniform float radiusMaxPixels;\nuniform float lineWidthScale;\nuniform float lineWidthMinPixels;\nuniform float lineWidthMaxPixels;\nuniform float stroked;\nuniform bool filled;\nuniform bool antialiasing;\nuniform bool billboard;\nuniform int radiusUnits;\nuniform int lineWidthUnits;\nuniform bool ZIncreasingDownwards;\n\nout vec4 vFillColor;\nout vec4 vLineColor;\nout vec2 unitPosition;\nout float innerUnitRadius;\nout float outerRadiusPixels;\n\n\nvoid main(void) {\n vec3 position = instancePositions;\n vec3 position64low = instancePositions64Low;\n\n if(ZIncreasingDownwards) {\n position.z *= -1.0;\n position64low.z *= -1.0;\n }\n geometry.worldPosition = position;\n\n // Multiply out radius and clamp to limits\n outerRadiusPixels = clamp(\n project_size_to_pixel(radiusScale * instanceRadius, radiusUnits),\n radiusMinPixels, radiusMaxPixels\n );\n \n // Multiply out line width and clamp to limits\n float lineWidthPixels = clamp(\n project_size_to_pixel(lineWidthScale * instanceLineWidths, lineWidthUnits),\n lineWidthMinPixels, lineWidthMaxPixels\n );\n\n // outer radius needs to offset by half stroke width\n outerRadiusPixels += stroked * lineWidthPixels / 2.0;\n\n // Expand geometry to accomodate edge smoothing\n float edgePadding = antialiasing ? (outerRadiusPixels + SMOOTH_EDGE_RADIUS) / outerRadiusPixels : 1.0;\n\n // position on the containing square in [-1, 1] space\n unitPosition = edgePadding * positions.xy;\n geometry.uv = unitPosition;\n geometry.pickingColor = instancePickingColors;\n\n innerUnitRadius = 1.0 - stroked * lineWidthPixels / outerRadiusPixels;\n \n if (billboard) {\n gl_Position = project_position_to_clipspace(position, position64low, vec3(0.0), geometry.position);\n DECKGL_FILTER_GL_POSITION(gl_Position, geometry);\n vec3 offset = edgePadding * positions * outerRadiusPixels;\n DECKGL_FILTER_SIZE(offset, geometry);\n gl_Position.xy += project_pixel_size_to_clipspace(offset.xy);\n } else {\n vec3 offset = edgePadding * positions * project_pixel_size(outerRadiusPixels);\n DECKGL_FILTER_SIZE(offset, geometry);\n gl_Position = project_position_to_clipspace(position, position64low, offset, geometry.position);\n DECKGL_FILTER_GL_POSITION(gl_Position, geometry);\n }\n\n // Apply opacity to instance color, or return instance picking color\n vFillColor = vec4(instanceFillColors.rgb, instanceFillColors.a * opacity);\n DECKGL_FILTER_COLOR(vFillColor, geometry);\n vLineColor = vec4(instanceLineColors.rgb, instanceLineColors.a * opacity);\n DECKGL_FILTER_COLOR(vLineColor, geometry);\n}\n";
|
|
2
2
|
export default _default;
|
|
@@ -18,17 +18,18 @@
|
|
|
18
18
|
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
|
19
19
|
// THE SOFTWARE.
|
|
20
20
|
export default `\
|
|
21
|
+
#version 300 es
|
|
21
22
|
#define SHADER_NAME points-layer-vertex-shader
|
|
22
23
|
|
|
23
|
-
|
|
24
|
+
in vec3 positions;
|
|
24
25
|
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
26
|
+
in vec3 instancePositions;
|
|
27
|
+
in vec3 instancePositions64Low;
|
|
28
|
+
in float instanceRadius;
|
|
29
|
+
in float instanceLineWidths;
|
|
30
|
+
in vec4 instanceFillColors;
|
|
31
|
+
in vec4 instanceLineColors;
|
|
32
|
+
in vec3 instancePickingColors;
|
|
32
33
|
|
|
33
34
|
uniform float opacity;
|
|
34
35
|
uniform float radiusScale;
|
|
@@ -45,11 +46,11 @@ uniform int radiusUnits;
|
|
|
45
46
|
uniform int lineWidthUnits;
|
|
46
47
|
uniform bool ZIncreasingDownwards;
|
|
47
48
|
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
49
|
+
out vec4 vFillColor;
|
|
50
|
+
out vec4 vLineColor;
|
|
51
|
+
out vec2 unitPosition;
|
|
52
|
+
out float innerUnitRadius;
|
|
53
|
+
out float outerRadiusPixels;
|
|
53
54
|
|
|
54
55
|
|
|
55
56
|
void main(void) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"vertex.glsl.js","sourceRoot":"","sources":["../../../src/layers/points/vertex.glsl.ts"],"names":[],"mappings":"AAAA,oDAAoD;AACpD,EAAE;AACF,+EAA+E;AAC/E,gFAAgF;AAChF,+EAA+E;AAC/E,4EAA4E;AAC5E,wEAAwE;AACxE,2DAA2D;AAC3D,EAAE;AACF,6EAA6E;AAC7E,sDAAsD;AACtD,EAAE;AACF,6EAA6E;AAC7E,2EAA2E;AAC3E,8EAA8E;AAC9E,yEAAyE;AACzE,gFAAgF;AAChF,4EAA4E;AAC5E,gBAAgB;AAEhB,eAAe
|
|
1
|
+
{"version":3,"file":"vertex.glsl.js","sourceRoot":"","sources":["../../../src/layers/points/vertex.glsl.ts"],"names":[],"mappings":"AAAA,oDAAoD;AACpD,EAAE;AACF,+EAA+E;AAC/E,gFAAgF;AAChF,+EAA+E;AAC/E,4EAA4E;AAC5E,wEAAwE;AACxE,2DAA2D;AAC3D,EAAE;AACF,6EAA6E;AAC7E,sDAAsD;AACtD,EAAE;AACF,6EAA6E;AAC7E,2EAA2E;AAC3E,8EAA8E;AAC9E,yEAAyE;AACzE,gFAAgF;AAChF,4EAA4E;AAC5E,gBAAgB;AAEhB,eAAe;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CA0Fd,CAAC"}
|
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
/// <reference types="react" />
|
|
2
|
-
import type { PickingInfo, UpdateParameters } from "@deck.gl/core
|
|
3
|
-
import { CompositeLayer } from "@deck.gl/core
|
|
4
|
-
import type { ExtendedLayerProps, LayerPickInfo } from "../utils/layerTools";
|
|
2
|
+
import type { PickingInfo, UpdateParameters } from "@deck.gl/core";
|
|
3
|
+
import { CompositeLayer } from "@deck.gl/core";
|
|
5
4
|
import type { ReportBoundingBoxAction } from "../../components/Map";
|
|
5
|
+
import type { ExtendedLayerProps, LayerPickInfo } from "../utils/layerTools";
|
|
6
6
|
import { PrivatePolylinesLayer } from "./privatePolylinesLayer";
|
|
7
7
|
export interface PolylinesLayerProps extends ExtendedLayerProps {
|
|
8
8
|
/**
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { CompositeLayer } from "@deck.gl/core
|
|
1
|
+
import { CompositeLayer } from "@deck.gl/core";
|
|
2
2
|
import { isEqual } from "lodash";
|
|
3
3
|
import { createPropertyData, defineBoundingBox } from "../utils/layerTools";
|
|
4
4
|
import { PrivatePolylinesLayer } from "./privatePolylinesLayer";
|
|
@@ -16,6 +16,8 @@ const defaultProps = {
|
|
|
16
16
|
};
|
|
17
17
|
export default class PolylinesLayer extends CompositeLayer {
|
|
18
18
|
renderLayers() {
|
|
19
|
+
const data = this.state["dataAttributes"];
|
|
20
|
+
const _pathType = data.pathType;
|
|
19
21
|
const layer = new PrivatePolylinesLayer(this.getSubLayerProps({
|
|
20
22
|
id: "polylines-layer",
|
|
21
23
|
widthUnits: this.props.widthUnits,
|
|
@@ -23,8 +25,8 @@ export default class PolylinesLayer extends CompositeLayer {
|
|
|
23
25
|
billboard: true,
|
|
24
26
|
jointRounded: true,
|
|
25
27
|
capRounded: true,
|
|
26
|
-
data
|
|
27
|
-
_pathType
|
|
28
|
+
data,
|
|
29
|
+
_pathType,
|
|
28
30
|
getColor: () => this.props.color,
|
|
29
31
|
getWidth: () => this.props.linesWidth,
|
|
30
32
|
updateTriggers: {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"polylinesLayer.js","sourceRoot":"","sources":["../../../src/layers/polylines/polylinesLayer.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"polylinesLayer.js","sourceRoot":"","sources":["../../../src/layers/polylines/polylinesLayer.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
|
-
import {
|
|
2
|
-
import
|
|
1
|
+
import type { PathLayerProps } from "@deck.gl/layers";
|
|
2
|
+
import { PathLayer } from "@deck.gl/layers";
|
|
3
3
|
import type { NumericArray } from "@math.gl/types";
|
|
4
|
-
import type { LayerContext } from "@deck.gl/core
|
|
4
|
+
import type { LayerContext } from "@deck.gl/core";
|
|
5
5
|
type UniformValue = number | boolean | Readonly<NumericArray>;
|
|
6
6
|
export interface ExtendedPathLayerProps {
|
|
7
7
|
depthTest?: boolean;
|
|
@@ -12,12 +12,40 @@ export declare class PrivatePolylinesLayer extends PathLayer<unknown, ExtendedPa
|
|
|
12
12
|
getShaders(): {
|
|
13
13
|
vs: string;
|
|
14
14
|
fs: string;
|
|
15
|
-
modules: import("@
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
15
|
+
modules: (import("@luma.gl/shadertools").ShaderModule | {
|
|
16
|
+
defaultUniforms: {
|
|
17
|
+
useFloatColors: boolean;
|
|
18
|
+
isActive?: boolean | undefined;
|
|
19
|
+
isAttribute?: boolean | undefined;
|
|
20
|
+
isHighlightActive?: boolean | undefined;
|
|
21
|
+
highlightedObjectColor?: NumericArray | undefined;
|
|
22
|
+
highlightColor?: NumericArray | undefined;
|
|
23
|
+
};
|
|
24
|
+
inject: {
|
|
25
|
+
'vs:DECKGL_FILTER_GL_POSITION': string;
|
|
26
|
+
'vs:DECKGL_FILTER_COLOR': string;
|
|
27
|
+
'fs:DECKGL_FILTER_COLOR': {
|
|
28
|
+
order: number;
|
|
29
|
+
injection: string;
|
|
30
|
+
};
|
|
31
|
+
};
|
|
32
|
+
props?: Required<import("@luma.gl/shadertools").PickingProps> | undefined;
|
|
33
|
+
uniforms?: import("@luma.gl/shadertools/dist/modules/engine/picking/picking").PickingUniforms | undefined;
|
|
34
|
+
name: string;
|
|
35
|
+
fs?: string | undefined;
|
|
36
|
+
vs?: string | undefined;
|
|
37
|
+
uniformTypes?: Record<keyof import("@luma.gl/shadertools/dist/modules/engine/picking/picking").PickingUniforms, import("@luma.gl/shadertools/dist/types").UniformFormat> | undefined;
|
|
38
|
+
uniformPropTypes?: Record<keyof import("@luma.gl/shadertools/dist/modules/engine/picking/picking").PickingUniforms, import("@luma.gl/shadertools/dist/lib/shader-module/shader-module").UniformInfo> | undefined;
|
|
39
|
+
getUniforms?: ((props?: any, oldProps?: any) => Record<string, import("@luma.gl/shadertools/dist/lib/shader-module/shader-module").UniformValue>) | undefined;
|
|
40
|
+
bindings?: Record<never, {
|
|
41
|
+
location: number;
|
|
42
|
+
type: "uniforms" | "texture" | "sampler";
|
|
43
|
+
}> | undefined;
|
|
44
|
+
defines?: Record<string, string | number> | undefined;
|
|
45
|
+
dependencies?: import("@luma.gl/shadertools").ShaderModule<any, any, {}>[] | undefined;
|
|
46
|
+
deprecations?: import("@luma.gl/shadertools/dist/lib/shader-module/shader-module").ShaderModuleDeprecation[] | undefined;
|
|
47
|
+
normalized?: boolean | undefined;
|
|
48
|
+
})[];
|
|
21
49
|
};
|
|
22
50
|
draw(args: {
|
|
23
51
|
moduleParameters?: unknown;
|
|
@@ -1,8 +1,7 @@
|
|
|
1
|
-
import { PathLayer } from "@deck.gl/layers
|
|
2
|
-
import
|
|
3
|
-
import { project32, picking } from "@deck.gl/core/typed";
|
|
4
|
-
import vs from "./path-layer-vertex.glsl";
|
|
1
|
+
import { PathLayer } from "@deck.gl/layers";
|
|
2
|
+
import { picking, project32 } from "@deck.gl/core";
|
|
5
3
|
import fs from "./path-layer-fragment.glsl";
|
|
4
|
+
import vs from "./path-layer-vertex.glsl";
|
|
6
5
|
export class PrivatePolylinesLayer extends PathLayer {
|
|
7
6
|
constructor(props) {
|
|
8
7
|
super(props);
|
|
@@ -12,15 +11,16 @@ export class PrivatePolylinesLayer extends PathLayer {
|
|
|
12
11
|
}
|
|
13
12
|
draw(args) {
|
|
14
13
|
args.uniforms["ZIncreasingDownwards"] = this.props.ZIncreasingDownwards;
|
|
14
|
+
const { gl } = this.context;
|
|
15
15
|
let restoreDepthTest = false;
|
|
16
16
|
if (typeof this.props.depthTest === "boolean" &&
|
|
17
17
|
!this.props.depthTest) {
|
|
18
18
|
restoreDepthTest = true;
|
|
19
|
-
|
|
19
|
+
gl.disable(gl.DEPTH_TEST);
|
|
20
20
|
}
|
|
21
21
|
super.draw({ uniforms: args.uniforms });
|
|
22
22
|
if (restoreDepthTest) {
|
|
23
|
-
|
|
23
|
+
gl.enable(gl.DEPTH_TEST);
|
|
24
24
|
}
|
|
25
25
|
}
|
|
26
26
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"privatePolylinesLayer.js","sourceRoot":"","sources":["../../../src/layers/polylines/privatePolylinesLayer.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"privatePolylinesLayer.js","sourceRoot":"","sources":["../../../src/layers/polylines/privatePolylinesLayer.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAK5C,OAAO,EAAE,OAAO,EAAE,SAAS,EAAE,MAAM,eAAe,CAAC;AAEnD,OAAO,EAAE,MAAM,4BAA4B,CAAC;AAC5C,OAAO,EAAE,MAAM,0BAA0B,CAAC;AAS1C,MAAM,OAAO,qBAAsB,SAAQ,SAG1C;IACG,YAAY,KAAqB;QAC7B,KAAK,CAAC,KAAK,CAAC,CAAC;IACjB,CAAC;IAED,UAAU;QACN,OAAO,EAAE,EAAE,EAAE,EAAE,EAAE,OAAO,EAAE,CAAC,SAAS,EAAE,OAAO,CAAC,EAAE,CAAC;IACrD,CAAC;IAED,IAAI,CAAC,IAIJ;QACG,IAAI,CAAC,QAAQ,CAAC,sBAAsB,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,oBAAoB,CAAC;QAExE,MAAM,EAAE,EAAE,EAAE,GAAG,IAAI,CAAC,OAAO,CAAC;QAE5B,IAAI,gBAAgB,GAAG,KAAK,CAAC;QAC7B,IACI,OAAO,IAAI,CAAC,KAAK,CAAC,SAAS,KAAK,SAAS;YACzC,CAAC,IAAI,CAAC,KAAK,CAAC,SAAS,EACvB,CAAC;YACC,gBAAgB,GAAG,IAAI,CAAC;YACxB,EAAE,CAAC,OAAO,CAAC,EAAE,CAAC,UAAU,CAAC,CAAC;QAC9B,CAAC;QACD,KAAK,CAAC,IAAI,CAAC,EAAE,QAAQ,EAAE,IAAI,CAAC,QAAQ,EAAE,CAAC,CAAC;QACxC,IAAI,gBAAgB,EAAE,CAAC;YACnB,EAAE,CAAC,MAAM,CAAC,EAAE,CAAC,UAAU,CAAC,CAAC;QAC7B,CAAC;IACL,CAAC;CACJ;AAED,qBAAqB,CAAC,SAAS,GAAG,uBAAuB,CAAC"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import type { PickingInfo } from "@deck.gl/core";
|
|
2
|
+
import { GeoJsonLayer } from "@deck.gl/layers";
|
|
2
3
|
import type { Feature } from "geojson";
|
|
3
|
-
import type { PickingInfo } from "@deck.gl/core/typed";
|
|
4
4
|
export default class SelectableGeoJsonLayer extends GeoJsonLayer<Feature> {
|
|
5
5
|
onClick(info: PickingInfo): boolean;
|
|
6
6
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"selectableGeoJsonLayer.js","sourceRoot":"","sources":["../../../src/layers/selectable_geojson/selectableGeoJsonLayer.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"selectableGeoJsonLayer.js","sourceRoot":"","sources":["../../../src/layers/selectable_geojson/selectableGeoJsonLayer.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAG/C,OAAO,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AAEvD,MAAM,CAAC,OAAO,OAAO,sBAAuB,SAAQ,YAAqB;IACrE,OAAO,CAAC,IAAiB;QACrB,+CAA+C;QAC/C,IAAI,gBAAgB,CAAC,IAAI,CAAC,OAAO,CAAC,YAAY,CAAC,EAAE,CAAC;YAC9C,OAAO,KAAK,CAAC;QACjB,CAAC;aAAM,CAAC;YACH,IAAI,CAAC,OAA8B,CAAC,QAAQ,CAAC,aAAa,CAAC;gBACxD,sBAAsB,EAAE,IAAI,CAAC,MAAM;aACtC,CAAC,CAAC;YACH,OAAO,IAAI,CAAC;QAChB,CAAC;IACL,CAAC;CACJ;AAED,sBAAsB,CAAC,SAAS,GAAG,wBAAwB,CAAC;AAC5D,sBAAsB,CAAC,YAAY,GAAG;IAClC,OAAO,EAAE,IAAI;IACb,QAAQ,EAAE,IAAI;CACjB,CAAC"}
|
|
@@ -1,5 +1,23 @@
|
|
|
1
1
|
export declare const localPhongLighting: {
|
|
2
2
|
name: string;
|
|
3
3
|
fs: string;
|
|
4
|
-
dependencies:
|
|
4
|
+
dependencies: {
|
|
5
|
+
name: string;
|
|
6
|
+
dependencies: {
|
|
7
|
+
name: string;
|
|
8
|
+
vs: string;
|
|
9
|
+
fs: string;
|
|
10
|
+
getUniforms: (opts?: import("@luma.gl/shadertools/dist/modules-webgl1/lighting/lights/lights").LightsOptions | undefined) => Record<string, any>;
|
|
11
|
+
defines: {
|
|
12
|
+
MAX_LIGHTS: number;
|
|
13
|
+
};
|
|
14
|
+
}[];
|
|
15
|
+
fs: string;
|
|
16
|
+
defines: {
|
|
17
|
+
LIGHTING_FRAGMENT: number;
|
|
18
|
+
};
|
|
19
|
+
getUniforms: (opts?: {
|
|
20
|
+
material?: import("@luma.gl/shadertools/dist/modules-webgl1/lighting/phong-lighting/phong-lighting").PhongLightingProps | undefined;
|
|
21
|
+
} | undefined) => Record<string, any>;
|
|
22
|
+
}[];
|
|
5
23
|
};
|
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
declare const fsShader = "#version 300 es\n#define SHADER_NAME terrainmap-shader\n\nprecision highp float;\n\nuniform bool isContoursDepth;\nuniform float contourReferencePoint;\nuniform float contourInterval;\n\nin vec2 vTexCoord;\nin vec3 cameraPosition;\nin vec3 normals_commonspace;\nin vec4 position_commonspace;\nin vec3 worldPos;\nin float property;\n\nuniform
|
|
1
|
+
declare const fsShader = "#version 300 es\n#define SHADER_NAME terrainmap-shader\n\nprecision highp float;\n\nuniform bool isContoursDepth;\nuniform float contourReferencePoint;\nuniform float contourInterval;\n\nin vec2 vTexCoord;\nin vec3 cameraPosition;\nin vec3 normals_commonspace;\nin vec4 position_commonspace;\nin vec3 worldPos;\nin float property;\n\nuniform vec4 uColor;\nuniform bool smoothShading;\n\nout vec4 fragColor;\n\nvoid main(void) {\n vec3 normal = normals_commonspace;\n\n if (!smoothShading) {\n normal = normalize(cross(dFdx(position_commonspace.xyz), dFdy(position_commonspace.xyz)));\n } \n\n vec4 color = uColor;\n bool is_contours = contourReferencePoint != -1.0 && contourInterval != -1.0;\n if (is_contours) {\n // Contours are made of either depths or properties.\n float val = (abs(worldPos.z) - contourReferencePoint) / contourInterval;\n\n float f = fract(val);\n float df = fwidth(val);\n\n // keep: float c = smoothstep(df * 1.0, df * 2.0, f); // smootstep from/to no of pixels distance fronm contour line.\n float c = smoothstep(0.0, df * 2.0, f);\n\n color = color * vec4(c, c, c, 1.0);\n }\n\n // Use two sided phong lighting. This has no effect if \"material\" property is not set.\n vec3 lightColor = getPhongLightColor(color.rgb, cameraPosition, position_commonspace.xyz, normal);\n fragColor = vec4(lightColor, 1.0);\n DECKGL_FILTER_COLOR(fragColor, geometry);\n}\n";
|
|
2
2
|
export default fsShader;
|
|
@@ -14,10 +14,11 @@ in vec4 position_commonspace;
|
|
|
14
14
|
in vec3 worldPos;
|
|
15
15
|
in float property;
|
|
16
16
|
|
|
17
|
-
uniform sampler2D colormap;
|
|
18
17
|
uniform vec4 uColor;
|
|
19
18
|
uniform bool smoothShading;
|
|
20
19
|
|
|
20
|
+
out vec4 fragColor;
|
|
21
|
+
|
|
21
22
|
void main(void) {
|
|
22
23
|
vec3 normal = normals_commonspace;
|
|
23
24
|
|
|
@@ -42,8 +43,8 @@ void main(void) {
|
|
|
42
43
|
|
|
43
44
|
// Use two sided phong lighting. This has no effect if "material" property is not set.
|
|
44
45
|
vec3 lightColor = getPhongLightColor(color.rgb, cameraPosition, position_commonspace.xyz, normal);
|
|
45
|
-
|
|
46
|
-
DECKGL_FILTER_COLOR(
|
|
46
|
+
fragColor = vec4(lightColor, 1.0);
|
|
47
|
+
DECKGL_FILTER_COLOR(fragColor, geometry);
|
|
47
48
|
}
|
|
48
49
|
`;
|
|
49
50
|
export default fsShader;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"fragment.fs.glsl.js","sourceRoot":"","sources":["../../../src/layers/triangle/fragment.fs.glsl.ts"],"names":[],"mappings":"AAAA,MAAM,QAAQ,GAAG
|
|
1
|
+
{"version":3,"file":"fragment.fs.glsl.js","sourceRoot":"","sources":["../../../src/layers/triangle/fragment.fs.glsl.ts"],"names":[],"mappings":"AAAA,MAAM,QAAQ,GAAG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAgDhB,CAAC;AAEF,eAAe,QAAQ,CAAC"}
|
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
declare const fragmentShader = "#version 300 es\n#define SHADER_NAME graph-layer-fragment-shader\n\nprecision highp float;\n\nout vec4 fragColor;\n\nvoid main(void) {\n
|
|
1
|
+
declare const fragmentShader = "#version 300 es\n#define SHADER_NAME graph-layer-fragment-shader\n\nprecision highp float;\n\nout vec4 fragColor;\n\nvoid main(void) {\n\n // Picking pass.\n if (picking.isActive > 0.5) {\n discard;\n return;\n }\n\n fragColor = vec4(0.0, 0.0, 0.0, 1.0);\n}\n";
|
|
2
2
|
export default fragmentShader;
|
|
@@ -1,10 +1,11 @@
|
|
|
1
|
-
import type { PickingInfo, UpdateParameters
|
|
2
|
-
import { Layer } from "@deck.gl/core
|
|
3
|
-
import type {
|
|
1
|
+
import type { LayerContext, PickingInfo, UpdateParameters } from "@deck.gl/core";
|
|
2
|
+
import { Layer } from "@deck.gl/core";
|
|
3
|
+
import type { GeometryProps } from "@luma.gl/engine";
|
|
4
|
+
import type { Device, UniformValue } from "@luma.gl/core";
|
|
4
5
|
import type { DeckGLLayerContext } from "../../components/Map";
|
|
5
|
-
import type { ExtendedLayerProps } from "../utils/layerTools";
|
|
6
|
+
import type { ExtendedLayerProps, LayerPickInfo } from "../utils/layerTools";
|
|
6
7
|
export type GeometryTriangles = {
|
|
7
|
-
|
|
8
|
+
topology: GeometryProps["topology"];
|
|
8
9
|
attributes: {
|
|
9
10
|
positions: {
|
|
10
11
|
value: Float32Array;
|
|
@@ -30,7 +31,7 @@ export type GeometryTriangles = {
|
|
|
30
31
|
};
|
|
31
32
|
};
|
|
32
33
|
export type GeometryLines = {
|
|
33
|
-
|
|
34
|
+
topology: GeometryProps["topology"];
|
|
34
35
|
attributes: {
|
|
35
36
|
positions: {
|
|
36
37
|
value: Float32Array;
|
|
@@ -60,10 +61,10 @@ export default class PrivateTriangleLayer extends Layer<PrivateTriangleLayerProp
|
|
|
60
61
|
initializeState(context: DeckGLLayerContext): void;
|
|
61
62
|
shouldUpdateState({ props, oldProps, context, changeFlags, }: UpdateParameters<this>): boolean;
|
|
62
63
|
updateState({ context }: UpdateParameters<this>): void;
|
|
63
|
-
_getModels(gl:
|
|
64
|
+
_getModels(gl: Device): [unknown, unknown];
|
|
64
65
|
draw(args: {
|
|
65
66
|
moduleParameters?: unknown;
|
|
66
|
-
uniforms:
|
|
67
|
+
uniforms: UniformValue;
|
|
67
68
|
context: LayerContext;
|
|
68
69
|
}): void;
|
|
69
70
|
decodePickingColor(): number;
|
|
@@ -1,12 +1,12 @@
|
|
|
1
|
-
import { COORDINATE_SYSTEM, Layer, picking, project
|
|
1
|
+
import { COORDINATE_SYSTEM, Layer, picking, project } from "@deck.gl/core";
|
|
2
|
+
import { GL } from "@luma.gl/constants";
|
|
3
|
+
import { Geometry, Model } from "@luma.gl/engine";
|
|
4
|
+
import { localPhongLighting } from "../shader_modules";
|
|
2
5
|
import { createPropertyData } from "../utils/layerTools";
|
|
3
|
-
import { Model, Geometry } from "@luma.gl/engine";
|
|
4
|
-
import vsShader from "./vertex.glsl";
|
|
5
6
|
import fsShader from "./fragment.fs.glsl";
|
|
6
|
-
import vsLineShader from "./vertex_lines.glsl";
|
|
7
7
|
import fsLineShader from "./fragment_lines.glsl";
|
|
8
|
-
import
|
|
9
|
-
import
|
|
8
|
+
import vsShader from "./vertex.glsl";
|
|
9
|
+
import vsLineShader from "./vertex_lines.glsl";
|
|
10
10
|
const defaultProps = {
|
|
11
11
|
data: ["dummy"],
|
|
12
12
|
contours: [-1, -1],
|
|
@@ -24,9 +24,9 @@ export default class PrivateTriangleLayer extends Layer {
|
|
|
24
24
|
return (_a = this.state["isLoaded"]) !== null && _a !== void 0 ? _a : false;
|
|
25
25
|
}
|
|
26
26
|
initializeState(context) {
|
|
27
|
-
const
|
|
28
|
-
const [triangleModel,
|
|
29
|
-
this.setState({ models: [triangleModel,
|
|
27
|
+
const gl = context.device;
|
|
28
|
+
const [triangleModel, lineModel] = this._getModels(gl);
|
|
29
|
+
this.setState({ models: [triangleModel, lineModel], isLoaded: false });
|
|
30
30
|
}
|
|
31
31
|
shouldUpdateState({ props, oldProps, context, changeFlags, }) {
|
|
32
32
|
return (super.shouldUpdateState({
|
|
@@ -77,17 +77,22 @@ export default class PrivateTriangleLayer extends Layer {
|
|
|
77
77
|
}
|
|
78
78
|
gl.enable(GL.POLYGON_OFFSET_FILL);
|
|
79
79
|
gl.polygonOffset(1, 1);
|
|
80
|
-
triangleModel
|
|
81
|
-
|
|
80
|
+
triangleModel.setUniforms({
|
|
81
|
+
uniforms,
|
|
82
|
+
contourReferencePoint,
|
|
82
83
|
contourInterval,
|
|
83
84
|
smoothShading,
|
|
84
|
-
uColor,
|
|
85
|
-
.
|
|
85
|
+
uColor,
|
|
86
|
+
ZIncreasingDownwards: this.props.ZIncreasingDownwards,
|
|
87
|
+
});
|
|
88
|
+
triangleModel.draw(context.renderPass);
|
|
86
89
|
gl.disable(GL.POLYGON_OFFSET_FILL);
|
|
87
90
|
if (this.props.gridLines) {
|
|
88
|
-
lineModel
|
|
89
|
-
|
|
90
|
-
.
|
|
91
|
+
lineModel.setUniforms({
|
|
92
|
+
uniforms,
|
|
93
|
+
ZIncreasingDownwards: this.props.ZIncreasingDownwards,
|
|
94
|
+
});
|
|
95
|
+
lineModel.draw(context.renderPass);
|
|
91
96
|
}
|
|
92
97
|
if (!this.props.depthTest) {
|
|
93
98
|
gl.enable(GL.DEPTH_TEST);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"privateTriangleLayer.js","sourceRoot":"","sources":["../../../src/layers/triangle/privateTriangleLayer.ts"],"names":[],"mappings":"AAKA,OAAO,
|
|
1
|
+
{"version":3,"file":"privateTriangleLayer.js","sourceRoot":"","sources":["../../../src/layers/triangle/privateTriangleLayer.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,10 +1,10 @@
|
|
|
1
1
|
import type React from "react";
|
|
2
|
-
import type { UpdateParameters } from "@deck.gl/core
|
|
3
|
-
import { CompositeLayer } from "@deck.gl/core
|
|
2
|
+
import type { UpdateParameters } from "@deck.gl/core";
|
|
3
|
+
import { CompositeLayer } from "@deck.gl/core";
|
|
4
|
+
import type { ReportBoundingBoxAction } from "../../components/Map";
|
|
5
|
+
import type { ExtendedLayerProps } from "../utils/layerTools";
|
|
4
6
|
import type { Material } from "./privateTriangleLayer";
|
|
5
7
|
import PrivateTriangleLayer from "./privateTriangleLayer";
|
|
6
|
-
import type { ExtendedLayerProps } from "../utils/layerTools";
|
|
7
|
-
import type { ReportBoundingBoxAction } from "../../components/Map";
|
|
8
8
|
export type Params = {
|
|
9
9
|
vertexArray: Float32Array;
|
|
10
10
|
indexArray: Uint32Array;
|
|
@@ -8,7 +8,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
8
8
|
});
|
|
9
9
|
};
|
|
10
10
|
import { isEqual } from "lodash";
|
|
11
|
-
import { CompositeLayer } from "@deck.gl/core
|
|
11
|
+
import { CompositeLayer } from "@deck.gl/core";
|
|
12
12
|
import workerpool from "workerpool";
|
|
13
13
|
import PrivateTriangleLayer from "./privateTriangleLayer";
|
|
14
14
|
import { makeFullMesh } from "./webworker";
|
|
@@ -93,12 +93,14 @@ const defaultProps = {
|
|
|
93
93
|
};
|
|
94
94
|
export default class TriangleLayer extends CompositeLayer {
|
|
95
95
|
get isLoaded() {
|
|
96
|
-
var _a
|
|
96
|
+
var _a;
|
|
97
97
|
const subLayers = this.getSubLayers();
|
|
98
98
|
const isLoaded = super.isLoaded &&
|
|
99
99
|
subLayers.length > 0 &&
|
|
100
100
|
subLayers.every((layer) => layer.isLoaded);
|
|
101
|
-
const
|
|
101
|
+
const isFinishedLoading = (_a = this.state) === null || _a === void 0 ? void 0 : _a["isFinishedLoading"];
|
|
102
|
+
const isFinished = isFinishedLoading !== null && isFinishedLoading !== void 0 ? isFinishedLoading : false;
|
|
103
|
+
//const isFinished = this.state?.["isFinishedLoading"] ?? false;
|
|
102
104
|
return isLoaded && isFinished;
|
|
103
105
|
}
|
|
104
106
|
rebuildData(reportBoundingBox) {
|