@loaders.gl/tile-converter 3.3.3 → 3.3.5

package/dist/dist.min.js

@@ -67658,6 +67658,9 @@ var Tile3D = class {
   unselect() {
     this._selectedFrame = 0;
   }
+  _getGpuMemoryUsageInBytes() {
+    return this.content.gpuMemoryUsageInBytes || this.content.byteLength || 0;
+  }
   _getPriority() {
     const traverser = this.tileset._traverser;
     const { skipLevelOfDetail } = traverser.options;
@@ -67857,6 +67860,8 @@ var Tile3D = class {
     }
     if (this._isTileset()) {
       this.hasTilesetContent = true;
+    } else {
+      this.gpuMemoryUsageInBytes = this._getGpuMemoryUsageInBytes();
     }
   }
   _updateBoundingVolume(header) {
@@ -68200,7 +68205,7 @@ var Tileset3D = class {
   }
   get queryParams() {
     if (!this._queryParamsString) {
-      this._queryParamsString = getQueryParamString(this._queryParams);
+      this._queryParamsString = new URLSearchParams(this._queryParams).toString();
     }
     return this._queryParamsString;
   }
@@ -68215,7 +68220,7 @@ var Tileset3D = class {
     if (isDataUrl) {
       return tilePath;
     }
-    return `${tilePath}${this.queryParams}`;
+    return `${tilePath}${tilePath.includes("?") ? "&" : "?"}${this.queryParams}`;
   }
   hasExtension(extensionName) {
     return Boolean(this._extensionsUsed && this._extensionsUsed.indexOf(extensionName) > -1);
@@ -68448,6 +68453,10 @@ var Tileset3D = class {
         const children = tile.header.children || [];
         for (const childHeader of children) {
           const childTile = new Tile3D(this, childHeader, tile);
+          if (childTile.contentUrl?.includes("?session=")) {
+            const url = new URL(childTile.contentUrl);
+            this._queryParams.session = url.searchParams.get("session");
+          }
           tile.children.push(childTile);
           childTile.depth = tile.depth + 1;
           stack2.push(childTile);
@@ -68553,11 +68562,11 @@ var Tileset3D = class {
   _updateCacheStats(tile) {
     this.stats.get(TILES_LOADED).incrementCount();
     this.stats.get(TILES_IN_MEMORY).incrementCount();
-    this.gpuMemoryUsageInBytes += tile.content.byteLength || 0;
+    this.gpuMemoryUsageInBytes += tile.gpuMemoryUsageInBytes || 0;
     this.stats.get(TILES_GPU_MEMORY).count = this.gpuMemoryUsageInBytes;
   }
   _unloadTile(tile) {
-    this.gpuMemoryUsageInBytes -= tile.content && tile.content.byteLength || 0;
+    this.gpuMemoryUsageInBytes -= tile.gpuMemoryUsageInBytes || 0;
     this.stats.get(TILES_IN_MEMORY).decrementCount();
     this.stats.get(TILES_UNLOADED).incrementCount();
     this.stats.get(TILES_GPU_MEMORY).count = this.gpuMemoryUsageInBytes;
@@ -68624,20 +68633,6 @@ var Tileset3D = class {
     }
   }
 };
-function getQueryParamString(queryParams) {
-  const queryParamStrings = [];
-  for (const key of Object.keys(queryParams)) {
-    queryParamStrings.push(`${key}=${queryParams[key]}`);
-  }
-  switch (queryParamStrings.length) {
-    case 0:
-      return "";
-    case 1:
-      return `?${queryParamStrings[0]}`;
-    default:
-      return `?${queryParamStrings.join("&")}`;
-  }
-}
 
 // ../3d-tiles/src/lib/utils/version.ts
 var VERSION5 = typeof __VERSION__ !== "undefined" ? __VERSION__ : "latest";
@@ -72196,6 +72191,19 @@ function getAccessorArrayTypeAndLength(accessor, bufferView) {
   assert6(byteLength >= 0 && byteLength <= bufferView.byteLength);
   return { ArrayType, length, byteLength };
 }
+function getMemoryUsageGLTF(gltf) {
+  let { images, bufferViews } = gltf;
+  images = images || [];
+  bufferViews = bufferViews || [];
+  const imageBufferViews = images.map((i) => i.bufferView);
+  bufferViews = bufferViews.filter((view) => !imageBufferViews.includes(view));
+  const bufferMemory = bufferViews.reduce((acc, view) => acc + view.byteLength, 0);
+  const pixelCount = images.reduce((acc, image) => {
+    const { width, height } = image.image;
+    return acc + width * height;
+  }, 0);
+  return bufferMemory + Math.ceil(4 * pixelCount * 1.33);
+}
 
 // ../gltf/src/lib/api/gltf-scenegraph.ts
 var DEFAULT_GLTF_JSON = {
@@ -74281,6 +74289,7 @@ async function extractGLTF(tile, gltfFormat, options, context) {
     }
     if (tile.gltfArrayBuffer) {
       tile.gltf = await parse9(tile.gltfArrayBuffer, GLTFLoader, options, context);
+      tile.gpuMemoryUsageInBytes = getMemoryUsageGLTF(tile.gltf);
       delete tile.gltfArrayBuffer;
       delete tile.gltfByteOffset;
       delete tile.gltfByteLength;
@@ -74488,6 +74497,7 @@ async function parseGltf3DTile(tile, arrayBuffer, options, context) {
   tile.gltfUpAxis = options["3d-tiles"] && options["3d-tiles"].assetGltfUpAxis ? options["3d-tiles"].assetGltfUpAxis : "Y";
   const { parse: parse9 } = context;
   tile.gltf = await parse9(arrayBuffer, GLTFLoader, options, context);
+  tile.gpuMemoryUsageInBytes = getMemoryUsageGLTF(tile.gltf);
 }
 
 // ../3d-tiles/src/lib/parsers/parse-3d-tile.ts
@@ -74772,7 +74782,7 @@ function getTileType(tile) {
   if (!tile.contentUrl) {
     return TILE_TYPE.EMPTY;
   }
-  const contentUrl = tile.contentUrl;
+  const contentUrl = tile.contentUrl.split("?")[0];
   const fileExtension = contentUrl.split(".").pop();
   switch (fileExtension) {
     case "pnts":

package/dist/es5/3d-tiles-attributes-worker.js

@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 exports._typecheckI3SAttributesWorker = exports.Tile3dAttributesWorker = void 0;
 exports.transform3DTilesAttributesOnWorker = transform3DTilesAttributesOnWorker;
 var _workerUtils = require("@loaders.gl/worker-utils");
-var VERSION = typeof "3.3.3" !== 'undefined' ? "3.3.3" : 'latest';
+var VERSION = typeof "3.3.5" !== 'undefined' ? "3.3.5" : 'latest';
 var Tile3dAttributesWorker = {
   id: '3d-tiles-attributes',
   name: '3DTiles Attributes Worker',

package/dist/es5/deps-installer/deps-installer.js

@@ -14,7 +14,7 @@ var _zip = require("@loaders.gl/zip");
 var _fileUtils = require("../lib/utils/file-utils");
 var _path = require("path");
 var _workerUtils = require("@loaders.gl/worker-utils");
-var VERSION = typeof "3.3.3" !== 'undefined' ? "3.3.3" : 'beta';
+var VERSION = typeof "3.3.5" !== 'undefined' ? "3.3.5" : 'beta';
 var PGM_LINK = 'https://raw.githubusercontent.com/visgl/deck.gl-data/master/egm/egm2008-5.zip';
 
 var DepsInstaller = function () {

package/dist/es5/i3s-attributes-worker.js

@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 exports._typecheckI3SAttributesWorker = exports.I3SAttributesWorker = void 0;
 exports.transformI3SAttributesOnWorker = transformI3SAttributesOnWorker;
 var _workerUtils = require("@loaders.gl/worker-utils");
-var VERSION = typeof "3.3.3" !== 'undefined' ? "3.3.3" : 'latest';
+var VERSION = typeof "3.3.5" !== 'undefined' ? "3.3.5" : 'latest';
 var I3SAttributesWorker = {
   id: 'i3s-attributes',
   name: 'I3S Attributes Worker',

package/dist/es5/pgm-loader.js

@@ -8,7 +8,7 @@ exports.PGMLoader = void 0;
 var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 var _geoid = require("@math.gl/geoid");
-var VERSION = typeof "3.3.3" !== 'undefined' ? "3.3.3" : 'latest';
+var VERSION = typeof "3.3.5" !== 'undefined' ? "3.3.5" : 'latest';
 
 var PGMLoader = {
   name: 'PGM - Netpbm grayscale image format',

package/dist/esm/3d-tiles-attributes-worker.js

@@ -1,6 +1,6 @@
 import { processOnWorker } from '@loaders.gl/worker-utils';
 
-const VERSION = typeof "3.3.3" !== 'undefined' ? "3.3.3" : 'latest';
+const VERSION = typeof "3.3.5" !== 'undefined' ? "3.3.5" : 'latest';
 export const Tile3dAttributesWorker = {
   id: '3d-tiles-attributes',
   name: '3DTiles Attributes Worker',

package/dist/esm/deps-installer/deps-installer.js

@@ -4,7 +4,7 @@ import { writeFile } from '../lib/utils/file-utils';
 import { join } from 'path';
 import { ChildProcessProxy } from '@loaders.gl/worker-utils';
 
-const VERSION = typeof "3.3.3" !== 'undefined' ? "3.3.3" : 'beta';
+const VERSION = typeof "3.3.5" !== 'undefined' ? "3.3.5" : 'beta';
 const PGM_LINK = 'https://raw.githubusercontent.com/visgl/deck.gl-data/master/egm/egm2008-5.zip';
 
 export class DepsInstaller {

package/dist/esm/i3s-attributes-worker.js

@@ -1,6 +1,6 @@
 import { processOnWorker } from '@loaders.gl/worker-utils';
 
-const VERSION = typeof "3.3.3" !== 'undefined' ? "3.3.3" : 'latest';
+const VERSION = typeof "3.3.5" !== 'undefined' ? "3.3.5" : 'latest';
 export const I3SAttributesWorker = {
   id: 'i3s-attributes',
   name: 'I3S Attributes Worker',

package/dist/esm/pgm-loader.js

@@ -1,6 +1,6 @@
 import { parsePGM } from '@math.gl/geoid';
 
-const VERSION = typeof "3.3.3" !== 'undefined' ? "3.3.3" : 'latest';
+const VERSION = typeof "3.3.5" !== 'undefined' ? "3.3.5" : 'latest';
 
 export const PGMLoader = {
   name: 'PGM - Netpbm grayscale image format',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@loaders.gl/tile-converter",
-  "version": "3.3.3",
+  "version": "3.3.5",
   "description": "Converter",
   "license": "MIT",
   "publishConfig": {
@@ -44,19 +44,19 @@
     "build-3d-tiles-attributes-worker": "esbuild src/workers/3d-tiles-attributes-worker.ts --outfile=dist/3d-tiles-attributes-worker.js --platform=node --target=esnext,node14 --external:join-images --minify --bundle --sourcemap --define:__VERSION__=\\\"$npm_package_version\\\""
   },
   "dependencies": {
-    "@loaders.gl/3d-tiles": "3.3.3",
-    "@loaders.gl/crypto": "3.3.3",
-    "@loaders.gl/draco": "3.3.3",
-    "@loaders.gl/gltf": "3.3.3",
-    "@loaders.gl/i3s": "3.3.3",
-    "@loaders.gl/images": "3.3.3",
-    "@loaders.gl/loader-utils": "3.3.3",
-    "@loaders.gl/polyfills": "3.3.3",
-    "@loaders.gl/schema": "3.3.3",
-    "@loaders.gl/textures": "3.3.3",
-    "@loaders.gl/tiles": "3.3.3",
-    "@loaders.gl/worker-utils": "3.3.3",
-    "@loaders.gl/zip": "3.3.3",
+    "@loaders.gl/3d-tiles": "3.3.5",
+    "@loaders.gl/crypto": "3.3.5",
+    "@loaders.gl/draco": "3.3.5",
+    "@loaders.gl/gltf": "3.3.5",
+    "@loaders.gl/i3s": "3.3.5",
+    "@loaders.gl/images": "3.3.5",
+    "@loaders.gl/loader-utils": "3.3.5",
+    "@loaders.gl/polyfills": "3.3.5",
+    "@loaders.gl/schema": "3.3.5",
+    "@loaders.gl/textures": "3.3.5",
+    "@loaders.gl/tiles": "3.3.5",
+    "@loaders.gl/worker-utils": "3.3.5",
+    "@loaders.gl/zip": "3.3.5",
     "@luma.gl/engine": "^8.5.4",
     "@math.gl/core": "^3.5.1",
     "@math.gl/culling": "^3.5.1",
@@ -80,5 +80,5 @@
     "join-images": "^1.1.3",
     "sharp": "^0.31.3"
   },
-  "gitHead": "44f4e272d8216f226a332eaae81e832e44c7e474"
+  "gitHead": "8aaa7fea4b7d72536d9d1f7d79688ec6702b2904"
 }