maddo/cirnogodot
1
0
Fork 0
mirror of https://gitlab.com/MaddoScientisto/cirnogodot.git synced 2026-06-08 13:05:53 +00:00
Code Issues Projects Releases Packages Wiki Activity

Selector changes

Browse source
This commit is contained in:
Marco 2025-08-12 08:43:26 +02:00
commit 690ac102dc
3 changed files with 140 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

117
Scripts/Components/FSM/3DPlayer/SelectorController.cs
View file

@ -6,11 +6,25 @@ namespace Cirno.Scripts.Components.FSM._3DPlayer;
public partial class SelectorController : Node
{
[Signal] public delegate void ShowSelectorEventHandler();
[Signal] public delegate void HideSelectorEventHandler();
[Signal] public delegate void ChangePositionEventHandler(Vector2 position);
[Signal]
public delegate void ShowSelectorEventHandler();
[Signal]
public delegate void HideSelectorEventHandler();
[Signal]
public delegate void ChangePositionEventHandler(Vector2 position);
[Signal]
public delegate void ChangeParent3DEventHandler(Node3D node);
private bool _canSelect = true;
public bool CanSelect => _canSelect;
private bool _autoSelect = false;
[Signal] public delegate void ChangeParent3DEventHandler(Node3D node);
private double _cooldownTimer = 0f;
private Interactable _lastInteractable;
@ -31,18 +45,25 @@ public partial class SelectorController : Node
if (value < 0)
{
_selectedInteractable = _interactables.Count - 1;
// if (_selectedInteractable < 0)
// {
// _selectedInteractable = 0;
// }
}
}
}
public IInteractable SelectedInteractable
{
// The problem here is that if it's deselected the index is -1
get =>
_interactables.Count > 0
? SelectedInteractableIndex >= _interactables.Count
? _interactables[^1]
: _interactables[SelectedInteractableIndex]
: null;
SelectedInteractableIndex < 0
? null
: _interactables.Count > 0
? SelectedInteractableIndex >= _interactables.Count
? _interactables[^1]
: _interactables[SelectedInteractableIndex]
: null;
set
{
// Passing null deselects the interactable
@ -63,7 +84,7 @@ public partial class SelectorController : Node
NotifyChanged(value);
}
}
public void SelectNext()
{
SelectedInteractableIndex += 1;
@ -73,28 +94,48 @@ public partial class SelectorController : Node
// _selectedInteractable = 0;
// }
if (_interactables.Count > 0)
if (_interactables.Count <= 0)
{
SelectedInteractable = _interactables[_selectedInteractable];
}
else
{
_selectedInteractable = -1;
SelectedInteractable = null;
//SelectedInteractableIndex = -1;
}
// No need to set it because the selection is already handled when reading
// else
// {
// SelectedInteractable = _interactables[_selectedInteractable];
// }
UpdatePosition();
}
public void SelectNextDelayed()
{
if (!_canSelect)
{
_autoSelect = true;
}
else
{
SelectNext();
}
//CallDeferred(MethodName.SelectNext);
}
public void AddInteractable(IInteractable interactable)
{
if (!_interactables.Contains(interactable))
{
_interactables.Add(interactable);
if (_interactables.Count == 1)
{
_selectedInteractable = 0;
}
// Always set the current one to the newest
SelectedInteractable = interactable;
// if (_interactables.Count == 1)
// {
// SelectedInteractable = interactable;
// //_selectedInteractable = 0;
// }
}
UpdatePosition();
@ -109,8 +150,17 @@ public partial class SelectorController : Node
public void Deselect()
{
_selectedInteractable = -1;
SelectedInteractable = null;
//SelectedInteractableIndex = -1;
EmitSignalHideSelector();
}
public void DeselectWithCooldown()
{
Deselect();
_canSelect = false;
_cooldownTimer = 0d;
}
public void UpdatePosition()
@ -127,7 +177,7 @@ public partial class SelectorController : Node
EmitSignalHideSelector();
}
}
private void NotifyChanged(IInteractable interactable)
{
//EmitSignal(nameof(SelectedItemInteractableChanged), interactable);
@ -138,9 +188,18 @@ public partial class SelectorController : Node
EmitSignalHideSelector();
}
// public void PhysicsProcess(double delta)
// {
// if (SelectedInteractable is null) return;
// //EmitSignalChangePosition(SelectedInteractable.GetScreenPosition());
// }
public void PhysicsProcess(double delta)
{
if (_canSelect is true) return;
_cooldownTimer += delta;
if (!(_cooldownTimer >= 0.2d)) return;
_canSelect = true;
_cooldownTimer = 0;
if (!_autoSelect) return;
_autoSelect = false;
SelectNext();
//if (SelectedInteractable is null) return;
//EmitSignalChangePosition(SelectedInteractable.GetScreenPosition());
}
}