mirrors/HeavenStudio
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

*don't* cause a stack overflow when polling split controller

Browse source
This commit is contained in:
minenice55 2024-01-30 21:25:05 -05:00
parent f938ab84f5
commit 664d55e7a9
1 changed files with 13 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
Assets/Scripts/InputSystem/ControllerTypes/InputJoyshock.cs
View file

@ -659,7 +659,13 @@ namespace HeavenStudio.InputSystem
} }
if (otherHalf != null) if (otherHalf != null)
{ {
return otherHalf.GetLastActionDown(); for (int i = 0; i < otherHalf.actionStates.Length; i++)
{
if (otherHalf.actionStates[i].pressed && otherHalf.actionStates[i].isDelta)
{
return i;
}
}
} }
return -1; return -1;
} }
@ -677,9 +683,10 @@ namespace HeavenStudio.InputSystem
public override bool GetActionDown(ControlStyles style, int button, out double dt) public override bool GetActionDown(ControlStyles style, int button, out double dt)
{ {
if (button == -1) { dt = 0; return false; } if (button == -1) { dt = 0; return false; }
if (otherHalf != null && otherHalf.GetActionDown(style, button, out dt)) if (otherHalf != null)
{ {
return true; dt = otherHalf.actionStates[button].dt;
return otherHalf.actionStates[button].pressed && otherHalf.actionStates[button].isDelta;
} }
dt = actionStates[button].dt; dt = actionStates[button].dt;
return actionStates[button].pressed && actionStates[button].isDelta; return actionStates[button].pressed && actionStates[button].isDelta;
@ -688,9 +695,10 @@ namespace HeavenStudio.InputSystem
public override bool GetActionUp(ControlStyles style, int button, out double dt) public override bool GetActionUp(ControlStyles style, int button, out double dt)
{ {
if (button == -1) { dt = 0; return false; } if (button == -1) { dt = 0; return false; }
if (otherHalf != null && otherHalf.GetActionUp(style, button, out dt)) if (otherHalf != null)
{ {
return true; dt = otherHalf.actionStates[button].dt;
return !otherHalf.actionStates[button].pressed && otherHalf.actionStates[button].isDelta;
} }
dt = actionStates[button].dt; dt = actionStates[button].dt;
return !actionStates[button].pressed && actionStates[button].isDelta; return !actionStates[button].pressed && actionStates[button].isDelta;