Selaa lähdekoodia

add python code

Jia, Jingyi 3 vuotta sitten
vanhempi
commit
d539696fae
100 muutettua tiedostoa jossa 44 lisäystä ja 38 poistoa
  1. BIN
      .DS_Store
  2. BIN
      Hector_v2/.DS_Store
  3. BIN
      Hector_v2/Assets/.DS_Store
  4. 7 2
      Hector_v2/Assets/Scenes/Simulation.unity
  5. BIN
      Hector_v2/Assets/Scripts/.DS_Store
  6. 4 3
      Hector_v2/Assets/Scripts/Test/TestManagement.cs
  7. 1 1
      Hector_v2/Assets/_Import/ShowRoom/_Meshes/Materials/Raster_01.mat
  8. 1 1
      Hector_v2/Assets/_Import/ShowRoom/_Textures/Plasma_03.mat
  9. BIN
      Hector_v2/Library/.DS_Store
  10. BIN
      Hector_v2/Library/ArtifactDB
  11. BIN
      Hector_v2/Library/Artifacts/03/039194d37eaed4b7680c8a0bef4df152
  12. BIN
      Hector_v2/Library/Artifacts/05/0504a5c61eb7b34eb4cb3628b8eaacee
  13. BIN
      Hector_v2/Library/Artifacts/0b/0b66fd855943f44d1f50964ac8d3be7a
  14. BIN
      Hector_v2/Library/Artifacts/0d/0d046021e05a2fd3a6127d7cbdd99a2c
  15. BIN
      Hector_v2/Library/Artifacts/16/16024e52fb390d354f3ece54d0991415
  16. BIN
      Hector_v2/Library/Artifacts/23/23a813629212b4a62a30a35424550f99
  17. BIN
      Hector_v2/Library/Artifacts/2b/2b7e67c049955f877c6156fb3dade073
  18. BIN
      Hector_v2/Library/Artifacts/36/36dd9599a587857363dcd13b7527d3bb
  19. BIN
      Hector_v2/Library/Artifacts/41/4159df39696c442240ff6b775f029906
  20. BIN
      Hector_v2/Library/Artifacts/4e/4e2bfc142249a9ccd33465ee276d7d10
  21. BIN
      Hector_v2/Library/Artifacts/53/5369409edc5b731ebb01bc3b296e9059
  22. BIN
      Hector_v2/Library/Artifacts/5a/5a36a49964a7a2b05f54a7f095baf034
  23. BIN
      Hector_v2/Library/Artifacts/5b/5b8bd3eb680dfe83cce4798407dc1b3b
  24. BIN
      Hector_v2/Library/Artifacts/5d/5d84570e1462127af64b4957985ebfb2
  25. BIN
      Hector_v2/Library/Artifacts/5f/5f55a784448812e407836deaeecb285a
  26. BIN
      Hector_v2/Library/Artifacts/6a/6a56418efcc2763a3bf93486538fe6a9
  27. BIN
      Hector_v2/Library/Artifacts/78/78ff0efd49096aef2cbe7a15f87b6ecb
  28. BIN
      Hector_v2/Library/Artifacts/83/838ada60efb54fa3b3b4602aa6a4920d
  29. BIN
      Hector_v2/Library/Artifacts/86/869e571bc9acfba8497ee5f290010ba1
  30. BIN
      Hector_v2/Library/Artifacts/8e/8e45b78d36fb81fc5aaeadd0e55b9a5d
  31. BIN
      Hector_v2/Library/Artifacts/95/95ac187e05e7b635d37e9acb10907be2
  32. BIN
      Hector_v2/Library/Artifacts/a3/a39808e1e81263be6d726b8710ca0c14
  33. BIN
      Hector_v2/Library/Artifacts/bc/bc6d85df3bd46eb65ecc50c31b56dcd9
  34. BIN
      Hector_v2/Library/Artifacts/cd/cdf982f587b1f9abee315e6fd6d9a97a
  35. BIN
      Hector_v2/Library/Artifacts/d4/d4a6e01d7248a0c355187a9c0f0502fd
  36. BIN
      Hector_v2/Library/Artifacts/dc/dcb50624f5b6a4f8d3920a0490c6135b
  37. BIN
      Hector_v2/Library/Artifacts/de/dece3683998494fce06f4011c4bd236a
  38. BIN
      Hector_v2/Library/Artifacts/df/df13e651ae1264095adb7aea52f0c064
  39. BIN
      Hector_v2/Library/Artifacts/ed/ed5e64a133e5f8f3e6c2dc4582acedeb
  40. BIN
      Hector_v2/Library/Artifacts/ef/efd1827d4fdc7cacb92d389ba2465351
  41. BIN
      Hector_v2/Library/Artifacts/fa/fa6b9ab74962306bcd59a1234c302b10
  42. BIN
      Hector_v2/Library/Artifacts/fb/fb4c016c56e387ddaa85853141cc8b77
  43. 0 0
      Hector_v2/Library/Collab/CollabSnapshot_fa7764f4-f4ff-4738-a203-67d66726386b.txt
  44. 30 30
      Hector_v2/Library/CurrentLayout-default.dwlt
  45. 1 1
      Hector_v2/Library/LastSceneManagerSetup.txt
  46. 0 0
      Hector_v2/Library/PackageCache/com.valvesoftware.unity.openvr@c3dfce70eef3-1624810109595/CHANGELOG.md
  47. 0 0
      Hector_v2/Library/PackageCache/com.valvesoftware.unity.openvr@c3dfce70eef3-1624810109595/CHANGELOG.md.meta
  48. 0 0
      Hector_v2/Library/PackageCache/com.valvesoftware.unity.openvr@c3dfce70eef3-1624810109595/Documentation~/com.valvesoftware.unity.openvr.md
  49. 0 0
      Hector_v2/Library/PackageCache/com.valvesoftware.unity.openvr@c3dfce70eef3-1624810109595/Editor.meta
  50. 0 0
      Hector_v2/Library/PackageCache/com.valvesoftware.unity.openvr@c3dfce70eef3-1624810109595/Editor/OpenVRBuildProcessor.cs
  51. 0 0
      Hector_v2/Library/PackageCache/com.valvesoftware.unity.openvr@c3dfce70eef3-1624810109595/Editor/OpenVRBuildProcessor.cs.meta
  52. 0 0
      Hector_v2/Library/PackageCache/com.valvesoftware.unity.openvr@c3dfce70eef3-1624810109595/Editor/OpenVRLoaderMetadata.cs
  53. 0 0
      Hector_v2/Library/PackageCache/com.valvesoftware.unity.openvr@c3dfce70eef3-1624810109595/Editor/OpenVRLoaderMetadata.cs.meta
  54. 0 0
      Hector_v2/Library/PackageCache/com.valvesoftware.unity.openvr@c3dfce70eef3-1624810109595/Editor/OpenVRSettingsCopier.cs
  55. 0 0
      Hector_v2/Library/PackageCache/com.valvesoftware.unity.openvr@c3dfce70eef3-1624810109595/Editor/OpenVRSettingsCopier.cs.meta
  56. 0 0
      Hector_v2/Library/PackageCache/com.valvesoftware.unity.openvr@c3dfce70eef3-1624810109595/Editor/OpenVRSettingsEditor.cs
  57. 0 0
      Hector_v2/Library/PackageCache/com.valvesoftware.unity.openvr@c3dfce70eef3-1624810109595/Editor/OpenVRSettingsEditor.cs.meta
  58. 0 0
      Hector_v2/Library/PackageCache/com.valvesoftware.unity.openvr@c3dfce70eef3-1624810109595/Editor/Unity.XR.OpenVR.Editor.asmdef
  59. 0 0
      Hector_v2/Library/PackageCache/com.valvesoftware.unity.openvr@c3dfce70eef3-1624810109595/Editor/Unity.XR.OpenVR.Editor.asmdef.meta
  60. 0 0
      Hector_v2/Library/PackageCache/com.valvesoftware.unity.openvr@c3dfce70eef3-1624810109595/LICENSE.md
  61. 0 0
      Hector_v2/Library/PackageCache/com.valvesoftware.unity.openvr@c3dfce70eef3-1624810109595/LICENSE.md.meta
  62. 0 0
      Hector_v2/Library/PackageCache/com.valvesoftware.unity.openvr@c3dfce70eef3-1624810109595/README.md
  63. 0 0
      Hector_v2/Library/PackageCache/com.valvesoftware.unity.openvr@c3dfce70eef3-1624810109595/README.md.meta
  64. 0 0
      Hector_v2/Library/PackageCache/com.valvesoftware.unity.openvr@c3dfce70eef3-1624810109595/Runtime.meta
  65. 0 0
      Hector_v2/Library/PackageCache/com.valvesoftware.unity.openvr@c3dfce70eef3-1624810109595/Runtime/DeviceLayouts.cs
  66. 0 0
      Hector_v2/Library/PackageCache/com.valvesoftware.unity.openvr@c3dfce70eef3-1624810109595/Runtime/DeviceLayouts.cs.meta
  67. 0 0
      Hector_v2/Library/PackageCache/com.valvesoftware.unity.openvr@c3dfce70eef3-1624810109595/Runtime/OpenVREvents.cs
  68. 0 0
      Hector_v2/Library/PackageCache/com.valvesoftware.unity.openvr@c3dfce70eef3-1624810109595/Runtime/OpenVREvents.cs.meta
  69. 0 0
      Hector_v2/Library/PackageCache/com.valvesoftware.unity.openvr@c3dfce70eef3-1624810109595/Runtime/OpenVRHelpers.cs
  70. 0 0
      Hector_v2/Library/PackageCache/com.valvesoftware.unity.openvr@c3dfce70eef3-1624810109595/Runtime/OpenVRHelpers.cs.meta
  71. 0 0
      Hector_v2/Library/PackageCache/com.valvesoftware.unity.openvr@c3dfce70eef3-1624810109595/Runtime/OpenVRLoader.cs
  72. 0 0
      Hector_v2/Library/PackageCache/com.valvesoftware.unity.openvr@c3dfce70eef3-1624810109595/Runtime/OpenVRLoader.cs.meta
  73. 0 0
      Hector_v2/Library/PackageCache/com.valvesoftware.unity.openvr@c3dfce70eef3-1624810109595/Runtime/OpenVRSettings.cs
  74. 0 0
      Hector_v2/Library/PackageCache/com.valvesoftware.unity.openvr@c3dfce70eef3-1624810109595/Runtime/OpenVRSettings.cs.meta
  75. 0 0
      Hector_v2/Library/PackageCache/com.valvesoftware.unity.openvr@c3dfce70eef3-1624810109595/Runtime/Unity.XR.OpenVR.asmdef
  76. 0 0
      Hector_v2/Library/PackageCache/com.valvesoftware.unity.openvr@c3dfce70eef3-1624810109595/Runtime/Unity.XR.OpenVR.asmdef.meta
  77. 0 0
      Hector_v2/Library/PackageCache/com.valvesoftware.unity.openvr@c3dfce70eef3-1624810109595/Runtime/UnitySubsystemsManifest.json
  78. 0 0
      Hector_v2/Library/PackageCache/com.valvesoftware.unity.openvr@c3dfce70eef3-1624810109595/Runtime/UnitySubsystemsManifest.json.meta
  79. 0 0
      Hector_v2/Library/PackageCache/com.valvesoftware.unity.openvr@c3dfce70eef3-1624810109595/Runtime/openvr_api.cs
  80. 0 0
      Hector_v2/Library/PackageCache/com.valvesoftware.unity.openvr@c3dfce70eef3-1624810109595/Runtime/openvr_api.cs.meta
  81. 0 0
      Hector_v2/Library/PackageCache/com.valvesoftware.unity.openvr@c3dfce70eef3-1624810109595/Runtime/x64.meta
  82. 0 0
      Hector_v2/Library/PackageCache/com.valvesoftware.unity.openvr@c3dfce70eef3-1624810109595/Runtime/x64/XRSDKOpenVR.dll
  83. 0 0
      Hector_v2/Library/PackageCache/com.valvesoftware.unity.openvr@c3dfce70eef3-1624810109595/Runtime/x64/XRSDKOpenVR.dll.meta
  84. 0 0
      Hector_v2/Library/PackageCache/com.valvesoftware.unity.openvr@c3dfce70eef3-1624810109595/Runtime/x64/XRSDKOpenVR.dll.sig
  85. 0 0
      Hector_v2/Library/PackageCache/com.valvesoftware.unity.openvr@c3dfce70eef3-1624810109595/Runtime/x64/XRSDKOpenVR.dll.sig.meta
  86. 0 0
      Hector_v2/Library/PackageCache/com.valvesoftware.unity.openvr@c3dfce70eef3-1624810109595/Runtime/x64/XRSDKOpenVR.exp
  87. 0 0
      Hector_v2/Library/PackageCache/com.valvesoftware.unity.openvr@c3dfce70eef3-1624810109595/Runtime/x64/XRSDKOpenVR.exp.meta
  88. 0 0
      Hector_v2/Library/PackageCache/com.valvesoftware.unity.openvr@c3dfce70eef3-1624810109595/Runtime/x64/XRSDKOpenVR.lib
  89. 0 0
      Hector_v2/Library/PackageCache/com.valvesoftware.unity.openvr@c3dfce70eef3-1624810109595/Runtime/x64/XRSDKOpenVR.lib.meta
  90. 0 0
      Hector_v2/Library/PackageCache/com.valvesoftware.unity.openvr@c3dfce70eef3-1624810109595/Runtime/x64/XRSDKOpenVR.pdb
  91. 0 0
      Hector_v2/Library/PackageCache/com.valvesoftware.unity.openvr@c3dfce70eef3-1624810109595/Runtime/x64/XRSDKOpenVR.pdb.meta
  92. 0 0
      Hector_v2/Library/PackageCache/com.valvesoftware.unity.openvr@c3dfce70eef3-1624810109595/Runtime/x64/lib.meta
  93. 0 0
      Hector_v2/Library/PackageCache/com.valvesoftware.unity.openvr@c3dfce70eef3-1624810109595/Runtime/x64/lib/x64.meta
  94. 0 0
      Hector_v2/Library/PackageCache/com.valvesoftware.unity.openvr@c3dfce70eef3-1624810109595/Runtime/x64/lib/x64/libopenvr_api.so
  95. 0 0
      Hector_v2/Library/PackageCache/com.valvesoftware.unity.openvr@c3dfce70eef3-1624810109595/Runtime/x64/lib/x64/libopenvr_api.so.dbg
  96. 0 0
      Hector_v2/Library/PackageCache/com.valvesoftware.unity.openvr@c3dfce70eef3-1624810109595/Runtime/x64/lib/x64/libopenvr_api.so.dbg.meta
  97. 0 0
      Hector_v2/Library/PackageCache/com.valvesoftware.unity.openvr@c3dfce70eef3-1624810109595/Runtime/x64/lib/x64/libopenvr_api.so.meta
  98. 0 0
      Hector_v2/Library/PackageCache/com.valvesoftware.unity.openvr@c3dfce70eef3-1624810109595/Runtime/x64/libXRSDKOpenVR.so
  99. 0 0
      Hector_v2/Library/PackageCache/com.valvesoftware.unity.openvr@c3dfce70eef3-1624810109595/Runtime/x64/libXRSDKOpenVR.so.meta
  100. 0 0
      Hector_v2/Library/PackageCache/com.valvesoftware.unity.openvr@c3dfce70eef3-1624810109595/Runtime/x64/libopenvr_api.so

BIN
.DS_Store


BIN
Hector_v2/.DS_Store


BIN
Hector_v2/Assets/.DS_Store


+ 7 - 2
Hector_v2/Assets/Scenes/Simulation.unity

@@ -35848,7 +35848,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   CurrentMode: {fileID: 0}
-  touchValue: {x: 0, y: 0}
+  signal: {x: 0, y: 0}
 --- !u!4 &965253637
 Transform:
   m_ObjectHideFlags: 0
@@ -63421,7 +63421,7 @@ MonoBehaviour:
   savedUp: {x: 0, y: 1, z: 0}
   savedRectSize: {x: 2000, y: 150}
   savedColor: {r: 1, g: 1, b: 1, a: 1}
-  savedTextUV0: {x: 0.03857422, y: 0.010253906}
+  savedTextUV0: {x: 0.032714844, y: 0.014160156}
   savedFill: 0
 --- !u!114 &1571137625
 MonoBehaviour:
@@ -91623,6 +91623,11 @@ PrefabInstance:
       propertyPath: TestID
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 5839439162582256163, guid: da82fda99b00d5a43acb267e6f773c88,
+        type: 3}
+      propertyPath: csvPath
+      value: C:\Users\alley\Desktop\Thesis-Hector-VR\User Study\TestResult
+      objectReference: {fileID: 0}
     - target: {fileID: 5839439162582256163, guid: da82fda99b00d5a43acb267e6f773c88,
         type: 3}
       propertyPath: TotalTime

BIN
Hector_v2/Assets/Scripts/.DS_Store


+ 4 - 3
Hector_v2/Assets/Scripts/Test/TestManagement.cs

@@ -11,7 +11,7 @@ public class TestManagement : MonoBehaviour
 {
     public static TestManagement Instance { get; private set; }
     public int TestID = 1;
-    public string csvPath = @"C:\Users\alley\Desktop\Hecto\TestResult\";
+    public string csvPath = @"C:\Users\alley\Desktop\Thesis-Hector-VR\User Study\TestResult";
     public int TestMode = 1;
     public GameObject[] ModeList;
     
@@ -55,10 +55,11 @@ public class TestManagement : MonoBehaviour
         if(Instance!=null){
             TestID = Instance.TestID;
             TestMode = Instance.TestMode;
+            csvPath = Instance.csvPath;
         }
         Instance = this;
 
-        // Handle the sequence of the mode to test
+        // Handle the sequence of the mode to test in simulation
         if(SceneManager.GetActiveScene().name == "Simulation"){
             initModeList();
             ModeList[TestMode-1].SetActive(true);
@@ -181,7 +182,7 @@ public class TestManagement : MonoBehaviour
 
     private void writeCSV(){
         
-        string strFilePath = csvPath + TestID +".csv";
+        string strFilePath = csvPath + @"\" + TestID +".csv";
         
         string strSeperator = ",";
         string line = "";

+ 1 - 1
Hector_v2/Assets/_Import/ShowRoom/_Meshes/Materials/Raster_01.mat

@@ -22,7 +22,7 @@ Material:
     - _MainTex:
         m_Texture: {fileID: 2800000, guid: 7d0db5738573848398398dd75e4e777c, type: 3}
         m_Scale: {x: 0.5, y: 0.5}
-        m_Offset: {x: 0.5, y: 0}
+        m_Offset: {x: 0, y: 0.5}
     m_Floats:
     - _InvFade: 1
     m_Colors:

+ 1 - 1
Hector_v2/Assets/_Import/ShowRoom/_Textures/Plasma_03.mat

@@ -22,7 +22,7 @@ Material:
     - _MainTex:
         m_Texture: {fileID: 2800000, guid: f83e3122995e44f618d14a646b1e0346, type: 3}
         m_Scale: {x: 0.5, y: 0.5}
-        m_Offset: {x: 0.5, y: 0}
+        m_Offset: {x: 0, y: 0.5}
     m_Floats:
     - _InvFade: 1
     m_Colors:

BIN
Hector_v2/Library/.DS_Store


BIN
Hector_v2/Library/ArtifactDB


BIN
Hector_v2/Library/Artifacts/03/039194d37eaed4b7680c8a0bef4df152


BIN
Hector_v2/Library/Artifacts/05/0504a5c61eb7b34eb4cb3628b8eaacee


BIN
Hector_v2/Library/Artifacts/0b/0b66fd855943f44d1f50964ac8d3be7a


BIN
Hector_v2/Library/Artifacts/0d/0d046021e05a2fd3a6127d7cbdd99a2c


BIN
Hector_v2/Library/Artifacts/16/16024e52fb390d354f3ece54d0991415


BIN
Hector_v2/Library/Artifacts/23/23a813629212b4a62a30a35424550f99


BIN
Hector_v2/Library/Artifacts/2b/2b7e67c049955f877c6156fb3dade073


BIN
Hector_v2/Library/Artifacts/36/36dd9599a587857363dcd13b7527d3bb


BIN
Hector_v2/Library/Artifacts/41/4159df39696c442240ff6b775f029906


BIN
Hector_v2/Library/Artifacts/4e/4e2bfc142249a9ccd33465ee276d7d10


BIN
Hector_v2/Library/Artifacts/53/5369409edc5b731ebb01bc3b296e9059


BIN
Hector_v2/Library/Artifacts/5a/5a36a49964a7a2b05f54a7f095baf034


BIN
Hector_v2/Library/Artifacts/5b/5b8bd3eb680dfe83cce4798407dc1b3b


BIN
Hector_v2/Library/Artifacts/5d/5d84570e1462127af64b4957985ebfb2


BIN
Hector_v2/Library/Artifacts/5f/5f55a784448812e407836deaeecb285a


BIN
Hector_v2/Library/Artifacts/6a/6a56418efcc2763a3bf93486538fe6a9


BIN
Hector_v2/Library/Artifacts/78/78ff0efd49096aef2cbe7a15f87b6ecb


BIN
Hector_v2/Library/Artifacts/83/838ada60efb54fa3b3b4602aa6a4920d


BIN
Hector_v2/Library/Artifacts/86/869e571bc9acfba8497ee5f290010ba1


BIN
Hector_v2/Library/Artifacts/8e/8e45b78d36fb81fc5aaeadd0e55b9a5d


BIN
Hector_v2/Library/Artifacts/95/95ac187e05e7b635d37e9acb10907be2


BIN
Hector_v2/Library/Artifacts/a3/a39808e1e81263be6d726b8710ca0c14


BIN
Hector_v2/Library/Artifacts/bc/bc6d85df3bd46eb65ecc50c31b56dcd9


BIN
Hector_v2/Library/Artifacts/cd/cdf982f587b1f9abee315e6fd6d9a97a


BIN
Hector_v2/Library/Artifacts/d4/d4a6e01d7248a0c355187a9c0f0502fd


BIN
Hector_v2/Library/Artifacts/dc/dcb50624f5b6a4f8d3920a0490c6135b


BIN
Hector_v2/Library/Artifacts/de/dece3683998494fce06f4011c4bd236a


BIN
Hector_v2/Library/Artifacts/df/df13e651ae1264095adb7aea52f0c064


BIN
Hector_v2/Library/Artifacts/ed/ed5e64a133e5f8f3e6c2dc4582acedeb


BIN
Hector_v2/Library/Artifacts/ef/efd1827d4fdc7cacb92d389ba2465351


BIN
Hector_v2/Library/Artifacts/fa/fa6b9ab74962306bcd59a1234c302b10


BIN
Hector_v2/Library/Artifacts/fb/fb4c016c56e387ddaa85853141cc8b77


Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 0 - 0
Hector_v2/Library/Collab/CollabSnapshot_fa7764f4-f4ff-4738-a203-67d66726386b.txt


+ 30 - 30
Hector_v2/Library/CurrentLayout-default.dwlt

@@ -14,8 +14,8 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   m_PixelRect:
     serializedVersion: 2
-    x: -12
-    y: 235
+    x: 8
+    y: 51
     width: 1904
     height: 981
   m_ShowMode: 4
@@ -45,10 +45,10 @@ MonoBehaviour:
     y: 30
     width: 1904
     height: 931
-  m_MinSize: {x: 679, y: 492}
+  m_MinSize: {x: 678, y: 492}
   m_MaxSize: {x: 14002, y: 14042}
   vertical: 0
-  controlID: 160
+  controlID: 135
 --- !u!114 &3
 MonoBehaviour:
   m_ObjectHideFlags: 52
@@ -95,8 +95,8 @@ MonoBehaviour:
     y: 0
     width: 352
     height: 462
-  m_MinSize: {x: 201, y: 221}
-  m_MaxSize: {x: 4001, y: 4021}
+  m_MinSize: {x: 200, y: 200}
+  m_MaxSize: {x: 4000, y: 4000}
   m_ActualView: {fileID: 16}
   m_Panes:
   - {fileID: 16}
@@ -216,10 +216,10 @@ MonoBehaviour:
     y: 0
     width: 1359
     height: 931
-  m_MinSize: {x: 403, y: 492}
+  m_MinSize: {x: 402, y: 492}
   m_MaxSize: {x: 10001, y: 14042}
   vertical: 1
-  controlID: 114
+  controlID: 136
 --- !u!114 &10
 MonoBehaviour:
   m_ObjectHideFlags: 52
@@ -241,10 +241,10 @@ MonoBehaviour:
     y: 0
     width: 1359
     height: 462
-  m_MinSize: {x: 403, y: 221}
-  m_MaxSize: {x: 8003, y: 4021}
+  m_MinSize: {x: 402, y: 221}
+  m_MaxSize: {x: 8002, y: 4021}
   vertical: 0
-  controlID: 115
+  controlID: 137
 --- !u!114 &11
 MonoBehaviour:
   m_ObjectHideFlags: 52
@@ -411,8 +411,8 @@ MonoBehaviour:
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 0
-    y: 481
+    x: 8
+    y: 543
     width: 1358
     height: 448
   m_ViewDataDictionary: {fileID: 0}
@@ -435,14 +435,14 @@ MonoBehaviour:
   m_LastFolders:
   - Assets/Scenes
   m_LastFoldersGridSize: 78
-  m_LastProjectPath: C:\Users\alley\Desktop\Hecto\Hector_v2
+  m_LastProjectPath: C:\Users\alley\Desktop\Thesis-Hector-VR\Hector_v2
   m_LockTracker:
     m_IsLocked: 0
   m_FolderTreeState:
-    scrollPos: {x: 0, y: 143}
-    m_SelectedIDs: 08830000
-    m_LastClickedID: 33544
-    m_ExpandedIDs: 00000000f68200000a83000000ca9a3b
+    scrollPos: {x: 0, y: 100}
+    m_SelectedIDs: 928d0000
+    m_LastClickedID: 36242
+    m_ExpandedIDs: 000000007e8d0000948d000000ca9a3b
     m_RenameOverlay:
       m_UserAcceptedRename: 0
       m_Name: 
@@ -470,7 +470,7 @@ MonoBehaviour:
     scrollPos: {x: 0, y: 0}
     m_SelectedIDs: 
     m_LastClickedID: 0
-    m_ExpandedIDs: 00000000f6820000
+    m_ExpandedIDs: 000000007e8d0000
     m_RenameOverlay:
       m_UserAcceptedRename: 0
       m_Name: 
@@ -547,8 +547,8 @@ MonoBehaviour:
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 1347
-    y: 265
+    x: 1367
+    y: 81
     width: 544
     height: 910
   m_ViewDataDictionary: {fileID: 0}
@@ -585,17 +585,17 @@ MonoBehaviour:
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 0
-    y: 19
+    x: 8
+    y: 81
     width: 351
     height: 441
   m_ViewDataDictionary: {fileID: 0}
   m_SceneHierarchy:
     m_TreeViewState:
       scrollPos: {x: 0, y: 0}
-      m_SelectedIDs: 58c30000
-      m_LastClickedID: 0
-      m_ExpandedIDs: d817fcff0619fcff8432fcff886bfcffa2c0feffc6c0feffe4c0feffe8e2fefff0f8ffff3efbffff
+      m_SelectedIDs: d2afffff
+      m_LastClickedID: -20526
+      m_ExpandedIDs: 5642feff1299feff62c0fefff007ffff345fffff2cb2ffff3efbffff
       m_RenameOverlay:
         m_UserAcceptedRename: 0
         m_Name: 
@@ -640,8 +640,8 @@ MonoBehaviour:
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 340
-    y: 265
+    x: 360
+    y: 81
     width: 1005
     height: 441
   m_ViewDataDictionary: {fileID: 0}
@@ -705,11 +705,11 @@ MonoBehaviour:
   m_Rotation:
     m_Target: {x: -0.21691252, y: 0.07517944, z: -0.016756356, w: -0.97316515}
     speed: 2
-    m_Value: {x: -0.21688345, y: 0.076637805, z: -0.017081415, w: -0.97303474}
+    m_Value: {x: -0.21690883, y: 0.07517816, z: -0.01675607, w: -0.9731486}
   m_Size:
     m_Target: 176.56934
     speed: 2
-    m_Value: 184.88936
+    m_Value: 176.56934
   m_Ortho:
     m_Target: 0
     speed: 2

+ 1 - 1
Hector_v2/Library/LastSceneManagerSetup.txt

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

+ 0 - 0
Hector_v2/Library/PackageCache/com.valvesoftware.unity.openvr@34a4270c0a30-1624810109595/CHANGELOG.md → Hector_v2/Library/PackageCache/com.valvesoftware.unity.openvr@c3dfce70eef3-1624810109595/CHANGELOG.md


+ 0 - 0
Hector_v2/Library/PackageCache/com.valvesoftware.unity.openvr@34a4270c0a30-1624810109595/CHANGELOG.md.meta → Hector_v2/Library/PackageCache/com.valvesoftware.unity.openvr@c3dfce70eef3-1624810109595/CHANGELOG.md.meta


+ 0 - 0
Hector_v2/Library/PackageCache/com.valvesoftware.unity.openvr@34a4270c0a30-1624810109595/Documentation~/com.valvesoftware.unity.openvr.md → Hector_v2/Library/PackageCache/com.valvesoftware.unity.openvr@c3dfce70eef3-1624810109595/Documentation~/com.valvesoftware.unity.openvr.md


+ 0 - 0
Hector_v2/Library/PackageCache/com.valvesoftware.unity.openvr@34a4270c0a30-1624810109595/Editor.meta → Hector_v2/Library/PackageCache/com.valvesoftware.unity.openvr@c3dfce70eef3-1624810109595/Editor.meta


+ 0 - 0
Hector_v2/Library/PackageCache/com.valvesoftware.unity.openvr@34a4270c0a30-1624810109595/Editor/OpenVRBuildProcessor.cs → Hector_v2/Library/PackageCache/com.valvesoftware.unity.openvr@c3dfce70eef3-1624810109595/Editor/OpenVRBuildProcessor.cs


+ 0 - 0
Hector_v2/Library/PackageCache/com.valvesoftware.unity.openvr@34a4270c0a30-1624810109595/Editor/OpenVRBuildProcessor.cs.meta → Hector_v2/Library/PackageCache/com.valvesoftware.unity.openvr@c3dfce70eef3-1624810109595/Editor/OpenVRBuildProcessor.cs.meta


+ 0 - 0
Hector_v2/Library/PackageCache/com.valvesoftware.unity.openvr@34a4270c0a30-1624810109595/Editor/OpenVRLoaderMetadata.cs → Hector_v2/Library/PackageCache/com.valvesoftware.unity.openvr@c3dfce70eef3-1624810109595/Editor/OpenVRLoaderMetadata.cs


+ 0 - 0
Hector_v2/Library/PackageCache/com.valvesoftware.unity.openvr@34a4270c0a30-1624810109595/Editor/OpenVRLoaderMetadata.cs.meta → Hector_v2/Library/PackageCache/com.valvesoftware.unity.openvr@c3dfce70eef3-1624810109595/Editor/OpenVRLoaderMetadata.cs.meta


+ 0 - 0
Hector_v2/Library/PackageCache/com.valvesoftware.unity.openvr@34a4270c0a30-1624810109595/Editor/OpenVRSettingsCopier.cs → Hector_v2/Library/PackageCache/com.valvesoftware.unity.openvr@c3dfce70eef3-1624810109595/Editor/OpenVRSettingsCopier.cs


+ 0 - 0
Hector_v2/Library/PackageCache/com.valvesoftware.unity.openvr@34a4270c0a30-1624810109595/Editor/OpenVRSettingsCopier.cs.meta → Hector_v2/Library/PackageCache/com.valvesoftware.unity.openvr@c3dfce70eef3-1624810109595/Editor/OpenVRSettingsCopier.cs.meta


+ 0 - 0
Hector_v2/Library/PackageCache/com.valvesoftware.unity.openvr@34a4270c0a30-1624810109595/Editor/OpenVRSettingsEditor.cs → Hector_v2/Library/PackageCache/com.valvesoftware.unity.openvr@c3dfce70eef3-1624810109595/Editor/OpenVRSettingsEditor.cs


+ 0 - 0
Hector_v2/Library/PackageCache/com.valvesoftware.unity.openvr@34a4270c0a30-1624810109595/Editor/OpenVRSettingsEditor.cs.meta → Hector_v2/Library/PackageCache/com.valvesoftware.unity.openvr@c3dfce70eef3-1624810109595/Editor/OpenVRSettingsEditor.cs.meta


+ 0 - 0
Hector_v2/Library/PackageCache/com.valvesoftware.unity.openvr@34a4270c0a30-1624810109595/Editor/Unity.XR.OpenVR.Editor.asmdef → Hector_v2/Library/PackageCache/com.valvesoftware.unity.openvr@c3dfce70eef3-1624810109595/Editor/Unity.XR.OpenVR.Editor.asmdef


+ 0 - 0
Hector_v2/Library/PackageCache/com.valvesoftware.unity.openvr@34a4270c0a30-1624810109595/Editor/Unity.XR.OpenVR.Editor.asmdef.meta → Hector_v2/Library/PackageCache/com.valvesoftware.unity.openvr@c3dfce70eef3-1624810109595/Editor/Unity.XR.OpenVR.Editor.asmdef.meta


+ 0 - 0
Hector_v2/Library/PackageCache/com.valvesoftware.unity.openvr@34a4270c0a30-1624810109595/LICENSE.md → Hector_v2/Library/PackageCache/com.valvesoftware.unity.openvr@c3dfce70eef3-1624810109595/LICENSE.md


+ 0 - 0
Hector_v2/Library/PackageCache/com.valvesoftware.unity.openvr@34a4270c0a30-1624810109595/LICENSE.md.meta → Hector_v2/Library/PackageCache/com.valvesoftware.unity.openvr@c3dfce70eef3-1624810109595/LICENSE.md.meta


+ 0 - 0
Hector_v2/Library/PackageCache/com.valvesoftware.unity.openvr@34a4270c0a30-1624810109595/README.md → Hector_v2/Library/PackageCache/com.valvesoftware.unity.openvr@c3dfce70eef3-1624810109595/README.md


+ 0 - 0
Hector_v2/Library/PackageCache/com.valvesoftware.unity.openvr@34a4270c0a30-1624810109595/README.md.meta → Hector_v2/Library/PackageCache/com.valvesoftware.unity.openvr@c3dfce70eef3-1624810109595/README.md.meta


+ 0 - 0
Hector_v2/Library/PackageCache/com.valvesoftware.unity.openvr@34a4270c0a30-1624810109595/Runtime.meta → Hector_v2/Library/PackageCache/com.valvesoftware.unity.openvr@c3dfce70eef3-1624810109595/Runtime.meta


+ 0 - 0
Hector_v2/Library/PackageCache/com.valvesoftware.unity.openvr@34a4270c0a30-1624810109595/Runtime/DeviceLayouts.cs → Hector_v2/Library/PackageCache/com.valvesoftware.unity.openvr@c3dfce70eef3-1624810109595/Runtime/DeviceLayouts.cs


+ 0 - 0
Hector_v2/Library/PackageCache/com.valvesoftware.unity.openvr@34a4270c0a30-1624810109595/Runtime/DeviceLayouts.cs.meta → Hector_v2/Library/PackageCache/com.valvesoftware.unity.openvr@c3dfce70eef3-1624810109595/Runtime/DeviceLayouts.cs.meta


+ 0 - 0
Hector_v2/Library/PackageCache/com.valvesoftware.unity.openvr@34a4270c0a30-1624810109595/Runtime/OpenVREvents.cs → Hector_v2/Library/PackageCache/com.valvesoftware.unity.openvr@c3dfce70eef3-1624810109595/Runtime/OpenVREvents.cs


+ 0 - 0
Hector_v2/Library/PackageCache/com.valvesoftware.unity.openvr@34a4270c0a30-1624810109595/Runtime/OpenVREvents.cs.meta → Hector_v2/Library/PackageCache/com.valvesoftware.unity.openvr@c3dfce70eef3-1624810109595/Runtime/OpenVREvents.cs.meta


+ 0 - 0
Hector_v2/Library/PackageCache/com.valvesoftware.unity.openvr@34a4270c0a30-1624810109595/Runtime/OpenVRHelpers.cs → Hector_v2/Library/PackageCache/com.valvesoftware.unity.openvr@c3dfce70eef3-1624810109595/Runtime/OpenVRHelpers.cs


+ 0 - 0
Hector_v2/Library/PackageCache/com.valvesoftware.unity.openvr@34a4270c0a30-1624810109595/Runtime/OpenVRHelpers.cs.meta → Hector_v2/Library/PackageCache/com.valvesoftware.unity.openvr@c3dfce70eef3-1624810109595/Runtime/OpenVRHelpers.cs.meta


+ 0 - 0
Hector_v2/Library/PackageCache/com.valvesoftware.unity.openvr@34a4270c0a30-1624810109595/Runtime/OpenVRLoader.cs → Hector_v2/Library/PackageCache/com.valvesoftware.unity.openvr@c3dfce70eef3-1624810109595/Runtime/OpenVRLoader.cs


+ 0 - 0
Hector_v2/Library/PackageCache/com.valvesoftware.unity.openvr@34a4270c0a30-1624810109595/Runtime/OpenVRLoader.cs.meta → Hector_v2/Library/PackageCache/com.valvesoftware.unity.openvr@c3dfce70eef3-1624810109595/Runtime/OpenVRLoader.cs.meta


+ 0 - 0
Hector_v2/Library/PackageCache/com.valvesoftware.unity.openvr@34a4270c0a30-1624810109595/Runtime/OpenVRSettings.cs → Hector_v2/Library/PackageCache/com.valvesoftware.unity.openvr@c3dfce70eef3-1624810109595/Runtime/OpenVRSettings.cs


+ 0 - 0
Hector_v2/Library/PackageCache/com.valvesoftware.unity.openvr@34a4270c0a30-1624810109595/Runtime/OpenVRSettings.cs.meta → Hector_v2/Library/PackageCache/com.valvesoftware.unity.openvr@c3dfce70eef3-1624810109595/Runtime/OpenVRSettings.cs.meta


+ 0 - 0
Hector_v2/Library/PackageCache/com.valvesoftware.unity.openvr@34a4270c0a30-1624810109595/Runtime/Unity.XR.OpenVR.asmdef → Hector_v2/Library/PackageCache/com.valvesoftware.unity.openvr@c3dfce70eef3-1624810109595/Runtime/Unity.XR.OpenVR.asmdef


+ 0 - 0
Hector_v2/Library/PackageCache/com.valvesoftware.unity.openvr@34a4270c0a30-1624810109595/Runtime/Unity.XR.OpenVR.asmdef.meta → Hector_v2/Library/PackageCache/com.valvesoftware.unity.openvr@c3dfce70eef3-1624810109595/Runtime/Unity.XR.OpenVR.asmdef.meta


+ 0 - 0
Hector_v2/Library/PackageCache/com.valvesoftware.unity.openvr@34a4270c0a30-1624810109595/Runtime/UnitySubsystemsManifest.json → Hector_v2/Library/PackageCache/com.valvesoftware.unity.openvr@c3dfce70eef3-1624810109595/Runtime/UnitySubsystemsManifest.json


+ 0 - 0
Hector_v2/Library/PackageCache/com.valvesoftware.unity.openvr@34a4270c0a30-1624810109595/Runtime/UnitySubsystemsManifest.json.meta → Hector_v2/Library/PackageCache/com.valvesoftware.unity.openvr@c3dfce70eef3-1624810109595/Runtime/UnitySubsystemsManifest.json.meta


+ 0 - 0
Hector_v2/Library/PackageCache/com.valvesoftware.unity.openvr@34a4270c0a30-1624810109595/Runtime/openvr_api.cs → Hector_v2/Library/PackageCache/com.valvesoftware.unity.openvr@c3dfce70eef3-1624810109595/Runtime/openvr_api.cs


+ 0 - 0
Hector_v2/Library/PackageCache/com.valvesoftware.unity.openvr@34a4270c0a30-1624810109595/Runtime/openvr_api.cs.meta → Hector_v2/Library/PackageCache/com.valvesoftware.unity.openvr@c3dfce70eef3-1624810109595/Runtime/openvr_api.cs.meta


+ 0 - 0
Hector_v2/Library/PackageCache/com.valvesoftware.unity.openvr@34a4270c0a30-1624810109595/Runtime/x64.meta → Hector_v2/Library/PackageCache/com.valvesoftware.unity.openvr@c3dfce70eef3-1624810109595/Runtime/x64.meta


+ 0 - 0
Hector_v2/Library/PackageCache/com.valvesoftware.unity.openvr@34a4270c0a30-1624810109595/Runtime/x64/XRSDKOpenVR.dll → Hector_v2/Library/PackageCache/com.valvesoftware.unity.openvr@c3dfce70eef3-1624810109595/Runtime/x64/XRSDKOpenVR.dll


+ 0 - 0
Hector_v2/Library/PackageCache/com.valvesoftware.unity.openvr@34a4270c0a30-1624810109595/Runtime/x64/XRSDKOpenVR.dll.meta → Hector_v2/Library/PackageCache/com.valvesoftware.unity.openvr@c3dfce70eef3-1624810109595/Runtime/x64/XRSDKOpenVR.dll.meta


+ 0 - 0
Hector_v2/Library/PackageCache/com.valvesoftware.unity.openvr@34a4270c0a30-1624810109595/Runtime/x64/XRSDKOpenVR.dll.sig → Hector_v2/Library/PackageCache/com.valvesoftware.unity.openvr@c3dfce70eef3-1624810109595/Runtime/x64/XRSDKOpenVR.dll.sig


+ 0 - 0
Hector_v2/Library/PackageCache/com.valvesoftware.unity.openvr@34a4270c0a30-1624810109595/Runtime/x64/XRSDKOpenVR.dll.sig.meta → Hector_v2/Library/PackageCache/com.valvesoftware.unity.openvr@c3dfce70eef3-1624810109595/Runtime/x64/XRSDKOpenVR.dll.sig.meta


+ 0 - 0
Hector_v2/Library/PackageCache/com.valvesoftware.unity.openvr@34a4270c0a30-1624810109595/Runtime/x64/XRSDKOpenVR.exp → Hector_v2/Library/PackageCache/com.valvesoftware.unity.openvr@c3dfce70eef3-1624810109595/Runtime/x64/XRSDKOpenVR.exp


+ 0 - 0
Hector_v2/Library/PackageCache/com.valvesoftware.unity.openvr@34a4270c0a30-1624810109595/Runtime/x64/XRSDKOpenVR.exp.meta → Hector_v2/Library/PackageCache/com.valvesoftware.unity.openvr@c3dfce70eef3-1624810109595/Runtime/x64/XRSDKOpenVR.exp.meta


+ 0 - 0
Hector_v2/Library/PackageCache/com.valvesoftware.unity.openvr@34a4270c0a30-1624810109595/Runtime/x64/XRSDKOpenVR.lib → Hector_v2/Library/PackageCache/com.valvesoftware.unity.openvr@c3dfce70eef3-1624810109595/Runtime/x64/XRSDKOpenVR.lib


+ 0 - 0
Hector_v2/Library/PackageCache/com.valvesoftware.unity.openvr@34a4270c0a30-1624810109595/Runtime/x64/XRSDKOpenVR.lib.meta → Hector_v2/Library/PackageCache/com.valvesoftware.unity.openvr@c3dfce70eef3-1624810109595/Runtime/x64/XRSDKOpenVR.lib.meta


+ 0 - 0
Hector_v2/Library/PackageCache/com.valvesoftware.unity.openvr@34a4270c0a30-1624810109595/Runtime/x64/XRSDKOpenVR.pdb → Hector_v2/Library/PackageCache/com.valvesoftware.unity.openvr@c3dfce70eef3-1624810109595/Runtime/x64/XRSDKOpenVR.pdb


+ 0 - 0
Hector_v2/Library/PackageCache/com.valvesoftware.unity.openvr@34a4270c0a30-1624810109595/Runtime/x64/XRSDKOpenVR.pdb.meta → Hector_v2/Library/PackageCache/com.valvesoftware.unity.openvr@c3dfce70eef3-1624810109595/Runtime/x64/XRSDKOpenVR.pdb.meta


+ 0 - 0
Hector_v2/Library/PackageCache/com.valvesoftware.unity.openvr@34a4270c0a30-1624810109595/Runtime/x64/lib.meta → Hector_v2/Library/PackageCache/com.valvesoftware.unity.openvr@c3dfce70eef3-1624810109595/Runtime/x64/lib.meta


+ 0 - 0
Hector_v2/Library/PackageCache/com.valvesoftware.unity.openvr@34a4270c0a30-1624810109595/Runtime/x64/lib/x64.meta → Hector_v2/Library/PackageCache/com.valvesoftware.unity.openvr@c3dfce70eef3-1624810109595/Runtime/x64/lib/x64.meta


+ 0 - 0
Hector_v2/Library/PackageCache/com.valvesoftware.unity.openvr@34a4270c0a30-1624810109595/Runtime/x64/lib/x64/libopenvr_api.so → Hector_v2/Library/PackageCache/com.valvesoftware.unity.openvr@c3dfce70eef3-1624810109595/Runtime/x64/lib/x64/libopenvr_api.so


+ 0 - 0
Hector_v2/Library/PackageCache/com.valvesoftware.unity.openvr@34a4270c0a30-1624810109595/Runtime/x64/lib/x64/libopenvr_api.so.dbg → Hector_v2/Library/PackageCache/com.valvesoftware.unity.openvr@c3dfce70eef3-1624810109595/Runtime/x64/lib/x64/libopenvr_api.so.dbg


+ 0 - 0
Hector_v2/Library/PackageCache/com.valvesoftware.unity.openvr@34a4270c0a30-1624810109595/Runtime/x64/lib/x64/libopenvr_api.so.dbg.meta → Hector_v2/Library/PackageCache/com.valvesoftware.unity.openvr@c3dfce70eef3-1624810109595/Runtime/x64/lib/x64/libopenvr_api.so.dbg.meta


+ 0 - 0
Hector_v2/Library/PackageCache/com.valvesoftware.unity.openvr@34a4270c0a30-1624810109595/Runtime/x64/lib/x64/libopenvr_api.so.meta → Hector_v2/Library/PackageCache/com.valvesoftware.unity.openvr@c3dfce70eef3-1624810109595/Runtime/x64/lib/x64/libopenvr_api.so.meta


+ 0 - 0
Hector_v2/Library/PackageCache/com.valvesoftware.unity.openvr@34a4270c0a30-1624810109595/Runtime/x64/libXRSDKOpenVR.so → Hector_v2/Library/PackageCache/com.valvesoftware.unity.openvr@c3dfce70eef3-1624810109595/Runtime/x64/libXRSDKOpenVR.so


+ 0 - 0
Hector_v2/Library/PackageCache/com.valvesoftware.unity.openvr@34a4270c0a30-1624810109595/Runtime/x64/libXRSDKOpenVR.so.meta → Hector_v2/Library/PackageCache/com.valvesoftware.unity.openvr@c3dfce70eef3-1624810109595/Runtime/x64/libXRSDKOpenVR.so.meta


+ 0 - 0
Hector_v2/Library/PackageCache/com.valvesoftware.unity.openvr@34a4270c0a30-1624810109595/Runtime/x64/libopenvr_api.so → Hector_v2/Library/PackageCache/com.valvesoftware.unity.openvr@c3dfce70eef3-1624810109595/Runtime/x64/libopenvr_api.so


Kaikkia tiedostoja ei voida näyttää, sillä liian monta tiedostoa muuttui tässä diffissä