Optimise adjusting zoom of the main camera after changing dimensions of the map

Author: JasonNumberThirteen

Assets/Project/Prefabs/Game Objects/MapTile.prefab

@@ -1,4 +1,3 @@
-using System.Linq;
 using System.Collections.Generic;
 using UnityEngine;
 using UnityEngine.Events;
@@ -8,7 +7,6 @@ public class MainCameraZoomController : MonoBehaviour, IPrimaryWindowElement
 	public UnityEvent<float> cameraSizeWasUpdatedEvent;
 
 	private float zoomPerScroll;
-	private float sizeUpperBoundToMapSize;
 	private bool zoomCanBeModified = true;
 	private bool mapTileIsSelected;
 	private bool inputIsActive = true;
@@ -17,7 +15,7 @@ public class MainCameraZoomController : MonoBehaviour, IPrimaryWindowElement
 	private MapGenerationManager mapGenerationManager;
 	private VisualiserEventsManager visualiserEventsManager;
 
-	private readonly float SIZE_GROWTH_PER_ITERATION = 1f;
+	private readonly float ADDITIONAL_OFFSET_FROM_MAP_EDGES = 1f;
 
 	public void SetPrimaryWindowElementActive(bool active)
 	{
@@ -32,7 +30,6 @@ public void SetZoomPerScroll(float zoomPerScroll)
 	private void Awake()
 	{
 		mainCamera = Camera.main;
-		sizeUpperBoundToMapSize = mainCamera != null ? mainCamera.orthographicSize : 0f;
 		userInputController = FindFirstObjectByType<UserInputController>();
 		mapGenerationManager = FindFirstObjectByType<MapGenerationManager>();
 		visualiserEventsManager = FindFirstObjectByType<VisualiserEventsManager>();
@@ -89,10 +86,14 @@ private void RegisterToListeners(bool register)
 
 	private void OnWheelScrolled(Vector2 scrollVector)
 	{
-		if(inputIsActive && zoomCanBeModified && mainCamera != null && mainCamera.orthographic)
+		if(!inputIsActive || !zoomCanBeModified || mainCamera == null || !mainCamera.orthographic)
 		{
-			mainCamera.orthographicSize = Mathf.Clamp(mainCamera.orthographicSize - zoomPerScroll*scrollVector.y, MapGenerationManager.MAP_DIMENSION_LOWER_BOUND, sizeUpperBoundToMapSize);
+			return;
 		}
+
+		var sizeModifyStep = zoomPerScroll*scrollVector.y;
+
+		mainCamera.orthographicSize = Mathf.Clamp(mainCamera.orthographicSize - sizeModifyStep, GetMinimumSize(), GetMaximumSize());
 	}
 
 	private void OnMapTilesWereAdded(List<MapTile> mapTiles)
@@ -112,53 +113,11 @@ private void UpdateMaximumSize()
 			return;
 		}
 
-		mainCamera.orthographicSize = MapGenerationManager.MAP_DIMENSION_LOWER_BOUND;
-
-		while (!EntireMapIsVisibleWithinCamera() && mainCamera.orthographicSize < MapGenerationManager.MAP_DIMENSION_UPPER_BOUND)
-		{
-			mainCamera.orthographicSize += SIZE_GROWTH_PER_ITERATION;
-		}
-
-		sizeUpperBoundToMapSize = mainCamera.orthographicSize;
+		mainCamera.orthographicSize = GetMaximumSize();
 
 		cameraSizeWasUpdatedEvent?.Invoke(mainCamera.orthographicSize);
 	}
 
-	private bool EntireMapIsVisibleWithinCamera()
-	{
-		if(mapGenerationManager == null)
-		{
-			return false;
-		}
-		
-		var mapSizeWithOffset = mapGenerationManager.GetMapSize() - Vector2.one*MapTile.GRID_SIZE;
-		var cameraSize = GetCameraSize();
-		var offsetToCenter = (mapSizeWithOffset - cameraSize)*0.5f;
-		var areaInTheCenterOfMap = new Rect(offsetToCenter, cameraSize);
-		var mapCornersTiles = mapGenerationManager.GetMapCornersTiles();
-
-		return mapCornersTiles.All(mapTile =>
-		{
-			var mapTileBounds = mapTile.GetMapTileRenderer().GetBounds();
-			var mapTileBoundsRectangle = new Rect(mapTileBounds.min, mapTileBounds.size);
-
-			return areaInTheCenterOfMap.Contains(mapTileBoundsRectangle.min) && areaInTheCenterOfMap.Contains(mapTileBoundsRectangle.max);
-		});
-	}
-
-	private Vector2 GetCameraSize()
-	{
-		if(mainCamera == null)
-		{
-			return Vector2.zero;
-		}
-
-		var cameraHeight = mainCamera.orthographicSize*2f;
-		var cameraWidth = cameraHeight*mainCamera.aspect;
-
-		return new Vector2(cameraWidth, cameraHeight);
-	}
-
 	private void OnEventReceived(VisualiserEvent visualiserEvent)
 	{
 		if(visualiserEvent is not MapTileBoolVisualiserEvent mapTileBoolVisualiserEvent)
@@ -182,4 +141,14 @@ private void OnEventReceived(VisualiserEvent visualiserEvent)
 				break;
 		}
 	}
+
+	private float GetMaximumSize()
+	{
+		var maximumMapDimension = GetSizeBy(mapGenerationManager != null ? mapGenerationManager.GetMaximumMapDimension() : 0f);
+		
+		return Mathf.Max(GetMinimumSize(), maximumMapDimension);
+	}
+
+	private float GetMinimumSize() => GetSizeBy(MapGenerationManager.MAP_DIMENSION_LOWER_BOUND);
+	private float GetSizeBy(float value) => value*0.5f + ADDITIONAL_OFFSET_FROM_MAP_EDGES;
 }

Assets/Project/Scripts/Game Objects/Camera/Main/MainCameraZoomController.cs

@@ -1,7 +1,7 @@
 using UnityEngine;
 using UnityEngine.Events;
 
-[RequireComponent(typeof(MapTileNode), typeof(MapTileRenderer))]
+[RequireComponent(typeof(MapTileNode))]
 public class MapTile : MonoBehaviour
 {
 	public static readonly float GRID_SIZE = 1f;
@@ -14,14 +14,12 @@ public class MapTile : MonoBehaviour
 	private MapTileType tileType;
 	private int weight;
 	private MapTileNode mapTileNode;
-	private MapTileRenderer mapTileRenderer;
 	private VisualiserEventsManager visualiserEventsManager;
 
 	public Vector2 GetPosition() => transform.position;
 	public MapTileType GetTileType() => tileType;
 	public int GetWeight() => weight;
 	public MapTileNode GetMapTileNode() => mapTileNode;
-	public MapTileRenderer GetMapTileRenderer() => mapTileRenderer;
 
 	public void ResetTile()
 	{
@@ -73,7 +71,6 @@ public void SetWeightTo(int weight)
 	private void Awake()
 	{
 		mapTileNode = GetComponent<MapTileNode>();
-		mapTileRenderer = GetComponent<MapTileRenderer>();
 		visualiserEventsManager = FindFirstObjectByType<VisualiserEventsManager>();
 	}
 }