Fix setting hovered map tile on Standalone platform when a map tile is hovered while pathfinding ends processing

Author: JasonNumberThirteen

Assets/Project/Scenes/VisualiserScene.unity

@@ -7,6 +7,10 @@ public class HoveredMapTileManager : MonoBehaviour, IPrimaryWindowElement, IMapE
 
 	private bool mapTilesCanBeHovered = true;
 	private MapTile mapTile;
+#if !UNITY_ANDROID
+	private MapPathManager mapPathManager;
+	private MapTileRaycaster mapTileRaycaster;
+#endif
 	private VisualiserEventsManager visualiserEventsManager;
 
 	public void SetPrimaryWindowElementActive(bool active)
@@ -24,6 +28,10 @@ public void SetMapEditingElementActive(bool active)
 
 	private void Awake()
 	{
+#if !UNITY_ANDROID
+		mapPathManager = ObjectMethods.FindComponentOfType<MapPathManager>();
+		mapTileRaycaster = ObjectMethods.FindComponentOfType<MapTileRaycaster>();
+#endif
 		visualiserEventsManager = ObjectMethods.FindComponentOfType<VisualiserEventsManager>();
 
 		RegisterToListeners(true);
@@ -38,20 +46,44 @@ private void RegisterToListeners(bool register)
 	{
 		if(register)
 		{
+#if !UNITY_ANDROID
+			if(mapPathManager != null)
+			{
+				mapPathManager.pathfindingProcessStateWasChangedEvent.AddListener(OnPathfindingProcessStateWasChanged);
+			}
+#endif
+			
 			if(visualiserEventsManager != null)
 			{
 				visualiserEventsManager.eventWasSentEvent.AddListener(OnEventWasSent);
 			}
 		}
 		else
 		{
+#if !UNITY_ANDROID
+			if(mapPathManager != null)
+			{
+				mapPathManager.pathfindingProcessStateWasChangedEvent.RemoveListener(OnPathfindingProcessStateWasChanged);
+			}
+#endif
+			
 			if(visualiserEventsManager != null)
 			{
 				visualiserEventsManager.eventWasSentEvent.RemoveListener(OnEventWasSent);
 			}
 		}
 	}
 
+#if !UNITY_ANDROID
+	private void OnPathfindingProcessStateWasChanged(bool started)
+	{
+		if(!started && mapTileRaycaster != null && mapTileRaycaster.ComponentWasDetected(MouseMethods.GetMousePosition(), out var mapTile))
+		{
+			SetMapTile(mapTile);
+		}
+	}
+#endif
+
 	private void OnEventWasSent(VisualiserEvent visualiserEvent)
 	{
 		if(mapTilesCanBeHovered && visualiserEvent is MapTileBoolVisualiserEvent mapTileBoolVisualiserEvent && mapTileBoolVisualiserEvent.GetVisualiserEventType() == VisualiserEventType.MapTileHoverStateWasChanged)

Assets/Project/Scripts/Game Objects/Managers/Map Tile/HoveredMapTileManager.cs

@@ -1,6 +1,5 @@
 using System.Linq;
 using UnityEngine;
-using UnityEngine.InputSystem;
 
 public class SelectedMapTileMovementManager : MonoBehaviour, IPrimaryWindowElement, IMapEditingElement
 {
@@ -107,7 +106,7 @@ private void Update()
 
 	private Vector3 GetMousePositionToWorldPoint()
 	{
-		var position = mainSceneCamera != null ? (Vector2)mainSceneCamera.GetScreenToWorldPointFrom(Mouse.current.position.ReadValue()) : Vector2.zero;
+		var position = mainSceneCamera != null ? (Vector2)mainSceneCamera.GetScreenToWorldPointFrom(MouseMethods.GetMousePosition()) : Vector2.zero;
 
 		return position.ToVector3();
 	}

Assets/Project/Scripts/Game Objects/Managers/Map Tile/SelectedMapTileMovementManager.cs

@@ -17,7 +17,7 @@ public class AndroidMapTileSelectionManager : MonoBehaviour, IPrimaryWindowEleme
 	private bool panelUIHoverWasDetected;
 	private Timer timer;
 	private UserInputController userInputController;
-	private AndroidMapTileRaycaster androidMapTileRaycaster;
+	private MapTileStateControllerRaycaster mapTileStateControllerRaycaster;
 	private PanelUIHoverDetectionManager panelUIHoverDetectionManager;
 	private UnityEngine.InputSystem.EnhancedTouch.Touch touch;
 	private MapTileStateController mapTileStateController;
@@ -43,7 +43,7 @@ private void Awake()
 #if UNITY_ANDROID
 		timer = GetComponent<Timer>();
 		userInputController = ObjectMethods.FindComponentOfType<UserInputController>();
-		androidMapTileRaycaster = ObjectMethods.FindComponentOfType<AndroidMapTileRaycaster>();
+		mapTileStateControllerRaycaster = ObjectMethods.FindComponentOfType<MapTileStateControllerRaycaster>();
 		panelUIHoverDetectionManager = ObjectMethods.FindComponentOfType<PanelUIHoverDetectionManager>();
 
 		RemoveRaycasterFromMainCameraIfPossible();
@@ -105,15 +105,15 @@ private void RegisterToListeners(bool register)
 
 	private void OnTimerStarted()
 	{
-		if(androidMapTileRaycaster != null && (!androidMapTileRaycaster.MapTileWasTapped(touch.screenPosition, out var mapTileStateController) || !MapTileStateControllersAreEqual(mapTileStateController)))
+		if(mapTileStateControllerRaycaster != null && (!mapTileStateControllerRaycaster.ComponentWasDetected(touch.screenPosition, out var mapTileStateController) || !MapTileStateControllersAreEqual(mapTileStateController)))
 		{
 			UnassignMapTileCompletelyIfNeeded();
 		}
 	}
 
 	private void OnTimerFinished()
 	{
-		if(androidMapTileRaycaster != null && androidMapTileRaycaster.MapTileWasTapped(touch.screenPosition, out var mapTileStateController))
+		if(mapTileStateControllerRaycaster != null && mapTileStateControllerRaycaster.ComponentWasDetected(touch.screenPosition, out var mapTileStateController))
 		{
 			HandleTappedMapTile(mapTileStateController);
 		}

Assets/Project/Scripts/Game Objects/Managers/Platform Specific/Android/AndroidMapTileSelectionManager.cs

@@ -0,0 +1,4 @@
+public class MapTileRaycaster : Raycaster<MapTile>
+{
+	
+}

Assets/Project/Scripts/Game Objects/Raycasters.meta

@@ -0,0 +1,4 @@
+public class MapTileStateControllerRaycaster : Raycaster<MapTileStateController>
+{
+
+}

Assets/Project/Scripts/Game Objects/Raycasters/MapTileRaycaster.cs

@@ -1,32 +1,25 @@
 using UnityEngine;
 
-public class AndroidMapTileRaycaster : MonoBehaviour
+public abstract class Raycaster<T> : MonoBehaviour
 {
 	[SerializeField] private LayerMask detectableGameObjects;
 
-#if UNITY_ANDROID
 	private MainSceneCamera mainSceneCamera;
 
-	public bool MapTileWasTapped(Vector3 position, out MapTileStateController mapTileStateController)
+	public bool ComponentWasDetected(Vector3 position, out T component)
 	{
 		var raycastHitCollider = GetRaycastHitCollider(position);
 
-		mapTileStateController = raycastHitCollider != null && raycastHitCollider.TryGetComponent<MapTileStateController>(out var foundMapTileStateController) ? foundMapTileStateController : null;
+		component = raycastHitCollider != null && raycastHitCollider.TryGetComponent<T>(out var foundMapTileStateController) ? foundMapTileStateController : default;
 
-		return mapTileStateController != null;
+		return component != null;
 	}
-#endif
-	
+
 	private void Awake()
 	{
-#if UNITY_ANDROID
 		mainSceneCamera = ObjectMethods.FindComponentOfType<MainSceneCamera>();
-#else
-		Destroy(gameObject);
-#endif
 	}
 
-#if UNITY_ANDROID
 	private Collider2D GetRaycastHitCollider(Vector3 position)
 	{
 		if(mainSceneCamera == null)
@@ -39,5 +32,4 @@ private Collider2D GetRaycastHitCollider(Vector3 position)
 
 		return raycastHit.collider;
 	}
-#endif
 }