Implemented tile flags so we can define and determine what a tile is supposed to...

git-svn-id: https://bd85.net/svn/cs3505_group@151 92bb83a3-7c8f-8a45-bc97-515c4e399668

diff --git a/CarFire/CarFire/CarFire/Game.cs b/CarFire/CarFire/CarFire/Game.cs
index 8b9b0759e9bacb46f6756aef25afe6e3075d41c9..a2693671890f8bf1cf3a75150dd9921b14f273bc 100644 (file)
--- a/CarFire/CarFire/CarFire/Game.cs
+++ b/CarFire/CarFire/CarFire/Game.cs
@@ -335,39 +335,39 @@ namespace CarFire
 \r
             Texture2D mapTiles = mContentManager.Load<Texture2D>("graphics/wallAndFloorTilesNoEdgeScale");\r
             Tilemap tilemap = new Tilemap(mapTiles, 10, 7);\r
-            tilemap.SetTile(' ', new Point(4, 5));\r
-            tilemap.SetTile('`', new Point(0, 1));\r
-            tilemap.SetTile('~', new Point(1, 1));\r
-            tilemap.SetTile('!', new Point(3, 1));\r
-            tilemap.SetTile('@', new Point(4, 1));\r
-            tilemap.SetTile('#', new Point(5, 1));\r
-            tilemap.SetTile('$', new Point(6, 1));\r
-            tilemap.SetTile('%', new Point(8, 1));\r
-            tilemap.SetTile('^', new Point(9, 1));\r
-            tilemap.SetTile('&', new Point(0, 2));\r
-            tilemap.SetTile('=', new Point(1, 2));\r
-            tilemap.SetTile('*', new Point(2, 2));\r
-            tilemap.SetTile('(', new Point(4, 2));\r
-            tilemap.SetTile(')', new Point(0, 3));\r
-            tilemap.SetTile('_', new Point(2, 3));\r
-            tilemap.SetTile('-', new Point(9, 3));\r
-            tilemap.SetTile(',', new Point(1, 4));\r
-            tilemap.SetTile('+', new Point(2, 4));\r
-            tilemap.SetTile('[', new Point(3, 4));\r
-            tilemap.SetTile(']', new Point(4, 4));\r
-            tilemap.SetTile('{', new Point(5, 4));\r
-            tilemap.SetTile('}', new Point(6, 4));\r
-            tilemap.SetTile('\\', new Point(8, 4));\r
-            tilemap.SetTile('|', new Point(9, 4));\r
-            tilemap.SetTile(';', new Point(0, 5));\r
-            tilemap.SetTile(':', new Point(1, 5));\r
-            tilemap.SetTile('\'', new Point(2, 5));\r
-            tilemap.SetTile('"', new Point(3, 5));\r
-            tilemap.SetTile('.', new Point(5, 5));\r
-            tilemap.SetTile('<', new Point(6, 5));\r
-            tilemap.SetTile('>', new Point(7, 5));\r
-            tilemap.SetTile('/', new Point(8, 5));\r
-            tilemap.SetTile('?', new Point(9, 5));\r
+            tilemap.SetTile(' ', new Point(4, 5), TileFlags.Default);\r
+            tilemap.SetTile('`', new Point(0, 1), TileFlags.Closed | TileFlags.Wall);\r
+            tilemap.SetTile('~', new Point(1, 1), TileFlags.Closed | TileFlags.Wall);\r
+            tilemap.SetTile('!', new Point(3, 1), TileFlags.Closed | TileFlags.Wall);\r
+            tilemap.SetTile('@', new Point(4, 1), TileFlags.Closed | TileFlags.Wall);\r
+            tilemap.SetTile('#', new Point(5, 1), TileFlags.Closed | TileFlags.Wall);\r
+            tilemap.SetTile('$', new Point(6, 1), TileFlags.Closed | TileFlags.Wall);\r
+            tilemap.SetTile('%', new Point(8, 1), TileFlags.Closed | TileFlags.Wall);\r
+            tilemap.SetTile('^', new Point(9, 1), TileFlags.Closed | TileFlags.Wall);\r
+            tilemap.SetTile('&', new Point(0, 2), TileFlags.Closed | TileFlags.Wall);\r
+            tilemap.SetTile('=', new Point(1, 2), TileFlags.Closed | TileFlags.Wall);\r
+            tilemap.SetTile('*', new Point(2, 2), TileFlags.Closed | TileFlags.Wall);\r
+            tilemap.SetTile('(', new Point(4, 2), TileFlags.Closed | TileFlags.Wall);\r
+            tilemap.SetTile(')', new Point(0, 3), TileFlags.Closed | TileFlags.Wall);\r
+            tilemap.SetTile('_', new Point(2, 3), TileFlags.Closed | TileFlags.Wall);\r
+            tilemap.SetTile('-', new Point(9, 3), TileFlags.Closed | TileFlags.Wall);\r
+            tilemap.SetTile(',', new Point(1, 4), TileFlags.Default);\r
+            tilemap.SetTile('+', new Point(2, 4), TileFlags.Default);\r
+            tilemap.SetTile('[', new Point(3, 4), TileFlags.Default);\r
+            tilemap.SetTile(']', new Point(4, 4), TileFlags.Default);\r
+            tilemap.SetTile('{', new Point(5, 4), TileFlags.Default);\r
+            tilemap.SetTile('}', new Point(6, 4), TileFlags.Default);\r
+            tilemap.SetTile('\\', new Point(8, 4), TileFlags.Default);\r
+            tilemap.SetTile('|', new Point(9, 4), TileFlags.Default);\r
+            tilemap.SetTile(';', new Point(0, 5), TileFlags.Default);\r
+            tilemap.SetTile(':', new Point(1, 5), TileFlags.Default);\r
+            tilemap.SetTile('\'', new Point(2, 5), TileFlags.Default);\r
+            tilemap.SetTile('"', new Point(3, 5), TileFlags.Default);\r
+            tilemap.SetTile('.', new Point(5, 5), TileFlags.Default);\r
+            tilemap.SetTile('<', new Point(6, 5), TileFlags.Default);\r
+            tilemap.SetTile('>', new Point(7, 5), TileFlags.Default);\r
+            tilemap.SetTile('/', new Point(8, 5), TileFlags.Default);\r
+            tilemap.SetTile('?', new Point(9, 5), TileFlags.Default);\r
 \r
             State.Map = mContentManager.Load<Map>("Maps/level1");\r
             State.Map.Tilemap = tilemap;\r

diff --git a/CarFire/CarFire/CarFire/Map.cs b/CarFire/CarFire/CarFire/Map.cs
index 1b8b5a89bc992a9279f324102379674ce0a5ef73..ae49c8a8c3bc2f635329f3e57615de4069020cd5 100644 (file)
--- a/CarFire/CarFire/CarFire/Map.cs
+++ b/CarFire/CarFire/CarFire/Map.cs
@@ -138,8 +138,8 @@ namespace CarFire
         /// </summary>\r
         public Tilemap Tilemap\r
         {\r
-            get { return mView.Tilemap; }\r
-            set { mView.Tilemap = value; }\r
+            get { return mData.Tilemap; }\r
+            set { mData.Tilemap = value; }\r
         }\r
 \r
         /// <summary>\r
@@ -355,6 +355,7 @@ namespace CarFire
             public List<RawEntity> Entities { get { return mEntities; } }\r
             public Point[] PlayerPositions { get { return mPlayerPositions; } }\r
             public bool[,] Grid { get { return mBooleanGrid; } }\r
+            public Tilemap Tilemap;\r
 \r
 \r
             public Model(Metadata metadata, char[,] grid, char defaultTile,\r
@@ -399,17 +400,17 @@ namespace CarFire
 \r
             public bool IsCellOpen(int x, int y)\r
             {\r
-                // TODO: Still need to define characters for types of scenery.\r
-                if (IsOnMap(x, y)) return mGrid[x, y] == ' ';\r
-                return false;\r
+                if (!IsOnMap(x, y)) return false;\r
+                return (Tilemap.GetTileFlags(mGrid[x, y]) & TileFlags.Open) == TileFlags.Open;\r
             }\r
 \r
             //created by Brady for AI precalculations\r
             public bool IsWall(int x, int y)\r
             {\r
-                if (IsOnMap(x, y)) return (mGrid[x, y] == '-' || mGrid[x, y] == '|' || mGrid[x, y] == '+' || mGrid[x, y] == '/' || mGrid[x, y] == '\\');\r
-                return false;\r
+                if (!IsOnMap(x, y)) return false;\r
+                return (Tilemap.GetTileFlags(mGrid[x, y]) & TileFlags.Wall) == TileFlags.Wall;\r
             }\r
+\r
             public void SetCell(int x, int y, char tile)\r
             {\r
                 if (IsOnMap(x, y))\r
@@ -520,7 +521,6 @@ namespace CarFire
         class View\r
         {\r
             public Vector2 CenterCell;\r
-            public Tilemap Tilemap;\r
             public float Zoom;\r
 \r
 \r
@@ -542,14 +542,14 @@ namespace CarFire
 \r
             public void Draw(SpriteBatch spriteBatch)\r
             {\r
-                if (Tilemap == null) throw new Exception("Cannot draw map without first setting the tilemap.");\r
+                if (mData.Tilemap == null) throw new Exception("Cannot draw map without first setting the tilemap.");\r
                 mViewport = spriteBatch.GraphicsDevice.Viewport;\r
 \r
                 for (int y = 0; y < mData.Metadata.GridHeight; y++)\r
                 {\r
                     for (int x = 0; x < mData.Metadata.GridWidth; x++)\r
                     {\r
-                        Tilemap.Draw(spriteBatch, mData.GetCell(x, y), GetRectangleFromCoordinates(x, y));\r
+                        mData.Tilemap.Draw(spriteBatch, mData.GetCell(x, y), GetRectangleFromCoordinates(x, y));\r
                     }\r
                 }\r
             }\r

diff --git a/CarFire/CarFire/CarFire/Tilemap.cs b/CarFire/CarFire/CarFire/Tilemap.cs
index d0441083c4810a181e8072414890a38f179c82e2..50906a8541989b43595e3095da654990bc51aebe 100644 (file)
--- a/CarFire/CarFire/CarFire/Tilemap.cs
+++ b/CarFire/CarFire/CarFire/Tilemap.cs
@@ -8,6 +8,20 @@ using Microsoft.Xna.Framework.Content;
 using Microsoft.Xna.Framework.Graphics;\r
 namespace CarFire\r
 {\r
+    /// <summary>\r
+    /// Flag options to define attributes for individual tiles.\r
+    /// </summary>\r
+    [Flags]\r
+    public enum TileFlags\r
+    {\r
+        Open = 0x01,\r
+        Closed = 0x02,\r
+        Floor = 0x04,\r
+        Wall = 0x08,\r
+        Default = 0x05\r
+    }\r
+\r
+\r
     /// <summary>\r
     /// Small wrapper around a texture to provide easy access to\r
     /// tile rectangles.\r
@@ -77,15 +91,27 @@ namespace CarFire
         }\r
 \r
 \r
+        /// <summary>\r
+        /// Get the flags associated with a tile character.\r
+        /// </summary>\r
+        /// <param name="tile">Tile character.</param>\r
+        /// <returns>Tile flags.</returns>\r
+        public TileFlags GetTileFlags(char tile)\r
+        {\r
+            return mFlags[tile];\r
+        }\r
+\r
+\r
         /// <summary>\r
         /// Associate a tile character with tile coordinates.  This\r
-        /// lets you access tile rectangles by character.\r
+        /// lets you access tiles by character.\r
         /// </summary>\r
         /// <param name="tile">Tile character.</param>\r
         /// <param name="point">Coordinates.</param>\r
-        public void SetTile(char tile, Point point)\r
+        public void SetTile(char tile, Point point, TileFlags flags)\r
         {\r
             mTiles.Add(tile, GetRectangleForTile(point));\r
+            mFlags.Add(tile, flags);\r
         }\r
 \r
 \r
@@ -111,6 +137,7 @@ namespace CarFire
         int mTileW;\r
         int mTileH;\r
         Dictionary<char, Rectangle> mTiles = new Dictionary<char, Rectangle>();\r
+        Dictionary<char, TileFlags> mFlags = new Dictionary<char, TileFlags>();\r
 \r
         #endregion\r
     }\r