itowns 2.42.1-next.9 → 2.43.1-next.0
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/changelog.md +90 -0
- 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/examples/effects_stereo.html +2 -2
- package/examples/misc_collada.html +2 -2
- package/examples/source_stream_wfs_25d.html +11 -11
- package/examples/source_stream_wfs_3d.html +1 -1
- package/examples/view_25d_map.html +2 -2
- package/examples/view_3d_map.html +2 -2
- package/examples/view_3d_map_webxr.html +1 -1
- package/examples/view_3d_mns_map.html +2 -2
- package/examples/view_immersive.html +1 -1
- package/examples/view_multi_25d.html +2 -2
- package/examples/widgets_searchbar.html +2 -2
- 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 +16 -26
- 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 +9 -20
- 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 -45
- 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 -25
- package/lib/Core/Prefab/TileBuilder.js +13 -22
- package/lib/Core/Prefab/computeBufferTileGeometry.js +12 -16
- 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 +24 -38
- package/lib/Core/System/Capabilities.js +2 -13
- package/lib/Core/TileGeometry.js +13 -15
- package/lib/Core/TileMesh.js +6 -15
- package/lib/Core/View.js +43 -58
- package/lib/Layer/C3DTilesLayer.js +29 -41
- package/lib/Layer/ColorLayer.js +10 -16
- package/lib/Layer/ElevationLayer.js +7 -14
- package/lib/Layer/EntwinePointTileLayer.js +9 -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 +37 -33
- package/lib/Main.js +87 -708
- package/lib/MainBundle.js +4 -34
- package/lib/Parser/B3dmParser.js +80 -131
- package/lib/Parser/CameraCalibrationParser.js +5 -14
- package/lib/Parser/GDFParser.js +11 -22
- package/lib/Parser/GLTFParser.js +88 -0
- 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 +20 -21
- package/lib/Parser/LASParser.js +6 -15
- package/lib/Parser/MapBoxUrlParser.js +2 -9
- package/lib/Parser/PntsParser.js +4 -14
- package/lib/Parser/PotreeBinParser.js +8 -16
- 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 +32 -29
- package/lib/Provider/DataSourceProvider.js +2 -9
- package/lib/Provider/Fetcher.js +40 -22
- package/lib/Provider/PointCloudProvider.js +7 -19
- 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 +33 -53
- package/lib/Renderer/OBB.js +12 -21
- package/lib/Renderer/OrientedImageCamera.js +2 -11
- package/lib/Renderer/OrientedImageMaterial.js +17 -35
- package/lib/Renderer/PointsMaterial.js +37 -60
- package/lib/Renderer/RasterTile.js +16 -29
- package/lib/Renderer/RenderMode.js +2 -9
- package/lib/Renderer/Shader/ShaderChunk.js +5 -23
- 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 +20 -53
- package/lib/Source/C3DTilesGoogleSource.js +76 -0
- 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 +13 -8
|
@@ -1,12 +1,6 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
Object.defineProperty(exports, "__esModule", {
|
|
4
|
-
value: true
|
|
5
|
-
});
|
|
6
|
-
exports.DRACOLoader = void 0;
|
|
7
|
-
var _three = require("three");
|
|
1
|
+
import { BufferAttribute, BufferGeometry, Color, FileLoader, Loader, LinearSRGBColorSpace, SRGBColorSpace } from 'three';
|
|
8
2
|
const _taskCache = new WeakMap();
|
|
9
|
-
class DRACOLoader extends
|
|
3
|
+
class DRACOLoader extends Loader {
|
|
10
4
|
constructor(manager) {
|
|
11
5
|
super(manager);
|
|
12
6
|
this.decoderPath = '';
|
|
@@ -43,7 +37,7 @@ class DRACOLoader extends _three.Loader {
|
|
|
43
37
|
return this;
|
|
44
38
|
}
|
|
45
39
|
load(url, onLoad, onProgress, onError) {
|
|
46
|
-
const loader = new
|
|
40
|
+
const loader = new FileLoader(this.manager);
|
|
47
41
|
loader.setPath(this.path);
|
|
48
42
|
loader.setResponseType('arraybuffer');
|
|
49
43
|
loader.setRequestHeader(this.requestHeader);
|
|
@@ -53,10 +47,10 @@ class DRACOLoader extends _three.Loader {
|
|
|
53
47
|
}, onProgress, onError);
|
|
54
48
|
}
|
|
55
49
|
parse(buffer, onLoad, onError) {
|
|
56
|
-
this.decodeDracoFile(buffer, onLoad, null, null,
|
|
50
|
+
this.decodeDracoFile(buffer, onLoad, null, null, SRGBColorSpace).catch(onError);
|
|
57
51
|
}
|
|
58
52
|
decodeDracoFile(buffer, callback, attributeIDs, attributeTypes) {
|
|
59
|
-
let vertexColorSpace = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] :
|
|
53
|
+
let vertexColorSpace = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : LinearSRGBColorSpace;
|
|
60
54
|
const taskConfig = {
|
|
61
55
|
attributeIDs: attributeIDs || this.defaultAttributeIDs,
|
|
62
56
|
attributeTypes: attributeTypes || this.defaultAttributeTypes,
|
|
@@ -127,16 +121,16 @@ class DRACOLoader extends _three.Loader {
|
|
|
127
121
|
return geometryPending;
|
|
128
122
|
}
|
|
129
123
|
_createGeometry(geometryData) {
|
|
130
|
-
const geometry = new
|
|
124
|
+
const geometry = new BufferGeometry();
|
|
131
125
|
if (geometryData.index) {
|
|
132
|
-
geometry.setIndex(new
|
|
126
|
+
geometry.setIndex(new BufferAttribute(geometryData.index.array, 1));
|
|
133
127
|
}
|
|
134
128
|
for (let i = 0; i < geometryData.attributes.length; i++) {
|
|
135
129
|
const result = geometryData.attributes[i];
|
|
136
130
|
const name = result.name;
|
|
137
131
|
const array = result.array;
|
|
138
132
|
const itemSize = result.itemSize;
|
|
139
|
-
const attribute = new
|
|
133
|
+
const attribute = new BufferAttribute(array, itemSize);
|
|
140
134
|
if (name === 'color') {
|
|
141
135
|
this._assignVertexColorSpace(attribute, result.vertexColorSpace);
|
|
142
136
|
attribute.normalized = array instanceof Float32Array === false;
|
|
@@ -151,15 +145,15 @@ class DRACOLoader extends _three.Loader {
|
|
|
151
145
|
// file is passed into .load() or .parse(). GLTFLoader uses internal APIs
|
|
152
146
|
// to decode geometry, and vertex colors are already Linear-sRGB in there.
|
|
153
147
|
|
|
154
|
-
if (inputColorSpace !==
|
|
155
|
-
const _color = new
|
|
148
|
+
if (inputColorSpace !== SRGBColorSpace) return;
|
|
149
|
+
const _color = new Color();
|
|
156
150
|
for (let i = 0, il = attribute.count; i < il; i++) {
|
|
157
151
|
_color.fromBufferAttribute(attribute, i).convertSRGBToLinear();
|
|
158
152
|
attribute.setXYZ(i, _color.r, _color.g, _color.b);
|
|
159
153
|
}
|
|
160
154
|
}
|
|
161
155
|
_loadLibrary(url, responseType) {
|
|
162
|
-
const loader = new
|
|
156
|
+
const loader = new FileLoader(this.manager);
|
|
163
157
|
loader.setPath(this.decoderPath);
|
|
164
158
|
loader.setResponseType(responseType);
|
|
165
159
|
loader.setWithCredentials(this.withCredentials);
|
|
@@ -249,7 +243,7 @@ class DRACOLoader extends _three.Loader {
|
|
|
249
243
|
}
|
|
250
244
|
|
|
251
245
|
/* WEB WORKER */
|
|
252
|
-
|
|
246
|
+
|
|
253
247
|
function DRACOWorker() {
|
|
254
248
|
let decoderConfig;
|
|
255
249
|
let decoderPending;
|
|
@@ -400,4 +394,5 @@ function DRACOWorker() {
|
|
|
400
394
|
return draco.DT_UINT32;
|
|
401
395
|
}
|
|
402
396
|
}
|
|
403
|
-
}
|
|
397
|
+
}
|
|
398
|
+
export { DRACOLoader };
|