X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;f=CarFire%2FCarFire%2FCarFire%2FMap.cs;h=1b8b5a89bc992a9279f324102379674ce0a5ef73;hb=8f212205c32b283d9a7730e15044d706db2f08bf;hp=8c744bad3e8a96962288d966ea47c991911d099a;hpb=af9deb873b24dadd0d509ce199fc6cac2b3efbc9;p=chaz%2Fcarfire
diff --git a/CarFire/CarFire/CarFire/Map.cs b/CarFire/CarFire/CarFire/Map.cs
index 8c744ba..1b8b5a8 100644
--- a/CarFire/CarFire/CarFire/Map.cs
+++ b/CarFire/CarFire/CarFire/Map.cs
@@ -19,33 +19,6 @@ namespace CarFire
///
public class Map
{
- // DEBUG: Tilesets not implemented at all.
- public static Texture2D DefaultTile;
-
- #region Public Exceptions
-
- ///
- /// This exception is thrown during the loading of a map if any
- /// part of the map file is inconsistent with the expected format
- /// and order.
- ///
- public class RuntimeException : System.ApplicationException
- {
- public RuntimeException() { }
-
- public RuntimeException(string message) :
- base(message) { }
-
- public RuntimeException(string message, System.Exception inner) :
- base(message, inner) { }
-
- protected RuntimeException(SerializationInfo info, StreamingContext context) :
- base(info, context) { }
- }
-
- #endregion
-
-
#region Public Constants
public const float PixelsToUnitSquares = 64.0f;
@@ -124,7 +97,9 @@ namespace CarFire
///
public int Height { get { return mData.Metadata.GridHeight; } }
- // TODO: This should return whatever object we end up using for tilesets.
+ ///
+ /// Get the name of the tileset.
+ ///
public string Tileset { get { return mData.Metadata.Tileset; } }
///
@@ -157,23 +132,24 @@ namespace CarFire
}
///
- /// Get and set the zoom of the map view. The default zoom is
- /// Map.PixelsToUnitSquares.
+ /// Get and set the tilemap with its associated texture and tile
+ /// character to coordinate mappings. This effects what the map looks
+ /// like when it is drawn.
///
- public float Zoom
+ public Tilemap Tilemap
{
- get { return mView.Zoom; }
- set { mView.Zoom = value; }
+ get { return mView.Tilemap; }
+ set { mView.Tilemap = value; }
}
-
///
- /// Get and set the associated game object.
+ /// Get and set the zoom of the map view. The default zoom is
+ /// Map.PixelsToUnitSquares.
///
- public Game Game
+ public float Zoom
{
- get { return mData.Game; }
- set { mData.Game = value; }
+ get { return mView.Zoom; }
+ set { mView.Zoom = value; }
}
#endregion
@@ -259,6 +235,16 @@ namespace CarFire
return mData.IsCellOpen(x, y);
}
+ ///
+ /// created by Brady for AI precalculations
+ ///
+ /// X-coordinate.
+ /// Y-coordinate.
+ public bool IsWall(int x, int y)
+ {
+ return mData.IsWall(x, y);
+ }
+
///
/// Determine whether or not a cell can be occupied by a game entity.
///
@@ -287,21 +273,23 @@ namespace CarFire
/// Get all the entities loaded from the map file. Exceptions could be
/// thrown if there are entities without associated classes.
///
+ /// The game reference to be passed to entities.
/// List of entity objects loaded.
- public List GetAllEntities()
+ public List GetAllEntities(Game game)
{
- return mData.GetAllEntities();
+ return mData.GetAllEntities(game);
}
///
/// Get the entities of a certain type loaded from the map file. Exceptions
/// could be thrown if there are entities without associated classes.
///
+ /// The game reference to be passed to entities.
/// Type of the entity you want a list of.
/// List of entity objects loaded.
- public List GetEntities()
+ public List GetEntities(Game game)
{
- return mData.GetEntities();
+ return mData.GetEntities(game);
}
@@ -368,8 +356,6 @@ namespace CarFire
public Point[] PlayerPositions { get { return mPlayerPositions; } }
public bool[,] Grid { get { return mBooleanGrid; } }
- public Game Game;
-
public Model(Metadata metadata, char[,] grid, char defaultTile,
List entities, Point[] playerPositions)
@@ -418,6 +404,12 @@ namespace CarFire
return false;
}
+ //created by Brady for AI precalculations
+ public bool IsWall(int x, int y)
+ {
+ if (IsOnMap(x, y)) return (mGrid[x, y] == '-' || mGrid[x, y] == '|' || mGrid[x, y] == '+' || mGrid[x, y] == '/' || mGrid[x, y] == '\\');
+ return false;
+ }
public void SetCell(int x, int y, char tile)
{
if (IsOnMap(x, y))
@@ -427,6 +419,12 @@ namespace CarFire
}
}
+ public char GetCell(int x, int y)
+ {
+ if (IsOnMap(x, y)) return mGrid[x, y];
+ return mDefaultTile;
+ }
+
public void ClearCell(int x, int y)
{
SetCell(x, y, mDefaultTile);
@@ -438,7 +436,7 @@ namespace CarFire
}
- public List GetAllEntities()
+ public List GetAllEntities(Game game)
{
List list = new List();
@@ -452,23 +450,23 @@ namespace CarFire
args[0] = raw.Id;
args[1] = raw.Position;
args[2] = raw.Attributes;
- args[3] = Game;
+ args[3] = game;
try
{
IEntity entity = (IEntity)Activator.CreateInstance(System.Type.GetType("CarFire." + typename), args);
if (entity != null)
{
- entity.LoadContent(Game.ContentManager);
+ entity.LoadContent(game.ContentManager);
list.Add(entity);
}
- else throw new RuntimeException();
+ else throw new Exception();
}
#pragma warning disable 0168
catch (System.Exception ex)
#pragma warning restore 0168
{
- throw new RuntimeException("Entity of type " + typename + " not loaded because an entity class can't be found.");
+ throw new Exception("Entity of type " + typename + " not loaded because an entity class can't be found.");
}
}
else
@@ -480,7 +478,7 @@ namespace CarFire
return list;
}
- public List GetEntities()
+ public List GetEntities(Game game)
{
System.Type type = typeof(T);
List list = new List();
@@ -494,15 +492,15 @@ namespace CarFire
args[0] = raw.Id;
args[1] = raw.Position;
args[2] = raw.Attributes;
- args[3] = Game;
+ args[3] = game;
T entity = (T)Activator.CreateInstance(type, args);
if (entity != null)
{
- ((IEntity)entity).LoadContent(Game.ContentManager);
+ ((IEntity)entity).LoadContent(game.ContentManager);
list.Add(entity);
}
- else throw new RuntimeException("Entity of type " + typename + " not loaded because an entity class can't be found.");
+ else throw new Exception("Entity of type " + typename + " not loaded because an entity class can't be found.");
}
}
@@ -522,6 +520,7 @@ namespace CarFire
class View
{
public Vector2 CenterCell;
+ public Tilemap Tilemap;
public float Zoom;
@@ -543,21 +542,14 @@ namespace CarFire
public void Draw(SpriteBatch spriteBatch)
{
+ if (Tilemap == null) throw new Exception("Cannot draw map without first setting the tilemap.");
mViewport = spriteBatch.GraphicsDevice.Viewport;
- // TODO: There is no culling yet, but it runs so fast that it probably won't ever need it.
for (int y = 0; y < mData.Metadata.GridHeight; y++)
{
for (int x = 0; x < mData.Metadata.GridWidth; x++)
{
- if (mData.IsCellOpen(x, y))
- {
- spriteBatch.Draw(Map.DefaultTile, GetRectangleFromCoordinates(x, y), Color.White);
- }
- else
- {
- spriteBatch.Draw(Map.DefaultTile, GetRectangleFromCoordinates(x, y), Color.DarkBlue);
- }
+ Tilemap.Draw(spriteBatch, mData.GetCell(x, y), GetRectangleFromCoordinates(x, y));
}
}
}