Added missing XR namespace.

uni-bremen-agst · Oct 15, 2024 · 8d9eb13 · 8d9eb13
1 parent 837bb4b
commit 8d9eb13
Show file tree

Hide file tree

Showing 24 changed files with 955 additions and 922 deletions.
diff --git a/Assets/Resources/Prefabs/Players/XRRig.prefab b/Assets/Resources/Prefabs/Players/XRRig.prefab
@@ -3324,7 +3324,7 @@ MonoBehaviour:
           m_StringArgument: 
           m_BoolArgument: 0
         m_CallState: 2
-  radialMenu: {fileID: -5982496924579745919, guid: c348712bda248c246b8c49b3db54643f,
+  RadialMenuActionRef: {fileID: -5982496924579745919, guid: c348712bda248c246b8c49b3db54643f,
     type: 3}
 --- !u!1 &7806924667908141112
 GameObject:
@@ -5196,7 +5196,6 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: df5e8c7d8b96d6944aaafef73a15f5b0, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  m_RayInteractor: {fileID: 645861538944586177}
   inputAction: {fileID: -1379689384741821685, guid: c348712bda248c246b8c49b3db54643f,
     type: 3}
   undo: {fileID: -989603093121905207, guid: c348712bda248c246b8c49b3db54643f, type: 3}

diff --git a/Assets/SEE/Controls/Actions/AcceptDivergenceAction.cs b/Assets/SEE/Controls/Actions/AcceptDivergenceAction.cs
@@ -13,6 +13,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using UnityEngine;
+using SEE.XR;
 
 namespace SEE.Controls.Actions
 {
@@ -116,7 +117,7 @@ public override bool Update()
         {
             if (SceneSettings.InputType == PlayerInputType.VRPlayer)
             {
-                if (XRSEEActions.Selected 
+                if (XRSEEActions.Selected
                     && XRSEEActions.RayInteractor.TryGetCurrent3DRaycastHit(out RaycastHit hit))
                 {
                     // find the edge representing the divergence that should be solved.

diff --git a/Assets/SEE/Controls/Actions/AddEdgeAction.cs b/Assets/SEE/Controls/Actions/AddEdgeAction.cs
@@ -10,6 +10,7 @@
 using SEE.Audio;
 using SEE.DataModel.DG;
 using SEE.Game.SceneManipulation;
+using SEE.XR;
 
 namespace SEE.Controls.Actions
 {

diff --git a/Assets/SEE/Controls/Actions/AddNodeAction.cs b/Assets/SEE/Controls/Actions/AddNodeAction.cs
@@ -9,6 +9,7 @@
 using System;
 using SEE.UI.PropertyDialog;
 using SEE.DataModel.DG;
+using SEE.XR;
 
 namespace SEE.Controls.Actions
 {

diff --git a/Assets/SEE/Controls/Actions/ContextMenuAction.cs b/Assets/SEE/Controls/Actions/ContextMenuAction.cs
@@ -17,6 +17,7 @@
 using SEE.GO.Menu;
 using SEE.UI.Menu.Drawable;
 using SEE.UI.Window.PropertyWindow;
+using SEE.XR;
 
 namespace SEE.Controls.Actions
 {

diff --git a/Assets/SEE/Controls/Actions/DeleteAction.cs b/Assets/SEE/Controls/Actions/DeleteAction.cs
@@ -8,6 +8,7 @@
 using SEE.Audio;
 using SEE.Game.SceneManipulation;
 using SEE.Utils.History;
+using SEE.XR;
 
 namespace SEE.Controls.Actions
 {

diff --git a/Assets/SEE/Controls/Actions/HideAction.cs b/Assets/SEE/Controls/Actions/HideAction.cs
@@ -7,6 +7,7 @@
 using UnityEngine;
 using UnityEngine.Assertions;
 using SEE.Utils.History;
+using SEE.XR;
 
 namespace SEE.Controls.Actions
 {

diff --git a/Assets/SEE/Controls/Actions/MoveAction.cs b/Assets/SEE/Controls/Actions/MoveAction.cs
@@ -15,6 +15,7 @@
 using SEE.Utils.History;
 using UnityEngine;
 using UnityEngine.EventSystems;
+using SEE.XR;
 
 
 namespace SEE.Controls.Actions

diff --git a/Assets/SEE/Controls/Actions/NodeManipulationAction.cs b/Assets/SEE/Controls/Actions/NodeManipulationAction.cs
@@ -9,6 +9,7 @@
 using SEE.Utils.History;
 using System.Collections.Generic;
 using UnityEngine;
+using SEE.XR;
 
 namespace SEE.Controls.Actions
 {

diff --git a/Assets/SEE/Controls/Actions/SelectAction.cs b/Assets/SEE/Controls/Actions/SelectAction.cs
@@ -4,6 +4,7 @@
 using UnityEngine;
 using SEE.Audio;
 using SEE.GO;
+using SEE.XR;
 
 namespace SEE.Controls.Actions
 {

diff --git a/Assets/SEE/Controls/Actions/ShowCodeAction.cs b/Assets/SEE/Controls/Actions/ShowCodeAction.cs
@@ -14,6 +14,7 @@
 using SEE.Utils.History;
 using SEE.Game.City;
 using SEE.VCS;
+using SEE.XR;
 using GraphElementRef = SEE.GO.GraphElementRef;
 using Range = SEE.DataModel.DG.Range;
 

diff --git a/Assets/SEE/Controls/Actions/ShowLabel.cs b/Assets/SEE/Controls/Actions/ShowLabel.cs
@@ -6,6 +6,7 @@
 using SEE.Game.Operator;
 using SEE.GO;
 using UnityEngine;
+using SEE.XR;
 
 namespace SEE.Controls.Actions
 {

diff --git a/Assets/SEE/Controls/SEEInput.cs b/Assets/SEE/Controls/SEEInput.cs
@@ -2,6 +2,7 @@
 using SEE.Utils;
 using UnityEngine;
 using SEE.GO;
+using SEE.XR;
 
 namespace SEE.Controls
 {

diff --git a/Assets/SEE/GameObjects/Menu/PlayerMenu.cs b/Assets/SEE/GameObjects/Menu/PlayerMenu.cs
@@ -8,6 +8,7 @@
 using SEE.UI.StateIndicator;
 using SEE.Utils;
 using UnityEngine;
+using SEE.XR;
 
 namespace SEE.GO.Menu
 {

diff --git a/Assets/SEE/UI/PopupMenu/PopupMenu.cs b/Assets/SEE/UI/PopupMenu/PopupMenu.cs
@@ -10,6 +10,7 @@
 using TMPro;
 using UnityEngine;
 using UnityEngine.UI;
+using SEE.XR;
 
 namespace SEE.UI.PopupMenu
 {

diff --git a/Assets/SEE/UI/Window/PropertyWindow/PropertyWindowContextMenu.cs b/Assets/SEE/UI/Window/PropertyWindow/PropertyWindowContextMenu.cs
@@ -10,6 +10,7 @@
 using TMPro;
 using UnityEngine;
 using UnityEngine.Events;
+using SEE.XR;
 
 namespace SEE.UI.Window.PropertyWindow
 {

diff --git a/Assets/SEE/UI/Window/TreeWindow/DesktopTreeWindow.cs b/Assets/SEE/UI/Window/TreeWindow/DesktopTreeWindow.cs
@@ -16,6 +16,7 @@
 using UnityEngine;
 using UnityEngine.EventSystems;
 using UnityEngine.UI;
+using SEE.XR;
 using ArgumentException = System.ArgumentException;
 using Edge = SEE.DataModel.DG.Edge;
 using Node = SEE.DataModel.DG.Node;

diff --git a/Assets/SEE/Utils/Raycasting.cs b/Assets/SEE/Utils/Raycasting.cs
@@ -7,6 +7,7 @@
 using UnityEngine.EventSystems;
 using UnityEngine.InputSystem;
 using UnityEngine.InputSystem.UI;
+using SEE.XR;
 
 namespace SEE.Utils
 {

diff --git a/Assets/SEE/XR/KeyboardInputHandler.cs b/Assets/SEE/XR/KeyboardInputHandler.cs
@@ -4,35 +4,38 @@
 using UnityEngine;
 using UnityEngine.EventSystems;
 
-/// <summary>
-/// This class changes the inputfield for the VR-Keyboard and
-/// also activates the keyboard.
-/// This script is based on this tutorial: https://www.youtube.com/watch?v=vTonHBr4t4g
-/// </summary>
-public class KeyboardInputHandler : MonoBehaviour, IPointerClickHandler
+namespace SEE.XR
 {
     /// <summary>
-    /// The reference to the keyboard GameObject.
+    /// This class changes the inputfield for the VR-Keyboard and
+    /// also activates the keyboard.
+    /// This script is based on this tutorial: https://www.youtube.com/watch?v=vTonHBr4t4g
     /// </summary>
-    private GameObject keyboardGameObject;
-
-    private void Start()
+    public class KeyboardInputHandler : MonoBehaviour, IPointerClickHandler
     {
-        // Cache the reference to the keyboard GameObject
-        keyboardGameObject = KeyboardManager.instance.gameObject.transform.Find("Keyboard").gameObject;
-    }
+        /// <summary>
+        /// The reference to the keyboard GameObject.
+        /// </summary>
+        private GameObject keyboardGameObject;
 
-    /// <summary>
-    /// This method gets called when the user clicks the input field.
-    /// If the user is in VR, the keyboard gets activated.
-    /// </summary>
-    /// <param name="eventdata">Event data associated with the event when the user clicks on the inputfield.</param>
-    public void OnPointerClick(PointerEventData eventdata)
-    {
-        if (SceneSettings.InputType == PlayerInputType.VRPlayer)
+        private void Start()
+        {
+            // Cache the reference to the keyboard GameObject
+            keyboardGameObject = KeyboardManager.instance.gameObject.transform.Find("Keyboard").gameObject;
+        }
+
+        /// <summary>
+        /// This method gets called when the user clicks the input field.
+        /// If the user is in VR, the keyboard gets activated.
+        /// </summary>
+        /// <param name="eventdata">Event data associated with the event when the user clicks on the inputfield.</param>
+        public void OnPointerClick(PointerEventData eventdata)
         {
-            KeyboardManager.instance.inputField = GetComponent<TMP_InputField>();
-            keyboardGameObject.SetActive(true);
+            if (SceneSettings.InputType == PlayerInputType.VRPlayer)
+            {
+                KeyboardManager.instance.inputField = GetComponent<TMP_InputField>();
+                keyboardGameObject.SetActive(true);
+            }
         }
     }
 }