itowns 2.42.1-next.14 → 2.42.1-next.16
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/debug.js +1 -1
- package/dist/debug.js.map +1 -1
- package/dist/itowns.js +1 -1
- package/dist/itowns.js.map +1 -1
- package/dist/itowns_widgets.js +1 -1
- package/dist/itowns_widgets.js.map +1 -1
- package/examples/{.eslintrc.js → .eslintrc.cjs} +1 -1
- package/lib/Controls/FirstPersonControls.js +5 -12
- package/lib/Controls/FlyControls.js +4 -13
- package/lib/Controls/GlobeControls.js +33 -43
- package/lib/Controls/PlanarControls.js +9 -20
- package/lib/Controls/StateControl.js +2 -11
- package/lib/Controls/StreetControls.js +14 -24
- package/lib/Converter/Feature2Mesh.js +28 -38
- package/lib/Converter/Feature2Texture.js +15 -25
- package/lib/Converter/convertToTile.js +13 -24
- package/lib/Converter/textureConverter.js +9 -19
- package/lib/Core/3DTiles/C3DTBatchTable.js +5 -13
- package/lib/Core/3DTiles/C3DTBatchTableHierarchyExtension.js +1 -8
- package/lib/Core/3DTiles/C3DTBoundingVolume.js +17 -27
- package/lib/Core/3DTiles/C3DTExtensions.js +1 -8
- package/lib/Core/3DTiles/C3DTFeature.js +3 -10
- package/lib/Core/3DTiles/C3DTilesEnums.js +3 -11
- package/lib/Core/3DTiles/C3DTileset.js +7 -16
- package/lib/Core/3DTiles/utils/BinaryPropertyAccessor.js +5 -11
- package/lib/Core/AnimationPlayer.js +2 -11
- package/lib/Core/Deprecated/Undeprecator.js +8 -19
- package/lib/Core/EntwinePointTileNode.js +6 -16
- package/lib/Core/Feature.js +16 -30
- package/lib/Core/Geographic/CoordStars.js +3 -12
- package/lib/Core/Geographic/Coordinates.js +12 -22
- package/lib/Core/Geographic/Crs.js +7 -15
- package/lib/Core/Geographic/Extent.js +36 -47
- package/lib/Core/Geographic/GeoidGrid.js +6 -16
- package/lib/Core/Label.js +7 -17
- package/lib/Core/MainLoop.js +7 -16
- package/lib/Core/Math/Ellipsoid.js +6 -17
- package/lib/Core/Picking.js +10 -20
- package/lib/Core/PointCloudNode.js +2 -11
- package/lib/Core/PotreeNode.js +4 -13
- package/lib/Core/Prefab/Globe/Atmosphere.js +17 -26
- package/lib/Core/Prefab/Globe/BuilderEllipsoidTile.js +6 -16
- package/lib/Core/Prefab/Globe/GlobeLayer.js +19 -28
- package/lib/Core/Prefab/Globe/SkyShader.js +2 -11
- package/lib/Core/Prefab/GlobeView.js +27 -37
- package/lib/Core/Prefab/Planar/PlanarLayer.js +11 -20
- package/lib/Core/Prefab/Planar/PlanarTileBuilder.js +6 -16
- package/lib/Core/Prefab/PlanarView.js +10 -20
- package/lib/Core/Prefab/TileBuilder.js +10 -19
- package/lib/Core/Prefab/computeBufferTileGeometry.js +3 -12
- package/lib/Core/Scheduler/Cache.js +2 -10
- package/lib/Core/Scheduler/CancelledCommandException.js +1 -8
- package/lib/Core/Scheduler/Scheduler.js +15 -23
- package/lib/Core/Style.js +21 -34
- package/lib/Core/System/Capabilities.js +2 -9
- package/lib/Core/TileGeometry.js +5 -14
- package/lib/Core/TileMesh.js +6 -15
- package/lib/Core/View.js +43 -53
- package/lib/Layer/C3DTilesLayer.js +25 -37
- package/lib/Layer/ColorLayer.js +10 -16
- package/lib/Layer/ElevationLayer.js +7 -14
- package/lib/Layer/EntwinePointTileLayer.js +8 -18
- package/lib/Layer/FeatureGeometryLayer.js +9 -16
- package/lib/Layer/GeoidLayer.js +6 -15
- package/lib/Layer/GeometryLayer.js +11 -17
- package/lib/Layer/InfoLayer.js +5 -14
- package/lib/Layer/LabelLayer.js +22 -32
- package/lib/Layer/Layer.js +16 -26
- package/lib/Layer/LayerUpdateState.js +1 -8
- package/lib/Layer/LayerUpdateStrategy.js +7 -18
- package/lib/Layer/OrientedImageLayer.js +15 -25
- package/lib/Layer/PointCloudLayer.js +9 -19
- package/lib/Layer/PotreeLayer.js +8 -18
- package/lib/Layer/RasterLayer.js +9 -17
- package/lib/Layer/ReferencingLayerProperties.js +1 -8
- package/lib/Layer/TiledGeometryLayer.js +21 -31
- package/lib/Main.js +86 -720
- package/lib/MainBundle.js +4 -34
- package/lib/Parser/B3dmParser.js +20 -28
- package/lib/Parser/CameraCalibrationParser.js +5 -14
- package/lib/Parser/GDFParser.js +11 -22
- package/lib/Parser/GLTFParser.js +13 -28
- package/lib/Parser/GTXParser.js +9 -21
- package/lib/Parser/GeoJsonParser.js +14 -22
- package/lib/Parser/GpxParser.js +7 -14
- package/lib/Parser/ISGParser.js +19 -28
- package/lib/Parser/KMLParser.js +7 -14
- package/lib/Parser/LASLoader.js +11 -16
- package/lib/Parser/LASParser.js +5 -15
- package/lib/Parser/MapBoxUrlParser.js +2 -9
- package/lib/Parser/PntsParser.js +4 -14
- package/lib/Parser/PotreeBinParser.js +3 -11
- package/lib/Parser/PotreeCinParser.js +3 -12
- package/lib/Parser/ShapefileParser.js +11 -18
- package/lib/Parser/VectorTileParser.js +23 -31
- package/lib/Parser/XbilParser.js +5 -13
- package/lib/Parser/deprecated/LegacyGLTFLoader.js +2 -12
- package/lib/Process/3dTilesProcessing.js +14 -27
- package/lib/Process/FeatureProcessing.js +14 -22
- package/lib/Process/LayeredMaterialNodeProcessing.js +14 -26
- package/lib/Process/ObjectRemovalHelper.js +2 -9
- package/lib/Process/handlerNodeError.js +1 -7
- package/lib/Provider/3dTilesProvider.js +16 -27
- package/lib/Provider/DataSourceProvider.js +2 -9
- package/lib/Provider/Fetcher.js +37 -13
- package/lib/Provider/PointCloudProvider.js +5 -15
- package/lib/Provider/TileProvider.js +4 -12
- package/lib/Provider/URLBuilder.js +4 -12
- package/lib/Renderer/Camera.js +7 -17
- package/lib/Renderer/Color.js +3 -11
- package/lib/Renderer/ColorLayersOrdering.js +14 -22
- package/lib/Renderer/CommonMaterial.js +3 -12
- package/lib/Renderer/Label2DRenderer.js +5 -16
- package/lib/Renderer/LayeredMaterial.js +27 -41
- package/lib/Renderer/OBB.js +10 -19
- package/lib/Renderer/OrientedImageCamera.js +2 -11
- package/lib/Renderer/OrientedImageMaterial.js +7 -17
- package/lib/Renderer/PointsMaterial.js +34 -48
- package/lib/Renderer/RasterTile.js +16 -29
- package/lib/Renderer/RenderMode.js +2 -9
- package/lib/Renderer/Shader/ShaderChunk.js +2 -11
- package/lib/Renderer/Shader/ShaderUtils.js +2 -9
- package/lib/Renderer/SphereHelper.js +2 -11
- package/lib/Renderer/WebXR.js +2 -11
- package/lib/Renderer/c3DEngine.js +18 -28
- package/lib/Source/C3DTilesGoogleSource.js +5 -13
- package/lib/Source/C3DTilesIonSource.js +6 -13
- package/lib/Source/C3DTilesSource.js +5 -12
- package/lib/Source/EntwinePointTileSource.js +12 -19
- package/lib/Source/FileSource.js +7 -14
- package/lib/Source/OrientedImageSource.js +6 -14
- package/lib/Source/PotreeSource.js +9 -16
- package/lib/Source/Source.js +26 -39
- package/lib/Source/TMSSource.js +11 -22
- package/lib/Source/VectorTilesSource.js +75 -34
- package/lib/Source/WFSSource.js +7 -14
- package/lib/Source/WMSSource.js +5 -12
- package/lib/Source/WMTSSource.js +3 -10
- package/lib/ThreeExtended/capabilities/WebGL.js +1 -8
- package/lib/ThreeExtended/libs/ktx-parse.module.js +2 -256
- package/lib/ThreeExtended/libs/zstddec.module.js +2 -8
- package/lib/ThreeExtended/loaders/DDSLoader.js +10 -16
- package/lib/ThreeExtended/loaders/DRACOLoader.js +14 -19
- package/lib/ThreeExtended/loaders/GLTFLoader.js +124 -129
- package/lib/ThreeExtended/loaders/KTX2Loader.js +73 -78
- package/lib/ThreeExtended/utils/BufferGeometryUtils.js +40 -59
- package/lib/ThreeExtended/utils/WorkerPool.js +2 -9
- package/lib/Utils/CameraUtils.js +32 -44
- package/lib/Utils/DEMUtils.js +8 -19
- package/lib/Utils/FeaturesUtils.js +8 -16
- package/lib/Utils/Gradients.js +3 -12
- package/lib/Utils/OrientationUtils.js +8 -18
- package/lib/Utils/ThreeUtils.js +2 -9
- package/lib/Utils/gui/C3DTilesStyle.js +7 -15
- package/lib/Utils/gui/Main.js +7 -48
- package/lib/Utils/gui/Minimap.js +12 -20
- package/lib/Utils/gui/Navigation.js +6 -14
- package/lib/Utils/gui/Scale.js +11 -19
- package/lib/Utils/gui/Searchbar.js +5 -13
- package/lib/Utils/gui/Widget.js +1 -8
- package/lib/Utils/placeObjectOnGround.js +13 -23
- package/package.json +10 -7
|
@@ -1,15 +1,6 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
Object.defineProperty(exports, "__esModule", {
|
|
5
|
-
value: true
|
|
6
|
-
});
|
|
7
|
-
exports.default = void 0;
|
|
8
|
-
var THREE = _interopRequireWildcard(require("three"));
|
|
9
|
-
var _Coordinates = _interopRequireDefault(require("../../Geographic/Coordinates"));
|
|
10
|
-
var _Extent = _interopRequireDefault(require("../../Geographic/Extent"));
|
|
11
|
-
function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
|
|
12
|
-
function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
|
|
1
|
+
import * as THREE from 'three';
|
|
2
|
+
import Coordinates from "../../Geographic/Coordinates.js";
|
|
3
|
+
import Extent from "../../Geographic/Extent.js";
|
|
13
4
|
const quaternion = new THREE.Quaternion();
|
|
14
5
|
const center = new THREE.Vector3();
|
|
15
6
|
class PlanarTileBuilder {
|
|
@@ -26,7 +17,7 @@ class PlanarTileBuilder {
|
|
|
26
17
|
throw new Error('options.crs is mandatory for PlanarTileBuilder');
|
|
27
18
|
}
|
|
28
19
|
this.tmp = {
|
|
29
|
-
coords: new
|
|
20
|
+
coords: new Coordinates('EPSG:4326', 0, 0),
|
|
30
21
|
position: new THREE.Vector3(),
|
|
31
22
|
normal: new THREE.Vector3(0, 0, 1)
|
|
32
23
|
};
|
|
@@ -70,7 +61,7 @@ class PlanarTileBuilder {
|
|
|
70
61
|
// compute sharable extent to pool the geometries
|
|
71
62
|
// the geometry in common extent is identical to the existing input
|
|
72
63
|
// with a translation
|
|
73
|
-
const sharableExtent = new
|
|
64
|
+
const sharableExtent = new Extent(extent.crs, 0, Math.abs(extent.west - extent.east), 0, Math.abs(extent.north - extent.south));
|
|
74
65
|
return {
|
|
75
66
|
sharableExtent,
|
|
76
67
|
quaternion,
|
|
@@ -78,5 +69,4 @@ class PlanarTileBuilder {
|
|
|
78
69
|
};
|
|
79
70
|
}
|
|
80
71
|
}
|
|
81
|
-
|
|
82
|
-
exports.default = _default;
|
|
72
|
+
export default PlanarTileBuilder;
|
|
@@ -1,18 +1,9 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
exports.default = void 0;
|
|
8
|
-
var THREE = _interopRequireWildcard(require("three"));
|
|
9
|
-
var _View = _interopRequireDefault(require("../View"));
|
|
10
|
-
var _CameraUtils = _interopRequireDefault(require("../../Utils/CameraUtils"));
|
|
11
|
-
var _PlanarControls = _interopRequireDefault(require("../../Controls/PlanarControls"));
|
|
12
|
-
var _PlanarLayer = _interopRequireDefault(require("./Planar/PlanarLayer"));
|
|
13
|
-
function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
|
|
14
|
-
function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
|
|
15
|
-
class PlanarView extends _View.default {
|
|
1
|
+
import * as THREE from 'three';
|
|
2
|
+
import View from "../View.js";
|
|
3
|
+
import CameraUtils from "../../Utils/CameraUtils.js";
|
|
4
|
+
import PlanarControls from "../../Controls/PlanarControls.js";
|
|
5
|
+
import PlanarLayer from "./Planar/PlanarLayer.js";
|
|
6
|
+
class PlanarView extends View {
|
|
16
7
|
/**
|
|
17
8
|
* @constructor
|
|
18
9
|
* @extends View
|
|
@@ -52,7 +43,7 @@ class PlanarView extends _View.default {
|
|
|
52
43
|
this.camera3D.near = 0.1;
|
|
53
44
|
this.camera3D.far = this.camera3D.isOrthographicCamera ? 2000 : 2 * max;
|
|
54
45
|
this.camera3D.updateProjectionMatrix();
|
|
55
|
-
const tileLayer = new
|
|
46
|
+
const tileLayer = new PlanarLayer('planar', extent, options.object3d, options);
|
|
56
47
|
this.mainLoop.gfxEngine.label2dRenderer.infoTileLayer = tileLayer.info;
|
|
57
48
|
this.addLayer(tileLayer);
|
|
58
49
|
|
|
@@ -64,9 +55,9 @@ class PlanarView extends _View.default {
|
|
|
64
55
|
placement.heading = placement.heading || 0;
|
|
65
56
|
placement.range = placement.range || max;
|
|
66
57
|
}
|
|
67
|
-
|
|
58
|
+
CameraUtils.transformCameraToLookAtTarget(this, this.camera3D, placement);
|
|
68
59
|
if (!options.noControls) {
|
|
69
|
-
this.controls = new
|
|
60
|
+
this.controls = new PlanarControls(this, options.controls);
|
|
70
61
|
}
|
|
71
62
|
this.tileLayer = tileLayer;
|
|
72
63
|
}
|
|
@@ -74,5 +65,4 @@ class PlanarView extends _View.default {
|
|
|
74
65
|
return super.addLayer(layer, this.tileLayer);
|
|
75
66
|
}
|
|
76
67
|
}
|
|
77
|
-
|
|
78
|
-
exports.default = _default;
|
|
68
|
+
export default PlanarView;
|
|
@@ -1,20 +1,11 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
});
|
|
7
|
-
exports.default = newTileGeometry;
|
|
8
|
-
var THREE = _interopRequireWildcard(require("three"));
|
|
9
|
-
var _TileGeometry = _interopRequireDefault(require("../TileGeometry"));
|
|
10
|
-
var _Cache = _interopRequireDefault(require("../Scheduler/Cache"));
|
|
11
|
-
var _computeBufferTileGeometry = _interopRequireDefault(require("./computeBufferTileGeometry"));
|
|
12
|
-
var _OBB = _interopRequireDefault(require("../../Renderer/OBB"));
|
|
13
|
-
function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
|
|
14
|
-
function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
|
|
1
|
+
import * as THREE from 'three';
|
|
2
|
+
import TileGeometry from "../TileGeometry.js";
|
|
3
|
+
import Cache from "../Scheduler/Cache.js";
|
|
4
|
+
import computeBuffers from "./computeBufferTileGeometry.js";
|
|
5
|
+
import OBB from "../../Renderer/OBB.js";
|
|
15
6
|
const cacheBuffer = new Map();
|
|
16
|
-
const cacheTile = new
|
|
17
|
-
function newTileGeometry(builder, params) {
|
|
7
|
+
const cacheTile = new Cache();
|
|
8
|
+
export default function newTileGeometry(builder, params) {
|
|
18
9
|
const {
|
|
19
10
|
sharableExtent,
|
|
20
11
|
quaternion,
|
|
@@ -39,7 +30,7 @@ function newTileGeometry(builder, params) {
|
|
|
39
30
|
params.builder = builder;
|
|
40
31
|
let buffers;
|
|
41
32
|
try {
|
|
42
|
-
buffers = (
|
|
33
|
+
buffers = computeBuffers(params);
|
|
43
34
|
} catch (e) {
|
|
44
35
|
return Promise.reject(e);
|
|
45
36
|
}
|
|
@@ -58,8 +49,8 @@ function newTileGeometry(builder, params) {
|
|
|
58
49
|
if (params.builder.uvCount > 1) {
|
|
59
50
|
buffers.uvs[1] = new THREE.BufferAttribute(buffers.uvs[1], 1);
|
|
60
51
|
}
|
|
61
|
-
const geometry = new
|
|
62
|
-
geometry.OBB = new
|
|
52
|
+
const geometry = new TileGeometry(params, buffers);
|
|
53
|
+
geometry.OBB = new OBB(geometry.boundingBox.min, geometry.boundingBox.max);
|
|
63
54
|
geometry._count = 0;
|
|
64
55
|
geometry.dispose = () => {
|
|
65
56
|
geometry._count--;
|
|
@@ -1,18 +1,9 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
Object.defineProperty(exports, "__esModule", {
|
|
4
|
-
value: true
|
|
5
|
-
});
|
|
6
|
-
exports.default = computeBuffers;
|
|
7
|
-
exports.getBufferIndexSize = getBufferIndexSize;
|
|
8
|
-
var THREE = _interopRequireWildcard(require("three"));
|
|
9
|
-
function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
|
|
10
|
-
function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
|
|
11
|
-
function getBufferIndexSize(segments, noSkirt) {
|
|
1
|
+
import * as THREE from 'three';
|
|
2
|
+
export function getBufferIndexSize(segments, noSkirt) {
|
|
12
3
|
const triangles = segments * segments * 2 + (noSkirt ? 0 : 4 * segments * 2);
|
|
13
4
|
return triangles * 3;
|
|
14
5
|
}
|
|
15
|
-
function computeBuffers(params) {
|
|
6
|
+
export default function computeBuffers(params) {
|
|
16
7
|
// Create output buffers.
|
|
17
8
|
const outBuffers = {
|
|
18
9
|
index: null,
|
|
@@ -1,9 +1,3 @@
|
|
|
1
|
-
"use strict";
|
|
2
|
-
|
|
3
|
-
Object.defineProperty(exports, "__esModule", {
|
|
4
|
-
value: true
|
|
5
|
-
});
|
|
6
|
-
exports.default = exports.CACHE_POLICIES = void 0;
|
|
7
1
|
let entry;
|
|
8
2
|
|
|
9
3
|
/**
|
|
@@ -18,7 +12,7 @@ let entry;
|
|
|
18
12
|
* @property {number} GEOMETRY - Shortcut for geometry resources. Time is 15 minutes.
|
|
19
13
|
* minutes.
|
|
20
14
|
*/
|
|
21
|
-
const CACHE_POLICIES = {
|
|
15
|
+
export const CACHE_POLICIES = {
|
|
22
16
|
INFINITE: Infinity,
|
|
23
17
|
TEXTURE: 900000,
|
|
24
18
|
GEOMETRY: 900000
|
|
@@ -43,7 +37,6 @@ const CACHE_POLICIES = {
|
|
|
43
37
|
*
|
|
44
38
|
* cache.flush();
|
|
45
39
|
*/
|
|
46
|
-
exports.CACHE_POLICIES = CACHE_POLICIES;
|
|
47
40
|
class Cache {
|
|
48
41
|
/**
|
|
49
42
|
* @param {number} [lifetime=CACHE_POLICIES.INFINITE] The cache expiration time for all values.
|
|
@@ -260,5 +253,4 @@ class Cache {
|
|
|
260
253
|
}
|
|
261
254
|
}
|
|
262
255
|
}
|
|
263
|
-
|
|
264
|
-
exports.default = _default;
|
|
256
|
+
export default Cache;
|
|
@@ -1,9 +1,3 @@
|
|
|
1
|
-
"use strict";
|
|
2
|
-
|
|
3
|
-
Object.defineProperty(exports, "__esModule", {
|
|
4
|
-
value: true
|
|
5
|
-
});
|
|
6
|
-
exports.default = void 0;
|
|
7
1
|
/**
|
|
8
2
|
* Custom error thrown when cancelling commands. Allows the caller to act differently if needed.
|
|
9
3
|
* @class
|
|
@@ -18,5 +12,4 @@ class CancelledCommandException {
|
|
|
18
12
|
return `Cancelled command ${this.command.requester.id}/${this.command.layer.id}`;
|
|
19
13
|
}
|
|
20
14
|
}
|
|
21
|
-
|
|
22
|
-
exports.default = _default;
|
|
15
|
+
export default CancelledCommandException;
|
|
@@ -1,23 +1,16 @@
|
|
|
1
|
-
"use strict";
|
|
2
|
-
|
|
3
|
-
var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
|
|
4
|
-
Object.defineProperty(exports, "__esModule", {
|
|
5
|
-
value: true
|
|
6
|
-
});
|
|
7
|
-
exports.default = void 0;
|
|
8
|
-
var _jsPriorityQueue = _interopRequireDefault(require("js-priority-queue"));
|
|
9
|
-
var _DataSourceProvider = _interopRequireDefault(require("../../Provider/DataSourceProvider"));
|
|
10
|
-
var _TileProvider = _interopRequireDefault(require("../../Provider/TileProvider"));
|
|
11
|
-
var _dTilesProvider = _interopRequireDefault(require("../../Provider/3dTilesProvider"));
|
|
12
|
-
var _PointCloudProvider = _interopRequireDefault(require("../../Provider/PointCloudProvider"));
|
|
13
|
-
var _URLBuilder = _interopRequireDefault(require("../../Provider/URLBuilder"));
|
|
14
|
-
var _CancelledCommandException = _interopRequireDefault(require("./CancelledCommandException"));
|
|
15
1
|
/**
|
|
16
2
|
* Generated On: 2015-10-5
|
|
17
3
|
* Class: Scheduler
|
|
18
4
|
* Description: Cette classe singleton gère les requetes/Commandes de la scène. Ces commandes peuvent etre synchrone ou asynchrone. Elle permet d'executer, de prioriser et d'annuler les commandes de la pile. Les commandes executées sont placées dans une autre file d'attente.
|
|
19
5
|
*/
|
|
20
6
|
|
|
7
|
+
import PriorityQueue from 'js-priority-queue';
|
|
8
|
+
import DataSourceProvider from "../../Provider/DataSourceProvider.js";
|
|
9
|
+
import TileProvider from "../../Provider/TileProvider.js";
|
|
10
|
+
import $3dTilesProvider from "../../Provider/3dTilesProvider.js";
|
|
11
|
+
import PointCloudProvider from "../../Provider/PointCloudProvider.js";
|
|
12
|
+
import URLBuilder from "../../Provider/URLBuilder.js";
|
|
13
|
+
import CancelledCommandException from "./CancelledCommandException.js";
|
|
21
14
|
function queueOrdering(a, b) {
|
|
22
15
|
const cmp = b.priority - a.priority;
|
|
23
16
|
// Prioritize recent commands
|
|
@@ -56,7 +49,7 @@ function _instanciateQueue() {
|
|
|
56
49
|
let st = this.storages.get(layer.id);
|
|
57
50
|
if (!st) {
|
|
58
51
|
st = {
|
|
59
|
-
q: new
|
|
52
|
+
q: new PriorityQueue({
|
|
60
53
|
comparator: queueOrdering
|
|
61
54
|
}),
|
|
62
55
|
priority: 1,
|
|
@@ -120,9 +113,9 @@ function Scheduler() {
|
|
|
120
113
|
Scheduler.prototype.constructor = Scheduler;
|
|
121
114
|
Scheduler.prototype.initDefaultProviders = function () {
|
|
122
115
|
// Register all providers
|
|
123
|
-
this.addProtocolProvider('tile',
|
|
124
|
-
this.addProtocolProvider('3d-tiles',
|
|
125
|
-
this.addProtocolProvider('pointcloud',
|
|
116
|
+
this.addProtocolProvider('tile', TileProvider);
|
|
117
|
+
this.addProtocolProvider('3d-tiles', $3dTilesProvider);
|
|
118
|
+
this.addProtocolProvider('pointcloud', PointCloudProvider);
|
|
126
119
|
};
|
|
127
120
|
Scheduler.prototype.runCommand = function (command, queue, executingCounterUpToDate) {
|
|
128
121
|
const provider = this.getProtocolProvider(command.layer.protocol);
|
|
@@ -147,7 +140,7 @@ Scheduler.prototype.execute = function (command) {
|
|
|
147
140
|
|
|
148
141
|
// parse host
|
|
149
142
|
const layer = command.layer;
|
|
150
|
-
const host = layer.source && layer.source.url ? new URL(
|
|
143
|
+
const host = layer.source && layer.source.url ? new URL(URLBuilder.subDomains(layer.source.url), document.location).host : undefined;
|
|
151
144
|
command.promise = new Promise((resolve, reject) => {
|
|
152
145
|
command.resolve = resolve;
|
|
153
146
|
command.reject = reject;
|
|
@@ -259,7 +252,7 @@ Scheduler.prototype.addProtocolProvider = function (protocol, provider) {
|
|
|
259
252
|
* @return {Provider}
|
|
260
253
|
*/
|
|
261
254
|
Scheduler.prototype.getProtocolProvider = function (protocol) {
|
|
262
|
-
return this.providers[protocol] ||
|
|
255
|
+
return this.providers[protocol] || DataSourceProvider;
|
|
263
256
|
};
|
|
264
257
|
Scheduler.prototype.commandsWaitingExecutionCount = function () {
|
|
265
258
|
let sum = this.defaultQueue.counters.pending + this.defaultQueue.counters.executing;
|
|
@@ -291,12 +284,11 @@ Scheduler.prototype.deQueue = function (queue) {
|
|
|
291
284
|
if (cmd.earlyDropFunction && cmd.earlyDropFunction(cmd)) {
|
|
292
285
|
queue.counters.pending--;
|
|
293
286
|
queue.counters.cancelled++;
|
|
294
|
-
cmd.reject(new
|
|
287
|
+
cmd.reject(new CancelledCommandException(cmd));
|
|
295
288
|
} else {
|
|
296
289
|
return cmd;
|
|
297
290
|
}
|
|
298
291
|
}
|
|
299
292
|
return undefined;
|
|
300
293
|
};
|
|
301
|
-
|
|
302
|
-
exports.default = _default;
|
|
294
|
+
export default Scheduler;
|
package/lib/Core/Style.js
CHANGED
|
@@ -1,24 +1,13 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
}
|
|
7
|
-
|
|
8
|
-
exports.readExpression = readExpression;
|
|
9
|
-
var _Feature = require("./Feature");
|
|
10
|
-
var _Cache = _interopRequireDefault(require("./Scheduler/Cache"));
|
|
11
|
-
var _Fetcher = _interopRequireDefault(require("../Provider/Fetcher"));
|
|
12
|
-
var mapbox = _interopRequireWildcard(require("@mapbox/mapbox-gl-style-spec"));
|
|
13
|
-
var _three = require("three");
|
|
14
|
-
var _Color = require("../Renderer/Color");
|
|
15
|
-
var _Coordinates = _interopRequireDefault(require("./Geographic/Coordinates"));
|
|
16
|
-
function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
|
|
17
|
-
function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
|
|
1
|
+
import { FEATURE_TYPES } from "./Feature.js";
|
|
2
|
+
import Cache from "./Scheduler/Cache.js";
|
|
3
|
+
import Fetcher from "../Provider/Fetcher.js";
|
|
4
|
+
import * as mapbox from '@mapbox/mapbox-gl-style-spec';
|
|
5
|
+
import { Color } from 'three';
|
|
6
|
+
import { deltaE } from "../Renderer/Color.js";
|
|
7
|
+
import Coordinates from "./Geographic/Coordinates.js";
|
|
18
8
|
/* babel-plugin-inline-import './StyleChunk/itowns_stroke_single_before.css' */
|
|
19
9
|
const itowns_stroke_single_before = ".itowns-stroke-single:before {\n display: var(--text_stroke_display);\n content: attr(data-before);\n opacity: 1;\n position: absolute;\n -webkit-text-stroke-width: var(--text_stroke_width);\n -webkit-text-stroke-color: var(--text_stroke_color);\n left: 0;\n right: 0;\n bottom: 0;\n top: 0;\n z-index: -1;\n white-space: inherit;\n overflow-wrap: inherit;\n letter-spacing: inherit;\n text-align: inherit;\n padding: inherit;\n font-family: inherit;\n text-transform: inherit;\n max-width: inherit;\n font-size: inherit;\n}\n";
|
|
20
|
-
const cacheStyle = new
|
|
21
|
-
exports.cacheStyle = cacheStyle;
|
|
10
|
+
export const cacheStyle = new Cache();
|
|
22
11
|
const matrix = document.createElementNS('http://www.w3.org/2000/svg', 'svg').createSVGMatrix();
|
|
23
12
|
const canvas = document.createElement('canvas');
|
|
24
13
|
const inv255 = 1 / 255;
|
|
@@ -26,7 +15,7 @@ function baseAltitudeDefault(properties, ctx) {
|
|
|
26
15
|
var _ctx$coordinates;
|
|
27
16
|
return (ctx === null || ctx === void 0 ? void 0 : (_ctx$coordinates = ctx.coordinates) === null || _ctx$coordinates === void 0 ? void 0 : _ctx$coordinates.z) || 0;
|
|
28
17
|
}
|
|
29
|
-
function readExpression(property, ctx) {
|
|
18
|
+
export function readExpression(property, ctx) {
|
|
30
19
|
if (property != undefined) {
|
|
31
20
|
if (property.expression) {
|
|
32
21
|
return property.expression.evaluate(ctx);
|
|
@@ -94,7 +83,7 @@ function readVectorProperty(property, options) {
|
|
|
94
83
|
async function loadImage(source) {
|
|
95
84
|
let promise = cacheStyle.get(source, 'null');
|
|
96
85
|
if (!promise) {
|
|
97
|
-
promise =
|
|
86
|
+
promise = Fetcher.texture(source, {
|
|
98
87
|
crossOrigin: 'anonymous'
|
|
99
88
|
});
|
|
100
89
|
cacheStyle.set(promise, source, 'null');
|
|
@@ -121,10 +110,10 @@ function replaceWhitePxl(imgd, color, id) {
|
|
|
121
110
|
const imgdColored = cacheStyle.get(id, color);
|
|
122
111
|
if (!imgdColored) {
|
|
123
112
|
const pix = imgd.data;
|
|
124
|
-
const newColor = new
|
|
125
|
-
const colorToChange = new
|
|
113
|
+
const newColor = new Color(color);
|
|
114
|
+
const colorToChange = new Color('white');
|
|
126
115
|
for (let i = 0, n = pix.length; i < n; i += 4) {
|
|
127
|
-
const d =
|
|
116
|
+
const d = deltaE(pix.slice(i, i + 3), colorToChange) / 100;
|
|
128
117
|
pix[i] = pix[i] * d + newColor.r * 255 * (1 - d);
|
|
129
118
|
pix[i + 1] = pix[i + 1] * d + newColor.g * 255 * (1 - d);
|
|
130
119
|
pix[i + 2] = pix[i + 2] * d + newColor.b * 255 * (1 - d);
|
|
@@ -210,9 +199,9 @@ function defineStyleProperty(style, category, parameter, userValue, defaultValue
|
|
|
210
199
|
* @property {Feature} feature @private The itowns feature of interest.
|
|
211
200
|
* @property {FeatureGeometry} geometry @private The FeatureGeometry to compute the style.
|
|
212
201
|
*/
|
|
213
|
-
class StyleContext {
|
|
214
|
-
#worldCoord = new
|
|
215
|
-
#localCoordinates = new
|
|
202
|
+
export class StyleContext {
|
|
203
|
+
#worldCoord = new Coordinates('EPSG:4326', 0, 0, 0);
|
|
204
|
+
#localCoordinates = new Coordinates('EPSG:4326', 0, 0, 0);
|
|
216
205
|
#worldCoordsComputed = true;
|
|
217
206
|
#feature = {};
|
|
218
207
|
#geometry = {};
|
|
@@ -257,7 +246,6 @@ class StyleContext {
|
|
|
257
246
|
return this.#worldCoord;
|
|
258
247
|
}
|
|
259
248
|
}
|
|
260
|
-
exports.StyleContext = StyleContext;
|
|
261
249
|
function _addIcon(icon, domElement, opt) {
|
|
262
250
|
const cIcon = icon.cloneNode();
|
|
263
251
|
cIcon.setAttribute('class', 'itowns-icon');
|
|
@@ -458,7 +446,7 @@ function _addIcon(icon, domElement, opt) {
|
|
|
458
446
|
* Used for the instanciation of a {@link Style}.
|
|
459
447
|
* @hideconstructor
|
|
460
448
|
*/
|
|
461
|
-
class StyleOptions {}
|
|
449
|
+
export class StyleOptions {}
|
|
462
450
|
|
|
463
451
|
/**
|
|
464
452
|
* @class
|
|
@@ -628,7 +616,7 @@ class StyleOptions {}
|
|
|
628
616
|
*
|
|
629
617
|
* view.addLayer(layer);
|
|
630
618
|
*/
|
|
631
|
-
|
|
619
|
+
|
|
632
620
|
class Style {
|
|
633
621
|
/**
|
|
634
622
|
* @param {StyleOptions} [params={}] An object that contain any properties
|
|
@@ -745,7 +733,7 @@ class Style {
|
|
|
745
733
|
static setFromProperties(properties, featCtx) {
|
|
746
734
|
const type = featCtx.type;
|
|
747
735
|
const style = {};
|
|
748
|
-
if (type ===
|
|
736
|
+
if (type === FEATURE_TYPES.POINT) {
|
|
749
737
|
const point = {
|
|
750
738
|
...(properties.fill !== undefined && {
|
|
751
739
|
color: properties.fill
|
|
@@ -809,7 +797,7 @@ class Style {
|
|
|
809
797
|
if (Object.keys(stroke).length) {
|
|
810
798
|
style.stroke = stroke;
|
|
811
799
|
}
|
|
812
|
-
if (type !==
|
|
800
|
+
if (type !== FEATURE_TYPES.LINE) {
|
|
813
801
|
const fill = {
|
|
814
802
|
...(properties.fill !== undefined && {
|
|
815
803
|
color: properties.fill
|
|
@@ -1138,5 +1126,4 @@ Object.keys(CustomStyle).forEach(key => {
|
|
|
1138
1126
|
if (typeof document !== 'undefined') {
|
|
1139
1127
|
document.getElementsByTagName('head')[0].appendChild(customStyleSheet);
|
|
1140
1128
|
}
|
|
1141
|
-
|
|
1142
|
-
exports.default = _default;
|
|
1129
|
+
export default Style;
|
|
@@ -1,9 +1,3 @@
|
|
|
1
|
-
"use strict";
|
|
2
|
-
|
|
3
|
-
Object.defineProperty(exports, "__esModule", {
|
|
4
|
-
value: true
|
|
5
|
-
});
|
|
6
|
-
exports.default = void 0;
|
|
7
1
|
/* babel-plugin-inline-import '../../Renderer/Shader/SampleTestFS.glsl' */
|
|
8
2
|
const SampleTestFS = "uniform sampler2D uni[SAMPLE];\nvoid main() {\n gl_FragColor += texture2D(uni[SAMPLE-1], vec2(0));\n}";
|
|
9
3
|
/* babel-plugin-inline-import '../../Renderer/Shader/SampleTestVS.glsl' */
|
|
@@ -21,7 +15,7 @@ function _WebGLShader(renderer, type, string) {
|
|
|
21
15
|
function isFirefox() {
|
|
22
16
|
return navigator && navigator.userAgent && navigator.userAgent.toLowerCase().includes('firefox');
|
|
23
17
|
}
|
|
24
|
-
|
|
18
|
+
export default {
|
|
25
19
|
isLogDepthBufferSupported() {
|
|
26
20
|
return logDepthBufferSupported;
|
|
27
21
|
},
|
|
@@ -70,5 +64,4 @@ var _default = {
|
|
|
70
64
|
gl.deleteShader(glFragmentShader);
|
|
71
65
|
logDepthBufferSupported = renderer.capabilities.logarithmicDepthBuffer;
|
|
72
66
|
}
|
|
73
|
-
};
|
|
74
|
-
exports.default = _default;
|
|
67
|
+
};
|
package/lib/Core/TileGeometry.js
CHANGED
|
@@ -1,17 +1,9 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
Object.defineProperty(exports, "__esModule", {
|
|
4
|
-
value: true
|
|
5
|
-
});
|
|
6
|
-
exports.default = void 0;
|
|
7
|
-
var THREE = _interopRequireWildcard(require("three"));
|
|
8
|
-
var _computeBufferTileGeometry = _interopRequireWildcard(require("./Prefab/computeBufferTileGeometry"));
|
|
9
|
-
function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
|
|
10
|
-
function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
|
|
1
|
+
import * as THREE from 'three';
|
|
2
|
+
import computeBuffers, { getBufferIndexSize } from "./Prefab/computeBufferTileGeometry.js";
|
|
11
3
|
function defaultBuffers(params) {
|
|
12
4
|
params.buildIndexAndUv_0 = true;
|
|
13
5
|
params.center = params.builder.center(params.extent).clone();
|
|
14
|
-
const buffers = (
|
|
6
|
+
const buffers = computeBuffers(params);
|
|
15
7
|
buffers.index = new THREE.BufferAttribute(buffers.index, 1);
|
|
16
8
|
buffers.uvs[0] = new THREE.BufferAttribute(buffers.uvs[0], 2);
|
|
17
9
|
buffers.position = new THREE.BufferAttribute(buffers.position, 3);
|
|
@@ -41,8 +33,7 @@ class TileGeometry extends THREE.BufferGeometry {
|
|
|
41
33
|
}
|
|
42
34
|
}
|
|
43
35
|
set hideSkirt(value) {
|
|
44
|
-
this.setDrawRange(0,
|
|
36
|
+
this.setDrawRange(0, getBufferIndexSize(this.segments, value));
|
|
45
37
|
}
|
|
46
38
|
}
|
|
47
|
-
|
|
48
|
-
exports.default = _default;
|
|
39
|
+
export default TileGeometry;
|
package/lib/Core/TileMesh.js
CHANGED
|
@@ -1,15 +1,7 @@
|
|
|
1
|
-
|
|
1
|
+
import * as THREE from 'three';
|
|
2
|
+
import CRS from "./Geographic/Crs.js";
|
|
3
|
+
import { geoidLayerIsVisible } from "../Layer/GeoidLayer.js";
|
|
2
4
|
|
|
3
|
-
var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
|
|
4
|
-
Object.defineProperty(exports, "__esModule", {
|
|
5
|
-
value: true
|
|
6
|
-
});
|
|
7
|
-
exports.default = void 0;
|
|
8
|
-
var THREE = _interopRequireWildcard(require("three"));
|
|
9
|
-
var _Crs = _interopRequireDefault(require("./Geographic/Crs"));
|
|
10
|
-
var _GeoidLayer = require("../Layer/GeoidLayer");
|
|
11
|
-
function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
|
|
12
|
-
function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
|
|
13
5
|
/**
|
|
14
6
|
* A TileMesh is a THREE.Mesh with a geometricError and an OBB
|
|
15
7
|
* The objectId property of the material is the with the id of the TileMesh
|
|
@@ -71,7 +63,7 @@ class TileMesh extends THREE.Mesh {
|
|
|
71
63
|
* @param {number} [elevation.scale]
|
|
72
64
|
*/
|
|
73
65
|
setBBoxZ(elevation) {
|
|
74
|
-
elevation.geoidHeight =
|
|
66
|
+
elevation.geoidHeight = geoidLayerIsVisible(this.layer) ? this.geoidHeight : 0;
|
|
75
67
|
this.obb.updateZ(elevation);
|
|
76
68
|
if (this.horizonCullingPointElevationScaled) {
|
|
77
69
|
this.horizonCullingPointElevationScaled.setLength(this.obb.z.delta + this.horizonCullingPoint.length());
|
|
@@ -79,7 +71,7 @@ class TileMesh extends THREE.Mesh {
|
|
|
79
71
|
this.obb.box3D.getBoundingSphere(this.boundingSphere);
|
|
80
72
|
}
|
|
81
73
|
getExtentsByProjection(crs) {
|
|
82
|
-
return this.#_tms.get(
|
|
74
|
+
return this.#_tms.get(CRS.formatToTms(crs));
|
|
83
75
|
}
|
|
84
76
|
|
|
85
77
|
/**
|
|
@@ -114,5 +106,4 @@ class TileMesh extends THREE.Mesh {
|
|
|
114
106
|
}
|
|
115
107
|
}
|
|
116
108
|
}
|
|
117
|
-
|
|
118
|
-
exports.default = _default;
|
|
109
|
+
export default TileMesh;
|