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

Inline AddComponent

Browse Source
This commit is contained in:
Vera Aguilera Puerto
2021-12-03 11:33:40 +01:00
parent bbf5e92f32
commit 19f50d60c9
16 changed files with 78 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Robust.Client/Physics/PhysicsSystem.cs
View File

@@ -35,7 +35,8 @@ namespace Robust.Client.Physics
protected override void HandleMapCreated(object? sender, MapEventArgs eventArgs)
{
if (eventArgs.Map == MapId.Nullspace) return;
MapManager.GetMapEntity(eventArgs.Map).AddComponent<PhysicsMapComponent>();
IEntity tempQualifier = MapManager.GetMapEntity(eventArgs.Map);
IoCManager.Resolve<IEntityManager>().AddComponent<PhysicsMapComponent>(tempQualifier);
}
}
}

2
Robust.Client/Player/LocalPlayer.cs
View File

@@ -68,7 +68,7 @@ namespace Robust.Client.Player
if (!ControlledEntity.TryGetComponent<EyeComponent>(out var eye))
{
eye = ControlledEntity.AddComponent<EyeComponent>();
eye = IoCManager.Resolve<IEntityManager>().AddComponent<EyeComponent>(ControlledEntity);
}
eye.Current = true;

22
Robust.Server/Console/Commands/TestbedCommand.cs
View File

@@ -120,7 +120,8 @@ namespace Robust.Server.Console.Commands
{
var entityManager = IoCManager.Resolve<IEntityManager>();
var ground = entityManager.SpawnEntity(null, new MapCoordinates(0, 0, mapId)).AddComponent<PhysicsComponent>();
IEntity tempQualifier = entityManager.SpawnEntity(null, new MapCoordinates(0, 0, mapId));
var ground = IoCManager.Resolve<IEntityManager>().AddComponent<PhysicsComponent>(tempQualifier);
var horizontal = new EdgeShape(new Vector2(-20, 0), new Vector2(20, 0));
var horizontalFixture = new Fixture(ground, horizontal)
@@ -159,8 +160,9 @@ namespace Robust.Server.Console.Commands
{
var x = 0.0f;
var box = entityManager.SpawnEntity(null,
new MapCoordinates(new Vector2(xs[j] + x, 0.55f + 2.1f * i), mapId)).AddComponent<PhysicsComponent>();
IEntity tempQualifier1 = entityManager.SpawnEntity(null,
new MapCoordinates(new Vector2(xs[j] + x, 0.55f + 2.1f * i), mapId));
var box = IoCManager.Resolve<IEntityManager>().AddComponent<PhysicsComponent>(tempQualifier1);
box.BodyType = BodyType.Dynamic;
shape = new PolygonShape();
@@ -184,7 +186,8 @@ namespace Robust.Server.Console.Commands
{
var entityManager = IoCManager.Resolve<IEntityManager>();
var ground = entityManager.SpawnEntity(null, new MapCoordinates(0, 0, mapId)).AddComponent<PhysicsComponent>();
IEntity tempQualifier = entityManager.SpawnEntity(null, new MapCoordinates(0, 0, mapId));
var ground = IoCManager.Resolve<IEntityManager>().AddComponent<PhysicsComponent>(tempQualifier);
var horizontal = new EdgeShape(new Vector2(-20, 0), new Vector2(20, 0));
var horizontalFixture = new Fixture(ground, horizontal)
@@ -222,8 +225,9 @@ namespace Robust.Server.Console.Commands
{
var x = 0.0f;
var box = entityManager.SpawnEntity(null,
new MapCoordinates(new Vector2(xs[j] + x, 0.55f + 2.1f * i), mapId)).AddComponent<PhysicsComponent>();
IEntity tempQualifier1 = entityManager.SpawnEntity(null,
new MapCoordinates(new Vector2(xs[j] + x, 0.55f + 2.1f * i), mapId));
var box = IoCManager.Resolve<IEntityManager>().AddComponent<PhysicsComponent>(tempQualifier1);
box.BodyType = BodyType.Dynamic;
shape = new PhysShapeCircle {Radius = 0.5f};
@@ -248,7 +252,8 @@ namespace Robust.Server.Console.Commands
// Setup ground
var entityManager = IoCManager.Resolve<IEntityManager>();
var ground = entityManager.SpawnEntity(null, new MapCoordinates(0, 0, mapId)).AddComponent<PhysicsComponent>();
IEntity tempQualifier = entityManager.SpawnEntity(null, new MapCoordinates(0, 0, mapId));
var ground = IoCManager.Resolve<IEntityManager>().AddComponent<PhysicsComponent>(tempQualifier);
var horizontal = new EdgeShape(new Vector2(-40, 0), new Vector2(40, 0));
var horizontalFixture = new Fixture(ground, horizontal)
@@ -277,7 +282,8 @@ namespace Robust.Server.Console.Commands
for (var j = i; j < count; ++j)
{
var box = entityManager.SpawnEntity(null, new MapCoordinates(0, 0, mapId)).AddComponent<PhysicsComponent>();
IEntity tempQualifier1 = entityManager.SpawnEntity(null, new MapCoordinates(0, 0, mapId));
var box = IoCManager.Resolve<IEntityManager>().AddComponent<PhysicsComponent>(tempQualifier1);
box.BodyType = BodyType.Dynamic;
box.Owner.Transform.WorldPosition = y;
broadphase.CreateFixture(box,

3
Robust.Server/GameObjects/EntitySystems/PhysicsSystem.cs
View File

@@ -40,7 +40,8 @@ namespace Robust.Server.GameObjects
protected override void HandleMapCreated(object? sender, MapEventArgs eventArgs)
{
if (eventArgs.Map == MapId.Nullspace) return;
MapManager.GetMapEntity(eventArgs.Map).AddComponent<PhysicsMapComponent>();
IEntity tempQualifier = MapManager.GetMapEntity(eventArgs.Map);
IoCManager.Resolve<IEntityManager>().AddComponent<PhysicsMapComponent>(tempQualifier);
}
/// <inheritdoc />

2
Robust.Server/Maps/MapLoader.cs
View File

@@ -612,7 +612,7 @@ namespace Robust.Server.Maps
if (_loadOptions!.StoreMapUids)
{
var comp = entity.AddComponent<MapSaveIdComponent>();
var comp = IoCManager.Resolve<IEntityManager>().AddComponent<MapSaveIdComponent>(entity);
comp.Uid = uid;
}
}

2
Robust.Shared/Containers/ContainerHelpers.cs
View File

@@ -273,7 +273,7 @@ namespace Robust.Shared.Containers
where T : IContainer
{
if (!entity.TryGetComponent<IContainerManager>(out var containermanager))
containermanager = entity.AddComponent<ContainerManagerComponent>();
containermanager = IoCManager.Resolve<IEntityManager>().AddComponent<ContainerManagerComponent>(entity);
return containermanager.MakeContainer<T>(containerId);
}

9
Robust.Shared/GameObjects/ComponentExt.cs
View File

@@ -1,5 +1,6 @@
using System.Collections.Generic;
using JetBrains.Annotations;
using Robust.Shared.IoC;
using Robust.Shared.Log;
namespace Robust.Shared.GameObjects
@@ -22,7 +23,7 @@ namespace Robust.Shared.GameObjects
return true;
}
component = entity.AddComponent<T>();
component = IoCManager.Resolve<IEntityManager>().AddComponent<T>(entity);
return false;
}
@@ -40,7 +41,7 @@ namespace Robust.Shared.GameObjects
return component;
}
return entity.AddComponent<T>();
return IoCManager.Resolve<IEntityManager>().AddComponent<T>(entity);
}
/// <summary>
@@ -66,7 +67,7 @@ namespace Robust.Shared.GameObjects
Logger.Warning(warning);
component = entity.AddComponent<T>();
component = IoCManager.Resolve<IEntityManager>().AddComponent<T>(entity);
return false;
}
@@ -92,7 +93,7 @@ namespace Robust.Shared.GameObjects
Logger.Warning(warning);
return entity.AddComponent<T>();
return IoCManager.Resolve<IEntityManager>().AddComponent<T>(entity);
}
public static IComponent SetAndDirtyIfChanged<TValue>(

16
Robust.Shared/GameObjects/IEntity.cs
View File

@@ -64,22 +64,6 @@ namespace Robust.Shared.GameObjects
#region Components
/// <summary>
/// Public method to add a component to an entity.
/// Calls the component's onAdd method, which also adds it to the component manager.
/// </summary>
/// <param name="component">The component to add.</param>
public void AddComponent(Component component)
{
IoCManager.Resolve<IEntityManager>().AddComponent(this, component);
}
public T AddComponent<T>()
where T : Component, new()
{
return IoCManager.Resolve<IEntityManager>().AddComponent<T>(this);
}
public void RemoveComponent<T>()
{
IoCManager.Resolve<IEntityManager>().RemoveComponent<T>(Uid);

6
Robust.Shared/Map/MapManager.cs
View File

@@ -275,7 +275,7 @@ namespace Robust.Shared.Map
var newEnt = (IEntity) _entityManager.CreateEntityUninitialized(null, entityUid);
_mapEntities.Add(actualID, newEnt.Uid);
var mapComp = newEnt.AddComponent<MapComponent>();
var mapComp = IoCManager.Resolve<IEntityManager>().AddComponent<MapComponent>(newEnt);
mapComp.WorldMap = actualID;
_entityManager.InitializeComponents(newEnt.Uid);
_entityManager.StartComponents(newEnt.Uid);
@@ -354,7 +354,7 @@ namespace Robust.Shared.Map
// re-use or add map component
if (!newMapEntity.TryGetComponent(out MapComponent? mapComp))
{
mapComp = newMapEntity.AddComponent<MapComponent>();
mapComp = IoCManager.Resolve<IEntityManager>().AddComponent<MapComponent>(newMapEntity);
}
else
{
@@ -470,7 +470,7 @@ namespace Robust.Shared.Map
Logger.DebugS("map", $"Binding grid {actualID} to entity {grid.GridEntityId}");
var gridComp = gridEnt.AddComponent<MapGridComponent>();
var gridComp = IoCManager.Resolve<IEntityManager>().AddComponent<MapGridComponent>(gridEnt);
gridComp.GridIndex = grid.Index;
//TODO: This is a hack to get TransformComponent.MapId working before entity states

4
Robust.Shared/Prototypes/EntityPrototype.cs
View File

@@ -223,7 +223,7 @@ namespace Robust.Shared.Prototypes
var component = (Component) factory.GetComponent(name);
component.Owner = entity;
componentDependencyManager.OnComponentAdd(entity.Uid, component);
entity.AddComponent(component);
IoCManager.Resolve<IEntityManager>().AddComponent(entity, component);
}
// Update entity metadata
@@ -281,7 +281,7 @@ namespace Robust.Shared.Prototypes
{
var newComponent = (Component) factory.GetComponent(compName);
newComponent.Owner = entity;
entity.AddComponent(newComponent);
IoCManager.Resolve<IEntityManager>().AddComponent(entity, newComponent);
component = newComponent;
}

26
Robust.UnitTesting/Shared/GameObjects/ComponentDependencies_Tests.cs
View File

@@ -248,7 +248,7 @@ namespace Robust.UnitTesting.Shared.GameObjects
Assert.That(dummyThreeComp.TestOne, Is.Null);
// We add the TestOne component...
dummyThree.AddComponent<TestOneComponent>();
IoCManager.Resolve<IEntityManager>().AddComponent<TestOneComponent>(dummyThree);
// This dependency should be resolved now!
Assert.That(dummyThreeComp.TestOne, Is.Not.Null);
@@ -261,7 +261,7 @@ namespace Robust.UnitTesting.Shared.GameObjects
// This dependency should still be unresolved.
Assert.That(dummyOneComp.TestTwo, Is.Null);
dummyThree.AddComponent<TestTwoComponent>();
IoCManager.Resolve<IEntityManager>().AddComponent<TestTwoComponent>(dummyThree);
// And now it is resolved!
Assert.That(dummyOneComp.TestTwo, Is.Not.Null);
@@ -269,14 +269,14 @@ namespace Robust.UnitTesting.Shared.GameObjects
// TestFour should not be resolved.
Assert.That(dummyOneComp.TestFour, Is.Null);
dummyThree.AddComponent<TestFourComponent>();
IoCManager.Resolve<IEntityManager>().AddComponent<TestFourComponent>(dummyThree);
// TestFour should now be resolved
Assert.That(dummyOneComp.TestFour, Is.Not.Null);
var dummyFourComp = dummyOneComp.TestFour;
dummyThree.AddComponent<TestInterfaceComponent>();
IoCManager.Resolve<IEntityManager>().AddComponent<TestInterfaceComponent>(dummyThree);
// This dependency should now be resolved.
Assert.That(dummyFourComp!.TestInterface, Is.Not.Null);
@@ -340,14 +340,14 @@ namespace Robust.UnitTesting.Shared.GameObjects
var dummy = entityManager.CreateEntityUninitialized("dummy");
// First we add test one.
var testOne = dummy.AddComponent<TestOneComponent>();
var testOne = IoCManager.Resolve<IEntityManager>().AddComponent<TestOneComponent>(dummy);
// We check the dependencies are null.
Assert.That(testOne.TestTwo, Is.Null);
Assert.That(testOne.TestThree, Is.Null);
// We add test two.
var testTwo = dummy.AddComponent<TestTwoComponent>();
var testTwo = IoCManager.Resolve<IEntityManager>().AddComponent<TestTwoComponent>(dummy);
// Check that everything is in order.
Assert.That(testOne.TestTwo, Is.Not.Null);
@@ -361,7 +361,7 @@ namespace Robust.UnitTesting.Shared.GameObjects
Assert.That(testOne.TestTwo, Is.Null);
// We add test three.
var testThree = dummy.AddComponent<TestThreeComponent>();
var testThree = IoCManager.Resolve<IEntityManager>().AddComponent<TestThreeComponent>(dummy);
// All should be in order again.
Assert.That(testOne.TestThree, Is.Not.Null);
@@ -381,8 +381,8 @@ namespace Robust.UnitTesting.Shared.GameObjects
IoCManager.Resolve<IEntityManager>().CullRemovedComponents();
// Re-add test one and two.
testOne = dummy.AddComponent<TestOneComponent>();
testTwo = dummy.AddComponent<TestTwoComponent>();
testOne = IoCManager.Resolve<IEntityManager>().AddComponent<TestOneComponent>(dummy);
testTwo = IoCManager.Resolve<IEntityManager>().AddComponent<TestTwoComponent>(dummy);
// All should be fine again!
Assert.That(testThree.TestOne, Is.Not.Null);
@@ -395,7 +395,7 @@ namespace Robust.UnitTesting.Shared.GameObjects
Assert.That(testTwo.TestTwo, Is.EqualTo(testTwo));
// Add test four.
dummy.AddComponent<TestFourComponent>();
IoCManager.Resolve<IEntityManager>().AddComponent<TestFourComponent>(dummy);
// TestFour should not be null, but TestInterface should be.
Assert.That(testOne.TestFour, Is.Not.Null);
@@ -482,11 +482,11 @@ namespace Robust.UnitTesting.Shared.GameObjects
{
var entityManager = IoCManager.Resolve<IEntityManager>();
var entity = entityManager.CreateEntityUninitialized("dummy");
var t1Comp = entity.AddComponent<TestOneComponent>();
var t1Comp = IoCManager.Resolve<IEntityManager>().AddComponent<TestOneComponent>(entity);
Assert.That(t1Comp.TestTwoIsAdded, Is.False);
entity.AddComponent<TestTwoComponent>();
IoCManager.Resolve<IEntityManager>().AddComponent<TestTwoComponent>(entity);
Assert.That(t1Comp.TestTwoIsAdded, Is.True);
@@ -502,7 +502,7 @@ namespace Robust.UnitTesting.Shared.GameObjects
var entity = entityManager.CreateEntityUninitialized("dummy");
try
{
var t7Comp = entity.AddComponent<TestSevenComponent>();
var t7Comp = IoCManager.Resolve<IEntityManager>().AddComponent<TestSevenComponent>(entity);
}
catch (ComponentDependencyInvalidMethodNameException invEx)
{

9
Robust.UnitTesting/Shared/GameObjects/EntityEventBusTests.RefDirectedEvents.cs
View File

@@ -1,6 +1,7 @@
using System;
using NUnit.Framework;
using Robust.Shared.GameObjects;
using Robust.Shared.IoC;
using Robust.Shared.Map;
using Robust.Shared.Reflection;
using Robust.Shared.Utility;
@@ -25,7 +26,7 @@ namespace Robust.UnitTesting.Shared.GameObjects
simulation.AddMap(map);
var entity = simulation.SpawnEntity(null, new MapCoordinates(0, 0, map));
entity.AddComponent<DummyComponent>();
IoCManager.Resolve<IEntityManager>().AddComponent<DummyComponent>(entity);
// Act.
var testEvent = new TestStructEvent {TestNumber = 5};
@@ -107,9 +108,9 @@ namespace Robust.UnitTesting.Shared.GameObjects
simulation.AddMap(map);
var entity = simulation.SpawnEntity(null, new MapCoordinates(0, 0, map));
entity.AddComponent<OrderComponentA>();
entity.AddComponent<OrderComponentB>();
entity.AddComponent<OrderComponentC>();
IoCManager.Resolve<IEntityManager>().AddComponent<OrderComponentA>(entity);
IoCManager.Resolve<IEntityManager>().AddComponent<OrderComponentB>(entity);
IoCManager.Resolve<IEntityManager>().AddComponent<OrderComponentC>(entity);
// Act.
var testEvent = new TestStructEvent {TestNumber = 5};

21
Robust.UnitTesting/Shared/GameObjects/EntityManager_Components_Tests.cs
View File

@@ -2,6 +2,7 @@ using System.Linq;
using NUnit.Framework;
using Robust.Shared.GameObjects;
using Robust.Shared.GameStates;
using Robust.Shared.IoC;
using Robust.Shared.Map;
using Robust.Shared.Maths;
using Robust.UnitTesting.Server;
@@ -80,7 +81,7 @@ namespace Robust.UnitTesting.Shared.GameObjects
var sim = SimulationFactory();
var entMan = sim.Resolve<IEntityManager>();
var entity = entMan.SpawnEntity(null, DefaultCoords);
entity.AddComponent<DummyComponent>();
IoCManager.Resolve<IEntityManager>().AddComponent<DummyComponent>(entity);
// Act
var result = entMan.HasComponent<DummyComponent>(entity.Uid);
@@ -100,7 +101,7 @@ namespace Robust.UnitTesting.Shared.GameObjects
var entMan = sim.Resolve<IEntityManager>();
var entity = entMan.SpawnEntity(null, DefaultCoords);
entity.AddComponent<DummyComponent>();
IoCManager.Resolve<IEntityManager>().AddComponent<DummyComponent>(entity);
// Act
var result = entMan.HasComponent(entity.Uid, netId.Value);
@@ -120,7 +121,7 @@ namespace Robust.UnitTesting.Shared.GameObjects
var entMan = sim.Resolve<IEntityManager>();
var entity = entMan.SpawnEntity(null, DefaultCoords);
var component = entity.AddComponent<DummyComponent>();
var component = IoCManager.Resolve<IEntityManager>().AddComponent<DummyComponent>(entity);
// Act
var result = entMan.GetComponent(entity.Uid, netId.Value);
@@ -136,7 +137,7 @@ namespace Robust.UnitTesting.Shared.GameObjects
var sim = SimulationFactory();
var entMan = sim.Resolve<IEntityManager>();
var entity = entMan.SpawnEntity(null, DefaultCoords);
var component = entity.AddComponent<DummyComponent>();
var component = IoCManager.Resolve<IEntityManager>().AddComponent<DummyComponent>(entity);
// Act
var result = entMan.TryGetComponent<DummyComponent>(entity.Uid, out var comp);
@@ -157,7 +158,7 @@ namespace Robust.UnitTesting.Shared.GameObjects
var entMan = sim.Resolve<IEntityManager>();
var entity = entMan.SpawnEntity(null, DefaultCoords);
var component = entity.AddComponent<DummyComponent>();
var component = IoCManager.Resolve<IEntityManager>().AddComponent<DummyComponent>(entity);
// Act
var result = entMan.TryGetComponent(entity.Uid, netId.Value, out var comp);
@@ -174,7 +175,7 @@ namespace Robust.UnitTesting.Shared.GameObjects
var sim = SimulationFactory();
var entMan = sim.Resolve<IEntityManager>();
var entity = entMan.SpawnEntity(null, DefaultCoords);
var component = entity.AddComponent<DummyComponent>();
var component = IoCManager.Resolve<IEntityManager>().AddComponent<DummyComponent>(entity);
// Act
entMan.RemoveComponent<DummyComponent>(entity.Uid);
@@ -195,7 +196,7 @@ namespace Robust.UnitTesting.Shared.GameObjects
var entMan = sim.Resolve<IEntityManager>();
var entity = entMan.SpawnEntity(null, DefaultCoords);
var component = entity.AddComponent<DummyComponent>();
var component = IoCManager.Resolve<IEntityManager>().AddComponent<DummyComponent>(entity);
// Act
entMan.RemoveComponent(entity.Uid, netId.Value);
@@ -212,7 +213,7 @@ namespace Robust.UnitTesting.Shared.GameObjects
var sim = SimulationFactory();
var entMan = sim.Resolve<IEntityManager>();
var entity = entMan.SpawnEntity(null, DefaultCoords);
var component = entity.AddComponent<DummyComponent>();
var component = IoCManager.Resolve<IEntityManager>().AddComponent<DummyComponent>(entity);
// Act
var result = entMan.GetComponents<DummyComponent>(entity.Uid);
@@ -230,7 +231,7 @@ namespace Robust.UnitTesting.Shared.GameObjects
var sim = SimulationFactory();
var entMan = sim.Resolve<IEntityManager>();
var entity = entMan.SpawnEntity(null, DefaultCoords);
var component = entity.AddComponent<DummyComponent>();
var component = IoCManager.Resolve<IEntityManager>().AddComponent<DummyComponent>(entity);
// Act
var result = entMan.EntityQuery<DummyComponent>(true);
@@ -248,7 +249,7 @@ namespace Robust.UnitTesting.Shared.GameObjects
var sim = SimulationFactory();
var entMan = sim.Resolve<IEntityManager>();
var entity = entMan.SpawnEntity(null, DefaultCoords);
var component = entity.AddComponent<DummyComponent>();
var component = IoCManager.Resolve<IEntityManager>().AddComponent<DummyComponent>(entity);
// Act
var result = entMan.GetComponents(entity.Uid);

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

@@ -3,6 +3,7 @@ using System.Linq;
using NUnit.Framework;
using Robust.Shared.Containers;
using Robust.Shared.GameObjects;
using Robust.Shared.IoC;
using Robust.Shared.Map;
using Robust.Shared.Maths;
using Robust.Shared.Physics;
@@ -307,7 +308,7 @@ namespace Robust.UnitTesting.Shared.GameObjects.Systems
// Act
var gridEnt = entMan.GetEntity(grid.GridEntityId); // we purposefully use the grid as container so parent stays the same, reparent will unanchor
var containerMan = gridEnt.AddComponent<ContainerManagerComponent>();
var containerMan = IoCManager.Resolve<IEntityManager>().AddComponent<ContainerManagerComponent>(gridEnt);
var container = containerMan.MakeContainer<Container>("TestContainer");
container.Insert(ent1);
@@ -335,7 +336,7 @@ namespace Robust.UnitTesting.Shared.GameObjects.Systems
// Act
// assumed default body is Dynamic
var physComp = ent1.AddComponent<PhysicsComponent>();
var physComp = IoCManager.Resolve<IEntityManager>().AddComponent<PhysicsComponent>(ent1);
Assert.That(physComp.BodyType, Is.EqualTo(BodyType.Static));
}
@@ -357,7 +358,7 @@ namespace Robust.UnitTesting.Shared.GameObjects.Systems
grid.SetTile(grid.TileIndicesFor(coordinates), new Tile(1));
var ent1 = entMan.SpawnEntity(null, coordinates);
var physComp = ent1.AddComponent<PhysicsComponent>();
var physComp = IoCManager.Resolve<IEntityManager>().AddComponent<PhysicsComponent>(ent1);
physComp.BodyType = BodyType.Dynamic;
// Act
@@ -380,7 +381,7 @@ namespace Robust.UnitTesting.Shared.GameObjects.Systems
var ent1 = entMan.SpawnEntity(null, new MapCoordinates(new Vector2(7, 7), TestMapId));
var tileIndices = grid.TileIndicesFor(ent1.Transform.Coordinates);
grid.SetTile(tileIndices, new Tile(1));
var physComp = ent1.AddComponent<PhysicsComponent>();
var physComp = IoCManager.Resolve<IEntityManager>().AddComponent<PhysicsComponent>(ent1);
ent1.Transform.Anchored = true;
// Act
@@ -426,7 +427,7 @@ namespace Robust.UnitTesting.Shared.GameObjects.Systems
grid.SetTile(tileIndices, new Tile(1));
var gridEnt = entMan.GetEntity(grid.GridEntityId);
var containerMan = gridEnt.AddComponent<ContainerManagerComponent>();
var containerMan = IoCManager.Resolve<IEntityManager>().AddComponent<ContainerManagerComponent>(gridEnt);
var container = containerMan.MakeContainer<Container>("TestContainer");
container.Insert(ent1);

3
Robust.UnitTesting/Shared/Physics/PhysicsComponent_Test.cs
View File

@@ -2,6 +2,7 @@ using System.Collections.Generic;
using System.Threading.Tasks;
using NUnit.Framework;
using Robust.Shared.GameObjects;
using Robust.Shared.IoC;
using Robust.Shared.Map;
using Robust.Shared.Maths;
using Robust.Shared.Physics;
@@ -36,7 +37,7 @@ namespace Robust.UnitTesting.Shared.Physics
await _server.WaitAssertion(() =>
{
var boxEnt = entManager.SpawnEntity(null, new MapCoordinates(Vector2.Zero, new MapId(1)));
var box = boxEnt.AddComponent<PhysicsComponent>();
var box = IoCManager.Resolve<IEntityManager>().AddComponent<PhysicsComponent>(boxEnt);
var poly = new PolygonShape();
poly.SetAsBox(0.5f, 0.5f);
var fixture = fixtureSystem.CreateFixture(box, poly);

16
Robust.UnitTesting/Shared/Physics/Stack_Test.cs
View File

@@ -63,7 +63,8 @@ namespace Robust.UnitTesting.Shared.Physics
mapManager.GetMapEntity(mapId).GetComponent<SharedPhysicsMapComponent>().Gravity = new Vector2(0, -9.8f);
var ground = entityManager.SpawnEntity(null, new MapCoordinates(0, 0, mapId)).AddComponent<PhysicsComponent>();
IEntity tempQualifier = entityManager.SpawnEntity(null, new MapCoordinates(0, 0, mapId));
var ground = IoCManager.Resolve<IEntityManager>().AddComponent<PhysicsComponent>(tempQualifier);
var horizontal = new EdgeShape(new Vector2(-20, 0), new Vector2(20, 0));
var horizontalFixture = new Fixture(ground, horizontal)
@@ -96,8 +97,9 @@ namespace Robust.UnitTesting.Shared.Physics
{
var x = 0.0f;
var box = entityManager.SpawnEntity(null,
new MapCoordinates(new Vector2(xs[j] + x, 0.55f + 2.1f * i), mapId)).AddComponent<PhysicsComponent>();
IEntity tempQualifier1 = entityManager.SpawnEntity(null,
new MapCoordinates(new Vector2(xs[j] + x, 0.55f + 2.1f * i), mapId));
var box = IoCManager.Resolve<IEntityManager>().AddComponent<PhysicsComponent>(tempQualifier1);
box.BodyType = BodyType.Dynamic;
var poly = new PolygonShape(0.001f);
@@ -177,7 +179,8 @@ namespace Robust.UnitTesting.Shared.Physics
mapId = mapManager.CreateMap();
mapManager.GetMapEntity(mapId).GetComponent<SharedPhysicsMapComponent>().Gravity = new Vector2(0, -9.8f);
var ground = entityManager.SpawnEntity(null, new MapCoordinates(0, 0, mapId)).AddComponent<PhysicsComponent>();
IEntity tempQualifier = entityManager.SpawnEntity(null, new MapCoordinates(0, 0, mapId));
var ground = IoCManager.Resolve<IEntityManager>().AddComponent<PhysicsComponent>(tempQualifier);
var horizontal = new EdgeShape(new Vector2(-20, 0), new Vector2(20, 0));
var horizontalFixture = new Fixture(ground, horizontal)
@@ -212,8 +215,9 @@ namespace Robust.UnitTesting.Shared.Physics
{
var x = 0.0f;
var circle = entityManager.SpawnEntity(null,
new MapCoordinates(new Vector2(xs[j] + x, 0.55f + 2.1f * i), mapId)).AddComponent<PhysicsComponent>();
IEntity tempQualifier1 = entityManager.SpawnEntity(null,
new MapCoordinates(new Vector2(xs[j] + x, 0.55f + 2.1f * i), mapId));
var circle = IoCManager.Resolve<IEntityManager>().AddComponent<PhysicsComponent>(tempQualifier1);
circle.LinearDamping = 0.05f;
circle.BodyType = BodyType.Dynamic;