maddo/cirnogodot
1
0
Fork 0
mirror of https://gitlab.com/MaddoScientisto/cirnogodot.git synced 2026-06-01 10:15:45 +00:00
Code Issues Projects Releases Packages Wiki Activity

Selector Fix

Browse source
This commit is contained in:
Marco 2025-08-12 10:42:09 +02:00
commit 7c2d01a52e
3 changed files with 109 additions and 49 deletions
Download patch file Download diff file Expand all files Collapse all files

1
Cirno.sln.DotSettings.user
View file

@ -31,5 +31,6 @@
<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AScriptManagerBridge_002Ecs_002Fl_003AC_0021_003FUsers_003FMaddo_003FAppData_003FLocal_003FJetBrains_003FShared_003FvAny_003FDecompilerCache_003Fdecompiler_003F4fd22cd129a84c16b5d8004b467c426f518800_003F3a_003Fc456f450_003FScriptManagerBridge_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AStringName_002Ecs_002Fl_003AC_0021_003FUsers_003FMaddo_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003Fb9315b94b9124600ad99083b1bc65e44584a00_003Faa_003Fd6996970_003FStringName_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AThrowHelpers_002Ecs_002Fl_003AC_0021_003FUsers_003FMaddo_003FAppData_003FLocal_003FJetBrains_003FShared_003FvAny_003FSourcesCache_003Fbb2a94dce7ca55a596694df58d3ca91c6d9c9c9c9813775e4d1abd0f91dc59_003FThrowHelpers_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AThrowHelper_002Ecs_002Fl_003AC_0021_003FUsers_003FMaddo_003FAppData_003FLocal_003FJetBrains_003FShared_003FvAny_003FSourcesCache_003Fc7102cd0ffb8973777e61b1942c3fffac7e14016a511d055c3adf73ff91748_003FThrowHelper_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AVariantUtils_002Ecs_002Fl_003AC_0021_003FUsers_003FMaddo_003FAppData_003FLocal_003FJetBrains_003FShared_003FvAny_003FDecompilerCache_003Fdecompiler_003F4fd22cd129a84c16b5d8004b467c426f518800_003F38_003Fb04c4423_003FVariantUtils_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AVector2_002Ecs_002Fl_003AC_0021_003FUsers_003FMaddo_003FAppData_003FLocal_003FJetBrains_003FShared_003FvAny_003FDecompilerCache_003Fdecompiler_003F08f0ea1144634eedbe3a87b9762ef1dd4bd200_003F85_003F367e08bf_003FVector2_002Ecs/@EntryIndexedValue">ForceIncluded</s:String></wpf:ResourceDictionary>

109
Scripts/Components/FSM/3DPlayer/IsoActivationProvider.cs
View file

@ -6,9 +6,8 @@ using Godot;
namespace Cirno.Scripts.Components.FSM._3DPlayer;
public partial class IsoActivationProvider: Area3D, IModule<PlayerState, CharacterBody3D>
public partial class IsoActivationProvider : Area3D, IModule<PlayerState, CharacterBody3D>
{
private bool _enabled = false;
public bool Enabled
@ -20,19 +19,21 @@ public partial class IsoActivationProvider: Area3D, IModule<PlayerState, Charact
_enabled = value;
}
}
[Export] private InputProvider _inputProvider;
[Export] private SelectorController _selectorController;
[Export] private AudioStreamPlayer _errorSound;
[Export] public PackedScene SelectorScene { get; set; }
private Node3D _selector;
public IStateMachine<PlayerState, CharacterBody3D> StateMachine { get; private set; }
private CollisionShape3D _collisionShape;
public void EnterState(PlayerState state)
{
Enabled = true;
@ -50,13 +51,15 @@ public partial class IsoActivationProvider: Area3D, IModule<PlayerState, Charact
public void Init(IStateMachine<PlayerState, CharacterBody3D> machine)
{
StateMachine = machine;
_collisionShape = GetNode<CollisionShape3D>("CollisionShape");
_selectorController.Hide();
SpawnSelector();
_selectorController.ShowSelector += ShowSelector;
_selectorController.HideSelector += HideSelector;
_selectorController.ChangeParent3D += OnChangeParent3D;
// if (SelectorScene is not null && _selector is null)
// {
// _selector = actor.CreateSibling<Selector>(SelectorScene, this.GlobalPosition);
@ -64,16 +67,57 @@ public partial class IsoActivationProvider: Area3D, IModule<PlayerState, Charact
// }
}
private void SpawnSelector()
private void OnChangeParent3D(Node3D node)
{
if (IsInstanceValid(_selector) && _selector is not null)
{
if (node is null)
{
_selector.Hide();
}
else
{
_selector.GlobalPosition = node.GlobalPosition;
_selector.Show();
//_selector.Reparent(node);
}
}
else
{
_selector = SelectorScene.Instantiate<Node3D>();
//node.AddChild(_selector);
StateMachine.MainObject.GetParent().AddChild(_selector);
//sel.GlobalPosition = StateMachine.MainObject.GlobalPosition;
_selector.GlobalPosition = node.GlobalPosition;
}
//_selector.Position = Vector3.Zero;
}
private void ShowSelector()
{
if (IsInstanceValid(_selector))
{
_selector?.Show();
}
}
private void HideSelector()
{
if (IsInstanceValid(_selector))
{
_selector?.Hide();
}
}
private void SpawnSelector(Node3D parent)
{
var sel = SelectorScene.Instantiate<Node3D>();
StateMachine.MainObject.GetParent().AddChild(sel);
sel.GlobalPosition = StateMachine.MainObject.GlobalPosition;
_selectorController.ShowSelector += () =>
{
sel.Show();
};
_selectorController.ShowSelector += () => { sel.Show(); };
_selectorController.HideSelector += () =>
{
@ -103,13 +147,12 @@ public partial class IsoActivationProvider: Area3D, IModule<PlayerState, Charact
public void Process(double delta)
{
}
public void PhysicsProcess(double delta)
{
_selectorController.PhysicsProcess(delta);
HandleInteraction();
}
@ -135,29 +178,33 @@ public partial class IsoActivationProvider: Area3D, IModule<PlayerState, Charact
private bool TrySelect()
{
var selected = _selectorController.SelectedInteractable;
var selected = _selectorController.GetSelectedInteractable();
if (selected is null)
{
_errorSound?.Play();
return false;
};
}
;
if (!selected.CanActivate())
{
_errorSound?.Play();
return true;
};
}
;
bool success = selected.Activate(ActivationType.Use);
if (success)
{
// Deselect and scan for next
//_selectorController.RemoveInteractable(selected);
_selectorController.DeselectWithCooldown();
//_selectorController.DeselectWithCooldown();
_selectorController.Deselect();
// Do this at end of frame instead
//_selectorController.SelectNext();
_selectorController.SelectNextDelayed();
_selectorController.SelectNext();
}
else
{
@ -171,7 +218,6 @@ public partial class IsoActivationProvider: Area3D, IModule<PlayerState, Charact
}
private List<IInteractable> ScanTargets()
{
var spaceState = GetWorld3D().DirectSpaceState;
@ -182,7 +228,6 @@ public partial class IsoActivationProvider: Area3D, IModule<PlayerState, Charact
CollideWithAreas = true,
CollisionMask = this.CollisionMask,
Exclude = [GetRid()],
};
var targets = spaceState.IntersectShape(query);
@ -204,25 +249,23 @@ public partial class IsoActivationProvider: Area3D, IModule<PlayerState, Charact
return found;
}
private void _on_interaction_controller_area_entered(Area3D area)
{
if (!Enabled) return;
if (area.IsInGroup("Interactable") && area is IInteractable interactable && interactable.CanActivate())
{
//if (_selector == null) return;
_selectorController.AddInteractable(interactable);
}
}
private void _on_interaction_controller_area_exited(Area3D area)
{
//if (!Enabled) return;
if (area.IsInGroup("Interactable") && area is IInteractable interactable)
{
//if (_selector == null) return;
_selectorController.RemoveInteractable(interactable);
}

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

@ -23,9 +23,9 @@ public partial class SelectorController : Node
public bool CanSelect => _canSelect;
private bool _autoSelect = false;
private double _cooldownTimer = 0f;
private Interactable _lastInteractable;
private List<IInteractable> _interactables = [];
@ -40,6 +40,7 @@ public partial class SelectorController : Node
if (value >= _interactables.Count)
{
_selectedInteractable = 0;
return;
}
if (value < 0)
@ -49,21 +50,35 @@ public partial class SelectorController : Node
// {
// _selectedInteractable = 0;
// }
return;
}
_selectedInteractable = value;
}
}
public IInteractable GetSelectedInteractable()
{
return SelectedInteractableIndex < 0
? null
: _interactables.Count > 0
? SelectedInteractableIndex >= _interactables.Count
? _interactables[^1]
: _interactables[SelectedInteractableIndex]
: null;
}
public IInteractable SelectedInteractable
{
// The problem here is that if it's deselected the index is -1
get =>
SelectedInteractableIndex < 0
? null
: _interactables.Count > 0
? SelectedInteractableIndex >= _interactables.Count
? _interactables[^1]
: _interactables[SelectedInteractableIndex]
: null;
// get =>
// SelectedInteractableIndex < 0
// ? null
// : _interactables.Count > 0
// ? SelectedInteractableIndex >= _interactables.Count
// ? _interactables[^1]
// : _interactables[SelectedInteractableIndex]
// : null;
set
{
// Passing null deselects the interactable
@ -128,8 +143,6 @@ public partial class SelectorController : Node
{
_interactables.Add(interactable);
// Always set the current one to the newest
SelectedInteractable = interactable;
// if (_interactables.Count == 1)
// {
@ -138,6 +151,9 @@ public partial class SelectorController : Node
// }
}
// Always set the current one to the newest
SelectedInteractable = interactable;
UpdatePosition();
}
@ -153,7 +169,6 @@ public partial class SelectorController : Node
SelectedInteractable = null;
//SelectedInteractableIndex = -1;
EmitSignalHideSelector();
}
public void DeselectWithCooldown()
@ -165,11 +180,12 @@ public partial class SelectorController : Node
public void UpdatePosition()
{
if (SelectedInteractable != null)
var selected = GetSelectedInteractable();
if (selected != null)
{
EmitSignalChangePosition(SelectedInteractable.GetScreenPosition());
EmitSignalChangePosition(selected.GetScreenPosition());
//EmitSignalChangePosition3D();
EmitSignalChangeParent3D(SelectedInteractable as Node3D);
EmitSignalChangeParent3D(selected as Node3D);
EmitSignalShowSelector();
}
else