@loaders.gl/tiles 4.4.0-alpha.2 → 4.4.0

package/README.md

@@ -1,4 +1,4 @@
-# @loaders.gl/tiles (Experimental)
+# @loaders.gl/tiles
 
 This module contains the common components for tiles loaders, i.e. [3D tiles](https://github.com/AnalyticalGraphicsInc/3d-tiles).
 

package/dist/constants.js

@@ -36,3 +36,4 @@ export const TILE3D_OPTIMIZATION_HINT = {
     USE_OPTIMIZATION: 1,
     SKIP_OPTIMIZATION: 0
 };
+//# sourceMappingURL=constants.js.map

package/dist/constants.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"constants.js","sourceRoot":"","sources":["../src/constants.ts"],"names":[],"mappings":"AAAA,aAAa;AACb,+BAA+B;AAC/B,oCAAoC;AAUpC,MAAM,CAAC,MAAM,kBAAkB,GAAG;IAChC,QAAQ,EAAE,CAAC,EAAE,2BAA2B;IACxC,OAAO,EAAE,CAAC,EAAE,kCAAkC;IAC9C,UAAU,EAAE,CAAC,EAAE,8IAA8I;IAC7J,KAAK,EAAE,CAAC,EAAE,mBAAmB;IAC7B,OAAO,EAAE,CAAC,EAAE,8DAA8D;IAC1E,MAAM,EAAE,CAAC,CAAC,kBAAkB;CAC7B,CAAC;AAIF,MAAM,CAAN,IAAY,eAGX;AAHD,WAAY,eAAe;IACzB,mDAAO,CAAA;IACP,2DAAW,CAAA,CAAC,qFAAqF;AACnG,CAAC,EAHW,eAAe,KAAf,eAAe,QAG1B;AAID,MAAM,CAAN,IAAY,SAKX;AALD,WAAY,SAAS;IACnB,4BAAe,CAAA;IACf,sCAAyB,CAAA;IACzB,sCAAyB,CAAA;IACzB,0BAAa,CAAA;AACf,CAAC,EALW,SAAS,KAAT,SAAS,QAKpB;AAID,MAAM,CAAN,IAAY,YAGX;AAHD,WAAY,YAAY;IACtB,2BAAW,CAAA;IACX,mCAAmB,CAAA;AACrB,CAAC,EAHW,YAAY,KAAZ,YAAY,QAGvB;AAID,MAAM,CAAN,IAAY,eAGX;AAHD,WAAY,eAAe;IACzB,qDAAkC,CAAA;IAClC,8DAA2C,CAAA;AAC7C,CAAC,EAHW,eAAe,KAAf,eAAe,QAG1B;AAKD,MAAM,CAAC,MAAM,wBAAwB,GAAG;IACtC,YAAY,EAAE,CAAC,CAAC;IAChB,gBAAgB,EAAE,CAAC;IACnB,iBAAiB,EAAE,CAAC;CACrB,CAAC"}

package/dist/dist.dev.js

@@ -4981,6 +4981,20 @@ var __exports__ = (() => {
       this.stats.get(STAT_QUEUED_REQUESTS_EVER);
       this.stats.get(STAT_ACTIVE_REQUESTS_EVER);
     }
+    /**
+     * Update scheduler props. Preserves active and queued requests.
+     */
+    setProps(props) {
+      if (props.throttleRequests !== void 0) {
+        this.props.throttleRequests = props.throttleRequests;
+      }
+      if (props.maxRequests !== void 0) {
+        this.props.maxRequests = props.maxRequests;
+      }
+      if (props.debounceTime !== void 0) {
+        this.props.debounceTime = props.debounceTime;
+      }
+    }
     /**
      * Called by an application that wants to issue a request, without having it deeply queued by the browser
      *
@@ -5100,7 +5114,7 @@ var __exports__ = (() => {
   // ../loader-utils/src/lib/path-utils/path.ts
   function filename(url) {
     const slashIndex = url ? url.lastIndexOf("/") : -1;
-    return slashIndex >= 0 ? url.substr(slashIndex + 1) : "";
+    return slashIndex >= 0 ? url.substr(slashIndex + 1) : url;
   }
   function dirname(url) {
     const slashIndex = url ? url.lastIndexOf("/") : -1;
@@ -5407,10 +5421,33 @@ var __exports__ = (() => {
     const toFixedFrameMatrix = fromFixedFrameMatrix.invert();
     tile.cartographicModelMatrix = toFixedFrameMatrix.multiplyRight(modelMatrix);
     tile.cartographicOrigin = cartographicOrigin;
+    const rootNode = _getRootNode(tile);
+    if (rootNode) {
+      tile.cartesianModelMatrix = new Matrix4(modelMatrix).multiplyRight(rootNode.matrix);
+      tile.cartographicModelMatrix.multiplyRight(rootNode.matrix);
+      rootNode.matrix = Matrix4.IDENTITY;
+    }
     if (!tile.coordinateSystem) {
       tile.modelMatrix = tile.cartographicModelMatrix;
     }
   }
+  var TRANSLATION_LIMIT_SQUARED = 1e6 ** 2;
+  function _getRootNode(tile) {
+    const gltf = tile.gltf;
+    if (!gltf) {
+      return null;
+    }
+    const sceneIndex = typeof gltf.scene === "number" ? gltf.scene : 0;
+    const scene = gltf.scenes?.[sceneIndex];
+    const rootNode = scene?.nodes?.[0];
+    if (!rootNode?.matrix)
+      return null;
+    const m = rootNode.matrix;
+    const translationMagnitude = m[12] * m[12] + m[13] * m[13] + m[14] * m[14];
+    if (translationMagnitude <= TRANSLATION_LIMIT_SQUARED)
+      return null;
+    return rootNode;
+  }
 
   // ../../node_modules/@math.gl/culling/dist/constants.js
   var INTERSECTION = {
@@ -6833,7 +6870,7 @@ var __exports__ = (() => {
           }
         }
       }
-      return allDescendantsLoaded;
+      return root.hasEmptyContent || allDescendantsLoaded;
     }
   };
 
@@ -6907,6 +6944,13 @@ var __exports__ = (() => {
     _inRequestVolume = false;
     _lodJudge = null;
     // TODO i3s specific, needs to remove
+    /**
+     * Indicates whether the tile has been drawn by the renderer.
+     * Defaults to true for backwards compatibility — renderers that support
+     * transition hold (e.g. deck.gl 9.3+) should set this to false on tile load,
+     * then back to true after first draw to avoid flashes (see deck.gl #7914).
+     */
+    tileDrawn = true;
     /**
      * @constructs
      * Create a Tile3D instance
@@ -7093,14 +7137,15 @@ var __exports__ = (() => {
       try {
         const contentUrl = this.tileset.getTileUrl(this.contentUrl);
         const loader = this.tileset.loader;
+        const tilesetLoaderOptions = this.tileset.loadOptions[loader.id] || {};
         const options = {
           ...this.tileset.loadOptions,
           [loader.id]: {
-            // @ts-expect-error
-            ...this.tileset.loadOptions[loader.id],
+            ...tilesetLoaderOptions,
             isTileset: this.type === "json",
             ...this._getLoaderSpecificOptions(loader.id)
           }
+          // TODO add typecheck - as const satisfies ...
         };
         this.content = await (0, import_core21.load)(contentUrl, loader, options);
         if (this.tileset.options.contentLoader) {
@@ -7130,6 +7175,7 @@ var __exports__ = (() => {
       }
       this.header.content = null;
       this.contentState = TILE_CONTENT_STATE.UNLOADED;
+      this.tileDrawn = true;
       return true;
     }
     /**
@@ -7623,6 +7669,8 @@ var __exports__ = (() => {
     onTileError: () => {
     },
     onTraversalComplete: (selectedTiles) => selectedTiles,
+    onUpdate: () => {
+    },
     contentLoader: void 0,
     viewDistanceScale: 1,
     maximumScreenSpaceError: 8,
@@ -7716,6 +7764,8 @@ var __exports__ = (() => {
     _traverser;
     _cache = new TilesetCache();
     _requestScheduler;
+    /** Tile IDs held visible during transitions until replacements have drawn */
+    _heldTiles = /* @__PURE__ */ new Set();
     // Promise tracking
     updatePromise = null;
     tilesetInitializationPromise;
@@ -7928,6 +7978,7 @@ var __exports__ = (() => {
      * Update tiles relying on data from all traversers
      */
     _updateTiles() {
+      const previousSelectedTiles = this.selectedTiles;
       this.selectedTiles = [];
       this._requestedTiles = [];
       this._emptyTiles = [];
@@ -7938,12 +7989,42 @@ var __exports__ = (() => {
         this._emptyTiles = this._emptyTiles.concat(frameStateDataValue._emptyTiles);
       }
       this.selectedTiles = this.options.onTraversalComplete(this.selectedTiles);
+      const selectedIds = new Set(this.selectedTiles.map((t) => t.id));
+      const hasUndrawnTiles = this.selectedTiles.some((t) => !t.tileDrawn);
+      let heldBackCount = 0;
+      if (hasUndrawnTiles) {
+        for (const tileId of selectedIds) {
+          this._heldTiles.add(tileId);
+        }
+        for (const tileId of this._heldTiles) {
+          if (selectedIds.has(tileId))
+            continue;
+          const tile = this._tiles[tileId];
+          if (tile && tile.contentAvailable) {
+            tile._selectedFrame = this._frameNumber;
+            this.selectedTiles.push(tile);
+            heldBackCount++;
+          } else {
+            this._heldTiles.delete(tileId);
+          }
+        }
+      } else {
+        this._heldTiles = selectedIds;
+      }
+      if (heldBackCount > 0) {
+        setTimeout(() => {
+          this.selectTiles();
+        }, 0);
+      }
       for (const tile of this.selectedTiles) {
         this._tiles[tile.id] = tile;
       }
       this._loadTiles();
       this._unloadTiles();
       this._updateStats();
+      if (this._tilesChanged(previousSelectedTiles, this.selectedTiles)) {
+        this.options.onUpdate();
+      }
     }
     _tilesChanged(oldSelectedTiles, selectedTiles) {
       if (oldSelectedTiles.length !== selectedTiles.length) {
@@ -7956,6 +8037,7 @@ var __exports__ = (() => {
       return changed;
     }
     _loadTiles() {
+      this._requestedTiles.sort((a, b) => a._priority - b._priority);
       for (const tile of this._requestedTiles) {
         if (tile.contentUnloaded) {
           this._loadTile(tile);
@@ -8277,8 +8359,9 @@ var __exports__ = (() => {
       this.extras = tilesetJson.extras;
     }
     _initializeI3STileset() {
-      if (this.loadOptions.i3s && "token" in this.loadOptions.i3s) {
-        this._queryParams.token = this.loadOptions.i3s.token;
+      const i3sOptions = this.loadOptions.i3s;
+      if (i3sOptions && typeof i3sOptions === "object" && "token" in i3sOptions) {
+        this._queryParams.token = i3sOptions.token;
       }
     }
   };