space-wizards/RobustToolbox
1
0
Fork 0
mirror of https://github.com/space-wizards/RobustToolbox.git synced 2026-02-15 03:30:53 +01:00
Code Issues Packages Projects Releases Wiki Activity

Replace GridEntityId with Owner (#3530)

Browse Source
This commit is contained in:
metalgearsloth
2022-12-12 14:58:41 +11:00
committed by GitHub
parent fef963e77a
commit 3c168f5a31
49 changed files with 224 additions and 228 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Robust.UnitTesting/Client/GameObjects/Components/TransformComponentTests.cs
View File

@@ -28,7 +28,7 @@ namespace Robust.UnitTesting.Client.GameObjects.Components
var gridA = mapManager.CreateGrid(TestMapId);
var gridB = mapManager.CreateGrid(TestMapId);
return (sim, gridA.GridEntityId, gridB.GridEntityId);
return (sim, gridA.Owner, gridB.Owner);
}
/// <summary>
@@ -45,16 +45,16 @@ namespace Robust.UnitTesting.Client.GameObjects.Components
var gridB = mapMan.GetGrid(gridIdB);
// Arrange
var initialPos = new EntityCoordinates(gridA.GridEntityId, (0, 0));
var initialPos = new EntityCoordinates(gridA.Owner, (0, 0));
var parent = entMan.SpawnEntity(null, initialPos);
var child = entMan.SpawnEntity(null, initialPos);
var parentTrans = entMan.GetComponent<TransformComponent>(parent);
var childTrans = entMan.GetComponent<TransformComponent>(child);
var compState = new TransformComponentState(new Vector2(5, 5), new Angle(0), gridB.GridEntityId, false, false);
var compState = new TransformComponentState(new Vector2(5, 5), new Angle(0), gridB.Owner, false, false);
parentTrans.HandleComponentState(compState, null);
compState = new TransformComponentState(new Vector2(6, 6), new Angle(0), gridB.GridEntityId, false, false);
compState = new TransformComponentState(new Vector2(6, 6), new Angle(0), gridB.Owner, false, false);
childTrans.HandleComponentState(compState, null);
// World pos should be 6, 6 now.
@@ -83,7 +83,7 @@ namespace Robust.UnitTesting.Client.GameObjects.Components
var gridB = mapMan.GetGrid(gridIdB);
// Arrange
var initalPos = new EntityCoordinates(gridA.GridEntityId, (0, 0));
var initalPos = new EntityCoordinates(gridA.Owner, (0, 0));
var node1 = entMan.SpawnEntity(null, initalPos);
var node2 = entMan.SpawnEntity(null, initalPos);
var node3 = entMan.SpawnEntity(null, initalPos);
@@ -96,7 +96,7 @@ namespace Robust.UnitTesting.Client.GameObjects.Components
var node2Trans = entMan.GetComponent<TransformComponent>(node2);
var node3Trans = entMan.GetComponent<TransformComponent>(node3);
var compState = new TransformComponentState(new Vector2(6, 6), Angle.FromDegrees(135), gridB.GridEntityId, false, false);
var compState = new TransformComponentState(new Vector2(6, 6), Angle.FromDegrees(135), gridB.Owner, false, false);
var handleState = new ComponentHandleState(compState, null);
xformSystem.OnHandleState(node1, node1Trans, ref handleState);

2
Robust.UnitTesting/Server/GameObjects/Components/Container_Test.cs
View File

@@ -198,7 +198,7 @@ namespace Robust.UnitTesting.Server.GameObjects.Components
var sim = SimulationFactory();
var containerSys = sim.Resolve<IEntitySystemManager>().GetEntitySystem<ContainerSystem>();
var grid = sim.Resolve<IMapManager>().CreateGrid(new MapId(1)).GridEntityId;
var grid = sim.Resolve<IMapManager>().CreateGrid(new MapId(1)).Owner;
var entity = sim.SpawnEntity("dummy", new EntityCoordinates(new EntityUid(1), (0, 0)));
var container = containerSys.MakeContainer<Container>(entity, "dummy");

4
Robust.UnitTesting/Server/GameObjects/Components/Transform_Test.cs
View File

@@ -94,8 +94,8 @@ namespace Robust.UnitTesting.Server.GameObjects.Components
var childTrans = EntityManager.GetComponent<TransformComponent>(child);
// that are not on the same map
parentTrans.Coordinates = new EntityCoordinates(GridA.GridEntityId, (5, 5));
childTrans.Coordinates = new EntityCoordinates(GridB.GridEntityId, (4, 4));
parentTrans.Coordinates = new EntityCoordinates(GridA.Owner, (5, 5));
childTrans.Coordinates = new EntityCoordinates(GridB.Owner, (4, 4));
// if they are parented, the child keeps its world position, but moves to the parents map
childTrans.AttachParent(parentTrans);

2
Robust.UnitTesting/Shared/EntityLookup_Test.cs
View File

@@ -66,7 +66,7 @@ namespace Robust.UnitTesting.Shared
Assert.That(lookup.GetEntitiesIntersecting(mapId, theMapSpotBeingUsed).ToList().Count, Is.EqualTo(1));
entManager.DeleteEntity(dummy);
mapManager.DeleteGrid(grid.GridEntityId);
mapManager.DeleteGrid(grid.Owner);
mapManager.DeleteMap(mapId);
}
}

14
Robust.UnitTesting/Shared/GameObjects/Systems/AnchoredSystemTests.cs
View File

@@ -47,7 +47,7 @@ namespace Robust.UnitTesting.Shared.GameObjects.Systems
// Add grid 1, as the default grid to anchor things to.
var grid = mapManager.CreateGrid(TestMapId);
return (sim, grid.GridEntityId);
return (sim, grid.Owner);
}
// An entity is anchored to the tile it is over on the target grid.
@@ -164,7 +164,7 @@ namespace Robust.UnitTesting.Shared.GameObjects.Systems
// Act
IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(ent1).Anchored = true;
Assert.That(IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(ent1).ParentUid, Is.EqualTo(grid.GridEntityId));
Assert.That(IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(ent1).ParentUid, Is.EqualTo(grid.Owner));
Assert.That(calledCount, Is.EqualTo(1));
void ParentChangedHandler(ref EntParentChangedMessage ev)
{
@@ -217,7 +217,7 @@ namespace Robust.UnitTesting.Shared.GameObjects.Systems
Assert.That(grid.GetAnchoredEntities(tileIndices).First(), Is.EqualTo(ent1));
Assert.That(grid.GetTileRef(tileIndices).Tile, Is.Not.EqualTo(Tile.Empty));
Assert.That(IoCManager.Resolve<IEntityManager>().HasComponent<PhysicsComponent>(ent1), Is.False);
var tempQualifier = grid.GridEntityId;
var tempQualifier = grid.Owner;
Assert.That(IoCManager.Resolve<IEntityManager>().HasComponent<PhysicsComponent>(tempQualifier), Is.True);
}
@@ -305,7 +305,7 @@ namespace Robust.UnitTesting.Shared.GameObjects.Systems
IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(ent1).Anchored = true;
// Act
entMan.EntitySysManager.GetEntitySystem<SharedTransformSystem>().SetParent(ent1, grid.GridEntityId);
entMan.EntitySysManager.GetEntitySystem<SharedTransformSystem>().SetParent(ent1, grid.Owner);
Assert.That(grid.GetAnchoredEntities(tileIndices).First(), Is.EqualTo(ent1));
Assert.That(grid.GetTileRef(tileIndices).Tile, Is.Not.EqualTo(Tile.Empty));
@@ -358,7 +358,7 @@ namespace Robust.UnitTesting.Shared.GameObjects.Systems
// Act
// We purposefully use the grid as container so parent stays the same, reparent will unanchor
var containerMan = IoCManager.Resolve<IEntityManager>().AddComponent<ContainerManagerComponent>(grid.GridEntityId);
var containerMan = IoCManager.Resolve<IEntityManager>().AddComponent<ContainerManagerComponent>(grid.Owner);
var container = containerMan.MakeContainer<Container>("TestContainer");
container.Insert(ent1);
@@ -477,7 +477,7 @@ namespace Robust.UnitTesting.Shared.GameObjects.Systems
var tileIndices = grid.TileIndicesFor(IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(ent1).Coordinates);
grid.SetTile(tileIndices, new Tile(1));
var containerMan = IoCManager.Resolve<IEntityManager>().AddComponent<ContainerManagerComponent>(grid.GridEntityId);
var containerMan = IoCManager.Resolve<IEntityManager>().AddComponent<ContainerManagerComponent>(grid.Owner);
var container = containerMan.MakeContainer<Container>("TestContainer");
container.Insert(ent1);
@@ -542,7 +542,7 @@ namespace Robust.UnitTesting.Shared.GameObjects.Systems
IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(ent1).Anchored = false;
Assert.That(IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(ent1).ParentUid, Is.EqualTo(grid.GridEntityId));
Assert.That(IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(ent1).ParentUid, Is.EqualTo(grid.Owner));
}
}
}

22
Robust.UnitTesting/Shared/Map/EntityCoordinates_Tests.cs
View File

@@ -150,12 +150,12 @@ namespace Robust.UnitTesting.Shared.Map
var mapId = mapManager.CreateMap();
var grid = mapManager.CreateGrid(mapId);
var gridEnt = grid.GridEntityId;
var gridEnt = grid.Owner;
var newEnt = entityManager.CreateEntityUninitialized("dummy", new EntityCoordinates(gridEnt, Vector2.Zero));
// Grids aren't parented to other grids.
Assert.That(IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(gridEnt).Coordinates.GetGridUid(entityManager), Is.Null);
Assert.That(IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(newEnt).Coordinates.GetGridUid(entityManager), Is.EqualTo(grid.GridEntityId));
Assert.That(IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(newEnt).Coordinates.GetGridUid(entityManager), Is.EqualTo(grid.Owner));
Assert.That(IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(newEnt).Coordinates.EntityId, Is.EqualTo(gridEnt));
}
@@ -181,7 +181,7 @@ namespace Robust.UnitTesting.Shared.Map
var mapId = mapManager.CreateMap();
var grid = mapManager.CreateGrid(mapId);
var gridEnt = grid.GridEntityId;
var gridEnt = grid.Owner;
var newEnt = entityManager.CreateEntityUninitialized("dummy", new EntityCoordinates(gridEnt, Vector2.Zero));
Assert.That(IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(gridEnt).Coordinates.GetMapId(entityManager), Is.EqualTo(mapId));
@@ -197,8 +197,8 @@ namespace Robust.UnitTesting.Shared.Map
var mapId = mapManager.CreateMap();
var grid = mapManager.CreateGrid(mapId);
var mapEnt = mapManager.GetMapEntityId(mapId);
var gridEnt = grid.GridEntityId;
var newEnt = entityManager.CreateEntityUninitialized("dummy", new EntityCoordinates(grid.GridEntityId, Vector2.Zero));
var gridEnt = grid.Owner;
var newEnt = entityManager.CreateEntityUninitialized("dummy", new EntityCoordinates(grid.Owner, Vector2.Zero));
Assert.That(entityManager.GetComponent<TransformComponent>(mapEnt).Coordinates.EntityId, Is.EqualTo(mapEnt));
Assert.That(entityManager.GetComponent<TransformComponent>(gridEnt).Coordinates.EntityId, Is.EqualTo(mapEnt));
@@ -219,8 +219,8 @@ namespace Robust.UnitTesting.Shared.Map
var mapId = mapManager.CreateMap();
var grid = mapManager.CreateGrid(mapId);
var mapEnt = mapManager.GetMapEntityId(mapId);
var gridEnt = grid.GridEntityId;
var newEnt = entityManager.CreateEntityUninitialized("dummy", new EntityCoordinates(grid.GridEntityId, Vector2.Zero));
var gridEnt = grid.Owner;
var newEnt = entityManager.CreateEntityUninitialized("dummy", new EntityCoordinates(grid.Owner, Vector2.Zero));
var mapCoords = entityManager.GetComponent<TransformComponent>(mapEnt).Coordinates;
Assert.That(mapCoords.IsValid(entityManager), Is.EqualTo(true));
@@ -269,8 +269,8 @@ namespace Robust.UnitTesting.Shared.Map
var mapId = mapManager.CreateMap();
var grid = mapManager.CreateGrid(mapId);
var gridEnt = grid.GridEntityId;
var newEnt = entityManager.CreateEntityUninitialized("dummy", new EntityCoordinates(grid.GridEntityId, entPos));
var gridEnt = grid.Owner;
var newEnt = entityManager.CreateEntityUninitialized("dummy", new EntityCoordinates(grid.Owner, entPos));
Assert.That(IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(newEnt).Coordinates.ToMap(entityManager), Is.EqualTo(new MapCoordinates(entPos, mapId)));
@@ -288,8 +288,8 @@ namespace Robust.UnitTesting.Shared.Map
var mapId = mapManager.CreateMap();
var mapEnt = mapManager.GetMapEntityId(mapId);
var grid = mapManager.CreateGrid(mapId);
var gridEnt = grid.GridEntityId;
var newEnt = entityManager.CreateEntityUninitialized("dummy", new EntityCoordinates(grid.GridEntityId, Vector2.Zero));
var gridEnt = grid.Owner;
var newEnt = entityManager.CreateEntityUninitialized("dummy", new EntityCoordinates(grid.Owner, Vector2.Zero));
Assert.That(IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(newEnt).Coordinates.WithEntityId(mapEnt).Position, Is.EqualTo(Vector2.Zero));

4
Robust.UnitTesting/Shared/Map/GridCollision_Test.cs
View File

@@ -36,8 +36,8 @@ namespace Robust.UnitTesting.Shared.Map
mapId = mapManager.CreateMap();
gridId1 = mapManager.CreateGrid(mapId);
gridId2 = mapManager.CreateGrid(mapId);
gridEnt1 = gridId1.GridEntityId;
gridEnt2 = gridId2.GridEntityId;
gridEnt1 = gridId1.Owner;
gridEnt2 = gridId2.Owner;
physics1 = entManager.GetComponent<PhysicsComponent>(gridEnt1.Value);
physics2 = entManager.GetComponent<PhysicsComponent>(gridEnt2.Value);
// Can't collide static bodies and grids (at time of this writing) start as static

4
Robust.UnitTesting/Shared/Map/GridContraction_Test.cs
View File

@@ -23,7 +23,7 @@ namespace Robust.UnitTesting.Shared.Map
{
var mapId = mapManager.CreateMap();
var grid = mapManager.CreateGrid(mapId);
var gridEntity = grid.GridEntityId;
var gridEntity = grid.Owner;
for (var i = 0; i < 10; i++)
{
@@ -72,7 +72,7 @@ namespace Robust.UnitTesting.Shared.Map
grid.SetTile(new Vector2i(i, 0), Tile.Empty);
}
Assert.That(!((!entManager.EntityExists(grid.GridEntityId) ? EntityLifeStage.Deleted : entManager.GetComponent<MetaDataComponent>(grid.GridEntityId).EntityLifeStage) >= EntityLifeStage.Deleted));
Assert.That(!((!entManager.EntityExists(grid.Owner) ? EntityLifeStage.Deleted : entManager.GetComponent<MetaDataComponent>(grid.Owner).EntityLifeStage) >= EntityLifeStage.Deleted));
});
}
}

4
Robust.UnitTesting/Shared/Map/GridFixtures_Tests.cs
View File

@@ -32,8 +32,8 @@ namespace Robust.UnitTesting.Shared.Map
var grid = mapManager.CreateGrid(mapId);
// Should be nothing if grid empty
Assert.That(entManager.TryGetComponent(grid.GridEntityId, out PhysicsComponent? gridBody));
Assert.That(entManager.TryGetComponent(grid.GridEntityId, out FixturesComponent? manager));
Assert.That(entManager.TryGetComponent(grid.Owner, out PhysicsComponent? gridBody));
Assert.That(entManager.TryGetComponent(grid.Owner, out FixturesComponent? manager));
Assert.That(manager!.FixtureCount, Is.EqualTo(0));
Assert.That(gridBody!.BodyType, Is.EqualTo(BodyType.Static));

4
Robust.UnitTesting/Shared/Map/GridRotation_Tests.cs
View File

@@ -30,7 +30,7 @@ namespace Robust.UnitTesting.Shared.Map
{
var mapId = mapMan.CreateMap();
var grid = mapMan.CreateGrid(mapId);
var gridEnt = grid.GridEntityId;
var gridEnt = grid.Owner;
var coordinates = new EntityCoordinates(gridEnt, new Vector2(10, 0));
// if no rotation and 0,0 position should just be the same coordinate.
@@ -68,7 +68,7 @@ namespace Robust.UnitTesting.Shared.Map
{
var mapId = mapMan.CreateMap();
var grid = mapMan.CreateGrid(mapId);
var gridEnt = grid.GridEntityId;
var gridEnt = grid.Owner;
/* Test for map chunk rotations */
var tile = new Tile(1);

14
Robust.UnitTesting/Shared/Map/GridSplit_Tests.cs
View File

@@ -115,9 +115,9 @@ public sealed class GridSplit_Tests
Assert.That(mapManager.GetAllMapGrids(mapId).Count(), Is.EqualTo(1));
var dummy = entManager.SpawnEntity(null, new EntityCoordinates(grid.GridEntityId, new Vector2(3.5f, 0.5f)));
var dummy = entManager.SpawnEntity(null, new EntityCoordinates(grid.Owner, new Vector2(3.5f, 0.5f)));
var dummyXform = entManager.GetComponent<TransformComponent>(dummy);
var anchored = entManager.SpawnEntity(null, new EntityCoordinates(grid.GridEntityId, new Vector2(3.5f, 0.5f)));
var anchored = entManager.SpawnEntity(null, new EntityCoordinates(grid.Owner, new Vector2(3.5f, 0.5f)));
var anchoredXform = entManager.GetComponent<TransformComponent>(anchored);
anchoredXform.Anchored = true;
Assert.That(anchoredXform.Anchored);
@@ -126,18 +126,18 @@ public sealed class GridSplit_Tests
Assert.That(mapManager.GetAllMapGrids(mapId).Count(), Is.EqualTo(2));
var newGrid = mapManager.GetAllMapGrids(mapId).Last();
var newGridXform = entManager.GetComponent<TransformComponent>(newGrid.GridEntityId);
var newGridXform = entManager.GetComponent<TransformComponent>(newGrid.Owner);
Assert.Multiple(() =>
{
// Assertions baby
Assert.That(anchoredXform.Anchored);
Assert.That(anchoredXform.ParentUid, Is.EqualTo(newGrid.GridEntityId));
Assert.That(anchoredXform.GridUid, Is.EqualTo(newGrid.GridEntityId));
Assert.That(anchoredXform.ParentUid, Is.EqualTo(newGrid.Owner));
Assert.That(anchoredXform.GridUid, Is.EqualTo(newGrid.Owner));
Assert.That(newGridXform._children, Does.Contain(anchored));
Assert.That(dummyXform.ParentUid, Is.EqualTo(newGrid.GridEntityId));
Assert.That(dummyXform.GridUid, Is.EqualTo(newGrid.GridEntityId));
Assert.That(dummyXform.ParentUid, Is.EqualTo(newGrid.Owner));
Assert.That(dummyXform.GridUid, Is.EqualTo(newGrid.Owner));
Assert.That(newGridXform._children, Does.Contain(dummy));
});
mapManager.DeleteMap(mapId);

8
Robust.UnitTesting/Shared/Map/MapGrid_Tests.cs
View File

@@ -39,7 +39,7 @@ namespace Robust.UnitTesting.Shared.Map
Assert.That(grid.ChunkCount, Is.EqualTo(1));
Assert.That(grid.GetMapChunks().Keys.ToList()[0], Is.EqualTo(new Vector2i(-2, -1)));
Assert.That(result, Is.EqualTo(new TileRef(grid.GridEntityId, new Vector2i(-9,-1), new Tile(1, (TileRenderFlag)1, 1))));
Assert.That(result, Is.EqualTo(new TileRef(grid.Owner, new Vector2i(-9,-1), new Tile(1, (TileRenderFlag)1, 1))));
}
/// <summary>
@@ -53,7 +53,7 @@ namespace Robust.UnitTesting.Shared.Map
var mapMan = sim.Resolve<IMapManager>();
var mapId = mapMan.CreateMap();
var grid = mapMan.CreateGrid(mapId, 8);
var gridXform = entMan.GetComponent<TransformComponent>(grid.GridEntityId);
var gridXform = entMan.GetComponent<TransformComponent>(grid.Owner);
gridXform.WorldPosition = new Vector2(3, 5);
grid.SetTile(new Vector2i(-1, -2), new Tile(1));
@@ -79,7 +79,7 @@ namespace Robust.UnitTesting.Shared.Map
var mapMan = sim.Resolve<IMapManager>();
var mapId = mapMan.CreateMap();
var grid = mapMan.CreateGrid(mapId, 8);
var gridXform = entMan.GetComponent<TransformComponent>(grid.GridEntityId);
var gridXform = entMan.GetComponent<TransformComponent>(grid.Owner);
gridXform.WorldPosition = new Vector2(3, 5);
@@ -157,7 +157,7 @@ namespace Robust.UnitTesting.Shared.Map
Assert.That(foundTile, Is.True);
Assert.That(grid.ChunkCount, Is.EqualTo(1));
Assert.That(grid.GetMapChunks().Keys.ToList()[0], Is.EqualTo(new Vector2i(-2, -1)));
Assert.That(tileRef, Is.EqualTo(new TileRef(grid.GridEntityId, new Vector2i(-9, -1), new Tile(1, (TileRenderFlag)1, 1))));
Assert.That(tileRef, Is.EqualTo(new TileRef(grid.Owner, new Vector2i(-9, -1), new Tile(1, (TileRenderFlag)1, 1))));
}
[Test]

2
Robust.UnitTesting/Shared/Map/MapManager_Tests.cs
View File

@@ -52,7 +52,7 @@ namespace Robust.UnitTesting.Shared.Map
mapMan.Restart();
Assert.That(mapMan.GridExists(grid.GridEntityId), Is.False);
Assert.That(mapMan.GridExists(grid.Owner), Is.False);
}
/// <summary>

2
Robust.UnitTesting/Shared/Map/MapPauseTests.cs
View File

@@ -144,7 +144,7 @@ internal sealed class MapPauseTests
var newGrid = mapMan.CreateGrid(mapId);
// assert
var metaData = entMan.GetComponent<MetaDataComponent>(newGrid.GridEntityId);
var metaData = entMan.GetComponent<MetaDataComponent>(newGrid.Owner);
Assert.That(metaData.EntityPaused, Is.True);
}

22
Robust.UnitTesting/Shared/Physics/Broadphase_Test.cs
View File

@@ -33,15 +33,15 @@ public sealed class Broadphase_Test
var grid = mapManager.CreateGrid(mapId);
grid.SetTile(Vector2i.Zero, new Tile(1));
Assert.That(entManager.HasComponent<BroadphaseComponent>(grid.GridEntityId));
var broadphase = entManager.GetComponent<BroadphaseComponent>(grid.GridEntityId);
Assert.That(entManager.HasComponent<BroadphaseComponent>(grid.Owner));
var broadphase = entManager.GetComponent<BroadphaseComponent>(grid.Owner);
var ent = entManager.SpawnEntity(null, new EntityCoordinates(grid.GridEntityId, new Vector2(0.5f, 0.5f)));
var ent = entManager.SpawnEntity(null, new EntityCoordinates(grid.Owner, new Vector2(0.5f, 0.5f)));
var xform = entManager.GetComponent<TransformComponent>(ent);
Assert.That(broadphase.SundriesTree, Does.Contain(ent));
var broadphaseData = xform.Broadphase;
Assert.That(broadphaseData!.Value.Uid, Is.EqualTo(grid.GridEntityId));
Assert.That(broadphaseData!.Value.Uid, Is.EqualTo(grid.Owner));
xform.Coordinates = new EntityCoordinates(mapEnt, Vector2.One);
Assert.That(broadphase.SundriesTree, Does.Not.Contain(ent));
@@ -68,16 +68,16 @@ public sealed class Broadphase_Test
var grid = mapManager.CreateGrid(mapId);
grid.SetTile(Vector2i.Zero, new Tile(1));
Assert.That(entManager.HasComponent<BroadphaseComponent>(grid.GridEntityId));
var broadphase = entManager.GetComponent<BroadphaseComponent>(grid.GridEntityId);
Assert.That(entManager.HasComponent<BroadphaseComponent>(grid.Owner));
var broadphase = entManager.GetComponent<BroadphaseComponent>(grid.Owner);
var ent = entManager.SpawnEntity(null, new EntityCoordinates(grid.GridEntityId, new Vector2(0.5f, 0.5f)));
var ent = entManager.SpawnEntity(null, new EntityCoordinates(grid.Owner, new Vector2(0.5f, 0.5f)));
var physics = entManager.AddComponent<PhysicsComponent>(ent);
var xform = entManager.GetComponent<TransformComponent>(ent);
// If we're not collidable we're still on the sundries tree.
Assert.That(broadphase.StaticSundriesTree, Does.Contain(ent));
Assert.That(xform.Broadphase!.Value.Uid, Is.EqualTo(grid.GridEntityId));
Assert.That(xform.Broadphase!.Value.Uid, Is.EqualTo(grid.Owner));
var shape = new PolygonShape();
shape.SetAsBox(0.5f, 0.5f);
@@ -114,7 +114,7 @@ public sealed class Broadphase_Test
var mapId1 = mapManager.CreateMap();
var mapId2 = mapManager.CreateMap();
var grid = mapManager.CreateGrid(mapId1);
var xform = entManager.GetComponent<TransformComponent>(grid.GridEntityId);
var xform = entManager.GetComponent<TransformComponent>(grid.Owner);
grid.SetTile(Vector2i.Zero, new Tile(1));
var mapBroadphase1 = entManager.GetComponent<BroadphaseComponent>(mapManager.GetMapEntityId(mapId1));
@@ -147,12 +147,12 @@ public sealed class Broadphase_Test
var grid = mapManager.CreateGrid(mapId);
grid.SetTile(Vector2i.Zero, new Tile(1));
var gridBroadphase = entManager.GetComponent<BroadphaseComponent>(grid.GridEntityId);
var gridBroadphase = entManager.GetComponent<BroadphaseComponent>(grid.Owner);
var mapBroadphase = entManager.GetComponent<BroadphaseComponent>(mapManager.GetMapEntityId(mapId));
Assert.That(entManager.EntityQuery<BroadphaseComponent>(true).Count(), Is.EqualTo(2));
var parent = entManager.SpawnEntity(null, new EntityCoordinates(grid.GridEntityId, new Vector2(0.5f, 0.5f)));
var parent = entManager.SpawnEntity(null, new EntityCoordinates(grid.Owner, new Vector2(0.5f, 0.5f)));
var child1 = entManager.SpawnEntity(null, new EntityCoordinates(parent, Vector2.Zero));
var child1Xform = entManager.GetComponent<TransformComponent>(child1);

6
Robust.UnitTesting/Shared/Physics/CollisionWake_Test.cs
View File

@@ -59,9 +59,9 @@ namespace Robust.UnitTesting.Shared.Physics
xform = entManager.GetComponent<TransformComponent>(entityOne);
Assert.That(xform.ParentUid == mapManager.GetMapEntityId(mapId));
var entityTwo = entManager.SpawnEntity("CollisionWakeTestItem", new EntityCoordinates(grid.GridEntityId, new Vector2(0.5f, 0.5f)));
var entityTwo = entManager.SpawnEntity("CollisionWakeTestItem", new EntityCoordinates(grid.Owner, new Vector2(0.5f, 0.5f)));
entityTwoPhysics = entManager.GetComponent<PhysicsComponent>(entityTwo);
Assert.That(entManager.GetComponent<TransformComponent>(entityTwo).ParentUid == grid.GridEntityId);
Assert.That(entManager.GetComponent<TransformComponent>(entityTwo).ParentUid == grid.Owner);
});
@@ -74,7 +74,7 @@ namespace Robust.UnitTesting.Shared.Physics
Assert.That(entityOnePhysics.CanCollide, Is.EqualTo(true));
xform.LocalPosition = new Vector2(0.5f, 0.5f);
xform.AttachParent(grid.GridEntityId);
xform.AttachParent(grid.Owner);
// Entity 2 should immediately not be collidable on spawn
Assert.That(entityTwoPhysics.Awake, Is.EqualTo(false));

4
Robust.UnitTesting/Shared/Physics/GridDeletion_Test.cs
View File

@@ -38,7 +38,7 @@ public sealed class GridDeletion_Test : RobustIntegrationTest
mapId = mapManager.CreateMap();
grid = mapManager.CreateGrid(mapId);
physics = entManager.GetComponent<PhysicsComponent>(grid.GridEntityId);
physics = entManager.GetComponent<PhysicsComponent>(grid.Owner);
physSystem.SetBodyType(physics, BodyType.Dynamic);
physSystem.SetLinearVelocity(physics, new Vector2(50f, 0f));
Assert.That(physics.LinearVelocity.Length, NUnit.Framework.Is.GreaterThan(0f));
@@ -49,7 +49,7 @@ public sealed class GridDeletion_Test : RobustIntegrationTest
await server.WaitAssertion(() =>
{
Assert.That(physics.LinearVelocity.Length, NUnit.Framework.Is.GreaterThan(0f));
entManager.DeleteEntity(grid.GridEntityId);
entManager.DeleteEntity(grid.Owner);
// So if gridtree is fucky then this SHOULD throw.
foreach (var _ in mapManager.FindGridsIntersecting(mapId,

10
Robust.UnitTesting/Shared/Physics/GridMovement_Test.cs
View File

@@ -35,10 +35,10 @@ public sealed class GridMovement_Test : RobustIntegrationTest
// Setup 1 body on grid, 1 body off grid, and assert that it's all gucci.
grid.SetTile(Vector2i.Zero, new Tile(1));
var fixtures = entManager.GetComponent<FixturesComponent>(grid.GridEntityId);
var fixtures = entManager.GetComponent<FixturesComponent>(grid.Owner);
Assert.That(fixtures.FixtureCount, Is.EqualTo(1));
var onGrid = entManager.SpawnEntity(null, new EntityCoordinates(grid.GridEntityId, 0.5f, 0.5f ));
var onGrid = entManager.SpawnEntity(null, new EntityCoordinates(grid.Owner, 0.5f, 0.5f ));
var onGridBody = entManager.AddComponent<PhysicsComponent>(onGrid);
physSystem.SetBodyType(onGridBody, BodyType.Dynamic);
var shapeA = new PolygonShape();
@@ -46,7 +46,7 @@ public sealed class GridMovement_Test : RobustIntegrationTest
var fixtureA = fixtureSystem.CreateFixture(onGridBody, shapeA);
physSystem.SetCollisionMask(fixtureA, 1);
Assert.That(fixtureSystem.GetFixtureCount(onGrid), Is.EqualTo(1));
Assert.That(entManager.GetComponent<TransformComponent>(onGrid).ParentUid, Is.EqualTo(grid.GridEntityId));
Assert.That(entManager.GetComponent<TransformComponent>(onGrid).ParentUid, Is.EqualTo(grid.Owner));
physSystem.WakeBody(onGridBody);
var offGrid = entManager.SpawnEntity(null, new MapCoordinates(new Vector2(10f, 10f), mapId));
@@ -57,7 +57,7 @@ public sealed class GridMovement_Test : RobustIntegrationTest
var fixtureB = fixtureSystem.CreateFixture(offGridBody, shapeB);
physSystem.SetCollisionLayer(fixtureB, 1);
Assert.That(fixtureSystem.GetFixtureCount(offGrid), Is.EqualTo(1));
Assert.That(entManager.GetComponent<TransformComponent>(offGrid).ParentUid, Is.Not.EqualTo((grid.GridEntityId)));
Assert.That(entManager.GetComponent<TransformComponent>(offGrid).ParentUid, Is.Not.EqualTo((grid.Owner)));
physSystem.WakeBody(offGridBody);
// Alright just a quick validation then we start the actual damn test.
@@ -68,7 +68,7 @@ public sealed class GridMovement_Test : RobustIntegrationTest
Assert.That(onGridBody.ContactCount, Is.EqualTo(0));
// Alright now move the grid on top of the off grid body, run physics for a frame and see if they contact
entManager.GetComponent<TransformComponent>(grid.GridEntityId).LocalPosition = new Vector2(10f, 10f);
entManager.GetComponent<TransformComponent>(grid.Owner).LocalPosition = new Vector2(10f, 10f);
physicsMap.Step(0.001f, false);
Assert.That(onGridBody.ContactCount, Is.EqualTo(1));

14
Robust.UnitTesting/Shared/Physics/MapVelocity_Test.cs
View File

@@ -42,16 +42,16 @@ namespace Robust.UnitTesting.Shared.Physics
var grid = mapManager.CreateGrid(mapId);
var grid2 = mapManager.CreateGrid(mapId);
Assert.That(entityManager.TryGetComponent<PhysicsComponent>(grid.GridEntityId, out var gridPhysics));
Assert.That(entityManager.TryGetComponent<PhysicsComponent>(grid.Owner, out var gridPhysics));
physicsSys.SetBodyType(gridPhysics!, BodyType.Dynamic);
Vector2 offset = new(3, 4);
Vector2 expectedFinalVelocity = new Vector2(-4, 3) * 2 + Vector2.One;
var dummy = entityManager.SpawnEntity(DummyEntity, new EntityCoordinates(grid.GridEntityId, offset));
var dummy = entityManager.SpawnEntity(DummyEntity, new EntityCoordinates(grid.Owner, offset));
Assert.That(entityManager.TryGetComponent(dummy, out PhysicsComponent? body));
Assert.That(entityManager.TryGetComponent(dummy, out TransformComponent? xform));
xform!.AttachParent(grid.GridEntityId);
xform!.AttachParent(grid.Owner);
// Test Linear Velocities
physicsSys.SetLinearVelocity(gridPhysics!, Vector2.One);
@@ -80,7 +80,7 @@ namespace Robust.UnitTesting.Shared.Physics
Assert.That(velocities.Item2, Is.Approximately(angularVelocity, 1e-6));
// Check that velocity does not change when changing parent
xform.AttachParent(grid2.GridEntityId);
xform.AttachParent(grid2.Owner);
linearVelocity = physicsSys.GetMapLinearVelocity(dummy, body);
angularVelocity = physicsSys.GetMapAngularVelocity(dummy, body);
velocities = physicsSys.GetMapVelocities(dummy, body);
@@ -107,14 +107,14 @@ namespace Robust.UnitTesting.Shared.Physics
var mapId = mapManager.CreateMap();
var grid = mapManager.CreateGrid(mapId);
Assert.That(entityManager.TryGetComponent<PhysicsComponent>(grid.GridEntityId, out var gridPhysics));
Assert.That(entityManager.TryGetComponent<PhysicsComponent>(grid.Owner, out var gridPhysics));
physicsSys.SetBodyType(gridPhysics!, BodyType.Dynamic);
Vector2 offset1 = new(2, 0);
var dummy1 = entityManager.SpawnEntity(DummyEntity, new EntityCoordinates(grid.GridEntityId, offset1));
var dummy1 = entityManager.SpawnEntity(DummyEntity, new EntityCoordinates(grid.Owner, offset1));
Assert.That(entityManager.TryGetComponent(dummy1, out PhysicsComponent? body1));
Assert.That(entityManager.TryGetComponent(dummy1, out TransformComponent? xform1));
xform1!.AttachParent(grid.GridEntityId);
xform1!.AttachParent(grid.Owner);
// create another entity attached to the dummy1
Vector2 offset2 = new(-1, 0);