* Content side new physics structure * BroadPhase outline done * But we need to fix WorldAABB * Fix static pvs AABB * Fix import * Rando fixes * B is for balloon * Change human mob hitbox to circle * Decent movement * Start adding friction to player controller I think it's the best way to go about it to keep other objects somewhat consistent for physics. * This baby can fit so many physics bugs in it. * Slight mob mover optimisations. * Player mover kinda works okay. * Beginnings of testbed * More testbed * Circlestack bed * Namespaces * BB fixes * Pull WorldAABB * Joint pulling * Semi-decent movement I guess. * Pulling better * Bullet controller + old movement * im too dumb for this shit * Use kinematic mob controller again It's probably for the best TBH * Stashed shitcode * Remove SlipController * In which movement code is entirely refactored * Singularity fix * Fix ApplyLinearImpulse * MoveRelay fix * Fix door collisions * Disable subfloor collisions Saves on broadphase a fair bit * Re-implement ClimbController * Zumzum's pressure * Laggy item throwing * Minor atmos change * Some caching * Optimise controllers * Optimise CollideWith to hell and back * Re-do throwing and tile friction * Landing too * Optimise controllers * Move CCVars and other stuff swept is beautiful * Cleanup a bunch of controllers * Fix shooting and high pressure movement controller * Flashing improvements * Stuff and things * Combat collisions * Combat mode collisions * Pulling distance joint again * Cleanup physics interfaces * More like scuffedularity * Shit's fucked * Haha tests go green * Bigmoneycrab * Fix dupe pulling * Zumzum's based fix * Don't run tile friction for non-predicted bodies * Experimental pulling improvement * Everything's a poly now * Optimise AI region debugging a bit Could still be better but should improve default performance a LOT * Mover no updater * Crazy kinematic body idea * Good collisions * KinematicController * Fix aghost * Throwing refactor * Pushing cleanup * Fix throwing and footstep sounds * Frametime in ICollideBehavior * Fix stuff * Actually fix weightlessness * Optimise collision behaviors a lot * Make open lockers still collide with walls * powwweeerrrrr * Merge master proper * AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA * AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA * AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA * Ch ch ch changesss * SHIP IT * Fix #if DEBUG * Fix vaulting and item locker collision * Fix throwing * Editing yaml by hand what can go wrong * on * Last yaml fixes * Okay now it's fixed * Linter Co-authored-by: Metal Gear Sloth <metalgearsloth@gmail.com> Co-authored-by: Vera Aguilera Puerto <zddm@outlook.es>
139 lines
4.7 KiB
C#
139 lines
4.7 KiB
C#
#nullable enable
|
|
using System.Diagnostics.CodeAnalysis;
|
|
using Content.Shared.GameObjects.Components.Mobs.State;
|
|
using Content.Shared.GameObjects.Components.Movement;
|
|
using Content.Shared.GameObjects.EntitySystems.ActionBlocker;
|
|
using Content.Shared.Physics;
|
|
using Content.Shared.Physics.Pull;
|
|
using Robust.Shared.Containers;
|
|
using Robust.Shared.GameObjects;
|
|
using Robust.Shared.Input;
|
|
using Robust.Shared.Input.Binding;
|
|
using Robust.Shared.IoC;
|
|
using Robust.Shared.Maths;
|
|
using Robust.Shared.Physics;
|
|
using Robust.Shared.Players;
|
|
|
|
namespace Content.Shared.GameObjects.EntitySystems
|
|
{
|
|
/// <summary>
|
|
/// Handles converting inputs into movement.
|
|
/// </summary>
|
|
public sealed class SharedMoverSystem : EntitySystem
|
|
{
|
|
public override void Initialize()
|
|
{
|
|
base.Initialize();
|
|
|
|
var moveUpCmdHandler = new MoverDirInputCmdHandler(Direction.North);
|
|
var moveLeftCmdHandler = new MoverDirInputCmdHandler(Direction.West);
|
|
var moveRightCmdHandler = new MoverDirInputCmdHandler(Direction.East);
|
|
var moveDownCmdHandler = new MoverDirInputCmdHandler(Direction.South);
|
|
|
|
CommandBinds.Builder
|
|
.Bind(EngineKeyFunctions.MoveUp, moveUpCmdHandler)
|
|
.Bind(EngineKeyFunctions.MoveLeft, moveLeftCmdHandler)
|
|
.Bind(EngineKeyFunctions.MoveRight, moveRightCmdHandler)
|
|
.Bind(EngineKeyFunctions.MoveDown, moveDownCmdHandler)
|
|
.Bind(EngineKeyFunctions.Walk, new WalkInputCmdHandler())
|
|
.Register<SharedMoverSystem>();
|
|
}
|
|
|
|
/// <inheritdoc />
|
|
public override void Shutdown()
|
|
{
|
|
CommandBinds.Unregister<SharedMoverSystem>();
|
|
base.Shutdown();
|
|
}
|
|
|
|
private static void HandleDirChange(ICommonSession? session, Direction dir, ushort subTick, bool state)
|
|
{
|
|
if (!TryGetAttachedComponent<SharedPlayerInputMoverComponent>(session, out var moverComp))
|
|
return;
|
|
|
|
var owner = session?.AttachedEntity;
|
|
|
|
if (owner != null && session != null)
|
|
{
|
|
foreach (var comp in owner.GetAllComponents<IRelayMoveInput>())
|
|
{
|
|
comp.MoveInputPressed(session);
|
|
}
|
|
|
|
// For stuff like "Moving out of locker" or the likes
|
|
if (owner.IsInContainer() &&
|
|
(!owner.TryGetComponent(out IMobStateComponent? mobState) ||
|
|
mobState.IsAlive()))
|
|
{
|
|
var relayEntityMoveMessage = new RelayMovementEntityMessage(owner);
|
|
owner.Transform.Parent!.Owner.SendMessage(owner.Transform, relayEntityMoveMessage);
|
|
}
|
|
}
|
|
|
|
moverComp.SetVelocityDirection(dir, subTick, state);
|
|
}
|
|
|
|
private static void HandleRunChange(ICommonSession? session, ushort subTick, bool walking)
|
|
{
|
|
if (!TryGetAttachedComponent<IMoverComponent>(session, out var moverComp))
|
|
{
|
|
return;
|
|
}
|
|
|
|
moverComp.SetSprinting(subTick, walking);
|
|
}
|
|
|
|
private static bool TryGetAttachedComponent<T>(ICommonSession? session, [NotNullWhen(true)] out T? component)
|
|
where T : class, IComponent
|
|
{
|
|
component = default;
|
|
|
|
var ent = session?.AttachedEntity;
|
|
|
|
if (ent == null || !ent.IsValid())
|
|
return false;
|
|
|
|
if (!ent.TryGetComponent(out T? comp))
|
|
return false;
|
|
|
|
component = comp;
|
|
return true;
|
|
}
|
|
|
|
private sealed class MoverDirInputCmdHandler : InputCmdHandler
|
|
{
|
|
private readonly Direction _dir;
|
|
|
|
public MoverDirInputCmdHandler(Direction dir)
|
|
{
|
|
_dir = dir;
|
|
}
|
|
|
|
public override bool HandleCmdMessage(ICommonSession? session, InputCmdMessage message)
|
|
{
|
|
if (message is not FullInputCmdMessage full)
|
|
{
|
|
return false;
|
|
}
|
|
|
|
HandleDirChange(session, _dir, message.SubTick, full.State == BoundKeyState.Down);
|
|
return false;
|
|
}
|
|
}
|
|
|
|
private sealed class WalkInputCmdHandler : InputCmdHandler
|
|
{
|
|
public override bool HandleCmdMessage(ICommonSession? session, InputCmdMessage message)
|
|
{
|
|
if (message is not FullInputCmdMessage full)
|
|
{
|
|
return false;
|
|
}
|
|
|
|
HandleRunChange(session, full.SubTick, full.State == BoundKeyState.Down);
|
|
return false;
|
|
}
|
|
}
|
|
}
|
|
}
|