Merge from geojson-support

Author: azrogers

CHANGES.md

@@ -4,7 +4,25 @@
 
 ##### 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:
+
+- Added a Cesium -> Geocoder -> Geocode Blueprint function, making it easy to query the Cesium ion geocoder.
+- Added `UCesiumMetadataPickingBlueprintLibrary::FindPropertyTableProperty` to search for a `FCesiumPropertyTableProperty` by name on a given `UPrimitiveComponent`.
+
+##### Fixes :wrench:
+
 - Fixed a linking issue introduced in *v2.15.0* in `GoogleTilesTestSetup`.
+- The "unsupported primitive mode" warning is now only logged once to avoid console spam.
+- Request cache will now use `FPaths::ProjectUserDir` instead of `FPaths::EngineUserDir` on non-Android and non-iOS platforms, fixing a permissions issue in Development builds.
+- Fixed a build issue with KTX-Software's overlay port on Windows when there is no bash.exe in the system PATH and Git-for-windows is installed in a non-default directory.
+
+In addition to the above, this release updates [cesium-native](https://github.com/CesiumGS/cesium-native) from v0.46.0 to v0.47.0. See the [changelog](https://github.com/CesiumGS/cesium-native/blob/main/CHANGES.md) for a complete list of changes in cesium-native.
 
 ### v2.15.0 - 2025-04-01
 

CesiumForUnreal.uplugin

@@ -1,7 +1,7 @@
 {
 	"FileVersion": 3,
 	"Version": 75,
-	"VersionName": "2.15.0",
+	"VersionName": "2.16.0",
 	"FriendlyName": "Cesium for Unreal",
 	"Description": "Unlock the 3D geospatial ecosystem in Unreal Engine with real-world 3D content and a high accuracy full-scale WGS84 globe.",
 	"Category": "Geospatial",

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

@@ -1654,7 +1654,8 @@ bool ACesium3DTileset::ShouldTickIfViewportsOnly() const {
 namespace {
 template <typename Func>
 void forEachRenderableTile(const auto& tiles, Func&& f) {
-  for (Cesium3DTilesSelection::Tile* pTile : tiles) {
+  for (const CesiumUtility::IntrusivePointer<Cesium3DTilesSelection::Tile>&
+           pTile : tiles) {
     if (!pTile ||
         pTile->getState() != Cesium3DTilesSelection::TileLoadState::Done) {
       continue;
@@ -1682,13 +1683,17 @@ void forEachRenderableTile(const auto& tiles, Func&& f) {
 }
 
 void removeVisibleTilesFromList(
-    std::vector<Cesium3DTilesSelection::Tile*>& list,
-    const std::vector<Cesium3DTilesSelection::Tile*>& visibleTiles) {
+    std::vector<CesiumUtility::IntrusivePointer<Cesium3DTilesSelection::Tile>>&
+        list,
+    const std::vector<
+        CesiumUtility::IntrusivePointer<Cesium3DTilesSelection::Tile>>&
+        visibleTiles) {
   if (list.empty()) {
     return;
   }
 
-  for (Cesium3DTilesSelection::Tile* pTile : visibleTiles) {
+  for (const CesiumUtility::IntrusivePointer<Cesium3DTilesSelection::Tile>&
+           pTile : visibleTiles) {
     auto it = std::find(list.begin(), list.end(), pTile);
     if (it != list.end()) {
       list.erase(it);
@@ -1705,11 +1710,15 @@ void removeVisibleTilesFromList(
  *
  * @param tiles The tiles to hide
  */
-void hideTiles(const std::vector<Cesium3DTilesSelection::Tile*>& tiles) {
+void hideTiles(
+    const std::vector<
+        CesiumUtility::IntrusivePointer<Cesium3DTilesSelection::Tile>>& tiles) {
   TRACE_CPUPROFILER_EVENT_SCOPE(Cesium::HideTiles)
   forEachRenderableTile(
       tiles,
-      [](Cesium3DTilesSelection::Tile* /*pTile*/, UCesiumGltfComponent* pGltf) {
+      [](const CesiumUtility::IntrusivePointer<
+             Cesium3DTilesSelection::Tile>& /*pTile*/,
+         UCesiumGltfComponent* pGltf) {
         if (pGltf->IsVisible()) {
           TRACE_CPUPROFILER_EVENT_SCOPE(Cesium::SetVisibilityFalse)
           pGltf->SetVisibility(false, true);
@@ -1728,11 +1737,14 @@ void hideTiles(const std::vector<Cesium3DTilesSelection::Tile*>& tiles) {
  * list. This includes tiles that are fading out.
  */
 void removeCollisionForTiles(
-    const std::unordered_set<Cesium3DTilesSelection::Tile*>& tiles) {
+    const std::unordered_set<
+        CesiumUtility::IntrusivePointer<Cesium3DTilesSelection::Tile>>& tiles) {
   TRACE_CPUPROFILER_EVENT_SCOPE(Cesium::RemoveCollisionForTiles)
   forEachRenderableTile(
       tiles,
-      [](Cesium3DTilesSelection::Tile* /*pTile*/, UCesiumGltfComponent* pGltf) {
+      [](const CesiumUtility::IntrusivePointer<
+             Cesium3DTilesSelection::Tile>& /*pTile*/,
+         UCesiumGltfComponent* pGltf) {
         TRACE_CPUPROFILER_EVENT_SCOPE(Cesium::SetCollisionDisabled)
         pGltf->SetCollisionEnabled(ECollisionEnabled::NoCollision);
       });
@@ -1814,10 +1826,11 @@ void ACesium3DTileset::updateLastViewUpdateResultState(
         ResolveGeoreference();
     check(Georeference);
 
-    for (Cesium3DTilesSelection::Tile* tile : result.tilesToRenderThisFrame) {
+    for (const CesiumUtility::IntrusivePointer<Cesium3DTilesSelection::Tile>&
+             pTile : result.tilesToRenderThisFrame) {
       CesiumGeometry::OrientedBoundingBox obb =
           Cesium3DTilesSelection::getOrientedBoundingBoxFromBoundingVolume(
-              tile->getBoundingVolume(),
+              pTile->getBoundingVolume(),
               Georeference->GetEllipsoid()->GetNativeEllipsoid());
 
       FVector unrealCenter =
@@ -1828,9 +1841,9 @@ void ACesium3DTileset::updateLastViewUpdateResultState(
           TEXT("ID %s (%p)"),
           UTF8_TO_TCHAR(
               Cesium3DTilesSelection::TileIdUtilities::createTileIdString(
-                  tile->getTileID())
+                  pTile->getTileID())
                   .c_str()),
-          tile);
+          pTile.get());
 
       DrawDebugString(World, unrealCenter, text, nullptr, FColor::Red, 0, true);
     }
@@ -1914,13 +1927,15 @@ void ACesium3DTileset::updateLastViewUpdateResultState(
 }
 
 void ACesium3DTileset::showTilesToRender(
-    const std::vector<Cesium3DTilesSelection::Tile*>& tiles) {
+    const std::vector<
+        CesiumUtility::IntrusivePointer<Cesium3DTilesSelection::Tile>>& tiles) {
   TRACE_CPUPROFILER_EVENT_SCOPE(Cesium::ShowTilesToRender)
   forEachRenderableTile(
       tiles,
       [&RootComponent = this->RootComponent,
        &BodyInstance = this->BodyInstance](
-          Cesium3DTilesSelection::Tile* pTile,
+          const CesiumUtility::IntrusivePointer<Cesium3DTilesSelection::Tile>&
+              pTile,
           UCesiumGltfComponent* pGltf) {
         applyActorCollisionSettings(BodyInstance, pGltf);
 
@@ -1959,7 +1974,8 @@ static void updateTileFades(const auto& tiles, bool fadingIn) {
   forEachRenderableTile(
       tiles,
       [fadingIn](
-          Cesium3DTilesSelection::Tile* pTile,
+          const CesiumUtility::IntrusivePointer<Cesium3DTilesSelection::Tile>&
+              pTile,
           UCesiumGltfComponent* pGltf) {
         float percentage = pTile->getContent()
                                .getRenderContent()
@@ -2046,22 +2062,34 @@ void ACesium3DTileset::Tick(float DeltaTime) {
   const Cesium3DTilesSelection::ViewUpdateResult* pResult;
   if (this->_captureMovieMode) {
     TRACE_CPUPROFILER_EVENT_SCOPE(Cesium::updateViewOffline)
-    pResult = &this->_pTileset->updateViewOffline(frustums);
+    pResult = &this->_pTileset->updateViewGroupOffline(
+        this->_pTileset->getDefaultViewGroup(),
+        frustums);
   } else {
     TRACE_CPUPROFILER_EVENT_SCOPE(Cesium::updateView)
-    pResult = &this->_pTileset->updateView(frustums, DeltaTime);
+    pResult = &this->_pTileset->updateViewGroup(
+        this->_pTileset->getDefaultViewGroup(),
+        frustums,
+        DeltaTime);
   }
+
+  {
+    TRACE_CPUPROFILER_EVENT_SCOPE(Cesium::loadTiles)
+    this->_pTileset->loadTiles();
+  }
+
   updateLastViewUpdateResultState(*pResult);
 
   removeCollisionForTiles(pResult->tilesFadingOut);
 
   removeVisibleTilesFromList(
-      _tilesToHideNextFrame,
+      this->_tilesToHideNextFrame,
       pResult->tilesToRenderThisFrame);
-  hideTiles(_tilesToHideNextFrame);
+  hideTiles(this->_tilesToHideNextFrame);
 
   _tilesToHideNextFrame.clear();
-  for (Cesium3DTilesSelection::Tile* pTile : pResult->tilesFadingOut) {
+  for (const CesiumUtility::IntrusivePointer<Cesium3DTilesSelection::Tile>&
+           pTile : pResult->tilesFadingOut) {
     Cesium3DTilesSelection::TileRenderContent* pRenderContent =
         pTile->getContent().getRenderContent();
     if (!this->UseLodTransitions ||

Source/CesiumRuntime/Private/Cesium3DTileset.cpp

@@ -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"
@@ -21,7 +22,6 @@
 #include "Modules/ModuleManager.h"
 #endif
 
-/*static*/ UObject* ACesiumCreditSystem::CesiumCreditSystemBP = nullptr;
 namespace {
 
 /**
@@ -89,17 +89,6 @@ FName ACesiumCreditSystem::DEFAULT_CREDITSYSTEM_TAG =
 
 /*static*/ ACesiumCreditSystem*
 ACesiumCreditSystem::GetDefaultCreditSystem(const UObject* WorldContextObject) {
-  // Blueprint loading can only happen in a constructor, so we instantiate a
-  // loader object that retrieves the blueprint class in its constructor. We can
-  // destroy the loader immediately once it's done since it will have already
-  // set CesiumCreditSystemBP.
-  if (!CesiumCreditSystemBP) {
-    UCesiumCreditSystemBPLoader* bpLoader =
-        NewObject<UCesiumCreditSystemBPLoader>();
-    CesiumCreditSystemBP = bpLoader->CesiumCreditSystemBP.LoadSynchronous();
-    bpLoader->ConditionalBeginDestroy();
-  }
-
   UWorld* world = WorldContextObject->GetWorld();
   // This method can be called by actors even when opening the content browser.
   if (!IsValid(world)) {
@@ -154,8 +143,12 @@ ACesiumCreditSystem::GetDefaultCreditSystem(const UObject* WorldContextObject) {
     spawnParameters.SpawnCollisionHandlingOverride =
         ESpawnActorCollisionHandlingMethod::AlwaysSpawn;
     spawnParameters.OverrideLevel = world->PersistentLevel;
+    UCesiumCreditSystemBPLoader* bpLoader =
+        GEngine->GetEngineSubsystem<UCesiumCreditSystemBPLoader>();
+    UClass* CesiumCreditSystemBP =
+        Cast<UClass>(bpLoader->CesiumCreditSystemBP.LoadSynchronous());
     pCreditSystem = world->SpawnActor<ACesiumCreditSystem>(
-        Cast<UClass>(CesiumCreditSystemBP),
+        CesiumCreditSystemBP,
         spawnParameters);
     // Null check so the editor doesn't crash when it makes arbitrary calls to
     // this function without a valid world context object.
@@ -333,13 +326,14 @@ void ACesiumCreditSystem::Tick(float DeltaTime) {
     return;
   }
 
+  const CesiumUtility::CreditsSnapshot& credits = _pCreditSystem->getSnapshot();
+
   const std::vector<CesiumUtility::Credit>& creditsToShowThisFrame =
-      _pCreditSystem->getCreditsToShowThisFrame();
+      credits.currentCredits;
 
   // if the credit list has changed, we want to reformat the credits
-  CreditsUpdated =
-      creditsToShowThisFrame.size() != _lastCreditsCount ||
-      _pCreditSystem->getCreditsToNoLongerShowThisFrame().size() > 0;
+  CreditsUpdated = creditsToShowThisFrame.size() != _lastCreditsCount ||
+                   credits.removedCredits.size() > 0;
 
   if (CreditsUpdated) {
     FString OnScreenCredits;
@@ -385,7 +379,6 @@ void ACesiumCreditSystem::Tick(float DeltaTime) {
 
     CreditsWidget->SetCredits(Credits, OnScreenCredits);
   }
-  _pCreditSystem->startNextFrame();
 }
 
 namespace {

Source/CesiumRuntime/Private/CesiumCreditSystem.cpp

@@ -2,10 +2,12 @@
 
 #pragma once
 
+#include <Subsystems/EngineSubsystem.h>
+
 #include "CesiumCreditSystemBPLoader.generated.h"
 
 UCLASS()
-class UCesiumCreditSystemBPLoader : public UObject {
+class UCesiumCreditSystemBPLoader : public UEngineSubsystem {
   GENERATED_BODY()
 
 public:

Source/CesiumRuntime/Private/CesiumCreditSystemBPLoader.h

@@ -22,7 +22,7 @@ struct FMetadataDescription;
 struct FCesiumPrimitiveFeaturesDescription;
 
 /**
- * DEPRECATED. Use CesiumEncodedFeaturesMetadata instead.
+ * DEPRECATED. Use EncodedFeaturesMetadata instead.
  */
 namespace CesiumEncodedMetadataUtility {
 struct EncodedMetadataProperty {