Use correct server when loading all levels.

Author: kring

Source/CesiumRuntime/Private/Cesium3DTileset.cpp

@@ -2093,27 +2093,9 @@ void ACesium3DTileset::PostLoad() {
       this->GetLinkerCustomVersion(FCesiumCustomVersion::GUID);
 
   PRAGMA_DISABLE_DEPRECATION_WARNINGS
-  if (CesiumVersion < FCesiumCustomVersion::CesiumIonServer &&
-      !this->IonAssetEndpointUrl_DEPRECATED.IsEmpty() &&
-      !this->IonAssetEndpointUrl_DEPRECATED.StartsWith(
-          TEXT("https://api.ion.cesium.com")) &&
-      !this->IonAssetEndpointUrl_DEPRECATED.StartsWith(
-          TEXT("https://api.cesium.com"))) {
-    this->CesiumIonServer = UCesiumIonServer::GetOrCreateForApiUrl(
+  if (CesiumVersion < FCesiumCustomVersion::CesiumIonServer) {
+    this->CesiumIonServer = UCesiumIonServer::GetBackwardCompatibleServer(
         this->IonAssetEndpointUrl_DEPRECATED);
-
-    // In previous versions, the custom IonAssetEndpointUrl would still use the
-    // project default token.
-    UCesiumIonServer* pDefault = UCesiumIonServer::GetDefault();
-    this->CesiumIonServer->DefaultIonAccessTokenId =
-        pDefault->DefaultIonAccessTokenId;
-    this->CesiumIonServer->DefaultIonAccessToken =
-        pDefault->DefaultIonAccessToken;
-
-    this->CesiumIonServer->Modify();
-    UEditorLoadingAndSavingUtils::SavePackages(
-        {this->CesiumIonServer->GetPackage()},
-        true);
   }
   PRAGMA_ENABLE_DEPRECATION_WARNINGS
 #endif

Source/CesiumRuntime/Private/CesiumIonRasterOverlay.cpp

@@ -58,27 +58,9 @@ void UCesiumIonRasterOverlay::PostLoad() {
       this->GetLinkerCustomVersion(FCesiumCustomVersion::GUID);
 
   PRAGMA_DISABLE_DEPRECATION_WARNINGS
-  if (CesiumVersion < FCesiumCustomVersion::CesiumIonServer &&
-      !this->IonAssetEndpointUrl_DEPRECATED.IsEmpty() &&
-      !this->IonAssetEndpointUrl_DEPRECATED.StartsWith(
-          TEXT("https://api.ion.cesium.com")) &&
-      !this->IonAssetEndpointUrl_DEPRECATED.StartsWith(
-          TEXT("https://api.cesium.com"))) {
-    this->CesiumIonServer = UCesiumIonServer::GetOrCreateForApiUrl(
+  if (CesiumVersion < FCesiumCustomVersion::CesiumIonServer) {
+    this->CesiumIonServer = UCesiumIonServer::GetBackwardCompatibleServer(
         this->IonAssetEndpointUrl_DEPRECATED);
-
-    // In previous versions, the custom IonAssetEndpointUrl would still use the
-    // project default token.
-    UCesiumIonServer* pDefault = UCesiumIonServer::GetDefault();
-    this->CesiumIonServer->DefaultIonAccessTokenId =
-        pDefault->DefaultIonAccessTokenId;
-    this->CesiumIonServer->DefaultIonAccessToken =
-        pDefault->DefaultIonAccessToken;
-
-    this->CesiumIonServer->Modify();
-    UEditorLoadingAndSavingUtils::SavePackages(
-        {this->CesiumIonServer->GetPackage()},
-        true);
   }
   PRAGMA_ENABLE_DEPRECATION_WARNINGS
 #endif

Source/CesiumRuntime/Private/CesiumIonServer.cpp

@@ -62,8 +62,16 @@ UCesiumIonServer::SetCurrentForNewObjects(UCesiumIonServer* Server) {
 
 #if WITH_EDITOR
 UCesiumIonServer*
-UCesiumIonServer::GetOrCreateForApiUrl(const FString& apiUrl) {
-  // Find an equivalent server.
+UCesiumIonServer::GetBackwardCompatibleServer(const FString& apiUrl) {
+  // Return the default server if the API URL is unspecified or if it's the
+  // standard SaaS API URL.
+  if (apiUrl.IsEmpty() ||
+      apiUrl.StartsWith(TEXT("https://api.ion.cesium.com")) ||
+      apiUrl.StartsWith(TEXT("https://api.cesium.com"))) {
+    return UCesiumIonServer::GetDefault();
+  }
+
+  // Find a server with this API URL.
   TArray<FAssetData> CesiumIonServers;
   FAssetRegistryModule& AssetRegistryModule =
       FModuleManager::LoadModuleChecked<FAssetRegistryModule>("AssetRegistry");
@@ -81,7 +89,7 @@ UCesiumIonServer::GetOrCreateForApiUrl(const FString& apiUrl) {
     return Cast<UCesiumIonServer>(pFound->GetAsset());
   }
 
-  // Create a new server asset.
+  // Not found - create a new server asset.
   UDataAssetFactory* Factory = NewObject<UDataAssetFactory>();
 
   UPackage* Package = nullptr;
@@ -120,6 +128,12 @@ UCesiumIonServer::GetOrCreateForApiUrl(const FString& apiUrl) {
   Server->ApiUrl = apiUrl;
   Server->OAuth2ApplicationID = 190;
 
+  // Adopt the token from the default server, consistent with the behavior in
+  // old versions of Cesium for Unreal.
+  UCesiumIonServer* pDefault = UCesiumIonServer::GetDefault();
+  Server->DefaultIonAccessTokenId = pDefault->DefaultIonAccessTokenId;
+  Server->DefaultIonAccessToken = pDefault->DefaultIonAccessToken;
+
   FAssetRegistryModule::AssetCreated(Server);
 
   Package->FullyLoad();

Source/CesiumRuntime/Public/CesiumIonServer.h

@@ -42,11 +42,11 @@ class CESIUMRUNTIME_API UCesiumIonServer : public UDataAsset {
 
 #if WITH_EDITOR
   /**
-   * Gets or creates a new server from a given API URL. This is primarily useful
-   * for backward compatibility with the old IonAssetEndpointUrl property. The
-   * new server is created in `/Game/CesiumSettings/CesiumIonServers`.
+   * Gets or creates a server from a given API URL. This is used for backward
+   * compatibility with the old `IonAssetEndpointUrl` property. The new server,
+   * if needed, is created in `/Game/CesiumSettings/CesiumIonServers`.
    */
-  static UCesiumIonServer* GetOrCreateForApiUrl(const FString& apiUrl);
+  static UCesiumIonServer* GetBackwardCompatibleServer(const FString& apiUrl);
 #endif
 
   /**