@loaders.gl/3d-tiles 3.4.0-alpha.4 → 3.4.0-alpha.5
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 +87 -40
- package/dist/es5/lib/parsers/helpers/parse-3d-tile-gltf-view.js +4 -3
- package/dist/es5/lib/parsers/helpers/parse-3d-tile-gltf-view.js.map +1 -1
- package/dist/es5/lib/parsers/helpers/parse-3d-tile-subtree.js.map +1 -1
- package/dist/es5/lib/parsers/parse-3d-tile-gltf.js +2 -1
- package/dist/es5/lib/parsers/parse-3d-tile-gltf.js.map +1 -1
- package/dist/es5/lib/parsers/parse-3d-tile-header.js +1 -1
- package/dist/es5/lib/parsers/parse-3d-tile-header.js.map +1 -1
- package/dist/es5/lib/utils/version.js +1 -1
- package/dist/es5/tiles-3d-loader.js +4 -3
- package/dist/es5/tiles-3d-loader.js.map +1 -1
- package/dist/esm/lib/parsers/helpers/parse-3d-tile-gltf-view.js +2 -1
- package/dist/esm/lib/parsers/helpers/parse-3d-tile-gltf-view.js.map +1 -1
- package/dist/esm/lib/parsers/helpers/parse-3d-tile-subtree.js.map +1 -1
- package/dist/esm/lib/parsers/parse-3d-tile-gltf.js +2 -1
- package/dist/esm/lib/parsers/parse-3d-tile-gltf.js.map +1 -1
- package/dist/esm/lib/parsers/parse-3d-tile-header.js +1 -1
- package/dist/esm/lib/parsers/parse-3d-tile-header.js.map +1 -1
- package/dist/esm/lib/utils/version.js +1 -1
- package/dist/esm/tiles-3d-loader.js +1 -0
- package/dist/esm/tiles-3d-loader.js.map +1 -1
- package/dist/lib/parsers/helpers/parse-3d-tile-gltf-view.d.ts.map +1 -1
- package/dist/lib/parsers/helpers/parse-3d-tile-gltf-view.js +1 -0
- package/dist/lib/parsers/helpers/parse-3d-tile-subtree.js +1 -1
- package/dist/lib/parsers/parse-3d-tile-gltf.d.ts.map +1 -1
- package/dist/lib/parsers/parse-3d-tile-gltf.js +1 -0
- package/dist/lib/parsers/parse-3d-tile-header.js +1 -1
- package/dist/tiles-3d-loader.js +1 -0
- package/package.json +7 -7
- package/src/lib/parsers/helpers/parse-3d-tile-gltf-view.ts +2 -1
- package/src/lib/parsers/helpers/parse-3d-tile-subtree.ts +1 -1
- package/src/lib/parsers/parse-3d-tile-gltf.ts +2 -1
- package/src/lib/parsers/parse-3d-tile-header.ts +1 -1
- package/src/tiles-3d-loader.ts +2 -0
package/dist/dist.min.js
CHANGED
|
@@ -5341,39 +5341,60 @@
|
|
|
5341
5341
|
}
|
|
5342
5342
|
});
|
|
5343
5343
|
|
|
5344
|
+
// ../core/src/lib/utils/url-utils.ts
|
|
5345
|
+
function extractQueryString(url) {
|
|
5346
|
+
const matches3 = url.match(QUERY_STRING_PATTERN);
|
|
5347
|
+
return matches3 && matches3[0];
|
|
5348
|
+
}
|
|
5349
|
+
function stripQueryString(url) {
|
|
5350
|
+
return url.replace(QUERY_STRING_PATTERN, "");
|
|
5351
|
+
}
|
|
5352
|
+
var QUERY_STRING_PATTERN;
|
|
5353
|
+
var init_url_utils = __esm({
|
|
5354
|
+
"../core/src/lib/utils/url-utils.ts"() {
|
|
5355
|
+
QUERY_STRING_PATTERN = /\?.*/;
|
|
5356
|
+
}
|
|
5357
|
+
});
|
|
5358
|
+
|
|
5344
5359
|
// ../core/src/lib/utils/resource-utils.ts
|
|
5345
|
-
function
|
|
5360
|
+
function getResourceUrl(resource) {
|
|
5346
5361
|
if (isResponse(resource)) {
|
|
5347
|
-
const
|
|
5348
|
-
|
|
5349
|
-
return {
|
|
5350
|
-
url,
|
|
5351
|
-
type: parseMIMEType(contentTypeHeader) || parseMIMETypeFromURL(url)
|
|
5352
|
-
};
|
|
5362
|
+
const response = resource;
|
|
5363
|
+
return response.url;
|
|
5353
5364
|
}
|
|
5354
5365
|
if (isBlob(resource)) {
|
|
5355
|
-
|
|
5356
|
-
|
|
5357
|
-
type: resource.type || ""
|
|
5358
|
-
};
|
|
5366
|
+
const blob = resource;
|
|
5367
|
+
return blob.name || "";
|
|
5359
5368
|
}
|
|
5360
5369
|
if (typeof resource === "string") {
|
|
5361
|
-
return
|
|
5362
|
-
url: stripQueryString(resource),
|
|
5363
|
-
type: parseMIMETypeFromURL(resource)
|
|
5364
|
-
};
|
|
5370
|
+
return resource;
|
|
5365
5371
|
}
|
|
5366
|
-
return
|
|
5367
|
-
|
|
5368
|
-
|
|
5369
|
-
|
|
5372
|
+
return "";
|
|
5373
|
+
}
|
|
5374
|
+
function getResourceMIMEType(resource) {
|
|
5375
|
+
if (isResponse(resource)) {
|
|
5376
|
+
const response = resource;
|
|
5377
|
+
const contentTypeHeader = response.headers.get("content-type") || "";
|
|
5378
|
+
const noQueryUrl = stripQueryString(response.url);
|
|
5379
|
+
return parseMIMEType(contentTypeHeader) || parseMIMETypeFromURL(noQueryUrl);
|
|
5380
|
+
}
|
|
5381
|
+
if (isBlob(resource)) {
|
|
5382
|
+
const blob = resource;
|
|
5383
|
+
return blob.type || "";
|
|
5384
|
+
}
|
|
5385
|
+
if (typeof resource === "string") {
|
|
5386
|
+
return parseMIMETypeFromURL(resource);
|
|
5387
|
+
}
|
|
5388
|
+
return "";
|
|
5370
5389
|
}
|
|
5371
5390
|
function getResourceContentLength(resource) {
|
|
5372
5391
|
if (isResponse(resource)) {
|
|
5373
|
-
|
|
5392
|
+
const response = resource;
|
|
5393
|
+
return response.headers["content-length"] || -1;
|
|
5374
5394
|
}
|
|
5375
5395
|
if (isBlob(resource)) {
|
|
5376
|
-
|
|
5396
|
+
const blob = resource;
|
|
5397
|
+
return blob.size;
|
|
5377
5398
|
}
|
|
5378
5399
|
if (typeof resource === "string") {
|
|
5379
5400
|
return resource.length;
|
|
@@ -5386,15 +5407,11 @@
|
|
|
5386
5407
|
}
|
|
5387
5408
|
return -1;
|
|
5388
5409
|
}
|
|
5389
|
-
function stripQueryString(url) {
|
|
5390
|
-
return url.replace(QUERY_STRING_PATTERN, "");
|
|
5391
|
-
}
|
|
5392
|
-
var QUERY_STRING_PATTERN;
|
|
5393
5410
|
var init_resource_utils = __esm({
|
|
5394
5411
|
"../core/src/lib/utils/resource-utils.ts"() {
|
|
5395
5412
|
init_is_type();
|
|
5396
5413
|
init_mime_type_utils();
|
|
5397
|
-
|
|
5414
|
+
init_url_utils();
|
|
5398
5415
|
}
|
|
5399
5416
|
});
|
|
5400
5417
|
|
|
@@ -5408,7 +5425,8 @@
|
|
|
5408
5425
|
if (contentLength >= 0) {
|
|
5409
5426
|
headers["content-length"] = String(contentLength);
|
|
5410
5427
|
}
|
|
5411
|
-
const
|
|
5428
|
+
const url = getResourceUrl(resource);
|
|
5429
|
+
const type = getResourceMIMEType(resource);
|
|
5412
5430
|
if (type) {
|
|
5413
5431
|
headers["content-type"] = type;
|
|
5414
5432
|
}
|
|
@@ -6394,8 +6412,9 @@
|
|
|
6394
6412
|
return loader;
|
|
6395
6413
|
}
|
|
6396
6414
|
function selectLoaderInternal(data, loaders, options, context) {
|
|
6397
|
-
const
|
|
6398
|
-
const
|
|
6415
|
+
const url = getResourceUrl(data);
|
|
6416
|
+
const type = getResourceMIMEType(data);
|
|
6417
|
+
const testUrl = stripQueryString(url) || context?.url;
|
|
6399
6418
|
let loader = null;
|
|
6400
6419
|
let reason = "";
|
|
6401
6420
|
if (options?.mimeType) {
|
|
@@ -6424,7 +6443,8 @@
|
|
|
6424
6443
|
return true;
|
|
6425
6444
|
}
|
|
6426
6445
|
function getNoValidLoaderMessage(data) {
|
|
6427
|
-
const
|
|
6446
|
+
const url = getResourceUrl(data);
|
|
6447
|
+
const type = getResourceMIMEType(data);
|
|
6428
6448
|
let message = "No valid loader found (";
|
|
6429
6449
|
message += url ? `${path_exports.filename(url)}, ` : "no url provided, ";
|
|
6430
6450
|
message += `MIME type: ${type ? `"${type}"` : "not provided"}, `;
|
|
@@ -6543,6 +6563,7 @@
|
|
|
6543
6563
|
init_resource_utils();
|
|
6544
6564
|
init_register_loaders();
|
|
6545
6565
|
init_is_type();
|
|
6566
|
+
init_url_utils();
|
|
6546
6567
|
EXT_PATTERN = /\.([^.]+)$/;
|
|
6547
6568
|
}
|
|
6548
6569
|
});
|
|
@@ -6755,18 +6776,25 @@
|
|
|
6755
6776
|
});
|
|
6756
6777
|
|
|
6757
6778
|
// ../core/src/lib/loader-utils/loader-context.ts
|
|
6758
|
-
function getLoaderContext(context, options,
|
|
6759
|
-
if (
|
|
6760
|
-
return
|
|
6779
|
+
function getLoaderContext(context, options, parentContext) {
|
|
6780
|
+
if (parentContext) {
|
|
6781
|
+
return parentContext;
|
|
6761
6782
|
}
|
|
6762
|
-
const
|
|
6783
|
+
const newContext = {
|
|
6763
6784
|
fetch: getFetchFunction(options, context),
|
|
6764
6785
|
...context
|
|
6765
6786
|
};
|
|
6766
|
-
if (
|
|
6767
|
-
|
|
6787
|
+
if (newContext.url) {
|
|
6788
|
+
const baseUrl = stripQueryString(newContext.url);
|
|
6789
|
+
newContext.baseUrl = baseUrl;
|
|
6790
|
+
newContext.queryString = extractQueryString(newContext.url);
|
|
6791
|
+
newContext.filename = path_exports.filename(baseUrl);
|
|
6792
|
+
newContext.baseUrl = path_exports.dirname(baseUrl);
|
|
6768
6793
|
}
|
|
6769
|
-
|
|
6794
|
+
if (!Array.isArray(newContext.loaders)) {
|
|
6795
|
+
newContext.loaders = null;
|
|
6796
|
+
}
|
|
6797
|
+
return newContext;
|
|
6770
6798
|
}
|
|
6771
6799
|
function getLoadersFromContext(loaders, context) {
|
|
6772
6800
|
if (!context && loaders && !Array.isArray(loaders)) {
|
|
@@ -6785,6 +6813,8 @@
|
|
|
6785
6813
|
var init_loader_context = __esm({
|
|
6786
6814
|
"../core/src/lib/loader-utils/loader-context.ts"() {
|
|
6787
6815
|
init_get_fetch_function();
|
|
6816
|
+
init_url_utils();
|
|
6817
|
+
init_src2();
|
|
6788
6818
|
}
|
|
6789
6819
|
});
|
|
6790
6820
|
|
|
@@ -6798,7 +6828,7 @@
|
|
|
6798
6828
|
}
|
|
6799
6829
|
data = await data;
|
|
6800
6830
|
options = options || {};
|
|
6801
|
-
const
|
|
6831
|
+
const url = getResourceUrl(data);
|
|
6802
6832
|
const typedLoaders = loaders;
|
|
6803
6833
|
const candidateLoaders = getLoadersFromContext(typedLoaders, context);
|
|
6804
6834
|
const loader = await selectLoader(data, candidateLoaders, options);
|
|
@@ -6806,7 +6836,7 @@
|
|
|
6806
6836
|
return null;
|
|
6807
6837
|
}
|
|
6808
6838
|
options = normalizeOptions(options, loader, candidateLoaders, url);
|
|
6809
|
-
context = getLoaderContext({ url, parse, loaders: candidateLoaders }, options, context);
|
|
6839
|
+
context = getLoaderContext({ url, parse, loaders: candidateLoaders }, options, context || null);
|
|
6810
6840
|
return await parseWithLoader(loader, data, options, context);
|
|
6811
6841
|
}
|
|
6812
6842
|
async function parseWithLoader(loader, data, options, context) {
|
|
@@ -10312,6 +10342,19 @@
|
|
|
10312
10342
|
assert8(byteLength >= 0 && byteLength <= bufferView.byteLength);
|
|
10313
10343
|
return { ArrayType, length: length4, byteLength };
|
|
10314
10344
|
}
|
|
10345
|
+
function getMemoryUsageGLTF(gltf) {
|
|
10346
|
+
let { images, bufferViews } = gltf;
|
|
10347
|
+
images = images || [];
|
|
10348
|
+
bufferViews = bufferViews || [];
|
|
10349
|
+
const imageBufferViews = images.map((i2) => i2.bufferView);
|
|
10350
|
+
bufferViews = bufferViews.filter((view) => !imageBufferViews.includes(view));
|
|
10351
|
+
const bufferMemory = bufferViews.reduce((acc, view) => acc + view.byteLength, 0);
|
|
10352
|
+
const pixelCount = images.reduce((acc, image) => {
|
|
10353
|
+
const { width, height } = image.image;
|
|
10354
|
+
return acc + width * height;
|
|
10355
|
+
}, 0);
|
|
10356
|
+
return bufferMemory + Math.ceil(4 * pixelCount * 1.33);
|
|
10357
|
+
}
|
|
10315
10358
|
var TYPES, ARRAY_CONSTRUCTOR_TO_WEBGL_CONSTANT, ARRAY_TO_COMPONENT_TYPE, ATTRIBUTE_TYPE_TO_COMPONENTS, ATTRIBUTE_COMPONENT_TYPE_TO_BYTE_SIZE, ATTRIBUTE_COMPONENT_TYPE_TO_ARRAY;
|
|
10316
10359
|
var init_gltf_utils = __esm({
|
|
10317
10360
|
"../gltf/src/lib/gltf-utils/gltf-utils.ts"() {
|
|
@@ -12557,6 +12600,7 @@
|
|
|
12557
12600
|
var init_src10 = __esm({
|
|
12558
12601
|
"../gltf/src/index.ts"() {
|
|
12559
12602
|
init_gltf_loader();
|
|
12603
|
+
init_gltf_utils();
|
|
12560
12604
|
}
|
|
12561
12605
|
});
|
|
12562
12606
|
|
|
@@ -12588,6 +12632,7 @@
|
|
|
12588
12632
|
}
|
|
12589
12633
|
if (tile.gltfArrayBuffer) {
|
|
12590
12634
|
tile.gltf = await parse5(tile.gltfArrayBuffer, GLTFLoader, options, context);
|
|
12635
|
+
tile.gpuMemoryUsageInBytes = getMemoryUsageGLTF(tile.gltf);
|
|
12591
12636
|
delete tile.gltfArrayBuffer;
|
|
12592
12637
|
delete tile.gltfByteOffset;
|
|
12593
12638
|
delete tile.gltfByteLength;
|
|
@@ -12830,6 +12875,7 @@
|
|
|
12830
12875
|
tile.gltfUpAxis = options["3d-tiles"] && options["3d-tiles"].assetGltfUpAxis ? options["3d-tiles"].assetGltfUpAxis : "Y";
|
|
12831
12876
|
const { parse: parse5 } = context;
|
|
12832
12877
|
tile.gltf = await parse5(arrayBuffer, GLTFLoader, options, context);
|
|
12878
|
+
tile.gpuMemoryUsageInBytes = getMemoryUsageGLTF(tile.gltf);
|
|
12833
12879
|
}
|
|
12834
12880
|
var init_parse_3d_tile_gltf = __esm({
|
|
12835
12881
|
"src/lib/parsers/parse-3d-tile-gltf.ts"() {
|
|
@@ -14410,7 +14456,7 @@
|
|
|
14410
14456
|
if (!tile.contentUrl) {
|
|
14411
14457
|
return TILE_TYPE.EMPTY;
|
|
14412
14458
|
}
|
|
14413
|
-
const contentUrl = tile.contentUrl;
|
|
14459
|
+
const contentUrl = tile.contentUrl.split("?")[0];
|
|
14414
14460
|
const fileExtension = contentUrl.split(".").pop();
|
|
14415
14461
|
switch (fileExtension) {
|
|
14416
14462
|
case "pnts":
|
|
@@ -14578,6 +14624,7 @@
|
|
|
14578
14624
|
const tilesetJson = JSON.parse(new TextDecoder().decode(data));
|
|
14579
14625
|
tilesetJson.loader = options.loader || Tiles3DLoader;
|
|
14580
14626
|
tilesetJson.url = context.url;
|
|
14627
|
+
tilesetJson.queryString = context.queryString;
|
|
14581
14628
|
tilesetJson.basePath = getBaseUri(tilesetJson);
|
|
14582
14629
|
tilesetJson.root = await normalizeTileHeaders(tilesetJson, options);
|
|
14583
14630
|
tilesetJson.type = TILESET_TYPE.TILES3D;
|
|
@@ -43,7 +43,7 @@ function _extractGLTF() {
|
|
|
43
43
|
tile3DOptions = options['3d-tiles'] || {};
|
|
44
44
|
extractGLTFBufferOrURL(tile, gltfFormat, options);
|
|
45
45
|
if (!tile3DOptions.loadGLTF) {
|
|
46
|
-
_context.next =
|
|
46
|
+
_context.next = 17;
|
|
47
47
|
break;
|
|
48
48
|
}
|
|
49
49
|
parse = context.parse, fetch = context.fetch;
|
|
@@ -58,17 +58,18 @@ function _extractGLTF() {
|
|
|
58
58
|
tile.gltfByteOffset = 0;
|
|
59
59
|
case 9:
|
|
60
60
|
if (!tile.gltfArrayBuffer) {
|
|
61
|
-
_context.next =
|
|
61
|
+
_context.next = 17;
|
|
62
62
|
break;
|
|
63
63
|
}
|
|
64
64
|
_context.next = 12;
|
|
65
65
|
return parse(tile.gltfArrayBuffer, _gltf.GLTFLoader, options, context);
|
|
66
66
|
case 12:
|
|
67
67
|
tile.gltf = _context.sent;
|
|
68
|
+
tile.gpuMemoryUsageInBytes = (0, _gltf._getMemoryUsageGLTF)(tile.gltf);
|
|
68
69
|
delete tile.gltfArrayBuffer;
|
|
69
70
|
delete tile.gltfByteOffset;
|
|
70
71
|
delete tile.gltfByteLength;
|
|
71
|
-
case
|
|
72
|
+
case 17:
|
|
72
73
|
case "end":
|
|
73
74
|
return _context.stop();
|
|
74
75
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"parse-3d-tile-gltf-view.js","names":["_gltf","require","_loaderUtils","GLTF_FORMAT","URI","EMBEDDED","exports","parse3DTileGLTFViewSync","tile","arrayBuffer","byteOffset","options","rotateYtoZ","gltfByteLength","byteLength","Error","gltfUpAxis","assetGltfUpAxis","gltfArrayBuffer","sliceArrayBuffer","gltfByteOffset","console","warn","concat","type","extractGLTF","_x","_x2","_x3","_x4","_extractGLTF","apply","arguments","_asyncToGenerator2","default","_regenerator","mark","_callee","gltfFormat","context","tile3DOptions","parse","fetch","wrap","_callee$","_context","prev","next","extractGLTFBufferOrURL","loadGLTF","gltfUrl","sent","GLTFLoader","gltf","stop","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":";;;;;;;;;;;AASA,IAAAA,KAAA,GAAAC,OAAA;AACA,IAAAC,YAAA,GAAAD,OAAA;AAEO,IAAME,WAAW,GAAG;EACzBC,GAAG,EAAE,CAAC;EACNC,QAAQ,EAAE;AACZ,CAAC;AAACC,OAAA,CAAAH,WAAA,GAAAA,WAAA;AAEK,SAASI,uBAAuBA,CAACC,IAAI,EAAEC,WAAW,EAAEC,UAAU,EAAEC,OAAO,EAAE;EAI9EH,IAAI,CAACI,UAAU,GAAG,IAAI;EAGtB,IAAMC,cAAc,GAAGL,IAAI,CAACE,UAAU,GAAGF,IAAI,CAACM,UAAU,GAAGJ,UAAU;EACrE,IAAIG,cAAc,KAAK,CAAC,EAAE;IACxB,MAAM,IAAIE,KAAK,CAAC,0CAA0C,CAAC;EAC7D;EAGAP,IAAI,CAACQ,UAAU,GACbL,OAAO,CAAC,UAAU,CAAC,IAAIA,OAAO,CAAC,UAAU,CAAC,CAACM,eAAe,GACtDN,OAAO,CAAC,UAAU,CAAC,CAACM,eAAe,GACnC,GAAG;EAITT,IAAI,CAACU,eAAe,GAAG,IAAAC,6BAAgB,EAACV,WAAW,EAAEC,UAAU,EAAEG,cAAc,CAAC;EAChFL,IAAI,CAACY,cAAc,GAAG,CAAC;EACvBZ,IAAI,CAACK,cAAc,GAAGA,cAAc;EAEpC,IAAIH,UAAU,GAAG,CAAC,KAAK,CAAC,EAAE,CAI1B,CAAC,MAAM;IAGLW,OAAO,CAACC,IAAI,IAAAC,MAAA,CAAIf,IAAI,CAACgB,IAAI,wDAAqD,CAAC;EACjF;EAGA,OAAOhB,IAAI,CAACE,UAAU,GAAGF,IAAI,CAACM,UAAU;AAC1C;AAAC,SAEqBW,WAAWA,CAAAC,EAAA,EAAAC,GAAA,EAAAC,GAAA,EAAAC,GAAA;EAAA,OAAAC,YAAA,CAAAC,KAAA,OAAAC,SAAA;AAAA;AAAA,SAAAF,aAAA;EAAAA,YAAA,OAAAG,kBAAA,CAAAC,OAAA,EAAAC,YAAA,CAAAD,OAAA,CAAAE,IAAA,CAA1B,SAAAC,QAA2B7B,IAAI,EAAE8B,UAAU,EAAE3B,OAAO,EAAE4B,OAAO;IAAA,IAAAC,aAAA,EAAAC,KAAA,EAAAC,KAAA;IAAA,OAAAP,YAAA,CAAAD,OAAA,CAAAS,IAAA,UAAAC,SAAAC,QAAA;MAAA,kBAAAA,QAAA,CAAAC,IAAA,GAAAD,QAAA,CAAAE,IAAA;QAAA;UAC5DP,aAAa,GAAG7B,OAAO,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;UAE/CqC,sBAAsB,CAACxC,IAAI,EAAE8B,UAAU,EAAE3B,OAAO,CAAC;UAAC,KAE9C6B,aAAa,CAACS,QAAQ;YAAAJ,QAAA,CAAAE,IAAA;YAAA;UAAA;UACjBN,KAAK,GAAWF,OAAO,CAAvBE,KAAK,EAAEC,KAAK,GAAIH,OAAO,CAAhBG,KAAK;UAAA,KACflC,IAAI,CAAC0C,OAAO;YAAAL,QAAA,CAAAE,IAAA;YAAA;UAAA;UAAAF,QAAA,CAAAE,IAAA;UAAA,OACeL,KAAK,CAAClC,IAAI,CAAC0C,OAAO,EAAEvC,OAAO,CAAC;QAAA;UAAzDH,IAAI,CAACU,eAAe,GAAA2B,QAAA,CAAAM,IAAA;UACpB3C,IAAI,CAACY,cAAc,GAAG,CAAC;QAAC;UAAA,KAEtBZ,IAAI,CAACU,eAAe;YAAA2B,QAAA,CAAAE,IAAA;YAAA;UAAA;UAAAF,QAAA,CAAAE,IAAA;UAAA,OAEJN,KAAK,CAACjC,IAAI,CAACU,eAAe,EAAEkC,gBAAU,EAAEzC,OAAO,EAAE4B,OAAO,CAAC;QAAA;UAA3E/B,IAAI,CAAC6C,IAAI,GAAAR,QAAA,CAAAM,IAAA;
|
|
1
|
+
{"version":3,"file":"parse-3d-tile-gltf-view.js","names":["_gltf","require","_loaderUtils","GLTF_FORMAT","URI","EMBEDDED","exports","parse3DTileGLTFViewSync","tile","arrayBuffer","byteOffset","options","rotateYtoZ","gltfByteLength","byteLength","Error","gltfUpAxis","assetGltfUpAxis","gltfArrayBuffer","sliceArrayBuffer","gltfByteOffset","console","warn","concat","type","extractGLTF","_x","_x2","_x3","_x4","_extractGLTF","apply","arguments","_asyncToGenerator2","default","_regenerator","mark","_callee","gltfFormat","context","tile3DOptions","parse","fetch","wrap","_callee$","_context","prev","next","extractGLTFBufferOrURL","loadGLTF","gltfUrl","sent","GLTFLoader","gltf","gpuMemoryUsageInBytes","_getMemoryUsageGLTF","stop","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 {_getMemoryUsageGLTF, 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 tile.gpuMemoryUsageInBytes = _getMemoryUsageGLTF(tile.gltf);\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 +1 @@
|
|
|
1
|
-
{"version":3,"file":"parse-3d-tile-subtree.js","names":["SUBTREE_FILE_MAGIC","SUBTREE_FILE_VERSION","parse3DTilesSubtree","_x","_x2","_x3","_parse3DTilesSubtree","apply","arguments","_asyncToGenerator2","default","_regenerator","mark","_callee","data","options","context","magic","version","jsonByteLength","stringAttribute","textDecoder","string","subtree","binaryByteLength","internalBinaryBuffer","wrap","_callee$","_context","prev","next","Uint32Array","slice","Error","parseUint64Value","Uint8Array","TextDecoder","decode","JSON","parse","ArrayBuffer","tileAvailability","getExplicitBitstream","explicitBitstream","sent","contentAvailability","childSubtreeAvailability","abrupt","stop","resolveBufferUri","bitstreamRelativeUri","basePath","hasProtocol","startsWith","resolvedUri","URL","decodeURI","toString","basePathWithProtocol","concat","host","pathname","_x4","_x5","_x6","_x7","_getExplicitBitstream","_callee2","name","bufferViewIndex","bufferView","buffer","bufferUri","response","_callee2$","_context2","bufferViews","buffers","url","fetch","uri","arrayBuffer","byteOffset","byteLength","dataView","DataView","left","getUint32","right","Math","pow"],"sources":["../../../../../src/lib/parsers/helpers/parse-3d-tile-subtree.ts"],"sourcesContent":["import type {Subtree, ExplicitBitstream} from '../../../types';\nimport type {LoaderContext, LoaderOptions} from '@loaders.gl/loader-utils';\n\nconst SUBTREE_FILE_MAGIC = 0x74627573;\nconst SUBTREE_FILE_VERSION = 1;\n\n/**\n * Parse subtree file\n * Spec - https://github.com/CesiumGS/3d-tiles/tree/main/extensions/3DTILES_implicit_tiling#subtree-file-format\n * @param data\n * @returns\n */\n// eslint-disable-next-line max-statements\nexport default async function parse3DTilesSubtree(\n data: ArrayBuffer,\n options: LoaderOptions | undefined,\n context: LoaderContext | undefined\n): Promise<Subtree> {\n const magic = new Uint32Array(data.slice(0, 4));\n\n if (magic[0] !== SUBTREE_FILE_MAGIC) {\n throw new Error('Wrong subtree file magic number');\n }\n\n const version = new Uint32Array(data.slice(4, 8));\n\n if (version[0] !== SUBTREE_FILE_VERSION) {\n throw new Error('Wrong subtree file verson, must be 1');\n }\n\n const jsonByteLength = parseUint64Value(data.slice(8, 16));\n const stringAttribute = new Uint8Array(data, 24, jsonByteLength);\n\n const textDecoder = new TextDecoder('utf8');\n const string = textDecoder.decode(stringAttribute);\n const subtree = JSON.parse(string);\n\n const binaryByteLength = parseUint64Value(data.slice(16, 24));\n let internalBinaryBuffer = new ArrayBuffer(0);\n\n if (binaryByteLength) {\n internalBinaryBuffer = data.slice(24 + jsonByteLength);\n }\n\n if ('bufferView' in subtree.tileAvailability) {\n subtree.tileAvailability.explicitBitstream = await getExplicitBitstream(\n subtree,\n 'tileAvailability',\n internalBinaryBuffer,\n context\n );\n }\n\n if ('bufferView' in subtree.contentAvailability) {\n subtree.contentAvailability.explicitBitstream = await getExplicitBitstream(\n subtree,\n 'contentAvailability',\n internalBinaryBuffer,\n context\n );\n }\n\n if ('bufferView' in subtree.childSubtreeAvailability) {\n subtree.childSubtreeAvailability.explicitBitstream = await getExplicitBitstream(\n subtree,\n 'childSubtreeAvailability',\n internalBinaryBuffer,\n context\n );\n }\n\n return subtree;\n}\n\n/**\n * Get url for bitstream downloading\n * @param bitstreamRelativeUri\n * @param baseUri\n * @returns\n */\nfunction resolveBufferUri(bitstreamRelativeUri: string, basePath: string): string {\n const hasProtocol = basePath.startsWith('http');\n\n if (hasProtocol) {\n const resolvedUri = new URL(bitstreamRelativeUri, basePath);\n return decodeURI(resolvedUri.toString());\n }\n\n /**\n * Adding http protocol only for new URL constructor usage.\n * It allows to resolve relative paths like ../../example with basePath.\n */\n const basePathWithProtocol = `http://${basePath}`;\n const resolvedUri = new URL(bitstreamRelativeUri, basePathWithProtocol);\n /**\n * Drop protocol and use just relative path.\n */\n return `/${resolvedUri.host}${resolvedUri.pathname}`;\n}\n\n/**\n * Get explicit bitstream for subtree availability data.\n * @param subtree\n * @param name\n * @param internalBinaryBuffer\n */\nasync function getExplicitBitstream(\n subtree: Subtree,\n name: string,\n internalBinaryBuffer: ArrayBuffer,\n context: LoaderContext | undefined\n): Promise<ExplicitBitstream> {\n const bufferViewIndex = subtree[name].bufferView;\n const bufferView = subtree.bufferViews[bufferViewIndex];\n const buffer = subtree.buffers[bufferView.buffer];\n\n if (!context?.url || !context.fetch) {\n throw new Error('Url is not provided');\n }\n\n if (!context.fetch) {\n throw new Error('fetch is not provided');\n }\n\n // External bitstream loading\n if (buffer.uri) {\n const bufferUri = resolveBufferUri(buffer.uri, context?.url);\n const response = await context.fetch(bufferUri);\n const data = await response.arrayBuffer();\n // Return view of bitstream.\n return new Uint8Array(data, bufferView.byteOffset, bufferView.byteLength);\n }\n // Return view of bitstream.\n return new Uint8Array(internalBinaryBuffer, bufferView.byteOffset, bufferView.byteLength);\n}\n\n/**\n * Parse buffer to return uint64 value\n * @param buffer\n * @returns 64-bit value until precision is lost after Number.MAX_SAFE_INTEGER\n */\nfunction parseUint64Value(buffer: ArrayBuffer): number {\n const dataView = new DataView(buffer);\n const left = dataView.getUint32(0, true);\n const right = dataView.getUint32(4, true);\n // combine the two 32-bit values\n return left + 2 ** 32 * right;\n}\n"],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"parse-3d-tile-subtree.js","names":["SUBTREE_FILE_MAGIC","SUBTREE_FILE_VERSION","parse3DTilesSubtree","_x","_x2","_x3","_parse3DTilesSubtree","apply","arguments","_asyncToGenerator2","default","_regenerator","mark","_callee","data","options","context","magic","version","jsonByteLength","stringAttribute","textDecoder","string","subtree","binaryByteLength","internalBinaryBuffer","wrap","_callee$","_context","prev","next","Uint32Array","slice","Error","parseUint64Value","Uint8Array","TextDecoder","decode","JSON","parse","ArrayBuffer","tileAvailability","getExplicitBitstream","explicitBitstream","sent","contentAvailability","childSubtreeAvailability","abrupt","stop","resolveBufferUri","bitstreamRelativeUri","basePath","hasProtocol","startsWith","resolvedUri","URL","decodeURI","toString","basePathWithProtocol","concat","host","pathname","_x4","_x5","_x6","_x7","_getExplicitBitstream","_callee2","name","bufferViewIndex","bufferView","buffer","bufferUri","response","_callee2$","_context2","bufferViews","buffers","url","fetch","uri","arrayBuffer","byteOffset","byteLength","dataView","DataView","left","getUint32","right","Math","pow"],"sources":["../../../../../src/lib/parsers/helpers/parse-3d-tile-subtree.ts"],"sourcesContent":["import type {Subtree, ExplicitBitstream} from '../../../types';\nimport type {LoaderContext, LoaderOptions} from '@loaders.gl/loader-utils';\n\nconst SUBTREE_FILE_MAGIC = 0x74627573;\nconst SUBTREE_FILE_VERSION = 1;\n\n/**\n * Parse subtree file\n * Spec - https://github.com/CesiumGS/3d-tiles/tree/main/extensions/3DTILES_implicit_tiling#subtree-file-format\n * @param data\n * @returns\n */\n// eslint-disable-next-line max-statements\nexport default async function parse3DTilesSubtree(\n data: ArrayBuffer,\n options: LoaderOptions | undefined,\n context: LoaderContext | undefined\n): Promise<Subtree> {\n const magic = new Uint32Array(data.slice(0, 4));\n\n if (magic[0] !== SUBTREE_FILE_MAGIC) {\n throw new Error('Wrong subtree file magic number');\n }\n\n const version = new Uint32Array(data.slice(4, 8));\n\n if (version[0] !== SUBTREE_FILE_VERSION) {\n throw new Error('Wrong subtree file verson, must be 1');\n }\n\n const jsonByteLength = parseUint64Value(data.slice(8, 16));\n const stringAttribute = new Uint8Array(data, 24, jsonByteLength);\n\n const textDecoder = new TextDecoder('utf8');\n const string = textDecoder.decode(stringAttribute);\n const subtree = JSON.parse(string);\n\n const binaryByteLength = parseUint64Value(data.slice(16, 24));\n let internalBinaryBuffer = new ArrayBuffer(0);\n\n if (binaryByteLength) {\n internalBinaryBuffer = data.slice(24 + jsonByteLength);\n }\n\n if ('bufferView' in subtree.tileAvailability) {\n subtree.tileAvailability.explicitBitstream = await getExplicitBitstream(\n subtree,\n 'tileAvailability',\n internalBinaryBuffer,\n context\n );\n }\n\n if ('bufferView' in subtree.contentAvailability) {\n subtree.contentAvailability.explicitBitstream = await getExplicitBitstream(\n subtree,\n 'contentAvailability',\n internalBinaryBuffer,\n context\n );\n }\n\n if ('bufferView' in subtree.childSubtreeAvailability) {\n subtree.childSubtreeAvailability.explicitBitstream = await getExplicitBitstream(\n subtree,\n 'childSubtreeAvailability',\n internalBinaryBuffer,\n context\n );\n }\n\n return subtree;\n}\n\n/**\n * Get url for bitstream downloading\n * @param bitstreamRelativeUri\n * @param basePath\n * @returns\n */\nfunction resolveBufferUri(bitstreamRelativeUri: string, basePath: string): string {\n const hasProtocol = basePath.startsWith('http');\n\n if (hasProtocol) {\n const resolvedUri = new URL(bitstreamRelativeUri, basePath);\n return decodeURI(resolvedUri.toString());\n }\n\n /**\n * Adding http protocol only for new URL constructor usage.\n * It allows to resolve relative paths like ../../example with basePath.\n */\n const basePathWithProtocol = `http://${basePath}`;\n const resolvedUri = new URL(bitstreamRelativeUri, basePathWithProtocol);\n /**\n * Drop protocol and use just relative path.\n */\n return `/${resolvedUri.host}${resolvedUri.pathname}`;\n}\n\n/**\n * Get explicit bitstream for subtree availability data.\n * @param subtree\n * @param name\n * @param internalBinaryBuffer\n */\nasync function getExplicitBitstream(\n subtree: Subtree,\n name: string,\n internalBinaryBuffer: ArrayBuffer,\n context: LoaderContext | undefined\n): Promise<ExplicitBitstream> {\n const bufferViewIndex = subtree[name].bufferView;\n const bufferView = subtree.bufferViews[bufferViewIndex];\n const buffer = subtree.buffers[bufferView.buffer];\n\n if (!context?.url || !context.fetch) {\n throw new Error('Url is not provided');\n }\n\n if (!context.fetch) {\n throw new Error('fetch is not provided');\n }\n\n // External bitstream loading\n if (buffer.uri) {\n const bufferUri = resolveBufferUri(buffer.uri, context?.url);\n const response = await context.fetch(bufferUri);\n const data = await response.arrayBuffer();\n // Return view of bitstream.\n return new Uint8Array(data, bufferView.byteOffset, bufferView.byteLength);\n }\n // Return view of bitstream.\n return new Uint8Array(internalBinaryBuffer, bufferView.byteOffset, bufferView.byteLength);\n}\n\n/**\n * Parse buffer to return uint64 value\n * @param buffer\n * @returns 64-bit value until precision is lost after Number.MAX_SAFE_INTEGER\n */\nfunction parseUint64Value(buffer: ArrayBuffer): number {\n const dataView = new DataView(buffer);\n const left = dataView.getUint32(0, true);\n const right = dataView.getUint32(4, true);\n // combine the two 32-bit values\n return left + 2 ** 32 * right;\n}\n"],"mappings":"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"}
|
|
@@ -24,7 +24,8 @@ function _parseGltf3DTile() {
|
|
|
24
24
|
return parse(arrayBuffer, _gltf.GLTFLoader, options, context);
|
|
25
25
|
case 5:
|
|
26
26
|
tile.gltf = _context.sent;
|
|
27
|
-
|
|
27
|
+
tile.gpuMemoryUsageInBytes = (0, _gltf._getMemoryUsageGLTF)(tile.gltf);
|
|
28
|
+
case 7:
|
|
28
29
|
case "end":
|
|
29
30
|
return _context.stop();
|
|
30
31
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"parse-3d-tile-gltf.js","names":["_gltf","require","parseGltf3DTile","_x","_x2","_x3","_x4","_parseGltf3DTile","apply","arguments","_asyncToGenerator2","default","_regenerator","mark","_callee","tile","arrayBuffer","options","context","parse","wrap","_callee$","_context","prev","next","rotateYtoZ","gltfUpAxis","assetGltfUpAxis","GLTFLoader","gltf","sent","stop"],"sources":["../../../../src/lib/parsers/parse-3d-tile-gltf.ts"],"sourcesContent":["import {GLTFLoader} from '@loaders.gl/gltf';\n\nexport async function parseGltf3DTile(tile, arrayBuffer, options, context) {\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 // Save gltf up axis\n tile.gltfUpAxis =\n options['3d-tiles'] && options['3d-tiles'].assetGltfUpAxis\n ? options['3d-tiles'].assetGltfUpAxis\n : 'Y';\n\n const {parse} = context;\n tile.gltf = await parse(arrayBuffer, GLTFLoader, options, context);\n}\n"],"mappings":";;;;;;;;;AAAA,IAAAA,KAAA,GAAAC,OAAA;
|
|
1
|
+
{"version":3,"file":"parse-3d-tile-gltf.js","names":["_gltf","require","parseGltf3DTile","_x","_x2","_x3","_x4","_parseGltf3DTile","apply","arguments","_asyncToGenerator2","default","_regenerator","mark","_callee","tile","arrayBuffer","options","context","parse","wrap","_callee$","_context","prev","next","rotateYtoZ","gltfUpAxis","assetGltfUpAxis","GLTFLoader","gltf","sent","gpuMemoryUsageInBytes","_getMemoryUsageGLTF","stop"],"sources":["../../../../src/lib/parsers/parse-3d-tile-gltf.ts"],"sourcesContent":["import {_getMemoryUsageGLTF, GLTFLoader} from '@loaders.gl/gltf';\n\nexport async function parseGltf3DTile(tile, arrayBuffer, options, context) {\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 // Save gltf up axis\n tile.gltfUpAxis =\n options['3d-tiles'] && options['3d-tiles'].assetGltfUpAxis\n ? options['3d-tiles'].assetGltfUpAxis\n : 'Y';\n\n const {parse} = context;\n tile.gltf = await parse(arrayBuffer, GLTFLoader, options, context);\n tile.gpuMemoryUsageInBytes = _getMemoryUsageGLTF(tile.gltf);\n}\n"],"mappings":";;;;;;;;;AAAA,IAAAA,KAAA,GAAAC,OAAA;AAAiE,SAE3CC,eAAeA,CAAAC,EAAA,EAAAC,GAAA,EAAAC,GAAA,EAAAC,GAAA;EAAA,OAAAC,gBAAA,CAAAC,KAAA,OAAAC,SAAA;AAAA;AAAA,SAAAF,iBAAA;EAAAA,gBAAA,OAAAG,kBAAA,CAAAC,OAAA,EAAAC,YAAA,CAAAD,OAAA,CAAAE,IAAA,CAA9B,SAAAC,QAA+BC,IAAI,EAAEC,WAAW,EAAEC,OAAO,EAAEC,OAAO;IAAA,IAAAC,KAAA;IAAA,OAAAP,YAAA,CAAAD,OAAA,CAAAS,IAAA,UAAAC,SAAAC,QAAA;MAAA,kBAAAA,QAAA,CAAAC,IAAA,GAAAD,QAAA,CAAAE,IAAA;QAAA;UAIvET,IAAI,CAACU,UAAU,GAAG,IAAI;UAEtBV,IAAI,CAACW,UAAU,GACbT,OAAO,CAAC,UAAU,CAAC,IAAIA,OAAO,CAAC,UAAU,CAAC,CAACU,eAAe,GACtDV,OAAO,CAAC,UAAU,CAAC,CAACU,eAAe,GACnC,GAAG;UAEFR,KAAK,GAAID,OAAO,CAAhBC,KAAK;UAAAG,QAAA,CAAAE,IAAA;UAAA,OACML,KAAK,CAACH,WAAW,EAAEY,gBAAU,EAAEX,OAAO,EAAEC,OAAO,CAAC;QAAA;UAAlEH,IAAI,CAACc,IAAI,GAAAP,QAAA,CAAAQ,IAAA;UACTf,IAAI,CAACgB,qBAAqB,GAAG,IAAAC,yBAAmB,EAACjB,IAAI,CAACc,IAAI,CAAC;QAAC;QAAA;UAAA,OAAAP,QAAA,CAAAW,IAAA;MAAA;IAAA,GAAAnB,OAAA;EAAA,CAC7D;EAAA,OAAAP,gBAAA,CAAAC,KAAA,OAAAC,SAAA;AAAA"}
|
|
@@ -22,7 +22,7 @@ function getTileType(tile) {
|
|
|
22
22
|
if (!tile.contentUrl) {
|
|
23
23
|
return _tiles.TILE_TYPE.EMPTY;
|
|
24
24
|
}
|
|
25
|
-
var contentUrl = tile.contentUrl;
|
|
25
|
+
var contentUrl = tile.contentUrl.split('?')[0];
|
|
26
26
|
var fileExtension = contentUrl.split('.').pop();
|
|
27
27
|
switch (fileExtension) {
|
|
28
28
|
case 'pnts':
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"parse-3d-tile-header.js","names":["_tile3dSubtreeLoader","require","_core","_tiles","_parse3dImplicitTiles","_s2CornersToObb","_createForOfIteratorHelper","o","allowArrayLike","it","Symbol","iterator","Array","isArray","_unsupportedIterableToArray","length","i","F","s","n","done","value","e","_e","f","TypeError","normalCompletion","didErr","err","call","step","next","_e2","return","minLen","_arrayLikeToArray","Object","prototype","toString","slice","constructor","name","from","test","arr","len","arr2","getTileType","tile","contentUrl","TILE_TYPE","EMPTY","fileExtension","split","pop","POINTCLOUD","SCENEGRAPH","getRefine","refine","TILE_REFINEMENT","REPLACE","ADD","resolveUri","uri","basePath","urlSchemeRegex","url","URL","concat","decodeURI","startsWith","normalizeTileData","options","content","contentUri","id","lodMetricType","LOD_METRIC_TYPE","GEOMETRIC_ERROR","lodMetricValue","geometricError","transformMatrix","transform","type","normalizeTileHeaders","_x","_x2","_normalizeTileHeaders","apply","arguments","_asyncToGenerator2","default","_regenerator","mark","_callee","tileset","root","rootImplicitTilingExtension","stack","children","_iterator","_step","childHeader","childImplicitTilingExtension","wrap","_callee$","_context","prev","getImplicitTilingExtensionData","normalizeImplicitTileHeaders","sent","push","t0","finish","abrupt","stop","_x3","_x4","_x5","_x6","_normalizeImplicitTileHeaders","_callee2","implicitTilingExtension","_tileset$root","_tile$boundingVolume$","subdivisionScheme","maximumLevel","subtreeLevels","subtreesUriTemplate","replacedUrlTemplate","subtreeUrl","subtree","contentUrlTemplate","rootLodMetricValue","s2VolumeInfo","box","s2VolumeBox","rootBoundingVolume","implicitOptions","_callee2$","_context2","subtrees","replaceContentUrlTemplate","load","Tile3DSubtreeLoader","boundingVolume","extensions","convertS2BoundingVolumetoOBB","normalizeImplicitTileData","_x7","_x8","_x9","_normalizeImplicitTileData","_callee3","rootSubtree","_yield$parseImplicitT","_callee3$","_context3","parseImplicitTiles","replace","_tile$extensions","implicitTiling"],"sources":["../../../../src/lib/parsers/parse-3d-tile-header.ts"],"sourcesContent":["import type {LoaderOptions} from '@loaders.gl/loader-utils';\nimport {Tile3DSubtreeLoader} from '../../tile-3d-subtree-loader';\nimport {load} from '@loaders.gl/core';\nimport {Tileset3D, LOD_METRIC_TYPE, TILE_REFINEMENT, TILE_TYPE, Tile3D} from '@loaders.gl/tiles';\nimport {ImplicitTilingExtension, Subtree} from '../../types';\nimport type {S2VolumeBox} from './helpers/parse-3d-implicit-tiles';\nimport {parseImplicitTiles, replaceContentUrlTemplate} from './helpers/parse-3d-implicit-tiles';\nimport type {S2VolumeInfo} from '../utils/obb/s2-corners-to-obb';\nimport {convertS2BoundingVolumetoOBB} from '../utils/obb/s2-corners-to-obb';\n\nfunction getTileType(tile) {\n if (!tile.contentUrl) {\n return TILE_TYPE.EMPTY;\n }\n\n const contentUrl = tile.contentUrl;\n const fileExtension = contentUrl.split('.').pop();\n switch (fileExtension) {\n case 'pnts':\n return TILE_TYPE.POINTCLOUD;\n case 'i3dm':\n case 'b3dm':\n case 'glb':\n case 'gltf':\n return TILE_TYPE.SCENEGRAPH;\n default:\n return fileExtension;\n }\n}\n\nfunction getRefine(refine) {\n switch (refine) {\n case 'REPLACE':\n case 'replace':\n return TILE_REFINEMENT.REPLACE;\n case 'ADD':\n case 'add':\n return TILE_REFINEMENT.ADD;\n default:\n return refine;\n }\n}\n\nfunction resolveUri(uri, basePath) {\n // url scheme per RFC3986\n const urlSchemeRegex = /^[a-z][0-9a-z+.-]*:/i;\n\n if (urlSchemeRegex.test(basePath)) {\n const url = new URL(uri, `${basePath}/`);\n return decodeURI(url.toString());\n } else if (uri.startsWith('/')) {\n return uri;\n }\n\n return `${basePath}/${uri}`;\n}\n\nexport function normalizeTileData(tile, options) {\n if (!tile) {\n return null;\n }\n if (tile.content) {\n const contentUri = tile.content.uri || tile.content.url;\n tile.contentUrl = resolveUri(contentUri, options.basePath);\n }\n tile.id = tile.contentUrl;\n tile.lodMetricType = LOD_METRIC_TYPE.GEOMETRIC_ERROR;\n tile.lodMetricValue = tile.geometricError;\n tile.transformMatrix = tile.transform;\n tile.type = getTileType(tile);\n tile.refine = getRefine(tile.refine);\n\n return tile;\n}\n\n// normalize tile headers\nexport async function normalizeTileHeaders(\n tileset: Tileset3D,\n options: LoaderOptions\n): Promise<Tileset3D> {\n const basePath = tileset.basePath;\n let root: Tileset3D;\n\n const rootImplicitTilingExtension = getImplicitTilingExtensionData(tileset?.root);\n if (rootImplicitTilingExtension && tileset.root) {\n root = await normalizeImplicitTileHeaders(\n tileset.root,\n tileset,\n rootImplicitTilingExtension,\n options\n );\n } else {\n root = normalizeTileData(tileset.root, tileset);\n }\n\n const stack: any[] = [];\n stack.push(root);\n\n while (stack.length > 0) {\n const tile = stack.pop() || {};\n const children = tile.children || [];\n for (let childHeader of children) {\n const childImplicitTilingExtension = getImplicitTilingExtensionData(childHeader);\n if (childImplicitTilingExtension) {\n childHeader = await normalizeImplicitTileHeaders(\n childHeader,\n tileset,\n childImplicitTilingExtension,\n options\n );\n } else {\n normalizeTileData(childHeader, {basePath});\n }\n\n stack.push(childHeader);\n }\n }\n\n return root;\n}\n\n/**\n * Do normalisation of implicit tile headers\n * TODO Check if Tile3D class can be a return type here.\n * @param tileset\n */\nexport async function normalizeImplicitTileHeaders(\n tile: Tile3D,\n tileset: Tileset3D,\n implicitTilingExtension: ImplicitTilingExtension,\n options: LoaderOptions\n) {\n const basePath = tileset.basePath;\n const {\n subdivisionScheme,\n maximumLevel,\n subtreeLevels,\n subtrees: {uri: subtreesUriTemplate}\n } = implicitTilingExtension;\n const replacedUrlTemplate = replaceContentUrlTemplate(subtreesUriTemplate, 0, 0, 0, 0);\n const subtreeUrl = resolveUri(replacedUrlTemplate, basePath);\n const subtree = await load(subtreeUrl, Tile3DSubtreeLoader, options);\n const contentUrlTemplate = resolveUri(tile.content.uri, basePath);\n const refine = tileset?.root?.refine;\n // @ts-ignore\n const rootLodMetricValue = tile.geometricError;\n\n // Replace tile.boundingVolume with the the bounding volume specified by the extensions['3DTILES_bounding_volume_S2']\n const s2VolumeInfo: S2VolumeInfo = tile.boundingVolume.extensions?.['3DTILES_bounding_volume_S2'];\n if (s2VolumeInfo) {\n const box = convertS2BoundingVolumetoOBB(s2VolumeInfo);\n const s2VolumeBox: S2VolumeBox = {box, s2VolumeInfo};\n tile.boundingVolume = s2VolumeBox;\n }\n\n const rootBoundingVolume = tile.boundingVolume;\n\n const implicitOptions = {\n contentUrlTemplate,\n subtreesUriTemplate,\n subdivisionScheme,\n subtreeLevels,\n maximumLevel,\n refine,\n basePath,\n lodMetricType: LOD_METRIC_TYPE.GEOMETRIC_ERROR,\n rootLodMetricValue,\n rootBoundingVolume,\n getTileType,\n getRefine\n };\n\n return await normalizeImplicitTileData(tile, subtree, implicitOptions);\n}\n\n/**\n * Do implicit data normalisation to create hierarchical tile structure\n * @param tile\n * @param rootSubtree\n * @param options\n * @returns\n */\nexport async function normalizeImplicitTileData(tile, rootSubtree: Subtree, options: any) {\n if (!tile) {\n return null;\n }\n\n tile.lodMetricType = LOD_METRIC_TYPE.GEOMETRIC_ERROR;\n tile.lodMetricValue = tile.geometricError;\n tile.transformMatrix = tile.transform;\n\n const {children, contentUrl} = await parseImplicitTiles({\n subtree: rootSubtree,\n options,\n s2VolumeBox: tile\n });\n\n if (contentUrl) {\n tile.contentUrl = contentUrl;\n tile.content = {uri: contentUrl.replace(`${options.basePath}/`, '')};\n }\n\n tile.refine = getRefine(tile.refine);\n tile.type = getTileType(tile);\n tile.children = children;\n tile.id = tile.contentUrl;\n\n return tile;\n}\n\n/**\n * Implicit Tiling data can be in 3DTILES_implicit_tiling for 3DTiles v.Next or directly in implicitTiling object for 3DTiles v1.1.\n * Spec 3DTiles v.Next - https://github.com/CesiumGS/3d-tiles/tree/main/extensions/3DTILES_implicit_tiling\n * Spec 3DTiles v.1.1 - https://github.com/CesiumGS/3d-tiles/tree/draft-1.1/specification/ImplicitTiling\n * @param tile\n * @returns\n */\nfunction getImplicitTilingExtensionData(tile: Tile3D | null): ImplicitTilingExtension {\n return tile?.extensions?.['3DTILES_implicit_tiling'] || tile?.implicitTiling;\n}\n"],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"parse-3d-tile-header.js","names":["_tile3dSubtreeLoader","require","_core","_tiles","_parse3dImplicitTiles","_s2CornersToObb","_createForOfIteratorHelper","o","allowArrayLike","it","Symbol","iterator","Array","isArray","_unsupportedIterableToArray","length","i","F","s","n","done","value","e","_e","f","TypeError","normalCompletion","didErr","err","call","step","next","_e2","return","minLen","_arrayLikeToArray","Object","prototype","toString","slice","constructor","name","from","test","arr","len","arr2","getTileType","tile","contentUrl","TILE_TYPE","EMPTY","split","fileExtension","pop","POINTCLOUD","SCENEGRAPH","getRefine","refine","TILE_REFINEMENT","REPLACE","ADD","resolveUri","uri","basePath","urlSchemeRegex","url","URL","concat","decodeURI","startsWith","normalizeTileData","options","content","contentUri","id","lodMetricType","LOD_METRIC_TYPE","GEOMETRIC_ERROR","lodMetricValue","geometricError","transformMatrix","transform","type","normalizeTileHeaders","_x","_x2","_normalizeTileHeaders","apply","arguments","_asyncToGenerator2","default","_regenerator","mark","_callee","tileset","root","rootImplicitTilingExtension","stack","children","_iterator","_step","childHeader","childImplicitTilingExtension","wrap","_callee$","_context","prev","getImplicitTilingExtensionData","normalizeImplicitTileHeaders","sent","push","t0","finish","abrupt","stop","_x3","_x4","_x5","_x6","_normalizeImplicitTileHeaders","_callee2","implicitTilingExtension","_tileset$root","_tile$boundingVolume$","subdivisionScheme","maximumLevel","subtreeLevels","subtreesUriTemplate","replacedUrlTemplate","subtreeUrl","subtree","contentUrlTemplate","rootLodMetricValue","s2VolumeInfo","box","s2VolumeBox","rootBoundingVolume","implicitOptions","_callee2$","_context2","subtrees","replaceContentUrlTemplate","load","Tile3DSubtreeLoader","boundingVolume","extensions","convertS2BoundingVolumetoOBB","normalizeImplicitTileData","_x7","_x8","_x9","_normalizeImplicitTileData","_callee3","rootSubtree","_yield$parseImplicitT","_callee3$","_context3","parseImplicitTiles","replace","_tile$extensions","implicitTiling"],"sources":["../../../../src/lib/parsers/parse-3d-tile-header.ts"],"sourcesContent":["import type {LoaderOptions} from '@loaders.gl/loader-utils';\nimport {Tile3DSubtreeLoader} from '../../tile-3d-subtree-loader';\nimport {load} from '@loaders.gl/core';\nimport {Tileset3D, LOD_METRIC_TYPE, TILE_REFINEMENT, TILE_TYPE, Tile3D} from '@loaders.gl/tiles';\nimport {ImplicitTilingExtension, Subtree} from '../../types';\nimport type {S2VolumeBox} from './helpers/parse-3d-implicit-tiles';\nimport {parseImplicitTiles, replaceContentUrlTemplate} from './helpers/parse-3d-implicit-tiles';\nimport type {S2VolumeInfo} from '../utils/obb/s2-corners-to-obb';\nimport {convertS2BoundingVolumetoOBB} from '../utils/obb/s2-corners-to-obb';\n\nfunction getTileType(tile) {\n if (!tile.contentUrl) {\n return TILE_TYPE.EMPTY;\n }\n\n const contentUrl = tile.contentUrl.split('?')[0]; // Discard query string\n const fileExtension = contentUrl.split('.').pop();\n switch (fileExtension) {\n case 'pnts':\n return TILE_TYPE.POINTCLOUD;\n case 'i3dm':\n case 'b3dm':\n case 'glb':\n case 'gltf':\n return TILE_TYPE.SCENEGRAPH;\n default:\n return fileExtension;\n }\n}\n\nfunction getRefine(refine) {\n switch (refine) {\n case 'REPLACE':\n case 'replace':\n return TILE_REFINEMENT.REPLACE;\n case 'ADD':\n case 'add':\n return TILE_REFINEMENT.ADD;\n default:\n return refine;\n }\n}\n\nfunction resolveUri(uri, basePath) {\n // url scheme per RFC3986\n const urlSchemeRegex = /^[a-z][0-9a-z+.-]*:/i;\n\n if (urlSchemeRegex.test(basePath)) {\n const url = new URL(uri, `${basePath}/`);\n return decodeURI(url.toString());\n } else if (uri.startsWith('/')) {\n return uri;\n }\n\n return `${basePath}/${uri}`;\n}\n\nexport function normalizeTileData(tile, options) {\n if (!tile) {\n return null;\n }\n if (tile.content) {\n const contentUri = tile.content.uri || tile.content.url;\n tile.contentUrl = resolveUri(contentUri, options.basePath);\n }\n tile.id = tile.contentUrl;\n tile.lodMetricType = LOD_METRIC_TYPE.GEOMETRIC_ERROR;\n tile.lodMetricValue = tile.geometricError;\n tile.transformMatrix = tile.transform;\n tile.type = getTileType(tile);\n tile.refine = getRefine(tile.refine);\n\n return tile;\n}\n\n// normalize tile headers\nexport async function normalizeTileHeaders(\n tileset: Tileset3D,\n options: LoaderOptions\n): Promise<Tileset3D> {\n const basePath = tileset.basePath;\n let root: Tileset3D;\n\n const rootImplicitTilingExtension = getImplicitTilingExtensionData(tileset?.root);\n if (rootImplicitTilingExtension && tileset.root) {\n root = await normalizeImplicitTileHeaders(\n tileset.root,\n tileset,\n rootImplicitTilingExtension,\n options\n );\n } else {\n root = normalizeTileData(tileset.root, tileset);\n }\n\n const stack: any[] = [];\n stack.push(root);\n\n while (stack.length > 0) {\n const tile = stack.pop() || {};\n const children = tile.children || [];\n for (let childHeader of children) {\n const childImplicitTilingExtension = getImplicitTilingExtensionData(childHeader);\n if (childImplicitTilingExtension) {\n childHeader = await normalizeImplicitTileHeaders(\n childHeader,\n tileset,\n childImplicitTilingExtension,\n options\n );\n } else {\n normalizeTileData(childHeader, {basePath});\n }\n\n stack.push(childHeader);\n }\n }\n\n return root;\n}\n\n/**\n * Do normalisation of implicit tile headers\n * TODO Check if Tile3D class can be a return type here.\n * @param tileset\n */\nexport async function normalizeImplicitTileHeaders(\n tile: Tile3D,\n tileset: Tileset3D,\n implicitTilingExtension: ImplicitTilingExtension,\n options: LoaderOptions\n) {\n const basePath = tileset.basePath;\n const {\n subdivisionScheme,\n maximumLevel,\n subtreeLevels,\n subtrees: {uri: subtreesUriTemplate}\n } = implicitTilingExtension;\n const replacedUrlTemplate = replaceContentUrlTemplate(subtreesUriTemplate, 0, 0, 0, 0);\n const subtreeUrl = resolveUri(replacedUrlTemplate, basePath);\n const subtree = await load(subtreeUrl, Tile3DSubtreeLoader, options);\n const contentUrlTemplate = resolveUri(tile.content.uri, basePath);\n const refine = tileset?.root?.refine;\n // @ts-ignore\n const rootLodMetricValue = tile.geometricError;\n\n // Replace tile.boundingVolume with the the bounding volume specified by the extensions['3DTILES_bounding_volume_S2']\n const s2VolumeInfo: S2VolumeInfo = tile.boundingVolume.extensions?.['3DTILES_bounding_volume_S2'];\n if (s2VolumeInfo) {\n const box = convertS2BoundingVolumetoOBB(s2VolumeInfo);\n const s2VolumeBox: S2VolumeBox = {box, s2VolumeInfo};\n tile.boundingVolume = s2VolumeBox;\n }\n\n const rootBoundingVolume = tile.boundingVolume;\n\n const implicitOptions = {\n contentUrlTemplate,\n subtreesUriTemplate,\n subdivisionScheme,\n subtreeLevels,\n maximumLevel,\n refine,\n basePath,\n lodMetricType: LOD_METRIC_TYPE.GEOMETRIC_ERROR,\n rootLodMetricValue,\n rootBoundingVolume,\n getTileType,\n getRefine\n };\n\n return await normalizeImplicitTileData(tile, subtree, implicitOptions);\n}\n\n/**\n * Do implicit data normalisation to create hierarchical tile structure\n * @param tile\n * @param rootSubtree\n * @param options\n * @returns\n */\nexport async function normalizeImplicitTileData(tile, rootSubtree: Subtree, options: any) {\n if (!tile) {\n return null;\n }\n\n tile.lodMetricType = LOD_METRIC_TYPE.GEOMETRIC_ERROR;\n tile.lodMetricValue = tile.geometricError;\n tile.transformMatrix = tile.transform;\n\n const {children, contentUrl} = await parseImplicitTiles({\n subtree: rootSubtree,\n options,\n s2VolumeBox: tile\n });\n\n if (contentUrl) {\n tile.contentUrl = contentUrl;\n tile.content = {uri: contentUrl.replace(`${options.basePath}/`, '')};\n }\n\n tile.refine = getRefine(tile.refine);\n tile.type = getTileType(tile);\n tile.children = children;\n tile.id = tile.contentUrl;\n\n return tile;\n}\n\n/**\n * Implicit Tiling data can be in 3DTILES_implicit_tiling for 3DTiles v.Next or directly in implicitTiling object for 3DTiles v1.1.\n * Spec 3DTiles v.Next - https://github.com/CesiumGS/3d-tiles/tree/main/extensions/3DTILES_implicit_tiling\n * Spec 3DTiles v.1.1 - https://github.com/CesiumGS/3d-tiles/tree/draft-1.1/specification/ImplicitTiling\n * @param tile\n * @returns\n */\nfunction getImplicitTilingExtensionData(tile: Tile3D | null): ImplicitTilingExtension {\n return tile?.extensions?.['3DTILES_implicit_tiling'] || tile?.implicitTiling;\n}\n"],"mappings":"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"}
|
|
@@ -4,6 +4,6 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
4
4
|
value: true
|
|
5
5
|
});
|
|
6
6
|
exports.VERSION = void 0;
|
|
7
|
-
var VERSION = typeof "3.4.0-alpha.
|
|
7
|
+
var VERSION = typeof "3.4.0-alpha.5" !== 'undefined' ? "3.4.0-alpha.5" : 'latest';
|
|
8
8
|
exports.VERSION = VERSION;
|
|
9
9
|
//# sourceMappingURL=version.js.map
|
|
@@ -74,16 +74,17 @@ function _parseTileset() {
|
|
|
74
74
|
tilesetJson = JSON.parse(new TextDecoder().decode(data));
|
|
75
75
|
tilesetJson.loader = options.loader || Tiles3DLoader;
|
|
76
76
|
tilesetJson.url = context.url;
|
|
77
|
+
tilesetJson.queryString = context.queryString;
|
|
77
78
|
tilesetJson.basePath = getBaseUri(tilesetJson);
|
|
78
|
-
_context2.next =
|
|
79
|
+
_context2.next = 7;
|
|
79
80
|
return (0, _parse3dTileHeader.normalizeTileHeaders)(tilesetJson, options);
|
|
80
|
-
case
|
|
81
|
+
case 7:
|
|
81
82
|
tilesetJson.root = _context2.sent;
|
|
82
83
|
tilesetJson.type = _tiles.TILESET_TYPE.TILES3D;
|
|
83
84
|
tilesetJson.lodMetricType = _tiles.LOD_METRIC_TYPE.GEOMETRIC_ERROR;
|
|
84
85
|
tilesetJson.lodMetricValue = ((_tilesetJson$root = tilesetJson.root) === null || _tilesetJson$root === void 0 ? void 0 : _tilesetJson$root.lodMetricValue) || 0;
|
|
85
86
|
return _context2.abrupt("return", tilesetJson);
|
|
86
|
-
case
|
|
87
|
+
case 12:
|
|
87
88
|
case "end":
|
|
88
89
|
return _context2.stop();
|
|
89
90
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tiles-3d-loader.js","names":["_loaderUtils","require","_tiles","_version","_parse3dTile","_parse3dTileHeader","Tiles3DLoader","id","name","module","version","VERSION","extensions","mimeTypes","tests","parse","options","loadGLTF","decodeQuantizedPositions","isTileset","assetGltfUpAxis","exports","getBaseUri","tileset","path","dirname","url","parseTile","_x","_x2","_x3","_parseTile","apply","arguments","_asyncToGenerator2","default","_regenerator","mark","_callee","arrayBuffer","context","tile","byteOffset","wrap","_callee$","_context","prev","next","content","featureIds","parse3DTile","abrupt","stop","parseTileset","_x4","_x5","_x6","_parseTileset","_callee2","data","_tilesetJson$root","tilesetJson","_callee2$","_context2","JSON","TextDecoder","decode","loader","basePath","normalizeTileHeaders","root","sent","type","TILESET_TYPE","TILES3D","lodMetricType","LOD_METRIC_TYPE","GEOMETRIC_ERROR","lodMetricValue","_x7","_x8","_x9","_parse","_callee3","loaderOptions","_callee3$","_context3","indexOf"],"sources":["../../src/tiles-3d-loader.ts"],"sourcesContent":["import type {LoaderWithParser} from '@loaders.gl/loader-utils';\nimport {path} from '@loaders.gl/loader-utils';\nimport {TILESET_TYPE, LOD_METRIC_TYPE} from '@loaders.gl/tiles';\nimport {VERSION} from './lib/utils/version';\nimport {parse3DTile} from './lib/parsers/parse-3d-tile';\nimport {normalizeTileHeaders} from './lib/parsers/parse-3d-tile-header';\n\n/**\n * Loader for 3D Tiles\n */\nexport const Tiles3DLoader: LoaderWithParser = {\n id: '3d-tiles',\n name: '3D Tiles',\n module: '3d-tiles',\n version: VERSION,\n extensions: ['cmpt', 'pnts', 'b3dm', 'i3dm'],\n mimeTypes: ['application/octet-stream'],\n tests: ['cmpt', 'pnts', 'b3dm', 'i3dm'],\n parse,\n options: {\n '3d-tiles': {\n loadGLTF: true,\n decodeQuantizedPositions: false,\n isTileset: 'auto',\n assetGltfUpAxis: null\n }\n }\n};\n\nfunction getBaseUri(tileset) {\n return path.dirname(tileset.url);\n}\n\nasync function parseTile(arrayBuffer, options, context) {\n const tile = {\n content: {\n featureIds: null\n }\n };\n const byteOffset = 0;\n await parse3DTile(arrayBuffer, byteOffset, options, context, tile.content);\n return tile.content;\n}\n\nasync function parseTileset(data, options, context) {\n const tilesetJson = JSON.parse(new TextDecoder().decode(data));\n // eslint-disable-next-line no-use-before-define\n tilesetJson.loader = options.loader || Tiles3DLoader;\n tilesetJson.url = context.url;\n // base path that non-absolute paths in tileset are relative to.\n tilesetJson.basePath = getBaseUri(tilesetJson);\n tilesetJson.root = await normalizeTileHeaders(tilesetJson, options);\n\n tilesetJson.type = TILESET_TYPE.TILES3D;\n\n tilesetJson.lodMetricType = LOD_METRIC_TYPE.GEOMETRIC_ERROR;\n tilesetJson.lodMetricValue = tilesetJson.root?.lodMetricValue || 0;\n\n return tilesetJson;\n}\n\nasync function parse(data, options, context) {\n // auto detect file type\n const loaderOptions = options['3d-tiles'] || {};\n let isTileset;\n if (loaderOptions.isTileset === 'auto') {\n isTileset = context.url && context.url.indexOf('.json') !== -1;\n } else {\n isTileset = loaderOptions.isTileset;\n }\n\n if (isTileset) {\n data = await parseTileset(data, options, context);\n } else {\n data = await parseTile(data, options, context);\n }\n\n return data;\n}\n"],"mappings":"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
|
|
1
|
+
{"version":3,"file":"tiles-3d-loader.js","names":["_loaderUtils","require","_tiles","_version","_parse3dTile","_parse3dTileHeader","Tiles3DLoader","id","name","module","version","VERSION","extensions","mimeTypes","tests","parse","options","loadGLTF","decodeQuantizedPositions","isTileset","assetGltfUpAxis","exports","getBaseUri","tileset","path","dirname","url","parseTile","_x","_x2","_x3","_parseTile","apply","arguments","_asyncToGenerator2","default","_regenerator","mark","_callee","arrayBuffer","context","tile","byteOffset","wrap","_callee$","_context","prev","next","content","featureIds","parse3DTile","abrupt","stop","parseTileset","_x4","_x5","_x6","_parseTileset","_callee2","data","_tilesetJson$root","tilesetJson","_callee2$","_context2","JSON","TextDecoder","decode","loader","queryString","basePath","normalizeTileHeaders","root","sent","type","TILESET_TYPE","TILES3D","lodMetricType","LOD_METRIC_TYPE","GEOMETRIC_ERROR","lodMetricValue","_x7","_x8","_x9","_parse","_callee3","loaderOptions","_callee3$","_context3","indexOf"],"sources":["../../src/tiles-3d-loader.ts"],"sourcesContent":["import type {LoaderWithParser} from '@loaders.gl/loader-utils';\nimport {path} from '@loaders.gl/loader-utils';\nimport {TILESET_TYPE, LOD_METRIC_TYPE} from '@loaders.gl/tiles';\nimport {VERSION} from './lib/utils/version';\nimport {parse3DTile} from './lib/parsers/parse-3d-tile';\nimport {normalizeTileHeaders} from './lib/parsers/parse-3d-tile-header';\n\n/**\n * Loader for 3D Tiles\n */\nexport const Tiles3DLoader: LoaderWithParser = {\n id: '3d-tiles',\n name: '3D Tiles',\n module: '3d-tiles',\n version: VERSION,\n extensions: ['cmpt', 'pnts', 'b3dm', 'i3dm'],\n mimeTypes: ['application/octet-stream'],\n tests: ['cmpt', 'pnts', 'b3dm', 'i3dm'],\n parse,\n options: {\n '3d-tiles': {\n loadGLTF: true,\n decodeQuantizedPositions: false,\n isTileset: 'auto',\n assetGltfUpAxis: null\n }\n }\n};\n\nfunction getBaseUri(tileset) {\n return path.dirname(tileset.url);\n}\n\nasync function parseTile(arrayBuffer, options, context) {\n const tile = {\n content: {\n featureIds: null\n }\n };\n const byteOffset = 0;\n await parse3DTile(arrayBuffer, byteOffset, options, context, tile.content);\n return tile.content;\n}\n\nasync function parseTileset(data, options, context) {\n const tilesetJson = JSON.parse(new TextDecoder().decode(data));\n // eslint-disable-next-line no-use-before-define\n tilesetJson.loader = options.loader || Tiles3DLoader;\n tilesetJson.url = context.url;\n tilesetJson.queryString = context.queryString;\n\n // base path that non-absolute paths in tileset are relative to.\n tilesetJson.basePath = getBaseUri(tilesetJson);\n tilesetJson.root = await normalizeTileHeaders(tilesetJson, options);\n\n tilesetJson.type = TILESET_TYPE.TILES3D;\n\n tilesetJson.lodMetricType = LOD_METRIC_TYPE.GEOMETRIC_ERROR;\n tilesetJson.lodMetricValue = tilesetJson.root?.lodMetricValue || 0;\n\n return tilesetJson;\n}\n\nasync function parse(data, options, context) {\n // auto detect file type\n const loaderOptions = options['3d-tiles'] || {};\n let isTileset;\n if (loaderOptions.isTileset === 'auto') {\n isTileset = context.url && context.url.indexOf('.json') !== -1;\n } else {\n isTileset = loaderOptions.isTileset;\n }\n\n if (isTileset) {\n data = await parseTileset(data, options, context);\n } else {\n data = await parseTile(data, options, context);\n }\n\n return data;\n}\n"],"mappings":";;;;;;;;;AACA,IAAAA,YAAA,GAAAC,OAAA;AACA,IAAAC,MAAA,GAAAD,OAAA;AACA,IAAAE,QAAA,GAAAF,OAAA;AACA,IAAAG,YAAA,GAAAH,OAAA;AACA,IAAAI,kBAAA,GAAAJ,OAAA;AAKO,IAAMK,aAA+B,GAAG;EAC7CC,EAAE,EAAE,UAAU;EACdC,IAAI,EAAE,UAAU;EAChBC,MAAM,EAAE,UAAU;EAClBC,OAAO,EAAEC,gBAAO;EAChBC,UAAU,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC;EAC5CC,SAAS,EAAE,CAAC,0BAA0B,CAAC;EACvCC,KAAK,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC;EACvCC,KAAK,EAALA,KAAK;EACLC,OAAO,EAAE;IACP,UAAU,EAAE;MACVC,QAAQ,EAAE,IAAI;MACdC,wBAAwB,EAAE,KAAK;MAC/BC,SAAS,EAAE,MAAM;MACjBC,eAAe,EAAE;IACnB;EACF;AACF,CAAC;AAACC,OAAA,CAAAf,aAAA,GAAAA,aAAA;AAEF,SAASgB,UAAUA,CAACC,OAAO,EAAE;EAC3B,OAAOC,iBAAI,CAACC,OAAO,CAACF,OAAO,CAACG,GAAG,CAAC;AAClC;AAAC,SAEcC,SAASA,CAAAC,EAAA,EAAAC,GAAA,EAAAC,GAAA;EAAA,OAAAC,UAAA,CAAAC,KAAA,OAAAC,SAAA;AAAA;AAAA,SAAAF,WAAA;EAAAA,UAAA,OAAAG,kBAAA,CAAAC,OAAA,EAAAC,YAAA,CAAAD,OAAA,CAAAE,IAAA,CAAxB,SAAAC,QAAyBC,WAAW,EAAEvB,OAAO,EAAEwB,OAAO;IAAA,IAAAC,IAAA,EAAAC,UAAA;IAAA,OAAAN,YAAA,CAAAD,OAAA,CAAAQ,IAAA,UAAAC,SAAAC,QAAA;MAAA,kBAAAA,QAAA,CAAAC,IAAA,GAAAD,QAAA,CAAAE,IAAA;QAAA;UAC9CN,IAAI,GAAG;YACXO,OAAO,EAAE;cACPC,UAAU,EAAE;YACd;UACF,CAAC;UACKP,UAAU,GAAG,CAAC;UAAAG,QAAA,CAAAE,IAAA;UAAA,OACd,IAAAG,wBAAW,EAACX,WAAW,EAAEG,UAAU,EAAE1B,OAAO,EAAEwB,OAAO,EAAEC,IAAI,CAACO,OAAO,CAAC;QAAA;UAAA,OAAAH,QAAA,CAAAM,MAAA,WACnEV,IAAI,CAACO,OAAO;QAAA;QAAA;UAAA,OAAAH,QAAA,CAAAO,IAAA;MAAA;IAAA,GAAAd,OAAA;EAAA,CACpB;EAAA,OAAAP,UAAA,CAAAC,KAAA,OAAAC,SAAA;AAAA;AAAA,SAEcoB,YAAYA,CAAAC,GAAA,EAAAC,GAAA,EAAAC,GAAA;EAAA,OAAAC,aAAA,CAAAzB,KAAA,OAAAC,SAAA;AAAA;AAAA,SAAAwB,cAAA;EAAAA,aAAA,OAAAvB,kBAAA,CAAAC,OAAA,EAAAC,YAAA,CAAAD,OAAA,CAAAE,IAAA,CAA3B,SAAAqB,SAA4BC,IAAI,EAAE3C,OAAO,EAAEwB,OAAO;IAAA,IAAAoB,iBAAA;IAAA,IAAAC,WAAA;IAAA,OAAAzB,YAAA,CAAAD,OAAA,CAAAQ,IAAA,UAAAmB,UAAAC,SAAA;MAAA,kBAAAA,SAAA,CAAAjB,IAAA,GAAAiB,SAAA,CAAAhB,IAAA;QAAA;UAC1Cc,WAAW,GAAGG,IAAI,CAACjD,KAAK,CAAC,IAAIkD,WAAW,CAAC,CAAC,CAACC,MAAM,CAACP,IAAI,CAAC,CAAC;UAE9DE,WAAW,CAACM,MAAM,GAAGnD,OAAO,CAACmD,MAAM,IAAI7D,aAAa;UACpDuD,WAAW,CAACnC,GAAG,GAAGc,OAAO,CAACd,GAAG;UAC7BmC,WAAW,CAACO,WAAW,GAAG5B,OAAO,CAAC4B,WAAW;UAG7CP,WAAW,CAACQ,QAAQ,GAAG/C,UAAU,CAACuC,WAAW,CAAC;UAACE,SAAA,CAAAhB,IAAA;UAAA,OACtB,IAAAuB,uCAAoB,EAACT,WAAW,EAAE7C,OAAO,CAAC;QAAA;UAAnE6C,WAAW,CAACU,IAAI,GAAAR,SAAA,CAAAS,IAAA;UAEhBX,WAAW,CAACY,IAAI,GAAGC,mBAAY,CAACC,OAAO;UAEvCd,WAAW,CAACe,aAAa,GAAGC,sBAAe,CAACC,eAAe;UAC3DjB,WAAW,CAACkB,cAAc,GAAG,EAAAnB,iBAAA,GAAAC,WAAW,CAACU,IAAI,cAAAX,iBAAA,uBAAhBA,iBAAA,CAAkBmB,cAAc,KAAI,CAAC;UAAC,OAAAhB,SAAA,CAAAZ,MAAA,WAE5DU,WAAW;QAAA;QAAA;UAAA,OAAAE,SAAA,CAAAX,IAAA;MAAA;IAAA,GAAAM,QAAA;EAAA,CACnB;EAAA,OAAAD,aAAA,CAAAzB,KAAA,OAAAC,SAAA;AAAA;AAAA,SAEclB,KAAKA,CAAAiE,GAAA,EAAAC,GAAA,EAAAC,GAAA;EAAA,OAAAC,MAAA,CAAAnD,KAAA,OAAAC,SAAA;AAAA;AAAA,SAAAkD,OAAA;EAAAA,MAAA,OAAAjD,kBAAA,CAAAC,OAAA,EAAAC,YAAA,CAAAD,OAAA,CAAAE,IAAA,CAApB,SAAA+C,SAAqBzB,IAAI,EAAE3C,OAAO,EAAEwB,OAAO;IAAA,IAAA6C,aAAA,EAAAlE,SAAA;IAAA,OAAAiB,YAAA,CAAAD,OAAA,CAAAQ,IAAA,UAAA2C,UAAAC,SAAA;MAAA,kBAAAA,SAAA,CAAAzC,IAAA,GAAAyC,SAAA,CAAAxC,IAAA;QAAA;UAEnCsC,aAAa,GAAGrE,OAAO,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;UAE/C,IAAIqE,aAAa,CAAClE,SAAS,KAAK,MAAM,EAAE;YACtCA,SAAS,GAAGqB,OAAO,CAACd,GAAG,IAAIc,OAAO,CAACd,GAAG,CAAC8D,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;UAChE,CAAC,MAAM;YACLrE,SAAS,GAAGkE,aAAa,CAAClE,SAAS;UACrC;UAAC,KAEGA,SAAS;YAAAoE,SAAA,CAAAxC,IAAA;YAAA;UAAA;UAAAwC,SAAA,CAAAxC,IAAA;UAAA,OACEM,YAAY,CAACM,IAAI,EAAE3C,OAAO,EAAEwB,OAAO,CAAC;QAAA;UAAjDmB,IAAI,GAAA4B,SAAA,CAAAf,IAAA;UAAAe,SAAA,CAAAxC,IAAA;UAAA;QAAA;UAAAwC,SAAA,CAAAxC,IAAA;UAAA,OAESpB,SAAS,CAACgC,IAAI,EAAE3C,OAAO,EAAEwB,OAAO,CAAC;QAAA;UAA9CmB,IAAI,GAAA4B,SAAA,CAAAf,IAAA;QAAA;UAAA,OAAAe,SAAA,CAAApC,MAAA,WAGCQ,IAAI;QAAA;QAAA;UAAA,OAAA4B,SAAA,CAAAnC,IAAA;MAAA;IAAA,GAAAgC,QAAA;EAAA,CACZ;EAAA,OAAAD,MAAA,CAAAnD,KAAA,OAAAC,SAAA;AAAA"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { GLTFLoader } from '@loaders.gl/gltf';
|
|
1
|
+
import { _getMemoryUsageGLTF, GLTFLoader } from '@loaders.gl/gltf';
|
|
2
2
|
import { sliceArrayBuffer } from '@loaders.gl/loader-utils';
|
|
3
3
|
export const GLTF_FORMAT = {
|
|
4
4
|
URI: 0,
|
|
@@ -33,6 +33,7 @@ export async function extractGLTF(tile, gltfFormat, options, context) {
|
|
|
33
33
|
}
|
|
34
34
|
if (tile.gltfArrayBuffer) {
|
|
35
35
|
tile.gltf = await parse(tile.gltfArrayBuffer, GLTFLoader, options, context);
|
|
36
|
+
tile.gpuMemoryUsageInBytes = _getMemoryUsageGLTF(tile.gltf);
|
|
36
37
|
delete tile.gltfArrayBuffer;
|
|
37
38
|
delete tile.gltfByteOffset;
|
|
38
39
|
delete tile.gltfByteLength;
|
|
@@ -1 +1 @@
|
|
|
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","concat","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":"AASA,SAAQA,UAAU,QAAO,kBAAkB;
|
|
1
|
+
{"version":3,"file":"parse-3d-tile-gltf-view.js","names":["_getMemoryUsageGLTF","GLTFLoader","sliceArrayBuffer","GLTF_FORMAT","URI","EMBEDDED","parse3DTileGLTFViewSync","tile","arrayBuffer","byteOffset","options","rotateYtoZ","gltfByteLength","byteLength","Error","gltfUpAxis","assetGltfUpAxis","gltfArrayBuffer","gltfByteOffset","console","warn","concat","type","extractGLTF","gltfFormat","context","tile3DOptions","extractGLTFBufferOrURL","loadGLTF","parse","fetch","gltfUrl","gltf","gpuMemoryUsageInBytes","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 {_getMemoryUsageGLTF, 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 tile.gpuMemoryUsageInBytes = _getMemoryUsageGLTF(tile.gltf);\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 +1 @@
|
|
|
1
|
-
{"version":3,"file":"parse-3d-tile-subtree.js","names":["SUBTREE_FILE_MAGIC","SUBTREE_FILE_VERSION","parse3DTilesSubtree","data","options","context","magic","Uint32Array","slice","Error","version","jsonByteLength","parseUint64Value","stringAttribute","Uint8Array","textDecoder","TextDecoder","string","decode","subtree","JSON","parse","binaryByteLength","internalBinaryBuffer","ArrayBuffer","tileAvailability","explicitBitstream","getExplicitBitstream","contentAvailability","childSubtreeAvailability","resolveBufferUri","bitstreamRelativeUri","basePath","hasProtocol","startsWith","resolvedUri","URL","decodeURI","toString","basePathWithProtocol","concat","host","pathname","name","bufferViewIndex","bufferView","bufferViews","buffer","buffers","url","fetch","uri","bufferUri","response","arrayBuffer","byteOffset","byteLength","dataView","DataView","left","getUint32","right"],"sources":["../../../../../src/lib/parsers/helpers/parse-3d-tile-subtree.ts"],"sourcesContent":["import type {Subtree, ExplicitBitstream} from '../../../types';\nimport type {LoaderContext, LoaderOptions} from '@loaders.gl/loader-utils';\n\nconst SUBTREE_FILE_MAGIC = 0x74627573;\nconst SUBTREE_FILE_VERSION = 1;\n\n/**\n * Parse subtree file\n * Spec - https://github.com/CesiumGS/3d-tiles/tree/main/extensions/3DTILES_implicit_tiling#subtree-file-format\n * @param data\n * @returns\n */\n// eslint-disable-next-line max-statements\nexport default async function parse3DTilesSubtree(\n data: ArrayBuffer,\n options: LoaderOptions | undefined,\n context: LoaderContext | undefined\n): Promise<Subtree> {\n const magic = new Uint32Array(data.slice(0, 4));\n\n if (magic[0] !== SUBTREE_FILE_MAGIC) {\n throw new Error('Wrong subtree file magic number');\n }\n\n const version = new Uint32Array(data.slice(4, 8));\n\n if (version[0] !== SUBTREE_FILE_VERSION) {\n throw new Error('Wrong subtree file verson, must be 1');\n }\n\n const jsonByteLength = parseUint64Value(data.slice(8, 16));\n const stringAttribute = new Uint8Array(data, 24, jsonByteLength);\n\n const textDecoder = new TextDecoder('utf8');\n const string = textDecoder.decode(stringAttribute);\n const subtree = JSON.parse(string);\n\n const binaryByteLength = parseUint64Value(data.slice(16, 24));\n let internalBinaryBuffer = new ArrayBuffer(0);\n\n if (binaryByteLength) {\n internalBinaryBuffer = data.slice(24 + jsonByteLength);\n }\n\n if ('bufferView' in subtree.tileAvailability) {\n subtree.tileAvailability.explicitBitstream = await getExplicitBitstream(\n subtree,\n 'tileAvailability',\n internalBinaryBuffer,\n context\n );\n }\n\n if ('bufferView' in subtree.contentAvailability) {\n subtree.contentAvailability.explicitBitstream = await getExplicitBitstream(\n subtree,\n 'contentAvailability',\n internalBinaryBuffer,\n context\n );\n }\n\n if ('bufferView' in subtree.childSubtreeAvailability) {\n subtree.childSubtreeAvailability.explicitBitstream = await getExplicitBitstream(\n subtree,\n 'childSubtreeAvailability',\n internalBinaryBuffer,\n context\n );\n }\n\n return subtree;\n}\n\n/**\n * Get url for bitstream downloading\n * @param bitstreamRelativeUri\n * @param
|
|
1
|
+
{"version":3,"file":"parse-3d-tile-subtree.js","names":["SUBTREE_FILE_MAGIC","SUBTREE_FILE_VERSION","parse3DTilesSubtree","data","options","context","magic","Uint32Array","slice","Error","version","jsonByteLength","parseUint64Value","stringAttribute","Uint8Array","textDecoder","TextDecoder","string","decode","subtree","JSON","parse","binaryByteLength","internalBinaryBuffer","ArrayBuffer","tileAvailability","explicitBitstream","getExplicitBitstream","contentAvailability","childSubtreeAvailability","resolveBufferUri","bitstreamRelativeUri","basePath","hasProtocol","startsWith","resolvedUri","URL","decodeURI","toString","basePathWithProtocol","concat","host","pathname","name","bufferViewIndex","bufferView","bufferViews","buffer","buffers","url","fetch","uri","bufferUri","response","arrayBuffer","byteOffset","byteLength","dataView","DataView","left","getUint32","right"],"sources":["../../../../../src/lib/parsers/helpers/parse-3d-tile-subtree.ts"],"sourcesContent":["import type {Subtree, ExplicitBitstream} from '../../../types';\nimport type {LoaderContext, LoaderOptions} from '@loaders.gl/loader-utils';\n\nconst SUBTREE_FILE_MAGIC = 0x74627573;\nconst SUBTREE_FILE_VERSION = 1;\n\n/**\n * Parse subtree file\n * Spec - https://github.com/CesiumGS/3d-tiles/tree/main/extensions/3DTILES_implicit_tiling#subtree-file-format\n * @param data\n * @returns\n */\n// eslint-disable-next-line max-statements\nexport default async function parse3DTilesSubtree(\n data: ArrayBuffer,\n options: LoaderOptions | undefined,\n context: LoaderContext | undefined\n): Promise<Subtree> {\n const magic = new Uint32Array(data.slice(0, 4));\n\n if (magic[0] !== SUBTREE_FILE_MAGIC) {\n throw new Error('Wrong subtree file magic number');\n }\n\n const version = new Uint32Array(data.slice(4, 8));\n\n if (version[0] !== SUBTREE_FILE_VERSION) {\n throw new Error('Wrong subtree file verson, must be 1');\n }\n\n const jsonByteLength = parseUint64Value(data.slice(8, 16));\n const stringAttribute = new Uint8Array(data, 24, jsonByteLength);\n\n const textDecoder = new TextDecoder('utf8');\n const string = textDecoder.decode(stringAttribute);\n const subtree = JSON.parse(string);\n\n const binaryByteLength = parseUint64Value(data.slice(16, 24));\n let internalBinaryBuffer = new ArrayBuffer(0);\n\n if (binaryByteLength) {\n internalBinaryBuffer = data.slice(24 + jsonByteLength);\n }\n\n if ('bufferView' in subtree.tileAvailability) {\n subtree.tileAvailability.explicitBitstream = await getExplicitBitstream(\n subtree,\n 'tileAvailability',\n internalBinaryBuffer,\n context\n );\n }\n\n if ('bufferView' in subtree.contentAvailability) {\n subtree.contentAvailability.explicitBitstream = await getExplicitBitstream(\n subtree,\n 'contentAvailability',\n internalBinaryBuffer,\n context\n );\n }\n\n if ('bufferView' in subtree.childSubtreeAvailability) {\n subtree.childSubtreeAvailability.explicitBitstream = await getExplicitBitstream(\n subtree,\n 'childSubtreeAvailability',\n internalBinaryBuffer,\n context\n );\n }\n\n return subtree;\n}\n\n/**\n * Get url for bitstream downloading\n * @param bitstreamRelativeUri\n * @param basePath\n * @returns\n */\nfunction resolveBufferUri(bitstreamRelativeUri: string, basePath: string): string {\n const hasProtocol = basePath.startsWith('http');\n\n if (hasProtocol) {\n const resolvedUri = new URL(bitstreamRelativeUri, basePath);\n return decodeURI(resolvedUri.toString());\n }\n\n /**\n * Adding http protocol only for new URL constructor usage.\n * It allows to resolve relative paths like ../../example with basePath.\n */\n const basePathWithProtocol = `http://${basePath}`;\n const resolvedUri = new URL(bitstreamRelativeUri, basePathWithProtocol);\n /**\n * Drop protocol and use just relative path.\n */\n return `/${resolvedUri.host}${resolvedUri.pathname}`;\n}\n\n/**\n * Get explicit bitstream for subtree availability data.\n * @param subtree\n * @param name\n * @param internalBinaryBuffer\n */\nasync function getExplicitBitstream(\n subtree: Subtree,\n name: string,\n internalBinaryBuffer: ArrayBuffer,\n context: LoaderContext | undefined\n): Promise<ExplicitBitstream> {\n const bufferViewIndex = subtree[name].bufferView;\n const bufferView = subtree.bufferViews[bufferViewIndex];\n const buffer = subtree.buffers[bufferView.buffer];\n\n if (!context?.url || !context.fetch) {\n throw new Error('Url is not provided');\n }\n\n if (!context.fetch) {\n throw new Error('fetch is not provided');\n }\n\n // External bitstream loading\n if (buffer.uri) {\n const bufferUri = resolveBufferUri(buffer.uri, context?.url);\n const response = await context.fetch(bufferUri);\n const data = await response.arrayBuffer();\n // Return view of bitstream.\n return new Uint8Array(data, bufferView.byteOffset, bufferView.byteLength);\n }\n // Return view of bitstream.\n return new Uint8Array(internalBinaryBuffer, bufferView.byteOffset, bufferView.byteLength);\n}\n\n/**\n * Parse buffer to return uint64 value\n * @param buffer\n * @returns 64-bit value until precision is lost after Number.MAX_SAFE_INTEGER\n */\nfunction parseUint64Value(buffer: ArrayBuffer): number {\n const dataView = new DataView(buffer);\n const left = dataView.getUint32(0, true);\n const right = dataView.getUint32(4, true);\n // combine the two 32-bit values\n return left + 2 ** 32 * right;\n}\n"],"mappings":"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"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { GLTFLoader } from '@loaders.gl/gltf';
|
|
1
|
+
import { _getMemoryUsageGLTF, GLTFLoader } from '@loaders.gl/gltf';
|
|
2
2
|
export async function parseGltf3DTile(tile, arrayBuffer, options, context) {
|
|
3
3
|
tile.rotateYtoZ = true;
|
|
4
4
|
tile.gltfUpAxis = options['3d-tiles'] && options['3d-tiles'].assetGltfUpAxis ? options['3d-tiles'].assetGltfUpAxis : 'Y';
|
|
@@ -6,5 +6,6 @@ export async function parseGltf3DTile(tile, arrayBuffer, options, context) {
|
|
|
6
6
|
parse
|
|
7
7
|
} = context;
|
|
8
8
|
tile.gltf = await parse(arrayBuffer, GLTFLoader, options, context);
|
|
9
|
+
tile.gpuMemoryUsageInBytes = _getMemoryUsageGLTF(tile.gltf);
|
|
9
10
|
}
|
|
10
11
|
//# sourceMappingURL=parse-3d-tile-gltf.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"parse-3d-tile-gltf.js","names":["GLTFLoader","parseGltf3DTile","tile","arrayBuffer","options","context","rotateYtoZ","gltfUpAxis","assetGltfUpAxis","parse","gltf"],"sources":["../../../../src/lib/parsers/parse-3d-tile-gltf.ts"],"sourcesContent":["import {GLTFLoader} from '@loaders.gl/gltf';\n\nexport async function parseGltf3DTile(tile, arrayBuffer, options, context) {\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 // Save gltf up axis\n tile.gltfUpAxis =\n options['3d-tiles'] && options['3d-tiles'].assetGltfUpAxis\n ? options['3d-tiles'].assetGltfUpAxis\n : 'Y';\n\n const {parse} = context;\n tile.gltf = await parse(arrayBuffer, GLTFLoader, options, context);\n}\n"],"mappings":"AAAA,SAAQA,UAAU,QAAO,kBAAkB;
|
|
1
|
+
{"version":3,"file":"parse-3d-tile-gltf.js","names":["_getMemoryUsageGLTF","GLTFLoader","parseGltf3DTile","tile","arrayBuffer","options","context","rotateYtoZ","gltfUpAxis","assetGltfUpAxis","parse","gltf","gpuMemoryUsageInBytes"],"sources":["../../../../src/lib/parsers/parse-3d-tile-gltf.ts"],"sourcesContent":["import {_getMemoryUsageGLTF, GLTFLoader} from '@loaders.gl/gltf';\n\nexport async function parseGltf3DTile(tile, arrayBuffer, options, context) {\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 // Save gltf up axis\n tile.gltfUpAxis =\n options['3d-tiles'] && options['3d-tiles'].assetGltfUpAxis\n ? options['3d-tiles'].assetGltfUpAxis\n : 'Y';\n\n const {parse} = context;\n tile.gltf = await parse(arrayBuffer, GLTFLoader, options, context);\n tile.gpuMemoryUsageInBytes = _getMemoryUsageGLTF(tile.gltf);\n}\n"],"mappings":"AAAA,SAAQA,mBAAmB,EAAEC,UAAU,QAAO,kBAAkB;AAEhE,OAAO,eAAeC,eAAeA,CAACC,IAAI,EAAEC,WAAW,EAAEC,OAAO,EAAEC,OAAO,EAAE;EAIzEH,IAAI,CAACI,UAAU,GAAG,IAAI;EAEtBJ,IAAI,CAACK,UAAU,GACbH,OAAO,CAAC,UAAU,CAAC,IAAIA,OAAO,CAAC,UAAU,CAAC,CAACI,eAAe,GACtDJ,OAAO,CAAC,UAAU,CAAC,CAACI,eAAe,GACnC,GAAG;EAET,MAAM;IAACC;EAAK,CAAC,GAAGJ,OAAO;EACvBH,IAAI,CAACQ,IAAI,GAAG,MAAMD,KAAK,CAACN,WAAW,EAAEH,UAAU,EAAEI,OAAO,EAAEC,OAAO,CAAC;EAClEH,IAAI,CAACS,qBAAqB,GAAGZ,mBAAmB,CAACG,IAAI,CAACQ,IAAI,CAAC;AAC7D"}
|
|
@@ -7,7 +7,7 @@ function getTileType(tile) {
|
|
|
7
7
|
if (!tile.contentUrl) {
|
|
8
8
|
return TILE_TYPE.EMPTY;
|
|
9
9
|
}
|
|
10
|
-
const contentUrl = tile.contentUrl;
|
|
10
|
+
const contentUrl = tile.contentUrl.split('?')[0];
|
|
11
11
|
const fileExtension = contentUrl.split('.').pop();
|
|
12
12
|
switch (fileExtension) {
|
|
13
13
|
case 'pnts':
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"parse-3d-tile-header.js","names":["Tile3DSubtreeLoader","load","LOD_METRIC_TYPE","TILE_REFINEMENT","TILE_TYPE","parseImplicitTiles","replaceContentUrlTemplate","convertS2BoundingVolumetoOBB","getTileType","tile","contentUrl","EMPTY","fileExtension","split","pop","POINTCLOUD","SCENEGRAPH","getRefine","refine","REPLACE","ADD","resolveUri","uri","basePath","urlSchemeRegex","test","url","URL","concat","decodeURI","toString","startsWith","normalizeTileData","options","content","contentUri","id","lodMetricType","GEOMETRIC_ERROR","lodMetricValue","geometricError","transformMatrix","transform","type","normalizeTileHeaders","tileset","root","rootImplicitTilingExtension","getImplicitTilingExtensionData","normalizeImplicitTileHeaders","stack","push","length","children","childHeader","childImplicitTilingExtension","implicitTilingExtension","_tileset$root","_tile$boundingVolume$","subdivisionScheme","maximumLevel","subtreeLevels","subtrees","subtreesUriTemplate","replacedUrlTemplate","subtreeUrl","subtree","contentUrlTemplate","rootLodMetricValue","s2VolumeInfo","boundingVolume","extensions","box","s2VolumeBox","rootBoundingVolume","implicitOptions","normalizeImplicitTileData","rootSubtree","replace","_tile$extensions","implicitTiling"],"sources":["../../../../src/lib/parsers/parse-3d-tile-header.ts"],"sourcesContent":["import type {LoaderOptions} from '@loaders.gl/loader-utils';\nimport {Tile3DSubtreeLoader} from '../../tile-3d-subtree-loader';\nimport {load} from '@loaders.gl/core';\nimport {Tileset3D, LOD_METRIC_TYPE, TILE_REFINEMENT, TILE_TYPE, Tile3D} from '@loaders.gl/tiles';\nimport {ImplicitTilingExtension, Subtree} from '../../types';\nimport type {S2VolumeBox} from './helpers/parse-3d-implicit-tiles';\nimport {parseImplicitTiles, replaceContentUrlTemplate} from './helpers/parse-3d-implicit-tiles';\nimport type {S2VolumeInfo} from '../utils/obb/s2-corners-to-obb';\nimport {convertS2BoundingVolumetoOBB} from '../utils/obb/s2-corners-to-obb';\n\nfunction getTileType(tile) {\n if (!tile.contentUrl) {\n return TILE_TYPE.EMPTY;\n }\n\n const contentUrl = tile.contentUrl;\n const fileExtension = contentUrl.split('.').pop();\n switch (fileExtension) {\n case 'pnts':\n return TILE_TYPE.POINTCLOUD;\n case 'i3dm':\n case 'b3dm':\n case 'glb':\n case 'gltf':\n return TILE_TYPE.SCENEGRAPH;\n default:\n return fileExtension;\n }\n}\n\nfunction getRefine(refine) {\n switch (refine) {\n case 'REPLACE':\n case 'replace':\n return TILE_REFINEMENT.REPLACE;\n case 'ADD':\n case 'add':\n return TILE_REFINEMENT.ADD;\n default:\n return refine;\n }\n}\n\nfunction resolveUri(uri, basePath) {\n // url scheme per RFC3986\n const urlSchemeRegex = /^[a-z][0-9a-z+.-]*:/i;\n\n if (urlSchemeRegex.test(basePath)) {\n const url = new URL(uri, `${basePath}/`);\n return decodeURI(url.toString());\n } else if (uri.startsWith('/')) {\n return uri;\n }\n\n return `${basePath}/${uri}`;\n}\n\nexport function normalizeTileData(tile, options) {\n if (!tile) {\n return null;\n }\n if (tile.content) {\n const contentUri = tile.content.uri || tile.content.url;\n tile.contentUrl = resolveUri(contentUri, options.basePath);\n }\n tile.id = tile.contentUrl;\n tile.lodMetricType = LOD_METRIC_TYPE.GEOMETRIC_ERROR;\n tile.lodMetricValue = tile.geometricError;\n tile.transformMatrix = tile.transform;\n tile.type = getTileType(tile);\n tile.refine = getRefine(tile.refine);\n\n return tile;\n}\n\n// normalize tile headers\nexport async function normalizeTileHeaders(\n tileset: Tileset3D,\n options: LoaderOptions\n): Promise<Tileset3D> {\n const basePath = tileset.basePath;\n let root: Tileset3D;\n\n const rootImplicitTilingExtension = getImplicitTilingExtensionData(tileset?.root);\n if (rootImplicitTilingExtension && tileset.root) {\n root = await normalizeImplicitTileHeaders(\n tileset.root,\n tileset,\n rootImplicitTilingExtension,\n options\n );\n } else {\n root = normalizeTileData(tileset.root, tileset);\n }\n\n const stack: any[] = [];\n stack.push(root);\n\n while (stack.length > 0) {\n const tile = stack.pop() || {};\n const children = tile.children || [];\n for (let childHeader of children) {\n const childImplicitTilingExtension = getImplicitTilingExtensionData(childHeader);\n if (childImplicitTilingExtension) {\n childHeader = await normalizeImplicitTileHeaders(\n childHeader,\n tileset,\n childImplicitTilingExtension,\n options\n );\n } else {\n normalizeTileData(childHeader, {basePath});\n }\n\n stack.push(childHeader);\n }\n }\n\n return root;\n}\n\n/**\n * Do normalisation of implicit tile headers\n * TODO Check if Tile3D class can be a return type here.\n * @param tileset\n */\nexport async function normalizeImplicitTileHeaders(\n tile: Tile3D,\n tileset: Tileset3D,\n implicitTilingExtension: ImplicitTilingExtension,\n options: LoaderOptions\n) {\n const basePath = tileset.basePath;\n const {\n subdivisionScheme,\n maximumLevel,\n subtreeLevels,\n subtrees: {uri: subtreesUriTemplate}\n } = implicitTilingExtension;\n const replacedUrlTemplate = replaceContentUrlTemplate(subtreesUriTemplate, 0, 0, 0, 0);\n const subtreeUrl = resolveUri(replacedUrlTemplate, basePath);\n const subtree = await load(subtreeUrl, Tile3DSubtreeLoader, options);\n const contentUrlTemplate = resolveUri(tile.content.uri, basePath);\n const refine = tileset?.root?.refine;\n // @ts-ignore\n const rootLodMetricValue = tile.geometricError;\n\n // Replace tile.boundingVolume with the the bounding volume specified by the extensions['3DTILES_bounding_volume_S2']\n const s2VolumeInfo: S2VolumeInfo = tile.boundingVolume.extensions?.['3DTILES_bounding_volume_S2'];\n if (s2VolumeInfo) {\n const box = convertS2BoundingVolumetoOBB(s2VolumeInfo);\n const s2VolumeBox: S2VolumeBox = {box, s2VolumeInfo};\n tile.boundingVolume = s2VolumeBox;\n }\n\n const rootBoundingVolume = tile.boundingVolume;\n\n const implicitOptions = {\n contentUrlTemplate,\n subtreesUriTemplate,\n subdivisionScheme,\n subtreeLevels,\n maximumLevel,\n refine,\n basePath,\n lodMetricType: LOD_METRIC_TYPE.GEOMETRIC_ERROR,\n rootLodMetricValue,\n rootBoundingVolume,\n getTileType,\n getRefine\n };\n\n return await normalizeImplicitTileData(tile, subtree, implicitOptions);\n}\n\n/**\n * Do implicit data normalisation to create hierarchical tile structure\n * @param tile\n * @param rootSubtree\n * @param options\n * @returns\n */\nexport async function normalizeImplicitTileData(tile, rootSubtree: Subtree, options: any) {\n if (!tile) {\n return null;\n }\n\n tile.lodMetricType = LOD_METRIC_TYPE.GEOMETRIC_ERROR;\n tile.lodMetricValue = tile.geometricError;\n tile.transformMatrix = tile.transform;\n\n const {children, contentUrl} = await parseImplicitTiles({\n subtree: rootSubtree,\n options,\n s2VolumeBox: tile\n });\n\n if (contentUrl) {\n tile.contentUrl = contentUrl;\n tile.content = {uri: contentUrl.replace(`${options.basePath}/`, '')};\n }\n\n tile.refine = getRefine(tile.refine);\n tile.type = getTileType(tile);\n tile.children = children;\n tile.id = tile.contentUrl;\n\n return tile;\n}\n\n/**\n * Implicit Tiling data can be in 3DTILES_implicit_tiling for 3DTiles v.Next or directly in implicitTiling object for 3DTiles v1.1.\n * Spec 3DTiles v.Next - https://github.com/CesiumGS/3d-tiles/tree/main/extensions/3DTILES_implicit_tiling\n * Spec 3DTiles v.1.1 - https://github.com/CesiumGS/3d-tiles/tree/draft-1.1/specification/ImplicitTiling\n * @param tile\n * @returns\n */\nfunction getImplicitTilingExtensionData(tile: Tile3D | null): ImplicitTilingExtension {\n return tile?.extensions?.['3DTILES_implicit_tiling'] || tile?.implicitTiling;\n}\n"],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"parse-3d-tile-header.js","names":["Tile3DSubtreeLoader","load","LOD_METRIC_TYPE","TILE_REFINEMENT","TILE_TYPE","parseImplicitTiles","replaceContentUrlTemplate","convertS2BoundingVolumetoOBB","getTileType","tile","contentUrl","EMPTY","split","fileExtension","pop","POINTCLOUD","SCENEGRAPH","getRefine","refine","REPLACE","ADD","resolveUri","uri","basePath","urlSchemeRegex","test","url","URL","concat","decodeURI","toString","startsWith","normalizeTileData","options","content","contentUri","id","lodMetricType","GEOMETRIC_ERROR","lodMetricValue","geometricError","transformMatrix","transform","type","normalizeTileHeaders","tileset","root","rootImplicitTilingExtension","getImplicitTilingExtensionData","normalizeImplicitTileHeaders","stack","push","length","children","childHeader","childImplicitTilingExtension","implicitTilingExtension","_tileset$root","_tile$boundingVolume$","subdivisionScheme","maximumLevel","subtreeLevels","subtrees","subtreesUriTemplate","replacedUrlTemplate","subtreeUrl","subtree","contentUrlTemplate","rootLodMetricValue","s2VolumeInfo","boundingVolume","extensions","box","s2VolumeBox","rootBoundingVolume","implicitOptions","normalizeImplicitTileData","rootSubtree","replace","_tile$extensions","implicitTiling"],"sources":["../../../../src/lib/parsers/parse-3d-tile-header.ts"],"sourcesContent":["import type {LoaderOptions} from '@loaders.gl/loader-utils';\nimport {Tile3DSubtreeLoader} from '../../tile-3d-subtree-loader';\nimport {load} from '@loaders.gl/core';\nimport {Tileset3D, LOD_METRIC_TYPE, TILE_REFINEMENT, TILE_TYPE, Tile3D} from '@loaders.gl/tiles';\nimport {ImplicitTilingExtension, Subtree} from '../../types';\nimport type {S2VolumeBox} from './helpers/parse-3d-implicit-tiles';\nimport {parseImplicitTiles, replaceContentUrlTemplate} from './helpers/parse-3d-implicit-tiles';\nimport type {S2VolumeInfo} from '../utils/obb/s2-corners-to-obb';\nimport {convertS2BoundingVolumetoOBB} from '../utils/obb/s2-corners-to-obb';\n\nfunction getTileType(tile) {\n if (!tile.contentUrl) {\n return TILE_TYPE.EMPTY;\n }\n\n const contentUrl = tile.contentUrl.split('?')[0]; // Discard query string\n const fileExtension = contentUrl.split('.').pop();\n switch (fileExtension) {\n case 'pnts':\n return TILE_TYPE.POINTCLOUD;\n case 'i3dm':\n case 'b3dm':\n case 'glb':\n case 'gltf':\n return TILE_TYPE.SCENEGRAPH;\n default:\n return fileExtension;\n }\n}\n\nfunction getRefine(refine) {\n switch (refine) {\n case 'REPLACE':\n case 'replace':\n return TILE_REFINEMENT.REPLACE;\n case 'ADD':\n case 'add':\n return TILE_REFINEMENT.ADD;\n default:\n return refine;\n }\n}\n\nfunction resolveUri(uri, basePath) {\n // url scheme per RFC3986\n const urlSchemeRegex = /^[a-z][0-9a-z+.-]*:/i;\n\n if (urlSchemeRegex.test(basePath)) {\n const url = new URL(uri, `${basePath}/`);\n return decodeURI(url.toString());\n } else if (uri.startsWith('/')) {\n return uri;\n }\n\n return `${basePath}/${uri}`;\n}\n\nexport function normalizeTileData(tile, options) {\n if (!tile) {\n return null;\n }\n if (tile.content) {\n const contentUri = tile.content.uri || tile.content.url;\n tile.contentUrl = resolveUri(contentUri, options.basePath);\n }\n tile.id = tile.contentUrl;\n tile.lodMetricType = LOD_METRIC_TYPE.GEOMETRIC_ERROR;\n tile.lodMetricValue = tile.geometricError;\n tile.transformMatrix = tile.transform;\n tile.type = getTileType(tile);\n tile.refine = getRefine(tile.refine);\n\n return tile;\n}\n\n// normalize tile headers\nexport async function normalizeTileHeaders(\n tileset: Tileset3D,\n options: LoaderOptions\n): Promise<Tileset3D> {\n const basePath = tileset.basePath;\n let root: Tileset3D;\n\n const rootImplicitTilingExtension = getImplicitTilingExtensionData(tileset?.root);\n if (rootImplicitTilingExtension && tileset.root) {\n root = await normalizeImplicitTileHeaders(\n tileset.root,\n tileset,\n rootImplicitTilingExtension,\n options\n );\n } else {\n root = normalizeTileData(tileset.root, tileset);\n }\n\n const stack: any[] = [];\n stack.push(root);\n\n while (stack.length > 0) {\n const tile = stack.pop() || {};\n const children = tile.children || [];\n for (let childHeader of children) {\n const childImplicitTilingExtension = getImplicitTilingExtensionData(childHeader);\n if (childImplicitTilingExtension) {\n childHeader = await normalizeImplicitTileHeaders(\n childHeader,\n tileset,\n childImplicitTilingExtension,\n options\n );\n } else {\n normalizeTileData(childHeader, {basePath});\n }\n\n stack.push(childHeader);\n }\n }\n\n return root;\n}\n\n/**\n * Do normalisation of implicit tile headers\n * TODO Check if Tile3D class can be a return type here.\n * @param tileset\n */\nexport async function normalizeImplicitTileHeaders(\n tile: Tile3D,\n tileset: Tileset3D,\n implicitTilingExtension: ImplicitTilingExtension,\n options: LoaderOptions\n) {\n const basePath = tileset.basePath;\n const {\n subdivisionScheme,\n maximumLevel,\n subtreeLevels,\n subtrees: {uri: subtreesUriTemplate}\n } = implicitTilingExtension;\n const replacedUrlTemplate = replaceContentUrlTemplate(subtreesUriTemplate, 0, 0, 0, 0);\n const subtreeUrl = resolveUri(replacedUrlTemplate, basePath);\n const subtree = await load(subtreeUrl, Tile3DSubtreeLoader, options);\n const contentUrlTemplate = resolveUri(tile.content.uri, basePath);\n const refine = tileset?.root?.refine;\n // @ts-ignore\n const rootLodMetricValue = tile.geometricError;\n\n // Replace tile.boundingVolume with the the bounding volume specified by the extensions['3DTILES_bounding_volume_S2']\n const s2VolumeInfo: S2VolumeInfo = tile.boundingVolume.extensions?.['3DTILES_bounding_volume_S2'];\n if (s2VolumeInfo) {\n const box = convertS2BoundingVolumetoOBB(s2VolumeInfo);\n const s2VolumeBox: S2VolumeBox = {box, s2VolumeInfo};\n tile.boundingVolume = s2VolumeBox;\n }\n\n const rootBoundingVolume = tile.boundingVolume;\n\n const implicitOptions = {\n contentUrlTemplate,\n subtreesUriTemplate,\n subdivisionScheme,\n subtreeLevels,\n maximumLevel,\n refine,\n basePath,\n lodMetricType: LOD_METRIC_TYPE.GEOMETRIC_ERROR,\n rootLodMetricValue,\n rootBoundingVolume,\n getTileType,\n getRefine\n };\n\n return await normalizeImplicitTileData(tile, subtree, implicitOptions);\n}\n\n/**\n * Do implicit data normalisation to create hierarchical tile structure\n * @param tile\n * @param rootSubtree\n * @param options\n * @returns\n */\nexport async function normalizeImplicitTileData(tile, rootSubtree: Subtree, options: any) {\n if (!tile) {\n return null;\n }\n\n tile.lodMetricType = LOD_METRIC_TYPE.GEOMETRIC_ERROR;\n tile.lodMetricValue = tile.geometricError;\n tile.transformMatrix = tile.transform;\n\n const {children, contentUrl} = await parseImplicitTiles({\n subtree: rootSubtree,\n options,\n s2VolumeBox: tile\n });\n\n if (contentUrl) {\n tile.contentUrl = contentUrl;\n tile.content = {uri: contentUrl.replace(`${options.basePath}/`, '')};\n }\n\n tile.refine = getRefine(tile.refine);\n tile.type = getTileType(tile);\n tile.children = children;\n tile.id = tile.contentUrl;\n\n return tile;\n}\n\n/**\n * Implicit Tiling data can be in 3DTILES_implicit_tiling for 3DTiles v.Next or directly in implicitTiling object for 3DTiles v1.1.\n * Spec 3DTiles v.Next - https://github.com/CesiumGS/3d-tiles/tree/main/extensions/3DTILES_implicit_tiling\n * Spec 3DTiles v.1.1 - https://github.com/CesiumGS/3d-tiles/tree/draft-1.1/specification/ImplicitTiling\n * @param tile\n * @returns\n */\nfunction getImplicitTilingExtensionData(tile: Tile3D | null): ImplicitTilingExtension {\n return tile?.extensions?.['3DTILES_implicit_tiling'] || tile?.implicitTiling;\n}\n"],"mappings":"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"}
|
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
export const VERSION = typeof "3.4.0-alpha.
|
|
1
|
+
export const VERSION = typeof "3.4.0-alpha.5" !== 'undefined' ? "3.4.0-alpha.5" : 'latest';
|
|
2
2
|
//# sourceMappingURL=version.js.map
|
|
@@ -39,6 +39,7 @@ async function parseTileset(data, options, context) {
|
|
|
39
39
|
const tilesetJson = JSON.parse(new TextDecoder().decode(data));
|
|
40
40
|
tilesetJson.loader = options.loader || Tiles3DLoader;
|
|
41
41
|
tilesetJson.url = context.url;
|
|
42
|
+
tilesetJson.queryString = context.queryString;
|
|
42
43
|
tilesetJson.basePath = getBaseUri(tilesetJson);
|
|
43
44
|
tilesetJson.root = await normalizeTileHeaders(tilesetJson, options);
|
|
44
45
|
tilesetJson.type = TILESET_TYPE.TILES3D;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tiles-3d-loader.js","names":["path","TILESET_TYPE","LOD_METRIC_TYPE","VERSION","parse3DTile","normalizeTileHeaders","Tiles3DLoader","id","name","module","version","extensions","mimeTypes","tests","parse","options","loadGLTF","decodeQuantizedPositions","isTileset","assetGltfUpAxis","getBaseUri","tileset","dirname","url","parseTile","arrayBuffer","context","tile","content","featureIds","byteOffset","parseTileset","data","_tilesetJson$root","tilesetJson","JSON","TextDecoder","decode","loader","basePath","root","type","TILES3D","lodMetricType","GEOMETRIC_ERROR","lodMetricValue","loaderOptions","indexOf"],"sources":["../../src/tiles-3d-loader.ts"],"sourcesContent":["import type {LoaderWithParser} from '@loaders.gl/loader-utils';\nimport {path} from '@loaders.gl/loader-utils';\nimport {TILESET_TYPE, LOD_METRIC_TYPE} from '@loaders.gl/tiles';\nimport {VERSION} from './lib/utils/version';\nimport {parse3DTile} from './lib/parsers/parse-3d-tile';\nimport {normalizeTileHeaders} from './lib/parsers/parse-3d-tile-header';\n\n/**\n * Loader for 3D Tiles\n */\nexport const Tiles3DLoader: LoaderWithParser = {\n id: '3d-tiles',\n name: '3D Tiles',\n module: '3d-tiles',\n version: VERSION,\n extensions: ['cmpt', 'pnts', 'b3dm', 'i3dm'],\n mimeTypes: ['application/octet-stream'],\n tests: ['cmpt', 'pnts', 'b3dm', 'i3dm'],\n parse,\n options: {\n '3d-tiles': {\n loadGLTF: true,\n decodeQuantizedPositions: false,\n isTileset: 'auto',\n assetGltfUpAxis: null\n }\n }\n};\n\nfunction getBaseUri(tileset) {\n return path.dirname(tileset.url);\n}\n\nasync function parseTile(arrayBuffer, options, context) {\n const tile = {\n content: {\n featureIds: null\n }\n };\n const byteOffset = 0;\n await parse3DTile(arrayBuffer, byteOffset, options, context, tile.content);\n return tile.content;\n}\n\nasync function parseTileset(data, options, context) {\n const tilesetJson = JSON.parse(new TextDecoder().decode(data));\n // eslint-disable-next-line no-use-before-define\n tilesetJson.loader = options.loader || Tiles3DLoader;\n tilesetJson.url = context.url;\n // base path that non-absolute paths in tileset are relative to.\n tilesetJson.basePath = getBaseUri(tilesetJson);\n tilesetJson.root = await normalizeTileHeaders(tilesetJson, options);\n\n tilesetJson.type = TILESET_TYPE.TILES3D;\n\n tilesetJson.lodMetricType = LOD_METRIC_TYPE.GEOMETRIC_ERROR;\n tilesetJson.lodMetricValue = tilesetJson.root?.lodMetricValue || 0;\n\n return tilesetJson;\n}\n\nasync function parse(data, options, context) {\n // auto detect file type\n const loaderOptions = options['3d-tiles'] || {};\n let isTileset;\n if (loaderOptions.isTileset === 'auto') {\n isTileset = context.url && context.url.indexOf('.json') !== -1;\n } else {\n isTileset = loaderOptions.isTileset;\n }\n\n if (isTileset) {\n data = await parseTileset(data, options, context);\n } else {\n data = await parseTile(data, options, context);\n }\n\n return data;\n}\n"],"mappings":"AACA,SAAQA,IAAI,QAAO,0BAA0B;AAC7C,SAAQC,YAAY,EAAEC,eAAe,QAAO,mBAAmB;AAC/D,SAAQC,OAAO,QAAO,qBAAqB;AAC3C,SAAQC,WAAW,QAAO,6BAA6B;AACvD,SAAQC,oBAAoB,QAAO,oCAAoC;AAKvE,OAAO,MAAMC,aAA+B,GAAG;EAC7CC,EAAE,EAAE,UAAU;EACdC,IAAI,EAAE,UAAU;EAChBC,MAAM,EAAE,UAAU;EAClBC,OAAO,EAAEP,OAAO;EAChBQ,UAAU,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC;EAC5CC,SAAS,EAAE,CAAC,0BAA0B,CAAC;EACvCC,KAAK,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC;EACvCC,KAAK;EACLC,OAAO,EAAE;IACP,UAAU,EAAE;MACVC,QAAQ,EAAE,IAAI;MACdC,wBAAwB,EAAE,KAAK;MAC/BC,SAAS,EAAE,MAAM;MACjBC,eAAe,EAAE;IACnB;EACF;AACF,CAAC;AAED,SAASC,UAAUA,CAACC,OAAO,EAAE;EAC3B,OAAOrB,IAAI,CAACsB,OAAO,CAACD,OAAO,CAACE,GAAG,CAAC;AAClC;AAEA,eAAeC,SAASA,CAACC,WAAW,EAAEV,OAAO,EAAEW,OAAO,EAAE;EACtD,MAAMC,IAAI,GAAG;IACXC,OAAO,EAAE;MACPC,UAAU,EAAE;IACd;EACF,CAAC;EACD,MAAMC,UAAU,GAAG,CAAC;EACpB,MAAM1B,WAAW,CAACqB,WAAW,EAAEK,UAAU,EAAEf,OAAO,EAAEW,OAAO,EAAEC,IAAI,CAACC,OAAO,CAAC;EAC1E,OAAOD,IAAI,CAACC,OAAO;AACrB;AAEA,eAAeG,YAAYA,CAACC,IAAI,EAAEjB,OAAO,EAAEW,OAAO,EAAE;EAAA,IAAAO,iBAAA;EAClD,MAAMC,WAAW,GAAGC,IAAI,CAACrB,KAAK,CAAC,IAAIsB,WAAW,CAAC,CAAC,CAACC,MAAM,CAACL,IAAI,CAAC,CAAC;EAE9DE,WAAW,CAACI,MAAM,GAAGvB,OAAO,CAACuB,MAAM,IAAIhC,aAAa;EACpD4B,WAAW,CAACX,GAAG,GAAGG,OAAO,CAACH,GAAG;
|
|
1
|
+
{"version":3,"file":"tiles-3d-loader.js","names":["path","TILESET_TYPE","LOD_METRIC_TYPE","VERSION","parse3DTile","normalizeTileHeaders","Tiles3DLoader","id","name","module","version","extensions","mimeTypes","tests","parse","options","loadGLTF","decodeQuantizedPositions","isTileset","assetGltfUpAxis","getBaseUri","tileset","dirname","url","parseTile","arrayBuffer","context","tile","content","featureIds","byteOffset","parseTileset","data","_tilesetJson$root","tilesetJson","JSON","TextDecoder","decode","loader","queryString","basePath","root","type","TILES3D","lodMetricType","GEOMETRIC_ERROR","lodMetricValue","loaderOptions","indexOf"],"sources":["../../src/tiles-3d-loader.ts"],"sourcesContent":["import type {LoaderWithParser} from '@loaders.gl/loader-utils';\nimport {path} from '@loaders.gl/loader-utils';\nimport {TILESET_TYPE, LOD_METRIC_TYPE} from '@loaders.gl/tiles';\nimport {VERSION} from './lib/utils/version';\nimport {parse3DTile} from './lib/parsers/parse-3d-tile';\nimport {normalizeTileHeaders} from './lib/parsers/parse-3d-tile-header';\n\n/**\n * Loader for 3D Tiles\n */\nexport const Tiles3DLoader: LoaderWithParser = {\n id: '3d-tiles',\n name: '3D Tiles',\n module: '3d-tiles',\n version: VERSION,\n extensions: ['cmpt', 'pnts', 'b3dm', 'i3dm'],\n mimeTypes: ['application/octet-stream'],\n tests: ['cmpt', 'pnts', 'b3dm', 'i3dm'],\n parse,\n options: {\n '3d-tiles': {\n loadGLTF: true,\n decodeQuantizedPositions: false,\n isTileset: 'auto',\n assetGltfUpAxis: null\n }\n }\n};\n\nfunction getBaseUri(tileset) {\n return path.dirname(tileset.url);\n}\n\nasync function parseTile(arrayBuffer, options, context) {\n const tile = {\n content: {\n featureIds: null\n }\n };\n const byteOffset = 0;\n await parse3DTile(arrayBuffer, byteOffset, options, context, tile.content);\n return tile.content;\n}\n\nasync function parseTileset(data, options, context) {\n const tilesetJson = JSON.parse(new TextDecoder().decode(data));\n // eslint-disable-next-line no-use-before-define\n tilesetJson.loader = options.loader || Tiles3DLoader;\n tilesetJson.url = context.url;\n tilesetJson.queryString = context.queryString;\n\n // base path that non-absolute paths in tileset are relative to.\n tilesetJson.basePath = getBaseUri(tilesetJson);\n tilesetJson.root = await normalizeTileHeaders(tilesetJson, options);\n\n tilesetJson.type = TILESET_TYPE.TILES3D;\n\n tilesetJson.lodMetricType = LOD_METRIC_TYPE.GEOMETRIC_ERROR;\n tilesetJson.lodMetricValue = tilesetJson.root?.lodMetricValue || 0;\n\n return tilesetJson;\n}\n\nasync function parse(data, options, context) {\n // auto detect file type\n const loaderOptions = options['3d-tiles'] || {};\n let isTileset;\n if (loaderOptions.isTileset === 'auto') {\n isTileset = context.url && context.url.indexOf('.json') !== -1;\n } else {\n isTileset = loaderOptions.isTileset;\n }\n\n if (isTileset) {\n data = await parseTileset(data, options, context);\n } else {\n data = await parseTile(data, options, context);\n }\n\n return data;\n}\n"],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"parse-3d-tile-gltf-view.d.ts","sourceRoot":"","sources":["../../../../src/lib/parsers/helpers/parse-3d-tile-gltf-view.ts"],"names":[],"mappings":"AAYA,eAAO,MAAM,WAAW;;;CAGvB,CAAC;AAEF,wBAAgB,uBAAuB,CAAC,IAAI,KAAA,EAAE,WAAW,KAAA,EAAE,UAAU,KAAA,EAAE,OAAO,KAAA,OAoC7E;AAED,wBAAsB,WAAW,CAAC,IAAI,KAAA,EAAE,UAAU,KAAA,EAAE,OAAO,KAAA,EAAE,OAAO,KAAA,
|
|
1
|
+
{"version":3,"file":"parse-3d-tile-gltf-view.d.ts","sourceRoot":"","sources":["../../../../src/lib/parsers/helpers/parse-3d-tile-gltf-view.ts"],"names":[],"mappings":"AAYA,eAAO,MAAM,WAAW;;;CAGvB,CAAC;AAEF,wBAAgB,uBAAuB,CAAC,IAAI,KAAA,EAAE,WAAW,KAAA,EAAE,UAAU,KAAA,EAAE,OAAO,KAAA,OAoC7E;AAED,wBAAsB,WAAW,CAAC,IAAI,KAAA,EAAE,UAAU,KAAA,EAAE,OAAO,KAAA,EAAE,OAAO,KAAA,iBAoBnE"}
|
|
@@ -60,6 +60,7 @@ async function extractGLTF(tile, gltfFormat, options, context) {
|
|
|
60
60
|
if (tile.gltfArrayBuffer) {
|
|
61
61
|
// TODO - Should handle byteOffset... However, not used now...
|
|
62
62
|
tile.gltf = await parse(tile.gltfArrayBuffer, gltf_1.GLTFLoader, options, context);
|
|
63
|
+
tile.gpuMemoryUsageInBytes = (0, gltf_1._getMemoryUsageGLTF)(tile.gltf);
|
|
63
64
|
delete tile.gltfArrayBuffer;
|
|
64
65
|
delete tile.gltfByteOffset;
|
|
65
66
|
delete tile.gltfByteLength;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"parse-3d-tile-gltf.d.ts","sourceRoot":"","sources":["../../../src/lib/parsers/parse-3d-tile-gltf.ts"],"names":[],"mappings":"AAEA,wBAAsB,eAAe,CAAC,IAAI,KAAA,EAAE,WAAW,KAAA,EAAE,OAAO,KAAA,EAAE,OAAO,KAAA,
|
|
1
|
+
{"version":3,"file":"parse-3d-tile-gltf.d.ts","sourceRoot":"","sources":["../../../src/lib/parsers/parse-3d-tile-gltf.ts"],"names":[],"mappings":"AAEA,wBAAsB,eAAe,CAAC,IAAI,KAAA,EAAE,WAAW,KAAA,EAAE,OAAO,KAAA,EAAE,OAAO,KAAA,iBAcxE"}
|
|
@@ -14,5 +14,6 @@ async function parseGltf3DTile(tile, arrayBuffer, options, context) {
|
|
|
14
14
|
: 'Y';
|
|
15
15
|
const { parse } = context;
|
|
16
16
|
tile.gltf = await parse(arrayBuffer, gltf_1.GLTFLoader, options, context);
|
|
17
|
+
tile.gpuMemoryUsageInBytes = (0, gltf_1._getMemoryUsageGLTF)(tile.gltf);
|
|
17
18
|
}
|
|
18
19
|
exports.parseGltf3DTile = parseGltf3DTile;
|
|
@@ -10,7 +10,7 @@ function getTileType(tile) {
|
|
|
10
10
|
if (!tile.contentUrl) {
|
|
11
11
|
return tiles_1.TILE_TYPE.EMPTY;
|
|
12
12
|
}
|
|
13
|
-
const contentUrl = tile.contentUrl;
|
|
13
|
+
const contentUrl = tile.contentUrl.split('?')[0]; // Discard query string
|
|
14
14
|
const fileExtension = contentUrl.split('.').pop();
|
|
15
15
|
switch (fileExtension) {
|
|
16
16
|
case 'pnts':
|
package/dist/tiles-3d-loader.js
CHANGED
|
@@ -45,6 +45,7 @@ async function parseTileset(data, options, context) {
|
|
|
45
45
|
// eslint-disable-next-line no-use-before-define
|
|
46
46
|
tilesetJson.loader = options.loader || exports.Tiles3DLoader;
|
|
47
47
|
tilesetJson.url = context.url;
|
|
48
|
+
tilesetJson.queryString = context.queryString;
|
|
48
49
|
// base path that non-absolute paths in tileset are relative to.
|
|
49
50
|
tilesetJson.basePath = getBaseUri(tilesetJson);
|
|
50
51
|
tilesetJson.root = await (0, parse_3d_tile_header_1.normalizeTileHeaders)(tilesetJson, options);
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@loaders.gl/3d-tiles",
|
|
3
|
-
"version": "3.4.0-alpha.
|
|
3
|
+
"version": "3.4.0-alpha.5",
|
|
4
4
|
"description": "3D Tiles, an open standard for streaming massive heterogeneous 3D geospatial datasets.",
|
|
5
5
|
"license": "MIT",
|
|
6
6
|
"publishConfig": {
|
|
@@ -34,11 +34,11 @@
|
|
|
34
34
|
"build-bundle": "esbuild src/bundle.ts --bundle --outfile=dist/dist.min.js"
|
|
35
35
|
},
|
|
36
36
|
"dependencies": {
|
|
37
|
-
"@loaders.gl/draco": "3.4.0-alpha.
|
|
38
|
-
"@loaders.gl/gltf": "3.4.0-alpha.
|
|
39
|
-
"@loaders.gl/loader-utils": "3.4.0-alpha.
|
|
40
|
-
"@loaders.gl/math": "3.4.0-alpha.
|
|
41
|
-
"@loaders.gl/tiles": "3.4.0-alpha.
|
|
37
|
+
"@loaders.gl/draco": "3.4.0-alpha.5",
|
|
38
|
+
"@loaders.gl/gltf": "3.4.0-alpha.5",
|
|
39
|
+
"@loaders.gl/loader-utils": "3.4.0-alpha.5",
|
|
40
|
+
"@loaders.gl/math": "3.4.0-alpha.5",
|
|
41
|
+
"@loaders.gl/tiles": "3.4.0-alpha.5",
|
|
42
42
|
"@math.gl/core": "^3.5.1",
|
|
43
43
|
"@math.gl/geospatial": "^3.5.1",
|
|
44
44
|
"long": "^5.2.1"
|
|
@@ -46,5 +46,5 @@
|
|
|
46
46
|
"peerDependencies": {
|
|
47
47
|
"@loaders.gl/core": "^3.2.0"
|
|
48
48
|
},
|
|
49
|
-
"gitHead": "
|
|
49
|
+
"gitHead": "686929f85b3420c15df051eab769942b260dd242"
|
|
50
50
|
}
|
|
@@ -7,7 +7,7 @@
|
|
|
7
7
|
// - Do we add an option to control this?
|
|
8
8
|
// - Also, should we have hard dependency on gltf module or use injection or auto-discovery for gltf parser?
|
|
9
9
|
|
|
10
|
-
import {GLTFLoader} from '@loaders.gl/gltf';
|
|
10
|
+
import {_getMemoryUsageGLTF, GLTFLoader} from '@loaders.gl/gltf';
|
|
11
11
|
import {sliceArrayBuffer} from '@loaders.gl/loader-utils';
|
|
12
12
|
|
|
13
13
|
export const GLTF_FORMAT = {
|
|
@@ -67,6 +67,7 @@ export async function extractGLTF(tile, gltfFormat, options, context) {
|
|
|
67
67
|
if (tile.gltfArrayBuffer) {
|
|
68
68
|
// TODO - Should handle byteOffset... However, not used now...
|
|
69
69
|
tile.gltf = await parse(tile.gltfArrayBuffer, GLTFLoader, options, context);
|
|
70
|
+
tile.gpuMemoryUsageInBytes = _getMemoryUsageGLTF(tile.gltf);
|
|
70
71
|
delete tile.gltfArrayBuffer;
|
|
71
72
|
delete tile.gltfByteOffset;
|
|
72
73
|
delete tile.gltfByteLength;
|
|
@@ -75,7 +75,7 @@ export default async function parse3DTilesSubtree(
|
|
|
75
75
|
/**
|
|
76
76
|
* Get url for bitstream downloading
|
|
77
77
|
* @param bitstreamRelativeUri
|
|
78
|
-
* @param
|
|
78
|
+
* @param basePath
|
|
79
79
|
* @returns
|
|
80
80
|
*/
|
|
81
81
|
function resolveBufferUri(bitstreamRelativeUri: string, basePath: string): string {
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import {GLTFLoader} from '@loaders.gl/gltf';
|
|
1
|
+
import {_getMemoryUsageGLTF, GLTFLoader} from '@loaders.gl/gltf';
|
|
2
2
|
|
|
3
3
|
export async function parseGltf3DTile(tile, arrayBuffer, options, context) {
|
|
4
4
|
// Set flags
|
|
@@ -13,4 +13,5 @@ export async function parseGltf3DTile(tile, arrayBuffer, options, context) {
|
|
|
13
13
|
|
|
14
14
|
const {parse} = context;
|
|
15
15
|
tile.gltf = await parse(arrayBuffer, GLTFLoader, options, context);
|
|
16
|
+
tile.gpuMemoryUsageInBytes = _getMemoryUsageGLTF(tile.gltf);
|
|
16
17
|
}
|
|
@@ -13,7 +13,7 @@ function getTileType(tile) {
|
|
|
13
13
|
return TILE_TYPE.EMPTY;
|
|
14
14
|
}
|
|
15
15
|
|
|
16
|
-
const contentUrl = tile.contentUrl;
|
|
16
|
+
const contentUrl = tile.contentUrl.split('?')[0]; // Discard query string
|
|
17
17
|
const fileExtension = contentUrl.split('.').pop();
|
|
18
18
|
switch (fileExtension) {
|
|
19
19
|
case 'pnts':
|
package/src/tiles-3d-loader.ts
CHANGED
|
@@ -47,6 +47,8 @@ async function parseTileset(data, options, context) {
|
|
|
47
47
|
// eslint-disable-next-line no-use-before-define
|
|
48
48
|
tilesetJson.loader = options.loader || Tiles3DLoader;
|
|
49
49
|
tilesetJson.url = context.url;
|
|
50
|
+
tilesetJson.queryString = context.queryString;
|
|
51
|
+
|
|
50
52
|
// base path that non-absolute paths in tileset are relative to.
|
|
51
53
|
tilesetJson.basePath = getBaseUri(tilesetJson);
|
|
52
54
|
tilesetJson.root = await normalizeTileHeaders(tilesetJson, options);
|