@loaders.gl/i3s 4.0.0-alpha.5 → 4.0.0-alpha.6
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/arcgis-webscene-loader.d.ts +7 -0
- package/dist/arcgis-webscene-loader.d.ts.map +1 -0
- package/dist/arcgis-webscene-loader.js +28 -0
- package/dist/bundle.js +2 -2
- package/dist/dist.min.js +8804 -8547
- package/dist/es5/arcgis-webscene-loader.js +40 -0
- package/dist/es5/arcgis-webscene-loader.js.map +1 -0
- package/dist/es5/bundle.js +6 -0
- package/dist/es5/bundle.js.map +1 -0
- package/dist/es5/i3s-attribute-loader.js +195 -0
- package/dist/es5/i3s-attribute-loader.js.map +1 -0
- package/dist/es5/i3s-building-scene-layer-loader.js +46 -0
- package/dist/es5/i3s-building-scene-layer-loader.js.map +1 -0
- package/dist/es5/i3s-content-loader.js +57 -0
- package/dist/es5/i3s-content-loader.js.map +1 -0
- package/dist/es5/i3s-loader.js +193 -0
- package/dist/es5/i3s-loader.js.map +1 -0
- package/dist/es5/i3s-node-page-loader.js +39 -0
- package/dist/es5/i3s-node-page-loader.js.map +1 -0
- package/dist/es5/index.js +61 -0
- package/dist/es5/index.js.map +1 -0
- package/dist/es5/lib/helpers/i3s-nodepages-tiles.js +312 -0
- package/dist/es5/lib/helpers/i3s-nodepages-tiles.js.map +1 -0
- package/dist/es5/lib/parsers/constants.js +72 -0
- package/dist/es5/lib/parsers/constants.js.map +1 -0
- package/dist/es5/lib/parsers/parse-arcgis-webscene.js +158 -0
- package/dist/es5/lib/parsers/parse-arcgis-webscene.js.map +1 -0
- package/dist/es5/lib/parsers/parse-i3s-attribute.js +76 -0
- package/dist/es5/lib/parsers/parse-i3s-attribute.js.map +1 -0
- package/dist/es5/lib/parsers/parse-i3s-building-scene-layer.js +65 -0
- package/dist/es5/lib/parsers/parse-i3s-building-scene-layer.js.map +1 -0
- package/dist/es5/lib/parsers/parse-i3s-tile-content.js +510 -0
- package/dist/es5/lib/parsers/parse-i3s-tile-content.js.map +1 -0
- package/dist/es5/lib/parsers/parse-i3s.js +116 -0
- package/dist/es5/lib/parsers/parse-i3s.js.map +1 -0
- package/dist/es5/lib/utils/convert-i3s-obb-to-mbs.js +17 -0
- package/dist/es5/lib/utils/convert-i3s-obb-to-mbs.js.map +1 -0
- package/dist/es5/lib/utils/customizeColors.js +159 -0
- package/dist/es5/lib/utils/customizeColors.js.map +1 -0
- package/dist/es5/lib/utils/url-utils.js +33 -0
- package/dist/es5/lib/utils/url-utils.js.map +1 -0
- package/dist/es5/types.js +26 -0
- package/dist/es5/types.js.map +1 -0
- package/dist/es5/workers/i3s-content-nodejs-worker.js +7 -0
- package/dist/es5/workers/i3s-content-nodejs-worker.js.map +1 -0
- package/dist/es5/workers/i3s-content-worker.js +6 -0
- package/dist/es5/workers/i3s-content-worker.js.map +1 -0
- package/dist/esm/arcgis-webscene-loader.js +16 -0
- package/dist/esm/arcgis-webscene-loader.js.map +1 -0
- package/dist/esm/bundle.js +4 -0
- package/dist/esm/bundle.js.map +1 -0
- package/dist/esm/i3s-attribute-loader.js +119 -0
- package/dist/esm/i3s-attribute-loader.js.map +1 -0
- package/dist/esm/i3s-building-scene-layer-loader.js +19 -0
- package/dist/esm/i3s-building-scene-layer-loader.js.map +1 -0
- package/dist/esm/i3s-content-loader.js +31 -0
- package/dist/esm/i3s-content-loader.js.map +1 -0
- package/dist/esm/i3s-loader.js +87 -0
- package/dist/esm/i3s-loader.js.map +1 -0
- package/dist/esm/i3s-node-page-loader.js +15 -0
- package/dist/esm/i3s-node-page-loader.js.map +1 -0
- package/dist/esm/index.js +8 -0
- package/dist/esm/index.js.map +1 -0
- package/dist/esm/lib/helpers/i3s-nodepages-tiles.js +198 -0
- package/dist/esm/lib/helpers/i3s-nodepages-tiles.js.map +1 -0
- package/dist/esm/lib/parsers/constants.js +57 -0
- package/dist/esm/lib/parsers/constants.js.map +1 -0
- package/dist/esm/lib/parsers/parse-arcgis-webscene.js +70 -0
- package/dist/esm/lib/parsers/parse-arcgis-webscene.js.map +1 -0
- package/dist/esm/lib/parsers/parse-i3s-attribute.js +60 -0
- package/dist/esm/lib/parsers/parse-i3s-attribute.js.map +1 -0
- package/dist/esm/lib/parsers/parse-i3s-building-scene-layer.js +39 -0
- package/dist/esm/lib/parsers/parse-i3s-building-scene-layer.js.map +1 -0
- package/dist/esm/lib/parsers/parse-i3s-tile-content.js +435 -0
- package/dist/esm/lib/parsers/parse-i3s-tile-content.js.map +1 -0
- package/dist/esm/lib/parsers/parse-i3s.js +83 -0
- package/dist/esm/lib/parsers/parse-i3s.js.map +1 -0
- package/dist/esm/lib/utils/convert-i3s-obb-to-mbs.js +9 -0
- package/dist/esm/lib/utils/convert-i3s-obb-to-mbs.js.map +1 -0
- package/dist/esm/lib/utils/customizeColors.js +92 -0
- package/dist/esm/lib/utils/customizeColors.js.map +1 -0
- package/dist/esm/lib/utils/url-utils.js +28 -0
- package/dist/esm/lib/utils/url-utils.js.map +1 -0
- package/dist/esm/types.js +18 -0
- package/dist/esm/types.js.map +1 -0
- package/dist/esm/workers/i3s-content-nodejs-worker.js +5 -0
- package/dist/esm/workers/i3s-content-nodejs-worker.js.map +1 -0
- package/dist/esm/workers/i3s-content-worker.js +4 -0
- package/dist/esm/workers/i3s-content-worker.js.map +1 -0
- package/dist/i3s-attribute-loader.d.ts +9 -2
- package/dist/i3s-attribute-loader.d.ts.map +1 -1
- package/dist/i3s-attribute-loader.js +155 -132
- package/dist/i3s-building-scene-layer-loader.js +23 -18
- package/dist/i3s-content-loader.d.ts.map +1 -1
- package/dist/i3s-content-loader.js +30 -22
- package/dist/i3s-content-nodejs-worker.js +198 -0
- package/dist/i3s-content-nodejs-worker.js.map +7 -0
- package/dist/i3s-content-worker.js +1119 -1100
- package/dist/i3s-loader.d.ts +5 -0
- package/dist/i3s-loader.d.ts.map +1 -1
- package/dist/i3s-loader.js +88 -83
- package/dist/i3s-node-page-loader.d.ts +3 -2
- package/dist/i3s-node-page-loader.d.ts.map +1 -1
- package/dist/i3s-node-page-loader.js +20 -20
- package/dist/index.d.ts +4 -2
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +19 -6
- package/dist/lib/helpers/i3s-nodepages-tiles.d.ts +1 -0
- package/dist/lib/helpers/i3s-nodepages-tiles.d.ts.map +1 -1
- package/dist/lib/helpers/i3s-nodepages-tiles.js +231 -228
- package/dist/lib/parsers/constants.js +85 -63
- package/dist/lib/parsers/parse-arcgis-webscene.d.ts +7 -0
- package/dist/lib/parsers/parse-arcgis-webscene.d.ts.map +1 -0
- package/dist/lib/parsers/parse-arcgis-webscene.js +88 -0
- package/dist/lib/parsers/parse-i3s-attribute.d.ts +6 -4
- package/dist/lib/parsers/parse-i3s-attribute.d.ts.map +1 -1
- package/dist/lib/parsers/parse-i3s-attribute.js +87 -62
- package/dist/lib/parsers/parse-i3s-building-scene-layer.js +41 -40
- package/dist/lib/parsers/parse-i3s-tile-content.d.ts +2 -2
- package/dist/lib/parsers/parse-i3s-tile-content.d.ts.map +1 -1
- package/dist/lib/parsers/parse-i3s-tile-content.js +454 -454
- package/dist/lib/parsers/parse-i3s.d.ts +1 -1
- package/dist/lib/parsers/parse-i3s.d.ts.map +1 -1
- package/dist/lib/parsers/parse-i3s.js +92 -88
- package/dist/lib/utils/convert-i3s-obb-to-mbs.js +19 -8
- package/dist/lib/utils/customizeColors.d.ts +14 -0
- package/dist/lib/utils/customizeColors.d.ts.map +1 -0
- package/dist/lib/utils/customizeColors.js +94 -0
- package/dist/lib/utils/url-utils.js +41 -28
- package/dist/types.d.ts +518 -97
- package/dist/types.d.ts.map +1 -1
- package/dist/types.js +18 -19
- package/dist/workers/i3s-content-nodejs-worker.d.ts +2 -0
- package/dist/workers/i3s-content-nodejs-worker.d.ts.map +1 -0
- package/dist/workers/i3s-content-nodejs-worker.js +6 -0
- package/dist/workers/i3s-content-worker.js +5 -4
- package/package.json +15 -15
- package/src/arcgis-webscene-loader.ts +31 -0
- package/src/i3s-attribute-loader.ts +9 -9
- package/src/i3s-content-loader.ts +19 -6
- package/src/i3s-loader.ts +22 -13
- package/src/i3s-node-page-loader.ts +6 -10
- package/src/index.ts +22 -5
- package/src/lib/helpers/i3s-nodepages-tiles.ts +14 -3
- package/src/lib/parsers/constants.ts +1 -1
- package/src/lib/parsers/parse-arcgis-webscene.ts +102 -0
- package/src/lib/parsers/parse-i3s-attribute.ts +21 -14
- package/src/lib/parsers/parse-i3s-tile-content.ts +99 -76
- package/src/lib/parsers/parse-i3s.ts +8 -3
- package/src/lib/utils/customizeColors.ts +134 -0
- package/src/types.ts +482 -33
- package/src/workers/i3s-content-nodejs-worker.ts +5 -0
- package/dist/bundle.js.map +0 -1
- package/dist/i3s-attribute-loader.js.map +0 -1
- package/dist/i3s-building-scene-layer-loader.js.map +0 -1
- package/dist/i3s-content-loader.js.map +0 -1
- package/dist/i3s-loader.js.map +0 -1
- package/dist/i3s-node-page-loader.js.map +0 -1
- package/dist/index.js.map +0 -1
- package/dist/lib/helpers/i3s-nodepages-tiles.js.map +0 -1
- package/dist/lib/parsers/constants.js.map +0 -1
- package/dist/lib/parsers/parse-i3s-attribute.js.map +0 -1
- package/dist/lib/parsers/parse-i3s-building-scene-layer.js.map +0 -1
- package/dist/lib/parsers/parse-i3s-tile-content.js.map +0 -1
- package/dist/lib/parsers/parse-i3s.js.map +0 -1
- package/dist/lib/utils/convert-i3s-obb-to-mbs.js.map +0 -1
- package/dist/lib/utils/url-utils.js.map +0 -1
- package/dist/types.js.map +0 -1
- package/dist/workers/i3s-content-worker.js.map +0 -1
|
@@ -1,239 +1,242 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
this.nodesPerPage = ((_tileset$nodePages = tileset.nodePages) === null || _tileset$nodePages === void 0 ? void 0 : _tileset$nodePages.nodesPerPage) || 64;
|
|
30
|
-
this.lodSelectionMetricType = (_tileset$nodePages2 = tileset.nodePages) === null || _tileset$nodePages2 === void 0 ? void 0 : _tileset$nodePages2.lodSelectionMetricType;
|
|
31
|
-
this.options = options;
|
|
32
|
-
this.initSelectedFormatsForTextureDefinitions(tileset);
|
|
33
|
-
}
|
|
34
|
-
|
|
35
|
-
async getNodeById(id) {
|
|
36
|
-
const pageIndex = Math.floor(id / this.nodesPerPage);
|
|
37
|
-
|
|
38
|
-
if (!this.nodePages[pageIndex] && !this.pendingNodePages[pageIndex]) {
|
|
39
|
-
var _this$options$i3s;
|
|
40
|
-
|
|
41
|
-
const nodePageUrl = getUrlWithToken("".concat(this.tileset.url, "/nodepages/").concat(pageIndex), (_this$options$i3s = this.options.i3s) === null || _this$options$i3s === void 0 ? void 0 : _this$options$i3s.token);
|
|
42
|
-
this.pendingNodePages[pageIndex] = {
|
|
43
|
-
status: 'Pending',
|
|
44
|
-
promise: load(nodePageUrl, I3SNodePageLoader, this.options)
|
|
45
|
-
};
|
|
46
|
-
this.nodePages[pageIndex] = await this.pendingNodePages[pageIndex].promise;
|
|
47
|
-
this.pendingNodePages[pageIndex].status = 'Done';
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
const core_1 = require("@loaders.gl/core");
|
|
4
|
+
const textures_1 = require("@loaders.gl/textures");
|
|
5
|
+
const i3s_node_page_loader_1 = require("../../i3s-node-page-loader");
|
|
6
|
+
const parse_i3s_1 = require("../parsers/parse-i3s");
|
|
7
|
+
const url_utils_1 = require("../utils/url-utils");
|
|
8
|
+
/**
|
|
9
|
+
* class I3SNodePagesTiles - loads nodePages and form i3s tiles from them
|
|
10
|
+
*/
|
|
11
|
+
class I3SNodePagesTiles {
|
|
12
|
+
/**
|
|
13
|
+
* @constructs
|
|
14
|
+
* Create a I3SNodePagesTiles instance.
|
|
15
|
+
* @param tileset - i3s tileset header ('layers/0')
|
|
16
|
+
* @param options - i3s loader options
|
|
17
|
+
*/
|
|
18
|
+
constructor(tileset, options) {
|
|
19
|
+
this.nodePages = [];
|
|
20
|
+
this.pendingNodePages = [];
|
|
21
|
+
this.textureDefinitionsSelectedFormats = [];
|
|
22
|
+
this.textureLoaderOptions = {};
|
|
23
|
+
this.tileset = { ...tileset }; // spread the tileset to avoid circular reference
|
|
24
|
+
this.nodesPerPage = tileset.nodePages?.nodesPerPage || 64;
|
|
25
|
+
this.lodSelectionMetricType = tileset.nodePages?.lodSelectionMetricType;
|
|
26
|
+
this.options = options;
|
|
27
|
+
this.nodesInNodePages = 0;
|
|
28
|
+
this.initSelectedFormatsForTextureDefinitions(tileset);
|
|
48
29
|
}
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
let materialDefinition;
|
|
73
|
-
let textureFormat = 'jpg';
|
|
74
|
-
let attributeUrls = [];
|
|
75
|
-
let isDracoGeometry = false;
|
|
76
|
-
|
|
77
|
-
if (node && node.mesh) {
|
|
78
|
-
const {
|
|
79
|
-
url,
|
|
80
|
-
isDracoGeometry: isDracoGeometryResult
|
|
81
|
-
} = node.mesh.geometry && this.getContentUrl(node.mesh.geometry) || {
|
|
82
|
-
isDracoGeometry: false
|
|
83
|
-
};
|
|
84
|
-
contentUrl = url;
|
|
85
|
-
isDracoGeometry = isDracoGeometryResult;
|
|
86
|
-
const {
|
|
87
|
-
textureData,
|
|
88
|
-
materialDefinition: nodeMaterialDefinition
|
|
89
|
-
} = this.getInformationFromMaterial(node.mesh.material);
|
|
90
|
-
materialDefinition = nodeMaterialDefinition;
|
|
91
|
-
textureFormat = textureData.format || textureFormat;
|
|
92
|
-
|
|
93
|
-
if (textureData.name) {
|
|
94
|
-
textureUrl = "".concat(this.tileset.url, "/nodes/").concat(node.mesh.material.resource, "/textures/").concat(textureData.name);
|
|
95
|
-
}
|
|
96
|
-
|
|
97
|
-
if (this.tileset.attributeStorageInfo) {
|
|
98
|
-
attributeUrls = generateTilesetAttributeUrls(this.tileset, node.mesh.attribute.resource);
|
|
99
|
-
}
|
|
100
|
-
}
|
|
101
|
-
|
|
102
|
-
const lodSelection = this.getLodSelection(node);
|
|
103
|
-
return normalizeTileNonUrlData({
|
|
104
|
-
id: id.toString(),
|
|
105
|
-
lodSelection,
|
|
106
|
-
obb: node.obb,
|
|
107
|
-
contentUrl,
|
|
108
|
-
textureUrl,
|
|
109
|
-
attributeUrls,
|
|
110
|
-
materialDefinition,
|
|
111
|
-
textureFormat,
|
|
112
|
-
textureLoaderOptions: this.textureLoaderOptions,
|
|
113
|
-
children,
|
|
114
|
-
isDracoGeometry
|
|
115
|
-
});
|
|
116
|
-
}
|
|
117
|
-
|
|
118
|
-
getContentUrl(meshGeometryData) {
|
|
119
|
-
let result = null;
|
|
120
|
-
const geometryDefinition = this.tileset.geometryDefinitions[meshGeometryData.definition];
|
|
121
|
-
let geometryIndex = -1;
|
|
122
|
-
|
|
123
|
-
if (this.options.i3s && this.options.i3s.useDracoGeometry) {
|
|
124
|
-
geometryIndex = geometryDefinition.geometryBuffers.findIndex(buffer => buffer.compressedAttributes && buffer.compressedAttributes.encoding === 'draco');
|
|
30
|
+
/**
|
|
31
|
+
* Loads some nodePage and return a particular node from it
|
|
32
|
+
* @param id - id of node through all node pages
|
|
33
|
+
*/
|
|
34
|
+
async getNodeById(id) {
|
|
35
|
+
const pageIndex = Math.floor(id / this.nodesPerPage);
|
|
36
|
+
if (!this.nodePages[pageIndex] && !this.pendingNodePages[pageIndex]) {
|
|
37
|
+
const nodePageUrl = (0, url_utils_1.getUrlWithToken)(`${this.tileset.url}/nodepages/${pageIndex}`,
|
|
38
|
+
// @ts-expect-error this.options is not properly typed
|
|
39
|
+
this.options.i3s?.token);
|
|
40
|
+
this.pendingNodePages[pageIndex] = {
|
|
41
|
+
status: 'Pending',
|
|
42
|
+
promise: (0, core_1.load)(nodePageUrl, i3s_node_page_loader_1.I3SNodePageLoader, this.options)
|
|
43
|
+
};
|
|
44
|
+
this.nodePages[pageIndex] = await this.pendingNodePages[pageIndex].promise;
|
|
45
|
+
this.nodesInNodePages += this.nodePages[pageIndex].nodes.length;
|
|
46
|
+
this.pendingNodePages[pageIndex].status = 'Done';
|
|
47
|
+
}
|
|
48
|
+
if (this.pendingNodePages[pageIndex].status === 'Pending') {
|
|
49
|
+
this.nodePages[pageIndex] = await this.pendingNodePages[pageIndex].promise;
|
|
50
|
+
}
|
|
51
|
+
const nodeIndex = id % this.nodesPerPage;
|
|
52
|
+
return this.nodePages[pageIndex].nodes[nodeIndex];
|
|
125
53
|
}
|
|
126
|
-
|
|
127
|
-
|
|
128
|
-
|
|
54
|
+
/**
|
|
55
|
+
* Forms tile header using node and tileset data
|
|
56
|
+
* @param id - id of node through all node pages
|
|
57
|
+
*/
|
|
58
|
+
// eslint-disable-next-line complexity, max-statements
|
|
59
|
+
async formTileFromNodePages(id) {
|
|
60
|
+
const node = await this.getNodeById(id);
|
|
61
|
+
const children = [];
|
|
62
|
+
const childNodesPromises = [];
|
|
63
|
+
for (const child of node.children || []) {
|
|
64
|
+
childNodesPromises.push(this.getNodeById(child));
|
|
65
|
+
}
|
|
66
|
+
const childNodes = await Promise.all(childNodesPromises);
|
|
67
|
+
for (const childNode of childNodes) {
|
|
68
|
+
children.push({
|
|
69
|
+
id: childNode.index.toString(),
|
|
70
|
+
obb: childNode.obb
|
|
71
|
+
});
|
|
72
|
+
}
|
|
73
|
+
let contentUrl;
|
|
74
|
+
let textureUrl;
|
|
75
|
+
let materialDefinition;
|
|
76
|
+
let textureFormat = 'jpg';
|
|
77
|
+
let attributeUrls = [];
|
|
78
|
+
let isDracoGeometry = false;
|
|
79
|
+
if (node && node.mesh) {
|
|
80
|
+
// Get geometry resource URL and type (compressed / non-compressed)
|
|
81
|
+
const { url, isDracoGeometry: isDracoGeometryResult } = (node.mesh.geometry &&
|
|
82
|
+
this.getContentUrl(node.mesh.geometry)) || { isDracoGeometry: false };
|
|
83
|
+
contentUrl = url;
|
|
84
|
+
isDracoGeometry = isDracoGeometryResult;
|
|
85
|
+
const { textureData, materialDefinition: nodeMaterialDefinition } = this.getInformationFromMaterial(node.mesh.material);
|
|
86
|
+
materialDefinition = nodeMaterialDefinition;
|
|
87
|
+
textureFormat = textureData.format || textureFormat;
|
|
88
|
+
if (textureData.name) {
|
|
89
|
+
textureUrl = `${this.tileset.url}/nodes/${node.mesh.material.resource}/textures/${textureData.name}`;
|
|
90
|
+
}
|
|
91
|
+
if (this.tileset.attributeStorageInfo) {
|
|
92
|
+
attributeUrls = (0, url_utils_1.generateTilesetAttributeUrls)(this.tileset, node.mesh.attribute.resource);
|
|
93
|
+
}
|
|
94
|
+
}
|
|
95
|
+
const lodSelection = this.getLodSelection(node);
|
|
96
|
+
return (0, parse_i3s_1.normalizeTileNonUrlData)({
|
|
97
|
+
id: id.toString(),
|
|
98
|
+
lodSelection,
|
|
99
|
+
obb: node.obb,
|
|
100
|
+
contentUrl,
|
|
101
|
+
textureUrl,
|
|
102
|
+
attributeUrls,
|
|
103
|
+
materialDefinition,
|
|
104
|
+
textureFormat,
|
|
105
|
+
textureLoaderOptions: this.textureLoaderOptions,
|
|
106
|
+
children,
|
|
107
|
+
isDracoGeometry
|
|
108
|
+
});
|
|
129
109
|
}
|
|
130
|
-
|
|
131
|
-
|
|
132
|
-
|
|
133
|
-
|
|
134
|
-
|
|
135
|
-
|
|
136
|
-
|
|
110
|
+
/**
|
|
111
|
+
* Forms url and type of geometry resource by nodepage's data and `geometryDefinitions` in the tileset
|
|
112
|
+
* @param - data about the node's mesh from the nodepage
|
|
113
|
+
* @returns -
|
|
114
|
+
* {string} url - url to the geometry resource
|
|
115
|
+
* {boolean} isDracoGeometry - whether the geometry resource contain DRACO compressed geometry
|
|
116
|
+
*/
|
|
117
|
+
getContentUrl(meshGeometryData) {
|
|
118
|
+
let result = null;
|
|
119
|
+
// @ts-ignore
|
|
120
|
+
const geometryDefinition = this.tileset.geometryDefinitions[meshGeometryData.definition];
|
|
121
|
+
let geometryIndex = -1;
|
|
122
|
+
// Try to find DRACO geometryDefinition of `useDracoGeometry` option is set
|
|
123
|
+
// @ts-expect-error this.options is not properly typed
|
|
124
|
+
if (this.options.i3s && this.options.i3s.useDracoGeometry) {
|
|
125
|
+
geometryIndex = geometryDefinition.geometryBuffers.findIndex((buffer) => buffer.compressedAttributes && buffer.compressedAttributes.encoding === 'draco');
|
|
126
|
+
}
|
|
127
|
+
// If DRACO geometry is not applicable try to select non-compressed geometry
|
|
128
|
+
if (geometryIndex === -1) {
|
|
129
|
+
geometryIndex = geometryDefinition.geometryBuffers.findIndex((buffer) => !buffer.compressedAttributes);
|
|
130
|
+
}
|
|
131
|
+
if (geometryIndex !== -1) {
|
|
132
|
+
const isDracoGeometry = Boolean(geometryDefinition.geometryBuffers[geometryIndex].compressedAttributes);
|
|
133
|
+
result = {
|
|
134
|
+
url: `${this.tileset.url}/nodes/${meshGeometryData.resource}/geometries/${geometryIndex}`,
|
|
135
|
+
isDracoGeometry
|
|
136
|
+
};
|
|
137
|
+
}
|
|
138
|
+
return result;
|
|
137
139
|
}
|
|
138
|
-
|
|
139
|
-
|
|
140
|
-
|
|
141
|
-
|
|
142
|
-
|
|
143
|
-
|
|
144
|
-
|
|
145
|
-
|
|
146
|
-
|
|
147
|
-
|
|
148
|
-
|
|
149
|
-
|
|
140
|
+
/**
|
|
141
|
+
* Forms 1.6 compatible LOD selection object from a nodepage's node data
|
|
142
|
+
* @param node - a node from nodepage
|
|
143
|
+
* @returns- Array of LodSelection
|
|
144
|
+
*/
|
|
145
|
+
getLodSelection(node) {
|
|
146
|
+
const lodSelection = [];
|
|
147
|
+
if (this.lodSelectionMetricType === 'maxScreenThresholdSQ') {
|
|
148
|
+
lodSelection.push({
|
|
149
|
+
metricType: 'maxScreenThreshold',
|
|
150
|
+
// @ts-ignore
|
|
151
|
+
maxError: Math.sqrt(node.lodThreshold / (Math.PI * 0.25))
|
|
152
|
+
});
|
|
153
|
+
}
|
|
154
|
+
lodSelection.push({
|
|
155
|
+
metricType: this.lodSelectionMetricType,
|
|
156
|
+
// @ts-ignore
|
|
157
|
+
maxError: node.lodThreshold
|
|
158
|
+
});
|
|
159
|
+
return lodSelection;
|
|
150
160
|
}
|
|
151
|
-
|
|
152
|
-
|
|
153
|
-
|
|
154
|
-
|
|
155
|
-
|
|
156
|
-
|
|
157
|
-
|
|
158
|
-
|
|
159
|
-
|
|
160
|
-
|
|
161
|
-
|
|
162
|
-
|
|
163
|
-
|
|
164
|
-
|
|
165
|
-
|
|
166
|
-
|
|
167
|
-
|
|
168
|
-
|
|
169
|
-
|
|
170
|
-
|
|
171
|
-
|
|
172
|
-
var _materialDefinition$p, _materialDefinition$p2;
|
|
173
|
-
|
|
174
|
-
informationFromMaterial.materialDefinition = materialDefinition;
|
|
175
|
-
const textureSetDefinitionIndex = materialDefinition === null || materialDefinition === void 0 ? void 0 : (_materialDefinition$p = materialDefinition.pbrMetallicRoughness) === null || _materialDefinition$p === void 0 ? void 0 : (_materialDefinition$p2 = _materialDefinition$p.baseColorTexture) === null || _materialDefinition$p2 === void 0 ? void 0 : _materialDefinition$p2.textureSetDefinitionId;
|
|
176
|
-
|
|
177
|
-
if (typeof textureSetDefinitionIndex === 'number') {
|
|
178
|
-
informationFromMaterial.textureData = this.textureDefinitionsSelectedFormats[textureSetDefinitionIndex] || informationFromMaterial.textureData;
|
|
161
|
+
/**
|
|
162
|
+
* Returns information about texture and material from `materialDefinitions`
|
|
163
|
+
* @param material - material data from nodepage
|
|
164
|
+
* @returns - Couple {textureData, materialDefinition}
|
|
165
|
+
* {string} textureData.name - path name of the texture
|
|
166
|
+
* {string} textureData.format - format of the texture
|
|
167
|
+
* materialDefinition - PBR-like material definition from `materialDefinitions`
|
|
168
|
+
*/
|
|
169
|
+
getInformationFromMaterial(material) {
|
|
170
|
+
const informationFromMaterial = { textureData: { name: null } };
|
|
171
|
+
if (material) {
|
|
172
|
+
const materialDefinition = this.tileset.materialDefinitions?.[material.definition];
|
|
173
|
+
if (materialDefinition) {
|
|
174
|
+
informationFromMaterial.materialDefinition = materialDefinition;
|
|
175
|
+
const textureSetDefinitionIndex = materialDefinition?.pbrMetallicRoughness?.baseColorTexture?.textureSetDefinitionId;
|
|
176
|
+
if (typeof textureSetDefinitionIndex === 'number') {
|
|
177
|
+
informationFromMaterial.textureData =
|
|
178
|
+
this.textureDefinitionsSelectedFormats[textureSetDefinitionIndex] ||
|
|
179
|
+
informationFromMaterial.textureData;
|
|
180
|
+
}
|
|
181
|
+
}
|
|
179
182
|
}
|
|
180
|
-
|
|
183
|
+
return informationFromMaterial;
|
|
181
184
|
}
|
|
182
|
-
|
|
183
|
-
|
|
184
|
-
|
|
185
|
-
|
|
186
|
-
|
|
187
|
-
|
|
188
|
-
|
|
189
|
-
|
|
190
|
-
|
|
191
|
-
|
|
192
|
-
|
|
193
|
-
|
|
194
|
-
|
|
195
|
-
|
|
196
|
-
|
|
197
|
-
|
|
198
|
-
|
|
199
|
-
|
|
200
|
-
|
|
185
|
+
/**
|
|
186
|
+
* Sets preferable and supported format for each textureDefinition of the tileset
|
|
187
|
+
* @param tileset - I3S layer data
|
|
188
|
+
* @returns
|
|
189
|
+
*/
|
|
190
|
+
initSelectedFormatsForTextureDefinitions(tileset) {
|
|
191
|
+
this.textureDefinitionsSelectedFormats = [];
|
|
192
|
+
const possibleI3sFormats = this.getSupportedTextureFormats();
|
|
193
|
+
const textureSetDefinitions = tileset.textureSetDefinitions || [];
|
|
194
|
+
for (const textureSetDefinition of textureSetDefinitions) {
|
|
195
|
+
const formats = (textureSetDefinition && textureSetDefinition.formats) || [];
|
|
196
|
+
let selectedFormat = null;
|
|
197
|
+
for (const i3sFormat of possibleI3sFormats) {
|
|
198
|
+
const format = formats.find((value) => value.format === i3sFormat);
|
|
199
|
+
if (format) {
|
|
200
|
+
selectedFormat = format;
|
|
201
|
+
break;
|
|
202
|
+
}
|
|
203
|
+
}
|
|
204
|
+
// For I3S 1.8 need to define basis target format to decode
|
|
205
|
+
if (selectedFormat && selectedFormat.format === 'ktx2') {
|
|
206
|
+
this.textureLoaderOptions.basis = {
|
|
207
|
+
format: (0, textures_1.selectSupportedBasisFormat)(),
|
|
208
|
+
containerFormat: 'ktx2',
|
|
209
|
+
module: 'encoder'
|
|
210
|
+
};
|
|
211
|
+
}
|
|
212
|
+
this.textureDefinitionsSelectedFormats.push(selectedFormat);
|
|
201
213
|
}
|
|
202
|
-
}
|
|
203
|
-
|
|
204
|
-
if (selectedFormat && selectedFormat.format === 'ktx2') {
|
|
205
|
-
this.textureLoaderOptions.basis = {
|
|
206
|
-
format: selectSupportedBasisFormat(),
|
|
207
|
-
containerFormat: 'ktx2',
|
|
208
|
-
module: 'encoder'
|
|
209
|
-
};
|
|
210
|
-
}
|
|
211
|
-
|
|
212
|
-
this.textureDefinitionsSelectedFormats.push(selectedFormat);
|
|
213
214
|
}
|
|
214
|
-
|
|
215
|
-
|
|
216
|
-
|
|
217
|
-
|
|
218
|
-
|
|
219
|
-
|
|
220
|
-
|
|
221
|
-
|
|
222
|
-
|
|
223
|
-
|
|
224
|
-
|
|
225
|
-
|
|
226
|
-
|
|
227
|
-
|
|
228
|
-
|
|
229
|
-
|
|
230
|
-
|
|
215
|
+
/**
|
|
216
|
+
* Returns the array of supported texture format
|
|
217
|
+
* @returns list of format strings
|
|
218
|
+
*/
|
|
219
|
+
getSupportedTextureFormats() {
|
|
220
|
+
const formats = [];
|
|
221
|
+
// @ts-expect-error this.options is not properly typed
|
|
222
|
+
if (!this.options.i3s || this.options.i3s.useCompressedTextures) {
|
|
223
|
+
// I3S 1.7 selection
|
|
224
|
+
const supportedCompressedFormats = (0, textures_1.getSupportedGPUTextureFormats)();
|
|
225
|
+
// List of possible in i3s formats:
|
|
226
|
+
// https://github.com/Esri/i3s-spec/blob/master/docs/1.7/textureSetDefinitionFormat.cmn.md
|
|
227
|
+
if (supportedCompressedFormats.has('etc2')) {
|
|
228
|
+
formats.push('ktx-etc2');
|
|
229
|
+
}
|
|
230
|
+
if (supportedCompressedFormats.has('dxt')) {
|
|
231
|
+
formats.push('dds');
|
|
232
|
+
}
|
|
233
|
+
// I3S 1.8 selection
|
|
234
|
+
// ktx2 wraps basis texture which at the edge case can be decoded as uncompressed image
|
|
235
|
+
formats.push('ktx2');
|
|
236
|
+
}
|
|
237
|
+
formats.push('jpg');
|
|
238
|
+
formats.push('png');
|
|
239
|
+
return formats;
|
|
231
240
|
}
|
|
232
|
-
|
|
233
|
-
formats.push('jpg');
|
|
234
|
-
formats.push('png');
|
|
235
|
-
return formats;
|
|
236
|
-
}
|
|
237
|
-
|
|
238
241
|
}
|
|
239
|
-
|
|
242
|
+
exports.default = I3SNodePagesTiles;
|
|
@@ -1,67 +1,89 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
1
|
+
"use strict";
|
|
2
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
+
};
|
|
5
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
+
exports.COORDINATE_SYSTEM = exports.INT_16_ATTRIBUTE_TYPE = exports.FLOAT_64_TYPE = exports.OBJECT_ID_ATTRIBUTE_TYPE = exports.STRING_ATTRIBUTE_TYPE = exports.sizeOf = exports.GL_TYPE_MAP = exports.getConstructorForDataFormat = void 0;
|
|
7
|
+
const constants_1 = __importDefault(require("@luma.gl/constants"));
|
|
8
|
+
const types_1 = require("../../types");
|
|
9
|
+
function getConstructorForDataFormat(dataType) {
|
|
10
|
+
switch (dataType) {
|
|
11
|
+
case types_1.DATA_TYPE.UInt8:
|
|
12
|
+
return Uint8Array;
|
|
13
|
+
case types_1.DATA_TYPE.UInt16:
|
|
14
|
+
return Uint16Array;
|
|
15
|
+
case types_1.DATA_TYPE.UInt32:
|
|
16
|
+
return Uint32Array;
|
|
17
|
+
case types_1.DATA_TYPE.Float32:
|
|
18
|
+
return Float32Array;
|
|
19
|
+
case types_1.DATA_TYPE.UInt64:
|
|
20
|
+
return Float64Array;
|
|
21
|
+
default:
|
|
22
|
+
throw new Error(`parse i3s tile content: unknown type of data: ${dataType}`);
|
|
23
|
+
}
|
|
23
24
|
}
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
25
|
+
exports.getConstructorForDataFormat = getConstructorForDataFormat;
|
|
26
|
+
exports.GL_TYPE_MAP = {
|
|
27
|
+
UInt8: constants_1.default.UNSIGNED_BYTE,
|
|
28
|
+
UInt16: constants_1.default.UNSIGNED_SHORT,
|
|
29
|
+
Float32: constants_1.default.FLOAT,
|
|
30
|
+
UInt32: constants_1.default.UNSIGNED_INT,
|
|
31
|
+
UInt64: constants_1.default.DOUBLE
|
|
30
32
|
};
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
33
|
+
/**
|
|
34
|
+
* Returns how many bytes a type occupies
|
|
35
|
+
* @param dataType
|
|
36
|
+
* @returns
|
|
37
|
+
*/
|
|
38
|
+
function sizeOf(dataType) {
|
|
39
|
+
switch (dataType) {
|
|
40
|
+
case types_1.DATA_TYPE.UInt8:
|
|
41
|
+
return 1;
|
|
42
|
+
case types_1.DATA_TYPE.UInt16:
|
|
43
|
+
case types_1.DATA_TYPE.Int16:
|
|
44
|
+
return 2;
|
|
45
|
+
case types_1.DATA_TYPE.UInt32:
|
|
46
|
+
case types_1.DATA_TYPE.Int32:
|
|
47
|
+
case types_1.DATA_TYPE.Float32:
|
|
48
|
+
return 4;
|
|
49
|
+
case types_1.DATA_TYPE.UInt64:
|
|
50
|
+
case types_1.DATA_TYPE.Int64:
|
|
51
|
+
case types_1.DATA_TYPE.Float64:
|
|
52
|
+
return 8;
|
|
53
|
+
default:
|
|
54
|
+
throw new Error(`parse i3s tile content: unknown size of data: ${dataType}`);
|
|
55
|
+
}
|
|
53
56
|
}
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
57
|
+
exports.sizeOf = sizeOf;
|
|
58
|
+
exports.STRING_ATTRIBUTE_TYPE = 'String';
|
|
59
|
+
exports.OBJECT_ID_ATTRIBUTE_TYPE = 'Oid32';
|
|
60
|
+
exports.FLOAT_64_TYPE = 'Float64';
|
|
61
|
+
exports.INT_16_ATTRIBUTE_TYPE = 'Int16';
|
|
62
|
+
// https://github.com/visgl/deck.gl/blob/9548f43cba2234a1f4877b6b17f6c88eb35b2e08/modules/core/src/lib/constants.js#L27
|
|
63
|
+
// Describes the format of positions
|
|
64
|
+
var COORDINATE_SYSTEM;
|
|
60
65
|
(function (COORDINATE_SYSTEM) {
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
66
|
+
/**
|
|
67
|
+
* `LNGLAT` if rendering into a geospatial viewport, `CARTESIAN` otherwise
|
|
68
|
+
*/
|
|
69
|
+
COORDINATE_SYSTEM[COORDINATE_SYSTEM["DEFAULT"] = -1] = "DEFAULT";
|
|
70
|
+
/**
|
|
71
|
+
* Positions are interpreted as [lng, lat, elevation]
|
|
72
|
+
* lng lat are degrees, elevation is meters. distances as meters.
|
|
73
|
+
*/
|
|
74
|
+
COORDINATE_SYSTEM[COORDINATE_SYSTEM["LNGLAT"] = 1] = "LNGLAT";
|
|
75
|
+
/**
|
|
76
|
+
* Positions are interpreted as meter offsets, distances as meters
|
|
77
|
+
*/
|
|
78
|
+
COORDINATE_SYSTEM[COORDINATE_SYSTEM["METER_OFFSETS"] = 2] = "METER_OFFSETS";
|
|
79
|
+
/**
|
|
80
|
+
* Positions are interpreted as lng lat offsets: [deltaLng, deltaLat, elevation]
|
|
81
|
+
* deltaLng, deltaLat are delta degrees, elevation is meters.
|
|
82
|
+
* distances as meters.
|
|
83
|
+
*/
|
|
84
|
+
COORDINATE_SYSTEM[COORDINATE_SYSTEM["LNGLAT_OFFSETS"] = 3] = "LNGLAT_OFFSETS";
|
|
85
|
+
/**
|
|
86
|
+
* Non-geospatial
|
|
87
|
+
*/
|
|
88
|
+
COORDINATE_SYSTEM[COORDINATE_SYSTEM["CARTESIAN"] = 0] = "CARTESIAN";
|
|
89
|
+
})(COORDINATE_SYSTEM = exports.COORDINATE_SYSTEM || (exports.COORDINATE_SYSTEM = {}));
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"parse-arcgis-webscene.d.ts","sourceRoot":"","sources":["../../../src/lib/parsers/parse-arcgis-webscene.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAC,kBAAkB,EAAmB,MAAM,aAAa,CAAC;AA2BtE;;;GAGG;AACH,wBAAsB,aAAa,CAAC,IAAI,EAAE,WAAW,GAAG,OAAO,CAAC,kBAAkB,CAAC,CAclF"}
|