Merge branch 'main' into tile-sse

Author: j9liu

CHANGES.md

@@ -1,5 +1,16 @@
 # Change Log
 
+### v0.58.0 - 2026-03-02
+
+##### Fixes :wrench:
+
+- Raster tiles are now included in the progress percentage for `Cesium3DTilesSelection::Tileset`. This allows apps that rely on this progress percentage to continue updating their views until all raster tiles have been properly loaded.
+- Fixed various bugs with `CesiumRasterOverlays::GeoJsonDocumentRasterOverlay`:
+  - Line width is now factored in to calculations of what geometry is visible in any given tile, reducing the possibility that certain geometry (like perfectly vertical or horizontal lines) would be incorrectly ignored.
+  - Geometry near the antimeridian, such as lines that need to wrap around the entire globe, will now render correctly without gaps.
+  - Geometry contained in other objects, such as polygons within feature collections, will no longer cause the geometry to be incorrectly rendered multiple times.
+- Updated the `KHR_gaussian_splatting` autogenerated classes to the Release Candidate version of the extension.
+
 ### v0.57.0 - 2026-02-02
 
 ##### Additions :tada:

CMakeLists.txt

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

Cesium3DTilesSelection/src/TilesetViewGroup.cpp

@@ -158,16 +158,10 @@ void TilesetViewGroup::finishFrame(
                         updateResult.tilesKicked +
                         this->_tilesAlreadyLoadingOrUnloading;
 
-  if (tilesLoading == 0) {
-    this->_loadProgressPercentage = 100.0f;
-  } else {
-    this->_loadProgressPercentage =
-        100.0f * float(totalTiles - tilesLoading) / float(totalTiles);
-  }
-
   // aggregate all the credits needed from this tileset for the current frame
   const std::shared_ptr<CreditSystem>& pCreditSystem =
       tileset.getExternals().pCreditSystem;
+
   if (pCreditSystem) {
     this->_currentFrameCredits.setCreditSystem(pCreditSystem);
 
@@ -190,36 +184,51 @@ void TilesetViewGroup::finishFrame(
 
       pActivated->getTileProvider()->addCredits(this->_currentFrameCredits);
     }
+  }
 
-    // Add per-tile credits for tiles selected this frame.
-    for (const Tile::ConstPointer& pTile :
-         updateResult.tilesToRenderThisFrame) {
-      const std::vector<RasterMappedTo3DTile>& mappedRasterTiles =
-          pTile->getMappedRasterTiles();
-      // raster overlay tile credits
-      for (const RasterMappedTo3DTile& mappedRasterTile : mappedRasterTiles) {
-        const RasterOverlayTile* pRasterOverlayTile =
-            mappedRasterTile.getReadyTile();
-        if (pRasterOverlayTile != nullptr) {
-          for (const Credit& credit : pRasterOverlayTile->getCredits()) {
-            this->_currentFrameCredits.addCreditReference(credit);
-          }
-        }
+  for (const Tile::ConstPointer& pTile : updateResult.tilesToRenderThisFrame) {
+    // add tile render content credits like gltf copyrights
+    const TileRenderContent* pRenderContent =
+        pTile->getContent().getRenderContent();
+    if (pCreditSystem && pRenderContent) {
+      for (const Credit& credit : pRenderContent->getCredits()) {
+        this->_currentFrameCredits.addCreditReference(credit);
       }
+    }
 
-      // content credits like gltf copyrights
-      const TileRenderContent* pRenderContent =
-          pTile->getContent().getRenderContent();
-      if (pRenderContent) {
-        for (const Credit& credit : pRenderContent->getCredits()) {
+    // add mapped raster tile credits and tile progress percentage
+    const std::vector<RasterMappedTo3DTile>& mappedRasterTiles =
+        pTile->getMappedRasterTiles();
+    for (const RasterMappedTo3DTile& mappedRasterTile : mappedRasterTiles) {
+      // add mapped raster tile credits for tiles selected this frame.
+      const RasterOverlayTile* pRasterOverlayTile =
+          mappedRasterTile.getReadyTile();
+      if (pCreditSystem && pRasterOverlayTile != nullptr) {
+        for (const Credit& credit : pRasterOverlayTile->getCredits()) {
           this->_currentFrameCredits.addCreditReference(credit);
         }
       }
+
+      // add the mapped raster tile in the progress percentage.
+      ++totalTiles;
+      if (mappedRasterTile.getState() !=
+          RasterMappedTo3DTile::AttachmentState::Attached)
+        ++tilesLoading;
     }
+  }
 
+  if (pCreditSystem) {
     this->_previousFrameCredits.releaseAllReferences();
     std::swap(this->_previousFrameCredits, this->_currentFrameCredits);
   }
+
+  // update progress percentage
+  if (tilesLoading == 0) {
+    this->_loadProgressPercentage = 100.0f;
+  } else {
+    this->_loadProgressPercentage =
+        100.0f * float(totalTiles - tilesLoading) / float(totalTiles);
+  }
 }
 
 float TilesetViewGroup::getPreviousLoadProgressPercentage() const {

CesiumGeospatial/src/GlobeRectangle.cpp

@@ -131,10 +131,19 @@ GlobeRectangle::computeUnion(const GlobeRectangle& other) const noexcept {
     rectangleWest += CesiumUtility::Math::TwoPi;
   }
 
-  const double west = CesiumUtility::Math::convertLongitudeRange(
-      glm::min(rectangleWest, otherRectangleWest));
-  const double east = CesiumUtility::Math::convertLongitudeRange(
-      glm::max(rectangleEast, otherRectangleEast));
+  double west = glm::min(rectangleWest, otherRectangleWest);
+  double east = glm::max(rectangleEast, otherRectangleEast);
+
+  // convertLongitudeRange will wrap values that are greater *or equal* to PI,
+  // which means a rectangle from [-PI, PI] would be wrapped to [-PI, -PI] - a
+  // completely different result. This is not what we want.
+  if (west != CesiumUtility::Math::OnePi) {
+    west = CesiumUtility::Math::convertLongitudeRange(west);
+  }
+
+  if (east != CesiumUtility::Math::OnePi) {
+    east = CesiumUtility::Math::convertLongitudeRange(east);
+  }
 
   return GlobeRectangle(
       west,

CesiumGltfWriter/generated/src/ModelJsonWriter.cpp

@@ -1198,17 +1198,11 @@ void writeJson(
   jsonWriter.Key("colorSpace");
   writeJson(obj.colorSpace, jsonWriter, context);
 
-  if (obj.projection !=
-      CesiumGltf::ExtensionKhrGaussianSplatting::Projection::perspective) {
-    jsonWriter.Key("projection");
-    writeJson(obj.projection, jsonWriter, context);
-  }
+  jsonWriter.Key("projection");
+  writeJson(obj.projection, jsonWriter, context);
 
-  if (obj.sortingMethod != CesiumGltf::ExtensionKhrGaussianSplatting::
-                               SortingMethod::cameraDistance) {
-    jsonWriter.Key("sortingMethod");
-    writeJson(obj.sortingMethod, jsonWriter, context);
-  }
+  jsonWriter.Key("sortingMethod");
+  writeJson(obj.sortingMethod, jsonWriter, context);
 
   writeExtensibleObject(obj, jsonWriter, context);
 

CesiumNativeTests/include/CesiumNativeTests/checkFilesEqual.h

@@ -0,0 +1,13 @@
+#pragma once
+
+#include <filesystem>
+
+namespace CesiumNativeTests {
+/**
+ * @brief Tests that the contents of `fileA` are equal to the contents of
+ * `fileB`.
+ */
+void checkFilesEqual(
+    const std::filesystem::path& fileA,
+    const std::filesystem::path& fileB);
+} // namespace CesiumNativeTests

CesiumNativeTests/src/checkFilesEqual.cpp

@@ -0,0 +1,19 @@
+#include <CesiumNativeTests/checkFilesEqual.h>
+#include <CesiumNativeTests/readFile.h>
+
+#include <doctest/doctest.h>
+
+#include <cstddef>
+#include <filesystem>
+#include <vector>
+
+namespace CesiumNativeTests {
+void checkFilesEqual(
+    const std::filesystem::path& fileA,
+    const std::filesystem::path& fileB) {
+  const std::vector<std::byte>& bytes = readFile(fileA);
+  const std::vector<std::byte>& bytes2 = readFile(fileB);
+
+  REQUIRE(bytes == bytes2);
+}
+} // namespace CesiumNativeTests

CesiumRasterOverlays/include/CesiumRasterOverlays/UrlTemplateRasterOverlay.h

@@ -84,10 +84,10 @@ class CESIUMRASTEROVERLAYS_API UrlTemplateRasterOverlay final
    *
    * The following template parameters are supported in `url`:
    * - `{x}` - The tile X coordinate in the tiling scheme, where 0 is the westernmost tile.
-   * - `{y}` - The tile Y coordinate in the tiling scheme, where 0 is the nothernmost tile.
+   * - `{y}` - The tile Y coordinate in the tiling scheme, where 0 is the southernmost tile.
    * - `{z}` - The level of the tile in the tiling scheme, where 0 is the root of the quadtree pyramid.
    * - `{reverseX}` - The tile X coordinate in the tiling scheme, where 0 is the easternmost tile.
-   * - `{reverseY}` - The tile Y coordinate in the tiling scheme, where 0 is the southernmost tile.
+   * - `{reverseY}` - The tile Y coordinate in the tiling scheme, where 0 is the northernmost tile.
    * - `{reverseZ}` - The tile Z coordinate in the tiling scheme, where 0 is equivalent to `urlTemplateOptions.maximumLevel`.
    * - `{westDegrees}` - The western edge of the tile in geodetic degrees.
    * - `{southDegrees}` - The southern edge of the tile in geodetic degrees.