Game zoom (#84)

* Set zoom to min at start of board * Build 0.7.2
patches34 · Dec 8, 2023 · 14505f8 · 14505f8
1 parent fcbca90
commit 14505f8
Show file tree

Hide file tree

Showing 6 changed files with 33 additions and 24 deletions.
diff --git a/Assets/Scripts/Singletons/MenuManager.cs b/Assets/Scripts/Singletons/MenuManager.cs
@@ -61,8 +61,6 @@ void Start()
 	{
 		Application.targetFrameRate = 30;
 
-
-
         for(int i = 0; i < transform.childCount; ++i)
         {
             UIMenu childScreen = transform.GetChild(i).GetComponent<UIMenu>();
@@ -72,9 +70,9 @@ void Start()
             }
         }
 
-        #if !UNITY_EDITOR
+#if !UNITY_EDITOR
         ShowMenu(MenuTypes.Info);
-        #endif
+#endif
     }
 
     public string BuildVersionStr;
@@ -147,29 +145,38 @@ void SetZoom(float delta, float zoomSpeed)
 
 		//	X
 		rectScale.x -= delta * zoomSpeed;
-		if(rectScale.x > zoomMax)
-		{
-			rectScale.x = zoomMax;
-		}
-		else if(rectScale.x < zoomMin)
-		{
-			rectScale.x = zoomMin;
-		}
 
 		//	Y
 		rectScale.y -= delta * zoomSpeed;
-		if(rectScale.y > zoomMax)
-		{
-			rectScale.y = zoomMax;
-		}
-		else if(rectScale.y < zoomMin)
-		{
-			rectScale.y = zoomMin;
-		}
 
-		boardPaddingRect.localScale = rectScale;
+		SetZoom(rectScale);
 	}
 
+	void SetZoom(Vector2 newZoom)
+	{
+        //	X
+        if (newZoom.x > zoomMax)
+        {
+            newZoom.x = zoomMax;
+        }
+        else if (newZoom.x < zoomMin)
+        {
+            newZoom.x = zoomMin;
+        }
+
+        //	Y
+        if (newZoom.y > zoomMax)
+        {
+            newZoom.y = zoomMax;
+        }
+        else if (newZoom.y < zoomMin)
+        {
+            newZoom.y = zoomMin;
+        }
+
+        boardPaddingRect.localScale = newZoom;
+    }
+
 	public void ShowMenu(int type)
 	{
 		ShowMenu((MenuTypes)type);
@@ -199,6 +206,8 @@ public void ResizeGameBoard(Vector2 boardSize)
 		boardPaddingRect.offsetMin = -boardSize - boardPadding;
 
 		zoomMin = Mathf.Min(CanvasRect.width / boardPaddingRect.rect.width, CanvasRect.height / boardPaddingRect.rect.height);
+
+		SetZoom(new Vector2(zoomMin, zoomMin));
 	}
 
 	public void SetZoomSpeed(float value)

diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset
@@ -133,7 +133,7 @@ PlayerSettings:
   vulkanEnableLateAcquireNextImage: 0
   vulkanEnableCommandBufferRecycling: 1
   loadStoreDebugModeEnabled: 0
-  bundleVersion: 0.7.1
+  bundleVersion: 0.7.2
   preloadedAssets: []
   metroInputSource: 0
   wsaTransparentSwapchain: 0

diff --git a/docs/Build/docs.data b/docs/Build/docs.data
diff --git a/docs/Build/docs.framework.js b/docs/Build/docs.framework.js
diff --git a/docs/Build/docs.wasm b/docs/Build/docs.wasm
diff --git a/docs/index.html b/docs/index.html
@@ -65,7 +65,7 @@
         streamingAssetsUrl: "StreamingAssets",
         companyName: "Patches",
         productName: "CreatureSweep",
-        productVersion: "0.7.1",
+        productVersion: "0.7.2",
         showBanner: unityShowBanner,
       };