tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests 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

6
Content.Client/GameObjects/EntitySystems/MoverSystem.cs
View File

@@ -1,13 +1,11 @@
using Content.Shared.GameObjects.Components.Movement; using Content.Shared.GameObjects.Components.Movement;
using Content.Shared.GameObjects.EntitySystems; using Content.Shared.GameObjects.EntitySystems;
using Content.Shared.Physics; using Content.Shared.Physics;
using JetBrains.Annotations; using JetBrains.Annotations;
using Robust.Client.GameObjects;
using Robust.Client.Physics; using Robust.Client.Physics;
using Robust.Client.Player; using Robust.Client.Player;
using Robust.Shared.GameObjects.Components; using Robust.Shared.GameObjects.Components;
using Robust.Shared.IoC; using Robust.Shared.IoC;
using Robust.Shared.Physics;
#nullable enable #nullable enable
@@ -46,7 +44,7 @@ namespace Content.Client.GameObjects.EntitySystems
FrameUpdate(frameTime); FrameUpdate(frameTime);
} }
protected override void SetController(SharedPhysicsComponent physics) protected override void SetController(PhysicsComponent physics)
{ {
((PhysicsComponent)physics).SetController<MoverController>(); ((PhysicsComponent)physics).SetController<MoverController>();
} }

9
Content.Server/GameObjects/Components/AnchorableComponent.cs
View File

@@ -1,13 +1,8 @@
using Content.Server.GameObjects.Components.Interactable; using Content.Server.GameObjects.Components.Interactable;
using Content.Server.GameObjects.EntitySystems; using Content.Server.GameObjects.EntitySystems;
using Content.Shared.GameObjects.Components.Interactable; using Content.Shared.GameObjects.Components.Interactable;
using Robust.Server.GameObjects;
using Robust.Server.GameObjects.EntitySystems;
using Robust.Shared.GameObjects; using Robust.Shared.GameObjects;
using Robust.Shared.GameObjects.Systems; using Robust.Shared.GameObjects.Components;
using Robust.Shared.Interfaces.GameObjects;
using Robust.Shared.IoC;
using Robust.Shared.Utility;
namespace Content.Server.GameObjects.Components namespace Content.Server.GameObjects.Components
{ {

2
Content.Server/GameObjects/Components/GUI/ServerHandsComponent.cs
View File

@@ -10,8 +10,8 @@ using Content.Shared.GameObjects;
using Robust.Server.GameObjects; using Robust.Server.GameObjects;
using Robust.Server.GameObjects.Components.Container; using Robust.Server.GameObjects.Components.Container;
using Robust.Server.GameObjects.EntitySystemMessages; using Robust.Server.GameObjects.EntitySystemMessages;
using Robust.Server.Interfaces.Player;
using Robust.Shared.GameObjects; using Robust.Shared.GameObjects;
using Robust.Shared.GameObjects.Components;
using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.Interfaces.GameObjects;
using Robust.Shared.Interfaces.Network; using Robust.Shared.Interfaces.Network;
using Robust.Shared.IoC; using Robust.Shared.IoC;

13
Content.Server/GameObjects/Components/Items/Storage/ItemComponent.cs
View File

@@ -1,32 +1,21 @@
using System; using Content.Server.GameObjects.EntitySystems;
using Content.Server.GameObjects.Components;
using Content.Server.GameObjects.Components.Destructible;
using Content.Server.GameObjects.EntitySystems;
using Content.Server.Interfaces.GameObjects; using Content.Server.Interfaces.GameObjects;
using Content.Server.Throw; using Content.Server.Throw;
using Content.Server.Utility; using Content.Server.Utility;
using Content.Shared.GameObjects; using Content.Shared.GameObjects;
using Content.Shared.GameObjects.Components.Items; using Content.Shared.GameObjects.Components.Items;
using Content.Shared.GameObjects.EntitySystems; using Content.Shared.GameObjects.EntitySystems;
using Content.Shared.Physics;
using Robust.Server.GameObjects;
using Robust.Server.Interfaces.GameObjects; using Robust.Server.Interfaces.GameObjects;
using Robust.Shared.Containers; using Robust.Shared.Containers;
using Robust.Shared.GameObjects; using Robust.Shared.GameObjects;
using Robust.Shared.GameObjects.Components; using Robust.Shared.GameObjects.Components;
using Robust.Shared.GameObjects.Systems;
using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.Interfaces.GameObjects;
using Robust.Shared.Interfaces.GameObjects.Components;
using Robust.Shared.Interfaces.Map; using Robust.Shared.Interfaces.Map;
using Robust.Shared.Interfaces.Physics;
using Robust.Shared.Interfaces.Random; using Robust.Shared.Interfaces.Random;
using Robust.Shared.Interfaces.Timing;
using Robust.Shared.IoC; using Robust.Shared.IoC;
using Robust.Shared.Maths; using Robust.Shared.Maths;
using Robust.Shared.Physics;
using Robust.Shared.Random; using Robust.Shared.Random;
using Robust.Shared.Serialization; using Robust.Shared.Serialization;
using Robust.Shared.Utility;
namespace Content.Server.GameObjects namespace Content.Server.GameObjects
{ {

2
Content.Server/GameObjects/Components/Movement/AiControllerComponent.cs
View File

@@ -1,7 +1,7 @@
using Content.Shared.GameObjects.Components.Movement; using Content.Shared.GameObjects.Components.Movement;
using Robust.Server.AI; using Robust.Server.AI;
using Robust.Server.GameObjects;
using Robust.Shared.GameObjects; using Robust.Shared.GameObjects;
using Robust.Shared.GameObjects.Components;
using Robust.Shared.Map; using Robust.Shared.Map;
using Robust.Shared.Maths; using Robust.Shared.Maths;
using Robust.Shared.Serialization; using Robust.Shared.Serialization;

3
Content.Server/GameObjects/Components/Projectiles/ProjectileComponent.cs
View File

@@ -1,14 +1,11 @@
using System.Collections.Generic; using System.Collections.Generic;
using Content.Server.GameObjects.Components.Mobs; using Content.Server.GameObjects.Components.Mobs;
using Content.Shared.GameObjects; using Content.Shared.GameObjects;
using Robust.Server.GameObjects;
using Robust.Server.GameObjects.EntitySystems; using Robust.Server.GameObjects.EntitySystems;
using Robust.Shared.GameObjects; using Robust.Shared.GameObjects;
using Robust.Shared.GameObjects.Components; using Robust.Shared.GameObjects.Components;
using Robust.Shared.GameObjects.Systems; using Robust.Shared.GameObjects.Systems;
using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.Interfaces.GameObjects;
using Robust.Shared.IoC;
using Robust.Shared.Map;
using Robust.Shared.Physics; using Robust.Shared.Physics;
using Robust.Shared.Serialization; using Robust.Shared.Serialization;
using Robust.Shared.ViewVariables; using Robust.Shared.ViewVariables;

5
Content.Server/GameObjects/Components/RotatableComponent.cs
View File

@@ -1,9 +1,8 @@
using Content.Server.GameObjects.EntitySystems; using Content.Server.Interfaces;
using Content.Server.Interfaces;
using Content.Shared.GameObjects; using Content.Shared.GameObjects;
using Content.Shared.GameObjects.EntitySystems; using Content.Shared.GameObjects.EntitySystems;
using Robust.Server.GameObjects;
using Robust.Shared.GameObjects; using Robust.Shared.GameObjects;
using Robust.Shared.GameObjects.Components;
using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.Interfaces.GameObjects;
using Robust.Shared.IoC; using Robust.Shared.IoC;
using Robust.Shared.Localization; using Robust.Shared.Localization;

9
Content.Server/GameObjects/Components/Weapon/Ranged/Barrels/ServerRangedBarrelComponent.cs
View File

@@ -1,19 +1,15 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using Content.Server.GameObjects.Components.Mobs; using Content.Server.GameObjects.Components.Mobs;
using Content.Server.GameObjects.Components.Projectiles; using Content.Server.GameObjects.Components.Projectiles;
using Content.Server.GameObjects.Components.Sound;
using Content.Server.GameObjects.Components.Weapon.Ranged.Ammunition; using Content.Server.GameObjects.Components.Weapon.Ranged.Ammunition;
using Content.Server.GameObjects.EntitySystems; using Content.Server.GameObjects.EntitySystems;
using Content.Shared.Audio; using Content.Shared.Audio;
using Content.Shared.GameObjects.Components.Weapons.Ranged; using Content.Shared.GameObjects.Components.Weapons.Ranged;
using Content.Shared.Physics;
using Robust.Server.GameObjects;
using Robust.Server.GameObjects.EntitySystems; using Robust.Server.GameObjects.EntitySystems;
using Robust.Shared.Audio; using Robust.Shared.Audio;
using Robust.Shared.GameObjects; using Robust.Shared.GameObjects.Components;
using Robust.Shared.GameObjects.EntitySystemMessages;
using Robust.Shared.GameObjects.Systems; using Robust.Shared.GameObjects.Systems;
using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.Interfaces.GameObjects;
using Robust.Shared.Interfaces.Map; using Robust.Shared.Interfaces.Map;
@@ -24,7 +20,6 @@ using Robust.Shared.IoC;
using Robust.Shared.Log; using Robust.Shared.Log;
using Robust.Shared.Map; using Robust.Shared.Map;
using Robust.Shared.Maths; using Robust.Shared.Maths;
using Robust.Shared.Physics;
using Robust.Shared.Prototypes; using Robust.Shared.Prototypes;
using Robust.Shared.Random; using Robust.Shared.Random;
using Robust.Shared.Serialization; using Robust.Shared.Serialization;

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

@@ -19,7 +19,6 @@ using Robust.Shared.Interfaces.Random;
using Robust.Shared.IoC; using Robust.Shared.IoC;
using Robust.Shared.Log; using Robust.Shared.Log;
using Robust.Shared.Map; using Robust.Shared.Map;
using Robust.Shared.Physics;
using Robust.Shared.Prototypes; using Robust.Shared.Prototypes;
using Robust.Shared.Random; using Robust.Shared.Random;
@@ -66,7 +65,7 @@ namespace Content.Server.GameObjects.EntitySystems
} }
var mover = entity.GetComponent<IMoverComponent>(); var mover = entity.GetComponent<IMoverComponent>();
var physics = entity.GetComponent<SharedPhysicsComponent>(); var physics = entity.GetComponent<PhysicsComponent>();
if (entity.TryGetComponent<CollidableComponent>(out var collider)) if (entity.TryGetComponent<CollidableComponent>(out var collider))
{ {
UpdateKinematics(entity.Transform, mover, physics, collider); UpdateKinematics(entity.Transform, mover, physics, collider);
@@ -78,7 +77,7 @@ namespace Content.Server.GameObjects.EntitySystems
} }
} }
protected override void SetController(SharedPhysicsComponent physics) protected override void SetController(PhysicsComponent physics)
{ {
((PhysicsComponent) physics).SetController<MoverController>(); ((PhysicsComponent) physics).SetController<MoverController>();
} }

4
Content.Server/Throw/ThrowHelper.cs
View File

@@ -1,6 +1,5 @@
using Content.Server.GameObjects.Components; using Content.Server.GameObjects.Components;
using Content.Shared.Physics; using Content.Shared.Physics;
using Robust.Server.GameObjects;
using Robust.Shared.GameObjects.Components; using Robust.Shared.GameObjects.Components;
using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.Interfaces.GameObjects;
using Robust.Shared.Interfaces.Map; using Robust.Shared.Interfaces.Map;
@@ -11,10 +10,7 @@ using Robust.Shared.Map;
using Robust.Shared.Maths; using Robust.Shared.Maths;
using Robust.Shared.Physics; using Robust.Shared.Physics;
using Robust.Shared.Random; using Robust.Shared.Random;
using System;
using Robust.Shared.Interfaces.Physics; using Robust.Shared.Interfaces.Physics;
using CannyFastMath;
using Math = CannyFastMath.Math;
using MathF = CannyFastMath.MathF; using MathF = CannyFastMath.MathF;
namespace Content.Server.Throw namespace Content.Server.Throw

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

@@ -144,10 +144,10 @@ namespace Content.Shared.GameObjects.Components.Movement
public override void OnAdd() public override void OnAdd()
{ {
// This component requires that the entity has a PhysicsComponent. // This component requires that the entity has a PhysicsComponent.
if (!Owner.HasComponent<SharedPhysicsComponent>()) if (!Owner.HasComponent<PhysicsComponent>())
Logger.Error( Logger.Error(
$"[ECS] {Owner.Prototype?.Name} - {nameof(SharedPlayerInputMoverComponent)} requires" + $"[ECS] {Owner.Prototype?.Name} - {nameof(SharedPlayerInputMoverComponent)} requires" +
$" {nameof(SharedPhysicsComponent)}. "); $" {nameof(PhysicsComponent)}. ");
base.OnAdd(); 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.GameObjects.Components.Movement;
using Content.Shared.Physics; using Content.Shared.Physics;
using Robust.Shared.Configuration; using Robust.Shared.Configuration;
@@ -13,7 +13,6 @@ using Robust.Shared.Interfaces.GameObjects.Components;
using Robust.Shared.Interfaces.Physics; using Robust.Shared.Interfaces.Physics;
using Robust.Shared.IoC; using Robust.Shared.IoC;
using Robust.Shared.Maths; using Robust.Shared.Maths;
using Robust.Shared.Physics;
using Robust.Shared.Players; using Robust.Shared.Players;
#nullable enable #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) CollidableComponent? collider = null)
{ {
if (physics.Controller == 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, private bool IsAroundCollider(ITransformComponent transform, IMoverComponent mover,
CollidableComponent collider) 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.Interfaces.Physics;
using Robust.Shared.IoC; using Robust.Shared.IoC;
using Robust.Shared.Maths; using Robust.Shared.Maths;
@@ -9,7 +10,7 @@ namespace Content.Shared.Physics
public class MoverController : VirtualController public class MoverController : VirtualController
{ {
private Vector2 _velocity; private Vector2 _velocity;
private SharedPhysicsComponent _component = null; private PhysicsComponent _component = null;
public Vector2 Velocity public Vector2 Velocity
{ {
@@ -17,7 +18,7 @@ namespace Content.Shared.Physics
set => _velocity = value; set => _velocity = value;
} }
public override SharedPhysicsComponent ControlledComponent public override PhysicsComponent ControlledComponent
{ {
set => _component = value; 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.Interfaces.Physics;
using Robust.Shared.IoC; using Robust.Shared.IoC;
using Robust.Shared.Maths; using Robust.Shared.Maths;
@@ -9,7 +10,7 @@ namespace Content.Shared.Physics
public class ThrowController: VirtualController public class ThrowController: VirtualController
{ {
private float _throwTime; private float _throwTime;
private SharedPhysicsComponent _component; private PhysicsComponent _component;
public const float DefaultThrowTime = 0.25f; public const float DefaultThrowTime = 0.25f;
@@ -19,7 +20,7 @@ namespace Content.Shared.Physics
set => _throwTime = value; set => _throwTime = value;
} }
public override SharedPhysicsComponent ControlledComponent public override PhysicsComponent ControlledComponent
{ {
set => _component = value; set => _component = value;
} }