Merge remote-tracking branch 'origin/main' into multiple-cesium-ions

Author: kring

CHANGES.md

@@ -12,6 +12,13 @@
  - Significantly improved tile download performance by adding `HttpThreadActiveFrameTimeInSeconds=0.001` to `Engine.ini`. This results in a major performance improvement for all tilesets, particularly Google Photorealistic 3D Tiles.
  - Added support for multiple Cesium ion servers by creating `CesiumIonServer` data assets.
 
+##### Fixes :wrench:
+
+- Fixed a bug in the "Select New Token" dialog that caused an error when trying to create a new token without being connected.
+- Fixed a bug where an EditCondition was not parsed correctly and caused Output Log window errors.
+- Removed query parameters from filepaths if present, as they are no longer ignored by Unreal. This fixes a bug where the URL would not load correctly in some cases.
+- Fixed a Tile Excluder bug that computed incorrect tile bounds, making tiles invisible when moving the tileset in the sample scene.
+
 ### v2.0.0 - 2023-11-01
 
 This release no longer supports Unreal Engine v5.0. Unreal Engine v5.1, v5.2, or v5.3 is required.

Source/CesiumEditor/Private/SelectCesiumIonToken.cpp

@@ -228,9 +228,10 @@ void SelectCesiumIonToken::Construct(const FArguments& InArgs) {
   this->_useExistingToken.token.token =
       TCHAR_TO_UTF8(*pServer->DefaultIonAccessToken);
   this->_specifyToken.token = pServer->DefaultIonAccessToken;
-  this->_tokenSource = pServer->DefaultIonAccessToken.IsEmpty()
-                           ? TokenSource::Create
-                           : TokenSource::Specify;
+  this->_tokenSource =
+      pServer->DefaultIonAccessToken.IsEmpty() && pSession->isConnected()
+          ? TokenSource::Create
+          : TokenSource::Specify;
 
   this->createRadioButton(
       pSession,

Source/CesiumRuntime/Private/Cesium3DTileset.cpp

@@ -105,6 +105,10 @@ ACesium3DTileset::ACesium3DTileset()
   this->Root = this->RootComponent;
 
   PlatformName = UGameplayStatics::GetPlatformName();
+
+#if WITH_EDITOR
+  bIsMac = PlatformName == TEXT("Mac");
+#endif
 }
 
 ACesium3DTileset::~ACesium3DTileset() { this->DestroyTileset(); }

Source/CesiumRuntime/Private/CesiumTile.cpp

@@ -26,9 +26,7 @@ bool UCesiumTile::PrimitiveBoxFullyContainsTileBounds(
 
 FBoxSphereBounds UCesiumTile::CalcBounds(const FTransform& LocalToWorld) const {
   FBoxSphereBounds bounds = std::visit(
-      CalcBoundsOperation{
-          LocalToWorld * this->GetComponentTransform(),
-          this->_tileTransform},
+      CalcBoundsOperation{LocalToWorld, this->_tileTransform},
       _tileBounds);
   return bounds;
 }

Source/CesiumRuntime/Private/Tests/UnrealAssetAccessor.spec.cpp

@@ -76,4 +76,13 @@ void FUnrealAssetAccessorSpec::Define() {
 
     TestAccessorRequest(Uri, randomText);
   });
+
+  It("Can access file:/// URLs with unnecessary query params", [this]() {
+    FString Uri = TEXT("file:///") + Filename;
+    Uri.ReplaceCharInline('\\', '/');
+    Uri.ReplaceInline(TEXT(" "), TEXT("%20"));
+    Uri.Append("?version=4.27.1");
+
+    TestAccessorRequest(Uri, randomText);
+  });
 }

Source/CesiumRuntime/Private/UnrealAssetAccessor.cpp

@@ -341,6 +341,13 @@ std::string convertFileUriToFilename(const std::string& url) {
     result.resize(end);
   }
 
+  // Remove query parameters from the URL if present, as they are no longer
+  // ignored by Unreal.
+  size_t pos = result.find("?");
+  if (pos != std::string::npos) {
+    result.erase(pos);
+  }
+
   return result;
 }
 

Source/CesiumRuntime/Public/Cesium3DTileset.h

@@ -800,7 +800,7 @@ class CESIUMRUNTIME_API ACesium3DTileset : public AActor {
       BlueprintGetter = GetEnableWaterMask,
       BlueprintSetter = SetEnableWaterMask,
       Category = "Cesium|Rendering",
-      meta = (EditCondition = "PlatformName != TEXT(\"Mac\")"))
+      meta = (EditCondition = "!bIsMac"))
   bool EnableWaterMask = false;
 
   /**
@@ -894,6 +894,11 @@ class CESIUMRUNTIME_API ACesium3DTileset : public AActor {
   UPROPERTY()
   FString PlatformName;
 
+#if WITH_EDITORONLY_DATA
+  UPROPERTY()
+  bool bIsMac;
+#endif
+
 public:
   UFUNCTION(BlueprintGetter, Category = "Cesium")
   float GetLoadProgress() const { return LoadProgress; }