Merge remote-tracking branch 'origin/144-inpenetratablewalls' into FrenchExperiment

# Conflicts:
#	Assets/Scenes/MediaRoom.unity

Assets/Samples/XR Interaction Toolkit/3.0.4/Starter Assets/XRI Default Input Actions.inputactions

@@ -27,7 +27,7 @@
                     "name": "Is Tracked",
                     "type": "Button",
                     "id": "6bb4e248-e42b-47c3-b66c-79566508ca74",
-                    "expectedControlType": "Button",
+                    "expectedControlType": "",
                     "processors": "",
                     "interactions": "",
                     "initialStateCheck": true

Assets/WallOffset.cs

+using Codice.Client.Common;
+using System.Threading.Tasks;
+using TeachR.ApplicationManager;
+using Unity.XR.CoreUtils;
+using UnityEngine;
+using Time = UnityEngine.Time;
+
+public class WallOffset : MonoBehaviour
+{
+    /*
+     * This Class will establish a Collider sorrounding the XRRig that detects the walls and prevents the player from walking through them by stopping the movement in the direction of the wall.
+     */
+    [SerializeField] private XROrigin xrOrigin;
+
+    void Awake()
+    {
+        InitGlobals.LogicInitHook += EnsureColliderOnXRRig;
+    }
+
+    private Task EnsureColliderOnXRRig()
+    {
+
+        /*
+         * The Wall needs a Collider which is not a Trigger
+         * The wall needs a Rigidbody
+         * 
+         * the walloffset needs a Collider and a Rigidbody
+         */
+        if (GetComponent<Collider>() == null)
+        {
+            
+            SphereCollider col = gameObject.AddComponent<SphereCollider>();
+            col.radius = 0.5f;
+            col.isTrigger = false; // Sicherstellen, dass der Collider kein Trigger ist
+            Debug.Log("Added SphereCollider to CameraOffset");
+
+            if(GetComponent<Rigidbody>() == null)
+            {
+                Rigidbody rb = gameObject.AddComponent<Rigidbody>();
+                rb.isKinematic = true;
+                rb.useGravity = false;
+            }
+
+        }
+        return Task.CompletedTask;
+    }
+
+    private void OnCollisionStay(Collision collision)
+    {
+        // berprfen, ob das kollidierende Objekt das Tag "Wall" hat
+        if (collision.gameObject.CompareTag("Wall"))
+        {
+            // Berechne die Richtung von der Wand weg
+            Vector3 directionAwayFromWall = transform.position - collision.contacts[0].point;
+            directionAwayFromWall.y = 0; // Nur die horizontale Richtung bercksichtigen
+
+            // Berechne die neue Position des XRRig
+            Vector3 newPosition = xrOrigin.transform.position + directionAwayFromWall.normalized * 0.1f;
+
+            // Setze die neue Position des XRRig mit einer glatten Bewegung
+            xrOrigin.transform.position = Vector3.Lerp(xrOrigin.transform.position, newPosition, Time.deltaTime);
+        }
+    }
+
+}

Assets/WallOffset.cs.meta

+fileFormatVersion: 2
+guid: a807e1003469e8349ad4334bbe5ddc5b
\ No newline at end of file

ProjectSettings/TagManager.asset

@@ -26,6 +26,7 @@ TagManager:
   - Cap Placement
   - Walkable
   - Teacher
+  - Wall
   layers:
   - Default
   - TransparentFX