space-wizards/RobustToolbox
1
0
Fork 0
mirror of https://github.com/space-wizards/RobustToolbox.git synced 2026-09-15 14:52:35 +02:00
Code Issues Packages Projects Releases Wiki Activity

Command Binding System supporting multiple bindings (#1089)

Browse Source
This commit is contained in:
chairbender
2020-05-31 20:44:16 +02:00
committed by GitHub
parent 29083fdb6f
commit d148bde02b
14 changed files with 969 additions and 163 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Robust.Client/GameObjects/EntitySystems/EyeUpdateSystem.cs
+6 -7
View File
@@ -5,6 +5,7 @@ using Robust.Client.ViewVariables;
using Robust.Shared.GameObjects;
using Robust.Shared.GameObjects.Systems;
using Robust.Shared.Input;
using Robust.Shared.Input.Binding;
using Robust.Shared.Interfaces.GameObjects.Systems;
using Robust.Shared.IoC;
using Robust.Shared.Maths;
@@ -36,19 +37,17 @@ namespace Robust.Client.GameObjects.EntitySystems
EntityQuery = new TypeEntityQuery(typeof(EyeComponent));
//WARN: Tightly couples this system with InputSystem, and assumes InputSystem exists and is initialized
var inputSystem = EntitySystemManager.GetEntitySystem<InputSystem>();
inputSystem.BindMap.BindFunction(EngineKeyFunctions.CameraRotateRight, new NullInputCmdHandler());
inputSystem.BindMap.BindFunction(EngineKeyFunctions.CameraRotateLeft, new NullInputCmdHandler());
CommandBinds.Builder
.Bind(EngineKeyFunctions.CameraRotateRight, new NullInputCmdHandler())
.Bind(EngineKeyFunctions.CameraRotateLeft, new NullInputCmdHandler())
.Register<EyeUpdateSystem>();
}
/// <inheritdoc />
public override void Shutdown()
{
//WARN: Tightly couples this system with InputSystem, and assumes InputSystem exists and is initialized
var inputSystem = EntitySystemManager.GetEntitySystem<InputSystem>();
inputSystem.BindMap.UnbindFunction(EngineKeyFunctions.CameraRotateRight);
inputSystem.BindMap.UnbindFunction(EngineKeyFunctions.CameraRotateLeft);
CommandBinds.Unregister<EyeUpdateSystem>();
base.Shutdown();
}
Robust.Client/GameObjects/EntitySystems/InputSystem.cs
+9 -16
View File
@@ -7,6 +7,7 @@ using Robust.Client.Player;
using Robust.Shared.GameObjects;
using Robust.Shared.GameObjects.Systems;
using Robust.Shared.Input;
using Robust.Shared.Input.Binding;
using Robust.Shared.Interfaces.GameObjects;
using Robust.Shared.IoC;
using Robust.Shared.Log;
@@ -18,7 +19,7 @@ namespace Robust.Client.GameObjects.EntitySystems
/// <summary>
/// Client-side processing of all input commands through the simulation.
/// </summary>
public class InputSystem : EntitySystem
public class InputSystem : SharedInputSystem
{
#pragma warning disable 649
[Dependency] private readonly IInputManager _inputManager;
@@ -27,18 +28,12 @@ namespace Robust.Client.GameObjects.EntitySystems
#pragma warning restore 649
private readonly IPlayerCommandStates _cmdStates = new PlayerCommandStates();
private readonly CommandBindMapping _bindMap = new CommandBindMapping();
/// <summary>
/// Current states for all of the keyFunctions.
/// </summary>
public IPlayerCommandStates CmdStates => _cmdStates;
/// <summary>
/// Holds the keyFunction -> handler bindings for the simulation.
/// </summary>
public ICommandBindMapping BindMap => _bindMap;
/// <summary>
/// If the input system is currently predicting input.
/// </summary>
@@ -68,11 +63,10 @@ namespace Robust.Client.GameObjects.EntitySystems
_cmdStates.SetState(function, message.State);
// handle local binds before sending off
if (_bindMap.TryGetHandler(function, out var handler))
foreach (var handler in BindRegistry.GetHandlers(function))
{
// local handlers can block sending over the network.
if (handler.HandleCmdMessage(session, message))
return;
if (handler.HandleCmdMessage(session, message)) return;
}
// send it off to the client
@@ -87,15 +81,14 @@ namespace Robust.Client.GameObjects.EntitySystems
{
var keyFunc = _inputManager.NetworkBindMap.KeyFunctionName(inputCmd.InputFunctionId);
if (!_bindMap.TryGetHandler(keyFunc, out var handler))
return;
Predicted = true;
var session = _playerManager.LocalPlayer.Session;
handler.HandleCmdMessage(session, inputCmd);
foreach (var handler in BindRegistry.GetHandlers(keyFunc))
{
if (handler.HandleCmdMessage(session, inputCmd)) break;
}
Predicted = false;
}
private void DispatchInputCommand(FullInputCmdMessage message)