Marcel hace 3 años
padre
commit
e391d6f021

+ 53 - 244
.idea/.idea.VRCyling/.idea/workspace.xml

@@ -20,130 +20,10 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="ae9d46da-fd77-45ea-9287-d8d155f44bcf" name="Default Changelist" comment="Test Vive Tracker on back">
-      <change afterPath="$PROJECT_DIR$/Assets/Logs.meta" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/Assets/Logs/2020-12-21_165733.meta" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/Assets/Logs/2020-12-21_165733/log_bike_game_object_data.tsv" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/Assets/Logs/2020-12-21_165733/log_bike_game_object_data.tsv.meta" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/Assets/Logs/2020-12-21_165733/log_bike_sensor_data.tsv" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/Assets/Logs/2020-12-21_165733/log_bike_sensor_data.tsv.meta" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/Assets/Logs/2020-12-21_165733/log_polar_sensor_data.tsv" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/Assets/Logs/2020-12-21_165733/log_polar_sensor_data.tsv.meta" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/Assets/Logs/2020-12-21_165733/log_vive_sensor_data.tsv" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/Assets/Logs/2020-12-21_165733/log_vive_sensor_data.tsv.meta" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/Assets/Logs/2020-12-21_170802/log_bike_game_object_data.tsv" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/Assets/Logs/2020-12-21_170802/log_bike_sensor_data.tsv" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/Assets/Logs/2020-12-21_170802/log_polar_sensor_data.tsv" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/Assets/Logs/2020-12-21_170802/log_vive_sensor_data.tsv" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/Assets/Logs/2020-12-21_171407.meta" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/Assets/Logs/2020-12-21_171407/log_bike_game_object_data.tsv" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/Assets/Logs/2020-12-21_171407/log_bike_game_object_data.tsv.meta" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/Assets/Logs/2020-12-21_171407/log_bike_sensor_data.tsv" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/Assets/Logs/2020-12-21_171407/log_bike_sensor_data.tsv.meta" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/Assets/Logs/2020-12-21_171407/log_polar_sensor_data.tsv" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/Assets/Logs/2020-12-21_171407/log_polar_sensor_data.tsv.meta" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/Assets/Logs/2020-12-21_171407/log_vive_sensor_data.tsv" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/Assets/Logs/2020-12-21_171407/log_vive_sensor_data.tsv.meta" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/Assets/Logs/2020-12-21_171822.meta" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/Assets/Logs/2020-12-21_171822/log_bike_game_object_data.tsv" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/Assets/Logs/2020-12-21_171822/log_bike_game_object_data.tsv.meta" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/Assets/Logs/2020-12-21_171822/log_bike_sensor_data.tsv" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/Assets/Logs/2020-12-21_171822/log_bike_sensor_data.tsv.meta" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/Assets/Logs/2020-12-21_171822/log_polar_sensor_data.tsv" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/Assets/Logs/2020-12-21_171822/log_polar_sensor_data.tsv.meta" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/Assets/Logs/2020-12-21_171822/log_vive_sensor_data.tsv" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/Assets/Logs/2020-12-21_171822/log_vive_sensor_data.tsv.meta" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/Assets/Logs/2020-12-21_172845.meta" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/Assets/Logs/2020-12-21_172845/log_bike_game_object_data.tsv" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/Assets/Logs/2020-12-21_172845/log_bike_game_object_data.tsv.meta" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/Assets/Logs/2020-12-21_172845/log_bike_sensor_data.tsv" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/Assets/Logs/2020-12-21_172845/log_bike_sensor_data.tsv.meta" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/Assets/Logs/2020-12-21_172845/log_polar_sensor_data.tsv" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/Assets/Logs/2020-12-21_172845/log_polar_sensor_data.tsv.meta" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/Assets/Logs/2020-12-21_172845/log_vive_sensor_data.tsv" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/Assets/Logs/2020-12-21_172845/log_vive_sensor_data.tsv.meta" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/Assets/Logs/2020-12-21_175053.meta" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/Assets/Logs/2020-12-21_175053/log_bike_game_object_data.tsv" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/Assets/Logs/2020-12-21_175053/log_bike_game_object_data.tsv.meta" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/Assets/Logs/2020-12-21_175053/log_bike_sensor_data.tsv" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/Assets/Logs/2020-12-21_175053/log_bike_sensor_data.tsv.meta" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/Assets/Logs/2020-12-21_175053/log_polar_sensor_data.tsv" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/Assets/Logs/2020-12-21_175053/log_polar_sensor_data.tsv.meta" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/Assets/Logs/2020-12-21_175053/log_vive_sensor_data.tsv" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/Assets/Logs/2020-12-21_175053/log_vive_sensor_data.tsv.meta" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/Assets/Logs/2020-12-21_175122.meta" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/Assets/Logs/2020-12-21_175122/log_bike_game_object_data.tsv" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/Assets/Logs/2020-12-21_175122/log_bike_game_object_data.tsv.meta" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/Assets/Logs/2020-12-21_175122/log_bike_sensor_data.tsv" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/Assets/Logs/2020-12-21_175122/log_bike_sensor_data.tsv.meta" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/Assets/Logs/2020-12-21_175122/log_polar_sensor_data.tsv" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/Assets/Logs/2020-12-21_175122/log_polar_sensor_data.tsv.meta" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/Assets/Logs/2020-12-21_175122/log_vive_sensor_data.tsv" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/Assets/Logs/2020-12-21_175122/log_vive_sensor_data.tsv.meta" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/Assets/Logs/2020-12-21_175622.meta" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/Assets/Logs/2020-12-21_175622/log_bike_game_object_data.tsv" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/Assets/Logs/2020-12-21_175622/log_bike_game_object_data.tsv.meta" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/Assets/Logs/2020-12-21_175622/log_bike_sensor_data.tsv" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/Assets/Logs/2020-12-21_175622/log_bike_sensor_data.tsv.meta" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/Assets/Logs/2020-12-21_175622/log_polar_sensor_data.tsv" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/Assets/Logs/2020-12-21_175622/log_polar_sensor_data.tsv.meta" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/Assets/Logs/2020-12-21_175622/log_vive_sensor_data.tsv" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/Assets/Logs/2020-12-21_175622/log_vive_sensor_data.tsv.meta" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/Assets/Logs/2020-12-21_181544.meta" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/Assets/Logs/2020-12-21_181544/log_bike_game_object_data.tsv" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/Assets/Logs/2020-12-21_181544/log_bike_game_object_data.tsv.meta" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/Assets/Logs/2020-12-21_181544/log_bike_sensor_data.tsv" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/Assets/Logs/2020-12-21_181544/log_bike_sensor_data.tsv.meta" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/Assets/Logs/2020-12-21_181544/log_polar_sensor_data.tsv" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/Assets/Logs/2020-12-21_181544/log_polar_sensor_data.tsv.meta" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/Assets/Logs/2020-12-21_181544/log_vive_sensor_data.tsv" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/Assets/Logs/2020-12-21_181544/log_vive_sensor_data.tsv.meta" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/Assets/Scripts/GameManager.cs" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/Assets/Scripts/GameManager.cs.meta" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/Assets/Scripts/Logging.meta" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/Assets/Scripts/Logging/BikeGameObjectDataLogger.cs" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/Assets/Scripts/Logging/BikeGameObjectDataLogger.cs.meta" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/Assets/Scripts/Logging/BikeSensorDataLogger.cs" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/Assets/Scripts/Logging/BikeSensorDataLogger.cs.meta" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/Assets/Scripts/Logging/FileLogger.cs" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/Assets/Scripts/Logging/FileLogger.cs.meta" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/Assets/Scripts/Logging/Logable.cs" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/Assets/Scripts/Logging/Logable.cs.meta" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/Assets/Scripts/Logging/Logging.cs" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/Assets/Scripts/Logging/Logging.cs.meta" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/Assets/Scripts/Logging/PolarSensorDataLogger.cs" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/Assets/Scripts/Logging/PolarSensorDataLogger.cs.meta" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/Assets/Scripts/Logging/SensorDataLogger.cs" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/Assets/Scripts/Logging/SensorDataLogger.cs.meta" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/Assets/Scripts/Logging/ViveSensorDataLogger.cs" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/Assets/Scripts/Logging/ViveSensorDataLogger.cs.meta" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/Assets/Scripts/Plotting.meta" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/.idea.VRCyling/.idea/contentModel.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/.idea.VRCyling/.idea/contentModel.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/.idea.VRCyling/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/.idea.VRCyling/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Assembly-CSharp-Editor.csproj" beforeDir="false" afterPath="$PROJECT_DIR$/Assembly-CSharp-Editor.csproj" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Assembly-CSharp.csproj" beforeDir="false" afterPath="$PROJECT_DIR$/Assembly-CSharp.csproj" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Assets/Plotting.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Plotting.meta" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Assets/Plotting/.idea/.gitignore" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Scripts/Plotting/.idea/.gitignore" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Assets/Plotting/.idea/Plotting.iml" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Scripts/Plotting/.idea/Plotting.iml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Assets/Plotting/.idea/inspectionProfiles/Project_Default.xml" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Scripts/Plotting/.idea/inspectionProfiles/Project_Default.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Assets/Plotting/.idea/inspectionProfiles/profiles_settings.xml" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Scripts/Plotting/.idea/inspectionProfiles/profiles_settings.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Assets/Plotting/.idea/misc.xml" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Scripts/Plotting/.idea/misc.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Assets/Plotting/.idea/modules.xml" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Scripts/Plotting/.idea/modules.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Assets/Plotting/.idea/other.xml" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Scripts/Plotting/.idea/other.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Assets/Plotting/.idea/vcs.xml" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Scripts/Plotting/.idea/vcs.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Assets/Plotting/DebugPlot.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Scripts/Plotting/DebugPlot.cs" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Assets/Plotting/DebugPlot.cs.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Scripts/Plotting/DebugPlot.cs.meta" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Assets/Plotting/PlotFileWriter.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Scripts/Logging/AsyncLogFileWriter.cs" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Assets/Plotting/PlotFileWriter.cs.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Scripts/Logging/AsyncLogFileWriter.cs.meta" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Assets/Plotting/plot.py.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Plotting/plot.py.meta" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Assets/Plotting/plots.meta" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/Assets/Scenes/MainScene.unity" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Scenes/MainScene.unity" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/.idea.VRCyling/riderModule.iml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/.idea.VRCyling/riderModule.iml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/Scripts/Logging/ViveSensorDataLogger.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Scripts/Logging/ViveSensorDataLogger.cs" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/Assets/Scripts/Sensors/Polar/PolarReceiver.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Scripts/Sensors/Polar/PolarReceiver.cs" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Assets/SteamVR_Resources/Resources/SteamVR_Settings.asset" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/SteamVR_Resources/Resources/SteamVR_Settings.asset" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Packages/packages-lock.json" beforeDir="false" afterPath="$PROJECT_DIR$/Packages/packages-lock.json" 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/SteamVR_Windows_EditorHelper.csprojAssemblyReference.cache" beforeDir="false" afterPath="$PROJECT_DIR$/obj/Debug/SteamVR_Windows_EditorHelper.csprojAssemblyReference.cache" afterDir="false" />
@@ -157,85 +37,10 @@
     <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
   </component>
   <component name="HighlightingSettingsPerFile">
-    <setting file="mock:///Dummy.cs" root0="SKIP_HIGHLIGHTING" />
-    <setting file="mock:///Dummy.cs" root0="SKIP_HIGHLIGHTING" />
-    <setting file="mock:///Dummy.cs" root0="SKIP_HIGHLIGHTING" />
-    <setting file="mock:///Dummy.cs" root0="SKIP_HIGHLIGHTING" />
-    <setting file="mock:///Dummy.cs" root0="SKIP_HIGHLIGHTING" />
-    <setting file="mock:///Dummy.cs" root0="SKIP_HIGHLIGHTING" />
-    <setting file="mock:///Dummy.cs" root0="SKIP_HIGHLIGHTING" />
-    <setting file="mock:///Dummy.cs" root0="SKIP_HIGHLIGHTING" />
-    <setting file="mock:///Dummy.cs" root0="SKIP_HIGHLIGHTING" />
-    <setting file="mock:///Dummy.cs" root0="SKIP_HIGHLIGHTING" />
+    <setting file="file://$PROJECT_DIR$/Library/PackageCache/com.unity.inputsystem@1.0.1/InputSystem/Utilities/PrimitiveValue.cs" root0="SKIP_HIGHLIGHTING" />
     <setting file="file://$PROJECT_DIR$/Assets/Scripts/Animation/BikeAnimation.cs" root0="FORCE_HIGHLIGHTING" />
-    <setting file="mock:///Dummy.cs" root0="SKIP_HIGHLIGHTING" />
     <setting file="file://$PROJECT_DIR$/Assets/Scripts/Tracking/KineticLegTracker.cs" root0="FORCE_HIGHLIGHTING" />
-    <setting file="mock:///Dummy.cs" root0="SKIP_HIGHLIGHTING" />
-    <setting file="mock:///Dummy.cs" root0="SKIP_HIGHLIGHTING" />
-    <setting file="mock:///Dummy.cs" root0="SKIP_HIGHLIGHTING" />
-    <setting file="mock:///Dummy.cs" root0="SKIP_HIGHLIGHTING" />
-    <setting file="mock:///Dummy.cs" root0="SKIP_HIGHLIGHTING" />
-    <setting file="mock:///Dummy.cs" root0="SKIP_HIGHLIGHTING" />
-    <setting file="mock:///Dummy.cs" root0="SKIP_HIGHLIGHTING" />
-    <setting file="mock:///Dummy.cs" root0="SKIP_HIGHLIGHTING" />
-    <setting file="mock:///Dummy.cs" root0="SKIP_HIGHLIGHTING" />
-    <setting file="mock:///Dummy.cs" root0="SKIP_HIGHLIGHTING" />
     <setting file="file://$PROJECT_DIR$/Library/PackageCache/com.unity.inputsystem@1.0.1/InputSystem/InputManager.cs" root0="SKIP_HIGHLIGHTING" />
-    <setting file="mock:///Dummy.cs" root0="SKIP_HIGHLIGHTING" />
-    <setting file="mock:///Dummy.cs" root0="SKIP_HIGHLIGHTING" />
-    <setting file="mock:///Dummy.cs" root0="SKIP_HIGHLIGHTING" />
-    <setting file="mock:///Dummy.cs" root0="SKIP_HIGHLIGHTING" />
-    <setting file="mock:///Dummy.cs" root0="SKIP_HIGHLIGHTING" />
-    <setting file="mock:///Dummy.cs" root0="SKIP_HIGHLIGHTING" />
-    <setting file="mock:///Dummy.cs" root0="SKIP_HIGHLIGHTING" />
-    <setting file="file://$PROJECT_DIR$/Library/PackageCache/com.unity.inputsystem@1.0.1/InputSystem/Utilities/PrimitiveValue.cs" root0="SKIP_HIGHLIGHTING" />
-    <setting file="mock:///Dummy.cs" root0="SKIP_HIGHLIGHTING" />
-    <setting file="mock:///Dummy.cs" root0="SKIP_HIGHLIGHTING" />
-    <setting file="mock:///Dummy.cs" root0="SKIP_HIGHLIGHTING" />
-    <setting file="mock:///Dummy.cs" root0="SKIP_HIGHLIGHTING" />
-    <setting file="mock:///Dummy.cs" root0="SKIP_HIGHLIGHTING" />
-    <setting file="mock:///Dummy.cs" root0="SKIP_HIGHLIGHTING" />
-    <setting file="mock:///Dummy.cs" root0="SKIP_HIGHLIGHTING" />
-    <setting file="mock:///Dummy.cs" root0="SKIP_HIGHLIGHTING" />
-    <setting file="mock:///Dummy.cs" root0="SKIP_HIGHLIGHTING" />
-    <setting file="mock:///Dummy.cs" root0="SKIP_HIGHLIGHTING" />
-    <setting file="mock:///Dummy.cs" root0="SKIP_HIGHLIGHTING" />
-    <setting file="mock:///Dummy.cs" root0="SKIP_HIGHLIGHTING" />
-    <setting file="mock:///Dummy.cs" root0="SKIP_HIGHLIGHTING" />
-    <setting file="mock:///Dummy.cs" root0="SKIP_HIGHLIGHTING" />
-    <setting file="mock:///Dummy.cs" root0="SKIP_HIGHLIGHTING" />
-    <setting file="mock:///Dummy.cs" root0="SKIP_HIGHLIGHTING" />
-    <setting file="mock:///Dummy.cs" root0="SKIP_HIGHLIGHTING" />
-    <setting file="mock:///Dummy.cs" root0="SKIP_HIGHLIGHTING" />
-    <setting file="mock:///Dummy.cs" root0="SKIP_HIGHLIGHTING" />
-    <setting file="mock:///Dummy.cs" root0="SKIP_HIGHLIGHTING" />
-    <setting file="mock:///Dummy.cs" root0="SKIP_HIGHLIGHTING" />
-    <setting file="mock:///Dummy.cs" root0="SKIP_HIGHLIGHTING" />
-    <setting file="mock:///Dummy.cs" root0="SKIP_HIGHLIGHTING" />
-    <setting file="mock:///Dummy.cs" root0="SKIP_HIGHLIGHTING" />
-    <setting file="mock:///Dummy.cs" root0="SKIP_HIGHLIGHTING" />
-    <setting file="mock:///Dummy.cs" root0="SKIP_HIGHLIGHTING" />
-    <setting file="mock:///Dummy.cs" root0="SKIP_HIGHLIGHTING" />
-    <setting file="mock:///Dummy.cs" root0="SKIP_HIGHLIGHTING" />
-    <setting file="mock:///Dummy.cs" root0="SKIP_HIGHLIGHTING" />
-    <setting file="mock:///Dummy.cs" root0="SKIP_HIGHLIGHTING" />
-    <setting file="mock:///Dummy.cs" root0="SKIP_HIGHLIGHTING" />
-    <setting file="mock:///Dummy.cs" root0="SKIP_HIGHLIGHTING" />
-    <setting file="mock:///Dummy.cs" root0="SKIP_HIGHLIGHTING" />
-    <setting file="mock:///Dummy.cs" root0="SKIP_HIGHLIGHTING" />
-    <setting file="mock:///Dummy.cs" root0="SKIP_HIGHLIGHTING" />
-    <setting file="mock:///Dummy.cs" root0="SKIP_HIGHLIGHTING" />
-    <setting file="mock:///Dummy.cs" root0="SKIP_HIGHLIGHTING" />
-    <setting file="mock:///Dummy.cs" root0="SKIP_HIGHLIGHTING" />
-    <setting file="mock:///Dummy.cs" root0="SKIP_HIGHLIGHTING" />
-    <setting file="mock:///Dummy.cs" root0="SKIP_HIGHLIGHTING" />
-    <setting file="mock:///Dummy.cs" root0="SKIP_HIGHLIGHTING" />
-    <setting file="mock:///Dummy.cs" root0="SKIP_HIGHLIGHTING" />
-    <setting file="mock:///Dummy.cs" root0="SKIP_HIGHLIGHTING" />
-    <setting file="mock:///Dummy.cs" root0="SKIP_HIGHLIGHTING" />
-    <setting file="mock:///Dummy.cs" root0="SKIP_HIGHLIGHTING" />
-    <setting file="mock:///Dummy.cs" root0="SKIP_HIGHLIGHTING" />
-    <setting file="mock:///Dummy.cs" root0="SKIP_HIGHLIGHTING" />
   </component>
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
@@ -274,7 +79,6 @@
         <option value="$PROJECT_DIR$/Assets/Plotting/PlotFileWriter.cs" />
         <option value="$PROJECT_DIR$/Assets/Plotting/AsyncLogFileWriter.cs" />
         <option value="$PROJECT_DIR$/Assets/Scripts/Plotting/DebugPlot.cs" />
-        <option value="$PROJECT_DIR$/Assets/Scripts/Sensors/Polar/PolarReceiver.cs" />
         <option value="$PROJECT_DIR$/Assets/Scripts/Logging/LogSensorData.cs" />
         <option value="$PROJECT_DIR$/Assets/Scripts/Logging/LogData.cs" />
         <option value="$PROJECT_DIR$/Assets/Scripts/Logging/BikeSensorDataLogger.cs" />
@@ -284,9 +88,10 @@
         <option value="$PROJECT_DIR$/Assets/Scripts/Logging/AsyncLogFileWriter.cs" />
         <option value="$PROJECT_DIR$/Assets/Scripts/Logging/FileLogger.cs" />
         <option value="$PROJECT_DIR$/Assets/Scripts/Logging/Logging.cs" />
-        <option value="$PROJECT_DIR$/Assets/Scripts/Logging/ViveSensorDataLogger.cs" />
         <option value="$PROJECT_DIR$/Assets/Scripts/Logging/BikeGameObjectDataLogger.cs" />
         <option value="$PROJECT_DIR$/Assets/Scripts/Logging/SensorDataLogger.cs" />
+        <option value="$PROJECT_DIR$/Assets/Scripts/Logging/ViveSensorDataLogger.cs" />
+        <option value="$PROJECT_DIR$/Assets/Scripts/Sensors/Polar/PolarReceiver.cs" />
       </list>
     </option>
   </component>
@@ -307,14 +112,14 @@
     <property name="WebServerToolWindowFactoryState" value="false" />
     <property name="XThreadsFramesViewSplitterKey" value="0.37366548" />
     <property name="nodejs_package_manager_path" value="npm" />
-    <property name="settings.editor.selected.configurable" value="preferences.sourceCode.C#" />
+    <property name="settings.editor.selected.configurable" value="preferences.pluginManager" />
     <property name="vue.rearranger.settings.migration" value="true" />
   </component>
   <component name="RunManager" selected="Attach to Unity Editor.Attach to Unity Editor &amp; Play">
-    <configuration name="Attach to Unity Editor &amp; Play" type="UNITY_DEBUG_RUN_CONFIGURATION" factoryName="UNITY_ATTACH_AND_PLAY" show_console_on_std_err="false" show_console_on_std_out="false" port="50000" address="localhost" ignored-value-for-modified-check="10624">
+    <configuration name="Attach to Unity Editor &amp; Play" type="UNITY_DEBUG_RUN_CONFIGURATION" factoryName="UNITY_ATTACH_AND_PLAY" show_console_on_std_err="false" show_console_on_std_out="false" port="50000" address="localhost">
       <option name="allowRunningInParallel" value="false" />
       <option name="listenPortForConnections" value="false" />
-      <option name="pid" value="10624" />
+      <option name="pid" />
       <option name="selectedOptions">
         <set />
       </option>
@@ -344,7 +149,8 @@
       <workItem from="1607588039382" duration="5023000" />
       <workItem from="1608111814180" duration="1242000" />
       <workItem from="1608191738071" duration="10660000" />
-      <workItem from="1608556964379" duration="14402000" />
+      <workItem from="1608556964379" duration="14561000" />
+      <workItem from="1608626823380" duration="1682000" />
     </task>
     <task id="LOCAL-00001" summary="VR Stuff, Bicycle Animations">
       <created>1606399745852</created>
@@ -435,99 +241,101 @@
       <screen x="0" y="0" width="1920" height="1040" />
     </state>
     <state width="463" height="464" key="DebuggerActiveHint/0.0.1920.1040@0.0.1920.1040" timestamp="1608205291466" />
-    <state width="1398" height="278" key="GridCell.Tab.0.bottom" timestamp="1608570934464">
+    <state width="1398" height="278" key="GridCell.Tab.0.bottom" timestamp="1608571659057">
       <screen x="0" y="0" width="1440" height="860" />
     </state>
-    <state width="1398" height="278" key="GridCell.Tab.0.bottom/0.0.1440.860@0.0.1440.860" timestamp="1608570934464" />
+    <state width="1398" height="278" key="GridCell.Tab.0.bottom/0.0.1440.860@0.0.1440.860" timestamp="1608571659057" />
     <state width="1877" height="314" key="GridCell.Tab.0.bottom/0.0.1920.1040@0.0.1920.1040" timestamp="1608205442014" />
-    <state width="1398" height="278" key="GridCell.Tab.0.center" timestamp="1608570934464">
+    <state width="1398" height="278" key="GridCell.Tab.0.center" timestamp="1608571659056">
       <screen x="0" y="0" width="1440" height="860" />
     </state>
-    <state width="1398" height="278" key="GridCell.Tab.0.center/0.0.1440.860@0.0.1440.860" timestamp="1608570934464" />
+    <state width="1398" height="278" key="GridCell.Tab.0.center/0.0.1440.860@0.0.1440.860" timestamp="1608571659056" />
     <state width="1877" height="314" key="GridCell.Tab.0.center/0.0.1920.1040@0.0.1920.1040" timestamp="1608205442014" />
-    <state width="1398" height="278" key="GridCell.Tab.0.left" timestamp="1608570934464">
+    <state width="1398" height="278" key="GridCell.Tab.0.left" timestamp="1608571659056">
       <screen x="0" y="0" width="1440" height="860" />
     </state>
-    <state width="1398" height="278" key="GridCell.Tab.0.left/0.0.1440.860@0.0.1440.860" timestamp="1608570934464" />
+    <state width="1398" height="278" key="GridCell.Tab.0.left/0.0.1440.860@0.0.1440.860" timestamp="1608571659056" />
     <state width="1877" height="314" key="GridCell.Tab.0.left/0.0.1920.1040@0.0.1920.1040" timestamp="1608205442014" />
-    <state width="1398" height="278" key="GridCell.Tab.0.right" timestamp="1608570934464">
+    <state width="1398" height="278" key="GridCell.Tab.0.right" timestamp="1608571659057">
       <screen x="0" y="0" width="1440" height="860" />
     </state>
-    <state width="1398" height="278" key="GridCell.Tab.0.right/0.0.1440.860@0.0.1440.860" timestamp="1608570934464" />
+    <state width="1398" height="278" key="GridCell.Tab.0.right/0.0.1440.860@0.0.1440.860" timestamp="1608571659057" />
     <state width="1877" height="314" key="GridCell.Tab.0.right/0.0.1920.1040@0.0.1920.1040" timestamp="1608205442014" />
-    <state width="1398" height="278" key="GridCell.Tab.1.bottom" timestamp="1608570944809">
+    <state width="1398" height="278" key="GridCell.Tab.1.bottom" timestamp="1608571659058">
       <screen x="0" y="0" width="1440" height="860" />
     </state>
-    <state width="1398" height="278" key="GridCell.Tab.1.bottom/0.0.1440.860@0.0.1440.860" timestamp="1608570944809" />
+    <state width="1398" height="278" key="GridCell.Tab.1.bottom/0.0.1440.860@0.0.1440.860" timestamp="1608571659058" />
     <state width="1877" height="314" key="GridCell.Tab.1.bottom/0.0.1920.1040@0.0.1920.1040" timestamp="1608205448906" />
-    <state width="1398" height="278" key="GridCell.Tab.1.center" timestamp="1608570944809">
+    <state width="1398" height="278" key="GridCell.Tab.1.center" timestamp="1608571659057">
       <screen x="0" y="0" width="1440" height="860" />
     </state>
-    <state width="1398" height="278" key="GridCell.Tab.1.center/0.0.1440.860@0.0.1440.860" timestamp="1608570944809" />
+    <state width="1398" height="278" key="GridCell.Tab.1.center/0.0.1440.860@0.0.1440.860" timestamp="1608571659057" />
     <state width="1877" height="314" key="GridCell.Tab.1.center/0.0.1920.1040@0.0.1920.1040" timestamp="1608205448906" />
-    <state width="1398" height="278" key="GridCell.Tab.1.left" timestamp="1608570944809">
+    <state width="1398" height="278" key="GridCell.Tab.1.left" timestamp="1608571659057">
       <screen x="0" y="0" width="1440" height="860" />
     </state>
-    <state width="1398" height="278" key="GridCell.Tab.1.left/0.0.1440.860@0.0.1440.860" timestamp="1608570944809" />
+    <state width="1398" height="278" key="GridCell.Tab.1.left/0.0.1440.860@0.0.1440.860" timestamp="1608571659057" />
     <state width="1877" height="314" key="GridCell.Tab.1.left/0.0.1920.1040@0.0.1920.1040" timestamp="1608205448906" />
-    <state width="1398" height="278" key="GridCell.Tab.1.right" timestamp="1608570944809">
+    <state width="1398" height="278" key="GridCell.Tab.1.right" timestamp="1608571659058">
       <screen x="0" y="0" width="1440" height="860" />
     </state>
-    <state width="1398" height="278" key="GridCell.Tab.1.right/0.0.1440.860@0.0.1440.860" timestamp="1608570944809" />
+    <state width="1398" height="278" key="GridCell.Tab.1.right/0.0.1440.860@0.0.1440.860" timestamp="1608571659058" />
     <state width="1877" height="314" key="GridCell.Tab.1.right/0.0.1920.1040@0.0.1920.1040" timestamp="1608205448906" />
-    <state width="1398" height="278" key="GridCell.Tab.2.bottom" timestamp="1608570934247">
+    <state width="1398" height="278" key="GridCell.Tab.2.bottom" timestamp="1608571659059">
       <screen x="0" y="0" width="1440" height="860" />
     </state>
-    <state width="1398" height="278" key="GridCell.Tab.2.bottom/0.0.1440.860@0.0.1440.860" timestamp="1608570934247" />
+    <state width="1398" height="278" key="GridCell.Tab.2.bottom/0.0.1440.860@0.0.1440.860" timestamp="1608571659059" />
     <state width="1877" height="314" key="GridCell.Tab.2.bottom/0.0.1920.1040@0.0.1920.1040" timestamp="1608205441888" />
-    <state width="1398" height="278" key="GridCell.Tab.2.center" timestamp="1608570934247">
+    <state width="1398" height="278" key="GridCell.Tab.2.center" timestamp="1608571659058">
       <screen x="0" y="0" width="1440" height="860" />
     </state>
-    <state width="1398" height="278" key="GridCell.Tab.2.center/0.0.1440.860@0.0.1440.860" timestamp="1608570934247" />
+    <state width="1398" height="278" key="GridCell.Tab.2.center/0.0.1440.860@0.0.1440.860" timestamp="1608571659058" />
     <state width="1877" height="314" key="GridCell.Tab.2.center/0.0.1920.1040@0.0.1920.1040" timestamp="1608205441888" />
-    <state width="1398" height="278" key="GridCell.Tab.2.left" timestamp="1608570934247">
+    <state width="1398" height="278" key="GridCell.Tab.2.left" timestamp="1608571659058">
       <screen x="0" y="0" width="1440" height="860" />
     </state>
-    <state width="1398" height="278" key="GridCell.Tab.2.left/0.0.1440.860@0.0.1440.860" timestamp="1608570934247" />
+    <state width="1398" height="278" key="GridCell.Tab.2.left/0.0.1440.860@0.0.1440.860" timestamp="1608571659058" />
     <state width="1877" height="314" key="GridCell.Tab.2.left/0.0.1920.1040@0.0.1920.1040" timestamp="1608205441888" />
-    <state width="1398" height="278" key="GridCell.Tab.2.right" timestamp="1608570934247">
+    <state width="1398" height="278" key="GridCell.Tab.2.right" timestamp="1608571659059">
       <screen x="0" y="0" width="1440" height="860" />
     </state>
-    <state width="1398" height="278" key="GridCell.Tab.2.right/0.0.1440.860@0.0.1440.860" timestamp="1608570934247" />
+    <state width="1398" height="278" key="GridCell.Tab.2.right/0.0.1440.860@0.0.1440.860" timestamp="1608571659059" />
     <state width="1877" height="314" key="GridCell.Tab.2.right/0.0.1920.1040@0.0.1920.1040" timestamp="1608205441888" />
-    <state width="1398" height="278" key="GridCell.Tab.3.bottom" timestamp="1608570934247">
+    <state width="1398" height="278" key="GridCell.Tab.3.bottom" timestamp="1608571659060">
       <screen x="0" y="0" width="1440" height="860" />
     </state>
-    <state width="1398" height="278" key="GridCell.Tab.3.bottom/0.0.1440.860@0.0.1440.860" timestamp="1608570934247" />
+    <state width="1398" height="278" key="GridCell.Tab.3.bottom/0.0.1440.860@0.0.1440.860" timestamp="1608571659060" />
     <state width="1877" height="314" key="GridCell.Tab.3.bottom/0.0.1920.1040@0.0.1920.1040" timestamp="1608205441889" />
-    <state width="1398" height="278" key="GridCell.Tab.3.center" timestamp="1608570934247">
+    <state width="1398" height="278" key="GridCell.Tab.3.center" timestamp="1608571659059">
       <screen x="0" y="0" width="1440" height="860" />
     </state>
-    <state width="1398" height="278" key="GridCell.Tab.3.center/0.0.1440.860@0.0.1440.860" timestamp="1608570934247" />
+    <state width="1398" height="278" key="GridCell.Tab.3.center/0.0.1440.860@0.0.1440.860" timestamp="1608571659059" />
     <state width="1877" height="314" key="GridCell.Tab.3.center/0.0.1920.1040@0.0.1920.1040" timestamp="1608205441889" />
-    <state width="1398" height="278" key="GridCell.Tab.3.left" timestamp="1608570934247">
+    <state width="1398" height="278" key="GridCell.Tab.3.left" timestamp="1608571659059">
       <screen x="0" y="0" width="1440" height="860" />
     </state>
-    <state width="1398" height="278" key="GridCell.Tab.3.left/0.0.1440.860@0.0.1440.860" timestamp="1608570934247" />
+    <state width="1398" height="278" key="GridCell.Tab.3.left/0.0.1440.860@0.0.1440.860" timestamp="1608571659059" />
     <state width="1877" height="314" key="GridCell.Tab.3.left/0.0.1920.1040@0.0.1920.1040" timestamp="1608205441889" />
-    <state width="1398" height="278" key="GridCell.Tab.3.right" timestamp="1608570934247">
+    <state width="1398" height="278" key="GridCell.Tab.3.right" timestamp="1608571659059">
       <screen x="0" y="0" width="1440" height="860" />
     </state>
-    <state width="1398" height="278" key="GridCell.Tab.3.right/0.0.1440.860@0.0.1440.860" timestamp="1608570934247" />
+    <state width="1398" height="278" key="GridCell.Tab.3.right/0.0.1440.860@0.0.1440.860" timestamp="1608571659059" />
     <state width="1877" height="314" key="GridCell.Tab.3.right/0.0.1920.1040@0.0.1920.1040" timestamp="1608205441889" />
-    <state x="573" y="160" key="RiderGenerateDialog" timestamp="1608564997064">
+    <state x="573" y="160" key="RiderGenerateDialog" timestamp="1608627346731">
       <screen x="0" y="0" width="1440" height="860" />
     </state>
-    <state x="573" y="160" key="RiderGenerateDialog/0.0.1440.860@0.0.1440.860" timestamp="1608564997064" />
+    <state x="573" y="160" key="RiderGenerateDialog/0.0.1440.860@0.0.1440.860" timestamp="1608627346731" />
     <state x="764" y="193" key="RiderGenerateDialog/0.0.1920.1040@0.0.1920.1040" timestamp="1608198510148" />
-    <state x="346" y="136" key="SettingsEditor" timestamp="1608560555168">
+    <state x="346" y="136" key="SettingsEditor" timestamp="1608627211813">
       <screen x="0" y="0" width="1440" height="860" />
     </state>
-    <state x="346" y="136" key="SettingsEditor/0.0.1440.860@0.0.1440.860" timestamp="1608560555168" />
+    <state x="346" y="136" key="SettingsEditor/0.0.1440.860@0.0.1440.860" timestamp="1608627211813" />
     <state x="461" y="164" key="SettingsEditor/0.0.1920.1040@0.0.1920.1040" timestamp="1607347297764" />
-    <state x="92" y="92" width="1736" height="856" key="VCS.FileHistoryDialog" timestamp="1607591027227">
-      <screen x="0" y="0" width="1920" height="1040" />
+    <state x="69" y="80" width="1302" height="741" key="VCS.FileHistoryDialog" timestamp="1608628517975">
+      <screen x="0" y="0" width="1440" height="900" />
     </state>
+    <state x="69" y="76" width="1302" height="708" key="VCS.FileHistoryDialog/0.0.1440.860@0.0.1440.860" timestamp="1608627545275" />
+    <state x="69" y="80" width="1302" height="741" key="VCS.FileHistoryDialog/0.0.1440.900@0.0.1440.900" timestamp="1608628517975" />
     <state x="92" y="92" width="1736" height="856" key="VCS.FileHistoryDialog/0.0.1920.1040@0.0.1920.1040" timestamp="1607591027227" />
     <state x="552" y="252" key="Vcs.Push.Dialog.v2" timestamp="1607593425704">
       <screen x="0" y="0" width="1920" height="1040" />
@@ -541,10 +349,11 @@
       <screen x="0" y="0" width="1440" height="860" />
     </state>
     <state x="301" y="85" key="editAsTableFormatDialogDimension/0.0.1440.860@0.0.1440.860" timestamp="1608571133060" />
-    <state x="472" y="191" width="672" height="561" key="search.everywhere.popup" timestamp="1608569282396">
-      <screen x="0" y="0" width="1440" height="860" />
+    <state x="473" y="201" width="672" height="588" key="search.everywhere.popup" timestamp="1608628151763">
+      <screen x="0" y="0" width="1440" height="900" />
     </state>
     <state x="472" y="191" width="672" height="561" key="search.everywhere.popup/0.0.1440.860@0.0.1440.860" timestamp="1608569282396" />
+    <state x="473" y="201" width="672" height="588" key="search.everywhere.popup/0.0.1440.900@0.0.1440.900" timestamp="1608628151763" />
     <state x="623" y="225" width="672" height="678" key="search.everywhere.popup/0.0.1920.1040@0.0.1920.1040" timestamp="1608204195479" />
   </component>
   <component name="XDebuggerManager">

+ 1 - 5
.idea/.idea.VRCyling/riderModule.iml

@@ -1,11 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module type="RIDER_MODULE" version="4">
   <component name="NewModuleRootManager">
-    <content url="file://$MODULE_DIR$/../..">
-      <excludeFolder url="file://$MODULE_DIR$/../../Assets/Logs" />
-      <excludeFolder url="file://$MODULE_DIR$/../../Library" />
-      <excludeFolder url="file://$MODULE_DIR$/../../Temp" />
-    </content>
+    <content url="file://$MODULE_DIR$/../.." />
     <orderEntry type="sourceFolder" forTests="false" />
   </component>
 </module>

+ 1 - 0
Assets/Scenes/MainScene.unity

@@ -226089,6 +226089,7 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   fwt: {fileID: 504796931}
   klt: {fileID: 1325331271}
+  hmd: {fileID: 1119305144}
 --- !u!114 &1169776438
 MonoBehaviour:
   m_ObjectHideFlags: 0

+ 28 - 4
Assets/Scripts/Logging/ViveSensorDataLogger.cs

@@ -23,12 +23,19 @@ namespace Logging
         private readonly float kineticTrackerRotationX;
         private readonly float kineticTrackerRotationY;
         private readonly float kineticTrackerRotationZ;
+        private readonly float hmdPositionX;
+        private readonly float hmdPositionY;
+        private readonly float hmdPositionZ;
+        private readonly float hmdRotationX;
+        private readonly float hmdRotationY;
+        private readonly float hmdRotationZ;
 
         public ViveSensorDataLog(float timestamp, float steerAngle, float frontWheelTrackerPositionX,
             float frontWheelTrackerPositionY, float frontWheelTrackerPositionZ, float frontWheelTrackerRotationX,
             float frontWheelTrackerRotationY, float frontWheelTrackerRotationZ, float kineticTrackerPositionX,
             float kineticTrackerPositionY, float kineticTrackerPositionZ, float kineticTrackerRotationX,
-            float kineticTrackerRotationY, float kineticTrackerRotationZ)
+            float kineticTrackerRotationY, float kineticTrackerRotationZ, float hmdPositionX, float hmdPositionY,
+            float hmdPositionZ, float hmdRotationX, float hmdRotationY, float hmdRotationZ)
         {
             this.timestamp = timestamp;
             this.steerAngle = steerAngle;
@@ -44,6 +51,12 @@ namespace Logging
             this.kineticTrackerRotationX = kineticTrackerRotationX;
             this.kineticTrackerRotationY = kineticTrackerRotationY;
             this.kineticTrackerRotationZ = kineticTrackerRotationZ;
+            this.hmdPositionX = hmdPositionX;
+            this.hmdPositionY = hmdPositionY;
+            this.hmdPositionZ = hmdPositionZ;
+            this.hmdRotationX = hmdRotationX;
+            this.hmdRotationY = hmdRotationY;
+            this.hmdRotationZ = hmdRotationZ;
         }
 
 
@@ -63,6 +76,12 @@ namespace Logging
             kineticTrackerRotationX.ToString("F6", CultureInfo.InvariantCulture),
             kineticTrackerRotationY.ToString("F6", CultureInfo.InvariantCulture),
             kineticTrackerRotationZ.ToString("F6", CultureInfo.InvariantCulture),
+            hmdPositionX.ToString("F6", CultureInfo.InvariantCulture),
+            hmdPositionY.ToString("F6", CultureInfo.InvariantCulture),
+            hmdPositionZ.ToString("F6", CultureInfo.InvariantCulture),
+            hmdRotationX.ToString("F6", CultureInfo.InvariantCulture),
+            hmdRotationY.ToString("F6", CultureInfo.InvariantCulture),
+            hmdRotationZ.ToString("F6", CultureInfo.InvariantCulture),
         };
     }
 
@@ -70,6 +89,7 @@ namespace Logging
     {
         public FrontWheelTracker fwt;
         public KineticLegTracker klt;
+        public Transform hmd;
 
         public override string Key => "vive_sensor_data";
 
@@ -80,12 +100,16 @@ namespace Logging
             var fwtRotation = fwt.RelativeRotation;
             var kltPosition = klt.RelativePosition;
             var kltRotation = klt.RelativeRotation;
+            var hmdPosition = hmd.position;
+            var hmdRotation = hmd.rotation.eulerAngles;
             //TODO: data always there?
             Log(new ViveSensorDataLog(Time.time, steerAngle,
-                fwtPosition.x, fwtPosition.y, fwtPosition.z, 
+                fwtPosition.x, fwtPosition.y, fwtPosition.z,
                 fwtRotation.x, fwtRotation.y, fwtRotation.z,
-                kltPosition.x, kltPosition.y, kltPosition.z, 
-                kltRotation.x, kltRotation.y, kltRotation.z));
+                kltPosition.x, kltPosition.y, kltPosition.z,
+                kltRotation.x, kltRotation.y, kltRotation.z,
+                hmdPosition.x, hmdPosition.y, hmdPosition.z,
+                hmdRotation.x, hmdRotation.y, hmdRotation.z));
         }
 
         public override void Log(ViveSensorDataLog value)

+ 1 - 1
Assets/Scripts/Sensors/Polar/PolarReceiver.cs

@@ -12,7 +12,7 @@ namespace Sensors.Polar
     public struct PolarSensorConfig
     {
         public int port;
-        public String ipAddress;
+        public string ipAddress;
         public bool plotAcc;
         public bool plotEcg;
         public int accSampleRate; //TODO: let user choose between 25, 50, 100, 200

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


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


BIN
obj/Debug/SteamVR_Windows_EditorHelper.csprojAssemblyReference.cache