partymode switch

UoA-eResearch · May 15, 2020 · 55297de · 55297de
1 parent 031126b
commit 55297de
Show file tree

Hide file tree

Showing 3 changed files with 54 additions and 249 deletions.
diff --git a/Assets/Scripts/PartyModeSwitch.cs b/Assets/Scripts/PartyModeSwitch.cs
@@ -22,7 +22,8 @@ public class PartyModeSwitch : MonoBehaviour, IMenu
 	// Update is called once per frame
 	void Update ()
 	{
-		if (linearMapping.value < .5)
+		linearMapping.value = myHandle.transform.localPosition.x;
+		if (linearMapping.value < 0)
 		{
 			EnablePartyMode();
 		}

diff --git a/Assets/Scripts/ResetButton.cs b/Assets/Scripts/ResetButton.cs
@@ -14,41 +14,9 @@ void Start () {
 
 	}
 
-	void OnCollisionEnter(Collision other)
+	void OnTriggerEnter()
 	{
-		if (other.transform != transform && other.transform.GetComponent<Hand>())
-		{
-			Debug.Log("colliding with a hand" + other.transform.name);
-		}
-	}
-
-	private void OnHandHoverEnd(Hand hand)
-	{
-		Debug.Log(hand.transform.name);
-	}
-
-	// private void OnHandHoverBegin(Hand hand)
-	// {
-	// 	Debug.Log(hand.transform.name);
-	// 	Debug.Log(transform.name);
-	// }
-
-	// private IEnumerator HandHoverUpdate(Hand hand)
-	// {
-	// 	if (hand.GetThumbpadButtonDown() || ((hand.controller != null) && hand.controller.GetPressDown(Valve.VR.EVRButtonId.k_EButton_Grip)))
-	// 	{
-	// 		partyModeSwitch.IncrementValue();
-	// 		yield return null;
-	// 		partyModeSwitch.DecrementValue();
-	// 	}
-	// }
-
-	private void HandHoverUpdate(Hand hand)
-	{
-		if (hand.GetThumbpadButtonDown() || ((hand.controller != null) && hand.controller.GetPressDown(Valve.VR.EVRButtonId.k_EButton_Grip)))
-		{
-			ResetPartyMode();
-		}
+		ResetPartyMode();
 	}
 
 	/// <summary>