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

package/dist/index.cjs

@@ -224,10 +224,34 @@ function calculateTransformProps(tileHeader, tile) {
   const toFixedFrameMatrix = fromFixedFrameMatrix.invert();
   tile.cartographicModelMatrix = toFixedFrameMatrix.multiplyRight(modelMatrix);
   tile.cartographicOrigin = cartographicOrigin;
+  const rootNode = _getRootNode(tile);
+  if (rootNode) {
+    tile.cartesianModelMatrix = new import_core.Matrix4(modelMatrix).multiplyRight(rootNode.matrix);
+    tile.cartographicModelMatrix.multiplyRight(rootNode.matrix);
+    rootNode.matrix = import_core.Matrix4.IDENTITY;
+  }
   if (!tile.coordinateSystem) {
     tile.modelMatrix = tile.cartographicModelMatrix;
   }
 }
+var TRANSLATION_LIMIT_SQUARED = 1e6 ** 2;
+function _getRootNode(tile) {
+  var _a, _b;
+  const gltf = tile.gltf;
+  if (!gltf) {
+    return null;
+  }
+  const sceneIndex = typeof gltf.scene === "number" ? gltf.scene : 0;
+  const scene = (_a = gltf.scenes) == null ? void 0 : _a[sceneIndex];
+  const rootNode = (_b = scene == null ? void 0 : scene.nodes) == null ? void 0 : _b[0];
+  if (!(rootNode == null ? void 0 : 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;
+}
 
 // dist/tileset/helpers/frame-state.js
 var import_core2 = require("@math.gl/core");
@@ -1095,7 +1119,7 @@ var TilesetTraverser = class {
         }
       }
     }
-    return allDescendantsLoaded;
+    return root.hasEmptyContent || allDescendantsLoaded;
   }
 };
 
@@ -1169,6 +1193,13 @@ var Tile3D = class {
   _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
@@ -1350,14 +1381,15 @@ var Tile3D = class {
     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_core8.load)(contentUrl, loader, options);
       if (this.tileset.options.contentLoader) {
@@ -1387,6 +1419,7 @@ var Tile3D = class {
     }
     this.header.content = null;
     this.contentState = TILE_CONTENT_STATE.UNLOADED;
+    this.tileDrawn = true;
     return true;
   }
   /**
@@ -1847,6 +1880,8 @@ var DEFAULT_PROPS2 = {
   onTileError: () => {
   },
   onTraversalComplete: (selectedTiles) => selectedTiles,
+  onUpdate: () => {
+  },
   contentLoader: void 0,
   viewDistanceScale: 1,
   maximumScreenSpaceError: 8,
@@ -1940,6 +1975,8 @@ var Tileset3D = class {
   _traverser;
   _cache = new TilesetCache();
   _requestScheduler;
+  /** Tile IDs held visible during transitions until replacements have drawn */
+  _heldTiles = /* @__PURE__ */ new Set();
   // Promise tracking
   updatePromise = null;
   tilesetInitializationPromise;
@@ -2145,6 +2182,7 @@ var Tileset3D = class {
    * Update tiles relying on data from all traversers
    */
   _updateTiles() {
+    const previousSelectedTiles = this.selectedTiles;
     this.selectedTiles = [];
     this._requestedTiles = [];
     this._emptyTiles = [];
@@ -2155,12 +2193,42 @@ var Tileset3D = class {
       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) {
@@ -2173,6 +2241,7 @@ var Tileset3D = class {
     return changed;
   }
   _loadTiles() {
+    this._requestedTiles.sort((a, b) => a._priority - b._priority);
     for (const tile of this._requestedTiles) {
       if (tile.contentUnloaded) {
         this._loadTile(tile);
@@ -2494,8 +2563,9 @@ var Tileset3D = class {
     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;
     }
   }
 };