itowns 2.42.1-next.15 → 2.42.1-next.17
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 +13 -21
- 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 +18 -26
- 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 +6 -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 +15 -28
- 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 -13
- package/lib/Source/PotreeSource.js +9 -16
- package/lib/Source/Source.js +17 -26
- package/lib/Source/TMSSource.js +11 -21
- package/lib/Source/VectorTilesSource.js +18 -26
- 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,21 +1,12 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
var _InfoLayer = require("./InfoLayer");
|
|
11
|
-
var _Picking = _interopRequireDefault(require("../Core/Picking"));
|
|
12
|
-
var _convertToTile = _interopRequireDefault(require("../Converter/convertToTile"));
|
|
13
|
-
var _ObjectRemovalHelper = _interopRequireDefault(require("../Process/ObjectRemovalHelper"));
|
|
14
|
-
var _LayeredMaterialNodeProcessing = require("../Process/LayeredMaterialNodeProcessing");
|
|
15
|
-
var _Layer = require("./Layer");
|
|
16
|
-
var _Cache = require("../Core/Scheduler/Cache");
|
|
17
|
-
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); }
|
|
18
|
-
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 GeometryLayer from "./GeometryLayer.js";
|
|
3
|
+
import { InfoTiledGeometryLayer } from "./InfoLayer.js";
|
|
4
|
+
import Picking from "../Core/Picking.js";
|
|
5
|
+
import convertToTile from "../Converter/convertToTile.js";
|
|
6
|
+
import ObjectRemovalHelper from "../Process/ObjectRemovalHelper.js";
|
|
7
|
+
import { SIZE_DIAGONAL_TEXTURE } from "../Process/LayeredMaterialNodeProcessing.js";
|
|
8
|
+
import { ImageryLayers } from "./Layer.js";
|
|
9
|
+
import { CACHE_POLICIES } from "../Core/Scheduler/Cache.js";
|
|
19
10
|
const subdivisionVector = new THREE.Vector3();
|
|
20
11
|
const boundingSphereCenter = new THREE.Vector3();
|
|
21
12
|
|
|
@@ -27,7 +18,7 @@ const boundingSphereCenter = new THREE.Vector3();
|
|
|
27
18
|
* @property {boolean} hideSkirt (default false) - Used to hide the skirt (tile borders).
|
|
28
19
|
* Useful when the layer opacity < 1
|
|
29
20
|
*/
|
|
30
|
-
class TiledGeometryLayer extends
|
|
21
|
+
class TiledGeometryLayer extends GeometryLayer {
|
|
31
22
|
/**
|
|
32
23
|
* A layer extending the {@link GeometryLayer}, but with a tiling notion.
|
|
33
24
|
*
|
|
@@ -70,7 +61,7 @@ class TiledGeometryLayer extends _GeometryLayer.default {
|
|
|
70
61
|
*/
|
|
71
62
|
constructor(id, object3d, schemeTile, builder, config) {
|
|
72
63
|
// cacheLifeTime = CACHE_POLICIES.INFINITE because the cache is handled by the builder
|
|
73
|
-
config.cacheLifeTime =
|
|
64
|
+
config.cacheLifeTime = CACHE_POLICIES.INFINITE;
|
|
74
65
|
config.source = false;
|
|
75
66
|
super(id, object3d, config);
|
|
76
67
|
this.isTiledGeometryLayer = true;
|
|
@@ -81,7 +72,7 @@ class TiledGeometryLayer extends _GeometryLayer.default {
|
|
|
81
72
|
this.sseSubdivisionThreshold = this.sseSubdivisionThreshold || 1.0;
|
|
82
73
|
this.schemeTile = schemeTile;
|
|
83
74
|
this.builder = builder;
|
|
84
|
-
this.info = new
|
|
75
|
+
this.info = new InfoTiledGeometryLayer(this);
|
|
85
76
|
if (!this.schemeTile) {
|
|
86
77
|
throw new Error(`Cannot init tiled layer without schemeTile for layer ${this.id}`);
|
|
87
78
|
}
|
|
@@ -98,7 +89,7 @@ class TiledGeometryLayer extends _GeometryLayer.default {
|
|
|
98
89
|
this.object3d.add(...level0s);
|
|
99
90
|
this.object3d.updateMatrixWorld();
|
|
100
91
|
}));
|
|
101
|
-
this.maxScreenSizeNode = this.sseSubdivisionThreshold * (
|
|
92
|
+
this.maxScreenSizeNode = this.sseSubdivisionThreshold * (SIZE_DIAGONAL_TEXTURE * 2);
|
|
102
93
|
}
|
|
103
94
|
get hideSkirt() {
|
|
104
95
|
return this._hideSkirt;
|
|
@@ -129,7 +120,7 @@ class TiledGeometryLayer extends _GeometryLayer.default {
|
|
|
129
120
|
pickObjectsAt(view, coordinates) {
|
|
130
121
|
let radius = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : this.options.defaultPickingRadius;
|
|
131
122
|
let target = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : [];
|
|
132
|
-
return
|
|
123
|
+
return Picking.pickTilesAt(view, coordinates, radius, this, target);
|
|
133
124
|
}
|
|
134
125
|
|
|
135
126
|
/**
|
|
@@ -177,7 +168,7 @@ class TiledGeometryLayer extends _GeometryLayer.default {
|
|
|
177
168
|
// Prepare ColorLayer sequence order
|
|
178
169
|
// In this moment, there is only one color layers sequence, because they are attached to tileLayer.
|
|
179
170
|
// In future, the sequence must be returned by parent geometry layer.
|
|
180
|
-
this.colorLayersOrder =
|
|
171
|
+
this.colorLayersOrder = ImageryLayers.getColorLayersIdOrderedBySequence(context.colorLayers);
|
|
181
172
|
let commonAncestor;
|
|
182
173
|
for (const source of sources.values()) {
|
|
183
174
|
if (source.isCamera) {
|
|
@@ -225,7 +216,7 @@ class TiledGeometryLayer extends _GeometryLayer.default {
|
|
|
225
216
|
*/
|
|
226
217
|
update(context, layer, node) {
|
|
227
218
|
if (!node.parent) {
|
|
228
|
-
return
|
|
219
|
+
return ObjectRemovalHelper.removeChildrenAndCleanup(this, node);
|
|
229
220
|
}
|
|
230
221
|
// early exit if parent' subdivision is in progress
|
|
231
222
|
if (node.parent.pendingSubdivision) {
|
|
@@ -250,17 +241,17 @@ class TiledGeometryLayer extends _GeometryLayer.default {
|
|
|
250
241
|
}
|
|
251
242
|
if (node.material.visible) {
|
|
252
243
|
if (!requestChildrenUpdate) {
|
|
253
|
-
return
|
|
244
|
+
return ObjectRemovalHelper.removeChildren(this, node);
|
|
254
245
|
}
|
|
255
246
|
}
|
|
256
247
|
return requestChildrenUpdate ? node.children.filter(n => n.layer == this) : undefined;
|
|
257
248
|
}
|
|
258
249
|
node.material.visible = false;
|
|
259
250
|
this.info.update(node);
|
|
260
|
-
return
|
|
251
|
+
return ObjectRemovalHelper.removeChildren(this, node);
|
|
261
252
|
}
|
|
262
253
|
convert(requester, extent) {
|
|
263
|
-
return
|
|
254
|
+
return convertToTile.convert(requester, extent, this);
|
|
264
255
|
}
|
|
265
256
|
countColorLayersTextures() {
|
|
266
257
|
return arguments.length;
|
|
@@ -417,9 +408,8 @@ class TiledGeometryLayer extends _GeometryLayer.default {
|
|
|
417
408
|
|
|
418
409
|
// The screen space error is calculated to have a correct texture display.
|
|
419
410
|
// For the projection of a texture's texel to be less than or equal to one pixel
|
|
420
|
-
const sse = node.screenSize / (
|
|
411
|
+
const sse = node.screenSize / (SIZE_DIAGONAL_TEXTURE * 2);
|
|
421
412
|
return this.sseSubdivisionThreshold < sse;
|
|
422
413
|
}
|
|
423
414
|
}
|
|
424
|
-
|
|
425
|
-
exports.default = _default;
|
|
415
|
+
export default TiledGeometryLayer;
|