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

Revert "Actions Rework" (#6888)

Browse Source
This commit is contained in:
Leon Friedrich
2022-02-25 18:55:18 +13:00
committed by GitHub
parent 5ac5dd6a64
commit 49ae383f06
135 changed files with 5165 additions and 3119 deletions
Download Patch File Download Diff File Expand all files Collapse all files

72
Content.Client/Outline/InteractionOutlineSystem.cs
View File

@@ -24,74 +24,14 @@ public sealed class InteractionOutlineSystem : EntitySystem
[Dependency] private readonly IUserInterfaceManager _uiManager = default!;
[Dependency] private readonly SharedInteractionSystem _interactionSystem = default!;
/// <summary>
/// Whether to currently draw the outline. The outline may be temporarily disabled by other systems
/// </summary>
private bool _enabled = true;
/// <summary>
/// Whether to draw the outline at all. Overrides <see cref="_enabled"/>.
/// </summary>
private bool _cvarEnabled = true;
public bool Enabled = true;
private EntityUid? _lastHoveredEntity;
public override void Initialize()
{
base.Initialize();
_configManager.OnValueChanged(CCVars.OutlineEnabled, SetCvarEnabled);
}
public override void Shutdown()
{
base.Shutdown();
_configManager.UnsubValueChanged(CCVars.OutlineEnabled, SetCvarEnabled);
}
public void SetCvarEnabled(bool cvarEnabled)
{
_cvarEnabled = cvarEnabled;
// clear last hover if required:
if (_cvarEnabled)
return;
if (_lastHoveredEntity == null || Deleted(_lastHoveredEntity))
return;
if (TryComp(_lastHoveredEntity, out InteractionOutlineComponent? outline))
outline.OnMouseLeave();
}
public void SetEnabled(bool enabled)
{
if (enabled == _enabled)
return;
_enabled = enabled;
// clear last hover if required:
if (enabled)
return;
if (_lastHoveredEntity == null || Deleted(_lastHoveredEntity))
return;
if (TryComp(_lastHoveredEntity, out InteractionOutlineComponent? outline))
outline.OnMouseLeave();
}
public override void FrameUpdate(float frameTime)
{
base.FrameUpdate(frameTime);
if (!_enabled || !_cvarEnabled)
return;
// If there is no local player, there is no session, and therefore nothing to do here.
var localPlayer = _playerManager.LocalPlayer;
if (localPlayer == null)
@@ -141,6 +81,16 @@ public sealed class InteractionOutlineSystem : EntitySystem
InteractionOutlineComponent? outline;
if (!Enabled || !_configManager.GetCVar(CCVars.OutlineEnabled))
{
if (entityToClick != null && TryComp(entityToClick, out outline))
{
outline.OnMouseLeave(); //Prevent outline remains from persisting post command.
}
return;
}
if (entityToClick == _lastHoveredEntity)
{
if (entityToClick != null && TryComp(entityToClick, out outline))