@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
|
@@ -36,34 +36,38 @@ export default class SeismicLayer extends CompositeLayer {
|
|
|
36
36
|
});
|
|
37
37
|
}
|
|
38
38
|
updateState({ props, oldProps }) {
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
!isEqual(
|
|
42
|
-
!isEqual(
|
|
43
|
-
!isEqual((_g = props.cage) === null || _g === void 0 ? void 0 : _g.edgeW, (_h = oldProps.cage) === null || _h === void 0 ? void 0 : _h.edgeW) ||
|
|
39
|
+
const needs_reload_cage = !isEqual(props.cage?.origin, oldProps.cage?.origin) ||
|
|
40
|
+
!isEqual(props.cage?.edgeU, oldProps.cage?.edgeU) ||
|
|
41
|
+
!isEqual(props.cage?.edgeV, oldProps.cage?.edgeV) ||
|
|
42
|
+
!isEqual(props.cage?.edgeW, oldProps.cage?.edgeW) ||
|
|
44
43
|
!isEqual(props.ZIncreasingDownwards, oldProps.ZIncreasingDownwards);
|
|
45
44
|
if (needs_reload_cage) {
|
|
46
45
|
const cageAttributes = this.rebuildCageAttributes(false);
|
|
47
|
-
this.setState(
|
|
46
|
+
this.setState({
|
|
47
|
+
...this.state,
|
|
48
|
+
cageAttributes,
|
|
49
|
+
});
|
|
48
50
|
}
|
|
49
|
-
const needs_reload_fences = !isEqual(props.seismicFences.length,
|
|
51
|
+
const needs_reload_fences = !isEqual(props.seismicFences.length, oldProps.seismicFences?.length) ||
|
|
50
52
|
props.seismicFences.some((fence, index) => {
|
|
51
|
-
|
|
52
|
-
const oldFence = (_a = oldProps.seismicFences) === null || _a === void 0 ? void 0 : _a[index];
|
|
53
|
+
const oldFence = oldProps.seismicFences?.[index];
|
|
53
54
|
return (
|
|
54
55
|
// do not use isEqual for performance: it iterates on each element
|
|
55
|
-
fence.topology !==
|
|
56
|
-
fence.vertices !==
|
|
57
|
-
fence.normals !==
|
|
58
|
-
fence.texCoords !==
|
|
56
|
+
fence.topology !== oldFence?.topology ||
|
|
57
|
+
fence.vertices !== oldFence?.vertices ||
|
|
58
|
+
fence.normals !== oldFence?.normals ||
|
|
59
|
+
fence.texCoords !== oldFence?.texCoords ||
|
|
59
60
|
//fence.seismicData !== oldFence?.seismicData ||
|
|
60
61
|
fence.vertexIndices.value !==
|
|
61
|
-
|
|
62
|
-
fence.vertexIndices.size !==
|
|
62
|
+
oldFence?.vertexIndices.value ||
|
|
63
|
+
fence.vertexIndices.size !== oldFence?.vertexIndices.size);
|
|
63
64
|
});
|
|
64
65
|
if (needs_reload_fences) {
|
|
65
66
|
const fences = this.rebuildFencesAttributes();
|
|
66
|
-
this.setState(
|
|
67
|
+
this.setState({
|
|
68
|
+
...this.state,
|
|
69
|
+
seismicFences: fences ?? [],
|
|
70
|
+
});
|
|
67
71
|
}
|
|
68
72
|
}
|
|
69
73
|
rebuildCageAttributes(reportBoundingBox) {
|
|
@@ -123,13 +127,12 @@ export default class SeismicLayer extends CompositeLayer {
|
|
|
123
127
|
return this.props.seismicFences;
|
|
124
128
|
}
|
|
125
129
|
getPickingInfo({ info }) {
|
|
126
|
-
var _a, _b;
|
|
127
130
|
if (!info.color) {
|
|
128
131
|
return info;
|
|
129
132
|
}
|
|
130
133
|
const layer_properties = [];
|
|
131
134
|
const zScale = this.props.modelMatrix ? this.props.modelMatrix[10] : 1;
|
|
132
|
-
if (
|
|
135
|
+
if (info.coordinate?.[2] !== undefined) {
|
|
133
136
|
const depth = (this.props.ZIncreasingDownwards
|
|
134
137
|
? -info.coordinate[2]
|
|
135
138
|
: info.coordinate[2]) / Math.max(0.001, zScale);
|
|
@@ -137,12 +140,14 @@ export default class SeismicLayer extends CompositeLayer {
|
|
|
137
140
|
}
|
|
138
141
|
// eslint-disable-next-line @typescript-eslint/ban-ts-comment
|
|
139
142
|
// @ts-ignore
|
|
140
|
-
const merged_props = [...layer_properties, ...(
|
|
143
|
+
const merged_props = [...layer_properties, ...(info.properties ?? [])];
|
|
141
144
|
const properties = uniqWith(merged_props, (e1, e2) => e1.name === e2.name);
|
|
142
|
-
return
|
|
145
|
+
return {
|
|
146
|
+
...info,
|
|
147
|
+
properties,
|
|
148
|
+
};
|
|
143
149
|
}
|
|
144
150
|
renderLayers() {
|
|
145
|
-
var _a, _b;
|
|
146
151
|
const cage = this.state["cageAttributes"];
|
|
147
152
|
const cageLayer = new PrivatePolylinesLayer(this.getSubLayerProps({
|
|
148
153
|
id: "polylines-layer",
|
|
@@ -158,7 +163,7 @@ export default class SeismicLayer extends CompositeLayer {
|
|
|
158
163
|
getColor: [this.props.cage.color],
|
|
159
164
|
getWidth: [this.props.cage.lineWidth],
|
|
160
165
|
},
|
|
161
|
-
visible:
|
|
166
|
+
visible: this.props.cage.visible ?? defaultCageProps.visible,
|
|
162
167
|
pickable: this.props.pickable,
|
|
163
168
|
depthTest: this.props.depthTest,
|
|
164
169
|
ZIncreasingDownwards: this.props.ZIncreasingDownwards,
|
|
@@ -173,7 +178,7 @@ export default class SeismicLayer extends CompositeLayer {
|
|
|
173
178
|
material: this.props.material === true
|
|
174
179
|
? defaultProps.material
|
|
175
180
|
: this.props.material,
|
|
176
|
-
smoothShading:
|
|
181
|
+
smoothShading: this.props.smoothShading ?? defaultProps.smoothShading,
|
|
177
182
|
pickable: this.props.pickable,
|
|
178
183
|
depthTest: this.props.depthTest,
|
|
179
184
|
ZIncreasingDownwards: this.props.ZIncreasingDownwards,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"seismicLayer.js","sourceRoot":"","sources":["../../../src/layers/seismic/seismicLayer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,QAAQ,CAAC;AAI3C,OAAO,EAAE,cAAc,EAAE,MAAM,eAAe,CAAC;AAG/C,OAAO,EAAE,qBAAqB,EAAE,MAAM,oCAAoC,CAAC;AAC3E,OAAO,EACH,2BAA2B,GAE9B,MAAM,2CAA2C,CAAC;AAEnD,OAAO,EAAE,kBAAkB,EAAE,kBAAkB,EAAE,MAAM,qBAAqB,CAAC;AAU7E,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAwG1C,MAAM,gBAAgB,GAAG;IACrB,UAAU,EAAE,QAAQ;IACpB,SAAS,EAAE,CAAC;IACZ,KAAK,EAAE,CAAC,GAAG,EAAE,GAAG,EAAE,CAAC,CAAC;IACpB,OAAO,EAAE,IAAI;CAChB,CAAC;AAEF,MAAM,YAAY,GAAG;IACjB,QAAQ,EAAE,cAAc;IACxB,IAAI,EAAE,cAAc;IACpB,EAAE,EAAE,eAAe;IACnB,IAAI,EAAE,gBAAgB;IACtB,aAAa,EAAE,EAAE;IACjB,QAAQ,EAAE;QACN,OAAO,EAAE,IAAI;QACb,OAAO,EAAE,GAAG;QACZ,SAAS,EAAE,EAAE;QACb,aAAa,EAAE,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC;KAC9B;IACD,aAAa,EAAE,KAAK;IACpB,QAAQ,EAAE,IAAI;IACd,OAAO,EAAE,IAAI;IACb,SAAS,EAAE,IAAI;IACf,oBAAoB,EAAE,IAAI;CAC7B,CAAC;AAaF,MAAM,CAAC,OAAO,OAAO,YAAa,SAAQ,cAAiC;IACvE,eAAe;QACX,MAAM,cAAc,GAAG,IAAI,CAAC,qBAAqB,CAAC,IAAI,CAAC,CAAC;QACxD,IAAI,CAAC,QAAQ,CAAC;YACV,cAAc;SACjB,CAAC,CAAC;IACP,CAAC;IAED,WAAW,CAAC,EAAE,KAAK,EAAE,QAAQ,EAAkC
|
|
1
|
+
{"version":3,"file":"seismicLayer.js","sourceRoot":"","sources":["../../../src/layers/seismic/seismicLayer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,QAAQ,CAAC;AAI3C,OAAO,EAAE,cAAc,EAAE,MAAM,eAAe,CAAC;AAG/C,OAAO,EAAE,qBAAqB,EAAE,MAAM,oCAAoC,CAAC;AAC3E,OAAO,EACH,2BAA2B,GAE9B,MAAM,2CAA2C,CAAC;AAEnD,OAAO,EAAE,kBAAkB,EAAE,kBAAkB,EAAE,MAAM,qBAAqB,CAAC;AAU7E,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAwG1C,MAAM,gBAAgB,GAAG;IACrB,UAAU,EAAE,QAAQ;IACpB,SAAS,EAAE,CAAC;IACZ,KAAK,EAAE,CAAC,GAAG,EAAE,GAAG,EAAE,CAAC,CAAC;IACpB,OAAO,EAAE,IAAI;CAChB,CAAC;AAEF,MAAM,YAAY,GAAG;IACjB,QAAQ,EAAE,cAAc;IACxB,IAAI,EAAE,cAAc;IACpB,EAAE,EAAE,eAAe;IACnB,IAAI,EAAE,gBAAgB;IACtB,aAAa,EAAE,EAAE;IACjB,QAAQ,EAAE;QACN,OAAO,EAAE,IAAI;QACb,OAAO,EAAE,GAAG;QACZ,SAAS,EAAE,EAAE;QACb,aAAa,EAAE,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC;KAC9B;IACD,aAAa,EAAE,KAAK;IACpB,QAAQ,EAAE,IAAI;IACd,OAAO,EAAE,IAAI;IACb,SAAS,EAAE,IAAI;IACf,oBAAoB,EAAE,IAAI;CAC7B,CAAC;AAaF,MAAM,CAAC,OAAO,OAAO,YAAa,SAAQ,cAAiC;IACvE,eAAe;QACX,MAAM,cAAc,GAAG,IAAI,CAAC,qBAAqB,CAAC,IAAI,CAAC,CAAC;QACxD,IAAI,CAAC,QAAQ,CAAC;YACV,cAAc;SACjB,CAAC,CAAC;IACP,CAAC;IAED,WAAW,CAAC,EAAE,KAAK,EAAE,QAAQ,EAAkC;QAC3D,MAAM,iBAAiB,GACnB,CAAC,OAAO,CAAC,KAAK,CAAC,IAAI,EAAE,MAAM,EAAE,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;YACnD,CAAC,OAAO,CAAC,KAAK,CAAC,IAAI,EAAE,KAAK,EAAE,QAAQ,CAAC,IAAI,EAAE,KAAK,CAAC;YACjD,CAAC,OAAO,CAAC,KAAK,CAAC,IAAI,EAAE,KAAK,EAAE,QAAQ,CAAC,IAAI,EAAE,KAAK,CAAC;YACjD,CAAC,OAAO,CAAC,KAAK,CAAC,IAAI,EAAE,KAAK,EAAE,QAAQ,CAAC,IAAI,EAAE,KAAK,CAAC;YACjD,CAAC,OAAO,CAAC,KAAK,CAAC,oBAAoB,EAAE,QAAQ,CAAC,oBAAoB,CAAC,CAAC;QAExE,IAAI,iBAAiB,EAAE,CAAC;YACpB,MAAM,cAAc,GAAG,IAAI,CAAC,qBAAqB,CAAC,KAAK,CAAC,CAAC;YACzD,IAAI,CAAC,QAAQ,CAAC;gBACV,GAAG,IAAI,CAAC,KAAK;gBACb,cAAc;aACjB,CAAC,CAAC;QACP,CAAC;QAED,MAAM,mBAAmB,GACrB,CAAC,OAAO,CACJ,KAAK,CAAC,aAAa,CAAC,MAAM,EAC1B,QAAQ,CAAC,aAAa,EAAE,MAAM,CACjC;YACD,KAAK,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC,KAAK,EAAE,KAAK,EAAE,EAAE;gBACtC,MAAM,QAAQ,GAAG,QAAQ,CAAC,aAAa,EAAE,CAAC,KAAK,CAAC,CAAC;gBACjD,OAAO;gBACH,kEAAkE;gBAClE,KAAK,CAAC,QAAQ,KAAK,QAAQ,EAAE,QAAQ;oBACrC,KAAK,CAAC,QAAQ,KAAK,QAAQ,EAAE,QAAQ;oBACrC,KAAK,CAAC,OAAO,KAAK,QAAQ,EAAE,OAAO;oBACnC,KAAK,CAAC,SAAS,KAAK,QAAQ,EAAE,SAAS;oBACvC,gDAAgD;oBAChD,KAAK,CAAC,aAAa,CAAC,KAAK;wBACrB,QAAQ,EAAE,aAAa,CAAC,KAAK;oBACjC,KAAK,CAAC,aAAa,CAAC,IAAI,KAAK,QAAQ,EAAE,aAAa,CAAC,IAAI,CAC5D,CAAC;YACN,CAAC,CAAC,CAAC;QAEP,IAAI,mBAAmB,EAAE,CAAC;YACtB,MAAM,MAAM,GAAG,IAAI,CAAC,uBAAuB,EAAE,CAAC;YAC9C,IAAI,CAAC,QAAQ,CAAC;gBACV,GAAG,IAAI,CAAC,KAAK;gBACb,aAAa,EAAE,MAAM,IAAI,EAAE;aAC9B,CAAC,CAAC;QACP,CAAC;IACL,CAAC;IAEO,qBAAqB,CACzB,iBAA0B;QAE1B,MAAM,cAAc,GAAG,IAAI,CAAC,YAAY,EAAE,CAAC;QAC3C,IACI,OAAO,IAAI,CAAC,KAAK,CAAC,iBAAiB,KAAK,UAAU;YAClD,iBAAiB,EACnB,CAAC;YACC,MAAM,WAAW,GAAG,kBAAkB,CAAC,cAAc,CAAC,SAAS,CAAC,CAAC;YACjE,IAAI,CAAC,KAAK,CAAC,iBAAiB,CAAC,EAAE,gBAAgB,EAAE,WAAW,EAAE,CAAC,CAAC;QACpE,CAAC;QAED,OAAO;YACH,MAAM,EAAE,cAAc,CAAC,UAAU;YACjC,YAAY,EAAE,cAAc,CAAC,YAAY;YACzC,UAAU,EAAE;gBACR,OAAO,EAAE;oBACL,KAAK,EAAE,cAAc,CAAC,SAAS;oBAC/B,IAAI,EAAE,CAAC;iBACV;aACJ;SACJ,CAAC;IACN,CAAC;IAEO,YAAY;QAKhB,mDAAmD;QACnD,MAAM,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC;QAC7B,MAAM,EAAE,GAAG,IAAI,CAAC,MAAM,CAAC;QACvB,MAAM,EAAE,GAAG,WAAW,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC;QAChD,MAAM,EAAE,GAAG,WAAW,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC;QAChD,MAAM,EAAE,GAAG,WAAW,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC;QAChD,MAAM,GAAG,GAAG,WAAW,CAAC,EAAE,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC;QACxC,MAAM,GAAG,GAAG,WAAW,CAAC,EAAE,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC;QACxC,MAAM,GAAG,GAAG,WAAW,CAAC,EAAE,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC;QACxC,MAAM,IAAI,GAAG,WAAW,CAAC,GAAG,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC;QAC1C,MAAM,QAAQ,GAAa;YACvB,GAAG,EAAE,EAAE,YAAY;YACnB,GAAG,EAAE;YACL,GAAG,GAAG;YACN,GAAG,EAAE;YACL,GAAG,EAAE;YACL,GAAG,EAAE,EAAE,aAAa;YACpB,GAAG,GAAG;YACN,GAAG,EAAE;YACL,GAAG,GAAG,EAAE,aAAa;YACrB,GAAG,IAAI;YACP,GAAG,GAAG;YACN,GAAG,EAAE,EAAE,WAAW;YAClB,GAAG,GAAG;YACN,GAAG,IAAI;YACP,GAAG,GAAG,EAAE,WAAW;YACnB,GAAG,EAAE,EAAE,4BAA4B;SACtC,CAAC;QAEF,OAAO;YACH,SAAS,EAAE,IAAI,YAAY,CAAC,QAAQ,CAAC;YACrC,UAAU,EAAE,CAAC;YACb,YAAY,EAAE,IAAI,WAAW,CAAC,CAAC,CAAC,EAAE,QAAQ,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;SAC1D,CAAC;IACN,CAAC;IAEO,uBAAuB;QAC3B,OAAO,IAAI,CAAC,KAAK,CAAC,aAAa,CAAC;IACpC,CAAC;IAED,cAAc,CAAC,EAAE,IAAI,EAAyB;QAC1C,IAAI,CAAC,IAAI,CAAC,KAAK,EAAE,CAAC;YACd,OAAO,IAAI,CAAC;QAChB,CAAC;QAED,MAAM,gBAAgB,GAAuB,EAAE,CAAC;QAEhD,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QACvE,IAAI,IAAI,CAAC,UAAU,EAAE,CAAC,CAAC,CAAC,KAAK,SAAS,EAAE,CAAC;YACrC,MAAM,KAAK,GACP,CAAC,IAAI,CAAC,KAAK,CAAC,oBAAoB;gBAC5B,CAAC,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC;gBACrB,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC,GAAG,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;YACxD,gBAAgB,CAAC,IAAI,CAAC,kBAAkB,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC,CAAC;QAC9D,CAAC;QAED,6DAA6D;QAC7D,aAAa;QACb,MAAM,YAAY,GAAG,CAAC,GAAG,gBAAgB,EAAE,GAAG,CAAC,IAAI,CAAC,UAAU,IAAI,EAAE,CAAC,CAAC,CAAC;QACvE,MAAM,UAAU,GAAG,QAAQ,CACvB,YAAY,EACZ,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,IAAI,KAAK,EAAE,CAAC,IAAI,CAClC,CAAC;QAEF,OAAO;YACH,GAAG,IAAI;YACP,UAAU;SACb,CAAC;IACN,CAAC;IAED,YAAY;QACR,MAAM,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,gBAAgB,CAAwB,CAAC;QACjE,MAAM,SAAS,GAAG,IAAI,qBAAqB,CACvC,IAAI,CAAC,gBAAgB,CAAC;YAClB,EAAE,EAAE,iBAAiB;YACrB,UAAU,EAAE,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,UAAU;YACtC,SAAS,EAAE,IAAI;YACf,YAAY,EAAE,IAAI;YAClB,UAAU,EAAE,IAAI;YAChB,IAAI,EAAE,IAAI;YACV,SAAS,EAAE,MAAM;YACjB,QAAQ,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK;YACrC,QAAQ,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,SAAS;YAEzC,cAAc,EAAE;gBACZ,QAAQ,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC;gBACjC,QAAQ,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC;aACxC;YACD,OAAO,EAAE,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,OAAO,IAAI,gBAAgB,CAAC,OAAO;YAC5D,QAAQ,EAAE,IAAI,CAAC,KAAK,CAAC,QAAQ;YAC7B,SAAS,EAAE,IAAI,CAAC,KAAK,CAAC,SAAS;YAC/B,oBAAoB,EAAE,IAAI,CAAC,KAAK,CAAC,oBAAoB;SACxD,CAAC,CACL,CAAC;QAEF,MAAM,aAAa,GAAG,IAAI,CAAC,KAAK,CAC5B,eAAe,CACY,CAAC;QAChC,MAAM,YAAY,GAAG,IAAI,2BAA2B,CAChD,IAAI,CAAC,gBAAgB,CAAC;YAClB,EAAE,EAAE,qBAAqB;YACzB,oBAAoB,EAAE,aAAa;YACnC,QAAQ,EAAE,IAAI,CAAC,KAAK,CAAC,QAAQ;YAC7B,QAAQ,EAAE,IAAI,CAAC,KAAK,CAAC,QAAQ;YAC7B,aAAa,EAAE,IAAI,CAAC,KAAK,CAAC,aAAa;YACvC,QAAQ,EACJ,IAAI,CAAC,KAAK,CAAC,QAAQ,KAAK,IAAI;gBACxB,CAAC,CAAC,YAAY,CAAC,QAAQ;gBACvB,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,QAAQ;YAC7B,aAAa,EACT,IAAI,CAAC,KAAK,CAAC,aAAa,IAAI,YAAY,CAAC,aAAa;YAC1D,QAAQ,EAAE,IAAI,CAAC,KAAK,CAAC,QAAQ;YAC7B,SAAS,EAAE,IAAI,CAAC,KAAK,CAAC,SAAS;YAC/B,oBAAoB,EAAE,IAAI,CAAC,KAAK,CAAC,oBAAoB;SACxD,CAAC,CACL,CAAC;QAEF,OAAO,CAAC,SAAS,EAAE,YAAY,CAAC,CAAC;IACrC,CAAC;CACJ;AAED,YAAY,CAAC,SAAS,GAAG,cAAc,CAAC;AACxC,YAAY,CAAC,YAAY,GAAG,YAA4C,CAAC"}
|
|
@@ -26,11 +26,11 @@ export const phongMaterial = {
|
|
|
26
26
|
specularColor: [0.15, 0.15, 0.15],
|
|
27
27
|
},
|
|
28
28
|
getUniforms(props) {
|
|
29
|
-
const uniforms =
|
|
29
|
+
const uniforms = { ...props };
|
|
30
30
|
if (uniforms.specularColor) {
|
|
31
31
|
uniforms.specularColor = uniforms.specularColor.map((x) => x / 255);
|
|
32
32
|
}
|
|
33
|
-
return
|
|
33
|
+
return { ...phongMaterial.defaultUniforms, ...uniforms };
|
|
34
34
|
},
|
|
35
35
|
};
|
|
36
36
|
//# sourceMappingURL=phong-material.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"phong-material.js","sourceRoot":"","sources":["../../../../src/layers/shader_modules/phong-lighting/phong-material.ts"],"names":[],"mappings":"AAAA,UAAU;AACV,+BAA+B;AAC/B,oCAAoC;AASpC,OAAO,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAC;AAEhD,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAC;AAU1D,wIAAwI;AACxI,MAAM,CAAC,MAAM,aAAa,GAAqC;IAC3D,IAAI,EAAE,eAAe;IACrB,YAAY,EAAE,CAAC,QAAQ,CAAC;IACxB,oDAAoD;IACpD,EAAE,EAAE,QAAQ;IACZ,EAAE,EAAE,QAAQ;IACZ,OAAO,EAAE;QACL,iBAAiB,EAAE,IAAI;KAC1B;IACD,YAAY,EAAE;QACV,OAAO,EAAE,KAAK;QACd,OAAO,EAAE,KAAK;QACd,SAAS,EAAE,KAAK;QAChB,aAAa,EAAE,WAAW;KAC7B;IACD,eAAe,EAAE;QACb,OAAO,EAAE,IAAI;QACb,OAAO,EAAE,GAAG;QACZ,SAAS,EAAE,EAAE;QACb,aAAa,EAAE,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,CAAC;KACpC;IACD,WAAW,CAAC,KAA0B;QAClC,MAAM,QAAQ,
|
|
1
|
+
{"version":3,"file":"phong-material.js","sourceRoot":"","sources":["../../../../src/layers/shader_modules/phong-lighting/phong-material.ts"],"names":[],"mappings":"AAAA,UAAU;AACV,+BAA+B;AAC/B,oCAAoC;AASpC,OAAO,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAC;AAEhD,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAC;AAU1D,wIAAwI;AACxI,MAAM,CAAC,MAAM,aAAa,GAAqC;IAC3D,IAAI,EAAE,eAAe;IACrB,YAAY,EAAE,CAAC,QAAQ,CAAC;IACxB,oDAAoD;IACpD,EAAE,EAAE,QAAQ;IACZ,EAAE,EAAE,QAAQ;IACZ,OAAO,EAAE;QACL,iBAAiB,EAAE,IAAI;KAC1B;IACD,YAAY,EAAE;QACV,OAAO,EAAE,KAAK;QACd,OAAO,EAAE,KAAK;QACd,SAAS,EAAE,KAAK;QAChB,aAAa,EAAE,WAAW;KAC7B;IACD,eAAe,EAAE;QACb,OAAO,EAAE,IAAI;QACb,OAAO,EAAE,GAAG;QACZ,SAAS,EAAE,EAAE;QACb,aAAa,EAAE,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,CAAC;KACpC;IACD,WAAW,CAAC,KAA0B;QAClC,MAAM,QAAQ,GAAG,EAAE,GAAG,KAAK,EAAE,CAAC;QAC9B,IAAI,QAAQ,CAAC,aAAa,EAAE,CAAC;YACzB,QAAQ,CAAC,aAAa,GAAG,QAAQ,CAAC,aAAa,CAAC,GAAG,CAC/C,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,GAAG,GAAG,CACD,CAAC;QACtB,CAAC;QACD,OAAO,EAAE,GAAG,aAAa,CAAC,eAAe,EAAE,GAAG,QAAQ,EAAE,CAAC;IAC7D,CAAC;CACJ,CAAC"}
|
|
@@ -6,9 +6,10 @@ precision highp float;
|
|
|
6
6
|
const PROD_PRECISION = /* glsl */ `\
|
|
7
7
|
`;
|
|
8
8
|
export function computePrecision() {
|
|
9
|
-
|
|
10
|
-
const
|
|
11
|
-
|
|
9
|
+
const env = globalThis.process?.env;
|
|
10
|
+
const mode = env?.["STORYBOOK_NODE_ENV"] ??
|
|
11
|
+
env?.["CYPRESS_NODE_ENV"] ??
|
|
12
|
+
env?.["NODE_ENV"];
|
|
12
13
|
return mode && mode !== "production" ? TEST_PRECISION : PROD_PRECISION;
|
|
13
14
|
}
|
|
14
15
|
const PRECISION = computePrecision();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"precisionForTests-shaders-glsl.js","sourceRoot":"","sources":["../../../../src/layers/shader_modules/test-precision/precisionForTests-shaders-glsl.ts"],"names":[],"mappings":"AAAA,MAAM,cAAc,GAAG,UAAU,CAAC;;;;CAIjC,CAAC;AAEF,MAAM,cAAc,GAAG,UAAU,CAAC;CACjC,CAAC;AAEF,MAAM,UAAU,gBAAgB
|
|
1
|
+
{"version":3,"file":"precisionForTests-shaders-glsl.js","sourceRoot":"","sources":["../../../../src/layers/shader_modules/test-precision/precisionForTests-shaders-glsl.ts"],"names":[],"mappings":"AAAA,MAAM,cAAc,GAAG,UAAU,CAAC;;;;CAIjC,CAAC;AAEF,MAAM,cAAc,GAAG,UAAU,CAAC;CACjC,CAAC;AAEF,MAAM,UAAU,gBAAgB;IAC5B,MAAM,GAAG,GACL,UAGH,CAAC,OAAO,EAAE,GAAG,CAAC;IACf,MAAM,IAAI,GACN,GAAG,EAAE,CAAC,oBAAoB,CAAC;QAC3B,GAAG,EAAE,CAAC,kBAAkB,CAAC;QACzB,GAAG,EAAE,CAAC,UAAU,CAAC,CAAC;IACtB,OAAO,IAAI,IAAI,IAAI,KAAK,YAAY,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC,cAAc,CAAC;AAC3E,CAAC;AAED,MAAM,SAAS,GAAG,gBAAgB,EAAE,CAAC;AAErC,OAAO,EAAE,SAAS,EAAE,CAAC"}
|
|
@@ -24,11 +24,16 @@ const defaultProps = {
|
|
|
24
24
|
// This is a private layer used only by the composite TriangleLayer
|
|
25
25
|
export default class PrivateTriangleLayer extends Layer {
|
|
26
26
|
get isLoaded() {
|
|
27
|
-
|
|
28
|
-
return (_a = this.state["isLoaded"]) !== null && _a !== void 0 ? _a : false;
|
|
27
|
+
return this.state["isLoaded"] ?? false;
|
|
29
28
|
}
|
|
30
29
|
setShaderModuleProps(args) {
|
|
31
|
-
super.setShaderModuleProps(
|
|
30
|
+
super.setShaderModuleProps({
|
|
31
|
+
...args,
|
|
32
|
+
lighting: {
|
|
33
|
+
...args["lighting"],
|
|
34
|
+
enabled: this.props.enableLighting,
|
|
35
|
+
},
|
|
36
|
+
});
|
|
32
37
|
}
|
|
33
38
|
initializeState(context) {
|
|
34
39
|
const gl = context.device;
|
|
@@ -47,33 +52,44 @@ export default class PrivateTriangleLayer extends Layer {
|
|
|
47
52
|
this.initializeState(context);
|
|
48
53
|
}
|
|
49
54
|
_getModels(device) {
|
|
50
|
-
const triangleModel = new Model(device,
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
55
|
+
const triangleModel = new Model(device, {
|
|
56
|
+
id: `${this.props.id}-mesh`,
|
|
57
|
+
...super.getShaders({
|
|
58
|
+
vs: vsShader,
|
|
59
|
+
fs: fsShader,
|
|
60
|
+
modules: [
|
|
61
|
+
project32,
|
|
62
|
+
picking,
|
|
63
|
+
lighting,
|
|
64
|
+
phongMaterial,
|
|
65
|
+
trianglesUniforms,
|
|
66
|
+
precisionForTests,
|
|
67
|
+
],
|
|
68
|
+
}),
|
|
69
|
+
bufferLayout: this.getAttributeManager().getBufferLayouts(),
|
|
70
|
+
geometry: new Geometry(this.props.geometryTriangles),
|
|
71
|
+
isInstanced: false, // This only works when set to false.
|
|
72
|
+
});
|
|
73
|
+
const lineModel = new Model(device, {
|
|
74
|
+
id: `${this.props.id}-lines`,
|
|
75
|
+
...super.getShaders({
|
|
76
|
+
vs: vsLineShader,
|
|
77
|
+
fs: fsLineShader,
|
|
78
|
+
modules: [
|
|
79
|
+
project32,
|
|
80
|
+
picking,
|
|
81
|
+
triangleMeshUniforms,
|
|
82
|
+
precisionForTests,
|
|
83
|
+
],
|
|
84
|
+
}),
|
|
85
|
+
bufferLayout: this.getAttributeManager().getBufferLayouts(),
|
|
86
|
+
geometry: new Geometry(this.props.geometryLines),
|
|
87
|
+
isInstanced: false,
|
|
88
|
+
});
|
|
72
89
|
return [triangleModel, lineModel];
|
|
73
90
|
}
|
|
74
91
|
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
75
92
|
draw(args) {
|
|
76
|
-
var _a, _b, _c, _d, _e, _f, _g, _h;
|
|
77
93
|
if (!this.state["models"]) {
|
|
78
94
|
return;
|
|
79
95
|
}
|
|
@@ -84,50 +100,60 @@ export default class PrivateTriangleLayer extends Layer {
|
|
|
84
100
|
}
|
|
85
101
|
gl.enable(GL.POLYGON_OFFSET_FILL);
|
|
86
102
|
gl.polygonOffset(1, 1);
|
|
87
|
-
triangleModel.shaderInputs.setProps(
|
|
103
|
+
triangleModel.shaderInputs.setProps({
|
|
104
|
+
...args.uniforms,
|
|
105
|
+
triangles: {
|
|
88
106
|
isContoursDepth: defaultProps.isContoursDepth,
|
|
89
|
-
contourReferencePoint:
|
|
90
|
-
contourInterval:
|
|
107
|
+
contourReferencePoint: this.props.contours?.[0] ?? defaultProps.contours[0],
|
|
108
|
+
contourInterval: this.props.contours?.[1] ?? defaultProps.contours[1],
|
|
91
109
|
// Normalize to [0,1] range.
|
|
92
110
|
uColor: [
|
|
93
|
-
...(
|
|
111
|
+
...(this.props.color ?? defaultProps.color).map((x) => (x ?? 0) / 255),
|
|
94
112
|
1 /* alpha channel */,
|
|
95
113
|
],
|
|
96
|
-
smoothShading:
|
|
97
|
-
ZIncreasingDownwards:
|
|
98
|
-
|
|
114
|
+
smoothShading: this.props.smoothShading ?? defaultProps.smoothShading,
|
|
115
|
+
ZIncreasingDownwards: this.props.ZIncreasingDownwards ??
|
|
116
|
+
defaultProps.ZIncreasingDownwards,
|
|
117
|
+
},
|
|
118
|
+
});
|
|
99
119
|
triangleModel.draw(args.context.renderPass);
|
|
100
120
|
gl.disable(GL.POLYGON_OFFSET_FILL);
|
|
101
121
|
if (this.props.gridLines) {
|
|
102
|
-
lineModel.shaderInputs.setProps(
|
|
103
|
-
|
|
104
|
-
|
|
122
|
+
lineModel.shaderInputs.setProps({
|
|
123
|
+
...args.uniforms,
|
|
124
|
+
triangleMesh: {
|
|
125
|
+
ZIncreasingDownwards: this.props.ZIncreasingDownwards ??
|
|
126
|
+
defaultProps.ZIncreasingDownwards,
|
|
127
|
+
},
|
|
128
|
+
});
|
|
105
129
|
lineModel.draw(args.context.renderPass);
|
|
106
130
|
}
|
|
107
131
|
if (!this.props.depthTest) {
|
|
108
132
|
gl.enable(GL.DEPTH_TEST);
|
|
109
133
|
}
|
|
110
134
|
if (!this.state["isLoaded"]) {
|
|
111
|
-
this.setState(
|
|
135
|
+
this.setState({ ...this.state, isLoaded: true });
|
|
112
136
|
}
|
|
113
137
|
}
|
|
114
138
|
decodePickingColor() {
|
|
115
139
|
return 0;
|
|
116
140
|
}
|
|
117
141
|
getPickingInfo({ info }) {
|
|
118
|
-
var _a;
|
|
119
142
|
if (!info.color) {
|
|
120
143
|
return info;
|
|
121
144
|
}
|
|
122
145
|
const layer_properties = [];
|
|
123
146
|
const zScale = this.props.modelMatrix ? this.props.modelMatrix[10] : 1;
|
|
124
|
-
if (typeof
|
|
147
|
+
if (typeof info.coordinate?.[2] !== "undefined") {
|
|
125
148
|
const depth = (this.props.ZIncreasingDownwards
|
|
126
149
|
? -info.coordinate[2]
|
|
127
150
|
: info.coordinate[2]) / Math.max(0.001, zScale);
|
|
128
151
|
layer_properties.push(createPropertyData("Depth", depth));
|
|
129
152
|
}
|
|
130
|
-
return
|
|
153
|
+
return {
|
|
154
|
+
...info,
|
|
155
|
+
properties: layer_properties,
|
|
156
|
+
};
|
|
131
157
|
}
|
|
132
158
|
}
|
|
133
159
|
PrivateTriangleLayer.layerName = "privateTriangleLayer";
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"privateTriangleLayer.js","sourceRoot":"","sources":["../../../src/layers/triangle/privateTriangleLayer.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,iBAAiB,EAAE,KAAK,EAAE,OAAO,EAAE,SAAS,EAAE,MAAM,eAAe,CAAC;AAE7E,OAAO,EAAE,EAAE,EAAE,MAAM,oBAAoB,CAAC;AAGxC,OAAO,EAAE,QAAQ,EAAE,KAAK,EAAE,MAAM,iBAAiB,CAAC;AAElD,OAAO,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAC;AAEhD,OAAO,EAAE,aAAa,EAAE,MAAM,iDAAiD,CAAC;AAChF,OAAO,EAAE,iBAAiB,EAAE,MAAM,oDAAoD,CAAC;AAQvF,OAAO,EAAE,kBAAkB,EAAE,MAAM,qBAAqB,CAAC;AAIzD,OAAO,QAAQ,MAAM,oBAAoB,CAAC;AAC1C,OAAO,QAAQ,MAAM,oBAAoB,CAAC;AAC1C,OAAO,YAAY,MAAM,gBAAgB,CAAC;AAC1C,OAAO,YAAY,MAAM,gBAAgB,CAAC;AAkC1C,MAAM,YAAY,GAAG;IACjB,IAAI,EAAE,CAAC,OAAO,CAAC;IACf,QAAQ,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;IAClB,eAAe,EAAE,IAAI;IACrB,SAAS,EAAE,KAAK;IAChB,KAAK,EAAE,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC;IACtB,gBAAgB,EAAE,iBAAiB,CAAC,SAAS;IAC7C,SAAS,EAAE,IAAI;IACf,aAAa,EAAE,IAAI;IACnB,oBAAoB,EAAE,IAAI;IAC1B,cAAc,EAAE,IAAI;CACvB,CAAC;AAEF,mEAAmE;AACnE,MAAM,CAAC,OAAO,OAAO,oBAAqB,SAAQ,KAAgC;IAC9E,IAAI,QAAQ
|
|
1
|
+
{"version":3,"file":"privateTriangleLayer.js","sourceRoot":"","sources":["../../../src/layers/triangle/privateTriangleLayer.ts"],"names":[],"mappings":"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"}
|
|
@@ -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,65 +7,66 @@ import config from "../../SubsurfaceConfig.json";
|
|
|
16
7
|
import { findConfig } from "../../utils/configTools";
|
|
17
8
|
// init workerpool
|
|
18
9
|
const workerPoolConfig = findConfig(config, "config/workerpool", "config/layer/TriangleLayer/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) {
|
|
26
20
|
pool.terminate();
|
|
27
21
|
}
|
|
28
22
|
}
|
|
29
|
-
function loadData(pointsData, triangleData) {
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
console.error("Could not load vertex data");
|
|
47
|
-
}
|
|
48
|
-
const blob_mesh = yield response_mesh.blob();
|
|
49
|
-
// Load as binary array of floats.
|
|
50
|
-
const buffer = yield blob_mesh.arrayBuffer();
|
|
51
|
-
vertexArray = new Float32Array(buffer);
|
|
52
|
-
}
|
|
53
|
-
//-- Triangle indexes --
|
|
54
|
-
let indexArray;
|
|
55
|
-
if (Array.isArray(triangleData)) {
|
|
56
|
-
// Input data is native javascript array.
|
|
57
|
-
indexArray = new Uint32Array(triangleData);
|
|
58
|
-
}
|
|
59
|
-
else if (triangleData instanceof Uint32Array) {
|
|
60
|
-
indexArray = triangleData;
|
|
23
|
+
async function loadData(pointsData, triangleData) {
|
|
24
|
+
// Keep
|
|
25
|
+
//const t0 = performance.now();
|
|
26
|
+
//-- Vertexes --
|
|
27
|
+
let vertexArray = new Float32Array();
|
|
28
|
+
if (Array.isArray(pointsData)) {
|
|
29
|
+
// Input data is native javascript array.
|
|
30
|
+
vertexArray = new Float32Array(pointsData);
|
|
31
|
+
}
|
|
32
|
+
else if (pointsData instanceof Float32Array) {
|
|
33
|
+
vertexArray = pointsData;
|
|
34
|
+
}
|
|
35
|
+
else {
|
|
36
|
+
// Input data is an URL.
|
|
37
|
+
const response_mesh = await fetch(pointsData);
|
|
38
|
+
if (!response_mesh.ok) {
|
|
39
|
+
console.error("Could not load vertex data");
|
|
61
40
|
}
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
41
|
+
const blob_mesh = await response_mesh.blob();
|
|
42
|
+
// Load as binary array of floats.
|
|
43
|
+
const buffer = await blob_mesh.arrayBuffer();
|
|
44
|
+
vertexArray = new Float32Array(buffer);
|
|
45
|
+
}
|
|
46
|
+
//-- Triangle indexes --
|
|
47
|
+
let indexArray;
|
|
48
|
+
if (Array.isArray(triangleData)) {
|
|
49
|
+
// Input data is native javascript array.
|
|
50
|
+
indexArray = new Uint32Array(triangleData);
|
|
51
|
+
}
|
|
52
|
+
else if (triangleData instanceof Uint32Array) {
|
|
53
|
+
indexArray = triangleData;
|
|
54
|
+
}
|
|
55
|
+
else {
|
|
56
|
+
// Input data is an URL.
|
|
57
|
+
const response_mesh = await fetch(triangleData);
|
|
58
|
+
if (!response_mesh.ok) {
|
|
59
|
+
console.error("Could not load triangle index data");
|
|
72
60
|
}
|
|
73
|
-
|
|
74
|
-
//
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
}
|
|
61
|
+
const blob_mesh = await response_mesh.blob();
|
|
62
|
+
// Load as binary array of floats.
|
|
63
|
+
const buffer = await blob_mesh.arrayBuffer();
|
|
64
|
+
indexArray = new Uint32Array(buffer);
|
|
65
|
+
}
|
|
66
|
+
//const t1 = performance.now();
|
|
67
|
+
// Keep this.
|
|
68
|
+
//console.log(`Task loading took ${(t1 - t0) * 0.001} seconds.`);
|
|
69
|
+
return Promise.all([vertexArray, indexArray]);
|
|
78
70
|
}
|
|
79
71
|
const defaultProps = {
|
|
80
72
|
"@@type": "TriangleLayer",
|
|
@@ -93,13 +85,12 @@ const defaultProps = {
|
|
|
93
85
|
};
|
|
94
86
|
export default class TriangleLayer extends CompositeLayer {
|
|
95
87
|
get isLoaded() {
|
|
96
|
-
var _a;
|
|
97
88
|
const subLayers = this.getSubLayers();
|
|
98
89
|
const isLoaded = super.isLoaded &&
|
|
99
90
|
subLayers.length > 0 &&
|
|
100
91
|
subLayers.every((layer) => layer.isLoaded);
|
|
101
|
-
const isFinishedLoading =
|
|
102
|
-
const isFinished = isFinishedLoading
|
|
92
|
+
const isFinishedLoading = this.state?.["isFinishedLoading"];
|
|
93
|
+
const isFinished = isFinishedLoading ?? false;
|
|
103
94
|
//const isFinished = this.state?.["isFinishedLoading"] ?? false;
|
|
104
95
|
return isLoaded && isFinished;
|
|
105
96
|
}
|
|
@@ -165,13 +156,19 @@ export default class TriangleLayer extends CompositeLayer {
|
|
|
165
156
|
layerBoundingBox: [xmin, ymin, zmin, xmax, ymax, zmax],
|
|
166
157
|
});
|
|
167
158
|
}
|
|
168
|
-
this.setState(
|
|
159
|
+
this.setState({
|
|
160
|
+
...this.state,
|
|
161
|
+
isFinishedLoading: true,
|
|
162
|
+
});
|
|
169
163
|
onTerminateWorker();
|
|
170
164
|
});
|
|
171
165
|
});
|
|
172
166
|
}
|
|
173
167
|
initializeState() {
|
|
174
|
-
this.setState(
|
|
168
|
+
this.setState({
|
|
169
|
+
...this.state,
|
|
170
|
+
isFinishedLoading: false,
|
|
171
|
+
});
|
|
175
172
|
const reportBoundingBox = true;
|
|
176
173
|
this.rebuildData(reportBoundingBox);
|
|
177
174
|
}
|
|
@@ -181,7 +178,10 @@ export default class TriangleLayer extends CompositeLayer {
|
|
|
181
178
|
!isEqual(props.triangleData, oldProps.triangleData) ||
|
|
182
179
|
!isEqual(props.ZIncreasingDownwards, oldProps.ZIncreasingDownwards);
|
|
183
180
|
if (needs_reload) {
|
|
184
|
-
this.setState(
|
|
181
|
+
this.setState({
|
|
182
|
+
...this.state,
|
|
183
|
+
isFinishedLoading: false,
|
|
184
|
+
});
|
|
185
185
|
const reportBoundingBox = false;
|
|
186
186
|
this.rebuildData(reportBoundingBox);
|
|
187
187
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"triangleLayer.js","sourceRoot":"","sources":["../../../src/layers/triangle/triangleLayer.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"triangleLayer.js","sourceRoot":"","sources":["../../../src/layers/triangle/triangleLayer.ts"],"names":[],"mappings":"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"}
|