fix code structure. add comments

Hector_v2/Assets/Hints/ControllerHints.cs

@@ -59,7 +59,7 @@ public class ControllerHints : MonoBehaviour
     {
         if (!isShowingHints)
         {
-            if (input.inMenu)
+            if (InteractionManagement.Instance.Menu_Opened)
             {
                 isShowingHints = ShowMenuHints();
             }
@@ -80,7 +80,7 @@ public class ControllerHints : MonoBehaviour
     // Clears current hints if the player changes environments.
     void Update()
     {
-        if (input.inMenu)
+        if (InteractionManagement.Instance.Menu_Opened)
         {
             DeactivateSimHints();
         }

Hector_v2/Assets/Prefabs/Test/Test Management.prefab

@@ -689142,7 +689142,7 @@ SphereCollider:
   m_IsTrigger: 1
   m_Enabled: 1
   serializedVersion: 2
-  m_Radius: 2.638918
+  m_Radius: 5
   m_Center: {x: 0, y: 0, z: 0}
 --- !u!1 &8547973414822889647
 GameObject:

Hector_v2/Assets/Scripts/Menu/CameraAutoLoader.cs

@@ -7,7 +7,8 @@ public class CameraAutoLoader : MonoBehaviour
     public MenuMaker CameraContent;
 
     private void OnEnable() {
-        InteractionManagement.Instance.SetCamera(CameraContent);
+        if(InteractionManagement.Instance != null)
+            InteractionManagement.Instance.SetCamera(CameraContent);
     }
     // Start is called before the first frame update
     void Start()

Hector_v2/Assets/Scripts/Menu/InteractionManagement.cs

@@ -3,7 +3,6 @@
  * 
  */
 
-
 using UnityEngine;
 using System.Collections;
 using Valve.VR;
@@ -68,7 +67,6 @@ public class InteractionManagement : MonoBehaviour
     // Start is called before the first frame update
     void Start()
     {
-        //SetMenu(true);
     }
 
     // Update is called once per frame
@@ -105,6 +103,8 @@ public class InteractionManagement : MonoBehaviour
     }
 
 
+    // Show messages to palyer
+    // time: the duraton(second) that msg will remain 
     public void SetPlayerText(string msg, float time = 0, bool showOldText = true){
         if(time == 0 ){
             playerText.text = msg; 
@@ -115,12 +115,13 @@ public class InteractionManagement : MonoBehaviour
 
         }
     }
+
+    // close the message box
     public void SetPlayerText(){
         playerText.text = "";
         playerTextPanel.SetActive(false);
     }
 
-    // Experimental: Prints a text for "seconds" seconds in player text. If showOldText is true, shows text that was shown before after time is over.
     IEnumerator PrintInfoForXSeconds(string text, float seconds, bool showOldText)
     {
         string oldPlayerText = playerText.text;
@@ -135,7 +136,9 @@ public class InteractionManagement : MonoBehaviour
         }       
     }
     
-    // Updates camera images and loads new image data on buttons.
+    // Updates camera images and loads new image data on buttons. 
+    // Need CameraAutoLoader.cs
+    // has not been tested. This function is copied directly from the origin project -Jingyi
     public void SetCamera(MenuMaker CameraContent){
         cc.updateCams();
         StartCoroutine(Load(CameraContent));

Hector_v2/Assets/Scripts/Menu/UIDrag.cs

@@ -28,7 +28,7 @@ public class UIDrag: MonoBehaviour,IPointerDownHandler,IPointerUpHandler
     public void OnPointerDown(PointerEventData eventData)
     {   
         if(!InteractionManagement.Instance.Robot_Locked && autoLockRobot){
-            InteractionManagement.Instance.LockRobot(true);
+            InteractionManagement.Instance.LockRobot(true);     // automatically lock the robot
         }
         startDrag();
     }

Hector_v2/Assets/Scripts/Outline/control_lock_color.cs

@@ -1,5 +1,6 @@
 /* control_lock_color.cs
  * author: Yannic Seidler
+ * modified:  Jingyi
  */
 
 using System.Collections;
@@ -18,7 +19,6 @@ public class control_lock_color : MonoBehaviour
     
     void Start()
     {
-        vrInput = GameObject.Find("Input").GetComponent<VRInput>();
         outLiner = GetComponent<Outline>();
     }
 
@@ -26,9 +26,9 @@ public class control_lock_color : MonoBehaviour
     // Enables the Outline.cs script which is also attached to the robot prefabs if the robot is locked. 
     void Update()
     {
-        if (vrInput != null)
+        if (InteractionManagement.Instance != null)
         {
-            if(vrInput.isLocked == true)
+            if(InteractionManagement.Instance.Robot_Locked == true)
             {
                 outLiner.enabled = true;
             }

Hector_v2/Assets/Scripts/Player/VRInput.cs

@@ -4,15 +4,10 @@ using Valve.VR;
 using UnityEngine.UI;
 using Valve.VR.InteractionSystem;
 
-// Class that handles controller input.
-// Attached to GameObject Input in the hierachy.
 public class VRInput : MonoBehaviour
 {
     public GameObject CurrentMode;
-    
-    public bool inMenu => InteractionManagement.Instance.Menu_Opened;
-    public bool isLocked => InteractionManagement.Instance.Robot_Locked;
-    public Vector2 touchValue; 
+    public Vector2 signal; 
     
     private void Awake()
     {   
@@ -36,13 +31,13 @@ public class VRInput : MonoBehaviour
   
 
     // update the velocity and angle according to the mode
-    public Vector2 getTouchValue()
+    public Vector2 getSignal()
     {   
         Vector2 signal = Vector2.zero;
         if(CurrentMode!=null){
             signal = CurrentMode.GetComponent<IMode>().Signal;
         }
-        touchValue = signal;
+        this.signal = signal;
         return signal;
             
     }

Hector_v2/Assets/Scripts/Player/VRInputCopy.cs

@@ -208,7 +208,7 @@ public class VRInputCopy : MonoBehaviour
         }
     }
 
-    public Vector2 getTouchValue()
+    public Vector2 getSignal()
     {   
         return touchValue;
     }

Hector_v2/Assets/Scripts/Roboter/RoboterControl.cs

@@ -52,11 +52,11 @@ public class RoboterControl : MonoBehaviour
         {
             // Orientation of asterix different
             case robotType.asterix_ugv:
-                controlSignal = input.getTouchValue();
+                controlSignal = input.getSignal();
                 controlSignal.y = -controlSignal.y;
                 break;
             default:
-                controlSignal = input.getTouchValue();
+                controlSignal = input.getSignal();
                 break;
         }
         

Hector_v2/Assets/Scripts/Test/Radar.cs

@@ -19,7 +19,7 @@ public class Radar : MonoBehaviour
     private void OnTriggerEnter(Collider other) {
         if( other.gameObject.layer == LayerMask.NameToLayer("Invisible")){
             foreach(Transform tran in  other.gameObject.GetComponentsInChildren<Transform>()){
-			    tran.gameObject.layer = LayerMask.NameToLayer("Radar");
+			    tran.gameObject.layer = LayerMask.NameToLayer("LiDAR");
 		    }
         }
             

Hector_v2/Assets/Scripts/Test/Test.cs

@@ -48,7 +48,7 @@ public class Test : MonoBehaviour
             robot.transform.Rotate(angularVelocity);  
         }
         else{
-            Vector2 controlSignal = GameObject.Find("Input").GetComponent<VRInput>().getTouchValue();
+            Vector2 controlSignal = GameObject.Find("Input").GetComponent<VRInput>().getSignal();
             Vector3  linearVelocity = new Vector3(0,0,controlSignal.y);
             Vector3  angularVelocity = new Vector3(0,controlSignal.x,0);
             robot.transform.Translate(linearVelocity);

Hector_v2/Assets/Scripts/Test/TestRobot.cs

@@ -53,7 +53,7 @@ public class TestRobot : MonoBehaviour
         PrePosition = transform.position;
 
         // caculate the time
-        Vector2 controlSignal = GameObject.Find("Input").GetComponent<VRInput>().getTouchValue();
+        Vector2 controlSignal = GameObject.Find("Input").GetComponent<VRInput>().getSignal();
         if(controlSignal!=Vector2.zero || this.GetComponent<NavMeshAgent>().velocity!=Vector3.zero){
             totalDriveTime += Time.deltaTime;
             averageSpeed = totalDriveDistance/totalDriveTime;
@@ -74,7 +74,7 @@ public class TestRobot : MonoBehaviour
             
         }
         else{
-            Vector2 controlSignal = GameObject.Find("Input").GetComponent<VRInput>().getTouchValue();
+            Vector2 controlSignal = GameObject.Find("Input").GetComponent<VRInput>().getSignal();
             linearVelocity = new Vector3(0,0,controlSignal.y * linearSpeed);
             angularVelocity = new Vector3(0,controlSignal.x * angularSpeed,0);
         }

Hector_v2/Library/CurrentLayout-default.dwlt

@@ -14,8 +14,8 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   m_PixelRect:
     serializedVersion: 2
-    x: -50
-    y: 191
+    x: -12
+    y: 235
     width: 1904
     height: 981
   m_ShowMode: 4
@@ -48,7 +48,7 @@ MonoBehaviour:
   m_MinSize: {x: 679, y: 492}
   m_MaxSize: {x: 14002, y: 14042}
   vertical: 0
-  controlID: 118
+  controlID: 160
 --- !u!114 &3
 MonoBehaviour:
   m_ObjectHideFlags: 52
@@ -219,7 +219,7 @@ MonoBehaviour:
   m_MinSize: {x: 403, y: 492}
   m_MaxSize: {x: 10001, y: 14042}
   vertical: 1
-  controlID: 119
+  controlID: 114
 --- !u!114 &10
 MonoBehaviour:
   m_ObjectHideFlags: 52
@@ -244,7 +244,7 @@ MonoBehaviour:
   m_MinSize: {x: 403, y: 221}
   m_MaxSize: {x: 8003, y: 4021}
   vertical: 0
-  controlID: 120
+  controlID: 115
 --- !u!114 &11
 MonoBehaviour:
   m_ObjectHideFlags: 52
@@ -319,8 +319,8 @@ MonoBehaviour:
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 359
-    y: 99
+    x: 360
+    y: 81
     width: 1005
     height: 441
   m_ViewDataDictionary: {fileID: 0}
@@ -411,8 +411,8 @@ MonoBehaviour:
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: -50
-    y: 683
+    x: 0
+    y: 481
     width: 1358
     height: 448
   m_ViewDataDictionary: {fileID: 0}
@@ -429,20 +429,20 @@ MonoBehaviour:
     m_SkipHidden: 0
     m_SearchArea: 1
     m_Folders:
-    - Assets/Scripts/Test
+    - Assets/Scenes
   m_ViewMode: 1
   m_StartGridSize: 78
   m_LastFolders:
-  - Assets/Scripts/Test
+  - Assets/Scenes
   m_LastFoldersGridSize: 78
   m_LastProjectPath: C:\Users\alley\Desktop\Hecto\Hector_v2
   m_LockTracker:
     m_IsLocked: 0
   m_FolderTreeState:
-    scrollPos: {x: 0, y: 164}
-    m_SelectedIDs: 1e830000
-    m_LastClickedID: 33566
-    m_ExpandedIDs: 00000000f6820000028300000c83000000ca9a3b
+    scrollPos: {x: 0, y: 143}
+    m_SelectedIDs: 08830000
+    m_LastClickedID: 33544
+    m_ExpandedIDs: 00000000f68200000a83000000ca9a3b
     m_RenameOverlay:
       m_UserAcceptedRename: 0
       m_Name: 
@@ -547,8 +547,8 @@ MonoBehaviour:
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 1309
-    y: 221
+    x: 1347
+    y: 265
     width: 544
     height: 910
   m_ViewDataDictionary: {fileID: 0}
@@ -585,31 +585,31 @@ MonoBehaviour:
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: -50
-    y: 221
+    x: 0
+    y: 19
     width: 351
     height: 441
   m_ViewDataDictionary: {fileID: 0}
   m_SceneHierarchy:
     m_TreeViewState:
       scrollPos: {x: 0, y: 0}
-      m_SelectedIDs: 648ef1ff
-      m_LastClickedID: -946588
-      m_ExpandedIDs: b290f1ff321bf2ff5651f2ff468cf2ffc2c5f2ff204af3ff86bdf3ff56fdf4ff7afdf4ffe6fff4ff942df7ffb82df7ffd62df7ff4a4df7ff4a9df7ff6e15faffe617faff0018faff3818faff5618faffce37faffbabdfaffc4bdfaff0eddfaff2c41fbff3641fbff245dfbff789efbfff0defbff2232fcffbcd3fcff361afdffcc82fdff92f3fdffba49feffdabffeff3efbffffc23e0000f44700008e500000b259000008600000544d0300ec43050028450500e6890500a29c050036a805003ea8050056320800ee420800645108002064080000cf0b00b6d40b00d2d60b00ead70b005ee20b00cae20b005ae60b00ece70b004ce80b0002ed0b003cef0b00560c10006e0e1000b4161000ee1a1000d61c10004e211000b4301000303e1000
+      m_SelectedIDs: 58c30000
+      m_LastClickedID: 0
+      m_ExpandedIDs: d817fcff0619fcff8432fcff886bfcffa2c0feffc6c0feffe4c0feffe8e2fefff0f8ffff3efbffff
       m_RenameOverlay:
         m_UserAcceptedRename: 0
-        m_Name: Top Camera
-        m_OriginalName: Top Camera
+        m_Name: 
+        m_OriginalName: 
         m_EditFieldRect:
           serializedVersion: 2
           x: 0
           y: 0
           width: 0
           height: 0
-        m_UserData: -721590
+        m_UserData: 0
         m_IsWaitingForDelay: 0
         m_IsRenaming: 0
-        m_OriginalEventType: 0
+        m_OriginalEventType: 11
         m_IsRenamingFilename: 0
         m_ClientGUIView: {fileID: 4}
       m_SearchString: 
@@ -640,8 +640,8 @@ MonoBehaviour:
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 302
-    y: 221
+    x: 340
+    y: 265
     width: 1005
     height: 441
   m_ViewDataDictionary: {fileID: 0}
@@ -655,9 +655,9 @@ MonoBehaviour:
   m_PlayAudio: 0
   m_AudioPlay: 0
   m_Position:
-    m_Target: {x: -10.979942, y: 68.44638, z: 20.498476}
+    m_Target: {x: -102.88748, y: -131.32115, z: 346.70807}
     speed: 2
-    m_Value: {x: -10.979942, y: 68.44638, z: 20.498476}
+    m_Value: {x: -102.88748, y: -131.32115, z: 346.70807}
   m_RenderMode: 0
   m_CameraMode:
     drawMode: 0
@@ -703,13 +703,13 @@ MonoBehaviour:
     m_GridAxis: 1
     m_gridOpacity: 0.5
   m_Rotation:
-    m_Target: {x: 0.039553825, y: -0.94478434, z: 0.124296755, w: 0.3006672}
+    m_Target: {x: -0.21691252, y: 0.07517944, z: -0.016756356, w: -0.97316515}
     speed: 2
-    m_Value: {x: 0.039553184, y: -0.944769, z: 0.12429474, w: 0.3006623}
+    m_Value: {x: -0.21688345, y: 0.076637805, z: -0.017081415, w: -0.97303474}
   m_Size:
-    m_Target: 2.7711458
+    m_Target: 176.56934
     speed: 2
-    m_Value: 2.7711458
+    m_Value: 184.88936
   m_Ortho:
     m_Target: 0
     speed: 2

Hector_v2/Library/LastSceneManagerSetup.txt

@@ -1,5 +1,5 @@
 sceneSetups:
-- path: Assets/Scenes/Simulation.unity
+- path: Assets/Scenes/UITest.unity
   isLoaded: 1
   isActive: 1
   isSubScene: 0