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

Minimalist Action Bar (#21352)

Browse Source
This commit is contained in:
Nemanja
2023-11-13 22:27:14 -05:00
committed by GitHub
parent 2fdc566969
commit 4e84961ef8
12 changed files with 111 additions and 317 deletions
Download Patch File Download Diff File Expand all files Collapse all files

257
Content.Client/UserInterface/Systems/Actions/ActionUIController.cs
View File

@@ -1,6 +1,5 @@
using System.Linq;
using System.Numerics;
using System.Runtime.InteropServices;
using Content.Client.Actions;
using Content.Client.Construction;
using Content.Client.Gameplay;
@@ -49,17 +48,14 @@ public sealed class ActionUIController : UIController, IOnStateChanged<GameplayS
[UISystemDependency] private readonly TargetOutlineSystem? _targetOutline = default;
[UISystemDependency] private readonly SpriteSystem _spriteSystem = default!;
private const int DefaultPageIndex = 0;
private ActionButtonContainer? _container;
private readonly List<ActionPage> _pages = new();
private int _currentPageIndex = DefaultPageIndex;
private readonly List<EntityUid?> _actions = new();
private readonly DragDropHelper<ActionButton> _menuDragHelper;
private readonly TextureRect _dragShadow;
private ActionsWindow? _window;
private ActionsBar? ActionsBar => UIManager.GetActiveUIWidgetOrNull<ActionsBar>();
private MenuButton? ActionButton => UIManager.GetActiveUIWidgetOrNull<MenuBar.Widgets.GameTopMenuBar>()?.ActionButton;
private ActionPage CurrentPage => _pages[_currentPageIndex];
public bool IsDragging => _menuDragHelper.IsDragging;
@@ -79,14 +75,6 @@ public sealed class ActionUIController : UIController, IOnStateChanged<GameplayS
SetSize = new Vector2(64, 64),
MouseFilter = MouseFilterMode.Ignore
};
var pageCount = ContentKeyFunctions.GetLoadoutBoundKeys().Length;
var buttonCount = ContentKeyFunctions.GetHotbarBoundKeys().Length;
for (var i = 0; i < pageCount; i++)
{
var page = new ActionPage(buttonCount);
_pages.Add(page);
}
}
public override void Initialize()
@@ -139,15 +127,6 @@ public sealed class ActionUIController : UIController, IOnStateChanged<GameplayS
}, false, true));
}
var loadoutKeys = ContentKeyFunctions.GetLoadoutBoundKeys();
for (var i = 0; i < loadoutKeys.Length; i++)
{
var boundId = i; // This is needed, because the lambda captures it.
var boundKey = loadoutKeys[i];
builder = builder.Bind(boundKey,
InputCmdHandler.FromDelegate(_ => ChangePage(boundId)));
}
builder
.Bind(ContentKeyFunctions.OpenActionsMenu,
InputCmdHandler.FromDelegate(_ => ToggleWindow()))
@@ -178,7 +157,7 @@ public sealed class ActionUIController : UIController, IOnStateChanged<GameplayS
if (!_timing.IsFirstTimePredicted || _actionsSystem == null || SelectingTargetFor is not { } actionId)
return false;
if (_playerManager.LocalPlayer?.ControlledEntity is not { } user)
if (_playerManager.LocalEntity is not { } user)
return false;
if (!EntityManager.TryGetComponent(user, out ActionsComponent? comp))
@@ -332,76 +311,16 @@ public sealed class ActionUIController : UIController, IOnStateChanged<GameplayS
private void TriggerAction(int index)
{
if (_actionsSystem == null ||
CurrentPage[index] is not { } actionId ||
!_actions.TryGetValue(index, out var actionId) ||
!_actionsSystem.TryGetActionData(actionId, out var baseAction))
{
return;
}
if (baseAction is BaseTargetActionComponent action)
ToggleTargeting(actionId, action);
ToggleTargeting(actionId.Value, action);
else
_actionsSystem?.TriggerAction(actionId, baseAction);
}
private void ChangePage(int index)
{
if (_actionsSystem == null)
return;
var lastPage = _pages.Count - 1;
if (index < 0)
{
index = lastPage;
}
else if (index > lastPage)
{
index = 0;
}
_currentPageIndex = index;
var page = _pages[_currentPageIndex];
_container?.SetActionData(_actionsSystem, page);
ActionsBar!.PageButtons.Label.Text = $"{_currentPageIndex + 1}";
}
private void OnLeftArrowPressed(ButtonEventArgs args)
{
ChangePage(_currentPageIndex - 1);
}
private void OnRightArrowPressed(ButtonEventArgs args)
{
ChangePage(_currentPageIndex + 1);
}
private void AppendAction(EntityUid action)
{
if (_container == null)
return;
foreach (var button in _container.GetButtons())
{
if (button.ActionId != null)
continue;
SetAction(button, action);
return;
}
foreach (var page in _pages)
{
for (var i = 0; i < page.Size; i++)
{
var pageAction = page[i];
if (pageAction != null)
continue;
page[i] = action;
return;
}
}
_actionsSystem?.TriggerAction(actionId.Value, baseAction);
}
private void OnActionAdded(EntityUid actionId)
@@ -416,18 +335,10 @@ public sealed class ActionUIController : UIController, IOnStateChanged<GameplayS
if (action is BaseTargetActionComponent targetAction && action.Toggled)
StartTargeting(actionId, targetAction);
foreach (var page in _pages)
{
for (var i = 0; i < page.Size; i++)
{
if (page[i] == actionId)
{
return;
}
}
}
if (_actions.Contains(actionId))
return;
AppendAction(actionId);
_actions.Add(actionId);
}
private void OnActionRemoved(EntityUid actionId)
@@ -435,40 +346,18 @@ public sealed class ActionUIController : UIController, IOnStateChanged<GameplayS
if (_container == null)
return;
// stop targeting if the action is removed
if (actionId == SelectingTargetFor)
StopTargeting();
foreach (var button in _container.GetButtons())
{
if (button.ActionId == actionId)
{
SetAction(button, null);
}
}
foreach (var page in _pages)
{
for (var i = 0; i < page.Size; i++)
{
if (page[i] == actionId)
{
page[i] = null;
}
}
}
_actions.RemoveAll(x => x == actionId);
}
private void OnActionsUpdated()
{
QueueWindowUpdate();
if (_container == null)
return;
foreach (var button in _container.GetButtons())
{
button.UpdateIcons();
}
if (_actionsSystem != null)
_container?.SetActionData(_actionsSystem, _actions.ToArray());
}
private void ActionButtonPressed(ButtonEventArgs args)
@@ -512,8 +401,8 @@ public sealed class ActionUIController : UIController, IOnStateChanged<GameplayS
return filter switch
{
Filters.Enabled => action.Enabled,
Filters.Item => action.Container != null && action.Container != _playerManager.LocalPlayer?.ControlledEntity,
Filters.Innate => action.Container == null || action.Container == _playerManager.LocalPlayer?.ControlledEntity,
Filters.Item => action.Container != null && action.Container != _playerManager.LocalEntity,
Filters.Innate => action.Container == null || action.Container == _playerManager.LocalEntity,
Filters.Instant => action is InstantActionComponent,
Filters.Targeted => action is BaseTargetActionComponent,
_ => throw new ArgumentOutOfRangeException(nameof(filter), filter, null)
@@ -580,7 +469,7 @@ public sealed class ActionUIController : UIController, IOnStateChanged<GameplayS
if (_actionsSystem == null)
return;
if (_playerManager.LocalPlayer?.ControlledEntity is not { } player)
if (_playerManager.LocalEntity is not { } player)
return;
var search = _window.SearchBar.Text;
@@ -615,7 +504,7 @@ public sealed class ActionUIController : UIController, IOnStateChanged<GameplayS
PopulateActions(actions);
}
private void SetAction(ActionButton button, EntityUid? actionId)
private void SetAction(ActionButton button, EntityUid? actionId, bool updateSlots = true)
{
if (_actionsSystem == null)
return;
@@ -627,22 +516,30 @@ public sealed class ActionUIController : UIController, IOnStateChanged<GameplayS
button.ClearData();
if (_container?.TryGetButtonIndex(button, out position) ?? false)
{
CurrentPage[position] = actionId;
_actions.RemoveAt(position);
}
return;
}
if (button.TryReplaceWith(actionId.Value, _actionsSystem) &&
else if (button.TryReplaceWith(actionId.Value, _actionsSystem) &&
_container != null &&
_container.TryGetButtonIndex(button, out position))
{
CurrentPage[position] = actionId;
if (position >= _actions.Count)
{
_actions.Add(actionId);
}
else
{
_actions[position] = actionId;
}
}
if (updateSlots)
_container?.SetActionData(_actionsSystem, _actions.ToArray());
}
private void DragAction()
{
EntityUid? swapAction = null;
if (UIManager.CurrentlyHovered is ActionButton button)
{
if (!_menuDragHelper.IsDragging || _menuDragHelper.Dragged?.ActionId is not { } type)
@@ -651,14 +548,18 @@ public sealed class ActionUIController : UIController, IOnStateChanged<GameplayS
return;
}
SetAction(button, type);
swapAction = button.ActionId;
SetAction(button, type, false);
}
if (_menuDragHelper.Dragged is {Parent: ActionButtonContainer} old)
{
SetAction(old, null);
SetAction(old, swapAction, false);
}
if (_actionsSystem != null)
_container?.SetActionData(_actionsSystem, _actions.ToArray());
_menuDragHelper.EndDrag();
}
@@ -737,6 +638,7 @@ public sealed class ActionUIController : UIController, IOnStateChanged<GameplayS
if (args.Function != EngineKeyFunctions.UIClick || _actionsSystem == null)
return;
//todo: make dragging onto the same spot NOT trigger again
if (UIManager.CurrentlyHovered == button)
{
_menuDragHelper.EndDrag();
@@ -813,9 +715,6 @@ public sealed class ActionUIController : UIController, IOnStateChanged<GameplayS
return;
}
ActionsBar.PageButtons.LeftArrow.OnPressed -= OnLeftArrowPressed;
ActionsBar.PageButtons.RightArrow.OnPressed -= OnRightArrowPressed;
if (_window != null)
{
_window.OnOpen -= OnWindowOpened;
@@ -846,9 +745,6 @@ public sealed class ActionUIController : UIController, IOnStateChanged<GameplayS
return;
}
ActionsBar.PageButtons.LeftArrow.OnPressed += OnLeftArrowPressed;
ActionsBar.PageButtons.RightArrow.OnPressed += OnRightArrowPressed;
RegisterActionContainer(ActionsBar.ActionsContainer);
_actionsSystem?.LinkAllActions();
@@ -856,12 +752,6 @@ public sealed class ActionUIController : UIController, IOnStateChanged<GameplayS
public void RegisterActionContainer(ActionButtonContainer container)
{
if (_container != null)
{
_container.ActionPressed -= OnActionPressed;
_container.ActionUnpressed -= OnActionPressed;
}
_container = container;
_container.ActionPressed += OnActionPressed;
_container.ActionUnpressed += OnActionUnpressed;
@@ -877,12 +767,12 @@ public sealed class ActionUIController : UIController, IOnStateChanged<GameplayS
if (_actionsSystem == null)
return;
foreach (ref var assignment in CollectionsMarshal.AsSpan(assignments))
for (var i = 0; i < assignments.Count; i++)
{
_pages[assignment.Hotbar][assignment.Slot] = assignment.ActionId;
_actions[i] = assignments[i].ActionId;
}
_container?.SetActionData(_actionsSystem, _pages[_currentPageIndex]);
_container?.SetActionData(_actionsSystem, _actions.ToArray());
}
public void RemoveActionContainer()
@@ -918,8 +808,8 @@ public sealed class ActionUIController : UIController, IOnStateChanged<GameplayS
if (_actionsSystem == null)
return;
LoadDefaultActions(component);
_container?.SetActionData(_actionsSystem, _pages[DefaultPageIndex]);
LoadDefaultActions();
_container?.SetActionData(_actionsSystem, _actions.ToArray());
QueueWindowUpdate();
}
@@ -930,7 +820,7 @@ public sealed class ActionUIController : UIController, IOnStateChanged<GameplayS
StopTargeting();
}
private void LoadDefaultActions(ActionsComponent component)
private void LoadDefaultActions()
{
if (_actionsSystem == null)
return;
@@ -938,36 +828,11 @@ public sealed class ActionUIController : UIController, IOnStateChanged<GameplayS
var actions = _actionsSystem.GetClientActions().Where(action => action.Comp.AutoPopulate).ToList();
actions.Sort(ActionComparer);
var offset = 0;
var totalPages = _pages.Count;
var pagesLeft = totalPages;
var currentPage = DefaultPageIndex;
while (pagesLeft > 0)
_actions.Clear();
foreach (var (action, _) in actions)
{
var page = _pages[currentPage];
var pageSize = page.Size;
for (var slot = 0; slot < pageSize; slot++)
{
var actionIndex = slot + offset;
if (actionIndex < actions.Count)
{
page[slot] = actions[slot + offset].Id;
}
else
{
page[slot] = null;
}
}
offset += pageSize;
currentPage++;
if (currentPage == totalPages)
{
currentPage = 0;
}
pagesLeft--;
if (!_actions.Contains(action))
_actions.Add(action);
}
}
@@ -1078,34 +943,4 @@ public sealed class ActionUIController : UIController, IOnStateChanged<GameplayS
handOverlay.IconOverride = null;
handOverlay.EntityOverride = null;
}
//TODO: Serialize this shit
private sealed class ActionPage
{
private readonly EntityUid?[] _data;
public ActionPage(int size)
{
_data = new EntityUid?[size];
}
public EntityUid? this[int index]
{
get => _data[index];
set => _data[index] = value;
}
public static implicit operator EntityUid?[](ActionPage p)
{
return p._data.ToArray();
}
public void Clear()
{
Array.Fill(_data, null);
}
public int Size => _data.Length;
}
}