X-Git-Url: https://git.dogcows.com/gitweb?p=chaz%2Fcarfire;a=blobdiff_plain;f=CarFire%2FCarFire%2FCarFire%2FMap.cs;fp=CarFire%2FCarFire%2FCarFire%2FMap.cs;h=2440f121ac6014a16cfdff81984e1348081afe44;hp=6727133bc79c1ee72471e67d8f30c0fd2fa7349e;hb=1368c1af3d7a4a12b0b0577dbe3edbfd254e2d04;hpb=a250362ff6ad169908a03d69e1b0dac1ef53564b

diff --git a/CarFire/CarFire/CarFire/Map.cs b/CarFire/CarFire/CarFire/Map.cs
index 6727133..2440f12 100644
--- a/CarFire/CarFire/CarFire/Map.cs
+++ b/CarFire/CarFire/CarFire/Map.cs
@@ -48,7 +48,7 @@ namespace CarFire
 
         #region Public Constants
 
-        public const float PixelsToUnitSquares = 60.0f;
+        public const float PixelsToUnitSquares = 64.0f;
 
         #endregion
 
@@ -92,7 +92,7 @@ namespace CarFire
         #endregion
 
 
-        #region Public Attributes
+        #region Public Properties
 
         /// <summary>
         /// Get the name of the map.
@@ -156,6 +156,12 @@ namespace CarFire
             set { mView.CenterCell = value; }
         }
 
+        public float Zoom
+        {
+            get { return mView.Zoom; }
+            set { mView.Zoom = value; }
+        }
+
         #endregion
 
 
@@ -326,6 +332,16 @@ namespace CarFire
             mData.ClearCell(point.X, point.Y);
         }
 
+
+        /// <summary>
+        /// Reset the map to the state it was at right after loading.
+        /// </summary>
+        public void Reset()
+        {
+            mData.Reset();
+            mView.Reset();
+        }
+
         #endregion
 
 
@@ -333,12 +349,11 @@ namespace CarFire
 
         class Modal
         {
-            Metadata mMetadata;
-            char[,] mGrid;
-            char mDefaultTile;
-            List<RawEntity> mEntities;
-            Point[] mPlayerPositions;
-            bool[,] mBooleanGrid;
+            public Metadata Metadata { get { return mMetadata; } }
+            public List<RawEntity> Entities { get { return mEntities; } }
+            public Point[] PlayerPositions { get { return mPlayerPositions; } }
+            public bool[,] Grid { get { return mBooleanGrid; } }
+
 
             public Modal(Metadata metadata, char[,] grid, char defaultTile,
                 List<RawEntity> entities, Point[] playerPositions)
@@ -349,19 +364,12 @@ namespace CarFire
                 Debug.Assert(metadata.GridWidth * metadata.GridHeight == grid.Length);
 
                 mMetadata = metadata;
-                mGrid = grid;
+                mCleanGrid = grid;
                 mDefaultTile = defaultTile;
                 mEntities = entities;
                 mPlayerPositions = playerPositions;
 
-                mBooleanGrid = new bool[mMetadata.GridWidth, mMetadata.GridHeight];
-                for (int x = 0; x < mMetadata.GridWidth; x++)
-                {
-                    for (int y = 0; y < mMetadata.GridHeight; y++)
-                    {
-                        mBooleanGrid[x, y] = IsCellOpen(x, y);
-                    }
-                }
+                Reset();
 
 #if DEBUG
                 Console.WriteLine("Loaded map {0} of type {1} written by {2}.",
@@ -372,22 +380,35 @@ namespace CarFire
             }
 
 
-            public Metadata Metadata { get { return mMetadata; } }
-            public List<RawEntity> Entities { get { return mEntities; } }
-            public Point[] PlayerPositions { get { return mPlayerPositions; } }
-            public bool[,] Grid { get { return mBooleanGrid; } }
+            public void Reset()
+            {
+                mGrid = (char[,])mCleanGrid.Clone();
+
+                mBooleanGrid = new bool[mMetadata.GridWidth, mMetadata.GridHeight];
+                for (int x = 0; x < mMetadata.GridWidth; x++)
+                {
+                    for (int y = 0; y < mMetadata.GridHeight; y++)
+                    {
+                        mBooleanGrid[x, y] = IsCellOpen(x, y);
+                    }
+                }
+            }
 
 
             public bool IsCellOpen(int x, int y)
             {
                 // TODO: Still need to define characters for types of scenery.
-                return mGrid[x, y] == ' ';
+                if (IsOnMap(x, y)) return mGrid[x, y] == ' ';
+                return false;
             }
 
             public void SetCell(int x, int y, char tile)
             {
-                mGrid[x, y] = tile;
-                mBooleanGrid[x, y] = IsCellOpen(x, y);
+                if (IsOnMap(x, y))
+                {
+                    mGrid[x, y] = tile;
+                    mBooleanGrid[x, y] = IsCellOpen(x, y);
+                }
             }
 
             public void ClearCell(int x, int y)
@@ -395,6 +416,11 @@ namespace CarFire
                 SetCell(x, y, mDefaultTile);
             }
 
+            public bool IsOnMap(int x, int y)
+            {
+                return 0 <= x && x < Metadata.GridWidth && 0 <= y && y < Metadata.GridHeight;
+            }
+
 
             public List<object> GetAllEntities()
             {
@@ -457,22 +483,39 @@ namespace CarFire
 
                 return list;
             }
+
+
+            Metadata mMetadata;
+            char[,] mGrid;
+            char[,] mCleanGrid;
+            bool[,] mBooleanGrid;
+            char mDefaultTile;
+            List<RawEntity> mEntities;
+            Point[] mPlayerPositions;
         }
 
         class View
         {
-            Modal mData;
-
             public Vector2 CenterCell;
-            Viewport mViewport;
+            public float Zoom;
 
 
             public View(Modal data)
             {
                 Debug.Assert(data != null);
                 mData = data;
+
+                Reset();
             }
 
+
+            public void Reset()
+            {
+                CenterCell = Vector2.Zero;
+                Zoom = PixelsToUnitSquares;
+            }
+
+
             public void Draw(SpriteBatch spriteBatch)
             {
                 mViewport = spriteBatch.GraphicsDevice.Viewport;
@@ -494,18 +537,30 @@ namespace CarFire
                 }
             }
 
-            /// <summary>
-            /// Get a matrix to transform a point from grid-space to screen coordinates.  This
-            /// method uses the viewport to bound the edges of the map such that the camera
-            /// will not show anything outside of the grid.
-            /// </summary>
-            /// <param name="center">The point to put in the center.</param>
-            /// <returns>The transformation matrix.</returns>
+
+            public Point GetPointFromCoordinates(float x, float y)
+            {
+                Matrix transform = GetTransformation(CenterCell);
+                Vector2 point = Vector2.Transform(new Vector2(x, y), transform);
+
+                return new Point((int)point.X, (int)point.Y);
+            }
+
+            public Rectangle GetRectangleFromCoordinates(float x, float y)
+            {
+                Matrix transform = GetTransformation(CenterCell);
+                Vector2 point = Vector2.Transform(new Vector2(x, y), transform);
+                
+                return new Rectangle((int)Math.Round(point.X, 0), (int)Math.Round(point.Y, 0), (int)Math.Round(Zoom, 0), (int)Math.Round(Zoom, 0));
+            }
+
+
+
             Matrix GetTransformation(Vector2 center)
             {
-                float halfRatio = PixelsToUnitSquares * 0.5f;
+                float halfRatio = Zoom * 0.5f;
                 Matrix transform = Matrix.CreateTranslation(-center.X, -center.Y, 0.0f);
-                transform *= Matrix.CreateScale(PixelsToUnitSquares);
+                transform *= Matrix.CreateScale(Zoom);
                 transform *= Matrix.CreateTranslation(mViewport.Width * 0.5f - halfRatio,
                     mViewport.Height * 0.5f - halfRatio, 0.0f);
 
@@ -526,21 +581,8 @@ namespace CarFire
             }
 
 
-            public Point GetPointFromCoordinates(float x, float y)
-            {
-                Matrix transform = GetTransformation(CenterCell);
-                Vector2 point = Vector2.Transform(new Vector2(x, y), transform);
-
-                return new Point((int)point.X, (int)point.Y);
-            }
-
-            public Rectangle GetRectangleFromCoordinates(float x, float y)
-            {
-                Matrix transform = GetTransformation(CenterCell);
-                Vector2 point = Vector2.Transform(new Vector2(x, y), transform);
-                
-                return new Rectangle((int)point.X, (int)point.Y, (int)PixelsToUnitSquares, (int)PixelsToUnitSquares);
-            }
+            Modal mData;
+            Viewport mViewport;
         }
 
         #endregion