From 9fe33c1ae076b0f6501619388e6b4cc872b76f80 Mon Sep 17 00:00:00 2001
From: smchoi <ws5260@naver.com>
Date: 수, 31 7월 2024 10:37:31 +0900
Subject: [PATCH] BIgUpdate
---
Assets/Korail/Scripts/VRInputManager.cs | 44 ++++++++++++++++++++++++--------------------
1 files changed, 24 insertions(+), 20 deletions(-)
diff --git a/Assets/Korail/Scripts/VRInputManager.cs b/Assets/Korail/Scripts/VRInputManager.cs
index 8ba0b5d..7a02cf2 100644
--- a/Assets/Korail/Scripts/VRInputManager.cs
+++ b/Assets/Korail/Scripts/VRInputManager.cs
@@ -52,7 +52,7 @@
private bool primary2DAxisRightUpTouch = false;
private Vector2 leftTrackPos = Vector2.zero;
private Vector2 rightTrackPos = Vector2.zero;
-
+
private bool triggerIsRunning = false;
private bool leftTriggerPressed = false;
@@ -85,7 +85,7 @@
public UnityEvent TriggerSelectExit;
-
+
public override void Awake()
{
@@ -93,12 +93,16 @@
void Start()
{
- Menu.SetActive(false);
-
+ if (Menu != null)
+ {
+ Menu.SetActive(false);
+ }
+
+
}
-
+
// Update is called once per frame
void Update()
{
@@ -108,7 +112,7 @@
OnMenuButton(leftHandDevice, rightHandDevice);
OnGripButton(leftHandDevice, rightHandDevice);
-
+
}
@@ -159,34 +163,34 @@
rightHandDevice.TryGetFeatureValue(CommonUsages.primary2DAxis, out rightTrackPos);
float angle = 0;
- if(!primary2DAxisRightUpTouch)
+ if (!primary2DAxisRightUpTouch)
{
- angle = Mathf.Atan2(leftTrackPos.y, leftTrackPos.x) * Mathf.Rad2Deg;
+ angle = Mathf.Atan2(leftTrackPos.y, leftTrackPos.x) * Mathf.Rad2Deg;
//primary2DAxisLeftUpTouch = ActivateTeleportation(angle);
}
-
-
- if(!primary2DAxisLeftUpTouch)
+
+
+ if (!primary2DAxisLeftUpTouch)
{
angle = Mathf.Atan2(rightTrackPos.y, rightTrackPos.x) * Mathf.Rad2Deg;
//primary2DAxisRightUpTouch = ActivateTeleportation(angle);
}
-
-
-
+
+
+
if (leftTrackPadPressed && !trackPadIsRunning)
{
trackPadIsRunning = true;
- angle = Mathf.Atan2(leftTrackPos.y, leftTrackPos.x) * Mathf.Rad2Deg;
+ angle = Mathf.Atan2(leftTrackPos.y, leftTrackPos.x) * Mathf.Rad2Deg;
ActionTrackPad(angle);
}
else if (rightTrackPadPressed && !trackPadIsRunning)
{
trackPadIsRunning = true;
- angle = Mathf.Atan2(rightTrackPos.y, rightTrackPos.x) * Mathf.Rad2Deg;
+ angle = Mathf.Atan2(rightTrackPos.y, rightTrackPos.x) * Mathf.Rad2Deg;
ActionTrackPad(angle);
}
@@ -273,24 +277,24 @@
{
leftHandDevice.TryGetFeatureValue(CommonUsages.gripButton, out leftGripPressed);
rightHandDevice.TryGetFeatureValue(CommonUsages.gripButton, out rightGripPressed);
-
+
if (leftGripPressed)
{
gripIsRunning = true;
-
+
}
else if (rightGripPressed)
{
gripIsRunning = true;
-
+
}
else if (!leftGripPressed && !rightGripPressed && gripIsRunning)
{
gripIsRunning = false;
-
+
}
}
--
Gitblit v1.8.0