@webviz/subsurface-viewer 1.18.1 → 1.18.3
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/DashSubsurfaceViewer.js +2 -13
- package/dist/DashSubsurfaceViewer.js.map +1 -1
- package/dist/SubsurfaceViewer.js +10 -16
- package/dist/SubsurfaceViewer.js.map +1 -1
- package/dist/components/ColorLegend.js +3 -4
- package/dist/components/ColorLegend.js.map +1 -1
- package/dist/components/ColorLegends.js +6 -1
- package/dist/components/ColorLegends.js.map +1 -1
- package/dist/components/DistanceScale.js +5 -2
- package/dist/components/DistanceScale.js.map +1 -1
- package/dist/components/InfoCard.js +9 -13
- package/dist/components/InfoCard.js.map +1 -1
- package/dist/components/Map.js +182 -151
- package/dist/components/Map.js.map +1 -1
- package/dist/components/settings/DrawModeSelector.js +2 -2
- package/dist/components/settings/DrawModeSelector.js.map +1 -1
- package/dist/components/settings/NumericInput.js +1 -5
- package/dist/components/settings/NumericInput.js.map +1 -1
- package/dist/components/settings/Settings.js +1 -1
- package/dist/components/settings/Settings.js.map +1 -1
- package/dist/extensions/side-projection-extension.js +2 -2
- package/dist/extensions/side-projection-extension.js.map +1 -1
- package/dist/hooks/useMultiViewCursorTracking/useMultiViewCursorTracking.js +11 -6
- package/dist/hooks/useMultiViewCursorTracking/useMultiViewCursorTracking.js.map +1 -1
- package/dist/hooks/useMultiViewPicking/MultiViewPickingInfoAssembler.js +83 -97
- package/dist/hooks/useMultiViewPicking/MultiViewPickingInfoAssembler.js.map +1 -1
- package/dist/hooks/useMultiViewPicking/useMultiViewPicking.js +4 -1
- package/dist/hooks/useMultiViewPicking/useMultiViewPicking.js.map +1 -1
- package/dist/layers/BoxSelectionLayer/boxSelectionLayer.js +2 -3
- package/dist/layers/BoxSelectionLayer/boxSelectionLayer.js.map +1 -1
- package/dist/layers/axes/axesLayer.js +11 -4
- package/dist/layers/axes/axesLayer.js.map +1 -1
- package/dist/layers/axes/boxLayer.js +17 -10
- package/dist/layers/axes/boxLayer.js.map +1 -1
- package/dist/layers/axes2d/axes2DLayer.js +56 -32
- package/dist/layers/axes2d/axes2DLayer.js.map +1 -1
- package/dist/layers/colormap/colormapLayer.js +33 -34
- package/dist/layers/colormap/colormapLayer.js.map +1 -1
- package/dist/layers/crosshair/crosshairLayer.js +2 -2
- package/dist/layers/crosshair/crosshairLayer.js.map +1 -1
- package/dist/layers/drawing/drawingLayer.js +6 -4
- package/dist/layers/drawing/drawingLayer.js.map +1 -1
- package/dist/layers/fault_polygons/faultPolygonsLayer.js +5 -6
- package/dist/layers/fault_polygons/faultPolygonsLayer.js.map +1 -1
- package/dist/layers/gpglLayers/gpglValueMappedSurfaceLayer.js +195 -169
- package/dist/layers/gpglLayers/gpglValueMappedSurfaceLayer.js.map +1 -1
- package/dist/layers/grid3d/grid3dLayer.js +46 -53
- package/dist/layers/grid3d/grid3dLayer.js.map +1 -1
- package/dist/layers/grid3d/privateGrid3dLayer.js +73 -48
- package/dist/layers/grid3d/privateGrid3dLayer.js.map +1 -1
- package/dist/layers/grid3d/webworker.js +17 -6
- package/dist/layers/grid3d/webworker.js.map +1 -1
- package/dist/layers/hillshading2d/hillshading2dLayer.js +15 -9
- package/dist/layers/hillshading2d/hillshading2dLayer.js.map +1 -1
- package/dist/layers/map/mapLayer.js +49 -50
- package/dist/layers/map/mapLayer.js.map +1 -1
- package/dist/layers/map/privateMapLayer.js +52 -28
- package/dist/layers/map/privateMapLayer.js.map +1 -1
- package/dist/layers/map/webworker.js +1 -1
- package/dist/layers/map/webworker.js.map +1 -1
- package/dist/layers/northarrow/northArrow3DLayer.js +17 -10
- package/dist/layers/northarrow/northArrow3DLayer.js.map +1 -1
- package/dist/layers/piechart/pieChartLayer.js +26 -21
- package/dist/layers/piechart/pieChartLayer.js.map +1 -1
- package/dist/layers/points/pointsLayer.js +5 -3
- package/dist/layers/points/pointsLayer.js.map +1 -1
- package/dist/layers/points/privatePointsLayer.js +1 -2
- package/dist/layers/points/privatePointsLayer.js.map +1 -1
- package/dist/layers/polyline_group/polylineGroupLayer.js +84 -58
- package/dist/layers/polyline_group/polylineGroupLayer.js.map +1 -1
- package/dist/layers/polylines/polylinesLayer.js +5 -3
- package/dist/layers/polylines/polylinesLayer.js.map +1 -1
- package/dist/layers/polylines/privatePolylinesLayer.js +1 -2
- package/dist/layers/polylines/privatePolylinesLayer.js.map +1 -1
- package/dist/layers/seismic/seismicLayer.js +28 -23
- package/dist/layers/seismic/seismicLayer.js.map +1 -1
- package/dist/layers/shader_modules/phong-lighting/phong-material.js +2 -2
- package/dist/layers/shader_modules/phong-lighting/phong-material.js.map +1 -1
- package/dist/layers/shader_modules/test-precision/precisionForTests-shaders-glsl.js +4 -3
- package/dist/layers/shader_modules/test-precision/precisionForTests-shaders-glsl.js.map +1 -1
- package/dist/layers/triangle/privateTriangleLayer.js +66 -40
- package/dist/layers/triangle/privateTriangleLayer.js.map +1 -1
- package/dist/layers/triangle/triangleLayer.js +66 -66
- package/dist/layers/triangle/triangleLayer.js.map +1 -1
- package/dist/layers/utils/colormapTools.js +16 -3
- package/dist/layers/utils/colormapTools.js.map +1 -1
- package/dist/layers/utils/layerTools.js +5 -7
- package/dist/layers/utils/layerTools.js.map +1 -1
- package/dist/layers/well_markers/wellMarkersLayer.js +41 -16
- package/dist/layers/well_markers/wellMarkersLayer.js.map +1 -1
- package/dist/layers/wells/layers/dashedSectionsPathLayer.js +60 -31
- package/dist/layers/wells/layers/dashedSectionsPathLayer.js.map +1 -1
- package/dist/layers/wells/layers/flatWellMarkersLayer.js +79 -33
- package/dist/layers/wells/layers/flatWellMarkersLayer.js.map +1 -1
- package/dist/layers/wells/layers/logCurveLayer.js +80 -69
- package/dist/layers/wells/layers/logCurveLayer.js.map +1 -1
- package/dist/layers/wells/layers/mergedTextLayer.js +18 -12
- package/dist/layers/wells/layers/mergedTextLayer.js.map +1 -1
- package/dist/layers/wells/layers/wellLabelLayer.js +20 -13
- package/dist/layers/wells/layers/wellLabelLayer.js.map +1 -1
- package/dist/layers/wells/utils/abscissaTransform.js +10 -4
- package/dist/layers/wells/utils/abscissaTransform.js.map +1 -1
- package/dist/layers/wells/utils/features.js +2 -4
- package/dist/layers/wells/utils/features.js.map +1 -1
- package/dist/layers/wells/utils/log.js +11 -11
- package/dist/layers/wells/utils/log.js.map +1 -1
- package/dist/layers/wells/utils/readout.js +2 -4
- package/dist/layers/wells/utils/readout.js.map +1 -1
- package/dist/layers/wells/utils/spline.js +19 -25
- package/dist/layers/wells/utils/spline.js.map +1 -1
- package/dist/layers/wells/utils/trajectory.js +28 -22
- package/dist/layers/wells/utils/trajectory.js.map +1 -1
- package/dist/layers/wells/utils/wells.js +3 -4
- package/dist/layers/wells/utils/wells.js.map +1 -1
- package/dist/layers/wells/wellsLayer.js +232 -138
- package/dist/layers/wells/wellsLayer.js.map +1 -1
- package/dist/utils/BoundingBox2D.js +2 -2
- package/dist/utils/BoundingBox2D.js.map +1 -1
- package/dist/utils/BoundingBox3D.js +2 -2
- package/dist/utils/BoundingBox3D.js.map +1 -1
- package/dist/utils/Color.js +2 -3
- package/dist/utils/Color.js.map +1 -1
- package/dist/utils/camera.js +3 -5
- package/dist/utils/camera.js.map +1 -1
- package/dist/utils/configuration.d.ts +5 -5
- package/dist/utils/configuration.js +7 -2
- package/dist/utils/configuration.js.map +1 -1
- package/dist/utils/event.js +7 -7
- package/dist/utils/event.js.map +1 -1
- package/dist/utils/serialize.js +52 -68
- package/dist/utils/serialize.js.map +1 -1
- package/dist/utils/specExtractor.js +1 -1
- package/dist/utils/specExtractor.js.map +1 -1
- package/dist/views/sectionView.js +1 -1
- package/dist/views/sectionView.js.map +1 -1
- package/dist/views/viewport.d.ts +1 -0
- package/dist/views/viewport.js +10 -4
- package/dist/views/viewport.js.map +1 -1
- package/package.json +12 -16
|
@@ -1,12 +1,3 @@
|
|
|
1
|
-
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
2
|
-
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
3
|
-
return new (P || (P = Promise))(function (resolve, reject) {
|
|
4
|
-
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
|
5
|
-
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
|
6
|
-
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
|
7
|
-
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
8
|
-
});
|
|
9
|
-
};
|
|
10
1
|
import { isEqual } from "lodash";
|
|
11
2
|
import { CompositeLayer } from "@deck.gl/core";
|
|
12
3
|
import workerpool from "workerpool";
|
|
@@ -16,10 +7,13 @@ import config from "../../SubsurfaceConfig.json";
|
|
|
16
7
|
import { findConfig, loadDataArray } from "../../utils";
|
|
17
8
|
// init workerpool
|
|
18
9
|
const workerPoolConfig = findConfig(config, "config/workerpool", "config/layer/Grid3DLayer/workerpool");
|
|
19
|
-
const pool = workerpool.pool(
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
10
|
+
const pool = workerpool.pool({
|
|
11
|
+
...{
|
|
12
|
+
maxWorkers: 10,
|
|
13
|
+
workerType: "web",
|
|
14
|
+
},
|
|
15
|
+
...workerPoolConfig,
|
|
16
|
+
});
|
|
23
17
|
function onTerminateWorker() {
|
|
24
18
|
const stats = pool.stats();
|
|
25
19
|
if (stats.busyWorkers === 0 && stats.pendingTasks === 0) {
|
|
@@ -43,36 +37,30 @@ function GetBBox(points) {
|
|
|
43
37
|
}
|
|
44
38
|
return [xmin, ymin, zmin, xmax, ymax, zmax];
|
|
45
39
|
}
|
|
46
|
-
function loadData(data, type) {
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
return Promise.reject("Grid3DLayer: Unsupported type of input data");
|
|
53
|
-
});
|
|
40
|
+
async function loadData(data, type) {
|
|
41
|
+
const result = await loadDataArray(data, type);
|
|
42
|
+
if (result !== null) {
|
|
43
|
+
return result;
|
|
44
|
+
}
|
|
45
|
+
return Promise.reject("Grid3DLayer: Unsupported type of input data");
|
|
54
46
|
}
|
|
55
|
-
function loadPropertiesData(propertiesData) {
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
return Promise.reject("Grid3DLayer: Unsupported type of input data");
|
|
65
|
-
});
|
|
47
|
+
async function loadPropertiesData(propertiesData) {
|
|
48
|
+
const isPropertiesDiscrete = propertiesData instanceof Uint16Array;
|
|
49
|
+
const result = isPropertiesDiscrete
|
|
50
|
+
? await loadDataArray(propertiesData, Uint16Array)
|
|
51
|
+
: await loadDataArray(propertiesData, Float32Array);
|
|
52
|
+
if (result !== null) {
|
|
53
|
+
return result;
|
|
54
|
+
}
|
|
55
|
+
return Promise.reject("Grid3DLayer: Unsupported type of input data");
|
|
66
56
|
}
|
|
67
|
-
function load_data(pointsData, polysData, propertiesData, loadProperties) {
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
return Promise.all([points, polys, properties]);
|
|
75
|
-
});
|
|
57
|
+
async function load_data(pointsData, polysData, propertiesData, loadProperties) {
|
|
58
|
+
const points = await loadData(pointsData, Float32Array);
|
|
59
|
+
const polys = await loadData(polysData, Uint32Array);
|
|
60
|
+
const properties = loadProperties && propertiesData
|
|
61
|
+
? await loadPropertiesData(propertiesData)
|
|
62
|
+
: undefined;
|
|
63
|
+
return Promise.all([points, polys, properties]);
|
|
76
64
|
}
|
|
77
65
|
/**
|
|
78
66
|
* Enumerates possible coloring modes of Grid3D Layer.
|
|
@@ -125,17 +113,15 @@ const defaultProps = {
|
|
|
125
113
|
};
|
|
126
114
|
export default class Grid3DLayer extends CompositeLayer {
|
|
127
115
|
get isLoaded() {
|
|
128
|
-
var _a, _b;
|
|
129
116
|
const subLayers = this.getSubLayers();
|
|
130
117
|
const isLoaded = super.isLoaded &&
|
|
131
118
|
subLayers.length > 0 &&
|
|
132
119
|
subLayers.every((layer) => layer.isLoaded);
|
|
133
|
-
const isFinished =
|
|
120
|
+
const isFinished = this.state?.["isFinishedLoading"] ?? false;
|
|
134
121
|
return isLoaded && isFinished;
|
|
135
122
|
}
|
|
136
123
|
rebuildData(reportBoundingBox) {
|
|
137
|
-
|
|
138
|
-
const p = load_data(this.props.pointsData, this.props.polysData, this.props.propertiesData, !isGeometricProperty((_a = this.props.coloringMode) !== null && _a !== void 0 ? _a : TGrid3DColoringMode.Property));
|
|
124
|
+
const p = load_data(this.props.pointsData, this.props.polysData, this.props.propertiesData, !isGeometricProperty(this.props.coloringMode ?? TGrid3DColoringMode.Property));
|
|
139
125
|
p.then(([points, polys, properties]) => {
|
|
140
126
|
const bbox = GetBBox(points);
|
|
141
127
|
// Using inline web worker for calculating the triangle mesh from
|
|
@@ -147,11 +133,10 @@ export default class Grid3DLayer extends CompositeLayer {
|
|
|
147
133
|
undefinedValue: this.getUndefinedPropertyValue(),
|
|
148
134
|
};
|
|
149
135
|
pool.exec(makeFullMesh, [{ data: webworkerParams }]).then((e) => {
|
|
150
|
-
var _a;
|
|
151
136
|
const [mesh, mesh_lines, propertyValueRange] = e;
|
|
152
137
|
const legend = {
|
|
153
138
|
discrete: false,
|
|
154
|
-
valueRange:
|
|
139
|
+
valueRange: this.props.colorMapRange ?? propertyValueRange,
|
|
155
140
|
colorName: this.props.colorMapName,
|
|
156
141
|
title: "MapLayer",
|
|
157
142
|
colormapFunction: this.props.colorMapFunction,
|
|
@@ -167,13 +152,19 @@ export default class Grid3DLayer extends CompositeLayer {
|
|
|
167
152
|
reportBoundingBox) {
|
|
168
153
|
this.props.reportBoundingBox({ layerBoundingBox: bbox });
|
|
169
154
|
}
|
|
170
|
-
this.setState(
|
|
155
|
+
this.setState({
|
|
156
|
+
...this.state,
|
|
157
|
+
isFinishedLoading: true,
|
|
158
|
+
});
|
|
171
159
|
onTerminateWorker();
|
|
172
160
|
});
|
|
173
161
|
});
|
|
174
162
|
}
|
|
175
163
|
initializeState() {
|
|
176
|
-
this.setState(
|
|
164
|
+
this.setState({
|
|
165
|
+
...this.state,
|
|
166
|
+
isFinishedLoading: false,
|
|
167
|
+
});
|
|
177
168
|
const reportBoundingBox = true;
|
|
178
169
|
this.rebuildData(reportBoundingBox);
|
|
179
170
|
}
|
|
@@ -184,7 +175,10 @@ export default class Grid3DLayer extends CompositeLayer {
|
|
|
184
175
|
!isEqual(props.gridLines, oldProps.gridLines) ||
|
|
185
176
|
!isEqual(props.ZIncreasingDownwards, oldProps.ZIncreasingDownwards);
|
|
186
177
|
if (needs_reload) {
|
|
187
|
-
this.setState(
|
|
178
|
+
this.setState({
|
|
179
|
+
...this.state,
|
|
180
|
+
isFinishedLoading: false,
|
|
181
|
+
});
|
|
188
182
|
const reportBoundingBox = false;
|
|
189
183
|
this.rebuildData(reportBoundingBox);
|
|
190
184
|
}
|
|
@@ -245,13 +239,12 @@ export default class Grid3DLayer extends CompositeLayer {
|
|
|
245
239
|
return Number.NaN;
|
|
246
240
|
}
|
|
247
241
|
getUndefinedPropertyColor() {
|
|
248
|
-
var _a, _b;
|
|
249
242
|
const colorFunc = this.props.colorMapFunction;
|
|
250
|
-
if (
|
|
243
|
+
if (this.props.propertiesData?.length === 0 &&
|
|
251
244
|
this.isColormapFunctionConstantColor(colorFunc)) {
|
|
252
245
|
return [colorFunc[0], colorFunc[1], colorFunc[2]];
|
|
253
246
|
}
|
|
254
|
-
return
|
|
247
|
+
return this.props.undefinedPropertyColor ?? [204, 204, 204];
|
|
255
248
|
}
|
|
256
249
|
isColormapFunctionConstantColor(colorFunc) {
|
|
257
250
|
return ((Array.isArray(colorFunc) || colorFunc instanceof Uint8Array) &&
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"grid3dLayer.js","sourceRoot":"","sources":["../../../src/layers/grid3d/grid3dLayer.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"grid3dLayer.js","sourceRoot":"","sources":["../../../src/layers/grid3d/grid3dLayer.ts"],"names":[],"mappings":"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"}
|
|
@@ -28,11 +28,16 @@ const defaultProps = {
|
|
|
28
28
|
// This is a private layer used only by the composite Grid3DLayer
|
|
29
29
|
export default class PrivateLayer extends Layer {
|
|
30
30
|
get isLoaded() {
|
|
31
|
-
|
|
32
|
-
return (_a = this.state["isLoaded"]) !== null && _a !== void 0 ? _a : false;
|
|
31
|
+
return this.state["isLoaded"] ?? false;
|
|
33
32
|
}
|
|
34
33
|
setShaderModuleProps(args) {
|
|
35
|
-
super.setShaderModuleProps(
|
|
34
|
+
super.setShaderModuleProps({
|
|
35
|
+
...args,
|
|
36
|
+
lighting: {
|
|
37
|
+
...args["lighting"],
|
|
38
|
+
enabled: this.props.enableLighting,
|
|
39
|
+
},
|
|
40
|
+
});
|
|
36
41
|
}
|
|
37
42
|
initializeState(context) {
|
|
38
43
|
const [model_mesh, mesh_lines_model] = this._getModels(context);
|
|
@@ -54,49 +59,69 @@ export default class PrivateLayer extends Layer {
|
|
|
54
59
|
}
|
|
55
60
|
//eslint-disable-next-line
|
|
56
61
|
_getModels(context) {
|
|
57
|
-
var _a, _b;
|
|
58
62
|
const geometricShading = isGeometricProperty(this.props.coloringMode);
|
|
59
63
|
const uniforms = this.getUniforms();
|
|
60
|
-
const colormap = createColormapTexture(
|
|
64
|
+
const colormap = createColormapTexture(this.props.colormapFunction ?? {
|
|
61
65
|
colormapName: this.props.colormapName,
|
|
62
66
|
colorTables: this.context.userData
|
|
63
67
|
.colorTables,
|
|
64
68
|
}, context, this.getColoringHints());
|
|
65
|
-
const mesh_model = new Model(context.device,
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
?
|
|
69
|
-
:
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
69
|
+
const mesh_model = new Model(context.device, {
|
|
70
|
+
id: `${this.props.id}-mesh`,
|
|
71
|
+
...super.getShaders({
|
|
72
|
+
vs: geometricShading ? linearVertexShader : flatVertexShader,
|
|
73
|
+
fs: geometricShading
|
|
74
|
+
? linearFragmentShader
|
|
75
|
+
: flatFragmentShader,
|
|
76
|
+
modules: [
|
|
77
|
+
project32,
|
|
78
|
+
picking,
|
|
79
|
+
lighting,
|
|
80
|
+
phongMaterial,
|
|
81
|
+
utilities,
|
|
82
|
+
gridUniforms,
|
|
83
|
+
precisionForTests,
|
|
84
|
+
],
|
|
85
|
+
}),
|
|
86
|
+
geometry: new Geometry({
|
|
87
|
+
topology: this.props.mesh.drawMode ?? "triangle-list",
|
|
88
|
+
attributes: {
|
|
89
|
+
positions: this.props.mesh.attributes.positions,
|
|
90
|
+
normals: this.props.mesh.attributes.normals,
|
|
91
|
+
...(geometricShading
|
|
92
|
+
? {}
|
|
93
|
+
: {
|
|
94
|
+
properties: this.props.mesh.attributes.properties,
|
|
95
|
+
}),
|
|
96
|
+
},
|
|
86
97
|
vertexCount: this.props.mesh.vertexCount,
|
|
87
|
-
}),
|
|
98
|
+
}),
|
|
99
|
+
bufferLayout: this.getAttributeManager().getBufferLayouts(),
|
|
100
|
+
bindings: {
|
|
88
101
|
colormap,
|
|
89
|
-
},
|
|
102
|
+
},
|
|
103
|
+
isInstanced: false,
|
|
104
|
+
});
|
|
90
105
|
mesh_model.shaderInputs.setProps({
|
|
91
|
-
grid:
|
|
106
|
+
grid: {
|
|
107
|
+
...uniforms,
|
|
108
|
+
},
|
|
109
|
+
});
|
|
110
|
+
const mesh_lines_model = new Model(context.device, {
|
|
111
|
+
id: `${this.props.id}-lines`,
|
|
112
|
+
...super.getShaders({
|
|
113
|
+
vs: vsLineShader,
|
|
114
|
+
fs: fsLineShader,
|
|
115
|
+
modules: [project32, picking, gridUniforms, precisionForTests],
|
|
116
|
+
}),
|
|
117
|
+
geometry: new Geometry(this.props.meshLines),
|
|
118
|
+
bufferLayout: this.getAttributeManager().getBufferLayouts(),
|
|
119
|
+
isInstanced: false,
|
|
92
120
|
});
|
|
93
|
-
const mesh_lines_model = new Model(context.device, Object.assign(Object.assign({ id: `${this.props.id}-lines` }, super.getShaders({
|
|
94
|
-
vs: vsLineShader,
|
|
95
|
-
fs: fsLineShader,
|
|
96
|
-
modules: [project32, picking, gridUniforms, precisionForTests],
|
|
97
|
-
})), { geometry: new Geometry(this.props.meshLines), bufferLayout: this.getAttributeManager().getBufferLayouts(), isInstanced: false }));
|
|
98
121
|
mesh_lines_model.shaderInputs.setProps({
|
|
99
|
-
grid:
|
|
122
|
+
grid: {
|
|
123
|
+
...uniforms,
|
|
124
|
+
},
|
|
100
125
|
});
|
|
101
126
|
return [mesh_model, mesh_lines_model];
|
|
102
127
|
}
|
|
@@ -121,7 +146,7 @@ export default class PrivateLayer extends Layer {
|
|
|
121
146
|
gl.enable(gl.DEPTH_TEST);
|
|
122
147
|
}
|
|
123
148
|
if (!this.state["isLoaded"]) {
|
|
124
|
-
this.setState(
|
|
149
|
+
this.setState({ ...this.state, isLoaded: true });
|
|
125
150
|
}
|
|
126
151
|
}
|
|
127
152
|
decodePickingColor() {
|
|
@@ -131,7 +156,6 @@ export default class PrivateLayer extends Layer {
|
|
|
131
156
|
return this.nullPickingColor();
|
|
132
157
|
}
|
|
133
158
|
getPickingInfo({ info }) {
|
|
134
|
-
var _a, _b;
|
|
135
159
|
if (!info.color) {
|
|
136
160
|
return info;
|
|
137
161
|
}
|
|
@@ -140,14 +164,14 @@ export default class PrivateLayer extends Layer {
|
|
|
140
164
|
const [r, g, b] = info.color;
|
|
141
165
|
const vertexIndex = decodeIndexFromRGB([r, g, b]);
|
|
142
166
|
const zScale = this.props.modelMatrix ? this.props.modelMatrix[10] : 1;
|
|
143
|
-
if (typeof
|
|
167
|
+
if (typeof info.coordinate?.[2] !== "undefined") {
|
|
144
168
|
const depth = (this.props.ZIncreasingDownwards
|
|
145
169
|
? -info.coordinate[2]
|
|
146
170
|
: info.coordinate[2]) / Math.max(0.001, zScale);
|
|
147
171
|
layer_properties.push(createPropertyData("Depth", depth));
|
|
148
172
|
}
|
|
149
|
-
const properties =
|
|
150
|
-
const propertyIndex = properties
|
|
173
|
+
const properties = this.props.mesh.attributes.properties?.value;
|
|
174
|
+
const propertyIndex = properties?.[vertexIndex];
|
|
151
175
|
if (propertyIndex != undefined && Number.isFinite(propertyIndex)) {
|
|
152
176
|
const propertyText = this.getPropertyText(propertyIndex);
|
|
153
177
|
if (propertyText) {
|
|
@@ -158,7 +182,10 @@ export default class PrivateLayer extends Layer {
|
|
|
158
182
|
layer_properties.push(createPropertyData("Property", propertyIndex));
|
|
159
183
|
}
|
|
160
184
|
}
|
|
161
|
-
return
|
|
185
|
+
return {
|
|
186
|
+
...info,
|
|
187
|
+
properties: layer_properties,
|
|
188
|
+
};
|
|
162
189
|
}
|
|
163
190
|
getPropertyText(index) {
|
|
164
191
|
if (!this.props.discretePropertyValueNames) {
|
|
@@ -175,7 +202,6 @@ export default class PrivateLayer extends Layer {
|
|
|
175
202
|
};
|
|
176
203
|
}
|
|
177
204
|
getColoringHints() {
|
|
178
|
-
var _a, _b;
|
|
179
205
|
if (this.props.colormapFunction instanceof Uint8Array) {
|
|
180
206
|
return {
|
|
181
207
|
discreteData: true,
|
|
@@ -188,7 +214,7 @@ export default class PrivateLayer extends Layer {
|
|
|
188
214
|
// and this.props.propertyValueRange?.[1] should be N
|
|
189
215
|
return {
|
|
190
216
|
discreteData: true,
|
|
191
|
-
colormapSize: (
|
|
217
|
+
colormapSize: (this.props.propertyValueRange?.[1] ?? 0) + 1,
|
|
192
218
|
};
|
|
193
219
|
}
|
|
194
220
|
return {
|
|
@@ -197,13 +223,12 @@ export default class PrivateLayer extends Layer {
|
|
|
197
223
|
};
|
|
198
224
|
}
|
|
199
225
|
getUniforms() {
|
|
200
|
-
|
|
201
|
-
const
|
|
202
|
-
const valueRangeMax = (_d = (_c = this.props.propertyValueRange) === null || _c === void 0 ? void 0 : _c[1]) !== null && _d !== void 0 ? _d : 1;
|
|
226
|
+
const valueRangeMin = this.props.propertyValueRange?.[0] ?? 0;
|
|
227
|
+
const valueRangeMax = this.props.propertyValueRange?.[1] ?? 1;
|
|
203
228
|
// If specified color map will extend from colormapRangeMin to colormapRangeMax.
|
|
204
229
|
// Otherwise it will extend from valueRangeMin to valueRangeMax.
|
|
205
|
-
const colormapRangeMin =
|
|
206
|
-
const colormapRangeMax =
|
|
230
|
+
const colormapRangeMin = this.props.colormapRange?.[0] ?? valueRangeMin;
|
|
231
|
+
const colormapRangeMax = this.props.colormapRange?.[1] ?? valueRangeMax;
|
|
207
232
|
const isColormapClampColorTransparent = this.props.colormapClampColor === false;
|
|
208
233
|
const hasClampColor = this.props.colormapClampColor !== undefined &&
|
|
209
234
|
this.props.colormapClampColor !== true &&
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"privateGrid3dLayer.js","sourceRoot":"","sources":["../../../src/layers/grid3d/privateGrid3dLayer.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,iBAAiB,EAAE,KAAK,EAAE,OAAO,EAAE,SAAS,EAAE,MAAM,eAAe,CAAC;AAG7E,OAAO,EAAE,QAAQ,EAAE,KAAK,EAAE,MAAM,iBAAiB,CAAC;AAGlD,OAAO,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAC;AAEhD,OAAO,EAAE,kBAAkB,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AAClE,OAAO,EAAE,aAAa,EAAE,MAAM,iDAAiD,CAAC;AAChF,OAAO,EAAE,iBAAiB,EAAE,MAAM,oDAAoD,CAAC;AAOvF,OAAO,EAAE,kBAAkB,EAAE,MAAM,qBAAqB,CAAC;AACzD,OAAO,EAEH,qBAAqB,GACxB,MAAM,wBAAwB,CAAC;AAGhC,OAAO,EAAE,qBAAqB,EAAE,oBAAoB,EAAE,MAAM,mBAAmB,CAAC;AAEhF,OAAO,oBAAoB,MAAM,wBAAwB,CAAC;AAC1D,OAAO,kBAAkB,MAAM,wBAAwB,CAAC;AACxD,OAAO,kBAAkB,MAAM,wBAAwB,CAAC;AACxD,OAAO,gBAAgB,MAAM,wBAAwB,CAAC;AACtD,OAAO,YAAY,MAAM,gBAAgB,CAAC;AAC1C,OAAO,YAAY,MAAM,gBAAgB,CAAC;AAE1C,sEAAsE;AACtE,OAAO,EAGH,kBAAkB,EAClB,mBAAmB,GACtB,MAAM,eAAe,CAAC;AAsBvB,MAAM,YAAY,GAAG;IACjB,YAAY,EAAE,EAAE;IAChB,kBAAkB,EAAE,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC;IACnC,YAAY,EAAE,CAAC;IACf,gBAAgB,EAAE,iBAAiB,CAAC,SAAS;IAC7C,kBAAkB,EAAE,CAAC,GAAG,EAAE,GAAG,CAAC;IAC9B,SAAS,EAAE,IAAI;IACf,oBAAoB,EAAE,IAAI;IAC1B,cAAc,EAAE,IAAI;CACvB,CAAC;AAqBF,iEAAiE;AACjE,MAAM,CAAC,OAAO,OAAO,YAAa,SAAQ,KAAwB;IAC9D,IAAI,QAAQ
|
|
1
|
+
{"version":3,"file":"privateGrid3dLayer.js","sourceRoot":"","sources":["../../../src/layers/grid3d/privateGrid3dLayer.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,14 @@
|
|
|
1
1
|
export function makeFullMesh(e) {
|
|
2
2
|
class Node {
|
|
3
|
+
i;
|
|
4
|
+
x;
|
|
5
|
+
y;
|
|
6
|
+
z;
|
|
7
|
+
steiner;
|
|
8
|
+
prev;
|
|
9
|
+
next;
|
|
10
|
+
prevZ;
|
|
11
|
+
nextZ;
|
|
3
12
|
constructor(i, x, y) {
|
|
4
13
|
// vertex index in coordinates array
|
|
5
14
|
this.i = i;
|
|
@@ -336,19 +345,19 @@ export function makeFullMesh(e) {
|
|
|
336
345
|
pSize !== 0 &&
|
|
337
346
|
(qSize === 0 || !q || p.z <= q.z)) {
|
|
338
347
|
e = p;
|
|
339
|
-
p = p
|
|
348
|
+
p = p?.nextZ;
|
|
340
349
|
pSize--;
|
|
341
350
|
}
|
|
342
351
|
else {
|
|
343
352
|
e = q;
|
|
344
|
-
q = q
|
|
353
|
+
q = q?.nextZ;
|
|
345
354
|
qSize--;
|
|
346
355
|
}
|
|
347
356
|
if (tail)
|
|
348
357
|
tail.nextZ = e;
|
|
349
358
|
else
|
|
350
359
|
list = e;
|
|
351
|
-
if (e
|
|
360
|
+
if (e?.prevZ)
|
|
352
361
|
e.prevZ = tail;
|
|
353
362
|
tail = e;
|
|
354
363
|
}
|
|
@@ -641,7 +650,9 @@ export function makeFullMesh(e) {
|
|
|
641
650
|
* Counts returned contain the actual number of primitives the arrays are created for.
|
|
642
651
|
*/
|
|
643
652
|
const createMeshArrays = (counts, withProperties) => {
|
|
644
|
-
const currentCounts =
|
|
653
|
+
const currentCounts = {
|
|
654
|
+
...counts,
|
|
655
|
+
};
|
|
645
656
|
let res = null;
|
|
646
657
|
do {
|
|
647
658
|
res = tryCreateArrays(currentCounts, withProperties);
|
|
@@ -703,7 +714,7 @@ export function makeFullMesh(e) {
|
|
|
703
714
|
let i = 0;
|
|
704
715
|
const counts = getPrimitiveCounts(polys);
|
|
705
716
|
const meshArrays = createMeshArrays(counts, !!properties);
|
|
706
|
-
if (!
|
|
717
|
+
if (!meshArrays?.arrays) {
|
|
707
718
|
return createEmptyMeshes(!!properties);
|
|
708
719
|
}
|
|
709
720
|
let arraysIndex = 0;
|
|
@@ -715,7 +726,7 @@ export function makeFullMesh(e) {
|
|
|
715
726
|
while (i < polys.length &&
|
|
716
727
|
arraysIndex < meshArrays.arrays.trianglePoints.length - 3) {
|
|
717
728
|
const n = polys[i];
|
|
718
|
-
let propertyValue = properties
|
|
729
|
+
let propertyValue = properties?.[pn++];
|
|
719
730
|
if (propertyValue != undefined &&
|
|
720
731
|
isPropertyValueDefined(propertyValue, params.undefinedValue)) {
|
|
721
732
|
propertyValueRangeMin =
|