Browse Source

Optimizations + Fan Adjustment

Marcel Zickler 2 years ago
parent
commit
b039a300c2

+ 1 - 40
.idea/.idea.VR Cycling/.idea/indexLayout.xml

@@ -1,45 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="ContentModelUserStore">
-    <attachedFolders />
-    <explicitIncludes>
-      <Path>Library/PackageCache/com.autodesk.fbx@3.1.0-preview.2</Path>
-      <Path>Library/PackageCache/com.unity.collab-proxy@1.3.9</Path>
-      <Path>Library/PackageCache/com.unity.ext.nunit@1.0.6</Path>
-      <Path>Library/PackageCache/com.unity.formats.fbx@3.2.1-preview.2</Path>
-      <Path>Library/PackageCache/com.unity.ide.rider@1.2.1</Path>
-      <Path>Library/PackageCache/com.unity.ide.visualstudio@2.0.3</Path>
-      <Path>Library/PackageCache/com.unity.ide.vscode@1.2.3</Path>
-      <Path>Library/PackageCache/com.unity.inputsystem@1.0.1</Path>
-      <Path>Library/PackageCache/com.unity.recorder@2.2.0-preview.4</Path>
-      <Path>Library/PackageCache/com.unity.render-pipelines.core@8.2.0</Path>
-      <Path>Library/PackageCache/com.unity.render-pipelines.universal@8.2.0</Path>
-      <Path>Library/PackageCache/com.unity.searcher@4.0.9</Path>
-      <Path>Library/PackageCache/com.unity.shadergraph@8.2.0</Path>
-      <Path>Library/PackageCache/com.unity.subsystemregistration@1.0.6</Path>
-      <Path>Library/PackageCache/com.unity.test-framework@1.1.22</Path>
-      <Path>Library/PackageCache/com.unity.textmeshpro@3.0.1</Path>
-      <Path>Library/PackageCache/com.unity.timeline@1.2.16</Path>
-      <Path>Library/PackageCache/com.unity.xr.legacyinputhelpers@2.1.4</Path>
-      <Path>Library/PackageCache/com.unity.xr.management@3.2.16</Path>
-      <Path>Library/PackageCache/com.valvesoftware.unity.openvr@ecdf2388462c-1610414760000</Path>
-      <Path>Packages</Path>
-      <Path>ProjectSettings</Path>
-    </explicitIncludes>
-    <explicitExcludes>
-      <Path>.git</Path>
-      <Path>.idea</Path>
-      <Path>Docu</Path>
-      <Path>External</Path>
-      <Path>Integrations</Path>
-      <Path>Library</Path>
-      <Path>Logs</Path>
-      <Path>Temp</Path>
-      <Path>UserSettings</Path>
-      <Path>obj</Path>
-      <Path>out</Path>
-    </explicitExcludes>
-  </component>
   <component name="UserContentModel">
     <attachedFolders />
     <explicitIncludes>
@@ -85,6 +45,7 @@
       <Path>Temp</Path>
       <Path>UserSettings</Path>
       <Path>obj</Path>
+      <Path>out</Path>
     </explicitExcludes>
   </component>
 </project>

+ 0 - 7
.idea/.idea.VR Cycling/.idea/riderModule.iml

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

+ 69 - 68
Assembly-CSharp-Editor.csproj

@@ -12,7 +12,7 @@
     <ProductVersion>10.0.20506</ProductVersion>
     <SchemaVersion>2.0</SchemaVersion>
     <RootNamespace></RootNamespace>
-    <ProjectGuid>{3e07a152-7790-71f7-ceeb-bb2f43a12ab3}</ProjectGuid>
+    <ProjectGuid>{8bbbea65-5cc1-5b45-73bc-35cb443daca4}</ProjectGuid>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <AssemblyName>Assembly-CSharp-Editor</AssemblyName>
@@ -59,115 +59,116 @@
      <Compile Include="Assets\Editor\Tests\HelpersTest.cs" />
      <Compile Include="Assets\TutorialInfo\Scripts\Editor\ReadmeEditor.cs" />
      <Compile Include="Assets\Editor\MatchPlayerPosEditor.cs" />
+     <Compile Include="Assets\Editor\MaterialAnalyzer.cs" />
      <Compile Include="Assets\Editor\Tests\BikePhysicsTest.cs" />
      <Compile Include="Assets\Editor\Tests\QuartilesTest.cs" />
  <Reference Include="UnityEditor.TestRunner">
- <HintPath>C:/Users/student/RiderProjects/VRCyling/Library/ScriptAssemblies/UnityEditor.TestRunner.dll</HintPath>
+ <HintPath>C:/Users/student/RiderProjects/VRCycling/Library/ScriptAssemblies/UnityEditor.TestRunner.dll</HintPath>
  </Reference>
  <Reference Include="UnityEngine.TestRunner">
- <HintPath>C:/Users/student/RiderProjects/VRCyling/Library/ScriptAssemblies/UnityEngine.TestRunner.dll</HintPath>
+ <HintPath>C:/Users/student/RiderProjects/VRCycling/Library/ScriptAssemblies/UnityEngine.TestRunner.dll</HintPath>
  </Reference>
  <Reference Include="Unity.XR.Management">
- <HintPath>C:/Users/student/RiderProjects/VRCyling/Library/ScriptAssemblies/Unity.XR.Management.dll</HintPath>
+ <HintPath>C:/Users/student/RiderProjects/VRCycling/Library/ScriptAssemblies/Unity.XR.Management.dll</HintPath>
  </Reference>
  <Reference Include="Unity.RenderPipeline.Universal.ShaderLibrary">
- <HintPath>C:/Users/student/RiderProjects/VRCyling/Library/ScriptAssemblies/Unity.RenderPipeline.Universal.ShaderLibrary.dll</HintPath>
+ <HintPath>C:/Users/student/RiderProjects/VRCycling/Library/ScriptAssemblies/Unity.RenderPipeline.Universal.ShaderLibrary.dll</HintPath>
  </Reference>
  <Reference Include="Unity.Timeline.Editor">
- <HintPath>C:/Users/student/RiderProjects/VRCyling/Library/ScriptAssemblies/Unity.Timeline.Editor.dll</HintPath>
+ <HintPath>C:/Users/student/RiderProjects/VRCycling/Library/ScriptAssemblies/Unity.Timeline.Editor.dll</HintPath>
  </Reference>
  <Reference Include="Unity.Subsystem.Registration">
- <HintPath>C:/Users/student/RiderProjects/VRCyling/Library/ScriptAssemblies/Unity.Subsystem.Registration.dll</HintPath>
+ <HintPath>C:/Users/student/RiderProjects/VRCycling/Library/ScriptAssemblies/Unity.Subsystem.Registration.dll</HintPath>
  </Reference>
  <Reference Include="Unity.XR.OpenVR">
- <HintPath>C:/Users/student/RiderProjects/VRCyling/Library/ScriptAssemblies/Unity.XR.OpenVR.dll</HintPath>
+ <HintPath>C:/Users/student/RiderProjects/VRCycling/Library/ScriptAssemblies/Unity.XR.OpenVR.dll</HintPath>
  </Reference>
  <Reference Include="Unity.RenderPipelines.Universal.Shaders">
- <HintPath>C:/Users/student/RiderProjects/VRCyling/Library/ScriptAssemblies/Unity.RenderPipelines.Universal.Shaders.dll</HintPath>
+ <HintPath>C:/Users/student/RiderProjects/VRCycling/Library/ScriptAssemblies/Unity.RenderPipelines.Universal.Shaders.dll</HintPath>
  </Reference>
  <Reference Include="Unity.VSCode.Editor">
- <HintPath>C:/Users/student/RiderProjects/VRCyling/Library/ScriptAssemblies/Unity.VSCode.Editor.dll</HintPath>
+ <HintPath>C:/Users/student/RiderProjects/VRCycling/Library/ScriptAssemblies/Unity.VSCode.Editor.dll</HintPath>
  </Reference>
  <Reference Include="Unity.XR.OpenVR.Editor">
- <HintPath>C:/Users/student/RiderProjects/VRCyling/Library/ScriptAssemblies/Unity.XR.OpenVR.Editor.dll</HintPath>
+ <HintPath>C:/Users/student/RiderProjects/VRCycling/Library/ScriptAssemblies/Unity.XR.OpenVR.Editor.dll</HintPath>
  </Reference>
  <Reference Include="Unity.Formats.Fbx.Editor">
- <HintPath>C:/Users/student/RiderProjects/VRCyling/Library/ScriptAssemblies/Unity.Formats.Fbx.Editor.dll</HintPath>
+ <HintPath>C:/Users/student/RiderProjects/VRCycling/Library/ScriptAssemblies/Unity.Formats.Fbx.Editor.dll</HintPath>
  </Reference>
  <Reference Include="Unity.RenderPipelines.Core.Editor">
- <HintPath>C:/Users/student/RiderProjects/VRCyling/Library/ScriptAssemblies/Unity.RenderPipelines.Core.Editor.dll</HintPath>
+ <HintPath>C:/Users/student/RiderProjects/VRCycling/Library/ScriptAssemblies/Unity.RenderPipelines.Core.Editor.dll</HintPath>
  </Reference>
  <Reference Include="Unity.InputSystem">
- <HintPath>C:/Users/student/RiderProjects/VRCyling/Library/ScriptAssemblies/Unity.InputSystem.dll</HintPath>
+ <HintPath>C:/Users/student/RiderProjects/VRCycling/Library/ScriptAssemblies/Unity.InputSystem.dll</HintPath>
  </Reference>
  <Reference Include="Unity.RenderPipelines.Core.Runtime">
- <HintPath>C:/Users/student/RiderProjects/VRCyling/Library/ScriptAssemblies/Unity.RenderPipelines.Core.Runtime.dll</HintPath>
+ <HintPath>C:/Users/student/RiderProjects/VRCycling/Library/ScriptAssemblies/Unity.RenderPipelines.Core.Runtime.dll</HintPath>
  </Reference>
  <Reference Include="Unity.Recorder.Editor">
- <HintPath>C:/Users/student/RiderProjects/VRCyling/Library/ScriptAssemblies/Unity.Recorder.Editor.dll</HintPath>
+ <HintPath>C:/Users/student/RiderProjects/VRCycling/Library/ScriptAssemblies/Unity.Recorder.Editor.dll</HintPath>
  </Reference>
  <Reference Include="Unity.TextMeshPro.Editor">
- <HintPath>C:/Users/student/RiderProjects/VRCyling/Library/ScriptAssemblies/Unity.TextMeshPro.Editor.dll</HintPath>
+ <HintPath>C:/Users/student/RiderProjects/VRCycling/Library/ScriptAssemblies/Unity.TextMeshPro.Editor.dll</HintPath>
  </Reference>
  <Reference Include="Unity.Recorder">
- <HintPath>C:/Users/student/RiderProjects/VRCyling/Library/ScriptAssemblies/Unity.Recorder.dll</HintPath>
+ <HintPath>C:/Users/student/RiderProjects/VRCycling/Library/ScriptAssemblies/Unity.Recorder.dll</HintPath>
  </Reference>
  <Reference Include="Unity.RenderPipelines.Universal.Runtime">
- <HintPath>C:/Users/student/RiderProjects/VRCyling/Library/ScriptAssemblies/Unity.RenderPipelines.Universal.Runtime.dll</HintPath>
+ <HintPath>C:/Users/student/RiderProjects/VRCycling/Library/ScriptAssemblies/Unity.RenderPipelines.Universal.Runtime.dll</HintPath>
  </Reference>
  <Reference Include="Unity.RenderPipelines.Universal.Editor">
- <HintPath>C:/Users/student/RiderProjects/VRCyling/Library/ScriptAssemblies/Unity.RenderPipelines.Universal.Editor.dll</HintPath>
+ <HintPath>C:/Users/student/RiderProjects/VRCycling/Library/ScriptAssemblies/Unity.RenderPipelines.Universal.Editor.dll</HintPath>
  </Reference>
  <Reference Include="UnityEngine.UI">
- <HintPath>C:/Users/student/RiderProjects/VRCyling/Library/ScriptAssemblies/UnityEngine.UI.dll</HintPath>
+ <HintPath>C:/Users/student/RiderProjects/VRCycling/Library/ScriptAssemblies/UnityEngine.UI.dll</HintPath>
  </Reference>
  <Reference Include="Unity.Searcher.Editor">
- <HintPath>C:/Users/student/RiderProjects/VRCyling/Library/ScriptAssemblies/Unity.Searcher.Editor.dll</HintPath>
+ <HintPath>C:/Users/student/RiderProjects/VRCycling/Library/ScriptAssemblies/Unity.Searcher.Editor.dll</HintPath>
  </Reference>
  <Reference Include="Unity.Timeline">
- <HintPath>C:/Users/student/RiderProjects/VRCyling/Library/ScriptAssemblies/Unity.Timeline.dll</HintPath>
+ <HintPath>C:/Users/student/RiderProjects/VRCycling/Library/ScriptAssemblies/Unity.Timeline.dll</HintPath>
  </Reference>
  <Reference Include="UnityEngine.XR.LegacyInputHelpers">
- <HintPath>C:/Users/student/RiderProjects/VRCyling/Library/ScriptAssemblies/UnityEngine.XR.LegacyInputHelpers.dll</HintPath>
+ <HintPath>C:/Users/student/RiderProjects/VRCycling/Library/ScriptAssemblies/UnityEngine.XR.LegacyInputHelpers.dll</HintPath>
  </Reference>
  <Reference Include="Unity.XR.Management.Editor">
- <HintPath>C:/Users/student/RiderProjects/VRCyling/Library/ScriptAssemblies/Unity.XR.Management.Editor.dll</HintPath>
+ <HintPath>C:/Users/student/RiderProjects/VRCycling/Library/ScriptAssemblies/Unity.XR.Management.Editor.dll</HintPath>
  </Reference>
  <Reference Include="Unity.Rider.Editor">
- <HintPath>C:/Users/student/RiderProjects/VRCyling/Library/ScriptAssemblies/Unity.Rider.Editor.dll</HintPath>
+ <HintPath>C:/Users/student/RiderProjects/VRCycling/Library/ScriptAssemblies/Unity.Rider.Editor.dll</HintPath>
  </Reference>
  <Reference Include="Unity.RenderPipelines.ShaderGraph.ShaderGraphLibrary">
- <HintPath>C:/Users/student/RiderProjects/VRCyling/Library/ScriptAssemblies/Unity.RenderPipelines.ShaderGraph.ShaderGraphLibrary.dll</HintPath>
+ <HintPath>C:/Users/student/RiderProjects/VRCycling/Library/ScriptAssemblies/Unity.RenderPipelines.ShaderGraph.ShaderGraphLibrary.dll</HintPath>
  </Reference>
  <Reference Include="Autodesk.Fbx">
- <HintPath>C:/Users/student/RiderProjects/VRCyling/Library/ScriptAssemblies/Autodesk.Fbx.dll</HintPath>
+ <HintPath>C:/Users/student/RiderProjects/VRCycling/Library/ScriptAssemblies/Autodesk.Fbx.dll</HintPath>
  </Reference>
  <Reference Include="UnityEditor.SpatialTracking">
- <HintPath>C:/Users/student/RiderProjects/VRCyling/Library/ScriptAssemblies/UnityEditor.SpatialTracking.dll</HintPath>
+ <HintPath>C:/Users/student/RiderProjects/VRCycling/Library/ScriptAssemblies/UnityEditor.SpatialTracking.dll</HintPath>
  </Reference>
  <Reference Include="UnityEngine.SpatialTracking">
- <HintPath>C:/Users/student/RiderProjects/VRCyling/Library/ScriptAssemblies/UnityEngine.SpatialTracking.dll</HintPath>
+ <HintPath>C:/Users/student/RiderProjects/VRCycling/Library/ScriptAssemblies/UnityEngine.SpatialTracking.dll</HintPath>
  </Reference>
  <Reference Include="Unity.VisualStudio.Editor">
- <HintPath>C:/Users/student/RiderProjects/VRCyling/Library/ScriptAssemblies/Unity.VisualStudio.Editor.dll</HintPath>
+ <HintPath>C:/Users/student/RiderProjects/VRCycling/Library/ScriptAssemblies/Unity.VisualStudio.Editor.dll</HintPath>
  </Reference>
  <Reference Include="Unity.ShaderGraph.Editor">
- <HintPath>C:/Users/student/RiderProjects/VRCyling/Library/ScriptAssemblies/Unity.ShaderGraph.Editor.dll</HintPath>
+ <HintPath>C:/Users/student/RiderProjects/VRCycling/Library/ScriptAssemblies/Unity.ShaderGraph.Editor.dll</HintPath>
  </Reference>
  <Reference Include="Unity.RenderPipelines.Core.ShaderLibrary">
- <HintPath>C:/Users/student/RiderProjects/VRCyling/Library/ScriptAssemblies/Unity.RenderPipelines.Core.ShaderLibrary.dll</HintPath>
+ <HintPath>C:/Users/student/RiderProjects/VRCycling/Library/ScriptAssemblies/Unity.RenderPipelines.Core.ShaderLibrary.dll</HintPath>
  </Reference>
  <Reference Include="Unity.TextMeshPro">
- <HintPath>C:/Users/student/RiderProjects/VRCyling/Library/ScriptAssemblies/Unity.TextMeshPro.dll</HintPath>
+ <HintPath>C:/Users/student/RiderProjects/VRCycling/Library/ScriptAssemblies/Unity.TextMeshPro.dll</HintPath>
  </Reference>
  <Reference Include="UnityEditor.XR.LegacyInputHelpers">
- <HintPath>C:/Users/student/RiderProjects/VRCyling/Library/ScriptAssemblies/UnityEditor.XR.LegacyInputHelpers.dll</HintPath>
+ <HintPath>C:/Users/student/RiderProjects/VRCycling/Library/ScriptAssemblies/UnityEditor.XR.LegacyInputHelpers.dll</HintPath>
  </Reference>
  <Reference Include="Unity.Formats.Fbx.Runtime">
- <HintPath>C:/Users/student/RiderProjects/VRCyling/Library/ScriptAssemblies/Unity.Formats.Fbx.Runtime.dll</HintPath>
+ <HintPath>C:/Users/student/RiderProjects/VRCycling/Library/ScriptAssemblies/Unity.Formats.Fbx.Runtime.dll</HintPath>
  </Reference>
  <Reference Include="UnityEditor.UI">
- <HintPath>C:/Users/student/RiderProjects/VRCyling/Library/ScriptAssemblies/UnityEditor.UI.dll</HintPath>
+ <HintPath>C:/Users/student/RiderProjects/VRCycling/Library/ScriptAssemblies/UnityEditor.UI.dll</HintPath>
  </Reference>
  <Reference Include="UnityEngine">
  <HintPath>C:/Program Files/Unity/Hub/Editor/2020.1.12f1/Editor/Data/Managed/UnityEngine/UnityEngine.dll</HintPath>
@@ -365,61 +366,61 @@
  <HintPath>C:/Program Files/Unity/Hub/Editor/2020.1.12f1/Editor/Data/PlaybackEngines/WindowsStandaloneSupport/UnityEditor.WindowsStandalone.Extensions.dll</HintPath>
  </Reference>
  <Reference Include="DotNetZip">
- <HintPath>C:/Users/student/RiderProjects/VRCyling/Assets/NuGet/Editor/DotNetZip.dll</HintPath>
+ <HintPath>C:/Users/student/RiderProjects/VRCycling/Assets/NuGet/Editor/DotNetZip.dll</HintPath>
  </Reference>
  <Reference Include="NugetForUnity">
- <HintPath>C:/Users/student/RiderProjects/VRCyling/Assets/NuGet/Editor/NugetForUnity.dll</HintPath>
+ <HintPath>C:/Users/student/RiderProjects/VRCycling/Assets/NuGet/Editor/NugetForUnity.dll</HintPath>
  </Reference>
  <Reference Include="Common.Logging">
- <HintPath>C:/Users/student/RiderProjects/VRCyling/Assets/Packages/Common.Logging.3.4.1/lib/net40/Common.Logging.dll</HintPath>
+ <HintPath>C:/Users/student/RiderProjects/VRCycling/Assets/Packages/Common.Logging.3.4.1/lib/net40/Common.Logging.dll</HintPath>
  </Reference>
  <Reference Include="Common.Logging.Core">
- <HintPath>C:/Users/student/RiderProjects/VRCyling/Assets/Packages/Common.Logging.Core.3.4.1/lib/net40/Common.Logging.Core.dll</HintPath>
+ <HintPath>C:/Users/student/RiderProjects/VRCycling/Assets/Packages/Common.Logging.Core.3.4.1/lib/net40/Common.Logging.Core.dll</HintPath>
  </Reference>
  <Reference Include="System.Net.IPNetwork">
- <HintPath>C:/Users/student/RiderProjects/VRCyling/Assets/Packages/IPNetwork2.2.1.2/lib/net46/System.Net.IPNetwork.dll</HintPath>
+ <HintPath>C:/Users/student/RiderProjects/VRCycling/Assets/Packages/IPNetwork2.2.1.2/lib/net46/System.Net.IPNetwork.dll</HintPath>
  </Reference>
  <Reference Include="Makaretu.Dns">
- <HintPath>C:/Users/student/RiderProjects/VRCyling/Assets/Packages/Makaretu.Dns.2.0.1/lib/net45/Makaretu.Dns.dll</HintPath>
+ <HintPath>C:/Users/student/RiderProjects/VRCycling/Assets/Packages/Makaretu.Dns.2.0.1/lib/net45/Makaretu.Dns.dll</HintPath>
  </Reference>
  <Reference Include="Makaretu.Dns.Multicast">
- <HintPath>C:/Users/student/RiderProjects/VRCyling/Assets/Packages/Makaretu.Dns.Multicast.0.27.0/lib/net461/Makaretu.Dns.Multicast.dll</HintPath>
+ <HintPath>C:/Users/student/RiderProjects/VRCycling/Assets/Packages/Makaretu.Dns.Multicast.0.27.0/lib/net461/Makaretu.Dns.Multicast.dll</HintPath>
  </Reference>
  <Reference Include="MQTTnet">
- <HintPath>C:/Users/student/RiderProjects/VRCyling/Assets/Packages/MQTTnet.3.0.13/lib/net461/MQTTnet.dll</HintPath>
+ <HintPath>C:/Users/student/RiderProjects/VRCycling/Assets/Packages/MQTTnet.3.0.13/lib/net461/MQTTnet.dll</HintPath>
  </Reference>
  <Reference Include="SimpleBase">
- <HintPath>C:/Users/student/RiderProjects/VRCyling/Assets/Packages/SimpleBase.1.3.1/lib/net45/SimpleBase.dll</HintPath>
+ <HintPath>C:/Users/student/RiderProjects/VRCycling/Assets/Packages/SimpleBase.1.3.1/lib/net45/SimpleBase.dll</HintPath>
  </Reference>
  <Reference Include="System.Net.Security">
- <HintPath>C:/Users/student/RiderProjects/VRCyling/Assets/Packages/System.Net.Security.4.3.2/lib/net46/System.Net.Security.dll</HintPath>
+ <HintPath>C:/Users/student/RiderProjects/VRCycling/Assets/Packages/System.Net.Security.4.3.2/lib/net46/System.Net.Security.dll</HintPath>
  </Reference>
  <Reference Include="System.Net.WebSockets">
- <HintPath>C:/Users/student/RiderProjects/VRCyling/Assets/Packages/System.Net.WebSockets.4.3.0/lib/net46/System.Net.WebSockets.dll</HintPath>
+ <HintPath>C:/Users/student/RiderProjects/VRCycling/Assets/Packages/System.Net.WebSockets.4.3.0/lib/net46/System.Net.WebSockets.dll</HintPath>
  </Reference>
  <Reference Include="System.Net.WebSockets.Client">
- <HintPath>C:/Users/student/RiderProjects/VRCyling/Assets/Packages/System.Net.WebSockets.Client.4.3.2/lib/net46/System.Net.WebSockets.Client.dll</HintPath>
+ <HintPath>C:/Users/student/RiderProjects/VRCycling/Assets/Packages/System.Net.WebSockets.Client.4.3.2/lib/net46/System.Net.WebSockets.Client.dll</HintPath>
  </Reference>
  <Reference Include="System.Security.Cryptography.Algorithms">
- <HintPath>C:/Users/student/RiderProjects/VRCyling/Assets/Packages/System.Security.Cryptography.Algorithms.4.3.0/lib/net461/System.Security.Cryptography.Algorithms.dll</HintPath>
+ <HintPath>C:/Users/student/RiderProjects/VRCycling/Assets/Packages/System.Security.Cryptography.Algorithms.4.3.0/lib/net461/System.Security.Cryptography.Algorithms.dll</HintPath>
  </Reference>
  <Reference Include="System.Security.Cryptography.Encoding">
- <HintPath>C:/Users/student/RiderProjects/VRCyling/Assets/Packages/System.Security.Cryptography.Encoding.4.3.0/lib/net46/System.Security.Cryptography.Encoding.dll</HintPath>
+ <HintPath>C:/Users/student/RiderProjects/VRCycling/Assets/Packages/System.Security.Cryptography.Encoding.4.3.0/lib/net46/System.Security.Cryptography.Encoding.dll</HintPath>
  </Reference>
  <Reference Include="System.Security.Cryptography.Primitives">
- <HintPath>C:/Users/student/RiderProjects/VRCyling/Assets/Packages/System.Security.Cryptography.Primitives.4.3.0/lib/net46/System.Security.Cryptography.Primitives.dll</HintPath>
+ <HintPath>C:/Users/student/RiderProjects/VRCycling/Assets/Packages/System.Security.Cryptography.Primitives.4.3.0/lib/net46/System.Security.Cryptography.Primitives.dll</HintPath>
  </Reference>
  <Reference Include="System.Security.Cryptography.X509Certificates">
- <HintPath>C:/Users/student/RiderProjects/VRCyling/Assets/Packages/System.Security.Cryptography.X509Certificates.4.3.0/lib/net461/System.Security.Cryptography.X509Certificates.dll</HintPath>
+ <HintPath>C:/Users/student/RiderProjects/VRCycling/Assets/Packages/System.Security.Cryptography.X509Certificates.4.3.0/lib/net461/System.Security.Cryptography.X509Certificates.dll</HintPath>
  </Reference>
  <Reference Include="Valve.Newtonsoft.Json">
- <HintPath>C:/Users/student/RiderProjects/VRCyling/Assets/SteamVR/Input/Plugins/JSON.NET/Valve.Newtonsoft.Json.dll</HintPath>
+ <HintPath>C:/Users/student/RiderProjects/VRCycling/Assets/SteamVR/Input/Plugins/JSON.NET/Valve.Newtonsoft.Json.dll</HintPath>
  </Reference>
  <Reference Include="ICSharpCode.NRefactory">
- <HintPath>C:/Users/student/RiderProjects/VRCyling/Library/PackageCache/com.unity.render-pipelines.core@8.2.0/Editor/ShaderGenerator/ICSharpCode.NRefactory.dll</HintPath>
+ <HintPath>C:/Users/student/RiderProjects/VRCycling/Library/PackageCache/com.unity.render-pipelines.core@8.2.0/Editor/ShaderGenerator/ICSharpCode.NRefactory.dll</HintPath>
  </Reference>
  <Reference Include="nunit.framework">
- <HintPath>C:/Users/student/RiderProjects/VRCyling/Library/PackageCache/com.unity.ext.nunit@1.0.6/net35/unity-custom/nunit.framework.dll</HintPath>
+ <HintPath>C:/Users/student/RiderProjects/VRCycling/Library/PackageCache/com.unity.ext.nunit@1.0.6/net35/unity-custom/nunit.framework.dll</HintPath>
  </Reference>
  <Reference Include="mscorlib">
  <HintPath>C:/Program Files/Unity/Hub/Editor/2020.1.12f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/mscorlib.dll</HintPath>
@@ -769,51 +770,51 @@
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="Assembly-CSharp.csproj">
-      <Project>{db112527-35d0-5fe2-ad7a-47eea9f0fcf0}</Project>
+      <Project>{f97d2e54-3902-267c-9c14-605ecd0c1ec1}</Project>
       <Name>Assembly-CSharp</Name>
     </ProjectReference>
     <ProjectReference Include="UniRx.csproj">
-      <Project>{c850c834-a79b-b5c3-aa9b-476ded9f3af6}</Project>
+      <Project>{ac8a9d46-d12b-43ef-57c7-bf5096bb96bf}</Project>
       <Name>UniRx</Name>
     </ProjectReference>
     <ProjectReference Include="SteamVR_Actions.csproj">
-      <Project>{806186c8-c664-2ef0-a914-446507b36928}</Project>
+      <Project>{a890fc1e-9e52-6223-4934-c1e2bd651e2f}</Project>
       <Name>SteamVR_Actions</Name>
     </ProjectReference>
     <ProjectReference Include="Boxophobic.Utils.Scripts.csproj">
-      <Project>{5e0584ed-19d3-ea42-3570-b31be9da1bfc}</Project>
+      <Project>{70a707c5-442a-7251-2f67-2e61b24738f3}</Project>
       <Name>Boxophobic.Utils.Scripts</Name>
     </ProjectReference>
     <ProjectReference Include="Boxophobic.PolyverseSkies.Runtime.csproj">
-      <Project>{4494e8ef-9e45-ed2b-56ae-334420205220}</Project>
+      <Project>{44fdd333-2a1e-1cb4-1485-1d5c04453624}</Project>
       <Name>Boxophobic.PolyverseSkies.Runtime</Name>
     </ProjectReference>
     <ProjectReference Include="Boxophobic.PolyverseSkies.Scripts.csproj">
-      <Project>{24370658-ddbd-a063-eaf9-df73e9f22ba2}</Project>
+      <Project>{153c0d1d-bef2-002b-a97c-6b7459085fbd}</Project>
       <Name>Boxophobic.PolyverseSkies.Scripts</Name>
     </ProjectReference>
     <ProjectReference Include="Boxophobic.PolyverseSkies.Editor.csproj">
-      <Project>{b0b43ba9-797d-97cf-0202-0096a023639a}</Project>
+      <Project>{259616fe-1b56-8511-50ce-8a99df2d1ce9}</Project>
       <Name>Boxophobic.PolyverseSkies.Editor</Name>
     </ProjectReference>
     <ProjectReference Include="Boxophobic.Utils.Editor.csproj">
-      <Project>{67d83658-c723-7895-333c-c16c51af856d}</Project>
+      <Project>{5eeb53f2-1357-9055-c374-ec646f4a51b6}</Project>
       <Name>Boxophobic.Utils.Editor</Name>
     </ProjectReference>
     <ProjectReference Include="SteamVR_Input_Editor.csproj">
-      <Project>{6b2d1554-301e-086a-b2f2-6a642758de58}</Project>
+      <Project>{5b8db92d-f7e8-ee2f-618e-ed5415d48641}</Project>
       <Name>SteamVR_Input_Editor</Name>
     </ProjectReference>
     <ProjectReference Include="SteamVR_Editor.csproj">
-      <Project>{a95c8a3e-61a4-b7ac-88cf-437458189db9}</Project>
+      <Project>{5a4588a7-6ca9-9e14-1a05-3af6bdbab82e}</Project>
       <Name>SteamVR_Editor</Name>
     </ProjectReference>
     <ProjectReference Include="SteamVR.csproj">
-      <Project>{84332faa-c693-3963-7224-30befa100592}</Project>
+      <Project>{259a7a3e-9eb0-03e2-f655-d32dfa897e25}</Project>
       <Name>SteamVR</Name>
     </ProjectReference>
     <ProjectReference Include="SteamVR_Windows_EditorHelper.csproj">
-      <Project>{7f3aaf93-0e4d-b29d-6791-66b2405aeb3c}</Project>
+      <Project>{3bbc4234-2483-801b-57d4-0d103cb40967}</Project>
       <Name>SteamVR_Windows_EditorHelper</Name>
     </ProjectReference>
   </ItemGroup>

+ 61 - 61
Assembly-CSharp.csproj

@@ -12,7 +12,7 @@
     <ProductVersion>10.0.20506</ProductVersion>
     <SchemaVersion>2.0</SchemaVersion>
     <RootNamespace></RootNamespace>
-    <ProjectGuid>{db112527-35d0-5fe2-ad7a-47eea9f0fcf0}</ProjectGuid>
+    <ProjectGuid>{f97d2e54-3902-267c-9c14-605ecd0c1ec1}</ProjectGuid>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <AssemblyName>Assembly-CSharp</AssemblyName>
@@ -401,106 +401,106 @@
      <None Include="Assets\TextMesh Pro\Shaders\TMP_Sprite.shader" />
      <None Include="Assets\Packages\System.Net.WebSockets.4.3.0\dotnet_library_license.txt" />
  <Reference Include="Unity.XR.Management">
- <HintPath>C:/Users/student/RiderProjects/VRCyling/Library/ScriptAssemblies/Unity.XR.Management.dll</HintPath>
+ <HintPath>C:/Users/student/RiderProjects/VRCycling/Library/ScriptAssemblies/Unity.XR.Management.dll</HintPath>
  </Reference>
  <Reference Include="Unity.RenderPipeline.Universal.ShaderLibrary">
- <HintPath>C:/Users/student/RiderProjects/VRCyling/Library/ScriptAssemblies/Unity.RenderPipeline.Universal.ShaderLibrary.dll</HintPath>
+ <HintPath>C:/Users/student/RiderProjects/VRCycling/Library/ScriptAssemblies/Unity.RenderPipeline.Universal.ShaderLibrary.dll</HintPath>
  </Reference>
  <Reference Include="Unity.Timeline.Editor">
- <HintPath>C:/Users/student/RiderProjects/VRCyling/Library/ScriptAssemblies/Unity.Timeline.Editor.dll</HintPath>
+ <HintPath>C:/Users/student/RiderProjects/VRCycling/Library/ScriptAssemblies/Unity.Timeline.Editor.dll</HintPath>
  </Reference>
  <Reference Include="Unity.Subsystem.Registration">
- <HintPath>C:/Users/student/RiderProjects/VRCyling/Library/ScriptAssemblies/Unity.Subsystem.Registration.dll</HintPath>
+ <HintPath>C:/Users/student/RiderProjects/VRCycling/Library/ScriptAssemblies/Unity.Subsystem.Registration.dll</HintPath>
  </Reference>
  <Reference Include="Unity.XR.OpenVR">
- <HintPath>C:/Users/student/RiderProjects/VRCyling/Library/ScriptAssemblies/Unity.XR.OpenVR.dll</HintPath>
+ <HintPath>C:/Users/student/RiderProjects/VRCycling/Library/ScriptAssemblies/Unity.XR.OpenVR.dll</HintPath>
  </Reference>
  <Reference Include="Unity.RenderPipelines.Universal.Shaders">
- <HintPath>C:/Users/student/RiderProjects/VRCyling/Library/ScriptAssemblies/Unity.RenderPipelines.Universal.Shaders.dll</HintPath>
+ <HintPath>C:/Users/student/RiderProjects/VRCycling/Library/ScriptAssemblies/Unity.RenderPipelines.Universal.Shaders.dll</HintPath>
  </Reference>
  <Reference Include="Unity.VSCode.Editor">
- <HintPath>C:/Users/student/RiderProjects/VRCyling/Library/ScriptAssemblies/Unity.VSCode.Editor.dll</HintPath>
+ <HintPath>C:/Users/student/RiderProjects/VRCycling/Library/ScriptAssemblies/Unity.VSCode.Editor.dll</HintPath>
  </Reference>
  <Reference Include="Unity.XR.OpenVR.Editor">
- <HintPath>C:/Users/student/RiderProjects/VRCyling/Library/ScriptAssemblies/Unity.XR.OpenVR.Editor.dll</HintPath>
+ <HintPath>C:/Users/student/RiderProjects/VRCycling/Library/ScriptAssemblies/Unity.XR.OpenVR.Editor.dll</HintPath>
  </Reference>
  <Reference Include="Unity.Formats.Fbx.Editor">
- <HintPath>C:/Users/student/RiderProjects/VRCyling/Library/ScriptAssemblies/Unity.Formats.Fbx.Editor.dll</HintPath>
+ <HintPath>C:/Users/student/RiderProjects/VRCycling/Library/ScriptAssemblies/Unity.Formats.Fbx.Editor.dll</HintPath>
  </Reference>
  <Reference Include="Unity.RenderPipelines.Core.Editor">
- <HintPath>C:/Users/student/RiderProjects/VRCyling/Library/ScriptAssemblies/Unity.RenderPipelines.Core.Editor.dll</HintPath>
+ <HintPath>C:/Users/student/RiderProjects/VRCycling/Library/ScriptAssemblies/Unity.RenderPipelines.Core.Editor.dll</HintPath>
  </Reference>
  <Reference Include="Unity.InputSystem">
- <HintPath>C:/Users/student/RiderProjects/VRCyling/Library/ScriptAssemblies/Unity.InputSystem.dll</HintPath>
+ <HintPath>C:/Users/student/RiderProjects/VRCycling/Library/ScriptAssemblies/Unity.InputSystem.dll</HintPath>
  </Reference>
  <Reference Include="Unity.RenderPipelines.Core.Runtime">
- <HintPath>C:/Users/student/RiderProjects/VRCyling/Library/ScriptAssemblies/Unity.RenderPipelines.Core.Runtime.dll</HintPath>
+ <HintPath>C:/Users/student/RiderProjects/VRCycling/Library/ScriptAssemblies/Unity.RenderPipelines.Core.Runtime.dll</HintPath>
  </Reference>
  <Reference Include="Unity.Recorder.Editor">
- <HintPath>C:/Users/student/RiderProjects/VRCyling/Library/ScriptAssemblies/Unity.Recorder.Editor.dll</HintPath>
+ <HintPath>C:/Users/student/RiderProjects/VRCycling/Library/ScriptAssemblies/Unity.Recorder.Editor.dll</HintPath>
  </Reference>
  <Reference Include="Unity.TextMeshPro.Editor">
- <HintPath>C:/Users/student/RiderProjects/VRCyling/Library/ScriptAssemblies/Unity.TextMeshPro.Editor.dll</HintPath>
+ <HintPath>C:/Users/student/RiderProjects/VRCycling/Library/ScriptAssemblies/Unity.TextMeshPro.Editor.dll</HintPath>
  </Reference>
  <Reference Include="Unity.Recorder">
- <HintPath>C:/Users/student/RiderProjects/VRCyling/Library/ScriptAssemblies/Unity.Recorder.dll</HintPath>
+ <HintPath>C:/Users/student/RiderProjects/VRCycling/Library/ScriptAssemblies/Unity.Recorder.dll</HintPath>
  </Reference>
  <Reference Include="Unity.RenderPipelines.Universal.Runtime">
- <HintPath>C:/Users/student/RiderProjects/VRCyling/Library/ScriptAssemblies/Unity.RenderPipelines.Universal.Runtime.dll</HintPath>
+ <HintPath>C:/Users/student/RiderProjects/VRCycling/Library/ScriptAssemblies/Unity.RenderPipelines.Universal.Runtime.dll</HintPath>
  </Reference>
  <Reference Include="Unity.RenderPipelines.Universal.Editor">
- <HintPath>C:/Users/student/RiderProjects/VRCyling/Library/ScriptAssemblies/Unity.RenderPipelines.Universal.Editor.dll</HintPath>
+ <HintPath>C:/Users/student/RiderProjects/VRCycling/Library/ScriptAssemblies/Unity.RenderPipelines.Universal.Editor.dll</HintPath>
  </Reference>
  <Reference Include="UnityEngine.UI">
- <HintPath>C:/Users/student/RiderProjects/VRCyling/Library/ScriptAssemblies/UnityEngine.UI.dll</HintPath>
+ <HintPath>C:/Users/student/RiderProjects/VRCycling/Library/ScriptAssemblies/UnityEngine.UI.dll</HintPath>
  </Reference>
  <Reference Include="Unity.Searcher.Editor">
- <HintPath>C:/Users/student/RiderProjects/VRCyling/Library/ScriptAssemblies/Unity.Searcher.Editor.dll</HintPath>
+ <HintPath>C:/Users/student/RiderProjects/VRCycling/Library/ScriptAssemblies/Unity.Searcher.Editor.dll</HintPath>
  </Reference>
  <Reference Include="Unity.Timeline">
- <HintPath>C:/Users/student/RiderProjects/VRCyling/Library/ScriptAssemblies/Unity.Timeline.dll</HintPath>
+ <HintPath>C:/Users/student/RiderProjects/VRCycling/Library/ScriptAssemblies/Unity.Timeline.dll</HintPath>
  </Reference>
  <Reference Include="UnityEngine.XR.LegacyInputHelpers">
- <HintPath>C:/Users/student/RiderProjects/VRCyling/Library/ScriptAssemblies/UnityEngine.XR.LegacyInputHelpers.dll</HintPath>
+ <HintPath>C:/Users/student/RiderProjects/VRCycling/Library/ScriptAssemblies/UnityEngine.XR.LegacyInputHelpers.dll</HintPath>
  </Reference>
  <Reference Include="Unity.XR.Management.Editor">
- <HintPath>C:/Users/student/RiderProjects/VRCyling/Library/ScriptAssemblies/Unity.XR.Management.Editor.dll</HintPath>
+ <HintPath>C:/Users/student/RiderProjects/VRCycling/Library/ScriptAssemblies/Unity.XR.Management.Editor.dll</HintPath>
  </Reference>
  <Reference Include="Unity.Rider.Editor">
- <HintPath>C:/Users/student/RiderProjects/VRCyling/Library/ScriptAssemblies/Unity.Rider.Editor.dll</HintPath>
+ <HintPath>C:/Users/student/RiderProjects/VRCycling/Library/ScriptAssemblies/Unity.Rider.Editor.dll</HintPath>
  </Reference>
  <Reference Include="Unity.RenderPipelines.ShaderGraph.ShaderGraphLibrary">
- <HintPath>C:/Users/student/RiderProjects/VRCyling/Library/ScriptAssemblies/Unity.RenderPipelines.ShaderGraph.ShaderGraphLibrary.dll</HintPath>
+ <HintPath>C:/Users/student/RiderProjects/VRCycling/Library/ScriptAssemblies/Unity.RenderPipelines.ShaderGraph.ShaderGraphLibrary.dll</HintPath>
  </Reference>
  <Reference Include="Autodesk.Fbx">
- <HintPath>C:/Users/student/RiderProjects/VRCyling/Library/ScriptAssemblies/Autodesk.Fbx.dll</HintPath>
+ <HintPath>C:/Users/student/RiderProjects/VRCycling/Library/ScriptAssemblies/Autodesk.Fbx.dll</HintPath>
  </Reference>
  <Reference Include="UnityEditor.SpatialTracking">
- <HintPath>C:/Users/student/RiderProjects/VRCyling/Library/ScriptAssemblies/UnityEditor.SpatialTracking.dll</HintPath>
+ <HintPath>C:/Users/student/RiderProjects/VRCycling/Library/ScriptAssemblies/UnityEditor.SpatialTracking.dll</HintPath>
  </Reference>
  <Reference Include="UnityEngine.SpatialTracking">
- <HintPath>C:/Users/student/RiderProjects/VRCyling/Library/ScriptAssemblies/UnityEngine.SpatialTracking.dll</HintPath>
+ <HintPath>C:/Users/student/RiderProjects/VRCycling/Library/ScriptAssemblies/UnityEngine.SpatialTracking.dll</HintPath>
  </Reference>
  <Reference Include="Unity.VisualStudio.Editor">
- <HintPath>C:/Users/student/RiderProjects/VRCyling/Library/ScriptAssemblies/Unity.VisualStudio.Editor.dll</HintPath>
+ <HintPath>C:/Users/student/RiderProjects/VRCycling/Library/ScriptAssemblies/Unity.VisualStudio.Editor.dll</HintPath>
  </Reference>
  <Reference Include="Unity.ShaderGraph.Editor">
- <HintPath>C:/Users/student/RiderProjects/VRCyling/Library/ScriptAssemblies/Unity.ShaderGraph.Editor.dll</HintPath>
+ <HintPath>C:/Users/student/RiderProjects/VRCycling/Library/ScriptAssemblies/Unity.ShaderGraph.Editor.dll</HintPath>
  </Reference>
  <Reference Include="Unity.RenderPipelines.Core.ShaderLibrary">
- <HintPath>C:/Users/student/RiderProjects/VRCyling/Library/ScriptAssemblies/Unity.RenderPipelines.Core.ShaderLibrary.dll</HintPath>
+ <HintPath>C:/Users/student/RiderProjects/VRCycling/Library/ScriptAssemblies/Unity.RenderPipelines.Core.ShaderLibrary.dll</HintPath>
  </Reference>
  <Reference Include="Unity.TextMeshPro">
- <HintPath>C:/Users/student/RiderProjects/VRCyling/Library/ScriptAssemblies/Unity.TextMeshPro.dll</HintPath>
+ <HintPath>C:/Users/student/RiderProjects/VRCycling/Library/ScriptAssemblies/Unity.TextMeshPro.dll</HintPath>
  </Reference>
  <Reference Include="UnityEditor.XR.LegacyInputHelpers">
- <HintPath>C:/Users/student/RiderProjects/VRCyling/Library/ScriptAssemblies/UnityEditor.XR.LegacyInputHelpers.dll</HintPath>
+ <HintPath>C:/Users/student/RiderProjects/VRCycling/Library/ScriptAssemblies/UnityEditor.XR.LegacyInputHelpers.dll</HintPath>
  </Reference>
  <Reference Include="Unity.Formats.Fbx.Runtime">
- <HintPath>C:/Users/student/RiderProjects/VRCyling/Library/ScriptAssemblies/Unity.Formats.Fbx.Runtime.dll</HintPath>
+ <HintPath>C:/Users/student/RiderProjects/VRCycling/Library/ScriptAssemblies/Unity.Formats.Fbx.Runtime.dll</HintPath>
  </Reference>
  <Reference Include="UnityEditor.UI">
- <HintPath>C:/Users/student/RiderProjects/VRCyling/Library/ScriptAssemblies/UnityEditor.UI.dll</HintPath>
+ <HintPath>C:/Users/student/RiderProjects/VRCycling/Library/ScriptAssemblies/UnityEditor.UI.dll</HintPath>
  </Reference>
  <Reference Include="UnityEngine">
  <HintPath>C:/Program Files/Unity/Hub/Editor/2020.1.12f1/Editor/Data/Managed/UnityEngine/UnityEngine.dll</HintPath>
@@ -692,49 +692,49 @@
  <HintPath>C:/Program Files/Unity/Hub/Editor/2020.1.12f1/Editor/Data/Managed/UnityEditor.dll</HintPath>
  </Reference>
  <Reference Include="Common.Logging">
- <HintPath>C:/Users/student/RiderProjects/VRCyling/Assets/Packages/Common.Logging.3.4.1/lib/net40/Common.Logging.dll</HintPath>
+ <HintPath>C:/Users/student/RiderProjects/VRCycling/Assets/Packages/Common.Logging.3.4.1/lib/net40/Common.Logging.dll</HintPath>
  </Reference>
  <Reference Include="Common.Logging.Core">
- <HintPath>C:/Users/student/RiderProjects/VRCyling/Assets/Packages/Common.Logging.Core.3.4.1/lib/net40/Common.Logging.Core.dll</HintPath>
+ <HintPath>C:/Users/student/RiderProjects/VRCycling/Assets/Packages/Common.Logging.Core.3.4.1/lib/net40/Common.Logging.Core.dll</HintPath>
  </Reference>
  <Reference Include="System.Net.IPNetwork">
- <HintPath>C:/Users/student/RiderProjects/VRCyling/Assets/Packages/IPNetwork2.2.1.2/lib/net46/System.Net.IPNetwork.dll</HintPath>
+ <HintPath>C:/Users/student/RiderProjects/VRCycling/Assets/Packages/IPNetwork2.2.1.2/lib/net46/System.Net.IPNetwork.dll</HintPath>
  </Reference>
  <Reference Include="Makaretu.Dns">
- <HintPath>C:/Users/student/RiderProjects/VRCyling/Assets/Packages/Makaretu.Dns.2.0.1/lib/net45/Makaretu.Dns.dll</HintPath>
+ <HintPath>C:/Users/student/RiderProjects/VRCycling/Assets/Packages/Makaretu.Dns.2.0.1/lib/net45/Makaretu.Dns.dll</HintPath>
  </Reference>
  <Reference Include="Makaretu.Dns.Multicast">
- <HintPath>C:/Users/student/RiderProjects/VRCyling/Assets/Packages/Makaretu.Dns.Multicast.0.27.0/lib/net461/Makaretu.Dns.Multicast.dll</HintPath>
+ <HintPath>C:/Users/student/RiderProjects/VRCycling/Assets/Packages/Makaretu.Dns.Multicast.0.27.0/lib/net461/Makaretu.Dns.Multicast.dll</HintPath>
  </Reference>
  <Reference Include="MQTTnet">
- <HintPath>C:/Users/student/RiderProjects/VRCyling/Assets/Packages/MQTTnet.3.0.13/lib/net461/MQTTnet.dll</HintPath>
+ <HintPath>C:/Users/student/RiderProjects/VRCycling/Assets/Packages/MQTTnet.3.0.13/lib/net461/MQTTnet.dll</HintPath>
  </Reference>
  <Reference Include="SimpleBase">
- <HintPath>C:/Users/student/RiderProjects/VRCyling/Assets/Packages/SimpleBase.1.3.1/lib/net45/SimpleBase.dll</HintPath>
+ <HintPath>C:/Users/student/RiderProjects/VRCycling/Assets/Packages/SimpleBase.1.3.1/lib/net45/SimpleBase.dll</HintPath>
  </Reference>
  <Reference Include="System.Net.Security">
- <HintPath>C:/Users/student/RiderProjects/VRCyling/Assets/Packages/System.Net.Security.4.3.2/lib/net46/System.Net.Security.dll</HintPath>
+ <HintPath>C:/Users/student/RiderProjects/VRCycling/Assets/Packages/System.Net.Security.4.3.2/lib/net46/System.Net.Security.dll</HintPath>
  </Reference>
  <Reference Include="System.Net.WebSockets">
- <HintPath>C:/Users/student/RiderProjects/VRCyling/Assets/Packages/System.Net.WebSockets.4.3.0/lib/net46/System.Net.WebSockets.dll</HintPath>
+ <HintPath>C:/Users/student/RiderProjects/VRCycling/Assets/Packages/System.Net.WebSockets.4.3.0/lib/net46/System.Net.WebSockets.dll</HintPath>
  </Reference>
  <Reference Include="System.Net.WebSockets.Client">
- <HintPath>C:/Users/student/RiderProjects/VRCyling/Assets/Packages/System.Net.WebSockets.Client.4.3.2/lib/net46/System.Net.WebSockets.Client.dll</HintPath>
+ <HintPath>C:/Users/student/RiderProjects/VRCycling/Assets/Packages/System.Net.WebSockets.Client.4.3.2/lib/net46/System.Net.WebSockets.Client.dll</HintPath>
  </Reference>
  <Reference Include="System.Security.Cryptography.Algorithms">
- <HintPath>C:/Users/student/RiderProjects/VRCyling/Assets/Packages/System.Security.Cryptography.Algorithms.4.3.0/lib/net461/System.Security.Cryptography.Algorithms.dll</HintPath>
+ <HintPath>C:/Users/student/RiderProjects/VRCycling/Assets/Packages/System.Security.Cryptography.Algorithms.4.3.0/lib/net461/System.Security.Cryptography.Algorithms.dll</HintPath>
  </Reference>
  <Reference Include="System.Security.Cryptography.Encoding">
- <HintPath>C:/Users/student/RiderProjects/VRCyling/Assets/Packages/System.Security.Cryptography.Encoding.4.3.0/lib/net46/System.Security.Cryptography.Encoding.dll</HintPath>
+ <HintPath>C:/Users/student/RiderProjects/VRCycling/Assets/Packages/System.Security.Cryptography.Encoding.4.3.0/lib/net46/System.Security.Cryptography.Encoding.dll</HintPath>
  </Reference>
  <Reference Include="System.Security.Cryptography.Primitives">
- <HintPath>C:/Users/student/RiderProjects/VRCyling/Assets/Packages/System.Security.Cryptography.Primitives.4.3.0/lib/net46/System.Security.Cryptography.Primitives.dll</HintPath>
+ <HintPath>C:/Users/student/RiderProjects/VRCycling/Assets/Packages/System.Security.Cryptography.Primitives.4.3.0/lib/net46/System.Security.Cryptography.Primitives.dll</HintPath>
  </Reference>
  <Reference Include="System.Security.Cryptography.X509Certificates">
- <HintPath>C:/Users/student/RiderProjects/VRCyling/Assets/Packages/System.Security.Cryptography.X509Certificates.4.3.0/lib/net461/System.Security.Cryptography.X509Certificates.dll</HintPath>
+ <HintPath>C:/Users/student/RiderProjects/VRCycling/Assets/Packages/System.Security.Cryptography.X509Certificates.4.3.0/lib/net461/System.Security.Cryptography.X509Certificates.dll</HintPath>
  </Reference>
  <Reference Include="Valve.Newtonsoft.Json">
- <HintPath>C:/Users/student/RiderProjects/VRCyling/Assets/SteamVR/Input/Plugins/JSON.NET/Valve.Newtonsoft.Json.dll</HintPath>
+ <HintPath>C:/Users/student/RiderProjects/VRCycling/Assets/SteamVR/Input/Plugins/JSON.NET/Valve.Newtonsoft.Json.dll</HintPath>
  </Reference>
  <Reference Include="mscorlib">
  <HintPath>C:/Program Files/Unity/Hub/Editor/2020.1.12f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/mscorlib.dll</HintPath>
@@ -1084,47 +1084,47 @@
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="UniRx.csproj">
-      <Project>{c850c834-a79b-b5c3-aa9b-476ded9f3af6}</Project>
+      <Project>{ac8a9d46-d12b-43ef-57c7-bf5096bb96bf}</Project>
       <Name>UniRx</Name>
     </ProjectReference>
     <ProjectReference Include="SteamVR_Actions.csproj">
-      <Project>{806186c8-c664-2ef0-a914-446507b36928}</Project>
+      <Project>{a890fc1e-9e52-6223-4934-c1e2bd651e2f}</Project>
       <Name>SteamVR_Actions</Name>
     </ProjectReference>
     <ProjectReference Include="Boxophobic.Utils.Scripts.csproj">
-      <Project>{5e0584ed-19d3-ea42-3570-b31be9da1bfc}</Project>
+      <Project>{70a707c5-442a-7251-2f67-2e61b24738f3}</Project>
       <Name>Boxophobic.Utils.Scripts</Name>
     </ProjectReference>
     <ProjectReference Include="Boxophobic.PolyverseSkies.Runtime.csproj">
-      <Project>{4494e8ef-9e45-ed2b-56ae-334420205220}</Project>
+      <Project>{44fdd333-2a1e-1cb4-1485-1d5c04453624}</Project>
       <Name>Boxophobic.PolyverseSkies.Runtime</Name>
     </ProjectReference>
     <ProjectReference Include="Boxophobic.PolyverseSkies.Scripts.csproj">
-      <Project>{24370658-ddbd-a063-eaf9-df73e9f22ba2}</Project>
+      <Project>{153c0d1d-bef2-002b-a97c-6b7459085fbd}</Project>
       <Name>Boxophobic.PolyverseSkies.Scripts</Name>
     </ProjectReference>
     <ProjectReference Include="Boxophobic.PolyverseSkies.Editor.csproj">
-      <Project>{b0b43ba9-797d-97cf-0202-0096a023639a}</Project>
+      <Project>{259616fe-1b56-8511-50ce-8a99df2d1ce9}</Project>
       <Name>Boxophobic.PolyverseSkies.Editor</Name>
     </ProjectReference>
     <ProjectReference Include="Boxophobic.Utils.Editor.csproj">
-      <Project>{67d83658-c723-7895-333c-c16c51af856d}</Project>
+      <Project>{5eeb53f2-1357-9055-c374-ec646f4a51b6}</Project>
       <Name>Boxophobic.Utils.Editor</Name>
     </ProjectReference>
     <ProjectReference Include="SteamVR_Input_Editor.csproj">
-      <Project>{6b2d1554-301e-086a-b2f2-6a642758de58}</Project>
+      <Project>{5b8db92d-f7e8-ee2f-618e-ed5415d48641}</Project>
       <Name>SteamVR_Input_Editor</Name>
     </ProjectReference>
     <ProjectReference Include="SteamVR_Editor.csproj">
-      <Project>{a95c8a3e-61a4-b7ac-88cf-437458189db9}</Project>
+      <Project>{5a4588a7-6ca9-9e14-1a05-3af6bdbab82e}</Project>
       <Name>SteamVR_Editor</Name>
     </ProjectReference>
     <ProjectReference Include="SteamVR.csproj">
-      <Project>{84332faa-c693-3963-7224-30befa100592}</Project>
+      <Project>{259a7a3e-9eb0-03e2-f655-d32dfa897e25}</Project>
       <Name>SteamVR</Name>
     </ProjectReference>
     <ProjectReference Include="SteamVR_Windows_EditorHelper.csproj">
-      <Project>{7f3aaf93-0e4d-b29d-6791-66b2405aeb3c}</Project>
+      <Project>{3bbc4234-2483-801b-57d4-0d103cb40967}</Project>
       <Name>SteamVR_Windows_EditorHelper</Name>
     </ProjectReference>
   </ItemGroup>

+ 380 - 0
Assets/Editor/MaterialAnalyzer.cs

@@ -0,0 +1,380 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Text;
+using UnityEditor;
+using UnityEngine;
+
+namespace Editor
+{
+	/// ---------------------------------------------------------------------------
+	/// <summary>
+	/// Analyzes the currently selected gameobjects in scene recursively and lists all materials in an EditorWindow.
+	/// The list allows to (mutli)select materials which automatically selects the scene game objects which use it.
+	/// Additionally every list item provides a button to jump to the material asset in project window.
+	/// </summary>
+	/// ---------------------------------------------------------------------------
+	public class MaterialAnalyzer : EditorWindow
+	{
+		/// PRIVATE ===============================================================
+ 
+		private static GUIStyle mListStyle;
+		private static GUIStyle mItemStyle;
+		private static GUIStyle mItemSelectedStyle;
+		private Texture2D mListBackgroundTex;
+		private Texture2D mItemBackgroundTex;
+		private Texture2D mItemSelectedBackgroundTex;
+ 
+		/// -----------------------------------------------------------------------
+		/// <summary>
+		/// Defines a single list item encapsulating a set of game objects and a selection state.
+		/// </summary>
+		/// -----------------------------------------------------------------------
+		private class ListItem
+		{
+			public ListItem( bool selected = false )
+			{
+				this.Selected = selected;
+			}
+ 
+			public HashSet<GameObject> GameObjects = new HashSet<GameObject>();
+			public bool Selected;
+		};
+ 
+		/// -----------------------------------------------------------------------
+		/// <summary>
+		/// Material comparer calls the material name comparer.
+		/// </summary>
+		/// -----------------------------------------------------------------------
+		private class MaterialComp : IComparer<Material>
+		{
+			public int Compare( Material x, Material y )
+			{
+				return x.name.CompareTo( y.name );
+			}
+		}
+		/// <summary>
+		/// Stores list items by material instance.
+		/// </summary>
+		private SortedDictionary<Material, ListItem> mSelectionMaterials = new SortedDictionary<Material, ListItem>( new MaterialComp() );
+ 
+		/// <summary>
+		/// The current scroll position.
+		/// </summary>
+		private Vector2 mScrollPosition;
+ 
+		/// <summary>
+		/// A text dump of the material hierarchy.
+		/// </summary>
+		private string mMaterialHierarchyDump = string.Empty;
+ 
+		/// METHODS ===============================================================
+ 
+		/// -----------------------------------------------------------------------
+		/// <summary>
+		/// Adds menu named "Analyze Scene" to the "Debug" menu which creates and initializes a new instance of this class.
+		/// </summary>
+		/// -----------------------------------------------------------------------
+		[MenuItem("Custom/Analyze Materials")]
+		public static void Init()
+		{
+			MaterialAnalyzer win = EditorWindow.GetWindow( typeof(MaterialAnalyzer) ) as MaterialAnalyzer;
+			win.init();
+			win.Show();
+		}
+ 
+		/// -----------------------------------------------------------------------
+		/// <summary>
+		/// Draws the GUI window.
+		/// </summary>
+		/// -----------------------------------------------------------------------
+		private void OnGUI()
+		{
+			GUILayout.BeginVertical();
+			if( GUILayout.Button( "Analyze Selection" ) )
+				analyzeSelection();
+			if( GUILayout.Button( "Dump Hierarchy" ) )
+				dumpMaterialHierarchy();
+			if( GUILayout.Button( "Dump List" ) )
+				dumpMaterialList();
+			GUILayout.EndVertical();
+ 
+			GUILayout.Label( "Materials: " + mSelectionMaterials.Count.ToString(), EditorStyles.boldLabel );
+ 
+			mScrollPosition = GUILayout.BeginScrollView( mScrollPosition, false, true, GUI.skin.horizontalScrollbar, GUI.skin.verticalScrollbar, mListStyle, GUILayout.MinWidth( 400 ), GUILayout.MaxWidth( 1000 ), GUILayout.MaxHeight( 1000 ) );
+			foreach( KeyValuePair<Material, ListItem> item in mSelectionMaterials )
+			{
+				GUILayout.BeginHorizontal();
+ 
+				// select the material asset in project hierarchy
+				if( GUILayout.Button( "<", EditorStyles.miniButton, GUILayout.Width( 20 ) ) )
+				{
+					// unselect all selected and select the material instance in project
+					foreach( ListItem listItem in mSelectionMaterials.Values )
+						listItem.Selected = false;
+ 
+					Selection.activeObject = item.Key;
+				}
+				if( GUILayout.Button( item.Key.name, item.Value.Selected ? mItemSelectedStyle : mItemStyle, GUILayout.MinWidth( 200 ) ) )
+					processListItemClick( item.Value );
+ 
+				if( GUILayout.Button( item.Key.shader != null ? item.Key.shader.name : " <MISSING>", item.Value.Selected ? mItemSelectedStyle : mItemStyle, GUILayout.Width( 300 ) ) )
+					processListItemClick( item.Value );
+ 
+				GUILayout.EndHorizontal();
+			}
+ 
+			GUILayout.EndScrollView();
+		}
+ 
+		/// -----------------------------------------------------------------------
+		/// <summary>
+		/// Processes the list item click.
+		/// </summary>
+		/// <param name='itemClicked'>
+		/// The item clicked.
+		/// </param>
+		/// -----------------------------------------------------------------------
+		private void processListItemClick( ListItem itemClicked )
+		{
+			Event e = Event.current;
+ 
+			// if shift/control is pressed just add this element
+			if( e.control )
+			{
+				itemClicked.Selected = !itemClicked.Selected;
+				updateSceneSelection();
+			}
+			else
+			{
+				// unselect all selected and select this
+				foreach( ListItem listItem in mSelectionMaterials.Values )
+					listItem.Selected = false;
+ 
+				itemClicked.Selected = true;
+				updateSceneSelection();
+			}
+		}
+ 
+		/// -----------------------------------------------------------------------
+		/// <summary>
+		/// Starts recursive analyze process iterating through every selected GameObject.
+		/// </summary>
+		/// -----------------------------------------------------------------------
+		private void analyzeSelection()
+		{
+			mSelectionMaterials.Clear();
+ 
+			if( Selection.transforms.Length == 0 )
+			{
+				Debug.LogError( "Please select the object(s) you wish to analyze." );
+				return;
+			}
+ 
+			StringBuilder dump = new StringBuilder();
+			foreach( Transform transform in Selection.transforms )
+				analyzeGameObject( transform.gameObject, dump, "" );
+ 
+			mMaterialHierarchyDump = dump.ToString();
+		}
+ 
+		/// -----------------------------------------------------------------------
+		/// <summary>
+		/// Analyzes the given game object.
+		/// </summary>
+		/// <param name='gameObject'>
+		/// The game object to analyze.
+		/// </param>
+		/// -----------------------------------------------------------------------
+		private void analyzeGameObject( GameObject gameObject, StringBuilder dump, string indent )
+		{
+			dump.Append( indent + gameObject.name + "\n" );
+ 
+			foreach( Component component in gameObject.GetComponents<Component>() )
+				analyzeComponent( component, dump, indent + "    " );
+ 
+			foreach( Transform child in gameObject.transform )
+				analyzeGameObject( child.gameObject, dump, indent + "    " );
+		}
+ 
+		/// -----------------------------------------------------------------------
+		/// <summary>
+		/// Analyzes the given component.
+		/// </summary>
+		/// <param name='component'>
+		/// The component to analyze.
+		/// </param>
+		/// -----------------------------------------------------------------------
+		private void analyzeComponent( Component component, StringBuilder dump, string indent )
+		{
+			// early out if component is missing
+			if( component == null )
+				return;
+ 
+			List<Material> materials = new List<Material>();
+			switch( component.GetType().ToString() )
+			{
+				case "UnityEngine.MeshRenderer":
+				{
+					MeshRenderer mr = component as MeshRenderer;
+					foreach( Material mat in mr.sharedMaterials )
+						materials.Add( mat );
+				}
+					break;
+				default:
+					break;
+			}
+ 
+			bool materialMissing = false;
+			foreach( Material mat in materials )
+			{
+				if( mat == null )
+				{
+					materialMissing = true;
+					dump.Append( indent + "> MISSING\n" );
+				}
+				else
+				{
+					ListItem item;
+					mSelectionMaterials.TryGetValue( mat, out item );
+					if( item == null )
+					{
+						item = new ListItem();
+						mSelectionMaterials.Add( mat, item );
+					}
+					item.GameObjects.Add( component.gameObject );
+ 
+					string matName = mat.shader != null ?
+						mat.name + " <" + mat.shader.name + ">" :
+						mat.name + " <MISSING>";
+					dump.Append( indent + "> " + matName + "\n" );
+				}
+			}
+ 
+			if( materialMissing )
+				Debug.LogWarning( "Material(s) missing in game object '" + component.gameObject + "'!" );
+		}
+ 
+		/// -----------------------------------------------------------------------
+		/// <summary>
+		/// Dumps the current selection hierarchy to a file.
+		/// </summary>
+		/// -----------------------------------------------------------------------
+		private void dumpMaterialHierarchy()
+		{
+			if( mMaterialHierarchyDump == string.Empty )
+			{
+				Debug.LogError( "There is nothing to dump yet." );
+				return;
+			}
+ 
+			string path = EditorUtility.SaveFilePanel( "Hierarchy Dump File", "", "material_hierarchy.txt", "txt" );
+			File.WriteAllText( path, mMaterialHierarchyDump );
+		}
+ 
+		/// -----------------------------------------------------------------------
+		/// <summary>
+		/// Dumps the current list of materials.
+		/// </summary>
+		/// -----------------------------------------------------------------------
+		private void dumpMaterialList()
+		{
+			if( mSelectionMaterials.Count == 0 )
+			{
+				Debug.LogError( "The material list is empty. Dump aborted." );
+				return;
+			}
+ 
+			// create string from current list
+			StringBuilder materialItems = new StringBuilder();
+			materialItems.Append( String.Format( "{0,-40}", "Material" ) ).Append( " | " );
+			materialItems.Append( String.Format( "{0,-60}", "Shader" ) ).Append( " | " );
+			materialItems.Append( String.Format( "{0,-9}", "Occurence" ) + " | " );
+			materialItems.Append( "GameObject List\n" );
+			materialItems.Append( "----------------------------------------------------------------------------" +
+			                      "----------------------------------------------------------------------------\n" );
+ 
+			foreach( KeyValuePair<Material, ListItem> item in mSelectionMaterials )
+			{
+				materialItems.Append( String.Format( "{0,-40}", item.Key.name ) ).Append( " | " );
+				materialItems.Append( String.Format( "{0,-60}", item.Key.shader != null ? item.Key.shader.name : " MISSING" ) ).Append( " | " );
+				materialItems.Append( String.Format( "{0,-9}", "   " + item.Value.GameObjects.Count.ToString() ) + " | " );
+ 
+				foreach( GameObject go in item.Value.GameObjects )
+					materialItems.Append( " " + go.name + " |" );
+ 
+				materialItems.Append( "\n" );
+			}
+ 
+			string path = EditorUtility.SaveFilePanel( "Material Dump File", "", "material_list.txt", "txt" );
+			File.WriteAllText( path, materialItems.ToString() );
+		}
+ 
+		/// -----------------------------------------------------------------------
+		/// <summary>
+		/// Selects the game objects in scene stored in all selected list items.
+		/// </summary>
+		/// -----------------------------------------------------------------------
+		private void updateSceneSelection()
+		{
+			HashSet<UnityEngine.Object> sceneObjectsToSelect = new HashSet<UnityEngine.Object>();
+			foreach( ListItem item in mSelectionMaterials.Values )
+				if( item.Selected )
+					foreach( GameObject go in item.GameObjects )
+						sceneObjectsToSelect.Add( go );
+ 
+			UnityEngine.Object[] array = new UnityEngine.Object[sceneObjectsToSelect.Count];
+			sceneObjectsToSelect.CopyTo( array );
+			Selection.objects = array;
+		}
+ 
+		/// -----------------------------------------------------------------------
+		/// <summary>
+		/// Initializes GUI styles and textures used.
+		/// </summary>
+		/// -----------------------------------------------------------------------
+		private void init()
+		{
+			// list background
+			mListBackgroundTex = new Texture2D( 1, 1 );
+			mListBackgroundTex.SetPixel( 0, 0, new Color( 0.6f, 0.6f, 0.6f ) );
+			mListBackgroundTex.Apply();
+			mListBackgroundTex.wrapMode = TextureWrapMode.Repeat;
+ 
+			// list style
+			mListStyle = new GUIStyle();
+			mListStyle.normal.background = mListBackgroundTex;
+			mListStyle.margin = new RectOffset( 4, 4, 4, 4 );
+			mListStyle.border = new RectOffset( 1, 1, 1, 1 );
+ 
+			// item background
+			mItemBackgroundTex = new Texture2D( 1, 1 );
+			Color wBGColor = new Color( 0.0f, 0.0f, 0.0f );
+			string wBGColorData = EditorPrefs.GetString( "Windows/Background" );
+			string[] wBGColorArray = wBGColorData.Split( ';' );
+			if( wBGColorArray.Length == 5 )
+				wBGColor = new Color( float.Parse( wBGColorArray[1] ), float.Parse( wBGColorArray[2] ), float.Parse( wBGColorArray[3] ) );
+			else
+				Debug.LogError( "Invalid window color in EditorPref found." + wBGColorArray.Length );
+			mItemBackgroundTex.SetPixel( 0, 0, wBGColor );
+			mItemBackgroundTex.Apply();
+			mItemBackgroundTex.wrapMode = TextureWrapMode.Repeat;
+ 
+			// item selected background
+			mItemSelectedBackgroundTex = new Texture2D( 1, 1 );
+			mItemSelectedBackgroundTex.SetPixel( 0, 0, new Color( 0.239f, 0.376f, 0.568f ) );
+			mItemSelectedBackgroundTex.Apply();
+			mItemSelectedBackgroundTex.wrapMode = TextureWrapMode.Repeat;
+ 
+			// item style
+			mItemStyle = new GUIStyle( EditorStyles.textField );
+			mItemStyle.normal.background = mItemBackgroundTex;
+			mItemStyle.hover.textColor = Color.cyan;
+			mItemStyle.padding = new RectOffset( 2, 2, 2, 2 );
+			mItemStyle.margin = new RectOffset( 1, 2, 1, 1 );
+			mItemSelectedStyle = new GUIStyle( mItemStyle );
+			mItemSelectedStyle.normal.background = mItemSelectedBackgroundTex;
+			mItemSelectedStyle.normal.textColor = Color.white;
+		}
+	}
+}

+ 3 - 0
Assets/Editor/MaterialAnalyzer.cs.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 258ec05b379649a3919a28f665a4d2eb
+timeCreated: 1620208620

+ 2 - 2
Assets/Materials/Vignette.mat

@@ -58,10 +58,10 @@ Material:
     - _GlossMapScale: 0
     - _Glossiness: 0
     - _GlossyReflections: 0
-    - _IFOV: 0.9289239
+    - _IFOV: 0.91708285
     - _InnerRadius: 0.15
     - _Metallic: 0
-    - _OFOV: 0.9989239
+    - _OFOV: 0.98708284
     - _OcclusionStrength: 1
     - _QueueOffset: 0
     - _ReceiveShadows: 1

+ 0 - 7
Assets/MeshCombiner/HDRP/Mesh Combiner_2019.3.2_HDRP.unitypackage.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: 5147c378a83cc5247ba7d765c8e6b7ac
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

+ 0 - 7
Assets/MeshCombiner/Standard/Mesh Combiner_2018.4.15_Standard.unitypackage.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: c14e2c1b3f66c914eadda6e37fd68cea
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

+ 0 - 7
Assets/MeshCombiner/URP/Mesh Combiner_2019.3.2_URP.unitypackage.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: fd04eeb770a55ad479ca27b18678b930
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

+ 0 - 25
Assets/PolygonCity/Prefabs/Buildings/SM_Bld_Apartment_01.prefab

@@ -12,7 +12,6 @@ GameObject:
   - component: {fileID: 3333522}
   - component: {fileID: 2344520}
   - component: {fileID: 64925656970162654}
-  - component: {fileID: 1693295865684161839}
   m_Layer: 0
   m_Name: SM_Bld_Apartment_01
   m_TagString: Untagged
@@ -97,27 +96,3 @@ MeshCollider:
   m_Convex: 1
   m_CookingOptions: 30
   m_Mesh: {fileID: 43202385419991602, guid: 7909122c71f894e4798017d6b7deeaa7, type: 2}
---- !u!205 &1693295865684161839
-LODGroup:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 165386}
-  serializedVersion: 2
-  m_LocalReferencePoint: {x: 0, y: 0, z: 0}
-  m_Size: 1
-  m_FadeMode: 0
-  m_AnimateCrossFading: 0
-  m_LastLODIsBillboard: 0
-  m_LODs:
-  - screenRelativeHeight: 0.6
-    fadeTransitionWidth: 0
-    renderers: []
-  - screenRelativeHeight: 0.3
-    fadeTransitionWidth: 0
-    renderers: []
-  - screenRelativeHeight: 0.1
-    fadeTransitionWidth: 0
-    renderers: []
-  m_Enabled: 1

File diff suppressed because it is too large
+ 286 - 293
Assets/Scenes/MainScene.unity


+ 1 - 1
Assets/Scripts/SicknessReduction/Haptic/DeskFanController.cs

@@ -8,7 +8,7 @@ namespace SicknessReduction.Haptic
     public class DeskFanController : EspController
     {
         private const int MAX_FAN_VALUE = 95; //in %. Sometimes 100% doesn't work correctly
-        private const int MIN_FAN_VALUE = 35; //everything below will not be enough to let the fan spin
+        private const int MIN_FAN_VALUE = 25; //everything below 35 will not be enough to let the fan spin; a bit of buffer for not starting to high
         private const string TOPIC = "DeskFan/Control";
 
         public float maxValueAtSpeed = 6.94f; //25km/h

+ 226 - 225
Assets/StreamingAssets/SteamVR/actions.json

@@ -1,226 +1,227 @@
 {
-   "action_sets" : [
-      {
-         "name" : "/actions/default",
-         "usage" : "single"
-      },
-      {
-         "name" : "/actions/platformer",
-         "usage" : "single"
-      },
-      {
-         "name" : "/actions/buggy",
-         "usage" : "single"
-      },
-      {
-         "name" : "/actions/mixedreality",
-         "usage" : "single"
-      },
-      {
-         "name" : "/actions/bikevr",
-         "usage" : "single"
-      }
-   ],
-   "actions" : [
-      {
-         "name" : "/actions/default/in/InteractUI",
-         "type" : "boolean"
-      },
-      {
-         "name" : "/actions/default/in/Teleport",
-         "type" : "boolean"
-      },
-      {
-         "name" : "/actions/default/in/GrabPinch",
-         "type" : "boolean"
-      },
-      {
-         "name" : "/actions/default/in/GrabGrip",
-         "type" : "boolean"
-      },
-      {
-         "name" : "/actions/default/in/Pose",
-         "type" : "pose"
-      },
-      {
-         "name" : "/actions/default/in/SkeletonLeftHand",
-         "skeleton" : "/skeleton/hand/left",
-         "type" : "skeleton"
-      },
-      {
-         "name" : "/actions/default/in/SkeletonRightHand",
-         "skeleton" : "/skeleton/hand/right",
-         "type" : "skeleton"
-      },
-      {
-         "name" : "/actions/default/in/Squeeze",
-         "requirement" : "optional",
-         "type" : "vector1"
-      },
-      {
-         "name" : "/actions/default/in/HeadsetOnHead",
-         "requirement" : "optional",
-         "type" : "boolean"
-      },
-      {
-         "name" : "/actions/default/in/SnapTurnLeft",
-         "requirement" : "suggested",
-         "type" : "boolean"
-      },
-      {
-         "name" : "/actions/default/in/SnapTurnRight",
-         "type" : "boolean"
-      },
-      {
-         "name" : "/actions/default/out/Haptic",
-         "type" : "vibration"
-      },
-      {
-         "name" : "/actions/platformer/in/Move",
-         "type" : "vector2"
-      },
-      {
-         "name" : "/actions/platformer/in/Jump",
-         "type" : "boolean"
-      },
-      {
-         "name" : "/actions/buggy/in/Steering",
-         "type" : "vector2"
-      },
-      {
-         "name" : "/actions/buggy/in/Throttle",
-         "type" : "vector1"
-      },
-      {
-         "name" : "/actions/buggy/in/Brake",
-         "type" : "boolean"
-      },
-      {
-         "name" : "/actions/buggy/in/Reset",
-         "type" : "boolean"
-      },
-      {
-         "name" : "/actions/mixedreality/in/ExternalCamera",
-         "requirement" : "optional",
-         "type" : "pose"
-      },
-      {
-         "name" : "/actions/bikevr/in/ResetPosition",
-         "requirement" : "mandatory",
-         "type" : "boolean"
-      },
-      {
-         "name" : "/actions/bikevr/in/MovePlayerForward",
-         "requirement" : "mandatory",
-         "type" : "boolean"
-      },
-      {
-         "name" : "/actions/bikevr/in/MovePlayerModeSwitch",
-         "type" : "boolean"
-      },
-      {
-         "name" : "/actions/bikevr/in/MovePlayerBackward",
-         "requirement" : "mandatory",
-         "type" : "boolean"
-      },
-      {
-         "name" : "/actions/bikevr/in/MovePlayerLeft",
-         "requirement" : "mandatory",
-         "type" : "boolean"
-      },
-      {
-         "name" : "/actions/bikevr/in/MovePlayerRight",
-         "requirement" : "mandatory",
-         "type" : "boolean"
-      },
-      {
-         "name" : "/actions/bikevr/in/ResetBikePosition",
-         "type" : "boolean"
-      },
-      {
-         "name" : "/actions/bikevr/in/Steer",
-         "type" : "pose"
-      }
-   ],
-   "default_bindings" : [
-      {
-         "binding_url" : "bindings_vive_controller.json",
-         "controller_type" : "vive_controller"
-      },
-      {
-         "binding_url" : "bindings_oculus_touch.json",
-         "controller_type" : "oculus_touch"
-      },
-      {
-         "binding_url" : "bindings_knuckles.json",
-         "controller_type" : "knuckles"
-      },
-      {
-         "binding_url" : "bindings_holographic_controller.json",
-         "controller_type" : "holographic_controller"
-      },
-      {
-         "binding_url" : "bindings_vive_cosmos_controller.json",
-         "controller_type" : "vive_cosmos_controller"
-      },
-      {
-         "binding_url" : "bindings_logitech_stylus.json",
-         "controller_type" : "logitech_stylus"
-      },
-      {
-         "binding_url" : "binding_vive_cosmos.json",
-         "controller_type" : "vive_cosmos"
-      },
-      {
-         "binding_url" : "binding_vive.json",
-         "controller_type" : "vive"
-      },
-      {
-         "binding_url" : "binding_index_hmd.json",
-         "controller_type" : "indexhmd"
-      },
-      {
-         "binding_url" : "binding_vive_pro.json",
-         "controller_type" : "vive_pro"
-      },
-      {
-         "binding_url" : "binding_rift.json",
-         "controller_type" : "rift"
-      },
-      {
-         "binding_url" : "binding_holographic_hmd.json",
-         "controller_type" : "holographic_hmd"
-      },
-      {
-         "binding_url" : "binding_vive_tracker_camera.json",
-         "controller_type" : "vive_tracker_camera"
-      },
-      {
-         "binding_url" : "application_generated_unity_vrcycling_exe_binding_vive_tracker_handed.json",
-         "controller_type" : "vive_tracker_handed"
-      }
-   ],
-   "localization" : [
-      {
-         "/actions/bikevr/in/MovePlayerBackward" : "MovePlayerBackward",
-         "/actions/bikevr/in/MovePlayerLeft" : "MovePlayerLeft",
-         "/actions/bikevr/in/MovePlayerModeSwitch" : "MovePlayerModeSwitch",
-         "/actions/bikevr/in/MovePlayerRight" : "MovePlayerRight",
-         "/actions/bikevr/in/ResetBikePosition" : "ResetBikePosition",
-         "/actions/bikevr/in/ResetPosition" : "ResetPosition",
-         "/actions/default/in/GrabGrip" : "Grab Grip",
-         "/actions/default/in/GrabPinch" : "Grab Pinch",
-         "/actions/default/in/HeadsetOnHead" : "Headset on head (proximity sensor)",
-         "/actions/default/in/InteractUI" : "Interact With UI",
-         "/actions/default/in/Pose" : "Pose",
-         "/actions/default/in/SkeletonLeftHand" : "Skeleton (Left)",
-         "/actions/default/in/SkeletonRightHand" : "Skeleton (Right)",
-         "/actions/default/in/SnapTurnLeft" : "Snap Turn (Left)",
-         "/actions/default/in/SnapTurnRight" : "Snap Turn (Right)",
-         "/actions/default/in/Teleport" : "Teleport",
-         "/actions/default/out/Haptic" : "Haptic",
-         "/actions/platformer/in/Jump" : "Jump",
-         "language_tag" : "en_US"
-      }
-   ]
-}
+  "actions": [
+    {
+      "name": "/actions/default/in/InteractUI",
+      "type": "boolean"
+    },
+    {
+      "name": "/actions/default/in/Teleport",
+      "type": "boolean"
+    },
+    {
+      "name": "/actions/default/in/GrabPinch",
+      "type": "boolean"
+    },
+    {
+      "name": "/actions/default/in/GrabGrip",
+      "type": "boolean"
+    },
+    {
+      "name": "/actions/default/in/Pose",
+      "type": "pose"
+    },
+    {
+      "name": "/actions/default/in/SkeletonLeftHand",
+      "type": "skeleton",
+      "skeleton": "/skeleton/hand/left"
+    },
+    {
+      "name": "/actions/default/in/SkeletonRightHand",
+      "type": "skeleton",
+      "skeleton": "/skeleton/hand/right"
+    },
+    {
+      "name": "/actions/default/in/Squeeze",
+      "type": "vector1",
+      "requirement": "optional"
+    },
+    {
+      "name": "/actions/default/in/HeadsetOnHead",
+      "type": "boolean",
+      "requirement": "optional"
+    },
+    {
+      "name": "/actions/default/in/SnapTurnLeft",
+      "type": "boolean",
+      "requirement": "suggested"
+    },
+    {
+      "name": "/actions/default/in/SnapTurnRight",
+      "type": "boolean"
+    },
+    {
+      "name": "/actions/default/out/Haptic",
+      "type": "vibration"
+    },
+    {
+      "name": "/actions/platformer/in/Move",
+      "type": "vector2"
+    },
+    {
+      "name": "/actions/platformer/in/Jump",
+      "type": "boolean"
+    },
+    {
+      "name": "/actions/buggy/in/Steering",
+      "type": "vector2"
+    },
+    {
+      "name": "/actions/buggy/in/Throttle",
+      "type": "vector1"
+    },
+    {
+      "name": "/actions/buggy/in/Brake",
+      "type": "boolean"
+    },
+    {
+      "name": "/actions/buggy/in/Reset",
+      "type": "boolean"
+    },
+    {
+      "name": "/actions/mixedreality/in/ExternalCamera",
+      "type": "pose",
+      "requirement": "optional"
+    },
+    {
+      "name": "/actions/bikevr/in/ResetPosition",
+      "type": "boolean",
+      "requirement": "mandatory"
+    },
+    {
+      "name": "/actions/bikevr/in/MovePlayerForward",
+      "type": "boolean",
+      "requirement": "mandatory"
+    },
+    {
+      "name": "/actions/bikevr/in/MovePlayerModeSwitch",
+      "type": "boolean"
+    },
+    {
+      "name": "/actions/bikevr/in/MovePlayerBackward",
+      "type": "boolean",
+      "requirement": "mandatory"
+    },
+    {
+      "name": "/actions/bikevr/in/MovePlayerLeft",
+      "type": "boolean",
+      "requirement": "mandatory"
+    },
+    {
+      "name": "/actions/bikevr/in/MovePlayerRight",
+      "type": "boolean",
+      "requirement": "mandatory"
+    },
+    {
+      "name": "/actions/bikevr/in/ResetBikePosition",
+      "type": "boolean"
+    },
+    {
+      "name": "/actions/bikevr/in/Steer",
+      "type": "pose",
+      "requirement": "optional"
+    }
+  ],
+  "action_sets": [
+    {
+      "name": "/actions/default",
+      "usage": "single"
+    },
+    {
+      "name": "/actions/platformer",
+      "usage": "single"
+    },
+    {
+      "name": "/actions/buggy",
+      "usage": "single"
+    },
+    {
+      "name": "/actions/mixedreality",
+      "usage": "single"
+    },
+    {
+      "name": "/actions/bikevr",
+      "usage": "single"
+    }
+  ],
+  "default_bindings": [
+    {
+      "controller_type": "vive_controller",
+      "binding_url": "bindings_vive_controller.json"
+    },
+    {
+      "controller_type": "oculus_touch",
+      "binding_url": "bindings_oculus_touch.json"
+    },
+    {
+      "controller_type": "knuckles",
+      "binding_url": "bindings_knuckles.json"
+    },
+    {
+      "controller_type": "holographic_controller",
+      "binding_url": "bindings_holographic_controller.json"
+    },
+    {
+      "controller_type": "vive_cosmos_controller",
+      "binding_url": "bindings_vive_cosmos_controller.json"
+    },
+    {
+      "controller_type": "logitech_stylus",
+      "binding_url": "bindings_logitech_stylus.json"
+    },
+    {
+      "controller_type": "vive_cosmos",
+      "binding_url": "binding_vive_cosmos.json"
+    },
+    {
+      "controller_type": "vive",
+      "binding_url": "binding_vive.json"
+    },
+    {
+      "controller_type": "indexhmd",
+      "binding_url": "binding_index_hmd.json"
+    },
+    {
+      "controller_type": "vive_pro",
+      "binding_url": "binding_vive_pro.json"
+    },
+    {
+      "controller_type": "rift",
+      "binding_url": "binding_rift.json"
+    },
+    {
+      "controller_type": "holographic_hmd",
+      "binding_url": "binding_holographic_hmd.json"
+    },
+    {
+      "controller_type": "vive_tracker_camera",
+      "binding_url": "binding_vive_tracker_camera.json"
+    },
+    {
+      "controller_type": "vive_tracker_handed",
+      "binding_url": "application_generated_unity_vrcycling_exe_binding_vive_tracker_handed.json"
+    }
+  ],
+  "localization": [
+    {
+      "language_tag": "en_US",
+      "/actions/bikevr/in/MovePlayerBackward": "MovePlayerBackward",
+      "/actions/bikevr/in/MovePlayerLeft": "MovePlayerLeft",
+      "/actions/bikevr/in/MovePlayerModeSwitch": "MovePlayerModeSwitch",
+      "/actions/bikevr/in/MovePlayerRight": "MovePlayerRight",
+      "/actions/bikevr/in/ResetBikePosition": "ResetBikePosition",
+      "/actions/bikevr/in/ResetPosition": "ResetPosition",
+      "/actions/default/in/GrabGrip": "Grab Grip",
+      "/actions/default/in/GrabPinch": "Grab Pinch",
+      "/actions/default/in/HeadsetOnHead": "Headset on head (proximity sensor)",
+      "/actions/default/in/InteractUI": "Interact With UI",
+      "/actions/default/in/Pose": "Pose",
+      "/actions/default/in/SkeletonLeftHand": "Skeleton (Left)",
+      "/actions/default/in/SkeletonRightHand": "Skeleton (Right)",
+      "/actions/default/in/SnapTurnLeft": "Snap Turn (Left)",
+      "/actions/default/in/SnapTurnRight": "Snap Turn (Right)",
+      "/actions/default/in/Teleport": "Teleport",
+      "/actions/default/out/Haptic": "Haptic",
+      "/actions/platformer/in/Jump": "Jump"
+    }
+  ]
+}

+ 1 - 1
Assets/StreamingAssets/SteamVR/application_generated_unity_vrcycling_exe_binding_vive_tracker_handed.json

@@ -414,7 +414,7 @@
    "category" : "steamvr_input",
    "controller_type" : "vive_tracker_handed",
    "description" : "",
-   "name" : "vive_controller",
+   "name" : "Saved [Testing] VR Cycling configuration for Vive Tracker in Hand",
    "options" : {},
    "simulated_actions" : []
 }

+ 24 - 24
SteamVR.csproj

@@ -12,7 +12,7 @@
     <ProductVersion>10.0.20506</ProductVersion>
     <SchemaVersion>2.0</SchemaVersion>
     <RootNamespace></RootNamespace>
-    <ProjectGuid>{84332faa-c693-3963-7224-30befa100592}</ProjectGuid>
+    <ProjectGuid>{259a7a3e-9eb0-03e2-f655-d32dfa897e25}</ProjectGuid>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <AssemblyName>SteamVR</AssemblyName>
@@ -246,16 +246,16 @@
      <None Include="Assets\SteamVR\SteamVR.asmdef" />
      <None Include="Assets\SteamVR\Resources\SteamVR_Fade.shader" />
  <Reference Include="Unity.XR.OpenVR">
- <HintPath>C:/Users/student/RiderProjects/VRCyling/Library/ScriptAssemblies/Unity.XR.OpenVR.dll</HintPath>
+ <HintPath>C:/Users/student/RiderProjects/VRCycling/Library/ScriptAssemblies/Unity.XR.OpenVR.dll</HintPath>
  </Reference>
  <Reference Include="UnityEngine.SpatialTracking">
- <HintPath>C:/Users/student/RiderProjects/VRCyling/Library/ScriptAssemblies/UnityEngine.SpatialTracking.dll</HintPath>
+ <HintPath>C:/Users/student/RiderProjects/VRCycling/Library/ScriptAssemblies/UnityEngine.SpatialTracking.dll</HintPath>
  </Reference>
  <Reference Include="UnityEditor.UI">
- <HintPath>C:/Users/student/RiderProjects/VRCyling/Library/ScriptAssemblies/UnityEditor.UI.dll</HintPath>
+ <HintPath>C:/Users/student/RiderProjects/VRCycling/Library/ScriptAssemblies/UnityEditor.UI.dll</HintPath>
  </Reference>
  <Reference Include="UnityEngine.UI">
- <HintPath>C:/Users/student/RiderProjects/VRCyling/Library/ScriptAssemblies/UnityEngine.UI.dll</HintPath>
+ <HintPath>C:/Users/student/RiderProjects/VRCycling/Library/ScriptAssemblies/UnityEngine.UI.dll</HintPath>
  </Reference>
  <Reference Include="UnityEngine">
  <HintPath>C:/Program Files/Unity/Hub/Editor/2020.1.12f1/Editor/Data/Managed/UnityEngine/UnityEngine.dll</HintPath>
@@ -453,58 +453,58 @@
  <HintPath>C:/Program Files/Unity/Hub/Editor/2020.1.12f1/Editor/Data/PlaybackEngines/WindowsStandaloneSupport/UnityEditor.WindowsStandalone.Extensions.dll</HintPath>
  </Reference>
  <Reference Include="DotNetZip">
- <HintPath>C:/Users/student/RiderProjects/VRCyling/Assets/NuGet/Editor/DotNetZip.dll</HintPath>
+ <HintPath>C:/Users/student/RiderProjects/VRCycling/Assets/NuGet/Editor/DotNetZip.dll</HintPath>
  </Reference>
  <Reference Include="NugetForUnity">
- <HintPath>C:/Users/student/RiderProjects/VRCyling/Assets/NuGet/Editor/NugetForUnity.dll</HintPath>
+ <HintPath>C:/Users/student/RiderProjects/VRCycling/Assets/NuGet/Editor/NugetForUnity.dll</HintPath>
  </Reference>
  <Reference Include="Common.Logging">
- <HintPath>C:/Users/student/RiderProjects/VRCyling/Assets/Packages/Common.Logging.3.4.1/lib/net40/Common.Logging.dll</HintPath>
+ <HintPath>C:/Users/student/RiderProjects/VRCycling/Assets/Packages/Common.Logging.3.4.1/lib/net40/Common.Logging.dll</HintPath>
  </Reference>
  <Reference Include="Common.Logging.Core">
- <HintPath>C:/Users/student/RiderProjects/VRCyling/Assets/Packages/Common.Logging.Core.3.4.1/lib/net40/Common.Logging.Core.dll</HintPath>
+ <HintPath>C:/Users/student/RiderProjects/VRCycling/Assets/Packages/Common.Logging.Core.3.4.1/lib/net40/Common.Logging.Core.dll</HintPath>
  </Reference>
  <Reference Include="System.Net.IPNetwork">
- <HintPath>C:/Users/student/RiderProjects/VRCyling/Assets/Packages/IPNetwork2.2.1.2/lib/net46/System.Net.IPNetwork.dll</HintPath>
+ <HintPath>C:/Users/student/RiderProjects/VRCycling/Assets/Packages/IPNetwork2.2.1.2/lib/net46/System.Net.IPNetwork.dll</HintPath>
  </Reference>
  <Reference Include="Makaretu.Dns">
- <HintPath>C:/Users/student/RiderProjects/VRCyling/Assets/Packages/Makaretu.Dns.2.0.1/lib/net45/Makaretu.Dns.dll</HintPath>
+ <HintPath>C:/Users/student/RiderProjects/VRCycling/Assets/Packages/Makaretu.Dns.2.0.1/lib/net45/Makaretu.Dns.dll</HintPath>
  </Reference>
  <Reference Include="Makaretu.Dns.Multicast">
- <HintPath>C:/Users/student/RiderProjects/VRCyling/Assets/Packages/Makaretu.Dns.Multicast.0.27.0/lib/net461/Makaretu.Dns.Multicast.dll</HintPath>
+ <HintPath>C:/Users/student/RiderProjects/VRCycling/Assets/Packages/Makaretu.Dns.Multicast.0.27.0/lib/net461/Makaretu.Dns.Multicast.dll</HintPath>
  </Reference>
  <Reference Include="MQTTnet">
- <HintPath>C:/Users/student/RiderProjects/VRCyling/Assets/Packages/MQTTnet.3.0.13/lib/net461/MQTTnet.dll</HintPath>
+ <HintPath>C:/Users/student/RiderProjects/VRCycling/Assets/Packages/MQTTnet.3.0.13/lib/net461/MQTTnet.dll</HintPath>
  </Reference>
  <Reference Include="SimpleBase">
- <HintPath>C:/Users/student/RiderProjects/VRCyling/Assets/Packages/SimpleBase.1.3.1/lib/net45/SimpleBase.dll</HintPath>
+ <HintPath>C:/Users/student/RiderProjects/VRCycling/Assets/Packages/SimpleBase.1.3.1/lib/net45/SimpleBase.dll</HintPath>
  </Reference>
  <Reference Include="System.Net.Security">
- <HintPath>C:/Users/student/RiderProjects/VRCyling/Assets/Packages/System.Net.Security.4.3.2/lib/net46/System.Net.Security.dll</HintPath>
+ <HintPath>C:/Users/student/RiderProjects/VRCycling/Assets/Packages/System.Net.Security.4.3.2/lib/net46/System.Net.Security.dll</HintPath>
  </Reference>
  <Reference Include="System.Net.WebSockets">
- <HintPath>C:/Users/student/RiderProjects/VRCyling/Assets/Packages/System.Net.WebSockets.4.3.0/lib/net46/System.Net.WebSockets.dll</HintPath>
+ <HintPath>C:/Users/student/RiderProjects/VRCycling/Assets/Packages/System.Net.WebSockets.4.3.0/lib/net46/System.Net.WebSockets.dll</HintPath>
  </Reference>
  <Reference Include="System.Net.WebSockets.Client">
- <HintPath>C:/Users/student/RiderProjects/VRCyling/Assets/Packages/System.Net.WebSockets.Client.4.3.2/lib/net46/System.Net.WebSockets.Client.dll</HintPath>
+ <HintPath>C:/Users/student/RiderProjects/VRCycling/Assets/Packages/System.Net.WebSockets.Client.4.3.2/lib/net46/System.Net.WebSockets.Client.dll</HintPath>
  </Reference>
  <Reference Include="System.Security.Cryptography.Algorithms">
- <HintPath>C:/Users/student/RiderProjects/VRCyling/Assets/Packages/System.Security.Cryptography.Algorithms.4.3.0/lib/net461/System.Security.Cryptography.Algorithms.dll</HintPath>
+ <HintPath>C:/Users/student/RiderProjects/VRCycling/Assets/Packages/System.Security.Cryptography.Algorithms.4.3.0/lib/net461/System.Security.Cryptography.Algorithms.dll</HintPath>
  </Reference>
  <Reference Include="System.Security.Cryptography.Encoding">
- <HintPath>C:/Users/student/RiderProjects/VRCyling/Assets/Packages/System.Security.Cryptography.Encoding.4.3.0/lib/net46/System.Security.Cryptography.Encoding.dll</HintPath>
+ <HintPath>C:/Users/student/RiderProjects/VRCycling/Assets/Packages/System.Security.Cryptography.Encoding.4.3.0/lib/net46/System.Security.Cryptography.Encoding.dll</HintPath>
  </Reference>
  <Reference Include="System.Security.Cryptography.Primitives">
- <HintPath>C:/Users/student/RiderProjects/VRCyling/Assets/Packages/System.Security.Cryptography.Primitives.4.3.0/lib/net46/System.Security.Cryptography.Primitives.dll</HintPath>
+ <HintPath>C:/Users/student/RiderProjects/VRCycling/Assets/Packages/System.Security.Cryptography.Primitives.4.3.0/lib/net46/System.Security.Cryptography.Primitives.dll</HintPath>
  </Reference>
  <Reference Include="System.Security.Cryptography.X509Certificates">
- <HintPath>C:/Users/student/RiderProjects/VRCyling/Assets/Packages/System.Security.Cryptography.X509Certificates.4.3.0/lib/net461/System.Security.Cryptography.X509Certificates.dll</HintPath>
+ <HintPath>C:/Users/student/RiderProjects/VRCycling/Assets/Packages/System.Security.Cryptography.X509Certificates.4.3.0/lib/net461/System.Security.Cryptography.X509Certificates.dll</HintPath>
  </Reference>
  <Reference Include="Valve.Newtonsoft.Json">
- <HintPath>C:/Users/student/RiderProjects/VRCyling/Assets/SteamVR/Input/Plugins/JSON.NET/Valve.Newtonsoft.Json.dll</HintPath>
+ <HintPath>C:/Users/student/RiderProjects/VRCycling/Assets/SteamVR/Input/Plugins/JSON.NET/Valve.Newtonsoft.Json.dll</HintPath>
  </Reference>
  <Reference Include="ICSharpCode.NRefactory">
- <HintPath>C:/Users/student/RiderProjects/VRCyling/Library/PackageCache/com.unity.render-pipelines.core@8.2.0/Editor/ShaderGenerator/ICSharpCode.NRefactory.dll</HintPath>
+ <HintPath>C:/Users/student/RiderProjects/VRCycling/Library/PackageCache/com.unity.render-pipelines.core@8.2.0/Editor/ShaderGenerator/ICSharpCode.NRefactory.dll</HintPath>
  </Reference>
  <Reference Include="mscorlib">
  <HintPath>C:/Program Files/Unity/Hub/Editor/2020.1.12f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/mscorlib.dll</HintPath>
@@ -854,7 +854,7 @@
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="SteamVR_Windows_EditorHelper.csproj">
-      <Project>{7f3aaf93-0e4d-b29d-6791-66b2405aeb3c}</Project>
+      <Project>{3bbc4234-2483-801b-57d4-0d103cb40967}</Project>
       <Name>SteamVR_Windows_EditorHelper</Name>
     </ProjectReference>
   </ItemGroup>

+ 28 - 28
SteamVR_Editor.csproj

@@ -12,7 +12,7 @@
     <ProductVersion>10.0.20506</ProductVersion>
     <SchemaVersion>2.0</SchemaVersion>
     <RootNamespace></RootNamespace>
-    <ProjectGuid>{a95c8a3e-61a4-b7ac-88cf-437458189db9}</ProjectGuid>
+    <ProjectGuid>{5a4588a7-6ca9-9e14-1a05-3af6bdbab82e}</ProjectGuid>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <AssemblyName>SteamVR_Editor</AssemblyName>
@@ -63,25 +63,25 @@
      <Compile Include="Assets\SteamVR\Editor\SteamVR_AutoEnableVR_2019plus.cs" />
      <None Include="Assets\SteamVR\Editor\SteamVR_Editor.asmdef" />
  <Reference Include="Unity.XR.OpenVR">
- <HintPath>C:/Users/student/RiderProjects/VRCyling/Library/ScriptAssemblies/Unity.XR.OpenVR.dll</HintPath>
+ <HintPath>C:/Users/student/RiderProjects/VRCycling/Library/ScriptAssemblies/Unity.XR.OpenVR.dll</HintPath>
  </Reference>
  <Reference Include="Unity.XR.Management.Editor">
- <HintPath>C:/Users/student/RiderProjects/VRCyling/Library/ScriptAssemblies/Unity.XR.Management.Editor.dll</HintPath>
+ <HintPath>C:/Users/student/RiderProjects/VRCycling/Library/ScriptAssemblies/Unity.XR.Management.Editor.dll</HintPath>
  </Reference>
  <Reference Include="Unity.XR.Management">
- <HintPath>C:/Users/student/RiderProjects/VRCyling/Library/ScriptAssemblies/Unity.XR.Management.dll</HintPath>
+ <HintPath>C:/Users/student/RiderProjects/VRCycling/Library/ScriptAssemblies/Unity.XR.Management.dll</HintPath>
  </Reference>
  <Reference Include="UnityEditor.UI">
- <HintPath>C:/Users/student/RiderProjects/VRCyling/Library/ScriptAssemblies/UnityEditor.UI.dll</HintPath>
+ <HintPath>C:/Users/student/RiderProjects/VRCycling/Library/ScriptAssemblies/UnityEditor.UI.dll</HintPath>
  </Reference>
  <Reference Include="UnityEngine.UI">
- <HintPath>C:/Users/student/RiderProjects/VRCyling/Library/ScriptAssemblies/UnityEngine.UI.dll</HintPath>
+ <HintPath>C:/Users/student/RiderProjects/VRCycling/Library/ScriptAssemblies/UnityEngine.UI.dll</HintPath>
  </Reference>
  <Reference Include="UnityEditor.TestRunner">
- <HintPath>C:/Users/student/RiderProjects/VRCyling/Library/ScriptAssemblies/UnityEditor.TestRunner.dll</HintPath>
+ <HintPath>C:/Users/student/RiderProjects/VRCycling/Library/ScriptAssemblies/UnityEditor.TestRunner.dll</HintPath>
  </Reference>
  <Reference Include="UnityEngine.TestRunner">
- <HintPath>C:/Users/student/RiderProjects/VRCyling/Library/ScriptAssemblies/UnityEngine.TestRunner.dll</HintPath>
+ <HintPath>C:/Users/student/RiderProjects/VRCycling/Library/ScriptAssemblies/UnityEngine.TestRunner.dll</HintPath>
  </Reference>
  <Reference Include="UnityEngine">
  <HintPath>C:/Program Files/Unity/Hub/Editor/2020.1.12f1/Editor/Data/Managed/UnityEngine/UnityEngine.dll</HintPath>
@@ -279,61 +279,61 @@
  <HintPath>C:/Program Files/Unity/Hub/Editor/2020.1.12f1/Editor/Data/PlaybackEngines/WindowsStandaloneSupport/UnityEditor.WindowsStandalone.Extensions.dll</HintPath>
  </Reference>
  <Reference Include="DotNetZip">
- <HintPath>C:/Users/student/RiderProjects/VRCyling/Assets/NuGet/Editor/DotNetZip.dll</HintPath>
+ <HintPath>C:/Users/student/RiderProjects/VRCycling/Assets/NuGet/Editor/DotNetZip.dll</HintPath>
  </Reference>
  <Reference Include="NugetForUnity">
- <HintPath>C:/Users/student/RiderProjects/VRCyling/Assets/NuGet/Editor/NugetForUnity.dll</HintPath>
+ <HintPath>C:/Users/student/RiderProjects/VRCycling/Assets/NuGet/Editor/NugetForUnity.dll</HintPath>
  </Reference>
  <Reference Include="Common.Logging">
- <HintPath>C:/Users/student/RiderProjects/VRCyling/Assets/Packages/Common.Logging.3.4.1/lib/net40/Common.Logging.dll</HintPath>
+ <HintPath>C:/Users/student/RiderProjects/VRCycling/Assets/Packages/Common.Logging.3.4.1/lib/net40/Common.Logging.dll</HintPath>
  </Reference>
  <Reference Include="Common.Logging.Core">
- <HintPath>C:/Users/student/RiderProjects/VRCyling/Assets/Packages/Common.Logging.Core.3.4.1/lib/net40/Common.Logging.Core.dll</HintPath>
+ <HintPath>C:/Users/student/RiderProjects/VRCycling/Assets/Packages/Common.Logging.Core.3.4.1/lib/net40/Common.Logging.Core.dll</HintPath>
  </Reference>
  <Reference Include="System.Net.IPNetwork">
- <HintPath>C:/Users/student/RiderProjects/VRCyling/Assets/Packages/IPNetwork2.2.1.2/lib/net46/System.Net.IPNetwork.dll</HintPath>
+ <HintPath>C:/Users/student/RiderProjects/VRCycling/Assets/Packages/IPNetwork2.2.1.2/lib/net46/System.Net.IPNetwork.dll</HintPath>
  </Reference>
  <Reference Include="Makaretu.Dns">
- <HintPath>C:/Users/student/RiderProjects/VRCyling/Assets/Packages/Makaretu.Dns.2.0.1/lib/net45/Makaretu.Dns.dll</HintPath>
+ <HintPath>C:/Users/student/RiderProjects/VRCycling/Assets/Packages/Makaretu.Dns.2.0.1/lib/net45/Makaretu.Dns.dll</HintPath>
  </Reference>
  <Reference Include="Makaretu.Dns.Multicast">
- <HintPath>C:/Users/student/RiderProjects/VRCyling/Assets/Packages/Makaretu.Dns.Multicast.0.27.0/lib/net461/Makaretu.Dns.Multicast.dll</HintPath>
+ <HintPath>C:/Users/student/RiderProjects/VRCycling/Assets/Packages/Makaretu.Dns.Multicast.0.27.0/lib/net461/Makaretu.Dns.Multicast.dll</HintPath>
  </Reference>
  <Reference Include="MQTTnet">
- <HintPath>C:/Users/student/RiderProjects/VRCyling/Assets/Packages/MQTTnet.3.0.13/lib/net461/MQTTnet.dll</HintPath>
+ <HintPath>C:/Users/student/RiderProjects/VRCycling/Assets/Packages/MQTTnet.3.0.13/lib/net461/MQTTnet.dll</HintPath>
  </Reference>
  <Reference Include="SimpleBase">
- <HintPath>C:/Users/student/RiderProjects/VRCyling/Assets/Packages/SimpleBase.1.3.1/lib/net45/SimpleBase.dll</HintPath>
+ <HintPath>C:/Users/student/RiderProjects/VRCycling/Assets/Packages/SimpleBase.1.3.1/lib/net45/SimpleBase.dll</HintPath>
  </Reference>
  <Reference Include="System.Net.Security">
- <HintPath>C:/Users/student/RiderProjects/VRCyling/Assets/Packages/System.Net.Security.4.3.2/lib/net46/System.Net.Security.dll</HintPath>
+ <HintPath>C:/Users/student/RiderProjects/VRCycling/Assets/Packages/System.Net.Security.4.3.2/lib/net46/System.Net.Security.dll</HintPath>
  </Reference>
  <Reference Include="System.Net.WebSockets">
- <HintPath>C:/Users/student/RiderProjects/VRCyling/Assets/Packages/System.Net.WebSockets.4.3.0/lib/net46/System.Net.WebSockets.dll</HintPath>
+ <HintPath>C:/Users/student/RiderProjects/VRCycling/Assets/Packages/System.Net.WebSockets.4.3.0/lib/net46/System.Net.WebSockets.dll</HintPath>
  </Reference>
  <Reference Include="System.Net.WebSockets.Client">
- <HintPath>C:/Users/student/RiderProjects/VRCyling/Assets/Packages/System.Net.WebSockets.Client.4.3.2/lib/net46/System.Net.WebSockets.Client.dll</HintPath>
+ <HintPath>C:/Users/student/RiderProjects/VRCycling/Assets/Packages/System.Net.WebSockets.Client.4.3.2/lib/net46/System.Net.WebSockets.Client.dll</HintPath>
  </Reference>
  <Reference Include="System.Security.Cryptography.Algorithms">
- <HintPath>C:/Users/student/RiderProjects/VRCyling/Assets/Packages/System.Security.Cryptography.Algorithms.4.3.0/lib/net461/System.Security.Cryptography.Algorithms.dll</HintPath>
+ <HintPath>C:/Users/student/RiderProjects/VRCycling/Assets/Packages/System.Security.Cryptography.Algorithms.4.3.0/lib/net461/System.Security.Cryptography.Algorithms.dll</HintPath>
  </Reference>
  <Reference Include="System.Security.Cryptography.Encoding">
- <HintPath>C:/Users/student/RiderProjects/VRCyling/Assets/Packages/System.Security.Cryptography.Encoding.4.3.0/lib/net46/System.Security.Cryptography.Encoding.dll</HintPath>
+ <HintPath>C:/Users/student/RiderProjects/VRCycling/Assets/Packages/System.Security.Cryptography.Encoding.4.3.0/lib/net46/System.Security.Cryptography.Encoding.dll</HintPath>
  </Reference>
  <Reference Include="System.Security.Cryptography.Primitives">
- <HintPath>C:/Users/student/RiderProjects/VRCyling/Assets/Packages/System.Security.Cryptography.Primitives.4.3.0/lib/net46/System.Security.Cryptography.Primitives.dll</HintPath>
+ <HintPath>C:/Users/student/RiderProjects/VRCycling/Assets/Packages/System.Security.Cryptography.Primitives.4.3.0/lib/net46/System.Security.Cryptography.Primitives.dll</HintPath>
  </Reference>
  <Reference Include="System.Security.Cryptography.X509Certificates">
- <HintPath>C:/Users/student/RiderProjects/VRCyling/Assets/Packages/System.Security.Cryptography.X509Certificates.4.3.0/lib/net461/System.Security.Cryptography.X509Certificates.dll</HintPath>
+ <HintPath>C:/Users/student/RiderProjects/VRCycling/Assets/Packages/System.Security.Cryptography.X509Certificates.4.3.0/lib/net461/System.Security.Cryptography.X509Certificates.dll</HintPath>
  </Reference>
  <Reference Include="Valve.Newtonsoft.Json">
- <HintPath>C:/Users/student/RiderProjects/VRCyling/Assets/SteamVR/Input/Plugins/JSON.NET/Valve.Newtonsoft.Json.dll</HintPath>
+ <HintPath>C:/Users/student/RiderProjects/VRCycling/Assets/SteamVR/Input/Plugins/JSON.NET/Valve.Newtonsoft.Json.dll</HintPath>
  </Reference>
  <Reference Include="ICSharpCode.NRefactory">
- <HintPath>C:/Users/student/RiderProjects/VRCyling/Library/PackageCache/com.unity.render-pipelines.core@8.2.0/Editor/ShaderGenerator/ICSharpCode.NRefactory.dll</HintPath>
+ <HintPath>C:/Users/student/RiderProjects/VRCycling/Library/PackageCache/com.unity.render-pipelines.core@8.2.0/Editor/ShaderGenerator/ICSharpCode.NRefactory.dll</HintPath>
  </Reference>
  <Reference Include="nunit.framework">
- <HintPath>C:/Users/student/RiderProjects/VRCyling/Library/PackageCache/com.unity.ext.nunit@1.0.6/net35/unity-custom/nunit.framework.dll</HintPath>
+ <HintPath>C:/Users/student/RiderProjects/VRCycling/Library/PackageCache/com.unity.ext.nunit@1.0.6/net35/unity-custom/nunit.framework.dll</HintPath>
  </Reference>
  <Reference Include="mscorlib">
  <HintPath>C:/Program Files/Unity/Hub/Editor/2020.1.12f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/mscorlib.dll</HintPath>
@@ -683,7 +683,7 @@
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="SteamVR.csproj">
-      <Project>{84332faa-c693-3963-7224-30befa100592}</Project>
+      <Project>{259a7a3e-9eb0-03e2-f655-d32dfa897e25}</Project>
       <Name>SteamVR</Name>
     </ProjectReference>
   </ItemGroup>

+ 26 - 26
SteamVR_Input_Editor.csproj

@@ -12,7 +12,7 @@
     <ProductVersion>10.0.20506</ProductVersion>
     <SchemaVersion>2.0</SchemaVersion>
     <RootNamespace></RootNamespace>
-    <ProjectGuid>{6b2d1554-301e-086a-b2f2-6a642758de58}</ProjectGuid>
+    <ProjectGuid>{5b8db92d-f7e8-ee2f-618e-ed5415d48641}</ProjectGuid>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <AssemblyName>SteamVR_Input_Editor</AssemblyName>
@@ -71,19 +71,19 @@
      <Compile Include="Assets\SteamVR\Input\Editor\SteamVR_Input_PostProcessBuild.cs" />
      <None Include="Assets\SteamVR\Input\Editor\SteamVR_Input_Editor.asmdef" />
  <Reference Include="Unity.XR.OpenVR">
- <HintPath>C:/Users/student/RiderProjects/VRCyling/Library/ScriptAssemblies/Unity.XR.OpenVR.dll</HintPath>
+ <HintPath>C:/Users/student/RiderProjects/VRCycling/Library/ScriptAssemblies/Unity.XR.OpenVR.dll</HintPath>
  </Reference>
  <Reference Include="UnityEditor.UI">
- <HintPath>C:/Users/student/RiderProjects/VRCyling/Library/ScriptAssemblies/UnityEditor.UI.dll</HintPath>
+ <HintPath>C:/Users/student/RiderProjects/VRCycling/Library/ScriptAssemblies/UnityEditor.UI.dll</HintPath>
  </Reference>
  <Reference Include="UnityEngine.UI">
- <HintPath>C:/Users/student/RiderProjects/VRCyling/Library/ScriptAssemblies/UnityEngine.UI.dll</HintPath>
+ <HintPath>C:/Users/student/RiderProjects/VRCycling/Library/ScriptAssemblies/UnityEngine.UI.dll</HintPath>
  </Reference>
  <Reference Include="UnityEditor.TestRunner">
- <HintPath>C:/Users/student/RiderProjects/VRCyling/Library/ScriptAssemblies/UnityEditor.TestRunner.dll</HintPath>
+ <HintPath>C:/Users/student/RiderProjects/VRCycling/Library/ScriptAssemblies/UnityEditor.TestRunner.dll</HintPath>
  </Reference>
  <Reference Include="UnityEngine.TestRunner">
- <HintPath>C:/Users/student/RiderProjects/VRCyling/Library/ScriptAssemblies/UnityEngine.TestRunner.dll</HintPath>
+ <HintPath>C:/Users/student/RiderProjects/VRCycling/Library/ScriptAssemblies/UnityEngine.TestRunner.dll</HintPath>
  </Reference>
  <Reference Include="UnityEngine">
  <HintPath>C:/Program Files/Unity/Hub/Editor/2020.1.12f1/Editor/Data/Managed/UnityEngine/UnityEngine.dll</HintPath>
@@ -281,61 +281,61 @@
  <HintPath>C:/Program Files/Unity/Hub/Editor/2020.1.12f1/Editor/Data/PlaybackEngines/WindowsStandaloneSupport/UnityEditor.WindowsStandalone.Extensions.dll</HintPath>
  </Reference>
  <Reference Include="DotNetZip">
- <HintPath>C:/Users/student/RiderProjects/VRCyling/Assets/NuGet/Editor/DotNetZip.dll</HintPath>
+ <HintPath>C:/Users/student/RiderProjects/VRCycling/Assets/NuGet/Editor/DotNetZip.dll</HintPath>
  </Reference>
  <Reference Include="NugetForUnity">
- <HintPath>C:/Users/student/RiderProjects/VRCyling/Assets/NuGet/Editor/NugetForUnity.dll</HintPath>
+ <HintPath>C:/Users/student/RiderProjects/VRCycling/Assets/NuGet/Editor/NugetForUnity.dll</HintPath>
  </Reference>
  <Reference Include="Common.Logging">
- <HintPath>C:/Users/student/RiderProjects/VRCyling/Assets/Packages/Common.Logging.3.4.1/lib/net40/Common.Logging.dll</HintPath>
+ <HintPath>C:/Users/student/RiderProjects/VRCycling/Assets/Packages/Common.Logging.3.4.1/lib/net40/Common.Logging.dll</HintPath>
  </Reference>
  <Reference Include="Common.Logging.Core">
- <HintPath>C:/Users/student/RiderProjects/VRCyling/Assets/Packages/Common.Logging.Core.3.4.1/lib/net40/Common.Logging.Core.dll</HintPath>
+ <HintPath>C:/Users/student/RiderProjects/VRCycling/Assets/Packages/Common.Logging.Core.3.4.1/lib/net40/Common.Logging.Core.dll</HintPath>
  </Reference>
  <Reference Include="System.Net.IPNetwork">
- <HintPath>C:/Users/student/RiderProjects/VRCyling/Assets/Packages/IPNetwork2.2.1.2/lib/net46/System.Net.IPNetwork.dll</HintPath>
+ <HintPath>C:/Users/student/RiderProjects/VRCycling/Assets/Packages/IPNetwork2.2.1.2/lib/net46/System.Net.IPNetwork.dll</HintPath>
  </Reference>
  <Reference Include="Makaretu.Dns">
- <HintPath>C:/Users/student/RiderProjects/VRCyling/Assets/Packages/Makaretu.Dns.2.0.1/lib/net45/Makaretu.Dns.dll</HintPath>
+ <HintPath>C:/Users/student/RiderProjects/VRCycling/Assets/Packages/Makaretu.Dns.2.0.1/lib/net45/Makaretu.Dns.dll</HintPath>
  </Reference>
  <Reference Include="Makaretu.Dns.Multicast">
- <HintPath>C:/Users/student/RiderProjects/VRCyling/Assets/Packages/Makaretu.Dns.Multicast.0.27.0/lib/net461/Makaretu.Dns.Multicast.dll</HintPath>
+ <HintPath>C:/Users/student/RiderProjects/VRCycling/Assets/Packages/Makaretu.Dns.Multicast.0.27.0/lib/net461/Makaretu.Dns.Multicast.dll</HintPath>
  </Reference>
  <Reference Include="MQTTnet">
- <HintPath>C:/Users/student/RiderProjects/VRCyling/Assets/Packages/MQTTnet.3.0.13/lib/net461/MQTTnet.dll</HintPath>
+ <HintPath>C:/Users/student/RiderProjects/VRCycling/Assets/Packages/MQTTnet.3.0.13/lib/net461/MQTTnet.dll</HintPath>
  </Reference>
  <Reference Include="SimpleBase">
- <HintPath>C:/Users/student/RiderProjects/VRCyling/Assets/Packages/SimpleBase.1.3.1/lib/net45/SimpleBase.dll</HintPath>
+ <HintPath>C:/Users/student/RiderProjects/VRCycling/Assets/Packages/SimpleBase.1.3.1/lib/net45/SimpleBase.dll</HintPath>
  </Reference>
  <Reference Include="System.Net.Security">
- <HintPath>C:/Users/student/RiderProjects/VRCyling/Assets/Packages/System.Net.Security.4.3.2/lib/net46/System.Net.Security.dll</HintPath>
+ <HintPath>C:/Users/student/RiderProjects/VRCycling/Assets/Packages/System.Net.Security.4.3.2/lib/net46/System.Net.Security.dll</HintPath>
  </Reference>
  <Reference Include="System.Net.WebSockets">
- <HintPath>C:/Users/student/RiderProjects/VRCyling/Assets/Packages/System.Net.WebSockets.4.3.0/lib/net46/System.Net.WebSockets.dll</HintPath>
+ <HintPath>C:/Users/student/RiderProjects/VRCycling/Assets/Packages/System.Net.WebSockets.4.3.0/lib/net46/System.Net.WebSockets.dll</HintPath>
  </Reference>
  <Reference Include="System.Net.WebSockets.Client">
- <HintPath>C:/Users/student/RiderProjects/VRCyling/Assets/Packages/System.Net.WebSockets.Client.4.3.2/lib/net46/System.Net.WebSockets.Client.dll</HintPath>
+ <HintPath>C:/Users/student/RiderProjects/VRCycling/Assets/Packages/System.Net.WebSockets.Client.4.3.2/lib/net46/System.Net.WebSockets.Client.dll</HintPath>
  </Reference>
  <Reference Include="System.Security.Cryptography.Algorithms">
- <HintPath>C:/Users/student/RiderProjects/VRCyling/Assets/Packages/System.Security.Cryptography.Algorithms.4.3.0/lib/net461/System.Security.Cryptography.Algorithms.dll</HintPath>
+ <HintPath>C:/Users/student/RiderProjects/VRCycling/Assets/Packages/System.Security.Cryptography.Algorithms.4.3.0/lib/net461/System.Security.Cryptography.Algorithms.dll</HintPath>
  </Reference>
  <Reference Include="System.Security.Cryptography.Encoding">
- <HintPath>C:/Users/student/RiderProjects/VRCyling/Assets/Packages/System.Security.Cryptography.Encoding.4.3.0/lib/net46/System.Security.Cryptography.Encoding.dll</HintPath>
+ <HintPath>C:/Users/student/RiderProjects/VRCycling/Assets/Packages/System.Security.Cryptography.Encoding.4.3.0/lib/net46/System.Security.Cryptography.Encoding.dll</HintPath>
  </Reference>
  <Reference Include="System.Security.Cryptography.Primitives">
- <HintPath>C:/Users/student/RiderProjects/VRCyling/Assets/Packages/System.Security.Cryptography.Primitives.4.3.0/lib/net46/System.Security.Cryptography.Primitives.dll</HintPath>
+ <HintPath>C:/Users/student/RiderProjects/VRCycling/Assets/Packages/System.Security.Cryptography.Primitives.4.3.0/lib/net46/System.Security.Cryptography.Primitives.dll</HintPath>
  </Reference>
  <Reference Include="System.Security.Cryptography.X509Certificates">
- <HintPath>C:/Users/student/RiderProjects/VRCyling/Assets/Packages/System.Security.Cryptography.X509Certificates.4.3.0/lib/net461/System.Security.Cryptography.X509Certificates.dll</HintPath>
+ <HintPath>C:/Users/student/RiderProjects/VRCycling/Assets/Packages/System.Security.Cryptography.X509Certificates.4.3.0/lib/net461/System.Security.Cryptography.X509Certificates.dll</HintPath>
  </Reference>
  <Reference Include="Valve.Newtonsoft.Json">
- <HintPath>C:/Users/student/RiderProjects/VRCyling/Assets/SteamVR/Input/Plugins/JSON.NET/Valve.Newtonsoft.Json.dll</HintPath>
+ <HintPath>C:/Users/student/RiderProjects/VRCycling/Assets/SteamVR/Input/Plugins/JSON.NET/Valve.Newtonsoft.Json.dll</HintPath>
  </Reference>
  <Reference Include="ICSharpCode.NRefactory">
- <HintPath>C:/Users/student/RiderProjects/VRCyling/Library/PackageCache/com.unity.render-pipelines.core@8.2.0/Editor/ShaderGenerator/ICSharpCode.NRefactory.dll</HintPath>
+ <HintPath>C:/Users/student/RiderProjects/VRCycling/Library/PackageCache/com.unity.render-pipelines.core@8.2.0/Editor/ShaderGenerator/ICSharpCode.NRefactory.dll</HintPath>
  </Reference>
  <Reference Include="nunit.framework">
- <HintPath>C:/Users/student/RiderProjects/VRCyling/Library/PackageCache/com.unity.ext.nunit@1.0.6/net35/unity-custom/nunit.framework.dll</HintPath>
+ <HintPath>C:/Users/student/RiderProjects/VRCycling/Library/PackageCache/com.unity.ext.nunit@1.0.6/net35/unity-custom/nunit.framework.dll</HintPath>
  </Reference>
  <Reference Include="mscorlib">
  <HintPath>C:/Program Files/Unity/Hub/Editor/2020.1.12f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/mscorlib.dll</HintPath>
@@ -685,7 +685,7 @@
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="SteamVR.csproj">
-      <Project>{84332faa-c693-3963-7224-30befa100592}</Project>
+      <Project>{259a7a3e-9eb0-03e2-f655-d32dfa897e25}</Project>
       <Name>SteamVR</Name>
     </ProjectReference>
   </ItemGroup>

+ 24 - 24
SteamVR_Windows_EditorHelper.csproj

@@ -12,7 +12,7 @@
     <ProductVersion>10.0.20506</ProductVersion>
     <SchemaVersion>2.0</SchemaVersion>
     <RootNamespace></RootNamespace>
-    <ProjectGuid>{7f3aaf93-0e4d-b29d-6791-66b2405aeb3c}</ProjectGuid>
+    <ProjectGuid>{3bbc4234-2483-801b-57d4-0d103cb40967}</ProjectGuid>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <AssemblyName>SteamVR_Windows_EditorHelper</AssemblyName>
@@ -53,16 +53,16 @@
      <Compile Include="Assets\SteamVR\WindowsHelper\SteamVR_Windows_Editor_Helper.cs" />
      <None Include="Assets\SteamVR\WindowsHelper\SteamVR_Windows_EditorHelper.asmdef" />
  <Reference Include="UnityEditor.UI">
- <HintPath>C:/Users/student/RiderProjects/VRCyling/Library/ScriptAssemblies/UnityEditor.UI.dll</HintPath>
+ <HintPath>C:/Users/student/RiderProjects/VRCycling/Library/ScriptAssemblies/UnityEditor.UI.dll</HintPath>
  </Reference>
  <Reference Include="UnityEngine.UI">
- <HintPath>C:/Users/student/RiderProjects/VRCyling/Library/ScriptAssemblies/UnityEngine.UI.dll</HintPath>
+ <HintPath>C:/Users/student/RiderProjects/VRCycling/Library/ScriptAssemblies/UnityEngine.UI.dll</HintPath>
  </Reference>
  <Reference Include="UnityEditor.TestRunner">
- <HintPath>C:/Users/student/RiderProjects/VRCyling/Library/ScriptAssemblies/UnityEditor.TestRunner.dll</HintPath>
+ <HintPath>C:/Users/student/RiderProjects/VRCycling/Library/ScriptAssemblies/UnityEditor.TestRunner.dll</HintPath>
  </Reference>
  <Reference Include="UnityEngine.TestRunner">
- <HintPath>C:/Users/student/RiderProjects/VRCyling/Library/ScriptAssemblies/UnityEngine.TestRunner.dll</HintPath>
+ <HintPath>C:/Users/student/RiderProjects/VRCycling/Library/ScriptAssemblies/UnityEngine.TestRunner.dll</HintPath>
  </Reference>
  <Reference Include="UnityEngine">
  <HintPath>C:/Program Files/Unity/Hub/Editor/2020.1.12f1/Editor/Data/Managed/UnityEngine/UnityEngine.dll</HintPath>
@@ -260,61 +260,61 @@
  <HintPath>C:/Program Files/Unity/Hub/Editor/2020.1.12f1/Editor/Data/PlaybackEngines/WindowsStandaloneSupport/UnityEditor.WindowsStandalone.Extensions.dll</HintPath>
  </Reference>
  <Reference Include="DotNetZip">
- <HintPath>C:/Users/student/RiderProjects/VRCyling/Assets/NuGet/Editor/DotNetZip.dll</HintPath>
+ <HintPath>C:/Users/student/RiderProjects/VRCycling/Assets/NuGet/Editor/DotNetZip.dll</HintPath>
  </Reference>
  <Reference Include="NugetForUnity">
- <HintPath>C:/Users/student/RiderProjects/VRCyling/Assets/NuGet/Editor/NugetForUnity.dll</HintPath>
+ <HintPath>C:/Users/student/RiderProjects/VRCycling/Assets/NuGet/Editor/NugetForUnity.dll</HintPath>
  </Reference>
  <Reference Include="Common.Logging">
- <HintPath>C:/Users/student/RiderProjects/VRCyling/Assets/Packages/Common.Logging.3.4.1/lib/net40/Common.Logging.dll</HintPath>
+ <HintPath>C:/Users/student/RiderProjects/VRCycling/Assets/Packages/Common.Logging.3.4.1/lib/net40/Common.Logging.dll</HintPath>
  </Reference>
  <Reference Include="Common.Logging.Core">
- <HintPath>C:/Users/student/RiderProjects/VRCyling/Assets/Packages/Common.Logging.Core.3.4.1/lib/net40/Common.Logging.Core.dll</HintPath>
+ <HintPath>C:/Users/student/RiderProjects/VRCycling/Assets/Packages/Common.Logging.Core.3.4.1/lib/net40/Common.Logging.Core.dll</HintPath>
  </Reference>
  <Reference Include="System.Net.IPNetwork">
- <HintPath>C:/Users/student/RiderProjects/VRCyling/Assets/Packages/IPNetwork2.2.1.2/lib/net46/System.Net.IPNetwork.dll</HintPath>
+ <HintPath>C:/Users/student/RiderProjects/VRCycling/Assets/Packages/IPNetwork2.2.1.2/lib/net46/System.Net.IPNetwork.dll</HintPath>
  </Reference>
  <Reference Include="Makaretu.Dns">
- <HintPath>C:/Users/student/RiderProjects/VRCyling/Assets/Packages/Makaretu.Dns.2.0.1/lib/net45/Makaretu.Dns.dll</HintPath>
+ <HintPath>C:/Users/student/RiderProjects/VRCycling/Assets/Packages/Makaretu.Dns.2.0.1/lib/net45/Makaretu.Dns.dll</HintPath>
  </Reference>
  <Reference Include="Makaretu.Dns.Multicast">
- <HintPath>C:/Users/student/RiderProjects/VRCyling/Assets/Packages/Makaretu.Dns.Multicast.0.27.0/lib/net461/Makaretu.Dns.Multicast.dll</HintPath>
+ <HintPath>C:/Users/student/RiderProjects/VRCycling/Assets/Packages/Makaretu.Dns.Multicast.0.27.0/lib/net461/Makaretu.Dns.Multicast.dll</HintPath>
  </Reference>
  <Reference Include="MQTTnet">
- <HintPath>C:/Users/student/RiderProjects/VRCyling/Assets/Packages/MQTTnet.3.0.13/lib/net461/MQTTnet.dll</HintPath>
+ <HintPath>C:/Users/student/RiderProjects/VRCycling/Assets/Packages/MQTTnet.3.0.13/lib/net461/MQTTnet.dll</HintPath>
  </Reference>
  <Reference Include="SimpleBase">
- <HintPath>C:/Users/student/RiderProjects/VRCyling/Assets/Packages/SimpleBase.1.3.1/lib/net45/SimpleBase.dll</HintPath>
+ <HintPath>C:/Users/student/RiderProjects/VRCycling/Assets/Packages/SimpleBase.1.3.1/lib/net45/SimpleBase.dll</HintPath>
  </Reference>
  <Reference Include="System.Net.Security">
- <HintPath>C:/Users/student/RiderProjects/VRCyling/Assets/Packages/System.Net.Security.4.3.2/lib/net46/System.Net.Security.dll</HintPath>
+ <HintPath>C:/Users/student/RiderProjects/VRCycling/Assets/Packages/System.Net.Security.4.3.2/lib/net46/System.Net.Security.dll</HintPath>
  </Reference>
  <Reference Include="System.Net.WebSockets">
- <HintPath>C:/Users/student/RiderProjects/VRCyling/Assets/Packages/System.Net.WebSockets.4.3.0/lib/net46/System.Net.WebSockets.dll</HintPath>
+ <HintPath>C:/Users/student/RiderProjects/VRCycling/Assets/Packages/System.Net.WebSockets.4.3.0/lib/net46/System.Net.WebSockets.dll</HintPath>
  </Reference>
  <Reference Include="System.Net.WebSockets.Client">
- <HintPath>C:/Users/student/RiderProjects/VRCyling/Assets/Packages/System.Net.WebSockets.Client.4.3.2/lib/net46/System.Net.WebSockets.Client.dll</HintPath>
+ <HintPath>C:/Users/student/RiderProjects/VRCycling/Assets/Packages/System.Net.WebSockets.Client.4.3.2/lib/net46/System.Net.WebSockets.Client.dll</HintPath>
  </Reference>
  <Reference Include="System.Security.Cryptography.Algorithms">
- <HintPath>C:/Users/student/RiderProjects/VRCyling/Assets/Packages/System.Security.Cryptography.Algorithms.4.3.0/lib/net461/System.Security.Cryptography.Algorithms.dll</HintPath>
+ <HintPath>C:/Users/student/RiderProjects/VRCycling/Assets/Packages/System.Security.Cryptography.Algorithms.4.3.0/lib/net461/System.Security.Cryptography.Algorithms.dll</HintPath>
  </Reference>
  <Reference Include="System.Security.Cryptography.Encoding">
- <HintPath>C:/Users/student/RiderProjects/VRCyling/Assets/Packages/System.Security.Cryptography.Encoding.4.3.0/lib/net46/System.Security.Cryptography.Encoding.dll</HintPath>
+ <HintPath>C:/Users/student/RiderProjects/VRCycling/Assets/Packages/System.Security.Cryptography.Encoding.4.3.0/lib/net46/System.Security.Cryptography.Encoding.dll</HintPath>
  </Reference>
  <Reference Include="System.Security.Cryptography.Primitives">
- <HintPath>C:/Users/student/RiderProjects/VRCyling/Assets/Packages/System.Security.Cryptography.Primitives.4.3.0/lib/net46/System.Security.Cryptography.Primitives.dll</HintPath>
+ <HintPath>C:/Users/student/RiderProjects/VRCycling/Assets/Packages/System.Security.Cryptography.Primitives.4.3.0/lib/net46/System.Security.Cryptography.Primitives.dll</HintPath>
  </Reference>
  <Reference Include="System.Security.Cryptography.X509Certificates">
- <HintPath>C:/Users/student/RiderProjects/VRCyling/Assets/Packages/System.Security.Cryptography.X509Certificates.4.3.0/lib/net461/System.Security.Cryptography.X509Certificates.dll</HintPath>
+ <HintPath>C:/Users/student/RiderProjects/VRCycling/Assets/Packages/System.Security.Cryptography.X509Certificates.4.3.0/lib/net461/System.Security.Cryptography.X509Certificates.dll</HintPath>
  </Reference>
  <Reference Include="Valve.Newtonsoft.Json">
- <HintPath>C:/Users/student/RiderProjects/VRCyling/Assets/SteamVR/Input/Plugins/JSON.NET/Valve.Newtonsoft.Json.dll</HintPath>
+ <HintPath>C:/Users/student/RiderProjects/VRCycling/Assets/SteamVR/Input/Plugins/JSON.NET/Valve.Newtonsoft.Json.dll</HintPath>
  </Reference>
  <Reference Include="ICSharpCode.NRefactory">
- <HintPath>C:/Users/student/RiderProjects/VRCyling/Library/PackageCache/com.unity.render-pipelines.core@8.2.0/Editor/ShaderGenerator/ICSharpCode.NRefactory.dll</HintPath>
+ <HintPath>C:/Users/student/RiderProjects/VRCycling/Library/PackageCache/com.unity.render-pipelines.core@8.2.0/Editor/ShaderGenerator/ICSharpCode.NRefactory.dll</HintPath>
  </Reference>
  <Reference Include="nunit.framework">
- <HintPath>C:/Users/student/RiderProjects/VRCyling/Library/PackageCache/com.unity.ext.nunit@1.0.6/net35/unity-custom/nunit.framework.dll</HintPath>
+ <HintPath>C:/Users/student/RiderProjects/VRCycling/Library/PackageCache/com.unity.ext.nunit@1.0.6/net35/unity-custom/nunit.framework.dll</HintPath>
  </Reference>
  <Reference Include="mscorlib">
  <HintPath>C:/Program Files/Unity/Hub/Editor/2020.1.12f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/mscorlib.dll</HintPath>

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


+ 1 - 1
unityProject.vrmanifest

@@ -5,7 +5,7 @@
       "app_key": "application.generated.unity.vrcycling.exe",
       "launch_type": "url",
       "url": "steam://launch/",
-      "action_manifest_path": "C:\\Users\\student\\RiderProjects\\VRCyling\\Assets\\StreamingAssets\\SteamVR\\actions.json",
+      "action_manifest_path": "C:\\Users\\student\\RiderProjects\\VRCycling\\Assets\\StreamingAssets\\SteamVR\\actions.json",
       "strings": {
         "en_us": {
           "name": "VR Cycling [Testing]"

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