Merge branch 'main' into vector-random-fix

Author: kring

CHANGES.md

@@ -15,11 +15,14 @@
 - Added `element_type` to `IntrusivePointer`, allowing it to be used with `std::pointer_types`.
 - Added implicit conversion of `IntrusivePointer<T>` to `T*`.
 - All properties and extensions from `tileset.json`, except `"root"`, are now parsed into `TilesetMetadata` when a tileset is loaded by `Cesium3DTilesSelection::Tileset`.
+- Added `accessorView` to `PropertyAttributePropertyView` to retrieve the underlying `AccessorView`.
 
 ##### Fixes :wrench:
 
 - Fixed a bug in `Tileset::updateViewGroupOffline` that would cause it to get stuck in an endless loop when invoked with no frustums.
 - Fixed `ColorMode::Random` in `VectorStyle` producing different results each time a raster overlay tile was rendered.
+- Fixed a bug in `IonRasterOverlay` that would cause unnecessary extra use of Bing Maps sessions when manually reloading the raster overlay after an expired token was automatically refreshed.
+- Fixed a bug that could lead to a crash when using raster overlays with tilesets that use "external tilesets", such as Google Photorealistic 3D Tiles.
 
 ### v0.50.0 - 2025-08-01
 

Cesium3DTilesSelection/src/RasterOverlayCollection.cpp

@@ -102,19 +102,26 @@ void RasterOverlayCollection::add(
   // Add a placeholder for this overlay to existing geometry tiles.
   for (Tile& tile : this->_loadedTiles) {
     // The tile rectangle and geometric error don't matter for a placeholder.
-    // - When a tile is transitioned from Unloaded to Loading, raster overlay
-    // tiles will be mapped to the tile automatically by TilesetContentManager,
-    // so we don't need to map the raster tiles to this unloaded or unloading
-    // tile now.
+    // - When a tile is transitioned from Unloaded (or FailedTemporarily) to
+    // ContentLoading, raster overlay tiles will be mapped to the tile
+    // automatically by TilesetContentManager, so we don't need to map the
+    // raster tiles to this unloaded or unloading tile now.
     // - When a tile is already failed to load, there is no need to map the
     // raster tiles to the tile as it is not rendered any way
     TileLoadState tileState = tile.getState();
-    if (tileState != TileLoadState::Unloaded &&
-        tileState != TileLoadState::Unloading &&
-        tileState != TileLoadState::Failed) {
-      tile.getMappedRasterTiles().emplace_back(
-          pPlaceholder->getTile(Rectangle(), glm::dvec2(0.0)),
-          -1);
+    if (tileState == TileLoadState::ContentLoading ||
+        tileState == TileLoadState::ContentLoaded ||
+        tileState == TileLoadState::Done) {
+      // Only tiles with renderable content should have raster overlays
+      // attached. In the ContentLoading state, we won't know yet whether the
+      // content is renderable, so assume that it is for now and
+      // `setTileContent` will clear them out if necessary.
+      if (tile.getContent().isRenderContent() ||
+          tileState == TileLoadState::ContentLoading) {
+        tile.getMappedRasterTiles().emplace_back(
+            pPlaceholder->getTile(Rectangle(), glm::dvec2(0.0)),
+            -1);
+      }
     }
   }
 

Cesium3DTilesSelection/src/TilesetContentManager.cpp

@@ -1231,6 +1231,13 @@ UnloadTileContentResult TilesetContentManager::unloadTileContent(Tile& tile) {
     return UnloadTileContentResult::Remove;
   }
 
+  // Detach raster tiles first so that the renderer's tile free
+  // process doesn't need to worry about them.
+  for (RasterMappedTo3DTile& mapped : tile.getMappedRasterTiles()) {
+    mapped.detachFromTile(*this->_externals.pPrepareRendererResources, tile);
+  }
+  tile.getMappedRasterTiles().clear();
+
   if (content.isExternalContent()) {
     // We can unload an external content tile with one reference, because this
     // represents the external content itself. Any more than that indicates
@@ -1247,13 +1254,6 @@ UnloadTileContentResult TilesetContentManager::unloadTileContent(Tile& tile) {
     return UnloadTileContentResult::RemoveAndClearChildren;
   }
 
-  // Detach raster tiles first so that the renderer's tile free
-  // process doesn't need to worry about them.
-  for (RasterMappedTo3DTile& mapped : tile.getMappedRasterTiles()) {
-    mapped.detachFromTile(*this->_externals.pPrepareRendererResources, tile);
-  }
-  tile.getMappedRasterTiles().clear();
-
   // Unload the renderer resources and clear any raster overlay tiles. We can do
   // this even if the tile can't be fully unloaded because this tile's geometry
   // is being using by an async upsample operation (checked below).

CesiumGltf/include/CesiumGltf/PropertyAttributePropertyView.h

@@ -251,6 +251,12 @@ class PropertyAttributePropertyView<ElementType, false>
    */
   int64_t size() const noexcept { return _size; }
 
+  /**
+   * @brief Gets the underlying \ref AccessorView from the
+   * PropertyAttributePropertyView.
+   */
+  const AccessorView<ElementType>& accessorView() const { return _accessor; }
+
 private:
   AccessorView<ElementType> _accessor;
   int64_t _size;
@@ -431,6 +437,12 @@ class PropertyAttributePropertyView<ElementType, true>
    */
   int64_t size() const noexcept { return _size; }
 
+  /**
+   * @brief Gets the underlying \ref AccessorView from the
+   * PropertyAttributePropertyView.
+   */
+  const AccessorView<ElementType>& accessorView() const { return _accessor; }
+
 private:
   AccessorView<ElementType> _accessor;
   int64_t _size;

CesiumRasterOverlays/src/IonRasterOverlay.cpp

@@ -135,6 +135,10 @@ IonRasterOverlay::createTileProvider(
             auto cacheIt = endpointCache.find(url);
             if (cacheIt != endpointCache.end()) {
               cacheIt->second.accessToken = update.token;
+
+              // For Bing Maps endpoints, the access token is stored in the key
+              // field instead.
+              cacheIt->second.key = update.token;
             }
 
             if (pHolder->pProvider) {

cmake/detect-vcpkg-triplet.cmake

@@ -39,8 +39,11 @@ elseif(APPLE)
         endif()
     endif()
 elseif(LINUX)
-    # Assuming x64 here isn't necessarily correct, but it's the only platform we officially support.
-    set(DETECTED_VCPKG_TRIPLET "x64-linux")
+    if(CMAKE_SYSTEM_PROCESSOR STREQUAL "arm64")
+        set(DETECTED_VCPKG_TRIPLET "arm64-linux")
+    else()
+        set(DETECTED_VCPKG_TRIPLET "x64-linux")
+    endif()
 else()
     set(DETECTED_VCPKG_TRIPLET_ERROR "Cannot guess an appropriate value for VCPKG_TRIPLET because the operating system is unknown. Please set it manually.")
 endif()

cmake/macros/configure_cesium_library.cmake

@@ -13,7 +13,8 @@ function(configure_cesium_library targetName)
 
     if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU" AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 13)
         # Disable dangling-reference warning due to amount of false positives: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=109642
-        target_compile_options(${targetName} PRIVATE -Wno-dangling-reference)
+        # Also disable stringop-overflow warning which causes false positives when building with aarch64-linux-gnu-g++-13
+        target_compile_options(${targetName} PRIVATE -Wno-dangling-reference -Wno-stringop-overflow)
     endif()
 
     if (CESIUM_GLM_STRICT_ENABLED)