Merge remote-tracking branch 'origin/main' into cesium.com

Author: kring

CHANGES.md

@@ -1,5 +1,26 @@
 # Change Log
 
+### ? - ?
+
+##### Breaking Changes :mega:
+
+- Removed `TilesetOptions::maximumSimultaneousSubtreeLoads` because it was unused.
+
+##### Additions :tada:
+
+- Added `convertPropertyComponentTypeToAccessorComponentType` to `PropertyType`.
+- Added support for `3DTILES_ellipsoid` in `Cesium3DTiles`, `Cesium3DTilesReader`, and `Cesium3DTilesWriter`.
+
+##### Fixes :wrench:
+
+- Fixed parsing URIs that have a scheme followed by `:` instead of `://`.
+
+### v0.44.2 - 2025-02-10
+
+##### Fixes :wrench:
+
+- Fixed a bug in `GltfUtilities::parseGltfCopyright` that could cause a crash when the copyright ends with a semicolon.
+
 ### v0.44.1 - 2025-02-03
 
 ##### Fixes :wrench:

CMakeLists.txt

@@ -87,7 +87,7 @@ endif()
 include("cmake/defaults.cmake")
 
 project(cesium-native
-    VERSION 0.44.0
+    VERSION 0.44.2
     LANGUAGES CXX C
 )
 

Cesium3DTiles/generated/include/Cesium3DTiles/Class.h

@@ -37,6 +37,11 @@ struct CESIUM3DTILES_API Class final : public CesiumUtility::ExtensibleObject {
    */
   std::unordered_map<std::string, Cesium3DTiles::ClassProperty> properties;
 
+  /**
+   * @brief Experimental. The parent class ID.
+   */
+  std::optional<std::string> parent;
+
   /**
    * @brief Calculates the size in bytes of this object, including the contents
    * of all collections, pointers, and strings. This will NOT include the size
@@ -61,6 +66,9 @@ struct CESIUM3DTILES_API Class final : public CesiumUtility::ExtensibleObject {
       accum += int64_t(k.capacity() * sizeof(char) - sizeof(std::string));
       accum += v.getSizeBytes() - int64_t(sizeof(Cesium3DTiles::ClassProperty));
     }
+    if (this->parent) {
+      accum += int64_t(this->parent->capacity() * sizeof(char));
+    }
     return accum;
   }
 };

Cesium3DTiles/generated/include/Cesium3DTiles/Extension3dTilesEllipsoid.h

@@ -0,0 +1,55 @@
+// This file was generated by generate-classes.
+// DO NOT EDIT THIS FILE!
+#pragma once
+
+#include <Cesium3DTiles/Library.h>
+#include <CesiumUtility/ExtensibleObject.h>
+
+#include <optional>
+#include <string>
+#include <vector>
+
+namespace Cesium3DTiles {
+/**
+ * @brief 3DTILES_ellipsoid extension data to define the referenced ellipsoid
+ */
+struct CESIUM3DTILES_API Extension3dTilesEllipsoid final
+    : public CesiumUtility::ExtensibleObject {
+  /**
+   * @brief The original name of this type.
+   */
+  static constexpr const char* TypeName = "Extension3dTilesEllipsoid";
+  /** @brief The official name of the extension. This should be the same as its
+   * key in the `extensions` object. */
+  static constexpr const char* ExtensionName = "3DTILES_ellipsoid";
+
+  /**
+   * @brief Name of the body the ellipsoid represents, or 'none'
+   */
+  std::optional<std::string> body;
+
+  /**
+   * @brief An array of three numbers that define the X, Y and Z radii values in
+   * meters for the ellipsoid
+   */
+  std::vector<double> radii;
+
+  /**
+   * @brief Calculates the size in bytes of this object, including the contents
+   * of all collections, pointers, and strings. This will NOT include the size
+   * of any extensions attached to the object. Calling this method may be slow
+   * as it requires traversing the object's entire structure.
+   */
+  int64_t getSizeBytes() const {
+    int64_t accum = 0;
+    accum += int64_t(sizeof(Extension3dTilesEllipsoid));
+    accum += CesiumUtility::ExtensibleObject::getSizeBytes() -
+             int64_t(sizeof(CesiumUtility::ExtensibleObject));
+    if (this->body) {
+      accum += int64_t(this->body->capacity() * sizeof(char));
+    }
+    accum += int64_t(sizeof(double) * this->radii.capacity());
+    return accum;
+  }
+};
+} // namespace Cesium3DTiles

Cesium3DTilesReader/generated/include/Cesium3DTilesReader/Extension3dTilesEllipsoidReader.h

@@ -0,0 +1,76 @@
+// This file was generated by generate-classes.
+// DO NOT EDIT THIS FILE!
+#pragma once
+
+#include <Cesium3DTiles/Extension3dTilesEllipsoid.h>
+#include <Cesium3DTilesReader/Library.h>
+#include <CesiumJsonReader/JsonReader.h>
+#include <CesiumJsonReader/JsonReaderOptions.h>
+
+#include <rapidjson/fwd.h>
+
+#include <span>
+#include <vector>
+
+namespace Cesium3DTiles {
+struct Extension3dTilesEllipsoid;
+} // namespace Cesium3DTiles
+
+namespace Cesium3DTilesReader {
+
+/**
+ * @brief Reads \ref Cesium3DTiles::Extension3dTilesEllipsoid
+ * "Extension3dTilesEllipsoid" instances from JSON.
+ */
+class CESIUM3DTILESREADER_API Extension3dTilesEllipsoidReader {
+public:
+  /**
+   * @brief Constructs a new instance.
+   */
+  Extension3dTilesEllipsoidReader();
+
+  /**
+   * @brief Gets the options controlling how the JSON is read.
+   */
+  CesiumJsonReader::JsonReaderOptions& getOptions();
+
+  /**
+   * @brief Gets the options controlling how the JSON is read.
+   */
+  const CesiumJsonReader::JsonReaderOptions& getOptions() const;
+
+  /**
+   * @brief Reads an instance of Extension3dTilesEllipsoid from a byte buffer.
+   *
+   * @param data The buffer from which to read the instance.
+   * @return The result of reading the instance.
+   */
+  CesiumJsonReader::ReadJsonResult<Cesium3DTiles::Extension3dTilesEllipsoid>
+  readFromJson(const std::span<const std::byte>& data) const;
+
+  /**
+   * @brief Reads an instance of Extension3dTilesEllipsoid from a
+   * rapidJson::Value.
+   *
+   * @param value The value from which to read the instance.
+   * @return The result of reading the instance.
+   */
+  CesiumJsonReader::ReadJsonResult<Cesium3DTiles::Extension3dTilesEllipsoid>
+  readFromJson(const rapidjson::Value& value) const;
+
+  /**
+   * @brief Reads an array of instances of Extension3dTilesEllipsoid from a
+   * rapidJson::Value.
+   *
+   * @param value The value from which to read the array of instances.
+   * @return The result of reading the array of instances.
+   */
+  CesiumJsonReader::ReadJsonResult<
+      std::vector<Cesium3DTiles::Extension3dTilesEllipsoid>>
+  readArrayFromJson(const rapidjson::Value& value) const;
+
+private:
+  CesiumJsonReader::JsonReaderOptions _options;
+};
+
+} // namespace Cesium3DTilesReader

Cesium3DTilesReader/generated/src/ClassJsonHandler.h

@@ -38,5 +38,6 @@ class ClassJsonHandler : public CesiumJsonReader::ExtensibleObjectJsonHandler {
       Cesium3DTiles::ClassProperty,
       ClassPropertyJsonHandler>
       _properties;
+  CesiumJsonReader::StringJsonHandler _parent;
 };
 } // namespace Cesium3DTilesReader

Cesium3DTilesReader/generated/src/Extension3dTilesEllipsoidJsonHandler.h

@@ -0,0 +1,52 @@
+// This file was generated by generate-classes.
+// DO NOT EDIT THIS FILE!
+#pragma once
+
+#include <Cesium3DTiles/Extension3dTilesEllipsoid.h>
+#include <CesiumJsonReader/ArrayJsonHandler.h>
+#include <CesiumJsonReader/DoubleJsonHandler.h>
+#include <CesiumJsonReader/ExtensibleObjectJsonHandler.h>
+#include <CesiumJsonReader/StringJsonHandler.h>
+
+namespace CesiumJsonReader {
+class JsonReaderOptions;
+} // namespace CesiumJsonReader
+
+namespace Cesium3DTilesReader {
+class Extension3dTilesEllipsoidJsonHandler
+    : public CesiumJsonReader::ExtensibleObjectJsonHandler,
+      public CesiumJsonReader::IExtensionJsonHandler {
+public:
+  using ValueType = Cesium3DTiles::Extension3dTilesEllipsoid;
+
+  static constexpr const char* ExtensionName = "3DTILES_ellipsoid";
+
+  explicit Extension3dTilesEllipsoidJsonHandler(
+      const CesiumJsonReader::JsonReaderOptions& options) noexcept;
+  void reset(
+      IJsonHandler* pParentHandler,
+      Cesium3DTiles::Extension3dTilesEllipsoid* pObject);
+
+  IJsonHandler* readObjectKey(const std::string_view& str) override;
+
+  void reset(
+      IJsonHandler* pParentHandler,
+      CesiumUtility::ExtensibleObject& o,
+      const std::string_view& extensionName) override;
+
+  IJsonHandler& getHandler() override { return *this; }
+
+protected:
+  IJsonHandler* readObjectKeyExtension3dTilesEllipsoid(
+      const std::string& objectType,
+      const std::string_view& str,
+      Cesium3DTiles::Extension3dTilesEllipsoid& o);
+
+private:
+  Cesium3DTiles::Extension3dTilesEllipsoid* _pObject = nullptr;
+  CesiumJsonReader::StringJsonHandler _body;
+  CesiumJsonReader::
+      ArrayJsonHandler<double, CesiumJsonReader::DoubleJsonHandler>
+          _radii;
+};
+} // namespace Cesium3DTilesReader

Cesium3DTilesReader/generated/src/GeneratedJsonHandlers.cpp

@@ -126,6 +126,126 @@ Extension3dTilesBoundingVolumeS2Reader::readArrayFromJson(
   return CesiumJsonReader::JsonReader::readJson(value, handler);
 }
 
+} // namespace Cesium3DTilesReader
+// This file was generated by generate-classes.
+// DO NOT EDIT THIS FILE!
+// NOLINTBEGIN(readability-duplicate-include)
+#include "Extension3dTilesEllipsoidJsonHandler.h"
+#include "registerReaderExtensions.h"
+
+#include <Cesium3DTiles/Extension3dTilesEllipsoid.h>
+#include <Cesium3DTilesReader/Extension3dTilesEllipsoidReader.h>
+#include <CesiumJsonReader/ArrayJsonHandler.h>
+#include <CesiumJsonReader/ExtensibleObjectJsonHandler.h>
+#include <CesiumJsonReader/IJsonHandler.h>
+#include <CesiumJsonReader/JsonReader.h>
+#include <CesiumUtility/Assert.h>
+#include <CesiumUtility/ExtensibleObject.h>
+
+#include <rapidjson/document.h>
+
+#include <any>
+#include <cstddef>
+#include <span>
+#include <string>
+#include <string_view>
+#include <vector>
+// NOLINTEND(readability-duplicate-include)
+
+namespace Cesium3DTilesReader {
+
+Extension3dTilesEllipsoidJsonHandler::Extension3dTilesEllipsoidJsonHandler(
+    const CesiumJsonReader::JsonReaderOptions& options) noexcept
+    : CesiumJsonReader::ExtensibleObjectJsonHandler(options),
+      _body(),
+      _radii() {}
+
+void Extension3dTilesEllipsoidJsonHandler::reset(
+    CesiumJsonReader::IJsonHandler* pParentHandler,
+    Cesium3DTiles::Extension3dTilesEllipsoid* pObject) {
+  CesiumJsonReader::ExtensibleObjectJsonHandler::reset(pParentHandler, pObject);
+  this->_pObject = pObject;
+}
+
+CesiumJsonReader::IJsonHandler*
+Extension3dTilesEllipsoidJsonHandler::readObjectKey(
+    const std::string_view& str) {
+  CESIUM_ASSERT(this->_pObject);
+  return this->readObjectKeyExtension3dTilesEllipsoid(
+      Cesium3DTiles::Extension3dTilesEllipsoid::TypeName,
+      str,
+      *this->_pObject);
+}
+
+void Extension3dTilesEllipsoidJsonHandler::reset(
+    CesiumJsonReader::IJsonHandler* pParentHandler,
+    CesiumUtility::ExtensibleObject& o,
+    const std::string_view& extensionName) {
+  std::any& value =
+      o.extensions
+          .emplace(extensionName, Cesium3DTiles::Extension3dTilesEllipsoid())
+          .first->second;
+  this->reset(
+      pParentHandler,
+      &std::any_cast<Cesium3DTiles::Extension3dTilesEllipsoid&>(value));
+}
+
+CesiumJsonReader::IJsonHandler*
+Extension3dTilesEllipsoidJsonHandler::readObjectKeyExtension3dTilesEllipsoid(
+    const std::string& objectType,
+    const std::string_view& str,
+    Cesium3DTiles::Extension3dTilesEllipsoid& o) {
+  using namespace std::string_literals;
+
+  if ("body"s == str) {
+    return property("body", this->_body, o.body);
+  }
+  if ("radii"s == str) {
+    return property("radii", this->_radii, o.radii);
+  }
+
+  return this->readObjectKeyExtensibleObject(objectType, str, *this->_pObject);
+}
+
+Extension3dTilesEllipsoidReader::Extension3dTilesEllipsoidReader() {
+  registerReaderExtensions(this->_options);
+}
+
+CesiumJsonReader::JsonReaderOptions&
+Extension3dTilesEllipsoidReader::getOptions() {
+  return this->_options;
+}
+
+const CesiumJsonReader::JsonReaderOptions&
+Extension3dTilesEllipsoidReader::getOptions() const {
+  return this->_options;
+}
+
+CesiumJsonReader::ReadJsonResult<Cesium3DTiles::Extension3dTilesEllipsoid>
+Extension3dTilesEllipsoidReader::readFromJson(
+    const std::span<const std::byte>& data) const {
+  Extension3dTilesEllipsoidJsonHandler handler(this->_options);
+  return CesiumJsonReader::JsonReader::readJson(data, handler);
+}
+
+CesiumJsonReader::ReadJsonResult<Cesium3DTiles::Extension3dTilesEllipsoid>
+Extension3dTilesEllipsoidReader::readFromJson(
+    const rapidjson::Value& value) const {
+  Extension3dTilesEllipsoidJsonHandler handler(this->_options);
+  return CesiumJsonReader::JsonReader::readJson(value, handler);
+}
+
+CesiumJsonReader::ReadJsonResult<
+    std::vector<Cesium3DTiles::Extension3dTilesEllipsoid>>
+Extension3dTilesEllipsoidReader::readArrayFromJson(
+    const rapidjson::Value& value) const {
+  CesiumJsonReader::ArrayJsonHandler<
+      Cesium3DTiles::Extension3dTilesEllipsoid,
+      Extension3dTilesEllipsoidJsonHandler>
+      handler(this->_options);
+  return CesiumJsonReader::JsonReader::readJson(value, handler);
+}
+
 } // namespace Cesium3DTilesReader
 // This file was generated by generate-classes.
 // DO NOT EDIT THIS FILE!
@@ -786,7 +906,8 @@ ClassJsonHandler::ClassJsonHandler(
     : CesiumJsonReader::ExtensibleObjectJsonHandler(options),
       _name(),
       _description(),
-      _properties(options) {}
+      _properties(options),
+      _parent() {}
 
 void ClassJsonHandler::reset(
     CesiumJsonReader::IJsonHandler* pParentHandler,
@@ -819,6 +940,9 @@ CesiumJsonReader::IJsonHandler* ClassJsonHandler::readObjectKeyClass(
   if ("properties"s == str) {
     return property("properties", this->_properties, o.properties);
   }
+  if ("parent"s == str) {
+    return property("parent", this->_parent, o.parent);
+  }
 
   return this->readObjectKeyExtensibleObject(objectType, str, *this->_pObject);
 }