@loaders.gl/3d-tiles 3.4.0-alpha.3 → 3.4.0-alpha.5

package/dist/lib/parsers/helpers/parse-3d-tile-subtree.js

@@ -43,7 +43,7 @@ exports.default = parse3DTilesSubtree;
 /**
  * Get url for bitstream downloading
  * @param bitstreamRelativeUri
- * @param baseUri
+ * @param basePath
  * @returns
  */
 function resolveBufferUri(bitstreamRelativeUri, basePath) {

package/dist/lib/parsers/parse-3d-tile-gltf.d.ts.map

@@ -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,iBAaxE"}
+{"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"}

package/dist/lib/parsers/parse-3d-tile-gltf.js

@@ -14,5 +14,6 @@ async function parseGltf3DTile(tile, arrayBuffer, options, context) {
             : 'Y';
     const { parse } = context;
     tile.gltf = await parse(arrayBuffer, gltf_1.GLTFLoader, options, context);
+    tile.gpuMemoryUsageInBytes = (0, gltf_1._getMemoryUsageGLTF)(tile.gltf);
 }
 exports.parseGltf3DTile = parseGltf3DTile;

package/dist/lib/parsers/parse-3d-tile-header.js

@@ -10,7 +10,7 @@ function getTileType(tile) {
     if (!tile.contentUrl) {
         return tiles_1.TILE_TYPE.EMPTY;
     }
-    const contentUrl = tile.contentUrl;
+    const contentUrl = tile.contentUrl.split('?')[0]; // Discard query string
     const fileExtension = contentUrl.split('.').pop();
     switch (fileExtension) {
         case 'pnts':

package/dist/tiles-3d-loader.js

@@ -45,6 +45,7 @@ async function parseTileset(data, options, context) {
     // eslint-disable-next-line no-use-before-define
     tilesetJson.loader = options.loader || exports.Tiles3DLoader;
     tilesetJson.url = context.url;
+    tilesetJson.queryString = context.queryString;
     // base path that non-absolute paths in tileset are relative to.
     tilesetJson.basePath = getBaseUri(tilesetJson);
     tilesetJson.root = await (0, parse_3d_tile_header_1.normalizeTileHeaders)(tilesetJson, options);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@loaders.gl/3d-tiles",
-  "version": "3.4.0-alpha.3",
+  "version": "3.4.0-alpha.5",
   "description": "3D Tiles, an open standard for streaming massive heterogeneous 3D geospatial datasets.",
   "license": "MIT",
   "publishConfig": {
@@ -34,11 +34,11 @@
     "build-bundle": "esbuild src/bundle.ts --bundle --outfile=dist/dist.min.js"
   },
   "dependencies": {
-    "@loaders.gl/draco": "3.4.0-alpha.3",
-    "@loaders.gl/gltf": "3.4.0-alpha.3",
-    "@loaders.gl/loader-utils": "3.4.0-alpha.3",
-    "@loaders.gl/math": "3.4.0-alpha.3",
-    "@loaders.gl/tiles": "3.4.0-alpha.3",
+    "@loaders.gl/draco": "3.4.0-alpha.5",
+    "@loaders.gl/gltf": "3.4.0-alpha.5",
+    "@loaders.gl/loader-utils": "3.4.0-alpha.5",
+    "@loaders.gl/math": "3.4.0-alpha.5",
+    "@loaders.gl/tiles": "3.4.0-alpha.5",
     "@math.gl/core": "^3.5.1",
     "@math.gl/geospatial": "^3.5.1",
     "long": "^5.2.1"
@@ -46,5 +46,5 @@
   "peerDependencies": {
     "@loaders.gl/core": "^3.2.0"
   },
-  "gitHead": "a954528dd1d78a1f128d8f6b07e4baeb7a296924"
+  "gitHead": "686929f85b3420c15df051eab769942b260dd242"
 }

package/src/lib/parsers/helpers/parse-3d-tile-gltf-view.ts

@@ -7,7 +7,7 @@
 // - Do we add an option to control this?
 // - Also, should we have hard dependency on gltf module or use injection or auto-discovery for gltf parser?
 
-import {GLTFLoader} from '@loaders.gl/gltf';
+import {_getMemoryUsageGLTF, GLTFLoader} from '@loaders.gl/gltf';
 import {sliceArrayBuffer} from '@loaders.gl/loader-utils';
 
 export const GLTF_FORMAT = {
@@ -67,6 +67,7 @@ export async function extractGLTF(tile, gltfFormat, options, context) {
     if (tile.gltfArrayBuffer) {
       // TODO - Should handle byteOffset... However, not used now...
       tile.gltf = await parse(tile.gltfArrayBuffer, GLTFLoader, options, context);
+      tile.gpuMemoryUsageInBytes = _getMemoryUsageGLTF(tile.gltf);
       delete tile.gltfArrayBuffer;
       delete tile.gltfByteOffset;
       delete tile.gltfByteLength;

package/src/lib/parsers/helpers/parse-3d-tile-subtree.ts

@@ -75,7 +75,7 @@ export default async function parse3DTilesSubtree(
 /**
  * Get url for bitstream downloading
  * @param bitstreamRelativeUri
- * @param baseUri
+ * @param basePath
  * @returns
  */
 function resolveBufferUri(bitstreamRelativeUri: string, basePath: string): string {

package/src/lib/parsers/parse-3d-tile-gltf.ts

@@ -1,4 +1,4 @@
-import {GLTFLoader} from '@loaders.gl/gltf';
+import {_getMemoryUsageGLTF, GLTFLoader} from '@loaders.gl/gltf';
 
 export async function parseGltf3DTile(tile, arrayBuffer, options, context) {
   // Set flags
@@ -13,4 +13,5 @@ export async function parseGltf3DTile(tile, arrayBuffer, options, context) {
 
   const {parse} = context;
   tile.gltf = await parse(arrayBuffer, GLTFLoader, options, context);
+  tile.gpuMemoryUsageInBytes = _getMemoryUsageGLTF(tile.gltf);
 }

package/src/lib/parsers/parse-3d-tile-header.ts

@@ -13,7 +13,7 @@ function getTileType(tile) {
     return TILE_TYPE.EMPTY;
   }
 
-  const contentUrl = tile.contentUrl;
+  const contentUrl = tile.contentUrl.split('?')[0]; // Discard query string
   const fileExtension = contentUrl.split('.').pop();
   switch (fileExtension) {
     case 'pnts':

package/src/tiles-3d-loader.ts

@@ -47,6 +47,8 @@ async function parseTileset(data, options, context) {
   // eslint-disable-next-line no-use-before-define
   tilesetJson.loader = options.loader || Tiles3DLoader;
   tilesetJson.url = context.url;
+  tilesetJson.queryString = context.queryString;
+
   // base path that non-absolute paths in tileset are relative to.
   tilesetJson.basePath = getBaseUri(tilesetJson);
   tilesetJson.root = await normalizeTileHeaders(tilesetJson, options);