Browse Source

fix fps logger

Marcel Zickler 3 years ago
parent
commit
b02b97285c
2 changed files with 15 additions and 27 deletions
  1. 14 17
      .idea/.idea.VRCyling/.idea/workspace.xml
  2. 1 10
      Assets/Scripts/Logging/FPSLogger.cs

+ 14 - 17
.idea/.idea.VRCyling/.idea/workspace.xml

@@ -22,20 +22,9 @@
     <select />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="ae9d46da-fd77-45ea-9287-d8d155f44bcf" name="Default Changelist" comment="">
+    <list default="true" id="ae9d46da-fd77-45ea-9287-d8d155f44bcf" name="Default Changelist" comment="Mqtt and stuff">
       <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/Scripts/ConditionManager.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Scripts/ConditionManager.cs" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Assets/Scripts/Logging/Base/Logging.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Scripts/Logging/Base/Logging.cs" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Assets/Scripts/Sensors/SensorStatus.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Scripts/Sensors/SensorStatus.cs" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Assets/Scripts/SicknessReduction/Haptic/DataBroker.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Scripts/SicknessReduction/Haptic/DataBroker.cs" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Assets/Scripts/SicknessReduction/Haptic/VibrationController.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Scripts/SicknessReduction/Haptic/VibrationController.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.csprojAssemblyReference.cache" beforeDir="false" afterPath="$PROJECT_DIR$/obj/Debug/Assembly-CSharp.csprojAssemblyReference.cache" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/Scripts/Logging/FPSLogger.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Scripts/Logging/FPSLogger.cs" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -98,6 +87,7 @@
       <option value="$PROJECT_DIR$/Assets/Scripts/SicknessReduction/Haptic/DataBroker.cs" />
       <option value="$PROJECT_DIR$/Assets/Scripts/Sensors/SensorStatus.cs" />
       <option value="$PROJECT_DIR$/Assets/Scripts/SicknessReduction/Haptic/VibrationController.cs" />
+      <option value="$PROJECT_DIR$/Assets/Scripts/Logging/FPSLogger.cs" />
     </changedPaths>
   </component>
   <component name="ProjectId" id="1kpDZJC6knaYGQzZ8UQRrDNzseV" />
@@ -189,7 +179,7 @@
       <workItem from="1619424599609" duration="770000" />
       <workItem from="1619504859585" duration="5363000" />
       <workItem from="1619512381672" duration="5742000" />
-      <workItem from="1619598623521" duration="3052000" />
+      <workItem from="1619598623521" duration="3858000" />
     </task>
     <task id="LOCAL-00001" summary="VR Stuff, Bicycle Animations">
       <created>1606399745852</created>
@@ -380,7 +370,14 @@
       <option name="project" value="LOCAL" />
       <updated>1619518479748</updated>
     </task>
-    <option name="localTasksCounter" value="28" />
+    <task id="LOCAL-00028" summary="Mqtt and stuff">
+      <created>1619602726933</created>
+      <option name="number" value="00028" />
+      <option name="presentableId" value="LOCAL-00028" />
+      <option name="project" value="LOCAL" />
+      <updated>1619602726933</updated>
+    </task>
+    <option name="localTasksCounter" value="29" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -403,7 +400,6 @@
   <component name="VcsManagerConfiguration">
     <option name="ADD_EXTERNAL_FILES_SILENTLY" value="true" />
     <option name="CLEAR_INITIAL_COMMIT_MESSAGE" value="true" />
-    <MESSAGE value="persistate player position and vr bike data display" />
     <MESSAGE value="Primitive steering with Vive Tracker" />
     <MESSAGE value="Vive Tracker Adjustments" />
     <MESSAGE value="Test Vive Tracker on back" />
@@ -428,7 +424,8 @@
     <MESSAGE value="Updated Scene" />
     <MESSAGE value="Condition Manager + Scene Adjustments" />
     <MESSAGE value="Forgot Saving Scene" />
-    <option name="LAST_COMMIT_MESSAGE" value="Forgot Saving Scene" />
+    <MESSAGE value="Mqtt and stuff" />
+    <option name="LAST_COMMIT_MESSAGE" value="Mqtt and stuff" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>

+ 1 - 10
Assets/Scripts/Logging/FPSLogger.cs

@@ -6,15 +6,6 @@ using UnityEngine;
 
 namespace Logging
 {
-    public enum RouteEvent
-    {
-        None,
-        Left,
-        Right,
-        Straight,
-        Start,
-        Finish
-    }
 
     public readonly struct FPSData : ISerializable
     {
@@ -35,7 +26,7 @@ namespace Logging
 
     public class FPSLogger : SensorDataLogger<FPSData>
     {
-        public override string Key => "route_events";
+        public override string Key => "fps";
 
         private float lastTs = 0f;
         public float checkInterval = 1f;