diff --git a/Assets/_PROJECT/Components/NewHandPresence/Prefabs/Scripts/Menu.cs b/Assets/_PROJECT/Components/NewHandPresence/Prefabs/Scripts/Menu.cs index d063cbad..bbb20e1e 100644 --- a/Assets/_PROJECT/Components/NewHandPresence/Prefabs/Scripts/Menu.cs +++ b/Assets/_PROJECT/Components/NewHandPresence/Prefabs/Scripts/Menu.cs @@ -323,12 +323,12 @@ public class Menu : MonoBehaviour if (PlayericonFloor1Parent.activeSelf) { PlayericonFloor1.GetComponent().anchoredPosition = IMG_Player; - Debug.Log(IMG_Player); + //Debug.Log(IMG_Player); } if (PlayericonFloor2Parent.activeSelf) { PlayericonFloor2.GetComponent().anchoredPosition = IMG_Player; - Debug.Log(IMG_Player); + //Debug.Log(IMG_Player); } /* diff --git a/Assets/_PROJECT/Components/Portals2/Space enter Collider.cs b/Assets/_PROJECT/Components/Portals2/Space enter Collider.cs index 79d45d14..f8e2e647 100644 --- a/Assets/_PROJECT/Components/Portals2/Space enter Collider.cs +++ b/Assets/_PROJECT/Components/Portals2/Space enter Collider.cs @@ -1,11 +1,30 @@ using System.Collections; using System.Collections.Generic; +using Unity.XR.CoreUtils; using UnityEngine; public class SpaceEnterCollider : MonoBehaviour { + public GameObject InstructionText; private void OnTriggerEnter(Collider other) { + XROrigin player = other.GetComponent(); + if (player == null) return; + + // Get player's Z rotation (in degrees) + float playerZ = player.transform.rotation.eulerAngles.z; + + if (Mathf.Approximately(playerZ, 0f)) + { + InstructionText.transform.rotation = Quaternion.Euler(0f, 0f, 0f); + //Debug.Log("Instruction text rotation" + InstructionText.transform.rotation); + } + else + { + InstructionText.transform.rotation = Quaternion.Euler(0f, 0f, -180f); + //Debug.Log("Instruction text rotation" + InstructionText.transform.rotation); + } + GravityHandler playerGravity = other.GetComponent(); if (playerGravity != null) { @@ -16,6 +35,9 @@ public class SpaceEnterCollider : MonoBehaviour private void OnTriggerExit(Collider other) { + XROrigin Player = other.GetComponent(); + if (Player == null) return; + GravityHandler playerGravity = other.GetComponent(); if (playerGravity != null) { diff --git a/Assets/_PROJECT/Scenes/DeltaBuilding_base.unity b/Assets/_PROJECT/Scenes/DeltaBuilding_base.unity index b1198c21..acf0830a 100644 --- a/Assets/_PROJECT/Scenes/DeltaBuilding_base.unity +++ b/Assets/_PROJECT/Scenes/DeltaBuilding_base.unity @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:62a98ad6509abf5c45a4764920808f3c1db504c7b6c10ad7d4c4d79757bced0b -size 63208552 +oid sha256:388db76fdb18aac982c6a9e7b0d69993e85ae3cab0d4d72411f7cfe0814a5234 +size 63207051 diff --git a/Build.zip b/Build.zip index 4080c439..5cac4aa6 100644 --- a/Build.zip +++ b/Build.zip @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d69e2d173376ebbca4e930e1e09ad5845dc31ca71495368630795e04bcc16150 -size 606286550 +oid sha256:7b514b5e5b2b79cdf54ab46999ea7c914eb79c0be9b22956d4c7f042e5bd92ee +size 606923902