Merge from vector-overlay

Author: azrogers

CHANGES.md

@@ -1,5 +1,13 @@
 # Change Log {#changes}
 
+### ? - ?
+
+##### Fixes :wrench:
+
+- Worked around an Unreal Engine limitation that prevented collisions and line traces from working correctly for tilesets with a very small scale factor.
+- Add a missing include for `GEngine` when packaging from source, introduced in *v2.16.0*.
+- Fixed a bug in UCesiumFeaturesMetadataComponent where multiple references to same feature ID set would cause improper encoding of its feature IDs.
+
 ### v2.16.0 - 2025-05-01
 
 ##### Additions :tada:

Content/Tests/Tilesets/BigCube/BigCube.glb

@@ -0,0 +1,14 @@
+{
+  "asset": { "version": "1.0" },
+  "root": {
+    "boundingVolume": {
+      "sphere": [
+        0,0,0,200000
+      ]
+    },
+    "children": [],
+    "content": { "uri": "BigCube.glb" },
+    "geometricError": 0.0,
+    "refine": "REPLACE"
+  }
+}

Content/Tests/Tilesets/BigCube/tileset.json

@@ -91,7 +91,9 @@ public CesiumRuntime(ReadOnlyTargetRules Target) : base(Target)
                 "DeveloperSettings",
                 "UMG",
                 "Renderer",
-                "OpenSSL"
+                "OpenSSL",
+                "Json",
+                "JsonUtilities"
             }
         );
 

Source/CesiumRuntime/CesiumRuntime.Build.cs

@@ -5,6 +5,7 @@
 #include "CesiumCreditSystemBPLoader.h"
 #include "CesiumRuntime.h"
 #include "CesiumUtility/CreditSystem.h"
+#include "Engine/Engine.h"
 #include "Engine/World.h"
 #include "EngineUtils.h"
 #include "ScreenCreditsWidget.h"

Source/CesiumRuntime/Private/CesiumCreditSystem.cpp

@@ -0,0 +1,92 @@
+#include "CesiumGeoJsonDocument.h"
+#include "CesiumRuntime.h"
+
+#include "CesiumUtility/Result.h"
+
+#include <span>
+
+bool UCesiumGeoJsonDocumentBlueprintLibrary::LoadGeoJsonFromString(
+    const FString& InString,
+    FCesiumGeoJsonDocument& OutVectorDocument) {
+  const std::string str = TCHAR_TO_UTF8(*InString);
+  std::span<const std::byte> bytes(
+      reinterpret_cast<const std::byte*>(str.data()),
+      str.size());
+  CesiumUtility::Result<
+      CesiumUtility::IntrusivePointer<CesiumVectorData::GeoJsonDocument>>
+      documentResult = CesiumVectorData::GeoJsonDocument::fromGeoJson(bytes);
+
+  if (!documentResult.errors.errors.empty()) {
+    documentResult.errors.logError(
+        spdlog::default_logger(),
+        "Errors while loading GeoJSON from string");
+  }
+
+  if (!documentResult.errors.warnings.empty()) {
+    documentResult.errors.logWarning(
+        spdlog::default_logger(),
+        "Warnings while loading GeoJSON from string");
+  }
+
+  if (documentResult.pValue) {
+    OutVectorDocument =
+        FCesiumGeoJsonDocument(std::move(documentResult.pValue));
+    return true;
+  }
+
+  return false;
+}
+
+FCesiumGeoJsonObject UCesiumGeoJsonDocumentBlueprintLibrary::GetRootObject(
+    const FCesiumGeoJsonDocument& InVectorDocument) {
+  if (!InVectorDocument._document) {
+    return FCesiumGeoJsonObject();
+  }
+
+  return FCesiumGeoJsonObject(
+      InVectorDocument._document,
+      &InVectorDocument._document->getRootObject());
+}
+
+UCesiumLoadVectorDocumentFromIonAsyncAction*
+UCesiumLoadVectorDocumentFromIonAsyncAction::LoadFromIon(
+    int64 AssetId,
+    const FString& IonAccessToken,
+    const FString& IonAssetEndpointUrl) {
+  UCesiumLoadVectorDocumentFromIonAsyncAction* pAction =
+      NewObject<UCesiumLoadVectorDocumentFromIonAsyncAction>();
+  pAction->AssetId = AssetId;
+  pAction->IonAccessToken = IonAccessToken;
+  pAction->IonAssetEndpointUrl = IonAssetEndpointUrl;
+  return pAction;
+}
+
+void UCesiumLoadVectorDocumentFromIonAsyncAction::Activate() {
+  CesiumVectorData::GeoJsonDocument::fromCesiumIonAsset(
+      getAsyncSystem(),
+      getAssetAccessor(),
+      this->AssetId,
+      TCHAR_TO_UTF8(*this->IonAccessToken),
+      TCHAR_TO_UTF8(*this->IonAssetEndpointUrl))
+      .thenInMainThread(
+          [Callback = this->OnLoadResult](
+              CesiumUtility::Result<CesiumUtility::IntrusivePointer<
+                  CesiumVectorData::GeoJsonDocument>>&& result) {
+            if (result.errors.hasErrors()) {
+              result.errors.logError(
+                  spdlog::default_logger(),
+                  "Errors loading GeoJSON:");
+              result.errors.logWarning(
+                  spdlog::default_logger(),
+                  "Warnings loading GeoJSON:");
+            }
+
+            if (result.pValue) {
+              Callback.Broadcast(
+                  true,
+                  FCesiumGeoJsonDocument(MoveTemp(result.pValue)));
+            } else {
+              Callback.Broadcast(false, {});
+            }
+          });
+}