tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Converted everything to use collision and physics component interfaces.

Browse Source
This commit is contained in:
Acruid
2020-07-19 00:33:02 -07:00
parent ea94f4a182
commit c9374992a6
29 changed files with 75 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Content.Server/GameObjects/EntitySystems/MoverSystem.cs
View File

@@ -1,4 +1,4 @@
#nullable enable
#nullable enable
using Content.Server.GameObjects;
using Content.Server.GameObjects.Components;
using Content.Server.GameObjects.Components.Items.Storage;
@@ -66,8 +66,8 @@ namespace Content.Server.GameObjects.EntitySystems
}
var mover = entity.GetComponent<IMoverComponent>();
var physics = entity.GetComponent<PhysicsComponent>();
if (entity.TryGetComponent<CollidableComponent>(out var collider))
var physics = entity.GetComponent<IPhysicsComponent>();
if (entity.TryGetComponent<ICollidableComponent>(out var collider))
{
UpdateKinematics(entity.Transform, mover, physics, collider);
}
@@ -78,7 +78,7 @@ namespace Content.Server.GameObjects.EntitySystems
}
}
protected override void SetController(PhysicsComponent physics)
protected override void SetController(IPhysicsComponent physics)
{
physics.SetController<MoverController>();
}
@@ -98,7 +98,7 @@ namespace Content.Server.GameObjects.EntitySystems
ev.Entity.RemoveComponent<PlayerInputMoverComponent>();
}
if (ev.Entity.TryGetComponent(out PhysicsComponent physics))
if (ev.Entity.TryGetComponent(out IPhysicsComponent physics))
{
(physics.Controller as MoverController)?.StopMoving();
}