2
0
Fork 0
mirror of https://github.com/GTA-ASM/SanAndreasUnity synced 2025-02-18 13:58:28 +00:00

assign mouse move input based on panel's drag events

This commit is contained in:
in0finite 2019-07-26 21:50:27 +02:00
parent de459d92d6
commit 4dca58ff2e
2 changed files with 42 additions and 14 deletions
Assets/Scripts

View file

@ -12,11 +12,12 @@ namespace SanAndreasUnity.UI
public static TouchInput Instance { get; private set; }
Canvas canvas;
GameObject pedMovementInputGo, vehicleInputGo;
public Canvas canvas;
public GameObject panel;
public GameObject pedMovementInputGo, vehicleInputGo;
Button walkButton, sprintButton, jumpButton, crouchButton, enterButton, aimButton, fireButton, flyButton,
exitVehicleButton, nextWeaponButton, previousWeaponButton;
UIEventsPickup jumpButtonEventsPickup, fireButtonEventsPickup, handbrakePickup, backwardVehiclePickup, forwardVehiclePickup;
UIEventsPickup jumpButtonEventsPickup, fireButtonEventsPickup, handbrakePickup, backwardVehiclePickup, forwardVehiclePickup, panelPickup;
Text walkButtonText, sprintButtonText, aimButtonText, jumpButtonText, fireButtonText;
ArrowsMovementButton movementButton, turnVehicleButton;
@ -28,6 +29,10 @@ namespace SanAndreasUnity.UI
public float vehicleTurnMultiplier = 1.5f;
//List<Vector2> m_panelDeltas = new List<Vector2>();
Vector2 m_panelDeltasSum = Vector2.zero;
public float touchPointerSensitivity = 1f;
void Awake ()
@ -36,10 +41,6 @@ namespace SanAndreasUnity.UI
// setup references
canvas = this.transform.GetChild(0).GetComponent<Canvas>();
pedMovementInputGo = canvas.transform.GetChild(0).gameObject;
vehicleInputGo = canvas.transform.GetChild(1).gameObject;
Transform parent = pedMovementInputGo.transform;
walkButton = parent.Find("WalkButton").GetComponent<Button>();
@ -66,6 +67,9 @@ namespace SanAndreasUnity.UI
jumpButtonEventsPickup = jumpButton.gameObject.GetOrAddComponent<UIEventsPickup>();
fireButtonEventsPickup = fireButton.gameObject.GetOrAddComponent<UIEventsPickup>();
// panel
panelPickup = this.panel.GetOrAddComponent<UIEventsPickup>();
// text components
walkButtonText = walkButton.GetComponentInChildren<Text>();
sprintButtonText = sprintButton.GetComponentInChildren<Text>();
@ -73,7 +77,7 @@ namespace SanAndreasUnity.UI
jumpButtonText = jumpButton.GetComponentInChildren<Text>();
fireButtonText = fireButton.GetComponentInChildren<Text>();
// setup button event handlers
// setup event handlers
// note: for this to work properly, EventSystem.Update() must run before our Update()
// toggle buttons
@ -89,6 +93,9 @@ namespace SanAndreasUnity.UI
nextWeaponButton.onClick.AddListener( () => m_nextWeaponPressed = true );
previousWeaponButton.onClick.AddListener( () => m_previousWeaponPressed = true );
// panel
panelPickup.onDrag += (eventData) => this.OnPanelDrag(eventData);
}
void OnLoaderFinished()
@ -119,12 +126,14 @@ namespace SanAndreasUnity.UI
this.canvas.gameObject.SetActive(true);
var customInput = CustomInput.Instance;
// ignore mouse buttons when touch is enabled
CustomInput.Instance.SetButton("LeftClick", false);
if (!CustomInput.Instance.HasButton("RightClick"))
CustomInput.Instance.SetButton("RightClick", false);
CustomInput.Instance.SetButtonDown("LeftClick", false);
CustomInput.Instance.SetButtonDown("RightClick", false);
customInput.SetButton("LeftClick", false);
if (!customInput.HasButton("RightClick"))
customInput.SetButton("RightClick", false);
customInput.SetButtonDown("LeftClick", false);
customInput.SetButtonDown("RightClick", false);
Ped ped = Ped.Instance;
@ -153,6 +162,14 @@ namespace SanAndreasUnity.UI
vehicleInputGo.SetActive(false);
}
// set mouse move input based on panel drag events
this.ResetMouseMoveInput();
customInput.SetAxis("Mouse X", m_panelDeltasSum.x / Screen.width * this.touchPointerSensitivity);
customInput.SetAxis("Mouse Y", m_panelDeltasSum.y / Screen.height * this.touchPointerSensitivity);
// reset deltas sum
m_panelDeltasSum = Vector2.zero;
}
void ResetCustomInput()
@ -292,6 +309,11 @@ namespace SanAndreasUnity.UI
}
void OnPanelDrag(UnityEngine.EventSystems.PointerEventData eventData)
{
m_panelDeltasSum += eventData.delta;
}
}
}

View file

@ -6,7 +6,7 @@ namespace SanAndreasUnity.Utilities
{
public class UIEventsPickup : MonoBehaviour, IPointerClickHandler, IPointerEnterHandler, IPointerExitHandler, IPointerDownHandler,
IPointerUpHandler
IPointerUpHandler, IDragHandler
{
public event Action<PointerEventData> onPointerClick = delegate {};
@ -14,6 +14,7 @@ namespace SanAndreasUnity.Utilities
public event Action<PointerEventData> onPointerExit = delegate {};
public event Action<PointerEventData> onPointerDown = delegate {};
public event Action<PointerEventData> onPointerUp = delegate {};
public event Action<PointerEventData> onDrag = delegate {};
public bool IsPointerInside { get; private set; } = false;
public bool IsPointerDown { get; private set; } = false;
@ -55,6 +56,11 @@ namespace SanAndreasUnity.Utilities
onPointerUp (eventData);
}
public void OnDrag (PointerEventData eventData)
{
onDrag (eventData);
}
}