fix: remove wait on realm change for satellite images (#2787)

decentraland · Nov 14, 2024 · a91a083 · a91a083
1 parent 7a66be5
commit a91a083
Show file tree

Hide file tree

Showing 6 changed files with 36 additions and 19 deletions.
diff --git a/Explorer/Assets/DCL/Landscape/SatelliteFloor.cs b/Explorer/Assets/DCL/Landscape/SatelliteFloor.cs
@@ -1,6 +1,7 @@
 using DCL.Landscape.Settings;
 using DCL.MapRenderer.ComponentsFactory;
 using Cysharp.Threading.Tasks;
+using Cysharp.Threading.Tasks.Triggers;
 using UnityEngine;
 using Utility;
 
@@ -23,8 +24,9 @@ public class SatelliteFloor
         private MaterialPropertyBlock materialPropertyBlock;
         private LandscapeData landscapeData;
 
-        private bool satelliteRenderersEnabled;
-        private bool Initialized;
+        private bool initialized;
+        private bool currentlyInGenesis;
+        private bool debugSettingEnabled;
 
         public void Initialize(LandscapeData config)
         {
@@ -34,6 +36,8 @@ public void Initialize(LandscapeData config)
             materialPropertyBlock = new MaterialPropertyBlock();
 
             satelliteRenderers = new Renderer[SATELLITE_MAP_RESOLUTION * SATELLITE_MAP_RESOLUTION];
+
+            debugSettingEnabled = landscapeData.showSatelliteView;
         }
 
         public void Create(MapRendererTextureContainer textureContainer)
@@ -67,22 +71,32 @@ public void Create(MapRendererTextureContainer textureContainer)
                 satelliteRenderers[x + (y * SATELLITE_MAP_RESOLUTION)] = satelliteRenderer;
             }
 
-            Initialized = true;
-            SwitchVisibilityAsync(landscapeData.showSatelliteView);
+            initialized = true;
+            SwitchVisibility();
         }
 
-
-        public async UniTask SwitchVisibilityAsync(bool isVisible)
+        public void SetCurrentlyInGenesis(bool isGenesis)
         {
-            if (satelliteRenderersEnabled == isVisible) return;
+            currentlyInGenesis = isGenesis;
+            SwitchVisibility();
+        }
 
-            if (!Initialized)
-                await UniTask.WaitUntil(() => Initialized);
+        public void SwitchVisibilitySetting(bool newValue)
+        {
+            debugSettingEnabled = newValue;
+            SwitchVisibility();
+        }
 
-            satelliteRenderersEnabled = isVisible;
+        private void SwitchVisibility()
+        {
+            var newVisibilityState = debugSettingEnabled && currentlyInGenesis;
+
+            if (!initialized)
+                return;
 
+            // Set rendering state for each renderer
             foreach (Renderer satelliteRenderer in satelliteRenderers)
-                satelliteRenderer.forceRenderingOff = !isVisible;
+                satelliteRenderer.forceRenderingOff = !newVisibilityState;
         }
     }
 }
diff --git a/Explorer/Assets/DCL/Landscape/Systems/LandscapeDebugSystem.cs b/Explorer/Assets/DCL/Landscape/Systems/LandscapeDebugSystem.cs
@@ -62,7 +62,7 @@ private void OnDetailToggle(ChangeEvent<bool> evt)
 
         private void OnSatelliteToggle(ChangeEvent<bool> evt)
         {
-            floor.SwitchVisibilityAsync(evt.newValue);
+            floor.SwitchVisibilitySetting(evt.newValue);
         }
 
         private void OnLoadRadiusConfirm(int value)

diff --git a/Explorer/Assets/DCL/MapRenderer/MapLayers/Atlas/SatelliteAtlas/SatelliteChunkController.cs b/Explorer/Assets/DCL/MapRenderer/MapLayers/Atlas/SatelliteAtlas/SatelliteChunkController.cs
@@ -1,4 +1,5 @@
-using CommunicationData.URLHelpers;
+using System;
+using CommunicationData.URLHelpers;
 using Cysharp.Threading.Tasks;
 using DCL.Diagnostics;
 using DCL.MapRenderer.ComponentsFactory;
@@ -9,6 +10,7 @@
 using Utility;
 using UnityEngine.AddressableAssets;
 using UnityEngine.ResourceManagement.AsyncOperations;
+using Object = UnityEngine.Object;
 
 namespace DCL.MapRenderer.MapLayers.Atlas.SatelliteAtlas
 {
@@ -77,8 +79,9 @@ public async UniTask LoadImageAsync(Vector2Int chunkId, float chunkWorldSize, Ca
             {
                 texture = await textureTask;
             }
-            catch
+            catch (Exception e)
             {
+                ReportHub.LogException(e, ReportCategory.UI);
                 texture = await Addressables.LoadAssetAsync<Texture2D>($"{chunkId.x},{chunkId.y}").Task;
             }
 

diff --git a/...serInAppInitializationFlow/StartupOperations/SwitchRealmMiscVisibilityStartupOperation.cs b/...serInAppInitializationFlow/StartupOperations/SwitchRealmMiscVisibilityStartupOperation.cs
@@ -20,7 +20,7 @@ public SwitchRealmMiscVisibilityStartupOperation(ILoadingStatus loadingStatus, I
         public async UniTask<Result> ExecuteAsync(AsyncLoadProcessReport report, CancellationToken ct)
         {
             float finalizationProgress = loadingStatus.SetCurrentStage(LoadingStatus.LoadingStage.EnvironmentMiscSetting);
-            await realmNavigator.SwitchMiscVisibilityAsync();
+            realmNavigator.SwitchMiscVisibilityAsync();
             report.SetProgress(finalizationProgress);
             return Result.SuccessResult();
         }

diff --git a/Explorer/Assets/Scripts/ECS/SceneLifeCycle/Realm/IRealmNavigator.cs b/Explorer/Assets/Scripts/ECS/SceneLifeCycle/Realm/IRealmNavigator.cs
@@ -34,7 +34,7 @@ UniTask<Result> TryInitializeTeleportToParcelAsync(Vector2Int parcel, Cancellati
 
         UniTask LoadTerrainAsync(AsyncLoadProcessReport loadReport, CancellationToken ct);
 
-        UniTask SwitchMiscVisibilityAsync();
+        void SwitchMiscVisibilityAsync();
 
         UniTask ChangeRealmAsync(URLDomain realm, CancellationToken ct);
 

diff --git a/Explorer/Assets/Scripts/Global/Dynamic/RealmNavigator.cs b/Explorer/Assets/Scripts/Global/Dynamic/RealmNavigator.cs
@@ -406,13 +406,13 @@ private async UniTask GenerateFixedScenesTerrainAsync(AsyncLoadProcessReport lan
             }
         }
 
-        public async UniTask SwitchMiscVisibilityAsync()
+        public void SwitchMiscVisibilityAsync()
         {
             bool isGenesis = IsGenesisRealm();
 
             RealmChanged?.Invoke(isGenesis);
             mapRenderer.SetSharedLayer(MapLayer.PlayerMarker, isGenesis);
-            await satelliteFloor.SwitchVisibilityAsync(isGenesis);
+            satelliteFloor.SetCurrentlyInGenesis(isGenesis);
             roadsPlugin.RoadAssetPool?.SwitchVisibility(isGenesis);
         }
 
@@ -446,7 +446,7 @@ public async UniTask ChangeRealmAsync(URLDomain realm, CancellationToken ct)
         {
             await realmController.SetRealmAsync(realm, ct);
             currentRealm = realm;
-            await SwitchMiscVisibilityAsync();
+            SwitchMiscVisibilityAsync();
         }
 
         private bool IsGenesisRealm() =>