@loaders.gl/3d-tiles 3.2.12 → 3.3.0-alpha.10
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/dist.min.js +1247 -1414
- package/dist/es5/bundle.js +0 -1
- package/dist/es5/bundle.js.map +1 -1
- package/dist/es5/cesium-ion-loader.js +7 -26
- package/dist/es5/cesium-ion-loader.js.map +1 -1
- package/dist/es5/index.js +14 -23
- package/dist/es5/index.js.map +1 -1
- package/dist/es5/lib/classes/helpers/tile-3d-accessor-utils.js +1 -5
- package/dist/es5/lib/classes/helpers/tile-3d-accessor-utils.js.map +1 -1
- package/dist/es5/lib/classes/tile-3d-batch-table-hierarchy.js +1 -40
- package/dist/es5/lib/classes/tile-3d-batch-table-hierarchy.js.map +1 -1
- package/dist/es5/lib/classes/tile-3d-batch-table.js +12 -59
- package/dist/es5/lib/classes/tile-3d-batch-table.js.map +1 -1
- package/dist/es5/lib/classes/tile-3d-feature-table.js +4 -23
- package/dist/es5/lib/classes/tile-3d-feature-table.js.map +1 -1
- package/dist/es5/lib/constants.js +3 -1
- package/dist/es5/lib/constants.js.map +1 -1
- package/dist/es5/lib/encoders/encode-3d-tile-batched-model.js +7 -16
- package/dist/es5/lib/encoders/encode-3d-tile-batched-model.js.map +1 -1
- package/dist/es5/lib/encoders/encode-3d-tile-composite.js +2 -11
- package/dist/es5/lib/encoders/encode-3d-tile-composite.js.map +1 -1
- package/dist/es5/lib/encoders/encode-3d-tile-instanced-model.js +10 -17
- package/dist/es5/lib/encoders/encode-3d-tile-instanced-model.js.map +1 -1
- package/dist/es5/lib/encoders/encode-3d-tile-point-cloud.js +8 -16
- package/dist/es5/lib/encoders/encode-3d-tile-point-cloud.js.map +1 -1
- package/dist/es5/lib/encoders/encode-3d-tile.js +0 -12
- package/dist/es5/lib/encoders/encode-3d-tile.js.map +1 -1
- package/dist/es5/lib/encoders/helpers/encode-3d-tile-header.js +6 -9
- package/dist/es5/lib/encoders/helpers/encode-3d-tile-header.js.map +1 -1
- package/dist/es5/lib/ion/ion.js +5 -46
- package/dist/es5/lib/ion/ion.js.map +1 -1
- package/dist/es5/lib/parsers/helpers/normalize-3d-tile-colors.js +2 -11
- package/dist/es5/lib/parsers/helpers/normalize-3d-tile-colors.js.map +1 -1
- package/dist/es5/lib/parsers/helpers/normalize-3d-tile-normals.js +0 -8
- package/dist/es5/lib/parsers/helpers/normalize-3d-tile-normals.js.map +1 -1
- package/dist/es5/lib/parsers/helpers/normalize-3d-tile-positions.js +0 -5
- package/dist/es5/lib/parsers/helpers/normalize-3d-tile-positions.js.map +1 -1
- package/dist/es5/lib/parsers/helpers/parse-3d-implicit-tiles.js +19 -51
- package/dist/es5/lib/parsers/helpers/parse-3d-implicit-tiles.js.map +1 -1
- package/dist/es5/lib/parsers/helpers/parse-3d-tile-gltf-view.js +6 -25
- package/dist/es5/lib/parsers/helpers/parse-3d-tile-gltf-view.js.map +1 -1
- package/dist/es5/lib/parsers/helpers/parse-3d-tile-header.js +1 -1
- package/dist/es5/lib/parsers/helpers/parse-3d-tile-header.js.map +1 -1
- package/dist/es5/lib/parsers/helpers/parse-3d-tile-subtree.js +40 -49
- package/dist/es5/lib/parsers/helpers/parse-3d-tile-subtree.js.map +1 -1
- package/dist/es5/lib/parsers/helpers/parse-3d-tile-tables.js +6 -14
- package/dist/es5/lib/parsers/helpers/parse-3d-tile-tables.js.map +1 -1
- package/dist/es5/lib/parsers/helpers/parse-utils.js +1 -3
- package/dist/es5/lib/parsers/helpers/parse-utils.js.map +1 -1
- package/dist/es5/lib/parsers/parse-3d-tile-batched-model.js +0 -16
- package/dist/es5/lib/parsers/parse-3d-tile-batched-model.js.map +1 -1
- package/dist/es5/lib/parsers/parse-3d-tile-composite.js +1 -11
- package/dist/es5/lib/parsers/parse-3d-tile-composite.js.map +1 -1
- package/dist/es5/lib/parsers/parse-3d-tile-gltf.js +0 -8
- package/dist/es5/lib/parsers/parse-3d-tile-gltf.js.map +1 -1
- package/dist/es5/lib/parsers/parse-3d-tile-header.js +127 -111
- package/dist/es5/lib/parsers/parse-3d-tile-header.js.map +1 -1
- package/dist/es5/lib/parsers/parse-3d-tile-instanced-model.js +5 -41
- package/dist/es5/lib/parsers/parse-3d-tile-instanced-model.js.map +1 -1
- package/dist/es5/lib/parsers/parse-3d-tile-point-cloud.js +4 -71
- package/dist/es5/lib/parsers/parse-3d-tile-point-cloud.js.map +1 -1
- package/dist/es5/lib/parsers/parse-3d-tile.js +5 -28
- package/dist/es5/lib/parsers/parse-3d-tile.js.map +1 -1
- package/dist/es5/lib/utils/version.js +1 -1
- package/dist/es5/lib/utils/version.js.map +1 -1
- package/dist/es5/tile-3d-subtree-loader.js +0 -4
- package/dist/es5/tile-3d-subtree-loader.js.map +1 -1
- package/dist/es5/tile-3d-writer.js +0 -6
- package/dist/es5/tile-3d-writer.js.map +1 -1
- package/dist/es5/tiles-3d-loader.js +5 -55
- package/dist/es5/tiles-3d-loader.js.map +1 -1
- package/dist/es5/types.js.map +1 -1
- package/dist/esm/bundle.js +1 -1
- package/dist/esm/bundle.js.map +1 -1
- package/dist/esm/cesium-ion-loader.js +9 -7
- package/dist/esm/cesium-ion-loader.js.map +1 -1
- package/dist/esm/index.js +4 -0
- package/dist/esm/index.js.map +1 -1
- package/dist/esm/lib/classes/helpers/tile-3d-accessor-utils.js +1 -0
- package/dist/esm/lib/classes/helpers/tile-3d-accessor-utils.js.map +1 -1
- package/dist/esm/lib/classes/tile-3d-batch-table-hierarchy.js +3 -40
- package/dist/esm/lib/classes/tile-3d-batch-table-hierarchy.js.map +1 -1
- package/dist/esm/lib/classes/tile-3d-batch-table.js +7 -67
- package/dist/esm/lib/classes/tile-3d-batch-table.js.map +1 -1
- package/dist/esm/lib/classes/tile-3d-feature-table.js +5 -26
- package/dist/esm/lib/classes/tile-3d-feature-table.js.map +1 -1
- package/dist/esm/lib/constants.js +3 -0
- package/dist/esm/lib/constants.js.map +1 -1
- package/dist/esm/lib/encoders/encode-3d-tile-batched-model.js +5 -3
- package/dist/esm/lib/encoders/encode-3d-tile-batched-model.js.map +1 -1
- package/dist/esm/lib/encoders/encode-3d-tile-composite.js +2 -2
- package/dist/esm/lib/encoders/encode-3d-tile-composite.js.map +1 -1
- package/dist/esm/lib/encoders/encode-3d-tile-instanced-model.js +5 -1
- package/dist/esm/lib/encoders/encode-3d-tile-instanced-model.js.map +1 -1
- package/dist/esm/lib/encoders/encode-3d-tile-point-cloud.js +4 -1
- package/dist/esm/lib/encoders/encode-3d-tile-point-cloud.js.map +1 -1
- package/dist/esm/lib/encoders/encode-3d-tile.js +2 -6
- package/dist/esm/lib/encoders/encode-3d-tile.js.map +1 -1
- package/dist/esm/lib/encoders/helpers/encode-3d-tile-header.js +3 -3
- package/dist/esm/lib/encoders/helpers/encode-3d-tile-header.js.map +1 -1
- package/dist/esm/lib/ion/ion.js +10 -8
- package/dist/esm/lib/ion/ion.js.map +1 -1
- package/dist/esm/lib/parsers/helpers/normalize-3d-tile-colors.js +1 -6
- package/dist/esm/lib/parsers/helpers/normalize-3d-tile-colors.js.map +1 -1
- package/dist/esm/lib/parsers/helpers/normalize-3d-tile-normals.js +0 -4
- package/dist/esm/lib/parsers/helpers/normalize-3d-tile-normals.js.map +1 -1
- package/dist/esm/lib/parsers/helpers/normalize-3d-tile-positions.js +1 -2
- package/dist/esm/lib/parsers/helpers/normalize-3d-tile-positions.js.map +1 -1
- package/dist/esm/lib/parsers/helpers/parse-3d-implicit-tiles.js +4 -16
- package/dist/esm/lib/parsers/helpers/parse-3d-implicit-tiles.js.map +1 -1
- package/dist/esm/lib/parsers/helpers/parse-3d-tile-gltf-view.js +6 -9
- package/dist/esm/lib/parsers/helpers/parse-3d-tile-gltf-view.js.map +1 -1
- package/dist/esm/lib/parsers/helpers/parse-3d-tile-header.js +5 -2
- package/dist/esm/lib/parsers/helpers/parse-3d-tile-header.js.map +1 -1
- package/dist/esm/lib/parsers/helpers/parse-3d-tile-subtree.js +26 -17
- package/dist/esm/lib/parsers/helpers/parse-3d-tile-subtree.js.map +1 -1
- package/dist/esm/lib/parsers/helpers/parse-3d-tile-tables.js +4 -7
- package/dist/esm/lib/parsers/helpers/parse-3d-tile-tables.js.map +1 -1
- package/dist/esm/lib/parsers/helpers/parse-utils.js +6 -1
- package/dist/esm/lib/parsers/helpers/parse-utils.js.map +1 -1
- package/dist/esm/lib/parsers/parse-3d-tile-batched-model.js +3 -4
- package/dist/esm/lib/parsers/parse-3d-tile-batched-model.js.map +1 -1
- package/dist/esm/lib/parsers/parse-3d-tile-composite.js +5 -1
- package/dist/esm/lib/parsers/parse-3d-tile-composite.js.map +1 -1
- package/dist/esm/lib/parsers/parse-3d-tile-gltf.js.map +1 -1
- package/dist/esm/lib/parsers/parse-3d-tile-header.js +35 -40
- package/dist/esm/lib/parsers/parse-3d-tile-header.js.map +1 -1
- package/dist/esm/lib/parsers/parse-3d-tile-instanced-model.js +7 -25
- package/dist/esm/lib/parsers/parse-3d-tile-instanced-model.js.map +1 -1
- package/dist/esm/lib/parsers/parse-3d-tile-point-cloud.js +9 -37
- package/dist/esm/lib/parsers/parse-3d-tile-point-cloud.js.map +1 -1
- package/dist/esm/lib/parsers/parse-3d-tile.js +8 -6
- package/dist/esm/lib/parsers/parse-3d-tile.js.map +1 -1
- package/dist/esm/lib/utils/version.js +2 -1
- package/dist/esm/lib/utils/version.js.map +1 -1
- package/dist/esm/tile-3d-subtree-loader.js +1 -0
- package/dist/esm/tile-3d-subtree-loader.js.map +1 -1
- package/dist/esm/tile-3d-writer.js +1 -1
- package/dist/esm/tile-3d-writer.js.map +1 -1
- package/dist/esm/tiles-3d-loader.js +3 -17
- package/dist/esm/tiles-3d-loader.js.map +1 -1
- package/dist/esm/types.js.map +1 -1
- package/dist/index.d.ts +1 -1
- package/dist/index.d.ts.map +1 -1
- package/dist/lib/classes/helpers/tile-3d-accessor-utils.d.ts +1 -1
- package/dist/lib/classes/tile-3d-batch-table.d.ts +1 -1
- package/dist/lib/parsers/helpers/parse-3d-implicit-tiles.d.ts.map +1 -1
- package/dist/lib/parsers/helpers/parse-3d-implicit-tiles.js +2 -13
- package/dist/lib/parsers/helpers/parse-3d-tile-subtree.d.ts +2 -1
- package/dist/lib/parsers/helpers/parse-3d-tile-subtree.d.ts.map +1 -1
- package/dist/lib/parsers/helpers/parse-3d-tile-subtree.js +36 -7
- package/dist/lib/parsers/parse-3d-tile-header.d.ts +5 -4
- package/dist/lib/parsers/parse-3d-tile-header.d.ts.map +1 -1
- package/dist/lib/parsers/parse-3d-tile-header.js +37 -18
- package/dist/tiles-3d-loader.d.ts.map +1 -1
- package/dist/tiles-3d-loader.js +1 -8
- package/dist/types.d.ts +26 -13
- package/dist/types.d.ts.map +1 -1
- package/package.json +7 -7
- package/src/index.ts +1 -1
- package/src/lib/parsers/helpers/parse-3d-implicit-tiles.ts +2 -14
- package/src/lib/parsers/helpers/parse-3d-tile-subtree.ts +50 -7
- package/src/lib/parsers/parse-3d-tile-header.ts +59 -21
- package/src/tiles-3d-loader.ts +2 -16
- package/src/types.ts +18 -3
package/dist/esm/lib/ion/ion.js
CHANGED
|
@@ -1,10 +1,12 @@
|
|
|
1
|
+
|
|
2
|
+
|
|
1
3
|
import { fetchFile } from '@loaders.gl/core';
|
|
2
4
|
import { assert } from '@loaders.gl/loader-utils';
|
|
3
5
|
const CESIUM_ION_URL = 'https://api.cesium.com/v1/assets';
|
|
6
|
+
|
|
4
7
|
export async function getIonTilesetMetadata(accessToken, assetId) {
|
|
5
8
|
if (!assetId) {
|
|
6
9
|
const assets = await getIonAssets(accessToken);
|
|
7
|
-
|
|
8
10
|
for (const item of assets.items) {
|
|
9
11
|
if (item.type === '3DTILES') {
|
|
10
12
|
assetId = item.id;
|
|
@@ -18,11 +20,13 @@ export async function getIonTilesetMetadata(accessToken, assetId) {
|
|
|
18
20
|
url
|
|
19
21
|
} = ionAssetMetadata;
|
|
20
22
|
assert(type === '3DTILES' && url);
|
|
23
|
+
|
|
21
24
|
ionAssetMetadata.headers = {
|
|
22
25
|
Authorization: "Bearer ".concat(ionAssetMetadata.accessToken)
|
|
23
26
|
};
|
|
24
27
|
return ionAssetMetadata;
|
|
25
28
|
}
|
|
29
|
+
|
|
26
30
|
export async function getIonAssets(accessToken) {
|
|
27
31
|
assert(accessToken);
|
|
28
32
|
const url = CESIUM_ION_URL;
|
|
@@ -34,13 +38,12 @@ export async function getIonAssets(accessToken) {
|
|
|
34
38
|
headers
|
|
35
39
|
}
|
|
36
40
|
});
|
|
37
|
-
|
|
38
41
|
if (!response.ok) {
|
|
39
42
|
throw new Error(response.statusText);
|
|
40
43
|
}
|
|
41
|
-
|
|
42
44
|
return await response.json();
|
|
43
45
|
}
|
|
46
|
+
|
|
44
47
|
export async function getIonAssetMetadata(accessToken, assetId) {
|
|
45
48
|
assert(accessToken, assetId);
|
|
46
49
|
const headers = {
|
|
@@ -52,24 +55,23 @@ export async function getIonAssetMetadata(accessToken, assetId) {
|
|
|
52
55
|
headers
|
|
53
56
|
}
|
|
54
57
|
});
|
|
55
|
-
|
|
56
58
|
if (!response.ok) {
|
|
57
59
|
throw new Error(response.statusText);
|
|
58
60
|
}
|
|
59
|
-
|
|
60
61
|
let metadata = await response.json();
|
|
62
|
+
|
|
61
63
|
response = await fetchFile("".concat(url, "/endpoint"), {
|
|
62
64
|
fetch: {
|
|
63
65
|
headers
|
|
64
66
|
}
|
|
65
67
|
});
|
|
66
|
-
|
|
67
68
|
if (!response.ok) {
|
|
68
69
|
throw new Error(response.statusText);
|
|
69
70
|
}
|
|
70
|
-
|
|
71
71
|
const tilesetInfo = await response.json();
|
|
72
|
-
|
|
72
|
+
|
|
73
|
+
metadata = {
|
|
74
|
+
...metadata,
|
|
73
75
|
...tilesetInfo
|
|
74
76
|
};
|
|
75
77
|
return metadata;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"
|
|
1
|
+
{"version":3,"file":"ion.js","names":["fetchFile","assert","CESIUM_ION_URL","getIonTilesetMetadata","accessToken","assetId","assets","getIonAssets","item","items","type","id","ionAssetMetadata","getIonAssetMetadata","url","headers","Authorization","response","fetch","ok","Error","statusText","json","metadata","tilesetInfo"],"sources":["../../../../src/lib/ion/ion.ts"],"sourcesContent":["// Minimal support to load tilsets from the Cesium ION services\n\nimport {fetchFile} from '@loaders.gl/core';\nimport {assert} from '@loaders.gl/loader-utils';\n\nconst CESIUM_ION_URL = 'https://api.cesium.com/v1/assets';\n\n// Returns `{url, headers, type, attributions}` for an ion tileset\nexport async function getIonTilesetMetadata(accessToken, assetId) {\n // Step 1, if no asset id, look for first 3DTILES asset associated with this token.\n if (!assetId) {\n const assets = await getIonAssets(accessToken);\n for (const item of assets.items) {\n if (item.type === '3DTILES') {\n assetId = item.id;\n }\n }\n }\n\n // Step 2: Query metdatadata for this asset.\n const ionAssetMetadata = await getIonAssetMetadata(accessToken, assetId);\n const {type, url} = ionAssetMetadata;\n assert(type === '3DTILES' && url);\n\n // Prepare a headers object for fetch\n ionAssetMetadata.headers = {\n Authorization: `Bearer ${ionAssetMetadata.accessToken}`\n };\n return ionAssetMetadata;\n}\n\n// Return a list of all assets associated with accessToken\nexport async function getIonAssets(accessToken) {\n assert(accessToken);\n const url = CESIUM_ION_URL;\n const headers = {Authorization: `Bearer ${accessToken}`};\n const response = await fetchFile(url, {fetch: {headers}});\n if (!response.ok) {\n throw new Error(response.statusText);\n }\n return await response.json();\n}\n\n// Return metadata for a specific asset associated with token\nexport async function getIonAssetMetadata(accessToken, assetId) {\n assert(accessToken, assetId);\n const headers = {Authorization: `Bearer ${accessToken}`};\n\n const url = `${CESIUM_ION_URL}/${assetId}`;\n // https://cesium.com/docs/rest-api/#operation/getAsset\n // Retrieves metadata information about a specific asset.\n let response = await fetchFile(`${url}`, {fetch: {headers}});\n if (!response.ok) {\n throw new Error(response.statusText);\n }\n let metadata = await response.json();\n\n // https://cesium.com/docs/rest-api/#operation/getAssetEndpoint\n // Retrieves information and credentials that allow you to access the tiled asset data for visualization and analysis.\n response = await fetchFile(`${url}/endpoint`, {fetch: {headers}});\n if (!response.ok) {\n throw new Error(response.statusText);\n }\n const tilesetInfo = await response.json();\n\n // extract dataset description\n metadata = {\n ...metadata,\n ...tilesetInfo\n };\n\n return metadata;\n}\n"],"mappings":";;AAEA,SAAQA,SAAS,QAAO,kBAAkB;AAC1C,SAAQC,MAAM,QAAO,0BAA0B;AAE/C,MAAMC,cAAc,GAAG,kCAAkC;;AAGzD,OAAO,eAAeC,qBAAqB,CAACC,WAAW,EAAEC,OAAO,EAAE;EAEhE,IAAI,CAACA,OAAO,EAAE;IACZ,MAAMC,MAAM,GAAG,MAAMC,YAAY,CAACH,WAAW,CAAC;IAC9C,KAAK,MAAMI,IAAI,IAAIF,MAAM,CAACG,KAAK,EAAE;MAC/B,IAAID,IAAI,CAACE,IAAI,KAAK,SAAS,EAAE;QAC3BL,OAAO,GAAGG,IAAI,CAACG,EAAE;MACnB;IACF;EACF;;EAGA,MAAMC,gBAAgB,GAAG,MAAMC,mBAAmB,CAACT,WAAW,EAAEC,OAAO,CAAC;EACxE,MAAM;IAACK,IAAI;IAAEI;EAAG,CAAC,GAAGF,gBAAgB;EACpCX,MAAM,CAACS,IAAI,KAAK,SAAS,IAAII,GAAG,CAAC;;EAGjCF,gBAAgB,CAACG,OAAO,GAAG;IACzBC,aAAa,mBAAYJ,gBAAgB,CAACR,WAAW;EACvD,CAAC;EACD,OAAOQ,gBAAgB;AACzB;;AAGA,OAAO,eAAeL,YAAY,CAACH,WAAW,EAAE;EAC9CH,MAAM,CAACG,WAAW,CAAC;EACnB,MAAMU,GAAG,GAAGZ,cAAc;EAC1B,MAAMa,OAAO,GAAG;IAACC,aAAa,mBAAYZ,WAAW;EAAE,CAAC;EACxD,MAAMa,QAAQ,GAAG,MAAMjB,SAAS,CAACc,GAAG,EAAE;IAACI,KAAK,EAAE;MAACH;IAAO;EAAC,CAAC,CAAC;EACzD,IAAI,CAACE,QAAQ,CAACE,EAAE,EAAE;IAChB,MAAM,IAAIC,KAAK,CAACH,QAAQ,CAACI,UAAU,CAAC;EACtC;EACA,OAAO,MAAMJ,QAAQ,CAACK,IAAI,EAAE;AAC9B;;AAGA,OAAO,eAAeT,mBAAmB,CAACT,WAAW,EAAEC,OAAO,EAAE;EAC9DJ,MAAM,CAACG,WAAW,EAAEC,OAAO,CAAC;EAC5B,MAAMU,OAAO,GAAG;IAACC,aAAa,mBAAYZ,WAAW;EAAE,CAAC;EAExD,MAAMU,GAAG,aAAMZ,cAAc,cAAIG,OAAO,CAAE;EAG1C,IAAIY,QAAQ,GAAG,MAAMjB,SAAS,WAAIc,GAAG,GAAI;IAACI,KAAK,EAAE;MAACH;IAAO;EAAC,CAAC,CAAC;EAC5D,IAAI,CAACE,QAAQ,CAACE,EAAE,EAAE;IAChB,MAAM,IAAIC,KAAK,CAACH,QAAQ,CAACI,UAAU,CAAC;EACtC;EACA,IAAIE,QAAQ,GAAG,MAAMN,QAAQ,CAACK,IAAI,EAAE;;EAIpCL,QAAQ,GAAG,MAAMjB,SAAS,WAAIc,GAAG,gBAAa;IAACI,KAAK,EAAE;MAACH;IAAO;EAAC,CAAC,CAAC;EACjE,IAAI,CAACE,QAAQ,CAACE,EAAE,EAAE;IAChB,MAAM,IAAIC,KAAK,CAACH,QAAQ,CAACI,UAAU,CAAC;EACtC;EACA,MAAMG,WAAW,GAAG,MAAMP,QAAQ,CAACK,IAAI,EAAE;;EAGzCC,QAAQ,GAAG;IACT,GAAGA,QAAQ;IACX,GAAGC;EACL,CAAC;EAED,OAAOD,QAAQ;AACjB"}
|
|
@@ -1,18 +1,16 @@
|
|
|
1
1
|
import { decodeRGB565, GL } from '@loaders.gl/math';
|
|
2
|
+
|
|
2
3
|
export function normalize3DTileColorAttribute(tile, colors, batchTable) {
|
|
3
4
|
if (!colors && (!tile || !tile.batchIds || !batchTable)) {
|
|
4
5
|
return null;
|
|
5
6
|
}
|
|
6
|
-
|
|
7
7
|
const {
|
|
8
8
|
batchIds,
|
|
9
9
|
isRGB565,
|
|
10
10
|
pointCount
|
|
11
11
|
} = tile;
|
|
12
|
-
|
|
13
12
|
if (batchIds && batchTable) {
|
|
14
13
|
const colorArray = new Uint8ClampedArray(pointCount * 3);
|
|
15
|
-
|
|
16
14
|
for (let i = 0; i < pointCount; i++) {
|
|
17
15
|
const batchId = batchIds[i];
|
|
18
16
|
const dimensions = batchTable.getProperty(batchId, 'dimensions');
|
|
@@ -21,7 +19,6 @@ export function normalize3DTileColorAttribute(tile, colors, batchTable) {
|
|
|
21
19
|
colorArray[i * 3 + 1] = color[1];
|
|
22
20
|
colorArray[i * 3 + 2] = color[2];
|
|
23
21
|
}
|
|
24
|
-
|
|
25
22
|
return {
|
|
26
23
|
type: GL.UNSIGNED_BYTE,
|
|
27
24
|
value: colorArray,
|
|
@@ -32,14 +29,12 @@ export function normalize3DTileColorAttribute(tile, colors, batchTable) {
|
|
|
32
29
|
|
|
33
30
|
if (isRGB565) {
|
|
34
31
|
const colorArray = new Uint8ClampedArray(pointCount * 3);
|
|
35
|
-
|
|
36
32
|
for (let i = 0; i < pointCount; i++) {
|
|
37
33
|
const color = decodeRGB565(colors[i]);
|
|
38
34
|
colorArray[i * 3] = color[0];
|
|
39
35
|
colorArray[i * 3 + 1] = color[1];
|
|
40
36
|
colorArray[i * 3 + 2] = color[2];
|
|
41
37
|
}
|
|
42
|
-
|
|
43
38
|
return {
|
|
44
39
|
type: GL.UNSIGNED_BYTE,
|
|
45
40
|
value: colorArray,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"
|
|
1
|
+
{"version":3,"file":"normalize-3d-tile-colors.js","names":["decodeRGB565","GL","normalize3DTileColorAttribute","tile","colors","batchTable","batchIds","isRGB565","pointCount","colorArray","Uint8ClampedArray","i","batchId","dimensions","getProperty","color","map","d","type","UNSIGNED_BYTE","value","size","normalized","length"],"sources":["../../../../../src/lib/parsers/helpers/normalize-3d-tile-colors.ts"],"sourcesContent":["import {decodeRGB565, GL} from '@loaders.gl/math';\n\n/* eslint-disable complexity*/\nexport function normalize3DTileColorAttribute(tile, colors, batchTable?) {\n // no colors defined\n if (!colors && (!tile || !tile.batchIds || !batchTable)) {\n return null;\n }\n\n const {batchIds, isRGB565, pointCount} = tile;\n // Batch table, look up colors in table\n if (batchIds && batchTable) {\n const colorArray = new Uint8ClampedArray(pointCount * 3);\n for (let i = 0; i < pointCount; i++) {\n const batchId = batchIds[i];\n // TODO figure out what is `dimensions` used for\n const dimensions = batchTable.getProperty(batchId, 'dimensions');\n const color = dimensions.map((d) => d * 255);\n colorArray[i * 3] = color[0];\n colorArray[i * 3 + 1] = color[1];\n colorArray[i * 3 + 2] = color[2];\n }\n return {\n type: GL.UNSIGNED_BYTE,\n value: colorArray,\n size: 3,\n normalized: true\n };\n }\n\n // RGB565 case, convert to RGB\n if (isRGB565) {\n const colorArray = new Uint8ClampedArray(pointCount * 3);\n for (let i = 0; i < pointCount; i++) {\n const color = decodeRGB565(colors[i]);\n colorArray[i * 3] = color[0];\n colorArray[i * 3 + 1] = color[1];\n colorArray[i * 3 + 2] = color[2];\n }\n return {\n type: GL.UNSIGNED_BYTE,\n value: colorArray,\n size: 3,\n normalized: true\n };\n }\n\n // RGB case (tile.isTranslucent)\n if (colors && colors.length === pointCount * 3) {\n return {\n type: GL.UNSIGNED_BYTE,\n value: colors,\n size: 3,\n normalized: true\n };\n }\n\n // DEFAULT: RGBA case\n return {\n type: GL.UNSIGNED_BYTE,\n value: colors,\n size: 4,\n normalized: true\n };\n}\n/* eslint-enable complexity*/\n"],"mappings":"AAAA,SAAQA,YAAY,EAAEC,EAAE,QAAO,kBAAkB;;AAGjD,OAAO,SAASC,6BAA6B,CAACC,IAAI,EAAEC,MAAM,EAAEC,UAAW,EAAE;EAEvE,IAAI,CAACD,MAAM,KAAK,CAACD,IAAI,IAAI,CAACA,IAAI,CAACG,QAAQ,IAAI,CAACD,UAAU,CAAC,EAAE;IACvD,OAAO,IAAI;EACb;EAEA,MAAM;IAACC,QAAQ;IAAEC,QAAQ;IAAEC;EAAU,CAAC,GAAGL,IAAI;EAE7C,IAAIG,QAAQ,IAAID,UAAU,EAAE;IAC1B,MAAMI,UAAU,GAAG,IAAIC,iBAAiB,CAACF,UAAU,GAAG,CAAC,CAAC;IACxD,KAAK,IAAIG,CAAC,GAAG,CAAC,EAAEA,CAAC,GAAGH,UAAU,EAAEG,CAAC,EAAE,EAAE;MACnC,MAAMC,OAAO,GAAGN,QAAQ,CAACK,CAAC,CAAC;MAE3B,MAAME,UAAU,GAAGR,UAAU,CAACS,WAAW,CAACF,OAAO,EAAE,YAAY,CAAC;MAChE,MAAMG,KAAK,GAAGF,UAAU,CAACG,GAAG,CAAEC,CAAC,IAAKA,CAAC,GAAG,GAAG,CAAC;MAC5CR,UAAU,CAACE,CAAC,GAAG,CAAC,CAAC,GAAGI,KAAK,CAAC,CAAC,CAAC;MAC5BN,UAAU,CAACE,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,GAAGI,KAAK,CAAC,CAAC,CAAC;MAChCN,UAAU,CAACE,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,GAAGI,KAAK,CAAC,CAAC,CAAC;IAClC;IACA,OAAO;MACLG,IAAI,EAAEjB,EAAE,CAACkB,aAAa;MACtBC,KAAK,EAAEX,UAAU;MACjBY,IAAI,EAAE,CAAC;MACPC,UAAU,EAAE;IACd,CAAC;EACH;;EAGA,IAAIf,QAAQ,EAAE;IACZ,MAAME,UAAU,GAAG,IAAIC,iBAAiB,CAACF,UAAU,GAAG,CAAC,CAAC;IACxD,KAAK,IAAIG,CAAC,GAAG,CAAC,EAAEA,CAAC,GAAGH,UAAU,EAAEG,CAAC,EAAE,EAAE;MACnC,MAAMI,KAAK,GAAGf,YAAY,CAACI,MAAM,CAACO,CAAC,CAAC,CAAC;MACrCF,UAAU,CAACE,CAAC,GAAG,CAAC,CAAC,GAAGI,KAAK,CAAC,CAAC,CAAC;MAC5BN,UAAU,CAACE,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,GAAGI,KAAK,CAAC,CAAC,CAAC;MAChCN,UAAU,CAACE,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,GAAGI,KAAK,CAAC,CAAC,CAAC;IAClC;IACA,OAAO;MACLG,IAAI,EAAEjB,EAAE,CAACkB,aAAa;MACtBC,KAAK,EAAEX,UAAU;MACjBY,IAAI,EAAE,CAAC;MACPC,UAAU,EAAE;IACd,CAAC;EACH;;EAGA,IAAIlB,MAAM,IAAIA,MAAM,CAACmB,MAAM,KAAKf,UAAU,GAAG,CAAC,EAAE;IAC9C,OAAO;MACLU,IAAI,EAAEjB,EAAE,CAACkB,aAAa;MACtBC,KAAK,EAAEhB,MAAM;MACbiB,IAAI,EAAE,CAAC;MACPC,UAAU,EAAE;IACd,CAAC;EACH;;EAGA,OAAO;IACLJ,IAAI,EAAEjB,EAAE,CAACkB,aAAa;IACtBC,KAAK,EAAEhB,MAAM;IACbiB,IAAI,EAAE,CAAC;IACPC,UAAU,EAAE;EACd,CAAC;AACH"}
|
|
@@ -5,22 +5,18 @@ export function normalize3DTileNormalAttribute(tile, normals) {
|
|
|
5
5
|
if (!normals) {
|
|
6
6
|
return null;
|
|
7
7
|
}
|
|
8
|
-
|
|
9
8
|
if (tile.isOctEncoded16P) {
|
|
10
9
|
const decodedArray = new Float32Array(tile.pointsLength * 3);
|
|
11
|
-
|
|
12
10
|
for (let i = 0; i < tile.pointsLength; i++) {
|
|
13
11
|
octDecode(normals[i * 2], normals[i * 2 + 1], scratchNormal);
|
|
14
12
|
scratchNormal.toArray(decodedArray, i * 3);
|
|
15
13
|
}
|
|
16
|
-
|
|
17
14
|
return {
|
|
18
15
|
type: GL.FLOAT,
|
|
19
16
|
size: 2,
|
|
20
17
|
value: decodedArray
|
|
21
18
|
};
|
|
22
19
|
}
|
|
23
|
-
|
|
24
20
|
return {
|
|
25
21
|
type: GL.FLOAT,
|
|
26
22
|
size: 2,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"
|
|
1
|
+
{"version":3,"file":"normalize-3d-tile-normals.js","names":["Vector3","GL","octDecode","scratchNormal","normalize3DTileNormalAttribute","tile","normals","isOctEncoded16P","decodedArray","Float32Array","pointsLength","i","toArray","type","FLOAT","size","value"],"sources":["../../../../../src/lib/parsers/helpers/normalize-3d-tile-normals.ts"],"sourcesContent":["import {Vector3} from '@math.gl/core';\nimport {GL, octDecode} from '@loaders.gl/math';\n\nconst scratchNormal = new Vector3();\n\nexport function normalize3DTileNormalAttribute(tile, normals) {\n if (!normals) {\n return null;\n }\n\n if (tile.isOctEncoded16P) {\n const decodedArray = new Float32Array(tile.pointsLength * 3);\n for (let i = 0; i < tile.pointsLength; i++) {\n octDecode(normals[i * 2], normals[i * 2 + 1], scratchNormal);\n // @ts-ignore\n scratchNormal.toArray(decodedArray, i * 3);\n }\n\n return {\n type: GL.FLOAT,\n size: 2,\n value: decodedArray\n };\n }\n\n return {\n type: GL.FLOAT,\n size: 2,\n value: normals\n };\n}\n"],"mappings":"AAAA,SAAQA,OAAO,QAAO,eAAe;AACrC,SAAQC,EAAE,EAAEC,SAAS,QAAO,kBAAkB;AAE9C,MAAMC,aAAa,GAAG,IAAIH,OAAO,EAAE;AAEnC,OAAO,SAASI,8BAA8B,CAACC,IAAI,EAAEC,OAAO,EAAE;EAC5D,IAAI,CAACA,OAAO,EAAE;IACZ,OAAO,IAAI;EACb;EAEA,IAAID,IAAI,CAACE,eAAe,EAAE;IACxB,MAAMC,YAAY,GAAG,IAAIC,YAAY,CAACJ,IAAI,CAACK,YAAY,GAAG,CAAC,CAAC;IAC5D,KAAK,IAAIC,CAAC,GAAG,CAAC,EAAEA,CAAC,GAAGN,IAAI,CAACK,YAAY,EAAEC,CAAC,EAAE,EAAE;MAC1CT,SAAS,CAACI,OAAO,CAACK,CAAC,GAAG,CAAC,CAAC,EAAEL,OAAO,CAACK,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,EAAER,aAAa,CAAC;MAE5DA,aAAa,CAACS,OAAO,CAACJ,YAAY,EAAEG,CAAC,GAAG,CAAC,CAAC;IAC5C;IAEA,OAAO;MACLE,IAAI,EAAEZ,EAAE,CAACa,KAAK;MACdC,IAAI,EAAE,CAAC;MACPC,KAAK,EAAER;IACT,CAAC;EACH;EAEA,OAAO;IACLK,IAAI,EAAEZ,EAAE,CAACa,KAAK;IACdC,IAAI,EAAE,CAAC;IACPC,KAAK,EAAEV;EACT,CAAC;AACH"}
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import { Vector3 } from '@math.gl/core';
|
|
2
2
|
import { GL } from '@loaders.gl/math';
|
|
3
|
+
|
|
3
4
|
export function normalize3DTilePositionAttribute(tile, positions, options) {
|
|
4
5
|
if (!tile.isQuantized) {
|
|
5
6
|
return positions;
|
|
@@ -21,11 +22,9 @@ export function normalize3DTilePositionAttribute(tile, positions, options) {
|
|
|
21
22
|
function decodeQuantizedPositions(tile, positions) {
|
|
22
23
|
const scratchPosition = new Vector3();
|
|
23
24
|
const decodedArray = new Float32Array(tile.pointCount * 3);
|
|
24
|
-
|
|
25
25
|
for (let i = 0; i < tile.pointCount; i++) {
|
|
26
26
|
scratchPosition.set(positions[i * 3], positions[i * 3 + 1], positions[i * 3 + 2]).scale(1 / tile.quantizedRange).multiply(tile.quantizedVolumeScale).add(tile.quantizedVolumeOffset).toArray(decodedArray, i * 3);
|
|
27
27
|
}
|
|
28
|
-
|
|
29
28
|
return decodedArray;
|
|
30
29
|
}
|
|
31
30
|
//# sourceMappingURL=normalize-3d-tile-positions.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"
|
|
1
|
+
{"version":3,"file":"normalize-3d-tile-positions.js","names":["Vector3","GL","normalize3DTilePositionAttribute","tile","positions","options","isQuantized","decodeQuantizedPositions","type","UNSIGNED_SHORT","value","size","normalized","scratchPosition","decodedArray","Float32Array","pointCount","i","set","scale","quantizedRange","multiply","quantizedVolumeScale","add","quantizedVolumeOffset","toArray"],"sources":["../../../../../src/lib/parsers/helpers/normalize-3d-tile-positions.ts"],"sourcesContent":["import {Vector3} from '@math.gl/core';\nimport {GL} from '@loaders.gl/math';\n\n// Prepare attribute for positions\nexport function normalize3DTilePositionAttribute(tile, positions, options) {\n if (!tile.isQuantized) {\n return positions;\n }\n\n // For quantized posititions, either expand to Float32Array or return custom accessor\n // https://github.com/AnalyticalGraphicsInc/3d-tiles/blob/master/specification/TileFormats/Instanced3DModel/README.md#quantized-positions\n\n // Optionally decodes quantized positions on GPU, for simpler renderers that don't accept normalized attributes\n if (options['3d-tiles'] && options['3d-tiles'].decodeQuantizedPositions) {\n tile.isQuantized = false;\n return decodeQuantizedPositions(tile, positions);\n }\n\n // Default: Use normalized shorts directly, no copying/processing.\n // NOTE: The \"missing\" offset/scaling operations are automatically added to modelMatrix if `tile.isQuantized === true`\n return {\n type: GL.UNSIGNED_SHORT,\n value: positions,\n size: 3,\n normalized: true\n };\n}\n\n// Pre-scale quantized positions on CPU\nfunction decodeQuantizedPositions(tile, positions) {\n const scratchPosition = new Vector3();\n const decodedArray = new Float32Array(tile.pointCount * 3);\n\n for (let i = 0; i < tile.pointCount; i++) {\n // POSITION = POSITION_QUANTIZED / 65535.0 * QUANTIZED_VOLUME_SCALE + QUANTIZED_VOLUME_OFFSET\n scratchPosition\n .set(positions[i * 3], positions[i * 3 + 1], positions[i * 3 + 2])\n .scale(1 / tile.quantizedRange)\n .multiply(tile.quantizedVolumeScale)\n .add(tile.quantizedVolumeOffset)\n .toArray(decodedArray, i * 3);\n }\n\n return decodedArray;\n}\n"],"mappings":"AAAA,SAAQA,OAAO,QAAO,eAAe;AACrC,SAAQC,EAAE,QAAO,kBAAkB;;AAGnC,OAAO,SAASC,gCAAgC,CAACC,IAAI,EAAEC,SAAS,EAAEC,OAAO,EAAE;EACzE,IAAI,CAACF,IAAI,CAACG,WAAW,EAAE;IACrB,OAAOF,SAAS;EAClB;;EAMA,IAAIC,OAAO,CAAC,UAAU,CAAC,IAAIA,OAAO,CAAC,UAAU,CAAC,CAACE,wBAAwB,EAAE;IACvEJ,IAAI,CAACG,WAAW,GAAG,KAAK;IACxB,OAAOC,wBAAwB,CAACJ,IAAI,EAAEC,SAAS,CAAC;EAClD;;EAIA,OAAO;IACLI,IAAI,EAAEP,EAAE,CAACQ,cAAc;IACvBC,KAAK,EAAEN,SAAS;IAChBO,IAAI,EAAE,CAAC;IACPC,UAAU,EAAE;EACd,CAAC;AACH;;AAGA,SAASL,wBAAwB,CAACJ,IAAI,EAAEC,SAAS,EAAE;EACjD,MAAMS,eAAe,GAAG,IAAIb,OAAO,EAAE;EACrC,MAAMc,YAAY,GAAG,IAAIC,YAAY,CAACZ,IAAI,CAACa,UAAU,GAAG,CAAC,CAAC;EAE1D,KAAK,IAAIC,CAAC,GAAG,CAAC,EAAEA,CAAC,GAAGd,IAAI,CAACa,UAAU,EAAEC,CAAC,EAAE,EAAE;IAExCJ,eAAe,CACZK,GAAG,CAACd,SAAS,CAACa,CAAC,GAAG,CAAC,CAAC,EAAEb,SAAS,CAACa,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,EAAEb,SAAS,CAACa,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,CACjEE,KAAK,CAAC,CAAC,GAAGhB,IAAI,CAACiB,cAAc,CAAC,CAC9BC,QAAQ,CAAClB,IAAI,CAACmB,oBAAoB,CAAC,CACnCC,GAAG,CAACpB,IAAI,CAACqB,qBAAqB,CAAC,CAC/BC,OAAO,CAACX,YAAY,EAAEG,CAAC,GAAG,CAAC,CAAC;EACjC;EAEA,OAAOH,YAAY;AACrB"}
|
|
@@ -6,6 +6,7 @@ const SUBDIVISION_COUNT_MAP = {
|
|
|
6
6
|
QUADTREE: QUADTREE_DEVISION_COUNT,
|
|
7
7
|
OCTREE: OCTREE_DEVISION_COUNT
|
|
8
8
|
};
|
|
9
|
+
|
|
9
10
|
export async function parseImplicitTiles(params) {
|
|
10
11
|
const {
|
|
11
12
|
options,
|
|
@@ -48,20 +49,18 @@ export async function parseImplicitTiles(params) {
|
|
|
48
49
|
const levelOffset = (childrenPerTile ** level - 1) / (childrenPerTile - 1);
|
|
49
50
|
let childTileMortonIndex = concatBits(parentData.mortonIndex, childIndex);
|
|
50
51
|
let tileAvailabilityIndex = levelOffset + childTileMortonIndex;
|
|
52
|
+
|
|
51
53
|
let childTileX = concatBits(parentData.x, childX);
|
|
52
54
|
let childTileY = concatBits(parentData.y, childY);
|
|
53
55
|
let childTileZ = concatBits(parentData.z, childZ);
|
|
54
56
|
let isChildSubtreeAvailable = false;
|
|
55
|
-
|
|
56
57
|
if (level + 1 > subtreeLevels) {
|
|
57
58
|
isChildSubtreeAvailable = getAvailabilityResult(subtree.childSubtreeAvailability, childTileMortonIndex);
|
|
58
59
|
}
|
|
59
|
-
|
|
60
60
|
const x = concatBits(globalData.x, childTileX);
|
|
61
61
|
const y = concatBits(globalData.y, childTileY);
|
|
62
62
|
const z = concatBits(globalData.z, childTileZ);
|
|
63
63
|
const lev = level + globalData.level;
|
|
64
|
-
|
|
65
64
|
if (isChildSubtreeAvailable) {
|
|
66
65
|
const subtreePath = "".concat(basePath, "/").concat(subtreesUriTemplate);
|
|
67
66
|
const childSubtreeUrl = replaceContentUrlTemplate(subtreePath, lev, x, y, z);
|
|
@@ -79,19 +78,14 @@ export async function parseImplicitTiles(params) {
|
|
|
79
78
|
childTileZ = 0;
|
|
80
79
|
level = 0;
|
|
81
80
|
}
|
|
82
|
-
|
|
83
81
|
const isTileAvailable = getAvailabilityResult(subtree.tileAvailability, tileAvailabilityIndex);
|
|
84
|
-
|
|
85
82
|
if (!isTileAvailable || level > maximumLevel) {
|
|
86
83
|
return tile;
|
|
87
84
|
}
|
|
88
|
-
|
|
89
85
|
const isContentAvailable = getAvailabilityResult(subtree.contentAvailability, tileAvailabilityIndex);
|
|
90
|
-
|
|
91
86
|
if (isContentAvailable) {
|
|
92
87
|
tile.contentUrl = replaceContentUrlTemplate(contentUrlTemplate, lev, x, y, z);
|
|
93
88
|
}
|
|
94
|
-
|
|
95
89
|
const childTileLevel = level + 1;
|
|
96
90
|
const pData = {
|
|
97
91
|
mortonIndex: childTileMortonIndex,
|
|
@@ -99,7 +93,6 @@ export async function parseImplicitTiles(params) {
|
|
|
99
93
|
y: childTileY,
|
|
100
94
|
z: childTileZ
|
|
101
95
|
};
|
|
102
|
-
|
|
103
96
|
for (let index = 0; index < childrenPerTile; index++) {
|
|
104
97
|
const currentTile = await parseImplicitTiles({
|
|
105
98
|
subtree,
|
|
@@ -109,7 +102,6 @@ export async function parseImplicitTiles(params) {
|
|
|
109
102
|
level: childTileLevel,
|
|
110
103
|
globalData
|
|
111
104
|
});
|
|
112
|
-
|
|
113
105
|
if (currentTile.contentUrl || currentTile.children.length) {
|
|
114
106
|
const globalLevel = lev + 1;
|
|
115
107
|
const childCoordinates = {
|
|
@@ -121,19 +113,15 @@ export async function parseImplicitTiles(params) {
|
|
|
121
113
|
tile.children.push(formattedTile);
|
|
122
114
|
}
|
|
123
115
|
}
|
|
124
|
-
|
|
125
116
|
return tile;
|
|
126
117
|
}
|
|
127
|
-
|
|
128
118
|
function getAvailabilityResult(availabilityData, index) {
|
|
129
119
|
if ('constant' in availabilityData) {
|
|
130
120
|
return Boolean(availabilityData.constant);
|
|
131
121
|
}
|
|
132
|
-
|
|
133
122
|
if (availabilityData.explicitBitstream) {
|
|
134
123
|
return getBooleanValueFromBitstream(index, availabilityData.explicitBitstream);
|
|
135
124
|
}
|
|
136
|
-
|
|
137
125
|
return false;
|
|
138
126
|
}
|
|
139
127
|
|
|
@@ -161,6 +149,8 @@ function formatTileData(tile, level, childCoordinates, options) {
|
|
|
161
149
|
type: getTileType(tile),
|
|
162
150
|
lodMetricType,
|
|
163
151
|
lodMetricValue,
|
|
152
|
+
geometricError: lodMetricValue,
|
|
153
|
+
transform: tile.transform,
|
|
164
154
|
boundingVolume
|
|
165
155
|
};
|
|
166
156
|
}
|
|
@@ -205,11 +195,9 @@ export function replaceContentUrlTemplate(templateUrl, level, x, y, z) {
|
|
|
205
195
|
|
|
206
196
|
function generateMapUrl(items) {
|
|
207
197
|
const mapUrl = {};
|
|
208
|
-
|
|
209
198
|
for (const key in items) {
|
|
210
199
|
mapUrl["{".concat(key, "}")] = items[key];
|
|
211
200
|
}
|
|
212
|
-
|
|
213
201
|
return mapUrl;
|
|
214
202
|
}
|
|
215
203
|
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../../../../src/lib/parsers/helpers/parse-3d-implicit-tiles.ts"],"names":["Tile3DSubtreeLoader","load","QUADTREE_DEVISION_COUNT","OCTREE_DEVISION_COUNT","SUBDIVISION_COUNT_MAP","QUADTREE","OCTREE","parseImplicitTiles","params","options","parentData","mortonIndex","x","y","z","childIndex","globalData","level","subtree","subdivisionScheme","subtreeLevels","maximumLevel","contentUrlTemplate","subtreesUriTemplate","basePath","tile","children","lodMetricValue","contentUrl","childrenPerTile","childX","childY","childZ","levelOffset","childTileMortonIndex","concatBits","tileAvailabilityIndex","childTileX","childTileY","childTileZ","isChildSubtreeAvailable","getAvailabilityResult","childSubtreeAvailability","lev","subtreePath","childSubtreeUrl","replaceContentUrlTemplate","childSubtree","isTileAvailable","tileAvailability","isContentAvailable","contentAvailability","childTileLevel","pData","index","currentTile","length","globalLevel","childCoordinates","formattedTile","formatTileData","push","availabilityData","Boolean","constant","explicitBitstream","getBooleanValueFromBitstream","refine","getRefine","lodMetricType","getTileType","rootLodMetricValue","rootBoundingVolume","uri","replace","boundingVolume","calculateBoundingVolumeForChildTile","content","id","type","region","west","south","east","north","minimumHeight","maximumHeight","boundingVolumesCount","sizeX","sizeY","sizeZ","childWest","childEast","childSouth","childNorth","childMinimumHeight","childMaximumHeight","console","warn","first","second","parseInt","toString","templateUrl","mapUrl","generateMapUrl","matched","items","key","availabilityIndex","availabilityBuffer","byteIndex","Math","floor","bitIndex","bitValue"],"mappings":"AACA,SAAQA,mBAAR,QAAkC,iCAAlC;AACA,SAAQC,IAAR,QAAmB,kBAAnB;AAEA,MAAMC,uBAAuB,GAAG,CAAhC;AACA,MAAMC,qBAAqB,GAAG,CAA9B;AAEA,MAAMC,qBAAqB,GAAG;AAC5BC,EAAAA,QAAQ,EAAEH,uBADkB;AAE5BI,EAAAA,MAAM,EAAEH;AAFoB,CAA9B;AAkBA,OAAO,eAAeI,kBAAf,CAAkCC,MAAlC,EAOJ;AACD,QAAM;AACJC,IAAAA,OADI;AAEJC,IAAAA,UAAU,GAAG;AACXC,MAAAA,WAAW,EAAE,CADF;AAEXC,MAAAA,CAAC,EAAE,CAFQ;AAGXC,MAAAA,CAAC,EAAE,CAHQ;AAIXC,MAAAA,CAAC,EAAE;AAJQ,KAFT;AAQJC,IAAAA,UAAU,GAAG,CART;AASJC,IAAAA,UAAU,GAAG;AACXC,MAAAA,KAAK,EAAE,CADI;AAEXN,MAAAA,WAAW,EAAE,CAFF;AAGXC,MAAAA,CAAC,EAAE,CAHQ;AAIXC,MAAAA,CAAC,EAAE,CAJQ;AAKXC,MAAAA,CAAC,EAAE;AALQ;AATT,MAgBFN,MAhBJ;AAiBA,MAAI;AAACU,IAAAA,OAAD;AAAUD,IAAAA,KAAK,GAAG;AAAlB,MAAuBT,MAA3B;AACA,QAAM;AACJW,IAAAA,iBADI;AAEJC,IAAAA,aAFI;AAGJC,IAAAA,YAHI;AAIJC,IAAAA,kBAJI;AAKJC,IAAAA,mBALI;AAMJC,IAAAA;AANI,MAOFf,OAPJ;AASA,QAAMgB,IAAI,GAAG;AAACC,IAAAA,QAAQ,EAAE,EAAX;AAAeC,IAAAA,cAAc,EAAE,CAA/B;AAAkCC,IAAAA,UAAU,EAAE;AAA9C,GAAb;AAEA,QAAMC,eAAe,GAAGzB,qBAAqB,CAACe,iBAAD,CAA7C;AAEA,QAAMW,MAAM,GAAGf,UAAU,GAAG,IAA5B;AACA,QAAMgB,MAAM,GAAIhB,UAAU,IAAI,CAAf,GAAoB,IAAnC;AACA,QAAMiB,MAAM,GAAIjB,UAAU,IAAI,CAAf,GAAoB,IAAnC;AAEA,QAAMkB,WAAW,GAAG,CAACJ,eAAe,IAAIZ,KAAnB,GAA2B,CAA5B,KAAkCY,eAAe,GAAG,CAApD,CAApB;AACA,MAAIK,oBAAoB,GAAGC,UAAU,CAACzB,UAAU,CAACC,WAAZ,EAAyBI,UAAzB,CAArC;AACA,MAAIqB,qBAAqB,GAAGH,WAAW,GAAGC,oBAA1C;AAGA,MAAIG,UAAU,GAAGF,UAAU,CAACzB,UAAU,CAACE,CAAZ,EAAekB,MAAf,CAA3B;AACA,MAAIQ,UAAU,GAAGH,UAAU,CAACzB,UAAU,CAACG,CAAZ,EAAekB,MAAf,CAA3B;AACA,MAAIQ,UAAU,GAAGJ,UAAU,CAACzB,UAAU,CAACI,CAAZ,EAAekB,MAAf,CAA3B;AAWA,MAAIQ,uBAAuB,GAAG,KAA9B;;AAEA,MAAIvB,KAAK,GAAG,CAAR,GAAYG,aAAhB,EAA+B;AAC7BoB,IAAAA,uBAAuB,GAAGC,qBAAqB,CAC7CvB,OAAO,CAACwB,wBADqC,EAE7CR,oBAF6C,CAA/C;AAID;;AAED,QAAMtB,CAAC,GAAGuB,UAAU,CAACnB,UAAU,CAACJ,CAAZ,EAAeyB,UAAf,CAApB;AACA,QAAMxB,CAAC,GAAGsB,UAAU,CAACnB,UAAU,CAACH,CAAZ,EAAeyB,UAAf,CAApB;AACA,QAAMxB,CAAC,GAAGqB,UAAU,CAACnB,UAAU,CAACF,CAAZ,EAAeyB,UAAf,CAApB;AACA,QAAMI,GAAG,GAAG1B,KAAK,GAAGD,UAAU,CAACC,KAA/B;;AAEA,MAAIuB,uBAAJ,EAA6B;AAC3B,UAAMI,WAAW,aAAMpB,QAAN,cAAkBD,mBAAlB,CAAjB;AACA,UAAMsB,eAAe,GAAGC,yBAAyB,CAACF,WAAD,EAAcD,GAAd,EAAmB/B,CAAnB,EAAsBC,CAAtB,EAAyBC,CAAzB,CAAjD;AACA,UAAMiC,YAAY,GAAG,MAAM9C,IAAI,CAAC4C,eAAD,EAAkB7C,mBAAlB,CAA/B;AAEAkB,IAAAA,OAAO,GAAG6B,YAAV;AAEA/B,IAAAA,UAAU,CAACL,WAAX,GAAyBuB,oBAAzB;AACAlB,IAAAA,UAAU,CAACJ,CAAX,GAAeyB,UAAf;AACArB,IAAAA,UAAU,CAACH,CAAX,GAAeyB,UAAf;AACAtB,IAAAA,UAAU,CAACF,CAAX,GAAeyB,UAAf;AACAvB,IAAAA,UAAU,CAACC,KAAX,GAAmBA,KAAnB;AAEAiB,IAAAA,oBAAoB,GAAG,CAAvB;AACAE,IAAAA,qBAAqB,GAAG,CAAxB;AACAC,IAAAA,UAAU,GAAG,CAAb;AACAC,IAAAA,UAAU,GAAG,CAAb;AACAC,IAAAA,UAAU,GAAG,CAAb;AACAtB,IAAAA,KAAK,GAAG,CAAR;AACD;;AAED,QAAM+B,eAAe,GAAGP,qBAAqB,CAACvB,OAAO,CAAC+B,gBAAT,EAA2Bb,qBAA3B,CAA7C;;AAEA,MAAI,CAACY,eAAD,IAAoB/B,KAAK,GAAGI,YAAhC,EAA8C;AAC5C,WAAOI,IAAP;AACD;;AAED,QAAMyB,kBAAkB,GAAGT,qBAAqB,CAC9CvB,OAAO,CAACiC,mBADsC,EAE9Cf,qBAF8C,CAAhD;;AAKA,MAAIc,kBAAJ,EAAwB;AACtBzB,IAAAA,IAAI,CAACG,UAAL,GAAkBkB,yBAAyB,CAACxB,kBAAD,EAAqBqB,GAArB,EAA0B/B,CAA1B,EAA6BC,CAA7B,EAAgCC,CAAhC,CAA3C;AACD;;AAED,QAAMsC,cAAc,GAAGnC,KAAK,GAAG,CAA/B;AACA,QAAMoC,KAAK,GAAG;AAAC1C,IAAAA,WAAW,EAAEuB,oBAAd;AAAoCtB,IAAAA,CAAC,EAAEyB,UAAvC;AAAmDxB,IAAAA,CAAC,EAAEyB,UAAtD;AAAkExB,IAAAA,CAAC,EAAEyB;AAArE,GAAd;;AAEA,OAAK,IAAIe,KAAK,GAAG,CAAjB,EAAoBA,KAAK,GAAGzB,eAA5B,EAA6CyB,KAAK,EAAlD,EAAsD;AACpD,UAAMC,WAAW,GAAG,MAAMhD,kBAAkB,CAAC;AAC3CW,MAAAA,OAD2C;AAE3CT,MAAAA,OAF2C;AAG3CC,MAAAA,UAAU,EAAE2C,KAH+B;AAI3CtC,MAAAA,UAAU,EAAEuC,KAJ+B;AAK3CrC,MAAAA,KAAK,EAAEmC,cALoC;AAM3CpC,MAAAA;AAN2C,KAAD,CAA5C;;AASA,QAAIuC,WAAW,CAAC3B,UAAZ,IAA0B2B,WAAW,CAAC7B,QAAZ,CAAqB8B,MAAnD,EAA2D;AACzD,YAAMC,WAAW,GAAGd,GAAG,GAAG,CAA1B;AACA,YAAMe,gBAAgB,GAAG;AAACrB,QAAAA,UAAD;AAAaC,QAAAA,UAAb;AAAyBC,QAAAA;AAAzB,OAAzB;AACA,YAAMoB,aAAa,GAAGC,cAAc,CAACL,WAAD,EAAcE,WAAd,EAA2BC,gBAA3B,EAA6CjD,OAA7C,CAApC;AAEAgB,MAAAA,IAAI,CAACC,QAAL,CAAcmC,IAAd,CAAmBF,aAAnB;AACD;AACF;;AAED,SAAOlC,IAAP;AACD;;AAED,SAASgB,qBAAT,CAA+BqB,gBAA/B,EAA+DR,KAA/D,EAAuF;AACrF,MAAI,cAAcQ,gBAAlB,EAAoC;AAClC,WAAOC,OAAO,CAACD,gBAAgB,CAACE,QAAlB,CAAd;AACD;;AAED,MAAIF,gBAAgB,CAACG,iBAArB,EAAwC;AACtC,WAAOC,4BAA4B,CAACZ,KAAD,EAAQQ,gBAAgB,CAACG,iBAAzB,CAAnC;AACD;;AAED,SAAO,KAAP;AACD;;AAUD,SAASL,cAAT,CACEnC,IADF,EAEER,KAFF,EAGEyC,gBAHF,EAIEjD,OAJF,EAKE;AACA,QAAM;AACJe,IAAAA,QADI;AAEJ2C,IAAAA,MAFI;AAGJC,IAAAA,SAHI;AAIJC,IAAAA,aAJI;AAKJC,IAAAA,WALI;AAMJC,IAAAA,kBANI;AAOJC,IAAAA;AAPI,MAQF/D,OARJ;AASA,QAAMgE,GAAG,GAAGhD,IAAI,CAACG,UAAL,IAAmBH,IAAI,CAACG,UAAL,CAAgB8C,OAAhB,WAA2BlD,QAA3B,QAAwC,EAAxC,CAA/B;AACA,QAAMG,cAAc,GAAG4C,kBAAkB,GAAG,KAAKtD,KAAjD;AACA,QAAM0D,cAAc,GAAGC,mCAAmC,CACxD3D,KADwD,EAExDuD,kBAFwD,EAGxDd,gBAHwD,CAA1D;AAMA,SAAO;AACLhC,IAAAA,QAAQ,EAAED,IAAI,CAACC,QADV;AAELE,IAAAA,UAAU,EAAEH,IAAI,CAACG,UAFZ;AAGLiD,IAAAA,OAAO,EAAE;AAACJ,MAAAA;AAAD,KAHJ;AAILK,IAAAA,EAAE,EAAErD,IAAI,CAACG,UAJJ;AAKLuC,IAAAA,MAAM,EAAEC,SAAS,CAACD,MAAD,CALZ;AAMLY,IAAAA,IAAI,EAAET,WAAW,CAAC7C,IAAD,CANZ;AAOL4C,IAAAA,aAPK;AAQL1C,IAAAA,cARK;AASLgD,IAAAA;AATK,GAAP;AAgBD;;AASD,SAASC,mCAAT,CACE3D,KADF,EAEEuD,kBAFF,EAGEd,gBAHF,EAIyB;AACvB,MAAIc,kBAAkB,CAACQ,MAAvB,EAA+B;AAC7B,UAAM;AAAC3C,MAAAA,UAAD;AAAaC,MAAAA,UAAb;AAAyBC,MAAAA;AAAzB,QAAuCmB,gBAA7C;AACA,UAAM,CAACuB,IAAD,EAAOC,KAAP,EAAcC,IAAd,EAAoBC,KAApB,EAA2BC,aAA3B,EAA0CC,aAA1C,IAA2Dd,kBAAkB,CAACQ,MAApF;AACA,UAAMO,oBAAoB,GAAG,KAAKtE,KAAlC;AAEA,UAAMuE,KAAK,GAAG,CAACL,IAAI,GAAGF,IAAR,IAAgBM,oBAA9B;AACA,UAAME,KAAK,GAAG,CAACL,KAAK,GAAGF,KAAT,IAAkBK,oBAAhC;AACA,UAAMG,KAAK,GAAG,CAACJ,aAAa,GAAGD,aAAjB,IAAkCE,oBAAhD;AAEA,UAAM,CAACI,SAAD,EAAYC,SAAZ,IAAyB,CAACX,IAAI,GAAGO,KAAK,GAAGnD,UAAhB,EAA4B4C,IAAI,GAAGO,KAAK,IAAInD,UAAU,GAAG,CAAjB,CAAxC,CAA/B;AACA,UAAM,CAACwD,UAAD,EAAaC,UAAb,IAA2B,CAACZ,KAAK,GAAGO,KAAK,GAAGnD,UAAjB,EAA6B4C,KAAK,GAAGO,KAAK,IAAInD,UAAU,GAAG,CAAjB,CAA1C,CAAjC;AACA,UAAM,CAACyD,kBAAD,EAAqBC,kBAArB,IAA2C,CAC/CX,aAAa,GAAGK,KAAK,GAAGnD,UADuB,EAE/C8C,aAAa,GAAGK,KAAK,IAAInD,UAAU,GAAG,CAAjB,CAF0B,CAAjD;AAKA,WAAO;AACLyC,MAAAA,MAAM,EAAE,CAACW,SAAD,EAAYE,UAAZ,EAAwBD,SAAxB,EAAmCE,UAAnC,EAA+CC,kBAA/C,EAAmEC,kBAAnE;AADH,KAAP;AAGD;;AAGDC,EAAAA,OAAO,CAACC,IAAR,CAAa,oCAAb,EAAmD1B,kBAAnD;AACA,SAAO,IAAP;AACD;;AAOD,SAASrC,UAAT,CAAoBgE,KAApB,EAAmCC,MAAnC,EAA2D;AACzD,SAAOC,QAAQ,CAACF,KAAK,CAACG,QAAN,CAAe,CAAf,IAAoBF,MAAM,CAACE,QAAP,CAAgB,CAAhB,CAArB,EAAyC,CAAzC,CAAf;AACD;;AAUD,OAAO,SAASxD,yBAAT,CACLyD,WADK,EAELtF,KAFK,EAGLL,CAHK,EAILC,CAJK,EAKLC,CALK,EAMG;AACR,QAAM0F,MAAM,GAAGC,cAAc,CAAC;AAACxF,IAAAA,KAAD;AAAQL,IAAAA,CAAR;AAAWC,IAAAA,CAAX;AAAcC,IAAAA;AAAd,GAAD,CAA7B;AACA,SAAOyF,WAAW,CAAC7B,OAAZ,CAAoB,uBAApB,EAA8CgC,OAAD,IAAaF,MAAM,CAACE,OAAD,CAAhE,CAAP;AACD;;AAMD,SAASD,cAAT,CAAwBE,KAAxB,EAAiF;AAC/E,QAAMH,MAAM,GAAG,EAAf;;AAEA,OAAK,MAAMI,GAAX,IAAkBD,KAAlB,EAAyB;AACvBH,IAAAA,MAAM,YAAKI,GAAL,OAAN,GAAqBD,KAAK,CAACC,GAAD,CAA1B;AACD;;AACD,SAAOJ,MAAP;AACD;;AAUD,SAAStC,4BAAT,CACE2C,iBADF,EAEEC,kBAFF,EAGW;AACT,QAAMC,SAAS,GAAGC,IAAI,CAACC,KAAL,CAAWJ,iBAAiB,GAAG,CAA/B,CAAlB;AACA,QAAMK,QAAQ,GAAGL,iBAAiB,GAAG,CAArC;AACA,QAAMM,QAAQ,GAAIL,kBAAkB,CAACC,SAAD,CAAlB,IAAiCG,QAAlC,GAA8C,CAA/D;AAEA,SAAOC,QAAQ,KAAK,CAApB;AACD","sourcesContent":["import type {Availability, BoundingVolume, Subtree} from '../../../types';\nimport {Tile3DSubtreeLoader} from '../../../tile-3d-subtree-loader';\nimport {load} from '@loaders.gl/core';\n\nconst QUADTREE_DEVISION_COUNT = 4;\nconst OCTREE_DEVISION_COUNT = 8;\n\nconst SUBDIVISION_COUNT_MAP = {\n QUADTREE: QUADTREE_DEVISION_COUNT,\n OCTREE: OCTREE_DEVISION_COUNT\n};\n\n/**\n * Recursively parse implicit tiles tree\n * Spec - https://github.com/CesiumGS/3d-tiles/tree/main/extensions/3DTILES_implicit_tiling\n * TODO Check out do we able to use Tile3D class as return type here.\n * @param subtree\n * @param lodMetricValue\n * @param options\n * @param parentData\n * @param childIndex\n * @param level\n * @param globalData\n */\n// eslint-disable-next-line max-statements\nexport async function parseImplicitTiles(params: {\n subtree: Subtree;\n options: any;\n parentData?: {mortonIndex: number; x: number; y: number; z: number};\n childIndex?: number;\n level?: number;\n globalData?: {level: number; mortonIndex: number; x: number; y: number; z: number};\n}) {\n const {\n options,\n parentData = {\n mortonIndex: 0,\n x: 0,\n y: 0,\n z: 0\n },\n childIndex = 0,\n globalData = {\n level: 0,\n mortonIndex: 0,\n x: 0,\n y: 0,\n z: 0\n }\n } = params;\n let {subtree, level = 0} = params;\n const {\n subdivisionScheme,\n subtreeLevels,\n maximumLevel,\n contentUrlTemplate,\n subtreesUriTemplate,\n basePath\n } = options;\n\n const tile = {children: [], lodMetricValue: 0, contentUrl: ''};\n\n const childrenPerTile = SUBDIVISION_COUNT_MAP[subdivisionScheme];\n\n const childX = childIndex & 0b01;\n const childY = (childIndex >> 1) & 0b01;\n const childZ = (childIndex >> 2) & 0b01;\n\n const levelOffset = (childrenPerTile ** level - 1) / (childrenPerTile - 1);\n let childTileMortonIndex = concatBits(parentData.mortonIndex, childIndex);\n let tileAvailabilityIndex = levelOffset + childTileMortonIndex;\n\n // Local tile coordinates\n let childTileX = concatBits(parentData.x, childX);\n let childTileY = concatBits(parentData.y, childY);\n let childTileZ = concatBits(parentData.z, childZ);\n\n // TODO Remove after real implicit tileset will be tested.\n // Degug data\n // tile.level = level + globalData.level;\n // tile.x = concatBits(globalData.x, childTileX);\n // tile.y = concatBits(globalData.y, childTileY);\n // tile.z = concatBits(globalData.z, childTileZ);\n // tile.mortonIndex = childTileMortonIndex;\n // End of debug data\n\n let isChildSubtreeAvailable = false;\n\n if (level + 1 > subtreeLevels) {\n isChildSubtreeAvailable = getAvailabilityResult(\n subtree.childSubtreeAvailability,\n childTileMortonIndex\n );\n }\n\n const x = concatBits(globalData.x, childTileX);\n const y = concatBits(globalData.y, childTileY);\n const z = concatBits(globalData.z, childTileZ);\n const lev = level + globalData.level;\n\n if (isChildSubtreeAvailable) {\n const subtreePath = `${basePath}/${subtreesUriTemplate}`;\n const childSubtreeUrl = replaceContentUrlTemplate(subtreePath, lev, x, y, z);\n const childSubtree = await load(childSubtreeUrl, Tile3DSubtreeLoader);\n\n subtree = childSubtree;\n\n globalData.mortonIndex = childTileMortonIndex;\n globalData.x = childTileX;\n globalData.y = childTileY;\n globalData.z = childTileZ;\n globalData.level = level;\n\n childTileMortonIndex = 0;\n tileAvailabilityIndex = 0;\n childTileX = 0;\n childTileY = 0;\n childTileZ = 0;\n level = 0;\n }\n\n const isTileAvailable = getAvailabilityResult(subtree.tileAvailability, tileAvailabilityIndex);\n\n if (!isTileAvailable || level > maximumLevel) {\n return tile;\n }\n\n const isContentAvailable = getAvailabilityResult(\n subtree.contentAvailability,\n tileAvailabilityIndex\n );\n\n if (isContentAvailable) {\n tile.contentUrl = replaceContentUrlTemplate(contentUrlTemplate, lev, x, y, z);\n }\n\n const childTileLevel = level + 1;\n const pData = {mortonIndex: childTileMortonIndex, x: childTileX, y: childTileY, z: childTileZ};\n\n for (let index = 0; index < childrenPerTile; index++) {\n const currentTile = await parseImplicitTiles({\n subtree,\n options,\n parentData: pData,\n childIndex: index,\n level: childTileLevel,\n globalData\n });\n\n if (currentTile.contentUrl || currentTile.children.length) {\n const globalLevel = lev + 1;\n const childCoordinates = {childTileX, childTileY, childTileZ};\n const formattedTile = formatTileData(currentTile, globalLevel, childCoordinates, options);\n // @ts-ignore\n tile.children.push(formattedTile);\n }\n }\n\n return tile;\n}\n\nfunction getAvailabilityResult(availabilityData: Availability, index: number): boolean {\n if ('constant' in availabilityData) {\n return Boolean(availabilityData.constant);\n }\n\n if (availabilityData.explicitBitstream) {\n return getBooleanValueFromBitstream(index, availabilityData.explicitBitstream);\n }\n\n return false;\n}\n\n/**\n * Do formatting of implicit tile data.\n * TODO Check out do we able to use Tile3D class as type here.\n * @param tile\n * @param lodMetricValue\n * @param options\n * @returns\n */\nfunction formatTileData(\n tile,\n level: number,\n childCoordinates: {childTileX: number; childTileY: number; childTileZ: number},\n options: any\n) {\n const {\n basePath,\n refine,\n getRefine,\n lodMetricType,\n getTileType,\n rootLodMetricValue,\n rootBoundingVolume\n } = options;\n const uri = tile.contentUrl && tile.contentUrl.replace(`${basePath}/`, '');\n const lodMetricValue = rootLodMetricValue / 2 ** level;\n const boundingVolume = calculateBoundingVolumeForChildTile(\n level,\n rootBoundingVolume,\n childCoordinates\n );\n\n return {\n children: tile.children,\n contentUrl: tile.contentUrl,\n content: {uri},\n id: tile.contentUrl,\n refine: getRefine(refine),\n type: getTileType(tile),\n lodMetricType,\n lodMetricValue,\n boundingVolume\n // Temp debug values. Remove when real implicit tileset will be tested.\n // x: tile.x,\n // y: tile.y,\n // z: tile.z,\n // level: tile.level\n };\n}\n\n/**\n * Calculate child bounding volume.\n * Spec - https://github.com/CesiumGS/3d-tiles/tree/main/extensions/3DTILES_implicit_tiling#subdivision-rules\n * @param level\n * @param rootBoundingVolume\n * @param childCoordinates\n */\nfunction calculateBoundingVolumeForChildTile(\n level: number,\n rootBoundingVolume: BoundingVolume,\n childCoordinates: {childTileX: number; childTileY: number; childTileZ: number}\n): BoundingVolume | null {\n if (rootBoundingVolume.region) {\n const {childTileX, childTileY, childTileZ} = childCoordinates;\n const [west, south, east, north, minimumHeight, maximumHeight] = rootBoundingVolume.region;\n const boundingVolumesCount = 2 ** level;\n\n const sizeX = (east - west) / boundingVolumesCount;\n const sizeY = (north - south) / boundingVolumesCount;\n const sizeZ = (maximumHeight - minimumHeight) / boundingVolumesCount;\n\n const [childWest, childEast] = [west + sizeX * childTileX, west + sizeX * (childTileX + 1)];\n const [childSouth, childNorth] = [south + sizeY * childTileY, south + sizeY * (childTileY + 1)];\n const [childMinimumHeight, childMaximumHeight] = [\n minimumHeight + sizeZ * childTileZ,\n minimumHeight + sizeZ * (childTileZ + 1)\n ];\n\n return {\n region: [childWest, childSouth, childEast, childNorth, childMinimumHeight, childMaximumHeight]\n };\n }\n\n // eslint-disable-next-line no-console\n console.warn('Unsupported bounding volume type: ', rootBoundingVolume);\n return null;\n}\n\n/**\n * Do binary concatenation\n * @param first\n * @param second\n */\nfunction concatBits(first: number, second: number): number {\n return parseInt(first.toString(2) + second.toString(2), 2);\n}\n\n/**\n * Replace implicit tile content url with real coordinates.\n * @param templateUrl\n * @param level\n * @param x\n * @param y\n * @param z\n */\nexport function replaceContentUrlTemplate(\n templateUrl: string,\n level: number,\n x: number,\n y: number,\n z: number\n): string {\n const mapUrl = generateMapUrl({level, x, y, z});\n return templateUrl.replace(/{level}|{x}|{y}|{z}/gi, (matched) => mapUrl[matched]);\n}\n\n/**\n * Get Map object for content url generation\n * @param items\n */\nfunction generateMapUrl(items: {[key: string]: number}): {[key: string]: string} {\n const mapUrl = {};\n\n for (const key in items) {\n mapUrl[`{${key}}`] = items[key];\n }\n return mapUrl;\n}\n\n/**\n * Get boolean value from bistream by index\n * A boolean value is encoded as a single bit, either 0 (false) or 1 (true).\n * Multiple boolean values are packed tightly in the same buffer.\n * These buffers of tightly-packed bits are sometimes referred to as bitstreams.\n * Spec - https://github.com/CesiumGS/3d-tiles/tree/implicit-revisions/specification/Metadata#booleans\n * @param availabilitiIndex\n */\nfunction getBooleanValueFromBitstream(\n availabilityIndex: number,\n availabilityBuffer: Uint8Array\n): boolean {\n const byteIndex = Math.floor(availabilityIndex / 8);\n const bitIndex = availabilityIndex % 8;\n const bitValue = (availabilityBuffer[byteIndex] >> bitIndex) & 1;\n\n return bitValue === 1;\n}\n"],"file":"parse-3d-implicit-tiles.js"}
|
|
1
|
+
{"version":3,"file":"parse-3d-implicit-tiles.js","names":["Tile3DSubtreeLoader","load","QUADTREE_DEVISION_COUNT","OCTREE_DEVISION_COUNT","SUBDIVISION_COUNT_MAP","QUADTREE","OCTREE","parseImplicitTiles","params","options","parentData","mortonIndex","x","y","z","childIndex","globalData","level","subtree","subdivisionScheme","subtreeLevels","maximumLevel","contentUrlTemplate","subtreesUriTemplate","basePath","tile","children","lodMetricValue","contentUrl","childrenPerTile","childX","childY","childZ","levelOffset","childTileMortonIndex","concatBits","tileAvailabilityIndex","childTileX","childTileY","childTileZ","isChildSubtreeAvailable","getAvailabilityResult","childSubtreeAvailability","lev","subtreePath","childSubtreeUrl","replaceContentUrlTemplate","childSubtree","isTileAvailable","tileAvailability","isContentAvailable","contentAvailability","childTileLevel","pData","index","currentTile","length","globalLevel","childCoordinates","formattedTile","formatTileData","push","availabilityData","Boolean","constant","explicitBitstream","getBooleanValueFromBitstream","refine","getRefine","lodMetricType","getTileType","rootLodMetricValue","rootBoundingVolume","uri","replace","boundingVolume","calculateBoundingVolumeForChildTile","content","id","type","geometricError","transform","region","west","south","east","north","minimumHeight","maximumHeight","boundingVolumesCount","sizeX","sizeY","sizeZ","childWest","childEast","childSouth","childNorth","childMinimumHeight","childMaximumHeight","console","warn","first","second","parseInt","toString","templateUrl","mapUrl","generateMapUrl","matched","items","key","availabilityIndex","availabilityBuffer","byteIndex","Math","floor","bitIndex","bitValue"],"sources":["../../../../../src/lib/parsers/helpers/parse-3d-implicit-tiles.ts"],"sourcesContent":["import type {Availability, BoundingVolume, Subtree} from '../../../types';\nimport {Tile3DSubtreeLoader} from '../../../tile-3d-subtree-loader';\nimport {load} from '@loaders.gl/core';\n\nconst QUADTREE_DEVISION_COUNT = 4;\nconst OCTREE_DEVISION_COUNT = 8;\n\nconst SUBDIVISION_COUNT_MAP = {\n QUADTREE: QUADTREE_DEVISION_COUNT,\n OCTREE: OCTREE_DEVISION_COUNT\n};\n\n/**\n * Recursively parse implicit tiles tree\n * Spec - https://github.com/CesiumGS/3d-tiles/tree/main/extensions/3DTILES_implicit_tiling\n * TODO Check out do we able to use Tile3D class as return type here.\n * @param subtree\n * @param lodMetricValue\n * @param options\n * @param parentData\n * @param childIndex\n * @param level\n * @param globalData\n */\n// eslint-disable-next-line max-statements\nexport async function parseImplicitTiles(params: {\n subtree: Subtree;\n options: any;\n parentData?: {mortonIndex: number; x: number; y: number; z: number};\n childIndex?: number;\n level?: number;\n globalData?: {level: number; mortonIndex: number; x: number; y: number; z: number};\n}) {\n const {\n options,\n parentData = {\n mortonIndex: 0,\n x: 0,\n y: 0,\n z: 0\n },\n childIndex = 0,\n globalData = {\n level: 0,\n mortonIndex: 0,\n x: 0,\n y: 0,\n z: 0\n }\n } = params;\n let {subtree, level = 0} = params;\n const {\n subdivisionScheme,\n subtreeLevels,\n maximumLevel,\n contentUrlTemplate,\n subtreesUriTemplate,\n basePath\n } = options;\n\n const tile = {children: [], lodMetricValue: 0, contentUrl: ''};\n\n const childrenPerTile = SUBDIVISION_COUNT_MAP[subdivisionScheme];\n\n const childX = childIndex & 0b01;\n const childY = (childIndex >> 1) & 0b01;\n const childZ = (childIndex >> 2) & 0b01;\n\n const levelOffset = (childrenPerTile ** level - 1) / (childrenPerTile - 1);\n let childTileMortonIndex = concatBits(parentData.mortonIndex, childIndex);\n let tileAvailabilityIndex = levelOffset + childTileMortonIndex;\n\n // Local tile coordinates\n let childTileX = concatBits(parentData.x, childX);\n let childTileY = concatBits(parentData.y, childY);\n let childTileZ = concatBits(parentData.z, childZ);\n\n let isChildSubtreeAvailable = false;\n\n if (level + 1 > subtreeLevels) {\n isChildSubtreeAvailable = getAvailabilityResult(\n subtree.childSubtreeAvailability,\n childTileMortonIndex\n );\n }\n\n const x = concatBits(globalData.x, childTileX);\n const y = concatBits(globalData.y, childTileY);\n const z = concatBits(globalData.z, childTileZ);\n const lev = level + globalData.level;\n\n if (isChildSubtreeAvailable) {\n const subtreePath = `${basePath}/${subtreesUriTemplate}`;\n const childSubtreeUrl = replaceContentUrlTemplate(subtreePath, lev, x, y, z);\n const childSubtree = await load(childSubtreeUrl, Tile3DSubtreeLoader);\n\n subtree = childSubtree;\n\n globalData.mortonIndex = childTileMortonIndex;\n globalData.x = childTileX;\n globalData.y = childTileY;\n globalData.z = childTileZ;\n globalData.level = level;\n\n childTileMortonIndex = 0;\n tileAvailabilityIndex = 0;\n childTileX = 0;\n childTileY = 0;\n childTileZ = 0;\n level = 0;\n }\n\n const isTileAvailable = getAvailabilityResult(subtree.tileAvailability, tileAvailabilityIndex);\n\n if (!isTileAvailable || level > maximumLevel) {\n return tile;\n }\n\n const isContentAvailable = getAvailabilityResult(\n subtree.contentAvailability,\n tileAvailabilityIndex\n );\n\n if (isContentAvailable) {\n tile.contentUrl = replaceContentUrlTemplate(contentUrlTemplate, lev, x, y, z);\n }\n\n const childTileLevel = level + 1;\n const pData = {mortonIndex: childTileMortonIndex, x: childTileX, y: childTileY, z: childTileZ};\n\n for (let index = 0; index < childrenPerTile; index++) {\n const currentTile = await parseImplicitTiles({\n subtree,\n options,\n parentData: pData,\n childIndex: index,\n level: childTileLevel,\n globalData\n });\n\n if (currentTile.contentUrl || currentTile.children.length) {\n const globalLevel = lev + 1;\n const childCoordinates = {childTileX, childTileY, childTileZ};\n const formattedTile = formatTileData(currentTile, globalLevel, childCoordinates, options);\n // @ts-ignore\n tile.children.push(formattedTile);\n }\n }\n\n return tile;\n}\n\nfunction getAvailabilityResult(availabilityData: Availability, index: number): boolean {\n if ('constant' in availabilityData) {\n return Boolean(availabilityData.constant);\n }\n\n if (availabilityData.explicitBitstream) {\n return getBooleanValueFromBitstream(index, availabilityData.explicitBitstream);\n }\n\n return false;\n}\n\n/**\n * Do formatting of implicit tile data.\n * TODO Check out do we able to use Tile3D class as type here.\n * @param tile\n * @param lodMetricValue\n * @param options\n * @returns\n */\nfunction formatTileData(\n tile,\n level: number,\n childCoordinates: {childTileX: number; childTileY: number; childTileZ: number},\n options: any\n) {\n const {\n basePath,\n refine,\n getRefine,\n lodMetricType,\n getTileType,\n rootLodMetricValue,\n rootBoundingVolume\n } = options;\n const uri = tile.contentUrl && tile.contentUrl.replace(`${basePath}/`, '');\n const lodMetricValue = rootLodMetricValue / 2 ** level;\n const boundingVolume = calculateBoundingVolumeForChildTile(\n level,\n rootBoundingVolume,\n childCoordinates\n );\n\n return {\n children: tile.children,\n contentUrl: tile.contentUrl,\n content: {uri},\n id: tile.contentUrl,\n refine: getRefine(refine),\n type: getTileType(tile),\n lodMetricType,\n lodMetricValue,\n geometricError: lodMetricValue,\n transform: tile.transform,\n boundingVolume\n };\n}\n\n/**\n * Calculate child bounding volume.\n * Spec - https://github.com/CesiumGS/3d-tiles/tree/main/extensions/3DTILES_implicit_tiling#subdivision-rules\n * @param level\n * @param rootBoundingVolume\n * @param childCoordinates\n */\nfunction calculateBoundingVolumeForChildTile(\n level: number,\n rootBoundingVolume: BoundingVolume,\n childCoordinates: {childTileX: number; childTileY: number; childTileZ: number}\n): BoundingVolume | null {\n if (rootBoundingVolume.region) {\n const {childTileX, childTileY, childTileZ} = childCoordinates;\n const [west, south, east, north, minimumHeight, maximumHeight] = rootBoundingVolume.region;\n const boundingVolumesCount = 2 ** level;\n\n const sizeX = (east - west) / boundingVolumesCount;\n const sizeY = (north - south) / boundingVolumesCount;\n const sizeZ = (maximumHeight - minimumHeight) / boundingVolumesCount;\n\n const [childWest, childEast] = [west + sizeX * childTileX, west + sizeX * (childTileX + 1)];\n const [childSouth, childNorth] = [south + sizeY * childTileY, south + sizeY * (childTileY + 1)];\n const [childMinimumHeight, childMaximumHeight] = [\n minimumHeight + sizeZ * childTileZ,\n minimumHeight + sizeZ * (childTileZ + 1)\n ];\n\n return {\n region: [childWest, childSouth, childEast, childNorth, childMinimumHeight, childMaximumHeight]\n };\n }\n\n // eslint-disable-next-line no-console\n console.warn('Unsupported bounding volume type: ', rootBoundingVolume);\n return null;\n}\n\n/**\n * Do binary concatenation\n * @param first\n * @param second\n */\nfunction concatBits(first: number, second: number): number {\n return parseInt(first.toString(2) + second.toString(2), 2);\n}\n\n/**\n * Replace implicit tile content url with real coordinates.\n * @param templateUrl\n * @param level\n * @param x\n * @param y\n * @param z\n */\nexport function replaceContentUrlTemplate(\n templateUrl: string,\n level: number,\n x: number,\n y: number,\n z: number\n): string {\n const mapUrl = generateMapUrl({level, x, y, z});\n return templateUrl.replace(/{level}|{x}|{y}|{z}/gi, (matched) => mapUrl[matched]);\n}\n\n/**\n * Get Map object for content url generation\n * @param items\n */\nfunction generateMapUrl(items: {[key: string]: number}): {[key: string]: string} {\n const mapUrl = {};\n\n for (const key in items) {\n mapUrl[`{${key}}`] = items[key];\n }\n return mapUrl;\n}\n\n/**\n * Get boolean value from bistream by index\n * A boolean value is encoded as a single bit, either 0 (false) or 1 (true).\n * Multiple boolean values are packed tightly in the same buffer.\n * These buffers of tightly-packed bits are sometimes referred to as bitstreams.\n * Spec - https://github.com/CesiumGS/3d-tiles/tree/implicit-revisions/specification/Metadata#booleans\n * @param availabilitiIndex\n */\nfunction getBooleanValueFromBitstream(\n availabilityIndex: number,\n availabilityBuffer: Uint8Array\n): boolean {\n const byteIndex = Math.floor(availabilityIndex / 8);\n const bitIndex = availabilityIndex % 8;\n const bitValue = (availabilityBuffer[byteIndex] >> bitIndex) & 1;\n\n return bitValue === 1;\n}\n"],"mappings":"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"}
|
|
@@ -1,3 +1,5 @@
|
|
|
1
|
+
|
|
2
|
+
|
|
1
3
|
import { GLTFLoader } from '@loaders.gl/gltf';
|
|
2
4
|
import { sliceArrayBuffer } from '@loaders.gl/loader-utils';
|
|
3
5
|
export const GLTF_FORMAT = {
|
|
@@ -6,18 +8,19 @@ export const GLTF_FORMAT = {
|
|
|
6
8
|
};
|
|
7
9
|
export function parse3DTileGLTFViewSync(tile, arrayBuffer, byteOffset, options) {
|
|
8
10
|
tile.rotateYtoZ = true;
|
|
9
|
-
const gltfByteLength = tile.byteOffset + tile.byteLength - byteOffset;
|
|
10
11
|
|
|
12
|
+
const gltfByteLength = tile.byteOffset + tile.byteLength - byteOffset;
|
|
11
13
|
if (gltfByteLength === 0) {
|
|
12
14
|
throw new Error('glTF byte length must be greater than 0.');
|
|
13
15
|
}
|
|
14
16
|
|
|
15
17
|
tile.gltfUpAxis = options['3d-tiles'] && options['3d-tiles'].assetGltfUpAxis ? options['3d-tiles'].assetGltfUpAxis : 'Y';
|
|
18
|
+
|
|
16
19
|
tile.gltfArrayBuffer = sliceArrayBuffer(arrayBuffer, byteOffset, gltfByteLength);
|
|
17
20
|
tile.gltfByteOffset = 0;
|
|
18
21
|
tile.gltfByteLength = gltfByteLength;
|
|
19
|
-
|
|
20
|
-
|
|
22
|
+
if (byteOffset % 4 === 0) {
|
|
23
|
+
} else {
|
|
21
24
|
console.warn("".concat(tile.type, ": embedded glb is not aligned to a 4-byte boundary."));
|
|
22
25
|
}
|
|
23
26
|
|
|
@@ -26,18 +29,15 @@ export function parse3DTileGLTFViewSync(tile, arrayBuffer, byteOffset, options)
|
|
|
26
29
|
export async function extractGLTF(tile, gltfFormat, options, context) {
|
|
27
30
|
const tile3DOptions = options['3d-tiles'] || {};
|
|
28
31
|
extractGLTFBufferOrURL(tile, gltfFormat, options);
|
|
29
|
-
|
|
30
32
|
if (tile3DOptions.loadGLTF) {
|
|
31
33
|
const {
|
|
32
34
|
parse,
|
|
33
35
|
fetch
|
|
34
36
|
} = context;
|
|
35
|
-
|
|
36
37
|
if (tile.gltfUrl) {
|
|
37
38
|
tile.gltfArrayBuffer = await fetch(tile.gltfUrl, options);
|
|
38
39
|
tile.gltfByteOffset = 0;
|
|
39
40
|
}
|
|
40
|
-
|
|
41
41
|
if (tile.gltfArrayBuffer) {
|
|
42
42
|
tile.gltf = await parse(tile.gltfArrayBuffer, GLTFLoader, options, context);
|
|
43
43
|
delete tile.gltfArrayBuffer;
|
|
@@ -46,7 +46,6 @@ export async function extractGLTF(tile, gltfFormat, options, context) {
|
|
|
46
46
|
}
|
|
47
47
|
}
|
|
48
48
|
}
|
|
49
|
-
|
|
50
49
|
function extractGLTFBufferOrURL(tile, gltfFormat, options) {
|
|
51
50
|
switch (gltfFormat) {
|
|
52
51
|
case GLTF_FORMAT.URI:
|
|
@@ -58,10 +57,8 @@ function extractGLTFBufferOrURL(tile, gltfFormat, options) {
|
|
|
58
57
|
delete tile.gltfByteOffset;
|
|
59
58
|
delete tile.gltfByteLength;
|
|
60
59
|
break;
|
|
61
|
-
|
|
62
60
|
case GLTF_FORMAT.EMBEDDED:
|
|
63
61
|
break;
|
|
64
|
-
|
|
65
62
|
default:
|
|
66
63
|
throw new Error('b3dm: Illegal glTF format field');
|
|
67
64
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"
|
|
1
|
+
{"version":3,"file":"parse-3d-tile-gltf-view.js","names":["GLTFLoader","sliceArrayBuffer","GLTF_FORMAT","URI","EMBEDDED","parse3DTileGLTFViewSync","tile","arrayBuffer","byteOffset","options","rotateYtoZ","gltfByteLength","byteLength","Error","gltfUpAxis","assetGltfUpAxis","gltfArrayBuffer","gltfByteOffset","console","warn","type","extractGLTF","gltfFormat","context","tile3DOptions","extractGLTFBufferOrURL","loadGLTF","parse","fetch","gltfUrl","gltf","gltfUrlBytes","Uint8Array","textDecoder","TextDecoder","decode","replace"],"sources":["../../../../../src/lib/parsers/helpers/parse-3d-tile-gltf-view.ts"],"sourcesContent":["// This file is derived from the Cesium code base under Apache 2 license\n// See LICENSE.md and https://github.com/AnalyticalGraphicsInc/cesium/blob/master/LICENSE.md\n\n// TODO - should we automatically parse the embedded glTF or leave it to the app?\n// - I.e. some apps might work directly on a GLB, in that case no need for us to decode...\n// - And if we decode, do we still keep the GLB in case it is needed?\n// - Do we add an option to control this?\n// - Also, should we have hard dependency on gltf module or use injection or auto-discovery for gltf parser?\n\nimport {GLTFLoader} from '@loaders.gl/gltf';\nimport {sliceArrayBuffer} from '@loaders.gl/loader-utils';\n\nexport const GLTF_FORMAT = {\n URI: 0,\n EMBEDDED: 1\n};\n\nexport function parse3DTileGLTFViewSync(tile, arrayBuffer, byteOffset, options) {\n // Set flags\n // glTF models need to be rotated from Y to Z up\n // https://github.com/AnalyticalGraphicsInc/3d-tiles/tree/master/specification#y-up-to-z-up\n tile.rotateYtoZ = true;\n\n // Assume glTF consumes rest of tile\n const gltfByteLength = tile.byteOffset + tile.byteLength - byteOffset;\n if (gltfByteLength === 0) {\n throw new Error('glTF byte length must be greater than 0.');\n }\n\n // Save gltf up axis\n tile.gltfUpAxis =\n options['3d-tiles'] && options['3d-tiles'].assetGltfUpAxis\n ? options['3d-tiles'].assetGltfUpAxis\n : 'Y';\n\n // TODO - We can avoid copy if already 4-byte aligned...\n // However the rest of the code may not be able to accept byteOffsets, so copy anyway\n tile.gltfArrayBuffer = sliceArrayBuffer(arrayBuffer, byteOffset, gltfByteLength);\n tile.gltfByteOffset = 0;\n tile.gltfByteLength = gltfByteLength;\n\n if (byteOffset % 4 === 0) {\n // tile.gltfArrayBuffer = arrayBuffer;\n // tile.gltfByteOffset = byteOffset;\n // tile.gltfByteLength = gltfByteLength;\n } else {\n // Create a copy of the glb so that it is 4-byte aligned\n // eslint-disable-next-line\n console.warn(`${tile.type}: embedded glb is not aligned to a 4-byte boundary.`);\n }\n\n // Entire tile is consumed\n return tile.byteOffset + tile.byteLength;\n}\n\nexport async function extractGLTF(tile, gltfFormat, options, context) {\n const tile3DOptions = options['3d-tiles'] || {};\n\n extractGLTFBufferOrURL(tile, gltfFormat, options);\n\n if (tile3DOptions.loadGLTF) {\n const {parse, fetch} = context;\n if (tile.gltfUrl) {\n tile.gltfArrayBuffer = await fetch(tile.gltfUrl, options);\n tile.gltfByteOffset = 0;\n }\n if (tile.gltfArrayBuffer) {\n // TODO - Should handle byteOffset... However, not used now...\n tile.gltf = await parse(tile.gltfArrayBuffer, GLTFLoader, options, context);\n delete tile.gltfArrayBuffer;\n delete tile.gltfByteOffset;\n delete tile.gltfByteLength;\n }\n }\n}\n\nfunction extractGLTFBufferOrURL(tile, gltfFormat, options) {\n switch (gltfFormat) {\n case GLTF_FORMAT.URI:\n // We need to remove padding from the end of the model URL in case this tile was part of a composite tile.\n // This removes all white space and null characters from the end of the string.\n const gltfUrlBytes = new Uint8Array(tile.gltfArrayBuffer, tile.gltfByteOffset);\n const textDecoder = new TextDecoder();\n const gltfUrl = textDecoder.decode(gltfUrlBytes);\n tile.gltfUrl = gltfUrl.replace(/[\\s\\0]+$/, '');\n delete tile.gltfArrayBuffer;\n delete tile.gltfByteOffset;\n delete tile.gltfByteLength;\n break;\n case GLTF_FORMAT.EMBEDDED:\n break;\n default:\n throw new Error('b3dm: Illegal glTF format field');\n }\n}\n"],"mappings":"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"}
|
|
@@ -1,5 +1,9 @@
|
|
|
1
|
+
|
|
2
|
+
|
|
1
3
|
const SIZEOF_UINT32 = 4;
|
|
2
|
-
|
|
4
|
+
|
|
5
|
+
export function parse3DTileHeaderSync(tile, arrayBuffer) {
|
|
6
|
+
let byteOffset = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 0;
|
|
3
7
|
const view = new DataView(arrayBuffer);
|
|
4
8
|
tile.magic = view.getUint32(byteOffset, true);
|
|
5
9
|
byteOffset += SIZEOF_UINT32;
|
|
@@ -11,7 +15,6 @@ export function parse3DTileHeaderSync(tile, arrayBuffer, byteOffset = 0) {
|
|
|
11
15
|
if (tile.version !== 1) {
|
|
12
16
|
throw new Error("3D Tile Version ".concat(tile.version, " not supported"));
|
|
13
17
|
}
|
|
14
|
-
|
|
15
18
|
return byteOffset;
|
|
16
19
|
}
|
|
17
20
|
//# sourceMappingURL=parse-3d-tile-header.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"
|
|
1
|
+
{"version":3,"file":"parse-3d-tile-header.js","names":["SIZEOF_UINT32","parse3DTileHeaderSync","tile","arrayBuffer","byteOffset","view","DataView","magic","getUint32","version","byteLength","Error"],"sources":["../../../../../src/lib/parsers/helpers/parse-3d-tile-header.ts"],"sourcesContent":["// This file is derived from the Cesium code base under Apache 2 license\n// See LICENSE.md and https://github.com/AnalyticalGraphicsInc/cesium/blob/master/LICENSE.md\n\nconst SIZEOF_UINT32 = 4;\n\n/* PARSE FIXED HEADER:\nPopulates\n magic, // identifies type of tile\n type, // String version of magic\n version,\n byteLength\n */\nexport function parse3DTileHeaderSync(tile, arrayBuffer, byteOffset = 0) {\n const view = new DataView(arrayBuffer);\n\n tile.magic = view.getUint32(byteOffset, true);\n byteOffset += SIZEOF_UINT32;\n\n tile.version = view.getUint32(byteOffset, true);\n byteOffset += SIZEOF_UINT32;\n\n tile.byteLength = view.getUint32(byteOffset, true);\n byteOffset += SIZEOF_UINT32;\n\n // TODO - move version check into each tile parser?\n if (tile.version !== 1) {\n throw new Error(`3D Tile Version ${tile.version} not supported`);\n }\n\n return byteOffset; // Indicates where the parsing ended\n}\n"],"mappings":";;AAGA,MAAMA,aAAa,GAAG,CAAC;;AASvB,OAAO,SAASC,qBAAqB,CAACC,IAAI,EAAEC,WAAW,EAAkB;EAAA,IAAhBC,UAAU,uEAAG,CAAC;EACrE,MAAMC,IAAI,GAAG,IAAIC,QAAQ,CAACH,WAAW,CAAC;EAEtCD,IAAI,CAACK,KAAK,GAAGF,IAAI,CAACG,SAAS,CAACJ,UAAU,EAAE,IAAI,CAAC;EAC7CA,UAAU,IAAIJ,aAAa;EAE3BE,IAAI,CAACO,OAAO,GAAGJ,IAAI,CAACG,SAAS,CAACJ,UAAU,EAAE,IAAI,CAAC;EAC/CA,UAAU,IAAIJ,aAAa;EAE3BE,IAAI,CAACQ,UAAU,GAAGL,IAAI,CAACG,SAAS,CAACJ,UAAU,EAAE,IAAI,CAAC;EAClDA,UAAU,IAAIJ,aAAa;;EAG3B,IAAIE,IAAI,CAACO,OAAO,KAAK,CAAC,EAAE;IACtB,MAAM,IAAIE,KAAK,2BAAoBT,IAAI,CAACO,OAAO,oBAAiB;EAClE;EAEA,OAAOL,UAAU;AACnB"}
|