Browse Source

Fixed routes

Marcel Zickler 3 years ago
parent
commit
9532fa2518

+ 74 - 48
.idea/.idea.VRCyling/.idea/workspace.xml

@@ -22,21 +22,12 @@
     <select />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="ae9d46da-fd77-45ea-9287-d8d155f44bcf" name="Default Changelist" comment="">
-      <change beforePath="$PROJECT_DIR$/.idea/.idea.VRCyling/.idea/contentModel.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/.idea.VRCyling/.idea/contentModel.xml" afterDir="false" />
+    <list default="true" id="ae9d46da-fd77-45ea-9287-d8d155f44bcf" name="Default Changelist" comment="fixes">
       <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/Logging/Data/FrontWheelTrackerLogger.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Scripts/Logging/Data/FrontWheelTrackerLogger.cs" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Assets/Scripts/Tracking/CalibratableTracker.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Scripts/Tracking/CalibratableTracker.cs" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Assets/Scripts/Tracking/KineticLegTracker.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Scripts/Tracking/KineticLegTracker.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$/obj/Debug/SteamVR_Windows_EditorHelper.csprojAssemblyReference.cache" beforeDir="false" afterPath="$PROJECT_DIR$/obj/Debug/SteamVR_Windows_EditorHelper.csprojAssemblyReference.cache" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/unityProject.vrmanifest" beforeDir="false" afterPath="$PROJECT_DIR$/unityProject.vrmanifest" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/Plotting/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Plotting/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/Prefabs/Player/BikePlayer - RigidBody.prefab" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Prefabs/Player/BikePlayer - RigidBody.prefab" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/Scripts/Roads/StraightRoadExtras.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Scripts/Roads/StraightRoadExtras.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/Settings/SampleSceneProfile.asset" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Settings/SampleSceneProfile.asset" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -53,7 +44,6 @@
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-        <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/Logging/LogSensorData.cs" />
@@ -95,8 +85,6 @@
         <option value="$PROJECT_DIR$/Assets/Scripts/Logging/Base/Logging.cs" />
         <option value="$PROJECT_DIR$/Assets/Scripts/Logging/Base/TimeSync.cs" />
         <option value="$PROJECT_DIR$/Assets/Scripts/Routes/Turn.cs" />
-        <option value="$PROJECT_DIR$/Assets/Scripts/Roads/StraightRoadExtras.cs" />
-        <option value="$PROJECT_DIR$/Assets/Scripts/Logging/Events/RouteEventLogger.cs" />
         <option value="$PROJECT_DIR$/Assets/StreetPartMeta.cs" />
         <option value="$PROJECT_DIR$/Assets/Scripts/Roads/StreetPartMeta.cs" />
         <option value="$PROJECT_DIR$/Assets/Scripts/Roads/StreetPartMetaTag.cs" />
@@ -104,6 +92,9 @@
         <option value="$PROJECT_DIR$/Assets/Scripts/Tracking/CalibratableTracker.cs" />
         <option value="$PROJECT_DIR$/Assets/Scripts/Tracking/KineticLegTracker.cs" />
         <option value="$PROJECT_DIR$/Assets/Scripts/Logging/Data/FrontWheelTrackerLogger.cs" />
+        <option value="$PROJECT_DIR$/Assets/Scripts/Calibration/PersistatePlayerPosition.cs" />
+        <option value="$PROJECT_DIR$/Assets/Scripts/Logging/Events/RouteEventLogger.cs" />
+        <option value="$PROJECT_DIR$/Assets/Scripts/Roads/StraightRoadExtras.cs" />
       </list>
     </option>
   </component>
@@ -128,10 +119,10 @@
     <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">
+    <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="6944">
       <option name="allowRunningInParallel" value="false" />
       <option name="listenPortForConnections" value="false" />
-      <option name="pid" />
+      <option name="pid" value="6944" />
       <option name="selectedOptions">
         <set />
       </option>
@@ -167,7 +158,7 @@
       <workItem from="1609928644105" duration="6587000" />
       <workItem from="1610355346577" duration="15843000" />
       <workItem from="1610431786853" duration="1170000" />
-      <workItem from="1610530755101" duration="811000" />
+      <workItem from="1610530755101" duration="4080000" />
     </task>
     <task id="LOCAL-00001" summary="VR Stuff, Bicycle Animations">
       <created>1606399745852</created>
@@ -239,7 +230,14 @@
       <option name="project" value="LOCAL" />
       <updated>1610362454731</updated>
     </task>
-    <option name="localTasksCounter" value="11" />
+    <task id="LOCAL-00011" summary="fixes">
+      <created>1610531922101</created>
+      <option name="number" value="00011" />
+      <option name="presentableId" value="LOCAL-00011" />
+      <option name="project" value="LOCAL" />
+      <updated>1610531922101</updated>
+    </task>
+    <option name="localTasksCounter" value="12" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -271,7 +269,8 @@
     <MESSAGE value="HMD logging" />
     <MESSAGE value="More logging" />
     <MESSAGE value="Start and Finish events" />
-    <option name="LAST_COMMIT_MESSAGE" value="Start and Finish events" />
+    <MESSAGE value="fixes" />
+    <option name="LAST_COMMIT_MESSAGE" value="fixes" />
   </component>
   <component name="WindowStateProjectService">
     <state x="188" y="243" key="#xdebugger.evaluate" timestamp="1608637186447">
@@ -284,54 +283,54 @@
     </state>
     <state width="478" height="402" key="DebuggerActiveHint/0.0.1440.900@0.0.1440.900" timestamp="1608636244835" />
     <state width="463" height="464" key="DebuggerActiveHint/0.0.1920.1040@0.0.1920.1040" timestamp="1608205291466" />
-    <state width="1877" height="385" key="GridCell.Tab.0.bottom" timestamp="1609933996568">
+    <state width="1877" height="385" key="GridCell.Tab.0.bottom" timestamp="1610538449594">
       <screen x="0" y="0" width="1920" height="1040" />
     </state>
     <state width="1398" height="278" key="GridCell.Tab.0.bottom/0.0.1440.860@0.0.1440.860" timestamp="1608571659057" />
     <state width="1398" height="320" key="GridCell.Tab.0.bottom/0.0.1440.900@0.0.1440.900" timestamp="1608637304836" />
-    <state width="1877" height="385" key="GridCell.Tab.0.bottom/0.0.1920.1040@0.0.1920.1040" timestamp="1609933996568" />
-    <state width="1877" height="385" key="GridCell.Tab.0.center" timestamp="1609933996568">
+    <state width="1877" height="385" key="GridCell.Tab.0.bottom/0.0.1920.1040@0.0.1920.1040" timestamp="1610538449594" />
+    <state width="1877" height="385" key="GridCell.Tab.0.center" timestamp="1610538449593">
       <screen x="0" y="0" width="1920" height="1040" />
     </state>
     <state width="1398" height="278" key="GridCell.Tab.0.center/0.0.1440.860@0.0.1440.860" timestamp="1608571659056" />
     <state width="1398" height="320" key="GridCell.Tab.0.center/0.0.1440.900@0.0.1440.900" timestamp="1608637304836" />
-    <state width="1877" height="385" key="GridCell.Tab.0.center/0.0.1920.1040@0.0.1920.1040" timestamp="1609933996568" />
-    <state width="1877" height="385" key="GridCell.Tab.0.left" timestamp="1609933996568">
+    <state width="1877" height="385" key="GridCell.Tab.0.center/0.0.1920.1040@0.0.1920.1040" timestamp="1610538449593" />
+    <state width="1877" height="385" key="GridCell.Tab.0.left" timestamp="1610538449593">
       <screen x="0" y="0" width="1920" height="1040" />
     </state>
     <state width="1398" height="278" key="GridCell.Tab.0.left/0.0.1440.860@0.0.1440.860" timestamp="1608571659056" />
     <state width="1398" height="320" key="GridCell.Tab.0.left/0.0.1440.900@0.0.1440.900" timestamp="1608637304835" />
-    <state width="1877" height="385" key="GridCell.Tab.0.left/0.0.1920.1040@0.0.1920.1040" timestamp="1609933996568" />
-    <state width="1877" height="385" key="GridCell.Tab.0.right" timestamp="1609933996568">
+    <state width="1877" height="385" key="GridCell.Tab.0.left/0.0.1920.1040@0.0.1920.1040" timestamp="1610538449593" />
+    <state width="1877" height="385" key="GridCell.Tab.0.right" timestamp="1610538449594">
       <screen x="0" y="0" width="1920" height="1040" />
     </state>
     <state width="1398" height="278" key="GridCell.Tab.0.right/0.0.1440.860@0.0.1440.860" timestamp="1608571659057" />
     <state width="1398" height="320" key="GridCell.Tab.0.right/0.0.1440.900@0.0.1440.900" timestamp="1608637304836" />
-    <state width="1877" height="385" key="GridCell.Tab.0.right/0.0.1920.1040@0.0.1920.1040" timestamp="1609933996568" />
-    <state width="1877" height="385" key="GridCell.Tab.1.bottom" timestamp="1609933996568">
+    <state width="1877" height="385" key="GridCell.Tab.0.right/0.0.1920.1040@0.0.1920.1040" timestamp="1610538449594" />
+    <state width="1877" height="385" key="GridCell.Tab.1.bottom" timestamp="1610538457610">
       <screen x="0" y="0" width="1920" height="1040" />
     </state>
     <state width="1398" height="278" key="GridCell.Tab.1.bottom/0.0.1440.860@0.0.1440.860" timestamp="1608571659058" />
     <state width="1398" height="320" key="GridCell.Tab.1.bottom/0.0.1440.900@0.0.1440.900" timestamp="1608637304837" />
-    <state width="1877" height="385" key="GridCell.Tab.1.bottom/0.0.1920.1040@0.0.1920.1040" timestamp="1609933996568" />
-    <state width="1877" height="385" key="GridCell.Tab.1.center" timestamp="1609933996568">
+    <state width="1877" height="385" key="GridCell.Tab.1.bottom/0.0.1920.1040@0.0.1920.1040" timestamp="1610538457610" />
+    <state width="1877" height="385" key="GridCell.Tab.1.center" timestamp="1610538457610">
       <screen x="0" y="0" width="1920" height="1040" />
     </state>
     <state width="1398" height="278" key="GridCell.Tab.1.center/0.0.1440.860@0.0.1440.860" timestamp="1608571659057" />
     <state width="1398" height="320" key="GridCell.Tab.1.center/0.0.1440.900@0.0.1440.900" timestamp="1608637304837" />
-    <state width="1877" height="385" key="GridCell.Tab.1.center/0.0.1920.1040@0.0.1920.1040" timestamp="1609933996568" />
-    <state width="1877" height="385" key="GridCell.Tab.1.left" timestamp="1609933996568">
+    <state width="1877" height="385" key="GridCell.Tab.1.center/0.0.1920.1040@0.0.1920.1040" timestamp="1610538457610" />
+    <state width="1877" height="385" key="GridCell.Tab.1.left" timestamp="1610538457609">
       <screen x="0" y="0" width="1920" height="1040" />
     </state>
     <state width="1398" height="278" key="GridCell.Tab.1.left/0.0.1440.860@0.0.1440.860" timestamp="1608571659057" />
     <state width="1398" height="320" key="GridCell.Tab.1.left/0.0.1440.900@0.0.1440.900" timestamp="1608637304836" />
-    <state width="1877" height="385" key="GridCell.Tab.1.left/0.0.1920.1040@0.0.1920.1040" timestamp="1609933996568" />
-    <state width="1877" height="385" key="GridCell.Tab.1.right" timestamp="1609933996568">
+    <state width="1877" height="385" key="GridCell.Tab.1.left/0.0.1920.1040@0.0.1920.1040" timestamp="1610538457609" />
+    <state width="1877" height="385" key="GridCell.Tab.1.right" timestamp="1610538457610">
       <screen x="0" y="0" width="1920" height="1040" />
     </state>
     <state width="1398" height="278" key="GridCell.Tab.1.right/0.0.1440.860@0.0.1440.860" timestamp="1608571659058" />
     <state width="1398" height="320" key="GridCell.Tab.1.right/0.0.1440.900@0.0.1440.900" timestamp="1608637304837" />
-    <state width="1877" height="385" key="GridCell.Tab.1.right/0.0.1920.1040@0.0.1920.1040" timestamp="1609933996568" />
+    <state width="1877" height="385" key="GridCell.Tab.1.right/0.0.1920.1040@0.0.1920.1040" timestamp="1610538457610" />
     <state width="1877" height="385" key="GridCell.Tab.2.bottom" timestamp="1609933996568">
       <screen x="0" y="0" width="1920" height="1040" />
     </state>
@@ -396,12 +395,12 @@
     <state x="69" y="76" width="1302" height="708" key="VCS.FileHistoryDialog/0.0.1440.860@0.0.1440.860" timestamp="1610365025117" />
     <state x="69" y="80" width="1302" height="741" key="VCS.FileHistoryDialog/0.0.1440.900@0.0.1440.900" timestamp="1608635342446" />
     <state x="92" y="92" width="1736" height="856" key="VCS.FileHistoryDialog/0.0.1920.1040@0.0.1920.1040" timestamp="1607591027227" />
-    <state x="414" y="208" key="Vcs.Push.Dialog.v2" timestamp="1610362459013">
-      <screen x="0" y="0" width="1440" height="860" />
+    <state x="552" y="252" key="Vcs.Push.Dialog.v2" timestamp="1610531923390">
+      <screen x="0" y="0" width="1920" height="1040" />
     </state>
     <state x="414" y="208" key="Vcs.Push.Dialog.v2/0.0.1440.860@0.0.1440.860" timestamp="1610362459013" />
     <state x="414" y="218" key="Vcs.Push.Dialog.v2/0.0.1440.900@0.0.1440.900" timestamp="1608628624093" />
-    <state x="552" y="252" key="Vcs.Push.Dialog.v2/0.0.1920.1040@0.0.1920.1040" timestamp="1607593425704" />
+    <state x="552" y="252" key="Vcs.Push.Dialog.v2/0.0.1920.1040@0.0.1920.1040" timestamp="1610531923390" />
     <state width="726" height="436" key="XDebugger.FullValuePopup" timestamp="1608570184149">
       <screen x="0" y="0" width="1440" height="860" />
     </state>
@@ -419,25 +418,26 @@
       <screen x="0" y="0" width="1440" height="860" />
     </state>
     <state x="332" y="41" key="com.intellij.openapi.editor.actions.MultiplePasteAction$ClipboardContentChooser/0.0.1440.860@0.0.1440.860" timestamp="1610362264361" />
-    <state x="400" y="103" width="1140" height="689" key="editAsTableFormatDialogDimension" timestamp="1610531633070">
+    <state x="400" y="103" width="1140" height="689" key="editAsTableFormatDialogDimension" timestamp="1610533263726">
       <screen x="0" y="0" width="1920" height="1040" />
     </state>
     <state x="300" y="85" width="1140" height="689" key="editAsTableFormatDialogDimension/0.0.1440.860@0.0.1440.860" timestamp="1610362422263" />
-    <state x="400" y="103" key="editAsTableFormatDialogDimension/0.0.1920.1040@0.0.1920.1040" timestamp="1610531633070" />
-    <state x="368" y="29" width="703" height="801" key="find.popup" timestamp="1610363676930">
-      <screen x="0" y="0" width="1440" height="860" />
+    <state x="400" y="103" key="editAsTableFormatDialogDimension/0.0.1920.1040@0.0.1920.1040" timestamp="1610533263726" />
+    <state x="491" y="35" width="938" height="969" key="find.popup" timestamp="1610533618773">
+      <screen x="0" y="0" width="1920" height="1040" />
     </state>
     <state x="368" y="29" width="703" height="801" key="find.popup/0.0.1440.860@0.0.1440.860" timestamp="1610363676930" />
+    <state x="491" y="35" width="938" height="969" key="find.popup/0.0.1920.1040@0.0.1920.1040" timestamp="1610533618773" />
     <state x="379" y="197" key="run.anything.popup" timestamp="1610374243030">
       <screen x="0" y="0" width="1440" height="860" />
     </state>
     <state x="379" y="197" key="run.anything.popup/0.0.1440.860@0.0.1440.860" timestamp="1610374243030" />
-    <state x="478" y="197" width="672" height="561" key="search.everywhere.popup" timestamp="1610362007792">
-      <screen x="0" y="0" width="1440" height="860" />
+    <state x="623" y="225" width="672" height="678" key="search.everywhere.popup" timestamp="1610538285122">
+      <screen x="0" y="0" width="1920" height="1040" />
     </state>
     <state x="478" y="197" width="672" height="561" key="search.everywhere.popup/0.0.1440.860@0.0.1440.860" timestamp="1610362007792" />
     <state x="476" y="204" width="672" height="588" key="search.everywhere.popup/0.0.1440.900@0.0.1440.900" timestamp="1608636877159" />
-    <state x="623" y="225" width="672" height="678" key="search.everywhere.popup/0.0.1920.1040@0.0.1920.1040" timestamp="1609928849106" />
+    <state x="623" y="225" width="672" height="678" key="search.everywhere.popup/0.0.1920.1040@0.0.1920.1040" timestamp="1610538285122" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
@@ -454,6 +454,32 @@
           <properties documentPath="C:\Users\marce\Unity Projects\VRCyling\Assets\Scripts\Sensors\Polar\PolarReceiver.cs" initialLine="79" />
           <option name="timeStamp" value="19" />
         </line-breakpoint>
+        <line-breakpoint enabled="true" type="DotNet Breakpoints">
+          <url>file://$PROJECT_DIR$/Assets/Scripts/Roads/StraightRoadExtras.cs</url>
+          <line>23</line>
+          <properties documentPath="C:\Users\student\Desktop\VRCyling\Assets\Scripts\Roads\StraightRoadExtras.cs" initialLine="23">
+            <startOffsets>
+              <option value="504" />
+            </startOffsets>
+            <endOffsets>
+              <option value="543" />
+            </endOffsets>
+          </properties>
+          <option name="timeStamp" value="21" />
+        </line-breakpoint>
+        <line-breakpoint enabled="true" type="DotNet Breakpoints">
+          <url>file://$PROJECT_DIR$/Assets/Scripts/Roads/StraightRoadExtras.cs</url>
+          <line>31</line>
+          <properties documentPath="C:\Users\student\Desktop\VRCyling\Assets\Scripts\Roads\StraightRoadExtras.cs" initialLine="31">
+            <startOffsets>
+              <option value="685" />
+            </startOffsets>
+            <endOffsets>
+              <option value="724" />
+            </endOffsets>
+          </properties>
+          <option name="timeStamp" value="22" />
+        </line-breakpoint>
       </breakpoints>
     </breakpoint-manager>
     <pin-to-top-manager>

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

@@ -2,11 +2,8 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="ee646045-196c-400d-a2b8-69533432d097" name="Default Changelist" comment="">
+      <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$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/data.py" beforeDir="false" afterPath="$PROJECT_DIR$/data.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/main.py" beforeDir="false" afterPath="$PROJECT_DIR$/main.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/tools.py" beforeDir="false" afterPath="$PROJECT_DIR$/tools.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/../Scripts/Logging/FileLogger.cs" beforeDir="false" afterPath="$PROJECT_DIR$/../Scripts/Logging/FileLogger.cs" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -74,6 +71,7 @@
       <workItem from="1609927755546" duration="570000" />
       <workItem from="1609929396953" duration="1851000" />
       <workItem from="1610104231320" duration="1600000" />
+      <workItem from="1610531608438" duration="805000" />
     </task>
     <servers />
   </component>
@@ -107,7 +105,7 @@
       <breakpoints>
         <line-breakpoint enabled="true" suspend="THREAD" type="python-line">
           <url>file://$PROJECT_DIR$/tools.py</url>
-          <line>15</line>
+          <line>17</line>
           <option name="timeStamp" value="2" />
         </line-breakpoint>
       </breakpoints>
@@ -122,6 +120,6 @@
     </watches-manager>
   </component>
   <component name="com.intellij.coverage.CoverageDataManagerImpl">
-    <SUITE FILE_PATH="coverage/Plotting$main.coverage" NAME="main Coverage Results" MODIFIED="1610106180565" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$" />
+    <SUITE FILE_PATH="coverage/Plotting$main.coverage" NAME="main Coverage Results" MODIFIED="1610531732789" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$" />
   </component>
 </project>

+ 48 - 61
Assets/Prefabs/Player/BikePlayer - RigidBody.prefab

@@ -108,6 +108,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   bicycleTransform: {fileID: 4988978073311274402}
+  calibrateOnStart: 1
 --- !u!1 &3712747140520814368
 GameObject:
   m_ObjectHideFlags: 0
@@ -218,6 +219,50 @@ MonoBehaviour:
   bicycleTransform: {fileID: 4988978073311274402}
   trackerDistanceToWheelCenterPoint: 0.38
   legTracker: {fileID: 1454561111988264472}
+--- !u!114 &4989405759833679730
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4988978071938499209}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 2536d945c8ba43ba857360dbd62685d0, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  bicycleController: {fileID: 3450098086302837850}
+--- !u!114 &3450098086302837850
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4988978072042319891}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: e9349e7eecd845c3a526e46930a4fc32, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  controllerMode: 0
+  centerOfMass: {fileID: 0}
+  rigidBody: {fileID: 4988978073311274401}
+  maxLeaningAngle: 35
+  maxSteeringAngle: 80
+  maxSpeed: 11.111
+--- !u!65 &4426752443652901415
+BoxCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4988978073311274415}
+  m_Material: {fileID: 0}
+  m_IsTrigger: 0
+  m_Enabled: 1
+  serializedVersion: 2
+  m_Size: {x: 0.62, y: 1.98, z: 3.27}
+  m_Center: {x: 0, y: 0, z: 0}
 --- !u!1 &5438041363405718847
 GameObject:
   m_ObjectHideFlags: 0
@@ -227,7 +272,6 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 5804818527648747315}
-  - component: {fileID: 2731252534111432329}
   - component: {fileID: 7596273975278892917}
   m_Layer: 12
   m_Name: StreetCollider
@@ -250,20 +294,6 @@ Transform:
   m_Father: {fileID: 4988978073311274402}
   m_RootOrder: 4
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!136 &2731252534111432329
-CapsuleCollider:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 5438041363405718847}
-  m_Material: {fileID: 0}
-  m_IsTrigger: 0
-  m_Enabled: 1
-  m_Radius: 0.64
-  m_Height: 3.25
-  m_Direction: 2
-  m_Center: {x: 0, y: -0.395, z: 0}
 --- !u!114 &7596273975278892917
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -277,52 +307,9 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   collisionLayer: 1
-  rearWheelContactPoint: {fileID: 0}
-  frontWheelContactPoint: {fileID: 0}
---- !u!114 &3450098086302837850
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 4988978072042319891}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: e9349e7eecd845c3a526e46930a4fc32, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  controllerMode: 0
-  centerOfMass: {fileID: 0}
-  rigidBody: {fileID: 4988978073311274401}
-  maxLeaningAngle: 35
-  maxSteeringAngle: 80
-  maxSpeed: 11.111
---- !u!114 &4989405759833679730
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 4988978071938499209}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 2536d945c8ba43ba857360dbd62685d0, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  bicycleController: {fileID: 3450098086302837850}
---- !u!65 &4426752443652901415
-BoxCollider:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 4988978073311274415}
-  m_Material: {fileID: 0}
-  m_IsTrigger: 0
-  m_Enabled: 1
-  serializedVersion: 2
-  m_Size: {x: 0.62, y: 1.98, z: 3.27}
-  m_Center: {x: 0, y: 0, z: 0}
+  rearWheelCollider: {fileID: 0}
+  frontWheelCollider: {fileID: 0}
+  bike: {fileID: 0}
 --- !u!1001 &5488976313075237648
 PrefabInstance:
   m_ObjectHideFlags: 0

+ 128 - 13
Assets/Scenes/MainScene.unity

@@ -31623,6 +31623,11 @@ PrefabInstance:
       propertyPath: m_LocalEulerAnglesHint.z
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 451871745638313690, guid: 7327ba33dc61a6447b6a81bcb9d0c62c,
+        type: 3}
+      propertyPath: m_Enabled
+      value: 1
+      objectReference: {fileID: 0}
     - target: {fileID: 451871745638313693, guid: 7327ba33dc61a6447b6a81bcb9d0c62c,
         type: 3}
       propertyPath: m_Name
@@ -54347,6 +54352,18 @@ Transform:
     type: 3}
   m_PrefabInstance: {fileID: 221150437}
   m_PrefabAsset: {fileID: 0}
+--- !u!114 &221634808 stripped
+MonoBehaviour:
+  m_CorrespondingSourceObject: {fileID: 1929101100484375460, guid: f1b4cbd2f891a5c46aedca9958dc3ed1,
+    type: 3}
+  m_PrefabInstance: {fileID: 1216320328}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: ad8f054f47e6472581c773771c181bc4, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
 --- !u!1001 &221721682
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -58040,6 +58057,25 @@ PrefabInstance:
       objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: a8075fecadfce7c4abe277fb835ca5c5, type: 3}
+--- !u!1 &240777121 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 5438041363405718847, guid: 3b07d6594636ab04d9c1fac04c1cde7e,
+    type: 3}
+  m_PrefabInstance: {fileID: 1929752190}
+  m_PrefabAsset: {fileID: 0}
+--- !u!65 &240777123
+BoxCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 240777121}
+  m_Material: {fileID: 0}
+  m_IsTrigger: 1
+  m_Enabled: 1
+  serializedVersion: 2
+  m_Size: {x: 0.62, y: 1.98, z: 3.27}
+  m_Center: {x: 0, y: 0, z: 0}
 --- !u!1001 &241162617
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -58808,7 +58844,31 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 0edb99d48e914465a069ad6898236082, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  items: []
+  items:
+  - turn: {fileID: 624357439}
+    from: 4
+    to: 2
+  - turn: {fileID: 18472990}
+    from: 0
+    to: 2
+  - turn: {fileID: 1248160490}
+    from: 0
+    to: 2
+  - turn: {fileID: 2014780535}
+    from: 0
+    to: 2
+  - turn: {fileID: 1812833148}
+    from: 0
+    to: 2
+  - turn: {fileID: 418869658}
+    from: 0
+    to: 2
+  - turn: {fileID: 718213689}
+    from: 0
+    to: 2
+  - turn: {fileID: 221634808}
+    from: 0
+    to: 4
   start: {fileID: 0}
   finish: {fileID: 0}
 --- !u!1001 &245939337
@@ -104534,6 +104594,18 @@ Transform:
     type: 3}
   m_PrefabInstance: {fileID: 2131646112}
   m_PrefabAsset: {fileID: 0}
+--- !u!114 &418869658 stripped
+MonoBehaviour:
+  m_CorrespondingSourceObject: {fileID: 1929101100484375460, guid: f1b4cbd2f891a5c46aedca9958dc3ed1,
+    type: 3}
+  m_PrefabInstance: {fileID: 775767391}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: ad8f054f47e6472581c773771c181bc4, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
 --- !u!4 &418878620 stripped
 Transform:
   m_CorrespondingSourceObject: {fileID: 1121772855208284805, guid: a8075fecadfce7c4abe277fb835ca5c5,
@@ -175654,6 +175726,18 @@ PrefabInstance:
       objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 33b36afb51822b442b3a3f8accf3c199, type: 3}
+--- !u!114 &718213689 stripped
+MonoBehaviour:
+  m_CorrespondingSourceObject: {fileID: 5908241662424435614, guid: 8b8f51b9ab677d14789d28c0522c7e4c,
+    type: 3}
+  m_PrefabInstance: {fileID: 1355098184}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 7bc613422f424ecbab70286630638b48, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
 --- !u!1001 &718531847
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -266092,8 +266176,8 @@ MonoBehaviour:
       colorBlindnessType: 0
       colorBlindnessStrength: 1
   m_Resources: {fileID: 11400000, guid: d82512f9c8e5d4a4d938b575d47f88d4, type: 2}
-  m_ShowToolkit: 0
-  m_ShowCustomSorter: 0
+  m_ShowToolkit: 1
+  m_ShowCustomSorter: 1
   breakBeforeColorGrading: 0
   m_BeforeTransparentBundles: []
   m_BeforeStackBundles: []
@@ -425330,6 +425414,18 @@ Transform:
     type: 3}
   m_PrefabInstance: {fileID: 1812629540}
   m_PrefabAsset: {fileID: 0}
+--- !u!114 &1812833148 stripped
+MonoBehaviour:
+  m_CorrespondingSourceObject: {fileID: 5908241662424435614, guid: 8b8f51b9ab677d14789d28c0522c7e4c,
+    type: 3}
+  m_PrefabInstance: {fileID: 298287648}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 7bc613422f424ecbab70286630638b48, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
 --- !u!1001 &1812868907
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -453803,11 +453899,6 @@ PrefabInstance:
       propertyPath: calibrateOnStart
       value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: 2731252534111432329, guid: 3b07d6594636ab04d9c1fac04c1cde7e,
-        type: 3}
-      propertyPath: m_Enabled
-      value: 0
-      objectReference: {fileID: 0}
     - target: {fileID: 3450098086302837850, guid: 3b07d6594636ab04d9c1fac04c1cde7e,
         type: 3}
       propertyPath: centerOfMass
@@ -453816,12 +453907,12 @@ PrefabInstance:
     - target: {fileID: 3450098086302837850, guid: 3b07d6594636ab04d9c1fac04c1cde7e,
         type: 3}
       propertyPath: maxLeaningAngle
-      value: 15
+      value: 35
       objectReference: {fileID: 0}
     - target: {fileID: 3450098086302837850, guid: 3b07d6594636ab04d9c1fac04c1cde7e,
         type: 3}
       propertyPath: maxSteeringAngle
-      value: 90
+      value: 80
       objectReference: {fileID: 0}
     - target: {fileID: 3450098086302837850, guid: 3b07d6594636ab04d9c1fac04c1cde7e,
         type: 3}
@@ -453848,6 +453939,11 @@ PrefabInstance:
       propertyPath: m_LocalPosition.y
       value: -0.953
       objectReference: {fileID: 0}
+    - target: {fileID: 4426752443652901415, guid: 3b07d6594636ab04d9c1fac04c1cde7e,
+        type: 3}
+      propertyPath: m_IsTrigger
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 4947603828939169604, guid: 3b07d6594636ab04d9c1fac04c1cde7e,
         type: 3}
       propertyPath: actionSet.actionSetPath
@@ -454640,6 +454736,16 @@ PrefabInstance:
       propertyPath: m_Layer
       value: 9
       objectReference: {fileID: 0}
+    - target: {fileID: 5438041363405718847, guid: 3b07d6594636ab04d9c1fac04c1cde7e,
+        type: 3}
+      propertyPath: m_TagString
+      value: bike
+      objectReference: {fileID: 0}
+    - target: {fileID: 5438041363405718847, guid: 3b07d6594636ab04d9c1fac04c1cde7e,
+        type: 3}
+      propertyPath: m_IsActive
+      value: 1
+      objectReference: {fileID: 0}
     - target: {fileID: 5448601093364272614, guid: 3b07d6594636ab04d9c1fac04c1cde7e,
         type: 3}
       propertyPath: index
@@ -454731,9 +454837,6 @@ PrefabInstance:
       value: KineticLegTracker
       objectReference: {fileID: 0}
     m_RemovedComponents:
-    - {fileID: 0}
-    - {fileID: 0}
-    - {fileID: 2731252534111432329, guid: 3b07d6594636ab04d9c1fac04c1cde7e, type: 3}
     - {fileID: 4988978072042319894, guid: 3b07d6594636ab04d9c1fac04c1cde7e, type: 3}
   m_SourcePrefab: {fileID: 100100000, guid: 3b07d6594636ab04d9c1fac04c1cde7e, type: 3}
 --- !u!1001 &1930089593
@@ -473458,6 +473561,18 @@ Transform:
     type: 3}
   m_PrefabInstance: {fileID: 2014754307}
   m_PrefabAsset: {fileID: 0}
+--- !u!114 &2014780535 stripped
+MonoBehaviour:
+  m_CorrespondingSourceObject: {fileID: 5908241662424435614, guid: 8b8f51b9ab677d14789d28c0522c7e4c,
+    type: 3}
+  m_PrefabInstance: {fileID: 1851158714}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 7bc613422f424ecbab70286630638b48, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
 --- !u!1001 &2015159758
 PrefabInstance:
   m_ObjectHideFlags: 0

+ 1 - 1
Assets/Scripts/Roads/StraightRoadExtras.cs

@@ -20,7 +20,7 @@ namespace Roads
       }
 
       private void OnTriggerEnter(Collider other)
-      {
+      { 
          if (hasArc && other.CompareTag("bike"))
          {
             ArcState = TriggerState.Inside;

+ 49 - 10
Assets/Settings/SampleSceneProfile.asset

@@ -59,7 +59,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 899c54efeace73346a0a16faa3afe726, type: 3}
   m_Name: Vignette
   m_EditorClassIdentifier: 
-  active: 1
+  active: 0
   m_AdvancedMode: 0
   color:
     m_OverrideState: 0
@@ -72,12 +72,12 @@ MonoBehaviour:
     m_Value: {x: 0.5, y: 0.5}
   intensity:
     m_OverrideState: 1
-    m_Value: 0.511
+    m_Value: 0.408
     min: 0
     max: 1
   smoothness:
     m_OverrideState: 1
-    m_Value: 0.547
+    m_Value: 1
     min: 0.01
     max: 1
   rounded:
@@ -99,14 +99,14 @@ MonoBehaviour:
   m_AdvancedMode: 0
   mode:
     m_OverrideState: 1
-    m_Value: 1
+    m_Value: 2
   gaussianStart:
     m_OverrideState: 1
-    m_Value: 10
+    m_Value: 0
     min: 0
   gaussianEnd:
     m_OverrideState: 1
-    m_Value: 20
+    m_Value: 75.3
     min: 0
   gaussianMaxRadius:
     m_OverrideState: 0
@@ -118,7 +118,7 @@ MonoBehaviour:
     m_Value: 0
   focusDistance:
     m_OverrideState: 1
-    m_Value: 0.1
+    m_Value: 0.65
     min: 0.1
   aperture:
     m_OverrideState: 0
@@ -126,8 +126,8 @@ MonoBehaviour:
     min: 1
     max: 32
   focalLength:
-    m_OverrideState: 0
-    m_Value: 1
+    m_OverrideState: 1
+    m_Value: 26
     min: 1
     max: 300
   bladeCount:
@@ -163,6 +163,7 @@ MonoBehaviour:
   - {fileID: -7011558710299706105}
   - {fileID: -4445312681917459208}
   - {fileID: 9156926202807721990}
+  - {fileID: 5613565092614401129}
 --- !u!114 &849379129802519247
 MonoBehaviour:
   m_ObjectHideFlags: 3
@@ -175,11 +176,49 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 97c23e3b12dc18c42a140437e53d3951, type: 3}
   m_Name: Tonemapping
   m_EditorClassIdentifier: 
-  active: 1
+  active: 0
   m_AdvancedMode: 0
   mode:
     m_OverrideState: 1
     m_Value: 2
+--- !u!114 &5613565092614401129
+MonoBehaviour:
+  m_ObjectHideFlags: 3
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 66f335fb1ffd8684294ad653bf1c7564, type: 3}
+  m_Name: ColorAdjustments
+  m_EditorClassIdentifier: 
+  active: 0
+  m_AdvancedMode: 0
+  postExposure:
+    m_OverrideState: 1
+    m_Value: 1.86
+  contrast:
+    m_OverrideState: 0
+    m_Value: 0
+    min: -100
+    max: 100
+  colorFilter:
+    m_OverrideState: 0
+    m_Value: {r: 1, g: 1, b: 1, a: 1}
+    hdr: 1
+    showAlpha: 0
+    showEyeDropper: 1
+  hueShift:
+    m_OverrideState: 0
+    m_Value: 0
+    min: -180
+    max: 180
+  saturation:
+    m_OverrideState: 0
+    m_Value: 0
+    min: -100
+    max: 100
 --- !u!114 &9156926202807721990
 MonoBehaviour:
   m_ObjectHideFlags: 3