X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;ds=sidebyside;f=CarFire%2FCarFire%2FCarFire%2FMap.cs;h=8c744bad3e8a96962288d966ea47c991911d099a;hb=f31fe51445e412355ef197ea87da3b07f7fc1c70;hp=6727133bc79c1ee72471e67d8f30c0fd2fa7349e;hpb=b92963913e205b5370c112dd5cbf96f91194bc50;p=chaz%2Fcarfire
diff --git a/CarFire/CarFire/CarFire/Map.cs b/CarFire/CarFire/CarFire/Map.cs
index 6727133..8c744ba 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
///
/// Get the name of the map.
@@ -156,6 +156,26 @@ namespace CarFire
set { mView.CenterCell = value; }
}
+ ///
+ /// Get and set the zoom of the map view. The default zoom is
+ /// Map.PixelsToUnitSquares.
+ ///
+ public float Zoom
+ {
+ get { return mView.Zoom; }
+ set { mView.Zoom = value; }
+ }
+
+
+ ///
+ /// Get and set the associated game object.
+ ///
+ public Game Game
+ {
+ get { return mData.Game; }
+ set { mData.Game = value; }
+ }
+
#endregion
@@ -170,7 +190,7 @@ namespace CarFire
public Map(Metadata metadata, char[,] grid, char defaultTile,
List entities, Point[] playerPositions)
{
- mData = new Modal(metadata, grid, defaultTile, entities, playerPositions);
+ mData = new Model(metadata, grid, defaultTile, entities, playerPositions);
mView = new View(mData);
}
@@ -268,7 +288,7 @@ namespace CarFire
/// thrown if there are entities without associated classes.
///
/// List of entity objects loaded.
- public List GetAllEntities()
+ public List GetAllEntities()
{
return mData.GetAllEntities();
}
@@ -326,21 +346,32 @@ namespace CarFire
mData.ClearCell(point.X, point.Y);
}
+
+ ///
+ /// Reset the map to the state it was at right after loading.
+ ///
+ public void Reset()
+ {
+ mData.Reset();
+ mView.Reset();
+ }
+
#endregion
#region Private Types
- class Modal
+ class Model
{
- Metadata mMetadata;
- char[,] mGrid;
- char mDefaultTile;
- List mEntities;
- Point[] mPlayerPositions;
- bool[,] mBooleanGrid;
+ public Metadata Metadata { get { return mMetadata; } }
+ public List Entities { get { return mEntities; } }
+ public Point[] PlayerPositions { get { return mPlayerPositions; } }
+ public bool[,] Grid { get { return mBooleanGrid; } }
+
+ public Game Game;
- public Modal(Metadata metadata, char[,] grid, char defaultTile,
+
+ public Model(Metadata metadata, char[,] grid, char defaultTile,
List entities, Point[] playerPositions)
{
Debug.Assert(metadata != null);
@@ -349,19 +380,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 +396,35 @@ namespace CarFire
}
- public Metadata Metadata { get { return mMetadata; } }
- public List 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,10 +432,15 @@ 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 GetAllEntities()
+ public List GetAllEntities()
{
- List list = new List();
+ List list = new List();
foreach (RawEntity raw in mEntities)
{
@@ -406,16 +448,20 @@ namespace CarFire
{
string typename = raw.Attributes["type"];
- object[] args = new object[3];
+ object[] args = new object[4];
args[0] = raw.Id;
args[1] = raw.Position;
args[2] = raw.Attributes;
+ args[3] = Game;
try
{
-
- object entity = Activator.CreateInstance(System.Type.GetType("CarFire." + typename), args);
- if (entity != null) list.Add(entity);
+ IEntity entity = (IEntity)Activator.CreateInstance(System.Type.GetType("CarFire." + typename), args);
+ if (entity != null)
+ {
+ entity.LoadContent(Game.ContentManager);
+ list.Add(entity);
+ }
else throw new RuntimeException();
}
#pragma warning disable 0168
@@ -444,35 +490,57 @@ namespace CarFire
{
if (raw.Attributes.ContainsKey("type") && typename == raw.Attributes["type"])
{
- object[] args = new object[3];
+ object[] args = new object[4];
args[0] = raw.Id;
args[1] = raw.Position;
args[2] = raw.Attributes;
+ args[3] = Game;
T entity = (T)Activator.CreateInstance(type, args);
- if (entity != null) list.Add(entity);
+ if (entity != null)
+ {
+ ((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.");
}
}
return list;
}
+
+
+ Metadata mMetadata;
+ char[,] mGrid;
+ char[,] mCleanGrid;
+ bool[,] mBooleanGrid;
+ char mDefaultTile;
+ List mEntities;
+ Point[] mPlayerPositions;
}
class View
{
- Modal mData;
-
public Vector2 CenterCell;
- Viewport mViewport;
+ public float Zoom;
- public View(Modal data)
+ public View(Model 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 +562,30 @@ namespace CarFire
}
}
- ///
- /// 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.
- ///
- /// The point to put in the center.
- /// The transformation matrix.
+
+ 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 +606,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);
- }
+ Model mData;
+ Viewport mViewport;
}
#endregion
@@ -548,7 +615,7 @@ namespace CarFire
#region Private Variables
- Modal mData;
+ Model mData;
View mView;
#endregion