space-wizards/RobustToolbox
1
0
Fork 0
mirror of https://github.com/space-wizards/RobustToolbox.git synced 2026-09-15 14:52:35 +02:00
Code Issues Packages Projects Releases Wiki Activity

Replace MapIndices to Vector2i (#1318)

Browse Source
This commit is contained in:
DrSmugleaf
2020-10-11 14:33:09 +02:00
committed by GitHub
parent 29086a5b4b
commit da76788751
22 changed files with 194 additions and 177 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Robust.UnitTesting/Shared/Map/MapChunk_Tests.cs
+14 -14
View File
@@ -29,7 +29,7 @@ namespace Robust.UnitTesting.Shared.Map
Assert.That(chunk.X, Is.EqualTo(7));
Assert.That(chunk.Y, Is.EqualTo(9));
Assert.That(chunk.Indices, Is.EqualTo(new MapIndices(7,9)));
Assert.That(chunk.Indices, Is.EqualTo(new Vector2i(7,9)));
}
[Test]
@@ -107,7 +107,7 @@ namespace Robust.UnitTesting.Shared.Map
var chunk = MapChunkFactory(7, 9);
chunk.SetTile(3, 5, new Tile(1, 3));
var result = chunk.GetTileRef(new MapIndices(3, 5));
var result = chunk.GetTileRef(new Vector2i(3, 5));
Assert.That(result.X, Is.EqualTo(8 * 7 + 3));
Assert.That(result.Y, Is.EqualTo(8 * 9 + 5));
@@ -124,8 +124,8 @@ namespace Robust.UnitTesting.Shared.Map
Assert.Throws<ArgumentOutOfRangeException>((() => chunk.GetTileRef(8, 0)));
Assert.Throws<ArgumentOutOfRangeException>((() => chunk.GetTileRef(0, 8)));
Assert.Throws<ArgumentOutOfRangeException>((() => chunk.GetTileRef(new MapIndices(8,0))));
Assert.Throws<ArgumentOutOfRangeException>((() => chunk.GetTileRef(new MapIndices(0, 8))));
Assert.Throws<ArgumentOutOfRangeException>((() => chunk.GetTileRef(new Vector2i(8,0))));
Assert.Throws<ArgumentOutOfRangeException>((() => chunk.GetTileRef(new Vector2i(0, 8))));
}
[Test]
@@ -164,13 +164,13 @@ namespace Robust.UnitTesting.Shared.Map
Assert.That(tiles[0],
Is.EqualTo(new TileRef(new MapId(11),
new GridId(13),
new MapIndices(8 * 7 + 3, 8 * 9 + 5),
new Vector2i(8 * 7 + 3, 8 * 9 + 5),
new Tile(1, 3))));
Assert.That(tiles[1],
Is.EqualTo(new TileRef(new MapId(11),
new GridId(13),
new MapIndices(8 * 7 + 5, 8 * 9 + 4),
new Vector2i(8 * 7 + 5, 8 * 9 + 4),
new Tile(5, 7))));
}
@@ -189,13 +189,13 @@ namespace Robust.UnitTesting.Shared.Map
Assert.That(tiles[8*3+5],
Is.EqualTo(new TileRef(new MapId(11),
new GridId(13),
new MapIndices(8 * 7 + 3, 8 * 9 + 5),
new Vector2i(8 * 7 + 3, 8 * 9 + 5),
new Tile(1, 3))));
Assert.That(tiles[8*5+4],
Is.EqualTo(new TileRef(new MapId(11),
new GridId(13),
new MapIndices(8 * 7 + 5, 8 * 9 + 4),
new Vector2i(8 * 7 + 5, 8 * 9 + 4),
new Tile(5, 7))));
}
@@ -249,13 +249,13 @@ namespace Robust.UnitTesting.Shared.Map
Assert.That(tiles[0],
Is.EqualTo(new TileRef(new MapId(11),
new GridId(13),
new MapIndices(8 * 7 + 3, 8 * 9 + 5),
new Vector2i(8 * 7 + 3, 8 * 9 + 5),
new Tile(1, 3))));
Assert.That(tiles[1],
Is.EqualTo(new TileRef(new MapId(11),
new GridId(13),
new MapIndices(8 * 7 + 5, 8 * 9 + 4),
new Vector2i(8 * 7 + 5, 8 * 9 + 4),
new Tile(5, 7))));
}
@@ -267,12 +267,12 @@ namespace Robust.UnitTesting.Shared.Map
// 8x8 chunk (-1,-1) occupies tiles -8 to -1 on each axis
var chunk = MapChunkFactory(-1, -1);
var indices = chunk.GridTileToChunkTile(new MapIndices(-3, -5));
var indices = chunk.GridTileToChunkTile(new Vector2i(-3, -5));
// drawing this out helps a ton
// grid tile -1,-1 is chunk tile 7,7
// grid tile -8,-8 is chunk tile 0,0
Assert.That(indices, Is.EqualTo(new MapIndices(5, 3)));
Assert.That(indices, Is.EqualTo(new Vector2i(5, 3)));
}
[Test]
@@ -449,7 +449,7 @@ namespace Robust.UnitTesting.Shared.Map
var chunk = MapChunkFactory(7, 9);
chunk.SetTile(3, 5, new Tile(1));
var result = chunk.CollidesWithChunk(new MapIndices(3, 5));
var result = chunk.CollidesWithChunk(new Vector2i(3, 5));
Assert.That(result, Is.True);
}
@@ -460,7 +460,7 @@ namespace Robust.UnitTesting.Shared.Map
var chunk = MapChunkFactory(7, 9);
chunk.SetTile(3, 5, new Tile(1));
var result = chunk.CollidesWithChunk(new MapIndices(3, 6));
var result = chunk.CollidesWithChunk(new Vector2i(3, 6));
Assert.That(result, Is.False);
}
Robust.UnitTesting/Shared/Map/MapGrid_Tests.cs
+21 -21
View File
@@ -34,13 +34,13 @@ namespace Robust.UnitTesting.Shared.Map
public void GetTileRefCoords()
{
var grid = MapGridFactory(new GridId(1));
grid.SetTile(new MapIndices(-9, -1), new Tile(1, 2));
grid.SetTile(new Vector2i(-9, -1), new Tile(1, 2));
var result = grid.GetTileRef(new MapIndices(-9, -1));
var result = grid.GetTileRef(new Vector2i(-9, -1));
Assert.That(grid.ChunkCount, Is.EqualTo(1));
Assert.That(grid.GetMapChunks().Keys.ToList()[0], Is.EqualTo(new MapIndices(-2, -1)));
Assert.That(result, Is.EqualTo(new TileRef(new MapId(5), new GridId(1), new MapIndices(-9,-1), new Tile(1, 2))));
Assert.That(grid.GetMapChunks().Keys.ToList()[0], Is.EqualTo(new Vector2i(-2, -1)));
Assert.That(result, Is.EqualTo(new TileRef(new MapId(5), new GridId(1), new Vector2i(-9,-1), new Tile(1, 2))));
}
/// <summary>
@@ -51,8 +51,8 @@ namespace Robust.UnitTesting.Shared.Map
{
var grid = MapGridFactory(new GridId(1));
grid.SetTile(new MapIndices(-1, -2), new Tile(1));
grid.SetTile(new MapIndices(1, 2), new Tile(1));
grid.SetTile(new Vector2i(-1, -2), new Tile(1));
grid.SetTile(new Vector2i(1, 2), new Tile(1));
var bounds = grid.WorldBounds;
@@ -71,10 +71,10 @@ namespace Robust.UnitTesting.Shared.Map
{
var grid = MapGridFactory(new GridId(1));
grid.SetTile(new MapIndices(-1, -2), new Tile(1));
grid.SetTile(new MapIndices(1, 2), new Tile(1));
grid.SetTile(new Vector2i(-1, -2), new Tile(1));
grid.SetTile(new Vector2i(1, 2), new Tile(1));
grid.SetTile(new MapIndices(1, 2), Tile.Empty);
grid.SetTile(new Vector2i(1, 2), Tile.Empty);
var bounds = grid.WorldBounds;
@@ -90,9 +90,9 @@ namespace Robust.UnitTesting.Shared.Map
{
var grid = MapGridFactory(new GridId(1));
var result = grid.GridTileToChunkIndices(new MapIndices(-9, -1));
var result = grid.GridTileToChunkIndices(new Vector2i(-9, -1));
Assert.That(result, Is.EqualTo(new MapIndices(-2, -1)));
Assert.That(result, Is.EqualTo(new Vector2i(-2, -1)));
}
/// <summary>
@@ -103,7 +103,7 @@ namespace Robust.UnitTesting.Shared.Map
{
var grid = MapGridFactory(new GridId(1));
var result = grid.GridTileToLocal(new MapIndices(0, 0)).Position;
var result = grid.GridTileToLocal(new Vector2i(0, 0)).Position;
Assert.That(result.X, Is.EqualTo(0.5f));
Assert.That(result.Y, Is.EqualTo(0.5f));
@@ -114,7 +114,7 @@ namespace Robust.UnitTesting.Shared.Map
{
var grid = MapGridFactory(new GridId(1));
var foundTile = grid.TryGetTileRef(new MapIndices(-9, -1), out var tileRef);
var foundTile = grid.TryGetTileRef(new Vector2i(-9, -1), out var tileRef);
Assert.That(foundTile, Is.False);
Assert.That(tileRef, Is.EqualTo(new TileRef()));
@@ -125,23 +125,23 @@ namespace Robust.UnitTesting.Shared.Map
public void TryGetTileRefTileExists()
{
var grid = MapGridFactory(new GridId(1));
grid.SetTile(new MapIndices(-9, -1), new Tile(1, 2));
grid.SetTile(new Vector2i(-9, -1), new Tile(1, 2));
var foundTile = grid.TryGetTileRef(new MapIndices(-9, -1), out var tileRef);
var foundTile = grid.TryGetTileRef(new Vector2i(-9, -1), out var tileRef);
Assert.That(foundTile, Is.True);
Assert.That(grid.ChunkCount, Is.EqualTo(1));
Assert.That(grid.GetMapChunks().Keys.ToList()[0], Is.EqualTo(new MapIndices(-2, -1)));
Assert.That(tileRef, Is.EqualTo(new TileRef(new MapId(5), new GridId(1), new MapIndices(-9, -1), new Tile(1, 2))));
Assert.That(grid.GetMapChunks().Keys.ToList()[0], Is.EqualTo(new Vector2i(-2, -1)));
Assert.That(tileRef, Is.EqualTo(new TileRef(new MapId(5), new GridId(1), new Vector2i(-9, -1), new Tile(1, 2))));
}
[Test]
public void PointCollidesWithGrid()
{
var grid = MapGridFactory(new GridId(1));
grid.SetTile(new MapIndices(19, 23), new Tile(1));
grid.SetTile(new Vector2i(19, 23), new Tile(1));
var result = grid.CollidesWithGrid(new MapIndices(19, 23));
var result = grid.CollidesWithGrid(new Vector2i(19, 23));
Assert.That(result, Is.True);
}
@@ -150,9 +150,9 @@ namespace Robust.UnitTesting.Shared.Map
public void PointNotCollideWithGrid()
{
var grid = MapGridFactory(new GridId(1));
grid.SetTile(new MapIndices(19, 23), new Tile(1));
grid.SetTile(new Vector2i(19, 23), new Tile(1));
var result = grid.CollidesWithGrid(new MapIndices(19, 24));
var result = grid.CollidesWithGrid(new Vector2i(19, 24));
Assert.That(result, Is.False);
}