Zoom (#83)

* Very crude zoom is functional.

* Zoom now has min and max bounds.

* Got rid of those pesky lines caused by imperfect rendering coordinates.

* Stopped the GUI from being zoomed.

* Code quality tweaks.

* Limited zoom to only in. The project isn't far enough along to be able to correctly solve the problems that would be caused by being able to zoom out.

Author: TBye101

CHANGELOG.md

@@ -25,6 +25,7 @@ SneakyTactician  <SneakyTactician@outlook.com>
 * The placeholder texture for the mine action button has been replaced
 * Stone rubble texture has been replaced
 * Pickaxe icon in map when tile is queue up to be mined has changed
+* Added the ability to zoom in
 
 #### Sound
 

MagicalLifeGUIWindows/Game1.cs

@@ -131,14 +131,21 @@ protected override void Draw(GameTime gameTime)
         {
             this.DisplayInGame();
             FMODUtil.System.update();
-            this.GraphicsDevice.SetRenderTarget(null);
+
+            //Used to render things to a buffer that will have a zoom multiplier applied before rendering.
+            SpriteBatch zoomBatch = new SpriteBatch(this.GraphicsDevice);
+            RenderTarget2D target = new RenderTarget2D(this.GraphicsDevice, RenderingPipe.FullScreenWindow.Width, RenderingPipe.FullScreenWindow.Height);
+            this.GraphicsDevice.SetRenderTarget(target);
+
             this.GraphicsDevice.Clear(Color.Black);
 
+
+
             if (Game1.SplashDone)
             {
-                this.SpriteBatch.Begin();
-                RenderingPipe.DrawScreen(ref this.SpriteBatch);
-                this.SpriteBatch.End();
+                zoomBatch.Begin();
+                RenderingPipe.DrawScreen(zoomBatch);
+                zoomBatch.End();
             }
             else
             {
@@ -148,7 +155,7 @@ protected override void Draw(GameTime gameTime)
                     LogoScreen item = Game1.SplashScreens[i];
                     if (!item.Done())
                     {
-                        item.Draw(ref this.SpriteBatch);
+                        item.Draw(ref zoomBatch);
                         break;
                     }
 
@@ -163,6 +170,19 @@ protected override void Draw(GameTime gameTime)
                 }
             }
 
+            //set rendering back to the back buffer
+            this.GraphicsDevice.SetRenderTarget(null);
+
+            //render target to back buffer
+            zoomBatch.Begin();
+
+            int width = (int)(this.GraphicsDevice.DisplayMode.Width * RenderingPipe.Zoom);
+            int height = (int)(this.GraphicsDevice.DisplayMode.Height * RenderingPipe.Zoom);
+
+            zoomBatch.Draw(target, new Rectangle(0, 0, width, height), Color.White);
+            RenderingPipe.DrawGUI(zoomBatch);
+            zoomBatch.End();
+
             base.Draw(gameTime);
         }
 

MagicalLifeGUIWindows/Input/InputHandlers.cs

@@ -13,15 +13,20 @@ public static class InputHandlers
 
         public static MiningActionHandler MiningAction;
 
-        public static StrafeHandler StrafingHandler = new StrafeHandler();
+        public static StrafeHandler StrafingHandler;
 
-        public static EscapeHandler EscHandler = new EscapeHandler();
+        public static EscapeHandler EscHandler;
+
+        public static ZoomHandler ZooomHandler;
 
         public static void Initialize()
         {
             LivingMove = new LivingMoveOrderInputHandler();
             LogoSkipper = new LogoSkip();
             MiningAction = new MiningActionHandler();
+            StrafingHandler = new StrafeHandler();
+            EscHandler = new EscapeHandler();
+            ZooomHandler = new ZoomHandler();
         }
     }
 }

MagicalLifeGUIWindows/Input/Specialized Handlers/ZoomHandler.cs

@@ -0,0 +1,47 @@
+using MagicalLifeAPI.Filing.Logging;
+using MagicalLifeGUIWindows.Input.History;
+using MagicalLifeGUIWindows.Rendering;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace MagicalLifeGUIWindows.Input.Specialized_Handlers
+{
+    public class ZoomHandler
+    {
+        /// <summary>
+        /// The most zoomed out the player can get.
+        /// </summary>
+        private static readonly float MinZoom = 1F;
+
+        /// <summary>
+        /// The most zoomed in the player can get.
+        /// </summary>
+        private static readonly float MaxZoom = 4F;
+
+
+        public ZoomHandler()
+        {
+            BoundHandler.MouseListner.MouseWheelMoved += this.MouseListner_MouseWheelMoved;
+        }
+
+        private void MouseListner_MouseWheelMoved(object sender, MonoGame.Extended.Input.InputListeners.MouseEventArgs e)
+        {
+            float previous = e.PreviousState.ScrollWheelValue;
+            float current = e.ScrollWheelValue;
+
+            float change = (previous - current) / 1000;
+
+            //Ensure that zoom is above the minimum.
+            float aboveMin = Math.Max(ZoomHandler.MinZoom, RenderingPipe.Zoom - change);
+
+            //Ensure that zoom is below the maximum.
+            float belowMaxAndAboveMin = Math.Min(ZoomHandler.MaxZoom, aboveMin);
+
+            RenderingPipe.Zoom = belowMaxAndAboveMin;
+            MasterLog.DebugWriteLine("Zoom: " + RenderingPipe.Zoom.ToString());
+        }
+    }
+}

MagicalLifeGUIWindows/MagicalLifeGUIWindows.csproj

@@ -175,6 +175,7 @@
     <Compile Include="Input\Specialized Handlers\LogoSkip.cs" />
     <Compile Include="Input\Specialized Handlers\MiningActionHandler.cs" />
     <Compile Include="Input\Specialized Handlers\StrafeHandler.cs" />
+    <Compile Include="Input\Specialized Handlers\ZoomHandler.cs" />
     <Compile Include="Load\Initializer.cs" />
     <Compile Include="Load\InputLoader.cs" />
     <Compile Include="Load\WindowConfig.cs" />

MagicalLifeGUIWindows/Rendering/RenderingPipe.cs

@@ -32,33 +32,36 @@ public static class RenderingPipe
         /// <summary>
         /// The x offset of the view due to the player moving the camera around the map.
         /// </summary>
-        public static int XViewOffset = 0;
+        public static int XViewOffset { get; set; } = 0;
 
         /// <summary>
         /// The y offset of the view due to the player moving the camera around the map.
         /// </summary>
-        public static int YViewOffset = 0;
+        public static int YViewOffset { get; set; } = 0;
+
+        /// <summary>
+        /// The zoom level of the map.
+        /// </summary>
+        public static float Zoom { get; set; } = 1F;
 
         /// <summary>
         /// The currently viewed dimension.
         /// </summary>
-        public static int Dimension = 0;
+        public static int Dimension { get; set; } = 0;
 
         /// <summary>
         /// Draws the screen.
         /// </summary>
         /// <param name="spBatch"></param>
-        public static void DrawScreen(ref SpriteBatch spBatch)
+        public static void DrawScreen(SpriteBatch spBatch)
         {
             if (World.Dimensions.Count > 0)
             {
                 MapRenderer.DrawMap(ref spBatch, RenderingPipe.Dimension);
             }
-
-            DrawGUI(ref spBatch);
         }
 
-        public static void DrawMouseLocation(ref SpriteBatch spBatch)
+        public static void DrawMouseLocation(SpriteBatch spBatch)
         {
             int x = Mouse.GetState().X;
             int y = Mouse.GetState().Y;
@@ -70,12 +73,12 @@ public static void DrawMouseLocation(ref SpriteBatch spBatch)
         /// Draws the GUI onto the screen.
         /// </summary>
         /// <param name="spBatch"></param>
-        private static void DrawGUI(ref SpriteBatch spBatch)
+        public static void DrawGUI(SpriteBatch spBatch)
         {
-            DrawContainers(ref spBatch);
+            DrawContainers(spBatch);
         }
 
-        private static void DrawContainers(ref SpriteBatch spBatch)
+        private static void DrawContainers(SpriteBatch spBatch)
         {
             foreach (GUIContainer item in Enumerable.Reverse(BoundHandler.GUIWindows))
             {