space-wizards/RobustToolbox
1
0
Fork 0
mirror of https://github.com/space-wizards/RobustToolbox.git synced 2026-02-14 19:29:36 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into robust-client-CEF

Browse Source
This commit is contained in:
Vera Aguilera Puerto
2021-08-09 12:02:15 +02:00
parent d62a64029d d12a238ecc
commit 9f29bf6349
6 changed files with 24 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
Robust.Shared/GameObjects/Systems/EntityLookup.cs
View File

@@ -587,17 +587,24 @@ namespace Robust.Shared.GameObjects
private static Box2 GetWorldAABB(in IEntity ent)
{
Vector2 pos;
if (ent.Deleted)
{
pos = ent.Transform.WorldPosition;
return new Box2(pos, pos);
}
if (ent.TryGetContainerMan(out var manager))
{
return GetWorldAABB(manager.Owner);
}
var pos = ent.Transform.WorldPosition;
pos = ent.Transform.WorldPosition;
if (ent.Deleted || !ent.TryGetComponent(out ILookupWorldBox2Component? lookup))
return new Box2(pos, pos);
return lookup.GetWorldAABB(pos);
return ent.TryGetComponent(out ILookupWorldBox2Component? lookup) ?
lookup.GetWorldAABB(pos) :
new Box2(pos, pos);
}
#endregion

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

@@ -20,10 +20,6 @@ namespace Robust.UnitTesting.Client.GameObjects.Components
{
var sim = RobustServerSimulation
.NewSimulation()
.RegisterComponents(factory =>
{
factory.RegisterClass<ContainerManagerComponent>();
})
.InitializeInstance();
var mapManager = sim.Resolve<IMapManager>();

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

@@ -16,7 +16,6 @@ namespace Robust.UnitTesting.Server.GameObjects.Components
{
var sim = RobustServerSimulation
.NewSimulation()
.RegisterComponents(factory => { factory.RegisterClass<ContainerManagerComponent>(); })
.RegisterPrototypes(protoMan => protoMan.LoadString(PROTOTYPES))
.InitializeInstance();

2
Robust.UnitTesting/Server/RobustServerSimulation.cs
View File

@@ -11,6 +11,7 @@ using Robust.Shared;
using Robust.Shared.Asynchronous;
using Robust.Shared.Configuration;
using Robust.Shared.Console;
using Robust.Shared.Containers;
using Robust.Shared.ContentPack;
using Robust.Shared.Exceptions;
using Robust.Shared.GameObjects;
@@ -229,6 +230,7 @@ namespace Robust.UnitTesting.Server
compFactory.RegisterClass<PhysicsComponent>();
compFactory.RegisterClass<EntityLookupComponent>();
compFactory.RegisterClass<BroadphaseComponent>();
compFactory.RegisterClass<ContainerManagerComponent>();
_regDelegate?.Invoke(compFactory);

14
Robust.UnitTesting/Shared/GameObjects/ContainerTests.cs
View File

@@ -99,12 +99,14 @@ namespace Robust.UnitTesting.Shared.GameObjects
}
var container = containerManagerComp.GetContainer("dummy");
Assert.That(container.ContainedEntities.Count, Is.EqualTo(0));
Assert.That(container.ExpectedEntities.Count, Is.EqualTo(1));
Assert.That(container.ContainedEntities.Count, Is.EqualTo(1));
Assert.That(container.ExpectedEntities.Count, Is.EqualTo(0));
/*
var containerSystem = IoCManager.Resolve<IEntitySystemManager>().GetEntitySystem<ContainerSystem>();
Assert.That(containerSystem.ExpectedEntities.ContainsKey(itemUid));
Assert.That(containerSystem.ExpectedEntities.Count, Is.EqualTo(1));
*/
});
await server.WaitAssertion(() =>
@@ -224,12 +226,14 @@ namespace Robust.UnitTesting.Shared.GameObjects
}
var container = containerManagerComp.GetContainer("dummy");
Assert.That(container.ContainedEntities.Count, Is.EqualTo(0));
Assert.That(container.ExpectedEntities.Count, Is.EqualTo(1));
Assert.That(container.ContainedEntities.Count, Is.EqualTo(1));
Assert.That(container.ExpectedEntities.Count, Is.EqualTo(0));
/*
var containerSystem = IoCManager.Resolve<IEntitySystemManager>().GetEntitySystem<ContainerSystem>();
Assert.That(containerSystem.ExpectedEntities.ContainsKey(itemUid));
Assert.That(containerSystem.ExpectedEntities.Count, Is.EqualTo(1));
*/
});
await server.WaitAssertion(() =>
@@ -261,9 +265,11 @@ namespace Robust.UnitTesting.Shared.GameObjects
Assert.That(container.ContainedEntities.Count, Is.EqualTo(0));
Assert.That(container.ExpectedEntities.Count, Is.EqualTo(0));
/*
var containerSystem = IoCManager.Resolve<IEntitySystemManager>().GetEntitySystem<ContainerSystem>();
Assert.That(!containerSystem.ExpectedEntities.ContainsKey(itemUid));
Assert.That(containerSystem.ExpectedEntities.Count, Is.EqualTo(0));
*/
});
}

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

@@ -31,10 +31,6 @@ namespace Robust.UnitTesting.Shared.GameObjects.Systems
{
var sim = RobustServerSimulation
.NewSimulation()
.RegisterComponents(factory =>
{
factory.RegisterClass<ContainerManagerComponent>();
})
.RegisterPrototypes(f=>
{
f.LoadString(Prototypes);