Compare commits

..

No commits in common. "a4802031d59f9aa0f9ed3624d4dfcea3d1cade66" and "a93076419d963a4c9b805a7445f7a4e01ffb9b96" have entirely different histories.

2 changed files with 11 additions and 16 deletions

View File

@ -18,11 +18,6 @@ namespace SemiColinGames {
public static void Deconstruct(this Point point, out int x, out int y) =>
(x, y) = (point.X, point.Y);
// Rectangle
public static Vector2 HalfSize(this Rectangle rect) {
return new Vector2(rect.Width / 2, rect.Height / 2);
}
// SpriteFont
public static Vector2 CenteredOn(this SpriteFont font, string text, Point position) {
Vector2 size = font.MeasureString(text);

View File

@ -25,20 +25,22 @@ namespace SemiColinGames {
public Camera Camera { get; }
// Size of World in pixels.
public readonly int Width;
public readonly int Height;
public int Width {
get { return gridWidth * TileSize; }
}
public int Height {
get { return gridHeight * TileSize; }
}
public World(GraphicsDevice graphics, string json) {
Camera = new Camera();
LinesOfSight = new LinesOfSight(graphics);
JObject root = JObject.Parse(json);
Width = root.SelectToken("width").Value<int>();
Height = root.SelectToken("height").Value<int>();
List<Tile> hazardTiles = new List<Tile>();
List<Tile> obstacleTiles = new List<Tile>();
List<Tile> obstacleTiles8 = new List<Tile>();
List<Tile> decorationTiles = new List<Tile>();
List<Tile> backgroundTiles = new List<Tile>();
foreach (JToken layer in root.SelectToken("layers").Children()) {
@ -53,8 +55,6 @@ namespace SemiColinGames {
hazardTiles = tileList;
} else if (layerName == "obstacles") {
obstacleTiles = tileList;
} else if (layerName == "obstacles-8") {
obstacleTiles8 = tileList;
} else if (layerName == "decorations") {
decorationTiles = tileList;
} else if (layerName == "background") {
@ -62,7 +62,6 @@ namespace SemiColinGames {
}
}
// Get all the obstacles into a single array, sorted by X.
obstacleTiles.AddRange(obstacleTiles8);
obstacleTiles.AddRange(hazardTiles);
obstacles = obstacleTiles.ToArray();
Array.Sort(obstacles, Tile.CompareByX);
@ -80,10 +79,11 @@ namespace SemiColinGames {
CollisionTargets[0] = new AABB(new Vector2(-1, 0), new Vector2(1, float.MaxValue));
// Now add all the normal collisionTargets for every obstacle.
Vector2 halfSize = new Vector2(TileSize / 2, TileSize / 2);
for (int i = 0; i < obstacles.Length; i++) {
Tile obstacle = obstacles[i];
CollisionTargets[i + 1] = new AABB(
obstacle.Position.Center.ToVector2(), obstacle.Position.HalfSize(), obstacle);
Vector2 center = new Vector2(
obstacles[i].Position.Left + halfSize.X, obstacles[i].Position.Top + halfSize.Y);
CollisionTargets[i + 1] = new AABB(center, halfSize, obstacles[i]);
}
// Add a final synthetic collisionTarget on the right side of the world.