Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Changes resulting from merging Client and Server PhysicsComponent.

Browse Source
This commit is contained in:
Acruid
2020-07-01 12:03:19 -07:00
parent b807b9e7ee
commit f0561d8d95
14 changed files with 25 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Content.Shared/GameObjects/Components/Movement/SharedPlayerInputMoverComponent.cs
View File

@@ -144,10 +144,10 @@ namespace Content.Shared.GameObjects.Components.Movement
public override void OnAdd()
{
// This component requires that the entity has a PhysicsComponent.
if (!Owner.HasComponent<SharedPhysicsComponent>())
if (!Owner.HasComponent<PhysicsComponent>())
Logger.Error(
$"[ECS] {Owner.Prototype?.Name} - {nameof(SharedPlayerInputMoverComponent)} requires" +
$" {nameof(SharedPhysicsComponent)}. ");
$" {nameof(PhysicsComponent)}. ");
base.OnAdd();
}

7
Content.Shared/GameObjects/EntitySystems/SharedMoverSystem.cs
View File

@@ -1,4 +1,4 @@
using System.Diagnostics.CodeAnalysis;
using System.Diagnostics.CodeAnalysis;
using Content.Shared.GameObjects.Components.Movement;
using Content.Shared.Physics;
using Robust.Shared.Configuration;
@@ -13,7 +13,6 @@ using Robust.Shared.Interfaces.GameObjects.Components;
using Robust.Shared.Interfaces.Physics;
using Robust.Shared.IoC;
using Robust.Shared.Maths;
using Robust.Shared.Physics;
using Robust.Shared.Players;
#nullable enable
@@ -56,7 +55,7 @@ namespace Content.Shared.GameObjects.EntitySystems
}
protected void UpdateKinematics(ITransformComponent transform, IMoverComponent mover, SharedPhysicsComponent physics,
protected void UpdateKinematics(ITransformComponent transform, IMoverComponent mover, PhysicsComponent physics,
CollidableComponent? collider = null)
{
if (physics.Controller == null)
@@ -112,7 +111,7 @@ namespace Content.Shared.GameObjects.EntitySystems
}
protected abstract void SetController(SharedPhysicsComponent physics);
protected abstract void SetController(PhysicsComponent physics);
private bool IsAroundCollider(ITransformComponent transform, IMoverComponent mover,
CollidableComponent collider)

7
Content.Shared/Physics/MoverController.cs
View File

@@ -1,4 +1,5 @@
using Content.Shared.GameObjects.Components.Movement;
using Content.Shared.GameObjects.Components.Movement;
using Robust.Shared.GameObjects.Components;
using Robust.Shared.Interfaces.Physics;
using Robust.Shared.IoC;
using Robust.Shared.Maths;
@@ -9,7 +10,7 @@ namespace Content.Shared.Physics
public class MoverController : VirtualController
{
private Vector2 _velocity;
private SharedPhysicsComponent _component = null;
private PhysicsComponent _component = null;
public Vector2 Velocity
{
@@ -17,7 +18,7 @@ namespace Content.Shared.Physics
set => _velocity = value;
}
public override SharedPhysicsComponent ControlledComponent
public override PhysicsComponent ControlledComponent
{
set => _component = value;
}

5
Content.Shared/Physics/ThrowController.cs
View File

@@ -1,3 +1,4 @@
using Robust.Shared.GameObjects.Components;
using Robust.Shared.Interfaces.Physics;
using Robust.Shared.IoC;
using Robust.Shared.Maths;
@@ -9,7 +10,7 @@ namespace Content.Shared.Physics
public class ThrowController: VirtualController
{
private float _throwTime;
private SharedPhysicsComponent _component;
private PhysicsComponent _component;
public const float DefaultThrowTime = 0.25f;
@@ -19,7 +20,7 @@ namespace Content.Shared.Physics
set => _throwTime = value;
}
public override SharedPhysicsComponent ControlledComponent
public override PhysicsComponent ControlledComponent
{
set => _component = value;
}