Browse Source

first test of study

Marcel Zickler 3 years ago
parent
commit
54f4972862

File diff suppressed because it is too large
+ 3 - 6
Assembly-CSharp-Editor.csproj


File diff suppressed because it is too large
+ 3 - 6
Assembly-CSharp.csproj


+ 2 - 2
Assets/Materials/Vignette.mat

@@ -58,10 +58,10 @@ Material:
     - _GlossMapScale: 0
     - _Glossiness: 0
     - _GlossyReflections: 0
-    - _IFOV: 0.1800043
+    - _IFOV: 0.28019053
     - _InnerRadius: 0.15
     - _Metallic: 0
-    - _OFOV: 0.3000043
+    - _OFOV: 0.40019053
     - _OcclusionStrength: 1
     - _QueueOffset: 0
     - _ReceiveShadows: 1

+ 3 - 4
Assets/Plotting/.idea/workspace.xml

@@ -7,14 +7,13 @@
       <change beforePath="$PROJECT_DIR$/../Materials/Vignette.mat" beforeDir="false" afterPath="$PROJECT_DIR$/../Materials/Vignette.mat" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/main.py" beforeDir="false" afterPath="$PROJECT_DIR$/main.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/../Scenes/MainScene.unity" beforeDir="false" afterPath="$PROJECT_DIR$/../Scenes/MainScene.unity" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/../Scripts/ConditionManager.cs" beforeDir="false" afterPath="$PROJECT_DIR$/../Scripts/ConditionManager.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/../Scripts/Tracking/MatchPlayerPositionAndCalibrate.cs" beforeDir="false" afterPath="$PROJECT_DIR$/../Scripts/Tracking/MatchPlayerPositionAndCalibrate.cs" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/../../SteamVR.csproj" beforeDir="false" afterPath="$PROJECT_DIR$/../../SteamVR.csproj" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/../../SteamVR_Editor.csproj" beforeDir="false" afterPath="$PROJECT_DIR$/../../SteamVR_Editor.csproj" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/../../SteamVR_Input_Editor.csproj" beforeDir="false" afterPath="$PROJECT_DIR$/../../SteamVR_Input_Editor.csproj" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/../../SteamVR_Windows_EditorHelper.csproj" beforeDir="false" afterPath="$PROJECT_DIR$/../../SteamVR_Windows_EditorHelper.csproj" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/../../obj/Debug/Assembly-CSharp-Editor.csprojAssemblyReference.cache" beforeDir="false" afterPath="$PROJECT_DIR$/../../obj/Debug/Assembly-CSharp-Editor.csprojAssemblyReference.cache" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/../../obj/Debug/Assembly-CSharp.csprojAssemblyReference.cache" beforeDir="false" afterPath="$PROJECT_DIR$/../../obj/Debug/Assembly-CSharp.csprojAssemblyReference.cache" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/../../obj/Debug/Assembly-CSharp-Editor.csprojAssemblyReference.cache" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/../../obj/Debug/Assembly-CSharp.csprojAssemblyReference.cache" beforeDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />

+ 1 - 1
Assets/Plotting/main.py

@@ -12,7 +12,7 @@ from functools import reduce
 from data import Data
 from tools import get_options, generate_figure
 
-logs_path = "../Logs/Subject_Marcel"
+logs_path = "../Logs/Subject_0"
 log_files = sorted([file for file in os.listdir(logs_path) if not '.' in file], reverse=True)
 d1 = Data(logs_path)
 d2 = Data(logs_path)

BIN
Assets/Scenes/MainScene.unity


+ 2 - 2
Assets/Scripts/Tracking/MatchPlayerPositionAndCalibrate.cs

@@ -72,7 +72,7 @@ namespace Tracking
             var dif = frontWheelDesiredPosition.position - fwtTransform.position;
             playerTransform.position += dif;
 
-            StartCoroutine(HideFrontWheelTracker());
+            //StartCoroutine(HideFrontWheelTracker());
         }
 
         private void MatchLeg()
@@ -88,7 +88,7 @@ namespace Tracking
             var angle = Vector2.Angle(dl2d, dr2d);
             playerTransform.RotateAround(fwtPosition, playerTransform.up, -angle);
 
-            StartCoroutine(HideLegTracker());
+            //StartCoroutine(HideLegTracker());
         }
 
         private IEnumerator HideFrontWheelTracker()

File diff suppressed because it is too large
+ 3 - 6
SteamVR.csproj


File diff suppressed because it is too large
+ 3 - 6
SteamVR_Editor.csproj


File diff suppressed because it is too large
+ 3 - 6
SteamVR_Input_Editor.csproj


File diff suppressed because it is too large
+ 3 - 6
SteamVR_Windows_EditorHelper.csproj


BIN
obj/Debug/Assembly-CSharp-Editor.csprojAssemblyReference.cache


BIN
obj/Debug/Assembly-CSharp.csprojAssemblyReference.cache


Some files were not shown because too many files changed in this diff