Merge commit '95498106dbac35de7ca87bc52c926a94b2091938' into tiles-render-readiness-flag

Author: GhisBntly

CHANGES.md

@@ -10,12 +10,15 @@
 
 ##### Additions :tada:
 
+- Switched to vcpkg registry version `dbe35ceb30c688bf72e952ab23778e009a578f18`, from `2024.11.16`. We expect to upgrade again to an official tagged version in the next release.
 - Added `SubtreeWriter::writeSubtreeBinary`.
 
 ##### Fixes :wrench:
 
 - Fixed a bug where `SubtreeAvailability` wasn't updating the `constant` and `bitstream` properties of the availability object when converting constant availability to a bitstream.
 - Fixed a bug where `SubtreeAvailability` attempted to update buffer data that was no longer valid.
+- Fixed a bug where `TilesetContentLoaderResult` would drop its `statusCode` between `std::move`s due to its omission in the move constructor.
+- Fixed a bug introduced in v0.47.0 that caused tiles upsampled for raster overlays to lose their water mask.
 
 ### v0.47.0 - 2025-05-01
 

CMakeLists.txt

@@ -124,7 +124,7 @@ endif()
 include("cmake/defaults.cmake")
 
 project(cesium-native
-    VERSION 0.47.0
+    VERSION 0.48.0
     LANGUAGES CXX C
 )
 

Cesium3DTilesSelection/include/Cesium3DTilesSelection/TilesetContentLoaderResult.h

@@ -85,7 +85,8 @@ template <class TilesetContentLoaderType> struct TilesetContentLoaderResult {
         pRootTile{std::move(rhs.pRootTile)},
         credits{std::move(rhs.credits)},
         requestHeaders{std::move(rhs.requestHeaders)},
-        errors{std::move(rhs.errors)} {}
+        errors{std::move(rhs.errors)},
+        statusCode(std::move(rhs.statusCode)) {}
 
   /**
    * @brief Move assignment operator for creating a
@@ -108,6 +109,7 @@ template <class TilesetContentLoaderType> struct TilesetContentLoaderResult {
     swap(this->credits, rhs.credits);
     swap(this->requestHeaders, rhs.requestHeaders);
     swap(this->errors, rhs.errors);
+    swap(this->statusCode, rhs.statusCode);
 
     return *this;
   }

CesiumRasterOverlays/src/RasterOverlayUtilities.cpp

@@ -924,14 +924,18 @@ void scaleWaterMask(
         waterMaskScale * (childID.tileID.y % 2);
   }
 
-  primitive.extras.emplace("OnlyWater", onlyWater);
-  primitive.extras.emplace("OnlyLand", onlyLand);
-
-  primitive.extras.emplace("WaterMaskTex", waterMaskTextureId);
-
-  primitive.extras.emplace("WaterMaskTranslationX", waterMaskTranslationX);
-  primitive.extras.emplace("WaterMaskTranslationY", waterMaskTranslationY);
-  primitive.extras.emplace("WaterMaskScale", waterMaskScale);
+  primitive.extras.insert_or_assign("OnlyWater", onlyWater);
+  primitive.extras.insert_or_assign("OnlyLand", onlyLand);
+
+  primitive.extras.insert_or_assign("WaterMaskTex", waterMaskTextureId);
+
+  primitive.extras.insert_or_assign(
+      "WaterMaskTranslationX",
+      waterMaskTranslationX);
+  primitive.extras.insert_or_assign(
+      "WaterMaskTranslationY",
+      waterMaskTranslationY);
+  primitive.extras.insert_or_assign("WaterMaskScale", waterMaskScale);
 }
 
 bool upsamplePointsPrimitiveForRasterOverlays(
@@ -1466,7 +1470,10 @@ bool upsampleTrianglesPrimitiveForRasterOverlays(
 
   // add skirts to extras to be upsampled later if needed
   if (hasSkirt) {
-    primitive.extras = SkirtMeshMetadata::createGltfExtras(*skirtMeshMetadata);
+    CesiumUtility::JsonValue::Object extras =
+        SkirtMeshMetadata::createGltfExtras(*skirtMeshMetadata);
+    extras.merge(std::move(primitive.extras));
+    primitive.extras = std::move(extras);
   }
 
   primitive.indices = static_cast<int>(indexAccessorIndex);

CesiumRasterOverlays/test/TestUpsampleGltfForRasterOverlay.cpp

@@ -1071,6 +1071,77 @@ TEST_CASE("upsampleGltfForRasterOverlay with UNSIGNED_SHORT indices") {
           skirtHeight * 0.5);
     }
   }
+
+  SUBCASE("Check water mask properties come through on their own") {
+    primitive.extras["OnlyWater"] = false;
+    primitive.extras["OnlyLand"] = false;
+    primitive.extras["WaterMaskTex"] = 1;
+    primitive.extras["WaterMaskTranslationX"] = 0.0;
+    primitive.extras["WaterMaskTranslationY"] = 0.0;
+    primitive.extras["WaterMaskScale"] = 1.0;
+
+    Model upsampledModel =
+        *RasterOverlayUtilities::upsampleGltfForRasterOverlays(
+            model,
+            lowerLeft,
+            false);
+
+    REQUIRE(upsampledModel.meshes.size() == 1);
+    const Mesh& upsampledMesh = upsampledModel.meshes.back();
+
+    REQUIRE(upsampledMesh.primitives.size() == 1);
+    const MeshPrimitive& upsampledPrimitive = upsampledMesh.primitives.back();
+
+    auto it = upsampledPrimitive.extras.find("OnlyWater");
+    REQUIRE(it != upsampledPrimitive.extras.end());
+    REQUIRE(it->second.isBool());
+    CHECK(it->second.getBool() == false);
+
+    it = upsampledPrimitive.extras.find("WaterMaskScale");
+    REQUIRE(it != upsampledPrimitive.extras.end());
+    REQUIRE(it->second.isDouble());
+    CHECK(it->second.getDouble() == 0.5);
+  }
+
+  SUBCASE("Check water mask properties come through when there is also skirt "
+          "metadata") {
+    double skirtHeight = 12.0;
+    SkirtMeshMetadata skirtMeshMetadata;
+    skirtMeshMetadata.noSkirtIndicesBegin = 0;
+    skirtMeshMetadata.noSkirtIndicesCount =
+        static_cast<uint32_t>(indices.size());
+    skirtMeshMetadata.meshCenter = center;
+    skirtMeshMetadata.skirtWestHeight = skirtHeight;
+    skirtMeshMetadata.skirtSouthHeight = skirtHeight;
+    skirtMeshMetadata.skirtEastHeight = skirtHeight;
+    skirtMeshMetadata.skirtNorthHeight = skirtHeight;
+
+    primitive.extras = SkirtMeshMetadata::createGltfExtras(skirtMeshMetadata);
+
+    primitive.extras["OnlyWater"] = true;
+    primitive.extras["OnlyLand"] = false;
+
+    Model upsampledModel =
+        *RasterOverlayUtilities::upsampleGltfForRasterOverlays(
+            model,
+            lowerLeft,
+            false);
+
+    REQUIRE(upsampledModel.meshes.size() == 1);
+    const Mesh& upsampledMesh = upsampledModel.meshes.back();
+
+    REQUIRE(upsampledMesh.primitives.size() == 1);
+    const MeshPrimitive& upsampledPrimitive = upsampledMesh.primitives.back();
+
+    auto it = upsampledPrimitive.extras.find("OnlyWater");
+    REQUIRE(it != upsampledPrimitive.extras.end());
+    REQUIRE(it->second.isBool());
+    CHECK(it->second.getBool() == true);
+
+    it = upsampledPrimitive.extras.find("skirtMeshMetadata");
+    REQUIRE(it != upsampledPrimitive.extras.end());
+    CHECK(it->second.isObject());
+  }
 }
 
 TEST_CASE("upsampleGltfForRasterOverlay with UNSIGNED_BYTE indices") {

CesiumUtility/include/CesiumUtility/IntrusivePointer.h

@@ -73,7 +73,7 @@ template <class T> class IntrusivePointer final {
   /**
    * @brief Constructs a new instance and assigns it to this IntrusivePointer.
    * If this IntrusivePointer already points to another instance,
-   * {@link releaseReference} is called on it.
+   * `releaseReference` is called on it.
    *
    * @param constructorArguments The arguments to the constructor to create the
    * new instance.

CesiumUtility/include/CesiumUtility/Uri.h

@@ -84,6 +84,36 @@ class Uri final {
    */
   std::string_view getPath() const;
 
+  /**
+   * @brief Returns the filename portion of the URI.
+   *
+   * For example, for the URI `http://example.com/file.txt`, this will return
+   * `file.txt`.
+   *
+   * @return The filename, or empty string if the URI could not be parsed.
+   */
+  std::string_view getFileName() const;
+
+  /**
+   * @brief Returns the filename portion of the URI without any extension.
+   *
+   * For example, for the URI `http://example.com/file.txt`, this will return
+   * `file`.
+   *
+   * @return The stem, or empty string if the URI could not be parsed.
+   */
+  std::string_view getStem() const;
+
+  /**
+   * @brief Returns the extension portion of the URI, if present.
+   *
+   * For example, for the URI `http://example.com/file.txt`, this will return
+   * `.txt`.
+   *
+   * @return The extension, or empty string if the URI could not be parsed.
+   */
+  std::string_view getExtension() const;
+
   /**
    * @brief Gets the query portion of the URI.
    *

CesiumUtility/src/Uri.cpp

@@ -5,6 +5,7 @@
 #include <ada/unicode.h>
 #include <ada/url_aggregator.h>
 
+#include <cstdint>
 #include <cstdlib>
 #include <cstring>
 #include <functional>
@@ -146,6 +147,72 @@ std::string_view Uri::getPath() const {
   return this->_url->get_pathname();
 }
 
+std::string_view Uri::getFileName() const {
+  if (!this->isValid()) {
+    return {};
+  }
+
+  uint32_t pathLength = this->_url->get_pathname_length();
+  // If the pathname is empty or just "/", there's no filename.
+  if (pathLength <= 1) {
+    return {};
+  }
+
+  const std::string_view path = this->_url->get_pathname();
+  const int32_t end = (int32_t)(pathLength - 1);
+  for (int32_t i = end; i >= 0; i--) {
+    if (path[(size_t)i] != '/') {
+      continue;
+    }
+
+    // Last char of pathname is '/', so no filename
+    if (i == end) {
+      return {};
+    }
+
+    return path.substr((size_t)(i + 1), (size_t)(end - i));
+  }
+
+  // If we've gotten this far, the whole pathname is the filename
+  return path;
+}
+
+std::string_view Uri::getStem() const {
+  const std::string_view filename = this->getFileName();
+  if (filename.empty()) {
+    return {};
+  }
+
+  const int32_t end = int32_t(filename.size() - 1);
+  for (int32_t i = end; i >= 0; i--) {
+    if (filename[(size_t)i] == '.') {
+      return filename.substr(0, (size_t)i);
+    }
+  }
+
+  // No extension found, the whole filename is the stem.
+  return filename;
+}
+
+std::string_view Uri::getExtension() const {
+  const std::string_view filename = this->getFileName();
+  if (filename.empty()) {
+    return {};
+  }
+
+  const size_t end = filename.size() - 1;
+  for (size_t i = end; i > 0; i--) {
+    if (filename[i] != '.') {
+      continue;
+    }
+
+    return filename.substr(i, end - i + 1);
+  }
+
+  // No extension found.
+  return {};
+}
+
 void Uri::setPath(const std::string_view& path) {
   this->_url->set_pathname(path);
 }

CesiumUtility/test/TestUri.cpp

@@ -256,3 +256,42 @@ TEST_CASE("UriQuery") {
     CHECK(query.toQueryString() == "query=foo&%7Bthis%7D=%7Banother%7D");
   }
 }
+
+TEST_CASE("Uri::getFileName") {
+  CHECK(Uri("test.txt").getFileName() == "test.txt");
+  CHECK(Uri("http://example.com/test.txt").getFileName() == "test.txt");
+  CHECK(Uri("http://example.com/a/b/c/test.txt").getFileName() == "test.txt");
+  CHECK(
+      Uri("file:///C:\\Example\\Directory\\test.txt").getFileName() ==
+      "test.txt");
+  CHECK(Uri("http://example.com/").getFileName() == "");
+  CHECK(Uri("http://example.com/a/b/c/").getFileName() == "");
+}
+
+TEST_CASE("Uri::getStem") {
+  CHECK(Uri("test.txt").getStem() == "test");
+  CHECK(Uri("http://example.com/test.txt").getStem() == "test");
+  CHECK(Uri("http://example.com/a/b/c/test.txt").getStem() == "test");
+  CHECK(Uri("http://example.com/a/b/c/test.").getStem() == "test");
+  CHECK(Uri("http://example.com/a/b/c/test").getStem() == "test");
+  CHECK(Uri("file:///C:\\Example\\Directory\\test.txt").getStem() == "test");
+  CHECK(Uri("http://example.com/").getStem() == "");
+  CHECK(Uri("http://example.com/a/b/c/").getStem() == "");
+  CHECK(Uri("http://example.com/a/b/c").getStem() == "c");
+  CHECK(Uri("http://example.com/a/b/c/.txt").getStem() == "");
+}
+
+TEST_CASE("Uri::getExtension") {
+  CHECK(Uri("test.txt").getExtension() == ".txt");
+  CHECK(Uri("http://example.com/test.txt").getExtension() == ".txt");
+  CHECK(Uri("http://example.com/a/b/c/test.txt").getExtension() == ".txt");
+  CHECK(Uri("http://example.com/a/b/c/test.").getExtension() == ".");
+  CHECK(Uri("http://example.com/a/b/c/test").getExtension() == "");
+  CHECK(
+      Uri("file:///C:\\Example\\Directory\\test.txt").getExtension() == ".txt");
+  CHECK(Uri("http://example.com/").getExtension() == "");
+  CHECK(Uri("http://example.com/a/b/c").getExtension() == "");
+  CHECK(Uri("http://example.com/a/b/c/.hidden").getExtension() == "");
+  CHECK(Uri("http://example.com/a/b/c/.").getExtension() == "");
+  CHECK(Uri("http://example.com/a/b/c/..").getExtension() == "");
+}