Merge branch 'main' into tile-sse

Author: j9liu

CHANGES.md

@@ -1,10 +1,21 @@
 # Change Log
 
+### v0.57.0 - 2026-02-02
+
+##### Additions :tada:
+
+- Added an overload for `AsyncSystem::all` that supports multiple futures that resolve to different types. Futures that resolve to `void` are currently unsupported by this overload.
+
+##### Fixes :wrench:
+
+- Fixed a bug in `Tileset::loadMetadata` that did not account for cases where the root tile could be `nullptr`, e.g., after attempting to load a tileset from an invalid URL.
+- Fixed a bug that could cause an assertion failure or crash when destroying a `Cesium3DTilesSelection::Tileset` very soon after creating it using the constructor taking a custom `TilesetContentLoader` or `TilesetContentLoaderFactory`.
+
 ### v0.56.0 - 2026-01-05
 
 ##### Breaking Changes :mega:
 
-- `CesiumIonClient::Connection::authorize` now returns a `CesiumUtility::Result<Connection>`. This removes the previous behavior of throwing an exception when authorization failed. 
+- `CesiumIonClient::Connection::authorize` now returns a `CesiumUtility::Result<Connection>`. This removes the previous behavior of throwing an exception when authorization failed.
 - `SharedAssetDepot` will no longer cache asset loads that fail with an exception / `Future` rejection, allowing them to be retried. Other types of load failures are cached as before.
 
 ##### Additions :tada:

CMakeLists.txt

@@ -194,7 +194,7 @@ endif()
 include("cmake/defaults.cmake")
 
 project(cesium-native
-    VERSION 0.56.0
+    VERSION 0.57.0
     LANGUAGES CXX C
 )
 

Cesium3DTilesSelection/include/Cesium3DTilesSelection/Tileset.h

@@ -119,8 +119,11 @@ class CESIUM3DTILESSELECTION_API Tileset final {
 
   /**
    * @brief A future that resolves when the details of the root tile of this
-   * tileset are available. The root tile's content (e.g., 3D model), however,
-   * will not necessarily be loaded yet.
+   * tileset are available. The root tile may still be nullptr if the tileset
+   * failed to load (e.g., from an invalid URL).
+   *
+   * Moreover, the root tile's content (e.g., 3D model) will not necessarily
+   * have been loaded yet when this future resolves.
    */
   CesiumAsync::SharedFuture<void>& getRootTileAvailableEvent();
 

Cesium3DTilesSelection/src/Tileset.cpp

@@ -72,7 +72,7 @@ Tileset::Tileset(
       _distances(),
       _childOcclusionProxies(),
       _pTilesetContentManager{
-          new TilesetContentManager(
+          TilesetContentManager::createFromLoader(
               _externals,
               _options,
               std::move(pCustomLoader),
@@ -91,7 +91,10 @@ Tileset::Tileset(
       _distances(),
       _childOcclusionProxies(),
       _pTilesetContentManager{
-          new TilesetContentManager(this->_externals, this->_options, url),
+          TilesetContentManager::createFromUrl(
+              this->_externals,
+              this->_options,
+              url),
       },
       _heightRequests(),
       _defaultViewGroup() {}
@@ -107,7 +110,7 @@ Tileset::Tileset(
       _options(options),
       _distances(),
       _childOcclusionProxies(),
-      _pTilesetContentManager{new TilesetContentManager(
+      _pTilesetContentManager{TilesetContentManager::createFromCesiumIon(
           this->_externals,
           this->_options,
           ionAssetID,
@@ -125,7 +128,7 @@ Tileset::Tileset(
       _options(options),
       _distances(),
       _childOcclusionProxies(),
-      _pTilesetContentManager{new TilesetContentManager(
+      _pTilesetContentManager{TilesetContentManager::createFromLoaderFactory(
           _externals,
           _options,
           std::move(loaderFactory))} {}
@@ -529,11 +532,11 @@ CesiumAsync::Future<const TilesetMetadata*> Tileset::loadMetadata() {
        asyncSystem =
            this->getAsyncSystem()]() -> Future<const TilesetMetadata*> {
         Tile* pRoot = pManager->getRootTile();
-        CESIUM_ASSERT(pRoot);
 
         TileExternalContent* pExternal =
-            pRoot->getContent().getExternalContent();
+            pRoot ? pRoot->getContent().getExternalContent() : nullptr;
         if (!pExternal) {
+          // Something went wrong while loading the root tile, so exit early.
           return asyncSystem.createResolvedFuture<const TilesetMetadata*>(
               nullptr);
         }