Merge remote-tracking branch 'origin/main' into jdesreumaux/glTF_modifier-raster_overlays

Author: kring

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

@@ -157,16 +157,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);
 
@@ -189,36 +183,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,

CesiumGltf/generated/include/CesiumGltf/ExtensionKhrGaussianSplatting.h

@@ -21,6 +21,27 @@ struct CESIUMGLTF_API ExtensionKhrGaussianSplatting final
    * key in the `extensions` object. */
   static constexpr const char* ExtensionName = "KHR_gaussian_splatting";
 
+  /**
+   * @brief Known values for Property specifying parameters regarding the kernel
+   * used to generate the Gaussians.
+   */
+  struct Kernel {
+    /** @brief `ellipse` */
+    inline static const std::string ellipse = "ellipse";
+  };
+
+  /**
+   * @brief Known values for Property specifying the color space of the
+   * spherical harmonics.
+   */
+  struct ColorSpace {
+    /** @brief `srgb_rec709_display` */
+    inline static const std::string srgb_rec709_display = "srgb_rec709_display";
+
+    /** @brief `lin_rec709_display` */
+    inline static const std::string lin_rec709_display = "lin_rec709_display";
+  };
+
   /**
    * @brief Known values for Optional property specifying how to project the
    * Gaussians to achieve a perspective correct value. This property defaults to
@@ -29,9 +50,6 @@ struct CESIUMGLTF_API ExtensionKhrGaussianSplatting final
   struct Projection {
     /** @brief `perspective` */
     inline static const std::string perspective = "perspective";
-
-    /** @brief `orthographic` */
-    inline static const std::string orthographic = "orthographic";
   };
 
   /**
@@ -41,40 +59,24 @@ struct CESIUMGLTF_API ExtensionKhrGaussianSplatting final
   struct SortingMethod {
     /** @brief `cameraDistance` */
     inline static const std::string cameraDistance = "cameraDistance";
-
-    /** @brief `zDepth` */
-    inline static const std::string zDepth = "zDepth";
   };
 
   /**
-   * @brief Known values for Optional property specifying the color space of the
-   * spherical harmonics. This property defaults to BT.709.
+   * @brief Property specifying parameters regarding the kernel used to generate
+   * the Gaussians.
+   *
+   * Known values are defined in {@link Kernel}.
+   *
    */
-  struct ColorSpace {
-    /** @brief `BT.709` */
-    inline static const std::string BT_709 = "BT.709";
-
-    /** @brief `BT.2020-ITU` */
-    inline static const std::string BT_2020_ITU = "BT.2020-ITU";
-
-    /** @brief `BT.2020-HLG` */
-    inline static const std::string BT_2020_HLG = "BT.2020-HLG";
-
-    /** @brief `BT.2020-PQ` */
-    inline static const std::string BT_2020_PQ = "BT.2020-PQ";
-
-    /** @brief `Display-P3` */
-    inline static const std::string Display_P3 = "Display-P3";
-
-    /** @brief `linear` */
-    inline static const std::string linear = "linear";
-  };
+  std::string kernel = Kernel::ellipse;
 
   /**
-   * @brief Optional property specifying parameters regarding the kernel used to
-   * generate the Gaussians. This property defaults to ellipse.
+   * @brief Property specifying the color space of the spherical harmonics.
+   *
+   * Known values are defined in {@link ColorSpace}.
+   *
    */
-  std::string kernel = "ellipse";
+  std::string colorSpace = ColorSpace::srgb_rec709_display;
 
   /**
    * @brief Optional property specifying how to project the Gaussians to achieve
@@ -94,15 +96,6 @@ struct CESIUMGLTF_API ExtensionKhrGaussianSplatting final
    */
   std::string sortingMethod = SortingMethod::cameraDistance;
 
-  /**
-   * @brief Optional property specifying the color space of the spherical
-   * harmonics. This property defaults to BT.709.
-   *
-   * Known values are defined in {@link ColorSpace}.
-   *
-   */
-  std::string colorSpace = ColorSpace::BT_709;
-
   /**
    * @brief Calculates the size in bytes of this object, including the contents
    * of all collections, pointers, and strings. This will NOT include the size
@@ -114,7 +107,7 @@ struct CESIUMGLTF_API ExtensionKhrGaussianSplatting final
     accum += int64_t(sizeof(ExtensionKhrGaussianSplatting));
     accum += CesiumUtility::ExtensibleObject::getSizeBytes() -
              int64_t(sizeof(CesiumUtility::ExtensibleObject));
-    accum += int64_t(this->kernel.capacity() * sizeof(char));
+
     return accum;
   }
 };

CesiumGltfReader/generated/src/ExtensionKhrGaussianSplattingJsonHandler.h

@@ -43,8 +43,8 @@ class ExtensionKhrGaussianSplattingJsonHandler
 private:
   CesiumGltf::ExtensionKhrGaussianSplatting* _pObject = nullptr;
   CesiumJsonReader::StringJsonHandler _kernel;
+  CesiumJsonReader::StringJsonHandler _colorSpace;
   CesiumJsonReader::StringJsonHandler _projection;
   CesiumJsonReader::StringJsonHandler _sortingMethod;
-  CesiumJsonReader::StringJsonHandler _colorSpace;
 };
 } // namespace CesiumGltfReader

CesiumGltfReader/generated/src/GeneratedJsonHandlers.cpp

@@ -3007,9 +3007,9 @@ ExtensionKhrGaussianSplattingJsonHandler::
         const CesiumJsonReader::JsonReaderOptions& options) noexcept
     : CesiumJsonReader::ExtensibleObjectJsonHandler(options),
       _kernel(),
+      _colorSpace(),
       _projection(),
-      _sortingMethod(),
-      _colorSpace() {}
+      _sortingMethod() {}
 
 void ExtensionKhrGaussianSplattingJsonHandler::reset(
     CesiumJsonReader::IJsonHandler* pParentHandler,
@@ -3051,15 +3051,15 @@ CesiumJsonReader::IJsonHandler* ExtensionKhrGaussianSplattingJsonHandler::
   if ("kernel"s == str) {
     return property("kernel", this->_kernel, o.kernel);
   }
+  if ("colorSpace"s == str) {
+    return property("colorSpace", this->_colorSpace, o.colorSpace);
+  }
   if ("projection"s == str) {
     return property("projection", this->_projection, o.projection);
   }
   if ("sortingMethod"s == str) {
     return property("sortingMethod", this->_sortingMethod, o.sortingMethod);
   }
-  if ("colorSpace"s == str) {
-    return property("colorSpace", this->_colorSpace, o.colorSpace);
-  }
 
   return this->readObjectKeyExtensibleObject(objectType, str, *this->_pObject);
 }

CesiumGltfWriter/generated/src/ModelJsonWriter.cpp

@@ -1192,28 +1192,17 @@ void writeJson(
     const CesiumJsonWriter::ExtensionWriterContext& context) {
   jsonWriter.StartObject();
 
-  if (obj.kernel != "ellipse") {
-    jsonWriter.Key("kernel");
-    writeJson(obj.kernel, jsonWriter, context);
-  }
+  jsonWriter.Key("kernel");
+  writeJson(obj.kernel, jsonWriter, context);
 
-  if (obj.projection !=
-      CesiumGltf::ExtensionKhrGaussianSplatting::Projection::perspective) {
-    jsonWriter.Key("projection");
-    writeJson(obj.projection, jsonWriter, context);
-  }
+  jsonWriter.Key("colorSpace");
+  writeJson(obj.colorSpace, jsonWriter, context);
 
-  if (obj.sortingMethod != CesiumGltf::ExtensionKhrGaussianSplatting::
-                               SortingMethod::cameraDistance) {
-    jsonWriter.Key("sortingMethod");
-    writeJson(obj.sortingMethod, jsonWriter, context);
-  }
+  jsonWriter.Key("projection");
+  writeJson(obj.projection, jsonWriter, context);
 
-  if (obj.colorSpace !=
-      CesiumGltf::ExtensionKhrGaussianSplatting::ColorSpace::BT_709) {
-    jsonWriter.Key("colorSpace");
-    writeJson(obj.colorSpace, 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