@loaders.gl/i3s 4.0.0-alpha.5 → 4.0.0-alpha.7
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 +9390 -8570
- 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 +56 -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/i3s-slpk-loader.js +20 -0
- package/dist/es5/i3s-slpk-loader.js.map +1 -0
- package/dist/es5/index.js +68 -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/parsers/parse-slpk/parse-slpk.js +94 -0
- package/dist/es5/lib/parsers/parse-slpk/parse-slpk.js.map +1 -0
- package/dist/es5/lib/parsers/parse-slpk/slpk-archieve.js +112 -0
- package/dist/es5/lib/parsers/parse-slpk/slpk-archieve.js.map +1 -0
- package/dist/es5/lib/parsers/parse-zip/cd-file-header.js +44 -0
- package/dist/es5/lib/parsers/parse-zip/cd-file-header.js.map +1 -0
- package/dist/es5/lib/parsers/parse-zip/local-file-header.js +26 -0
- package/dist/es5/lib/parsers/parse-zip/local-file-header.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-worker-node.js +7 -0
- package/dist/es5/workers/i3s-content-worker-node.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 +30 -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/i3s-slpk-loader.js +13 -0
- package/dist/esm/i3s-slpk-loader.js.map +1 -0
- package/dist/esm/index.js +9 -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/parsers/parse-slpk/parse-slpk.js +37 -0
- package/dist/esm/lib/parsers/parse-slpk/parse-slpk.js.map +1 -0
- package/dist/esm/lib/parsers/parse-slpk/slpk-archieve.js +58 -0
- package/dist/esm/lib/parsers/parse-slpk/slpk-archieve.js.map +1 -0
- package/dist/esm/lib/parsers/parse-zip/cd-file-header.js +37 -0
- package/dist/esm/lib/parsers/parse-zip/cd-file-header.js.map +1 -0
- package/dist/esm/lib/parsers/parse-zip/local-file-header.js +19 -0
- package/dist/esm/lib/parsers/parse-zip/local-file-header.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-worker-node.js +5 -0
- package/dist/esm/workers/i3s-content-worker-node.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 +29 -22
- package/dist/i3s-content-worker-node.js +197 -0
- package/dist/i3s-content-worker-node.js.map +7 -0
- package/dist/i3s-content-worker.js +1178 -1137
- 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/i3s-slpk-loader.d.ts +10 -0
- package/dist/i3s-slpk-loader.d.ts.map +1 -0
- package/dist/i3s-slpk-loader.js +20 -0
- package/dist/index.d.ts +5 -2
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +21 -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/parsers/parse-slpk/parse-slpk.d.ts +4 -0
- package/dist/lib/parsers/parse-slpk/parse-slpk.d.ts.map +1 -0
- package/dist/lib/parsers/parse-slpk/parse-slpk.js +50 -0
- package/dist/lib/parsers/parse-slpk/slpk-archieve.d.ts +32 -0
- package/dist/lib/parsers/parse-slpk/slpk-archieve.d.ts.map +1 -0
- package/dist/lib/parsers/parse-slpk/slpk-archieve.js +79 -0
- package/dist/lib/parsers/parse-zip/cd-file-header.d.ts +38 -0
- package/dist/lib/parsers/parse-zip/cd-file-header.d.ts.map +1 -0
- package/dist/lib/parsers/parse-zip/cd-file-header.js +48 -0
- package/dist/lib/parsers/parse-zip/local-file-header.d.ts +30 -0
- package/dist/lib/parsers/parse-zip/local-file-header.d.ts.map +1 -0
- package/dist/lib/parsers/parse-zip/local-file-header.js +28 -0
- 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-worker-node.d.ts +2 -0
- package/dist/workers/i3s-content-worker-node.d.ts.map +1 -0
- package/dist/workers/i3s-content-worker-node.js +7 -0
- package/dist/workers/i3s-content-worker.js +5 -4
- package/package.json +16 -14
- package/src/arcgis-webscene-loader.ts +31 -0
- package/src/i3s-attribute-loader.ts +9 -9
- package/src/i3s-content-loader.ts +17 -5
- package/src/i3s-loader.ts +22 -13
- package/src/i3s-node-page-loader.ts +6 -10
- package/src/i3s-slpk-loader.ts +25 -0
- 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/parsers/parse-slpk/parse-slpk.ts +61 -0
- package/src/lib/parsers/parse-slpk/slpk-archieve.ts +108 -0
- package/src/lib/parsers/parse-zip/cd-file-header.ts +93 -0
- package/src/lib/parsers/parse-zip/local-file-header.ts +56 -0
- package/src/lib/utils/customizeColors.ts +134 -0
- package/src/types.ts +482 -33
- package/src/workers/i3s-content-worker-node.ts +6 -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,499 +1,499 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
const
|
|
11
|
-
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.parseI3STileContent = void 0;
|
|
4
|
+
const core_1 = require("@loaders.gl/core");
|
|
5
|
+
const core_2 = require("@math.gl/core");
|
|
6
|
+
const geospatial_1 = require("@math.gl/geospatial");
|
|
7
|
+
const images_1 = require("@loaders.gl/images");
|
|
8
|
+
const draco_1 = require("@loaders.gl/draco");
|
|
9
|
+
const textures_1 = require("@loaders.gl/textures");
|
|
10
|
+
const types_1 = require("../../types");
|
|
11
|
+
const url_utils_1 = require("../utils/url-utils");
|
|
12
|
+
const constants_1 = require("./constants");
|
|
13
|
+
const customizeColors_1 = require("../utils/customizeColors");
|
|
14
|
+
const scratchVector = new core_2.Vector3([0, 0, 0]);
|
|
12
15
|
function getLoaderForTextureFormat(textureFormat) {
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
return ImageLoader;
|
|
25
|
-
}
|
|
16
|
+
switch (textureFormat) {
|
|
17
|
+
case 'ktx-etc2':
|
|
18
|
+
case 'dds':
|
|
19
|
+
return textures_1.CompressedTextureLoader;
|
|
20
|
+
case 'ktx2':
|
|
21
|
+
return textures_1.BasisLoader;
|
|
22
|
+
case 'jpg':
|
|
23
|
+
case 'png':
|
|
24
|
+
default:
|
|
25
|
+
return images_1.ImageLoader;
|
|
26
|
+
}
|
|
26
27
|
}
|
|
27
|
-
|
|
28
28
|
const I3S_ATTRIBUTE_TYPE = 'i3s-attribute-type';
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
const
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
29
|
+
async function parseI3STileContent(arrayBuffer, tileOptions, tilesetOptions, options, context) {
|
|
30
|
+
const content = {
|
|
31
|
+
attributes: {},
|
|
32
|
+
indices: null,
|
|
33
|
+
featureIds: [],
|
|
34
|
+
vertexCount: 0,
|
|
35
|
+
modelMatrix: new core_2.Matrix4(),
|
|
36
|
+
coordinateSystem: 0,
|
|
37
|
+
byteLength: 0,
|
|
38
|
+
texture: null
|
|
39
|
+
};
|
|
40
|
+
if (tileOptions.textureUrl) {
|
|
41
|
+
// @ts-expect-error options is not properly typed
|
|
42
|
+
const url = (0, url_utils_1.getUrlWithToken)(tileOptions.textureUrl, options?.i3s?.token);
|
|
43
|
+
const loader = getLoaderForTextureFormat(tileOptions.textureFormat);
|
|
44
|
+
const response = await fetch(url, options?.fetch);
|
|
45
|
+
const arrayBuffer = await response.arrayBuffer();
|
|
46
|
+
// @ts-expect-error options is not properly typed
|
|
47
|
+
if (options?.i3s.decodeTextures) {
|
|
48
|
+
if (loader === images_1.ImageLoader) {
|
|
49
|
+
const options = { ...tileOptions.textureLoaderOptions, image: { type: 'data' } };
|
|
50
|
+
try {
|
|
51
|
+
// @ts-ignore context must be defined
|
|
52
|
+
// Image constructor is not supported in worker thread.
|
|
53
|
+
// Do parsing image data on the main thread by using context to avoid worker issues.
|
|
54
|
+
content.texture = await context.parse(arrayBuffer, options);
|
|
55
|
+
}
|
|
56
|
+
catch (e) {
|
|
57
|
+
// context object is different between worker and node.js conversion script.
|
|
58
|
+
// To prevent error we parse data in ordinary way if it is not parsed by using context.
|
|
59
|
+
// @ts-expect-error
|
|
60
|
+
content.texture = await (0, core_1.parse)(arrayBuffer, loader, options);
|
|
61
|
+
}
|
|
62
|
+
}
|
|
63
|
+
else if (loader === textures_1.CompressedTextureLoader || loader === textures_1.BasisLoader) {
|
|
64
|
+
let texture = await (0, core_1.load)(arrayBuffer, loader, tileOptions.textureLoaderOptions);
|
|
65
|
+
if (loader === textures_1.BasisLoader) {
|
|
66
|
+
// @ts-expect-error
|
|
67
|
+
texture = texture[0];
|
|
68
|
+
}
|
|
69
|
+
content.texture = {
|
|
70
|
+
compressed: true,
|
|
71
|
+
mipmaps: false,
|
|
72
|
+
// @ts-expect-error
|
|
73
|
+
width: texture[0].width,
|
|
74
|
+
// @ts-expect-error
|
|
75
|
+
height: texture[0].height,
|
|
76
|
+
// @ts-expect-error
|
|
77
|
+
data: texture
|
|
78
|
+
};
|
|
79
|
+
}
|
|
54
80
|
}
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
if (loader === BasisLoader) {
|
|
59
|
-
texture = texture[0];
|
|
81
|
+
else {
|
|
82
|
+
content.texture = arrayBuffer;
|
|
60
83
|
}
|
|
61
|
-
|
|
62
|
-
tile.content.texture = {
|
|
63
|
-
compressed: true,
|
|
64
|
-
mipmaps: false,
|
|
65
|
-
width: texture[0].width,
|
|
66
|
-
height: texture[0].height,
|
|
67
|
-
data: texture
|
|
68
|
-
};
|
|
69
|
-
}
|
|
70
|
-
} else {
|
|
71
|
-
tile.content.texture = arrayBuffer;
|
|
72
84
|
}
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
tile.content.texture = null;
|
|
79
|
-
}
|
|
80
|
-
|
|
81
|
-
return await parseI3SNodeGeometry(arrayBuffer, tile, tileset, options);
|
|
85
|
+
content.material = makePbrMaterial(tileOptions.materialDefinition, content.texture);
|
|
86
|
+
if (content.material) {
|
|
87
|
+
content.texture = null;
|
|
88
|
+
}
|
|
89
|
+
return await parseI3SNodeGeometry(arrayBuffer, content, tileOptions, tilesetOptions, options);
|
|
82
90
|
}
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
}
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
|
|
120
|
-
|
|
121
|
-
|
|
122
|
-
|
|
91
|
+
exports.parseI3STileContent = parseI3STileContent;
|
|
92
|
+
/* eslint-disable max-statements */
|
|
93
|
+
async function parseI3SNodeGeometry(arrayBuffer, content, tileOptions, tilesetOptions, options) {
|
|
94
|
+
const contentByteLength = arrayBuffer.byteLength;
|
|
95
|
+
let attributes;
|
|
96
|
+
let vertexCount;
|
|
97
|
+
let byteOffset = 0;
|
|
98
|
+
let featureCount = 0;
|
|
99
|
+
let indices;
|
|
100
|
+
if (tileOptions.isDracoGeometry) {
|
|
101
|
+
const decompressedGeometry = await (0, core_1.parse)(arrayBuffer, draco_1.DracoLoader, {
|
|
102
|
+
draco: {
|
|
103
|
+
attributeNameEntry: I3S_ATTRIBUTE_TYPE
|
|
104
|
+
}
|
|
105
|
+
});
|
|
106
|
+
// @ts-expect-error
|
|
107
|
+
vertexCount = decompressedGeometry.header.vertexCount;
|
|
108
|
+
indices = decompressedGeometry.indices?.value;
|
|
109
|
+
const { POSITION, NORMAL, COLOR_0, TEXCOORD_0, ['feature-index']: featureIndex, ['uv-region']: uvRegion } = decompressedGeometry.attributes;
|
|
110
|
+
attributes = {
|
|
111
|
+
position: POSITION,
|
|
112
|
+
normal: NORMAL,
|
|
113
|
+
color: COLOR_0,
|
|
114
|
+
uv0: TEXCOORD_0,
|
|
115
|
+
uvRegion,
|
|
116
|
+
id: featureIndex
|
|
117
|
+
};
|
|
118
|
+
updateAttributesMetadata(attributes, decompressedGeometry);
|
|
119
|
+
const featureIds = getFeatureIdsFromFeatureIndexMetadata(featureIndex);
|
|
120
|
+
if (featureIds) {
|
|
121
|
+
flattenFeatureIdsByFeatureIndices(attributes, featureIds);
|
|
122
|
+
}
|
|
123
|
+
}
|
|
124
|
+
else {
|
|
125
|
+
const { vertexAttributes, ordering: attributesOrder, featureAttributes, featureAttributeOrder } = tilesetOptions.store.defaultGeometrySchema;
|
|
126
|
+
// First 8 bytes reserved for header (vertexCount and featureCount)
|
|
127
|
+
const headers = parseHeaders(arrayBuffer, tilesetOptions);
|
|
128
|
+
byteOffset = headers.byteOffset;
|
|
129
|
+
vertexCount = headers.vertexCount;
|
|
130
|
+
featureCount = headers.featureCount;
|
|
131
|
+
// Getting vertex attributes such as positions, normals, colors, etc...
|
|
132
|
+
const { attributes: normalizedVertexAttributes, byteOffset: offset } = normalizeAttributes(arrayBuffer, byteOffset, vertexAttributes, vertexCount, attributesOrder);
|
|
133
|
+
// Getting feature attributes such as featureIds and faceRange
|
|
134
|
+
const { attributes: normalizedFeatureAttributes } = normalizeAttributes(arrayBuffer, offset, featureAttributes, featureCount, featureAttributeOrder);
|
|
135
|
+
flattenFeatureIdsByFaceRanges(normalizedFeatureAttributes);
|
|
136
|
+
attributes = concatAttributes(normalizedVertexAttributes, normalizedFeatureAttributes);
|
|
137
|
+
}
|
|
138
|
+
if (!options?.i3s?.coordinateSystem ||
|
|
139
|
+
options.i3s.coordinateSystem === constants_1.COORDINATE_SYSTEM.METER_OFFSETS) {
|
|
140
|
+
const enuMatrix = parsePositions(attributes.position, tileOptions);
|
|
141
|
+
content.modelMatrix = enuMatrix.invert();
|
|
142
|
+
content.coordinateSystem = constants_1.COORDINATE_SYSTEM.METER_OFFSETS;
|
|
143
|
+
}
|
|
144
|
+
else {
|
|
145
|
+
content.modelMatrix = getModelMatrix(attributes.position);
|
|
146
|
+
content.coordinateSystem = constants_1.COORDINATE_SYSTEM.LNGLAT_OFFSETS;
|
|
147
|
+
}
|
|
148
|
+
attributes.color = await (0, customizeColors_1.customizeColors)(attributes.color, attributes.id, tileOptions, tilesetOptions, options);
|
|
149
|
+
content.attributes = {
|
|
150
|
+
positions: attributes.position,
|
|
151
|
+
normals: attributes.normal,
|
|
152
|
+
colors: normalizeAttribute(attributes.color),
|
|
153
|
+
texCoords: attributes.uv0,
|
|
154
|
+
uvRegions: normalizeAttribute(attributes.uvRegion || attributes.region) // Normalize from UInt16
|
|
123
155
|
};
|
|
124
|
-
|
|
125
|
-
|
|
126
|
-
|
|
127
|
-
if (featureIds) {
|
|
128
|
-
flattenFeatureIdsByFeatureIndices(attributes, featureIds);
|
|
156
|
+
content.indices = indices || null;
|
|
157
|
+
if (attributes.id && attributes.id.value) {
|
|
158
|
+
content.featureIds = attributes.id.value;
|
|
129
159
|
}
|
|
130
|
-
|
|
131
|
-
const {
|
|
132
|
-
|
|
133
|
-
|
|
134
|
-
|
|
135
|
-
featureAttributeOrder
|
|
136
|
-
} = tileset.store.defaultGeometrySchema;
|
|
137
|
-
const headers = parseHeaders(tileset, arrayBuffer);
|
|
138
|
-
byteOffset = headers.byteOffset;
|
|
139
|
-
vertexCount = headers.vertexCount;
|
|
140
|
-
featureCount = headers.featureCount;
|
|
141
|
-
const {
|
|
142
|
-
attributes: normalizedVertexAttributes,
|
|
143
|
-
byteOffset: offset
|
|
144
|
-
} = normalizeAttributes(arrayBuffer, byteOffset, vertexAttributes, vertexCount, attributesOrder);
|
|
145
|
-
const {
|
|
146
|
-
attributes: normalizedFeatureAttributes
|
|
147
|
-
} = normalizeAttributes(arrayBuffer, offset, featureAttributes, featureCount, featureAttributeOrder);
|
|
148
|
-
flattenFeatureIdsByFaceRanges(normalizedFeatureAttributes);
|
|
149
|
-
attributes = concatAttributes(normalizedVertexAttributes, normalizedFeatureAttributes);
|
|
150
|
-
}
|
|
151
|
-
|
|
152
|
-
if (!(options !== null && options !== void 0 && (_options$i3s2 = options.i3s) !== null && _options$i3s2 !== void 0 && _options$i3s2.coordinateSystem) || options.i3s.coordinateSystem === COORDINATE_SYSTEM.METER_OFFSETS) {
|
|
153
|
-
const enuMatrix = parsePositions(attributes.position, tile);
|
|
154
|
-
content.modelMatrix = enuMatrix.invert();
|
|
155
|
-
content.coordinateSystem = COORDINATE_SYSTEM.METER_OFFSETS;
|
|
156
|
-
} else {
|
|
157
|
-
content.modelMatrix = getModelMatrix(attributes.position);
|
|
158
|
-
content.coordinateSystem = COORDINATE_SYSTEM.LNGLAT_OFFSETS;
|
|
159
|
-
}
|
|
160
|
-
|
|
161
|
-
content.attributes = {
|
|
162
|
-
positions: attributes.position,
|
|
163
|
-
normals: attributes.normal,
|
|
164
|
-
colors: normalizeAttribute(attributes.color),
|
|
165
|
-
texCoords: attributes.uv0,
|
|
166
|
-
uvRegions: normalizeAttribute(attributes.uvRegion)
|
|
167
|
-
};
|
|
168
|
-
content.indices = indices || null;
|
|
169
|
-
|
|
170
|
-
if (attributes.id && attributes.id.value) {
|
|
171
|
-
tile.content.featureIds = attributes.id.value;
|
|
172
|
-
}
|
|
173
|
-
|
|
174
|
-
for (const attributeIndex in content.attributes) {
|
|
175
|
-
if (!content.attributes[attributeIndex]) {
|
|
176
|
-
delete content.attributes[attributeIndex];
|
|
160
|
+
// Remove undefined attributes
|
|
161
|
+
for (const attributeIndex in content.attributes) {
|
|
162
|
+
if (!content.attributes[attributeIndex]) {
|
|
163
|
+
delete content.attributes[attributeIndex];
|
|
164
|
+
}
|
|
177
165
|
}
|
|
178
|
-
|
|
179
|
-
|
|
180
|
-
|
|
181
|
-
content.byteLength = arrayBuffer.byteLength;
|
|
182
|
-
return tile;
|
|
166
|
+
content.vertexCount = vertexCount;
|
|
167
|
+
content.byteLength = contentByteLength;
|
|
168
|
+
return content;
|
|
183
169
|
}
|
|
184
|
-
|
|
170
|
+
/**
|
|
171
|
+
* Update attributes with metadata from decompressed geometry.
|
|
172
|
+
* @param decompressedGeometry
|
|
173
|
+
* @param attributes
|
|
174
|
+
*/
|
|
185
175
|
function updateAttributesMetadata(attributes, decompressedGeometry) {
|
|
186
|
-
|
|
187
|
-
|
|
188
|
-
|
|
189
|
-
|
|
190
|
-
|
|
191
|
-
|
|
192
|
-
|
|
193
|
-
|
|
194
|
-
|
|
195
|
-
|
|
196
|
-
|
|
197
|
-
|
|
198
|
-
default:
|
|
199
|
-
break;
|
|
176
|
+
for (const key in decompressedGeometry.loaderData.attributes) {
|
|
177
|
+
const dracoAttribute = decompressedGeometry.loaderData.attributes[key];
|
|
178
|
+
switch (dracoAttribute.name) {
|
|
179
|
+
case 'POSITION':
|
|
180
|
+
attributes.position.metadata = dracoAttribute.metadata;
|
|
181
|
+
break;
|
|
182
|
+
case 'feature-index':
|
|
183
|
+
attributes.id.metadata = dracoAttribute.metadata;
|
|
184
|
+
break;
|
|
185
|
+
default:
|
|
186
|
+
break;
|
|
187
|
+
}
|
|
200
188
|
}
|
|
201
|
-
}
|
|
202
189
|
}
|
|
203
|
-
|
|
190
|
+
/**
|
|
191
|
+
* Do concatenation of attribute objects.
|
|
192
|
+
* Done as separate fucntion to avoid ts errors.
|
|
193
|
+
* @param normalizedVertexAttributes
|
|
194
|
+
* @param normalizedFeatureAttributes
|
|
195
|
+
* @returns - result of attributes concatenation.
|
|
196
|
+
*/
|
|
204
197
|
function concatAttributes(normalizedVertexAttributes, normalizedFeatureAttributes) {
|
|
205
|
-
|
|
206
|
-
...normalizedFeatureAttributes
|
|
207
|
-
};
|
|
198
|
+
return { ...normalizedVertexAttributes, ...normalizedFeatureAttributes };
|
|
208
199
|
}
|
|
209
|
-
|
|
200
|
+
/**
|
|
201
|
+
* Normalize attribute to range [0..1] . Eg. convert colors buffer from [255,255,255,255] to [1,1,1,1]
|
|
202
|
+
* @param attribute - geometry attribute
|
|
203
|
+
* @returns - geometry attribute in right format
|
|
204
|
+
*/
|
|
210
205
|
function normalizeAttribute(attribute) {
|
|
211
|
-
|
|
206
|
+
if (!attribute) {
|
|
207
|
+
return attribute;
|
|
208
|
+
}
|
|
209
|
+
attribute.normalized = true;
|
|
212
210
|
return attribute;
|
|
213
|
-
}
|
|
214
|
-
|
|
215
|
-
attribute.normalized = true;
|
|
216
|
-
return attribute;
|
|
217
211
|
}
|
|
218
|
-
|
|
219
|
-
|
|
220
|
-
|
|
221
|
-
|
|
222
|
-
|
|
223
|
-
|
|
224
|
-
|
|
225
|
-
|
|
226
|
-
|
|
227
|
-
|
|
228
|
-
|
|
229
|
-
|
|
230
|
-
|
|
231
|
-
|
|
232
|
-
|
|
233
|
-
|
|
234
|
-
|
|
235
|
-
|
|
236
|
-
|
|
237
|
-
featureCount = new TypedArrayTypeHeader(arrayBuffer, 4, 4)[0];
|
|
238
|
-
byteOffset += sizeOf(type);
|
|
239
|
-
break;
|
|
240
|
-
|
|
241
|
-
default:
|
|
242
|
-
break;
|
|
212
|
+
function parseHeaders(arrayBuffer, options) {
|
|
213
|
+
let byteOffset = 0;
|
|
214
|
+
// First 8 bytes reserved for header (vertexCount and featurecount)
|
|
215
|
+
let vertexCount = 0;
|
|
216
|
+
let featureCount = 0;
|
|
217
|
+
for (const { property, type } of options.store.defaultGeometrySchema.header) {
|
|
218
|
+
const TypedArrayTypeHeader = (0, constants_1.getConstructorForDataFormat)(type);
|
|
219
|
+
switch (property) {
|
|
220
|
+
case types_1.HeaderAttributeProperty.vertexCount:
|
|
221
|
+
vertexCount = new TypedArrayTypeHeader(arrayBuffer, 0, 4)[0];
|
|
222
|
+
byteOffset += (0, constants_1.sizeOf)(type);
|
|
223
|
+
break;
|
|
224
|
+
case types_1.HeaderAttributeProperty.featureCount:
|
|
225
|
+
featureCount = new TypedArrayTypeHeader(arrayBuffer, 4, 4)[0];
|
|
226
|
+
byteOffset += (0, constants_1.sizeOf)(type);
|
|
227
|
+
break;
|
|
228
|
+
default:
|
|
229
|
+
break;
|
|
230
|
+
}
|
|
243
231
|
}
|
|
244
|
-
|
|
245
|
-
|
|
246
|
-
|
|
247
|
-
|
|
248
|
-
|
|
249
|
-
byteOffset
|
|
250
|
-
};
|
|
232
|
+
return {
|
|
233
|
+
vertexCount,
|
|
234
|
+
featureCount,
|
|
235
|
+
byteOffset
|
|
236
|
+
};
|
|
251
237
|
}
|
|
252
|
-
|
|
253
|
-
function normalizeAttributes(arrayBuffer, byteOffset, vertexAttributes,
|
|
254
|
-
|
|
255
|
-
|
|
256
|
-
|
|
257
|
-
|
|
258
|
-
|
|
259
|
-
|
|
260
|
-
|
|
261
|
-
|
|
262
|
-
|
|
263
|
-
|
|
264
|
-
|
|
265
|
-
|
|
266
|
-
|
|
267
|
-
|
|
268
|
-
|
|
269
|
-
|
|
270
|
-
|
|
271
|
-
|
|
272
|
-
|
|
273
|
-
|
|
274
|
-
|
|
275
|
-
|
|
276
|
-
|
|
277
|
-
|
|
278
|
-
|
|
279
|
-
|
|
280
|
-
|
|
281
|
-
|
|
282
|
-
|
|
283
|
-
|
|
284
|
-
|
|
285
|
-
|
|
286
|
-
|
|
287
|
-
|
|
288
|
-
|
|
289
|
-
|
|
290
|
-
|
|
291
|
-
|
|
292
|
-
|
|
293
|
-
|
|
294
|
-
|
|
295
|
-
|
|
238
|
+
/* eslint-enable max-statements */
|
|
239
|
+
function normalizeAttributes(arrayBuffer, byteOffset, vertexAttributes, attributeCount, attributesOrder) {
|
|
240
|
+
const attributes = {};
|
|
241
|
+
// the order of attributes depend on the order being added to the vertexAttributes object
|
|
242
|
+
for (const attribute of attributesOrder) {
|
|
243
|
+
if (vertexAttributes[attribute]) {
|
|
244
|
+
const { valueType, valuesPerElement } = vertexAttributes[attribute];
|
|
245
|
+
// protect from arrayBuffer read overunns by NOT assuming node has regions always even though its declared in defaultGeometrySchema.
|
|
246
|
+
// In i3s 1.6: client is required to decide that based on ./shared resource of the node (materialDefinitions.[Mat_id].params.vertexRegions == true)
|
|
247
|
+
// In i3s 1.7 the property has been rolled into the 3d scene layer json/node pages.
|
|
248
|
+
// Code below does not account when the bytelength is actually bigger than
|
|
249
|
+
// the calculated value (b\c the tile potentially could have mesh segmentation information).
|
|
250
|
+
// In those cases tiles without regions could fail or have garbage values.
|
|
251
|
+
if (byteOffset + attributeCount * valuesPerElement * (0, constants_1.sizeOf)(valueType) <=
|
|
252
|
+
arrayBuffer.byteLength) {
|
|
253
|
+
const buffer = arrayBuffer.slice(byteOffset);
|
|
254
|
+
let value;
|
|
255
|
+
if (valueType === 'UInt64') {
|
|
256
|
+
value = parseUint64Values(buffer, attributeCount * valuesPerElement, (0, constants_1.sizeOf)(valueType));
|
|
257
|
+
}
|
|
258
|
+
else {
|
|
259
|
+
const TypedArrayType = (0, constants_1.getConstructorForDataFormat)(valueType);
|
|
260
|
+
value = new TypedArrayType(buffer, 0, attributeCount * valuesPerElement);
|
|
261
|
+
}
|
|
262
|
+
attributes[attribute] = {
|
|
263
|
+
value,
|
|
264
|
+
type: constants_1.GL_TYPE_MAP[valueType],
|
|
265
|
+
size: valuesPerElement
|
|
266
|
+
};
|
|
267
|
+
switch (attribute) {
|
|
268
|
+
case 'color':
|
|
269
|
+
attributes.color.normalized = true;
|
|
270
|
+
break;
|
|
271
|
+
case 'position':
|
|
272
|
+
case 'region':
|
|
273
|
+
case 'normal':
|
|
274
|
+
default:
|
|
275
|
+
}
|
|
276
|
+
byteOffset = byteOffset + attributeCount * valuesPerElement * (0, constants_1.sizeOf)(valueType);
|
|
277
|
+
}
|
|
278
|
+
else if (attribute !== 'uv0') {
|
|
279
|
+
break;
|
|
280
|
+
}
|
|
281
|
+
}
|
|
296
282
|
}
|
|
297
|
-
|
|
298
|
-
|
|
299
|
-
return {
|
|
300
|
-
attributes,
|
|
301
|
-
byteOffset
|
|
302
|
-
};
|
|
283
|
+
return { attributes, byteOffset };
|
|
303
284
|
}
|
|
304
|
-
|
|
285
|
+
/**
|
|
286
|
+
* Parse buffer to return array of uint64 values
|
|
287
|
+
*
|
|
288
|
+
* @param buffer
|
|
289
|
+
* @param elementsCount
|
|
290
|
+
* @returns 64-bit array of values until precision is lost after Number.MAX_SAFE_INTEGER
|
|
291
|
+
*/
|
|
305
292
|
function parseUint64Values(buffer, elementsCount, attributeSize) {
|
|
306
|
-
|
|
307
|
-
|
|
308
|
-
|
|
309
|
-
|
|
310
|
-
|
|
311
|
-
|
|
312
|
-
|
|
313
|
-
|
|
314
|
-
|
|
315
|
-
|
|
316
|
-
|
|
317
|
-
|
|
318
|
-
|
|
293
|
+
const values = [];
|
|
294
|
+
const dataView = new DataView(buffer);
|
|
295
|
+
let offset = 0;
|
|
296
|
+
for (let index = 0; index < elementsCount; index++) {
|
|
297
|
+
// split 64-bit number into two 32-bit parts
|
|
298
|
+
const left = dataView.getUint32(offset, true);
|
|
299
|
+
const right = dataView.getUint32(offset + 4, true);
|
|
300
|
+
// combine the two 32-bit values
|
|
301
|
+
const value = left + 2 ** 32 * right;
|
|
302
|
+
values.push(value);
|
|
303
|
+
offset += attributeSize;
|
|
304
|
+
}
|
|
305
|
+
return new Uint32Array(values);
|
|
319
306
|
}
|
|
320
|
-
|
|
321
|
-
|
|
322
|
-
|
|
323
|
-
|
|
324
|
-
|
|
325
|
-
|
|
326
|
-
|
|
327
|
-
|
|
328
|
-
|
|
329
|
-
|
|
330
|
-
|
|
331
|
-
return enuMatrix;
|
|
307
|
+
function parsePositions(attribute, options) {
|
|
308
|
+
const mbs = options.mbs;
|
|
309
|
+
const value = attribute.value;
|
|
310
|
+
const metadata = attribute.metadata;
|
|
311
|
+
const enuMatrix = new core_2.Matrix4();
|
|
312
|
+
const cartographicOrigin = new core_2.Vector3(mbs[0], mbs[1], mbs[2]);
|
|
313
|
+
const cartesianOrigin = new core_2.Vector3();
|
|
314
|
+
geospatial_1.Ellipsoid.WGS84.cartographicToCartesian(cartographicOrigin, cartesianOrigin);
|
|
315
|
+
geospatial_1.Ellipsoid.WGS84.eastNorthUpToFixedFrame(cartesianOrigin, enuMatrix);
|
|
316
|
+
attribute.value = offsetsToCartesians(value, metadata, cartographicOrigin);
|
|
317
|
+
return enuMatrix;
|
|
332
318
|
}
|
|
333
|
-
|
|
319
|
+
/**
|
|
320
|
+
* Converts position coordinates to absolute cartesian coordinates
|
|
321
|
+
* @param vertices - "position" attribute data
|
|
322
|
+
* @param metadata - When the geometry is DRACO compressed, contain position attribute's metadata
|
|
323
|
+
* https://github.com/Esri/i3s-spec/blob/master/docs/1.7/compressedAttributes.cmn.md
|
|
324
|
+
* @param cartographicOrigin - Cartographic origin coordinates
|
|
325
|
+
* @returns - converted "position" data
|
|
326
|
+
*/
|
|
334
327
|
function offsetsToCartesians(vertices, metadata = {}, cartographicOrigin) {
|
|
335
|
-
|
|
336
|
-
|
|
337
|
-
|
|
338
|
-
|
|
339
|
-
|
|
340
|
-
|
|
341
|
-
|
|
342
|
-
|
|
343
|
-
|
|
344
|
-
|
|
345
|
-
|
|
346
|
-
|
|
347
|
-
|
|
348
|
-
|
|
349
|
-
|
|
350
|
-
|
|
351
|
-
|
|
352
|
-
return positions;
|
|
328
|
+
const positions = new Float64Array(vertices.length);
|
|
329
|
+
const scaleX = (metadata['i3s-scale_x'] && metadata['i3s-scale_x'].double) || 1;
|
|
330
|
+
const scaleY = (metadata['i3s-scale_y'] && metadata['i3s-scale_y'].double) || 1;
|
|
331
|
+
for (let i = 0; i < positions.length; i += 3) {
|
|
332
|
+
positions[i] = vertices[i] * scaleX + cartographicOrigin.x;
|
|
333
|
+
positions[i + 1] = vertices[i + 1] * scaleY + cartographicOrigin.y;
|
|
334
|
+
positions[i + 2] = vertices[i + 2] + cartographicOrigin.z;
|
|
335
|
+
}
|
|
336
|
+
for (let i = 0; i < positions.length; i += 3) {
|
|
337
|
+
// @ts-ignore
|
|
338
|
+
geospatial_1.Ellipsoid.WGS84.cartographicToCartesian(positions.subarray(i, i + 3), scratchVector);
|
|
339
|
+
positions[i] = scratchVector.x;
|
|
340
|
+
positions[i + 1] = scratchVector.y;
|
|
341
|
+
positions[i + 2] = scratchVector.z;
|
|
342
|
+
}
|
|
343
|
+
return positions;
|
|
353
344
|
}
|
|
354
|
-
|
|
345
|
+
/**
|
|
346
|
+
* Get model matrix for loaded vertices
|
|
347
|
+
* @param positions positions attribute
|
|
348
|
+
* @returns Matrix4 - model matrix for geometry transformation
|
|
349
|
+
*/
|
|
355
350
|
function getModelMatrix(positions) {
|
|
356
|
-
|
|
357
|
-
|
|
358
|
-
|
|
359
|
-
|
|
360
|
-
|
|
361
|
-
|
|
362
|
-
|
|
363
|
-
modelMatrix[5] = scaleY;
|
|
364
|
-
return modelMatrix;
|
|
351
|
+
const metadata = positions.metadata;
|
|
352
|
+
const scaleX = metadata?.['i3s-scale_x']?.double || 1;
|
|
353
|
+
const scaleY = metadata?.['i3s-scale_y']?.double || 1;
|
|
354
|
+
const modelMatrix = new core_2.Matrix4();
|
|
355
|
+
modelMatrix[0] = scaleX;
|
|
356
|
+
modelMatrix[5] = scaleY;
|
|
357
|
+
return modelMatrix;
|
|
365
358
|
}
|
|
366
|
-
|
|
359
|
+
/**
|
|
360
|
+
* Makes a glTF-compatible PBR material from an I3S material definition
|
|
361
|
+
* @param materialDefinition - i3s material definition
|
|
362
|
+
* https://github.com/Esri/i3s-spec/blob/master/docs/1.7/materialDefinitions.cmn.md
|
|
363
|
+
* @param texture - texture image
|
|
364
|
+
* @returns {object}
|
|
365
|
+
*/
|
|
367
366
|
function makePbrMaterial(materialDefinition, texture) {
|
|
368
|
-
|
|
369
|
-
|
|
370
|
-
|
|
371
|
-
|
|
372
|
-
|
|
373
|
-
|
|
374
|
-
|
|
375
|
-
|
|
376
|
-
}
|
|
377
|
-
|
|
378
|
-
|
|
379
|
-
|
|
380
|
-
|
|
381
|
-
|
|
367
|
+
let pbrMaterial;
|
|
368
|
+
if (materialDefinition) {
|
|
369
|
+
pbrMaterial = {
|
|
370
|
+
...materialDefinition,
|
|
371
|
+
pbrMetallicRoughness: materialDefinition.pbrMetallicRoughness
|
|
372
|
+
? { ...materialDefinition.pbrMetallicRoughness }
|
|
373
|
+
: { baseColorFactor: [255, 255, 255, 255] }
|
|
374
|
+
};
|
|
375
|
+
}
|
|
376
|
+
else {
|
|
377
|
+
pbrMaterial = {
|
|
378
|
+
pbrMetallicRoughness: {}
|
|
379
|
+
};
|
|
380
|
+
if (texture) {
|
|
381
|
+
pbrMaterial.pbrMetallicRoughness.baseColorTexture = { texCoord: 0 };
|
|
382
|
+
}
|
|
383
|
+
else {
|
|
384
|
+
pbrMaterial.pbrMetallicRoughness.baseColorFactor = [255, 255, 255, 255];
|
|
385
|
+
}
|
|
386
|
+
}
|
|
387
|
+
// Set default 0.25 per spec https://github.com/Esri/i3s-spec/blob/master/docs/1.7/materialDefinitions.cmn.md
|
|
388
|
+
pbrMaterial.alphaCutoff = pbrMaterial.alphaCutoff || 0.25;
|
|
389
|
+
if (pbrMaterial.alphaMode) {
|
|
390
|
+
// I3S contain alphaMode in lowerCase
|
|
391
|
+
pbrMaterial.alphaMode = pbrMaterial.alphaMode.toUpperCase();
|
|
392
|
+
}
|
|
393
|
+
// Convert colors from [255,255,255,255] to [1,1,1,1]
|
|
394
|
+
if (pbrMaterial.emissiveFactor) {
|
|
395
|
+
pbrMaterial.emissiveFactor = convertColorFormat(pbrMaterial.emissiveFactor);
|
|
396
|
+
}
|
|
397
|
+
if (pbrMaterial.pbrMetallicRoughness && pbrMaterial.pbrMetallicRoughness.baseColorFactor) {
|
|
398
|
+
pbrMaterial.pbrMetallicRoughness.baseColorFactor = convertColorFormat(pbrMaterial.pbrMetallicRoughness.baseColorFactor);
|
|
399
|
+
}
|
|
382
400
|
if (texture) {
|
|
383
|
-
|
|
384
|
-
texCoord: 0
|
|
385
|
-
};
|
|
386
|
-
} else {
|
|
387
|
-
pbrMaterial.pbrMetallicRoughness.baseColorFactor = [255, 255, 255, 255];
|
|
401
|
+
setMaterialTexture(pbrMaterial, texture);
|
|
388
402
|
}
|
|
389
|
-
|
|
390
|
-
|
|
391
|
-
pbrMaterial.alphaCutoff = pbrMaterial.alphaCutoff || 0.25;
|
|
392
|
-
|
|
393
|
-
if (pbrMaterial.alphaMode) {
|
|
394
|
-
pbrMaterial.alphaMode = pbrMaterial.alphaMode.toUpperCase();
|
|
395
|
-
}
|
|
396
|
-
|
|
397
|
-
if (pbrMaterial.emissiveFactor) {
|
|
398
|
-
pbrMaterial.emissiveFactor = convertColorFormat(pbrMaterial.emissiveFactor);
|
|
399
|
-
}
|
|
400
|
-
|
|
401
|
-
if (pbrMaterial.pbrMetallicRoughness && pbrMaterial.pbrMetallicRoughness.baseColorFactor) {
|
|
402
|
-
pbrMaterial.pbrMetallicRoughness.baseColorFactor = convertColorFormat(pbrMaterial.pbrMetallicRoughness.baseColorFactor);
|
|
403
|
-
}
|
|
404
|
-
|
|
405
|
-
if (texture) {
|
|
406
|
-
setMaterialTexture(pbrMaterial, texture);
|
|
407
|
-
}
|
|
408
|
-
|
|
409
|
-
return pbrMaterial;
|
|
403
|
+
return pbrMaterial;
|
|
410
404
|
}
|
|
411
|
-
|
|
405
|
+
/**
|
|
406
|
+
* Convert color from [255,255,255,255] to [1,1,1,1]
|
|
407
|
+
* @param colorFactor - color array
|
|
408
|
+
* @returns - new color array
|
|
409
|
+
*/
|
|
412
410
|
function convertColorFormat(colorFactor) {
|
|
413
|
-
|
|
414
|
-
|
|
415
|
-
|
|
416
|
-
|
|
417
|
-
|
|
418
|
-
|
|
419
|
-
return normalizedColor;
|
|
411
|
+
const normalizedColor = [...colorFactor];
|
|
412
|
+
for (let index = 0; index < colorFactor.length; index++) {
|
|
413
|
+
normalizedColor[index] = colorFactor[index] / 255;
|
|
414
|
+
}
|
|
415
|
+
return normalizedColor;
|
|
420
416
|
}
|
|
421
|
-
|
|
417
|
+
/**
|
|
418
|
+
* Set texture in PBR material
|
|
419
|
+
* @param {object} material - i3s material definition
|
|
420
|
+
* @param image - texture image
|
|
421
|
+
* @returns
|
|
422
|
+
*/
|
|
422
423
|
function setMaterialTexture(material, image) {
|
|
423
|
-
|
|
424
|
-
|
|
425
|
-
|
|
424
|
+
const texture = { source: { image } };
|
|
425
|
+
// I3SLoader now support loading only one texture. This elseif sequence will assign this texture to one of
|
|
426
|
+
// properties defined in materialDefinition
|
|
427
|
+
if (material.pbrMetallicRoughness && material.pbrMetallicRoughness.baseColorTexture) {
|
|
428
|
+
material.pbrMetallicRoughness.baseColorTexture = {
|
|
429
|
+
...material.pbrMetallicRoughness.baseColorTexture,
|
|
430
|
+
texture
|
|
431
|
+
};
|
|
432
|
+
}
|
|
433
|
+
else if (material.emissiveTexture) {
|
|
434
|
+
material.emissiveTexture = { ...material.emissiveTexture, texture };
|
|
435
|
+
}
|
|
436
|
+
else if (material.pbrMetallicRoughness &&
|
|
437
|
+
material.pbrMetallicRoughness.metallicRoughnessTexture) {
|
|
438
|
+
material.pbrMetallicRoughness.metallicRoughnessTexture = {
|
|
439
|
+
...material.pbrMetallicRoughness.metallicRoughnessTexture,
|
|
440
|
+
texture
|
|
441
|
+
};
|
|
442
|
+
}
|
|
443
|
+
else if (material.normalTexture) {
|
|
444
|
+
material.normalTexture = { ...material.normalTexture, texture };
|
|
445
|
+
}
|
|
446
|
+
else if (material.occlusionTexture) {
|
|
447
|
+
material.occlusionTexture = { ...material.occlusionTexture, texture };
|
|
426
448
|
}
|
|
427
|
-
};
|
|
428
|
-
|
|
429
|
-
if (material.pbrMetallicRoughness && material.pbrMetallicRoughness.baseColorTexture) {
|
|
430
|
-
material.pbrMetallicRoughness.baseColorTexture = { ...material.pbrMetallicRoughness.baseColorTexture,
|
|
431
|
-
texture
|
|
432
|
-
};
|
|
433
|
-
} else if (material.emissiveTexture) {
|
|
434
|
-
material.emissiveTexture = { ...material.emissiveTexture,
|
|
435
|
-
texture
|
|
436
|
-
};
|
|
437
|
-
} else if (material.pbrMetallicRoughness && material.pbrMetallicRoughness.metallicRoughnessTexture) {
|
|
438
|
-
material.pbrMetallicRoughness.metallicRoughnessTexture = { ...material.pbrMetallicRoughness.metallicRoughnessTexture,
|
|
439
|
-
texture
|
|
440
|
-
};
|
|
441
|
-
} else if (material.normalTexture) {
|
|
442
|
-
material.normalTexture = { ...material.normalTexture,
|
|
443
|
-
texture
|
|
444
|
-
};
|
|
445
|
-
} else if (material.occlusionTexture) {
|
|
446
|
-
material.occlusionTexture = { ...material.occlusionTexture,
|
|
447
|
-
texture
|
|
448
|
-
};
|
|
449
|
-
}
|
|
450
449
|
}
|
|
451
|
-
|
|
450
|
+
/**
|
|
451
|
+
* Flatten feature ids using face ranges
|
|
452
|
+
* @param normalizedFeatureAttributes
|
|
453
|
+
* @returns
|
|
454
|
+
*/
|
|
452
455
|
function flattenFeatureIdsByFaceRanges(normalizedFeatureAttributes) {
|
|
453
|
-
|
|
454
|
-
id
|
|
455
|
-
|
|
456
|
-
|
|
457
|
-
|
|
458
|
-
|
|
459
|
-
|
|
460
|
-
|
|
461
|
-
|
|
462
|
-
|
|
463
|
-
|
|
464
|
-
|
|
465
|
-
|
|
466
|
-
|
|
467
|
-
|
|
468
|
-
|
|
469
|
-
|
|
470
|
-
|
|
471
|
-
|
|
472
|
-
|
|
473
|
-
|
|
474
|
-
const endIndex = startIndex + trianglesCount * 3;
|
|
475
|
-
orderedFeatureIndices.fill(fillId, startIndex, endIndex);
|
|
476
|
-
featureIndex++;
|
|
477
|
-
startIndex = endIndex;
|
|
478
|
-
}
|
|
479
|
-
|
|
480
|
-
normalizedFeatureAttributes.id.value = orderedFeatureIndices;
|
|
456
|
+
const { id, faceRange } = normalizedFeatureAttributes;
|
|
457
|
+
if (!id || !faceRange) {
|
|
458
|
+
return;
|
|
459
|
+
}
|
|
460
|
+
const featureIds = id.value;
|
|
461
|
+
const range = faceRange.value;
|
|
462
|
+
const featureIdsLength = range[range.length - 1] + 1;
|
|
463
|
+
const orderedFeatureIndices = new Uint32Array(featureIdsLength * 3);
|
|
464
|
+
let featureIndex = 0;
|
|
465
|
+
let startIndex = 0;
|
|
466
|
+
for (let index = 1; index < range.length; index += 2) {
|
|
467
|
+
const fillId = Number(featureIds[featureIndex]);
|
|
468
|
+
const endValue = range[index];
|
|
469
|
+
const prevValue = range[index - 1];
|
|
470
|
+
const trianglesCount = endValue - prevValue + 1;
|
|
471
|
+
const endIndex = startIndex + trianglesCount * 3;
|
|
472
|
+
orderedFeatureIndices.fill(fillId, startIndex, endIndex);
|
|
473
|
+
featureIndex++;
|
|
474
|
+
startIndex = endIndex;
|
|
475
|
+
}
|
|
476
|
+
normalizedFeatureAttributes.id.value = orderedFeatureIndices;
|
|
481
477
|
}
|
|
482
|
-
|
|
478
|
+
/**
|
|
479
|
+
* Flatten feature ids using featureIndices
|
|
480
|
+
* @param attributes
|
|
481
|
+
* @param featureIds
|
|
482
|
+
* @returns
|
|
483
|
+
*/
|
|
483
484
|
function flattenFeatureIdsByFeatureIndices(attributes, featureIds) {
|
|
484
|
-
|
|
485
|
-
|
|
486
|
-
|
|
487
|
-
|
|
488
|
-
|
|
489
|
-
|
|
490
|
-
|
|
491
|
-
attributes.id.value = result;
|
|
485
|
+
const featureIndices = attributes.id.value;
|
|
486
|
+
const result = new Float32Array(featureIndices.length);
|
|
487
|
+
for (let index = 0; index < featureIndices.length; index++) {
|
|
488
|
+
result[index] = featureIds[featureIndices[index]];
|
|
489
|
+
}
|
|
490
|
+
attributes.id.value = result;
|
|
492
491
|
}
|
|
493
|
-
|
|
492
|
+
/**
|
|
493
|
+
* Flatten feature ids using featureIndices
|
|
494
|
+
* @param featureIndex
|
|
495
|
+
* @returns
|
|
496
|
+
*/
|
|
494
497
|
function getFeatureIdsFromFeatureIndexMetadata(featureIndex) {
|
|
495
|
-
|
|
496
|
-
|
|
497
|
-
return featureIndex === null || featureIndex === void 0 ? void 0 : (_featureIndex$metadat = featureIndex.metadata) === null || _featureIndex$metadat === void 0 ? void 0 : (_featureIndex$metadat2 = _featureIndex$metadat['i3s-feature-ids']) === null || _featureIndex$metadat2 === void 0 ? void 0 : _featureIndex$metadat2.intArray;
|
|
498
|
+
return featureIndex?.metadata?.['i3s-feature-ids']?.intArray;
|
|
498
499
|
}
|
|
499
|
-
//# sourceMappingURL=parse-i3s-tile-content.js.map
|