Mirrors/SanAndreasUnity
2
0
Fork 0
mirror of https://github.com/GTA-ASM/SanAndreasUnity synced 2024-11-10 06:34:16 +00:00
Code Issues Projects Releases Packages Wiki Activity

preserve input for some buttons

Browse source
This commit is contained in:
in0finite 2019-07-23 17:17:02 +02:00
parent 551fcf7988
commit 4045311d59
2 changed files with 27 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
Assets/Scripts/Behaviours/Ped/States/BaseScriptState.cs
View file

@ -304,7 +304,26 @@ namespace SanAndreasUnity.Behaviours.Peds.States
protected virtual void ResetCustomInput()
{
CustomInput.Instance.ResetAllInput();
var customInput = CustomInput.Instance;
if (!UIManager.Instance.UseTouchInput)
{
// touch input is not used
customInput.ResetAllInput();
return;
}
// preserve input for: walk, sprint, aim
bool isWalkOn = customInput.GetButton("Walk");
bool isSprintOn = customInput.GetButton("Sprint");
bool isAimOn = customInput.GetButton("RightClick");
customInput.ResetAllInput();
customInput.SetButton("Walk", isWalkOn);
customInput.SetButton("Sprint", isSprintOn);
customInput.SetButton("RightClick", isAimOn);
}
protected virtual void DrawMovementTouchInput()
@ -360,11 +379,11 @@ namespace SanAndreasUnity.Behaviours.Peds.States
// sprint/walk toggle button
bool isWalkOn = m_ped.IsWalkOn; // preserve current value
bool isSprintOn = m_ped.IsSprintOn; // preserve current value
bool isWalkOn = customInput.GetButton("Walk"); // preserve current value
bool isSprintOn = customInput.GetButton("Sprint"); // preserve current value
float topY = Screen.height - bottomMargin - buttonHeight;
GUI.contentColor = m_ped.IsWalkOn ? Color.blue : Color.white;
GUI.contentColor = isWalkOn ? Color.blue : Color.white;
if (GUI.Button(new Rect(xPos, topY, buttonWidth, buttonHeight), "Walk"))
{
isWalkOn = !isWalkOn;
@ -372,7 +391,7 @@ namespace SanAndreasUnity.Behaviours.Peds.States
//topY -= buttonHeight;
xPos -= buttonWidth + horizontalSpace;
GUI.contentColor = m_ped.IsSprintOn ? Color.blue : Color.white;
GUI.contentColor = isSprintOn ? Color.blue : Color.white;
if (GUI.Button(new Rect(xPos, topY, buttonWidth, buttonHeight), "Sprint"))
{
isSprintOn = !isSprintOn;
@ -414,9 +433,9 @@ namespace SanAndreasUnity.Behaviours.Peds.States
}
// aim
bool isAimOn = m_ped.IsAimOn; // preserve current value
bool isAimOn = customInput.GetButton("RightClick"); // preserve current value
topY -= buttonHeight;
GUI.contentColor = m_ped.IsAimOn ? Color.blue : Color.white;
GUI.contentColor = isAimOn ? Color.blue : Color.white;
if (GUI.Button(new Rect(xPos, topY, buttonWidth, buttonHeight), "Aim"))
{
isAimOn = !isAimOn;

2
Docs/TODO.md
View file

@ -27,7 +27,7 @@
- Chat
- Android: HUD must run before other UI scripts ; add perms for read/write access to storage ; forbid screen rotation ; vibrate when ped is damaged ; disable left and right mouse click ; vehicle touch input: forward, backward, handbrake, left & right ; weapon switching buttons ; states to implement hud: fly, ; circular button for movement ; buttons which don't work: aim, sprint, walk ;
- Android: HUD must run before other UI scripts ; add perms for read/write access to storage ; forbid screen rotation ; vibrate when ped is damaged ; disable left and right mouse click ; vehicle touch input: forward, backward, handbrake, left & right ; weapon switching buttons ; states to implement hud: fly, ; circular button for movement ; buttons which don't work: aim, sprint, walk ; lock cursor when testing finishes ;
- Play sounds: horn ; empty weapon slot ; ped damage ; footsteps in run and sprint states ;