fix: map avatar points (#1893)

* MinimapPlugin AsUniTaskResult, remove unnecessary state machine creation * nullables * HotUserMarkerObject internal initialize * fix points and avatar instantiation after clean-up
decentraland · Aug 27, 2024 · 5446349 · 5446349
1 parent b846bb4
commit 5446349
Show file tree

Hide file tree

Showing 10 changed files with 58 additions and 32 deletions.
diff --git a/Explorer/Assets/DCL/AvatarRendering/DemoScripts/Systems/InstantiateRandomAvatarsSystem.cs b/Explorer/Assets/DCL/AvatarRendering/DemoScripts/Systems/InstantiateRandomAvatarsSystem.cs
@@ -299,7 +299,9 @@ private void CreateAvatar(ICharacterControllerSettings characterControllerSettin
 
             transformComp.Transform.name = $"RANDOM_AVATAR_{avatarIndex}";
 
-            CharacterController characterController = transformComp.Transform.gameObject.AddComponent<CharacterController>();
+            CharacterController characterController = transformComp.Transform.TryGetComponent<CharacterController>(out var component)
+                ? component
+                : transformComp.Transform.gameObject.AddComponent<CharacterController>();
             characterController.radius = 0.4f;
             characterController.height = 2;
             characterController.center = Vector3.up;

diff --git a/Explorer/Assets/DCL/MapRenderer/Addressables/HotUserMarkerObject.prefab b/Explorer/Assets/DCL/MapRenderer/Addressables/HotUserMarkerObject.prefab
@@ -23,6 +23,7 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 4175020263976144273}
+  serializedVersion: 2
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
@@ -31,7 +32,6 @@ Transform:
   - {fileID: 3972535992487305214}
   - {fileID: 1882238951119396974}
   m_Father: {fileID: 6490643975463183000}
-  m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &6634102564137692517
 GameObject:
@@ -57,14 +57,14 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 6634102564137692517}
+  serializedVersion: 2
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 8293322612040113748}
   m_Father: {fileID: 0}
-  m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!114 &6723780352267149330
 MonoBehaviour:
@@ -79,7 +79,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   <pivot>k__BackingField: {x: 0.5, y: 0.5}
-  <spriteRenderers>k__BackingField:
+  spriteRenderers:
   - {fileID: 6574531059262994368}
   - {fileID: 6527134346746202169}
 --- !u!1 &8549977302113203150
@@ -106,13 +106,13 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 8549977302113203150}
+  serializedVersion: 2
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 0.45, y: 0.45, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 8293322612040113748}
-  m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!212 &6574531059262994368
 SpriteRenderer:
@@ -190,13 +190,13 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 9041844299909259778}
+  serializedVersion: 2
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: -0.026}
   m_LocalScale: {x: 0.38, y: 0.38, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 8293322612040113748}
-  m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!212 &6527134346746202169
 SpriteRenderer:

diff --git a/Explorer/Assets/DCL/MapRenderer/ComponentsFactory/HotUsersMarkersInstaller.cs b/Explorer/Assets/DCL/MapRenderer/ComponentsFactory/HotUsersMarkersInstaller.cs
@@ -4,6 +4,7 @@
 using DCL.MapRenderer.Culling;
 using DCL.MapRenderer.MapLayers;
 using DCL.MapRenderer.MapLayers.Users;
+using DCL.MapRenderer.MapLayers.UsersMarker;
 using System.Collections.Generic;
 using System.Threading;
 using UnityEngine;
@@ -50,10 +51,7 @@ IHotUserMarker CreateWrap() =>
         private static HotUserMarkerObject CreatePoolMethod(MapRendererConfiguration configuration, HotUserMarkerObject prefab, ICoordsUtils coordsUtils)
         {
             HotUserMarkerObject markerObject = Object.Instantiate(prefab, configuration.HotUserMarkersRoot);
-
-            for (var i = 0; i < markerObject.spriteRenderers.Length; i++)
-                markerObject.spriteRenderers[i].sortingOrder = MapRendererDrawOrder.HOT_USER_MARKERS;
-
+            markerObject.UpdateSortOrder(MapRendererDrawOrder.HOT_USER_MARKERS);
             coordsUtils.SetObjectScale(markerObject);
             return markerObject;
         }

diff --git a/Explorer/Assets/DCL/MapRenderer/ConsumerUtils/csc.rsp b/Explorer/Assets/DCL/MapRenderer/ConsumerUtils/csc.rsp
@@ -0,0 +1 @@
+-nullable:enable
diff --git a/Explorer/Assets/DCL/MapRenderer/ConsumerUtils/csc.rsp.meta b/Explorer/Assets/DCL/MapRenderer/ConsumerUtils/csc.rsp.meta
diff --git a/Explorer/Assets/DCL/MapRenderer/IMapRendererSettings.cs b/Explorer/Assets/DCL/MapRenderer/IMapRendererSettings.cs
@@ -7,6 +7,7 @@
 using DCL.MapRenderer.MapLayers.PlayerMarker;
 using DCL.MapRenderer.MapLayers.PointsOfInterest;
 using DCL.MapRenderer.MapLayers.Users;
+using DCL.MapRenderer.MapLayers.UsersMarker;
 using System;
 using UnityEngine;
 

diff --git a/Explorer/Assets/DCL/MapRenderer/MapLayers/UsersMarker/HotUserMarker.cs b/Explorer/Assets/DCL/MapRenderer/MapLayers/UsersMarker/HotUserMarker.cs
@@ -1,8 +1,6 @@
-using Cysharp.Threading.Tasks;
-using DCL.MapRenderer.CommonBehavior;
+using DCL.MapRenderer.CommonBehavior;
 using DCL.MapRenderer.CoordsUtils;
-using DCL.MapRenderer.Culling;
-using System.Threading;
+using DCL.MapRenderer.MapLayers.UsersMarker;
 using UnityEngine;
 using UnityEngine.Pool;
 using Utility;

diff --git a/Explorer/Assets/DCL/MapRenderer/MapLayers/UsersMarker/HotUserMarkerObject.cs b/Explorer/Assets/DCL/MapRenderer/MapLayers/UsersMarker/HotUserMarkerObject.cs
@@ -1,10 +1,17 @@
-using UnityEngine;
+using System;
+using UnityEngine;
 
-namespace DCL.MapRenderer.MapLayers.Users
+namespace DCL.MapRenderer.MapLayers.UsersMarker
 {
     public class HotUserMarkerObject : MapRendererMarkerBase
     {
         [field: SerializeField]
-        internal SpriteRenderer[] spriteRenderers { get; private set; }
+        private SpriteRenderer[] spriteRenderers = Array.Empty<SpriteRenderer>();
+
+        public void UpdateSortOrder(int sortingOrder)
+        {
+            for (var i = 0; i < spriteRenderers.Length; i++)
+                spriteRenderers[i].sortingOrder = sortingOrder;
+        }
     }
 }
diff --git a/Explorer/Assets/DCL/MapRenderer/MapLayers/UsersMarker/UsersMarkersHotAreaController.cs b/Explorer/Assets/DCL/MapRenderer/MapLayers/UsersMarker/UsersMarkersHotAreaController.cs
@@ -8,6 +8,8 @@
 using DCL.CharacterPreview.Components;
 using DCL.MapRenderer.CoordsUtils;
 using DCL.MapRenderer.Culling;
+using DCL.MapRenderer.MapLayers.UsersMarker;
+using ECS.Groups;
 using ECS.LifeCycle.Components;
 using MVC;
 using System.Collections.Generic;
@@ -55,15 +57,14 @@ public void CreateSystems(ref ArchSystemsWorldBuilder<World> builder)
             untrackSystem.Activate();
         }
 
-        [All(typeof(CharacterTransform))]
-        [None(typeof(PlayerComponent), typeof(CharacterPreviewComponent))]
         [Query]
+        [None(typeof(PlayerComponent), typeof(CharacterPreviewComponent), typeof(DeleteEntityIntention))]
         private void SetPlayerMarker(in CharacterTransform transformComponent, in AvatarShapeComponent avatarShape)
         {
             if (!isEnabled)
                 return;
 
-            if(markers.TryGetValue(avatarShape.ID, out var marker))
+            if (markers.TryGetValue(avatarShape.ID, out var marker))
             {
                 marker.UpdateMarkerPosition(avatarShape.ID, transformComponent.Transform.position);
                 mapCullingController.SetTrackedObjectPositionDirty(marker);
@@ -77,7 +78,8 @@ private void SetPlayerMarker(in CharacterTransform transformComponent, in Avatar
         }
 
         [Query]
-        private void RemoveMarker(in AvatarShapeComponent avatarShape, in DeleteEntityIntention deleteEntityIntention)
+        [All(typeof(DeleteEntityIntention))]
+        private void RemoveMarker(in AvatarShapeComponent avatarShape)
         {
             if (markers.TryGetValue(avatarShape.ID, out var marker))
             {
@@ -115,6 +117,7 @@ public partial class TrackPlayersPositionSystem : ControllerECSBridgeSystem
         internal TrackPlayersPositionSystem(World world) : base(world) { }
     }
 
+    [UpdateAfter(typeof(TrackPlayersPositionSystem))]
     [UpdateInGroup(typeof(PresentationSystemGroup))]
     public partial class RemovedTrackedPlayersPositionSystem : ControllerECSBridgeSystem
     {

diff --git a/Explorer/Assets/DCL/PluginSystem/Global/MinimapPlugin.cs b/Explorer/Assets/DCL/PluginSystem/Global/MinimapPlugin.cs
@@ -11,6 +11,7 @@
 using System.Threading;
 using ECS.SceneLifeCycle;
 using ECS.SceneLifeCycle.Realm;
+using Utility.Tasks;
 
 namespace DCL.PluginSystem.Global
 {
@@ -41,20 +42,32 @@ public MinimapPlugin(IMVCManager mvcManager, MapRendererContainer mapRendererCon
             this.mainUIView = mainUIView;
         }
 
-        protected override async UniTask<ContinueInitialization?> InitializeInternalAsync(MinimapSettings settings, CancellationToken ct)
+        protected override UniTask<ContinueInitialization?> InitializeInternalAsync(MinimapSettings settings, CancellationToken ct)
         {
-            return (ref ArchSystemsWorldBuilder<Arch.Core.World> world, in GlobalPluginArguments _) =>
+            ContinueInitialization initialization = (ref ArchSystemsWorldBuilder<Arch.Core.World> world, in GlobalPluginArguments _) =>
             {
-                mvcManager.RegisterController(new MinimapController(
-                    () =>
-                    {
-                        MinimapView? view = mainUIView.MinimapView;
-                        view.gameObject.SetActive(true);
-                        return view;
-                    },
-                    mapRendererContainer.MapRenderer, mvcManager, placesAPIService, TrackPlayerPositionSystem.InjectToWorld(ref world),
-                    realmData, chatMessagesBus, realmNavigator, scenesCache, mapPathEventBus));
+                mvcManager.RegisterController(
+                    new MinimapController(
+                        () =>
+                        {
+                            MinimapView? view = mainUIView.MinimapView;
+                            view.gameObject.SetActive(true);
+                            return view;
+                        },
+                        mapRendererContainer.MapRenderer,
+                        mvcManager,
+                        placesAPIService,
+                        TrackPlayerPositionSystem.InjectToWorld(ref world),
+                        realmData,
+                        chatMessagesBus,
+                        realmNavigator,
+                        scenesCache,
+                        mapPathEventBus
+                    )
+                );
             };
+
+            return initialization.AsUniTaskResult<ContinueInitialization?>();
         }
 
         protected override void InjectSystems(ref ArchSystemsWorldBuilder<Arch.Core.World> builder, in GlobalPluginArguments arguments) { }