Browse Source

Rest Frame Positioning

Marcel Zickler 3 years ago
parent
commit
acbb1501e7

+ 0 - 153
.idea/.idea.VRCyling/.idea/contentModel.xml

@@ -218,12 +218,6 @@
               </e>
               <e p="FitTest.cs" t="Include" />
               <e p="License.txt" t="Include" />
-              <e p="x64" t="Include">
-                <e p="ANT_WrappedLib.dll" t="Include" />
-              </e>
-              <e p="x86" t="Include">
-                <e p="ANT_WrappedLib.dll" t="Include" />
-              </e>
             </e>
           </e>
           <e p="Scripts" t="Include">
@@ -430,148 +424,60 @@
               <e p="SimplePlayerController.cs" t="Include" />
               <e p="TwinCameraEyePatcher.cs" t="Include" />
             </e>
-            <e p="MiscScripts.meta" t="Include" />
-            <e p="Models" t="Include">
-              <e p="HorizontalNose.prefab" t="Include" />
-              <e p="HorizontalNose.prefab.meta" t="Include" />
-              <e p="nose 1.obj" t="Include" />
-              <e p="nose 1.obj.meta" t="Include" />
-              <e p="nose.obj" t="Include" />
-              <e p="nose.obj.meta" t="Include" />
-              <e p="nose2.obj" t="Include" />
-              <e p="nose2.obj.meta" t="Include" />
-              <e p="nose3.obj" t="Include" />
-              <e p="nose3.obj.meta" t="Include" />
-            </e>
-            <e p="Models.meta" t="Include" />
-            <e p="Sprites" t="Include">
-              <e p="Checker.mat" t="Include" />
-              <e p="Checker.mat.meta" t="Include" />
-              <e p="checker.png" t="Include" />
-              <e p="checker.png.meta" t="Include" />
-            </e>
-            <e p="Sprites.meta" t="Include" />
-            <e p="Utilities" t="Include">
-              <e p="Tools" t="Include">
-                <e p="FOVUtility.prefab" t="Include" />
-                <e p="FOVUtility.prefab.meta" t="Include" />
-                <e p="SicknessSphere.prefab" t="Include" />
-                <e p="SicknessSphere.prefab.meta" t="Include" />
-              </e>
-              <e p="Tools.meta" t="Include" />
-            </e>
-            <e p="Utilities.meta" t="Include" />
           </e>
           <e p="Liscense" t="Include">
             <e p="Liscense.txt.txt" t="Include" />
           </e>
-          <e p="README.md" t="Include" />
           <e p="SicknessReductionTechniques" t="Include">
             <e p="AuthenticNose" t="Include">
               <e p="AuthenticNose.cs" t="Include" />
             </e>
-            <e p="AuthenticNose.meta" t="Include" />
-            <e p="Construction" t="Include">
-              <e p="Materials" t="Include">
-                <e p="vignette.mat" t="Include" />
-                <e p="vignette.mat.meta" t="Include" />
-              </e>
-              <e p="Materials.meta" t="Include" />
-              <e p="vignette.png" t="Include" />
-              <e p="vignette.png.meta" t="Include" />
-              <e p="VignetteFOV.prefab" t="Include" />
-              <e p="VignetteFOV.prefab.meta" t="Include" />
-            </e>
-            <e p="Construction.meta" t="Include" />
             <e p="DotEffect" t="Include">
               <e p="DotEffect.cs" t="Include" />
             </e>
-            <e p="DotEffect.meta" t="Include" />
             <e p="DynamicColorBlur" t="Include">
               <e p="DynamicColorBlur.cs" t="Include" />
               <e p="SaliencyBlur.shader" t="Include" />
             </e>
-            <e p="DynamicColorBlur.meta" t="Include" />
             <e p="DynamicFOVFilter" t="Include">
               <e p="DynamicFOVFilter.cs" t="Include" />
             </e>
-            <e p="DynamicFOVFilter.meta" t="Include" />
             <e p="DynamicGaussianBlur" t="Include">
               <e p="DynamicGaussianBlur.cs" t="Include" />
               <e p="GaussianBlur.shader" t="Include" />
             </e>
-            <e p="DynamicGaussianBlur.meta" t="Include" />
             <e p="Legacy" t="Include">
               <e p="DynamicFOV" t="Include">
                 <e p="CircleEffect.shader" t="Include" />
                 <e p="DynamicFOV.cs" t="Include" />
               </e>
             </e>
-            <e p="Legacy.meta" t="Include" />
             <e p="SingleNose" t="Include">
               <e p="SingleNose.cs" t="Include" />
             </e>
-            <e p="SingleNose.meta" t="Include" />
-            <e p="VirtualCAVE" t="Include">
-              <e p="CaveMaterial.mat" t="Include" />
-              <e p="CaveMaterial.mat.meta" t="Include" />
-              <e p="VirtualCAVE.prefab" t="Include" />
-              <e p="VirtualCAVE.prefab.meta" t="Include" />
-            </e>
-            <e p="VirtualCAVE.meta" t="Include" />
             <e p="VisionLock" t="Include">
               <e p="VisionLock.cs" t="Include" />
             </e>
-            <e p="VisionLock.meta" t="Include" />
             <e p="VisionSnapper" t="Include">
               <e p="HeadSnapperShader.shader" t="Include" />
               <e p="VisionSnapper.cs" t="Include" />
             </e>
-            <e p="VisionSnapper.meta" t="Include" />
-            <e p="WireBox" t="Include">
-              <e p="Wire.mat" t="Include" />
-              <e p="Wire.mat.meta" t="Include" />
-            </e>
-            <e p="WireBox.meta" t="Include" />
           </e>
         </e>
         <e p="InputActions" t="Include">
           <e p="InputMaster.cs" t="Include" />
         </e>
-        <e p="NuGet" t="Include">
-          <e p="Editor" t="Include">
-            <e p="DotNetZip.dll" t="Include" />
-            <e p="NugetForUnity.dll" t="Include" />
-          </e>
-        </e>
         <e p="Packages" t="Include">
           <e p="Common.Logging.3.4.1" t="Include">
             <e p="lib" t="Include">
               <e p="net40" t="Include">
-                <e p="Common.Logging.dll" t="Include" />
                 <e p="Common.Logging.xml" t="Include" />
               </e>
             </e>
           </e>
-          <e p="Common.Logging.Core.3.4.1" t="Include">
-            <e p="lib" t="Include">
-              <e p="net40" t="Include">
-                <e p="Common.Logging.Core.dll" t="Include" />
-                <e p="Common.Logging.Core.XML" t="Include" />
-              </e>
-            </e>
-          </e>
-          <e p="IPNetwork2.2.1.2" t="Include">
-            <e p="lib" t="Include">
-              <e p="net46" t="Include">
-                <e p="System.Net.IPNetwork.dll" t="Include" />
-              </e>
-            </e>
-          </e>
           <e p="Makaretu.Dns.2.0.1" t="Include">
             <e p="lib" t="Include">
               <e p="net45" t="Include">
-                <e p="Makaretu.Dns.dll" t="Include" />
                 <e p="Makaretu.Dns.xml" t="Include" />
               </e>
             </e>
@@ -579,7 +485,6 @@
           <e p="Makaretu.Dns.Multicast.0.27.0" t="Include">
             <e p="lib" t="Include">
               <e p="net461" t="Include">
-                <e p="Makaretu.Dns.Multicast.dll" t="Include" />
                 <e p="Makaretu.Dns.Multicast.xml" t="Include" />
               </e>
             </e>
@@ -592,85 +497,32 @@
             <e p="dotnet_library_license.txt" t="Include" />
             <e p="ThirdPartyNotices.txt" t="Include" />
           </e>
-          <e p="MQTTnet.3.0.13" t="Include">
-            <e p="lib" t="Include">
-              <e p="net461" t="Include">
-                <e p="MQTTnet.dll" t="Include" />
-              </e>
-            </e>
-          </e>
-          <e p="NETStandard.Library.2.0.0" t="Include">
-            <e p="License.txt" t="Include" />
-            <e p="THIRD-PARTY-NOTICES.TXT" t="Include" />
-          </e>
-          <e p="SimpleBase.1.3.1" t="Include">
-            <e p="lib" t="Include">
-              <e p="net45" t="Include">
-                <e p="SimpleBase.dll" t="Include" />
-              </e>
-            </e>
-          </e>
           <e p="System.Net.Security.4.3.2" t="Include">
             <e p="dotnet_library_license.txt" t="Include" />
-            <e p="lib" t="Include">
-              <e p="net46" t="Include">
-                <e p="System.Net.Security.dll" t="Include" />
-              </e>
-            </e>
             <e p="ThirdPartyNotices.txt" t="Include" />
           </e>
           <e p="System.Net.WebSockets.4.3.0" t="Include">
             <e p="dotnet_library_license.txt" t="Include" />
-            <e p="lib" t="Include">
-              <e p="net46" t="Include">
-                <e p="System.Net.WebSockets.dll" t="Include" />
-              </e>
-            </e>
             <e p="ThirdPartyNotices.txt" t="Include" />
           </e>
           <e p="System.Net.WebSockets.Client.4.3.2" t="Include">
             <e p="dotnet_library_license.txt" t="Include" />
-            <e p="lib" t="Include">
-              <e p="net46" t="Include">
-                <e p="System.Net.WebSockets.Client.dll" t="Include" />
-              </e>
-            </e>
             <e p="ThirdPartyNotices.txt" t="Include" />
           </e>
           <e p="System.Security.Cryptography.Algorithms.4.3.0" t="Include">
             <e p="dotnet_library_license.txt" t="Include" />
-            <e p="lib" t="Include">
-              <e p="net461" t="Include">
-                <e p="System.Security.Cryptography.Algorithms.dll" t="Include" />
-              </e>
-            </e>
             <e p="ThirdPartyNotices.txt" t="Include" />
           </e>
           <e p="System.Security.Cryptography.Encoding.4.3.0" t="Include">
             <e p="dotnet_library_license.txt" t="Include" />
-            <e p="lib" t="Include">
-              <e p="net46" t="Include">
-                <e p="System.Security.Cryptography.Encoding.dll" t="Include" />
-              </e>
-            </e>
             <e p="ThirdPartyNotices.txt" t="Include" />
           </e>
           <e p="System.Security.Cryptography.Primitives.4.3.0" t="Include">
             <e p="dotnet_library_license.txt" t="Include" />
-            <e p="lib" t="Include">
-              <e p="net46" t="Include">
-                <e p="System.Security.Cryptography.Primitives.dll" t="Include" />
-              </e>
-            </e>
             <e p="ThirdPartyNotices.txt" t="Include" />
           </e>
           <e p="System.Security.Cryptography.X509Certificates.4.3.0" t="Include">
             <e p="dotnet_library_license.txt" t="Include" />
-            <e p="lib" t="Include">
-              <e p="net461" t="Include">
-                <e p="System.Security.Cryptography.X509Certificates.dll" t="Include" />
-              </e>
-            </e>
             <e p="ThirdPartyNotices.txt" t="Include" />
           </e>
         </e>
@@ -1138,11 +990,6 @@
               <e p="SteamVR_Input_PostProcessBuild.cs" t="Include" />
               <e p="SteamVR_Skeleton_PoserEditor.cs" t="Include" />
             </e>
-            <e p="Plugins" t="Include">
-              <e p="JSON.NET" t="Include">
-                <e p="Valve.Newtonsoft.Json.dll" t="Include" />
-              </e>
-            </e>
             <e p="SteamVR_Action.cs" t="Include" />
             <e p="SteamVR_Action_Boolean.cs" t="Include" />
             <e p="SteamVR_Action_In.cs" t="Include" />

+ 32 - 11
.idea/.idea.VRCyling/.idea/workspace.xml

@@ -22,15 +22,28 @@
     <select />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="ae9d46da-fd77-45ea-9287-d8d155f44bcf" name="Default Changelist" comment="DoF and Vive Tracker Update">
+    <list default="true" id="ae9d46da-fd77-45ea-9287-d8d155f44bcf" name="Default Changelist" comment="GingerVR">
+      <change afterPath="$PROJECT_DIR$/Assets/GingerVR/Extras.meta" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/Assets/GingerVR/Liscense.meta" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/Assets/GingerVR/Liscense/Liscense.txt.txt.meta" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/Assets/GingerVR/SicknessReductionTechniques.meta" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/.idea.VRCyling/.idea/contentModel.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/.idea.VRCyling/.idea/contentModel.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/.idea.VRCyling/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/.idea.VRCyling/.idea/workspace.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/Assembly-CSharp-Editor.csproj" beforeDir="false" afterPath="$PROJECT_DIR$/Assembly-CSharp-Editor.csproj" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/Assembly-CSharp.csproj" beforeDir="false" afterPath="$PROJECT_DIR$/Assembly-CSharp.csproj" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/GingerVR/SicknessReductionTechniques/AuthenticNose/DoubleNose.mat" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/GingerVR/SicknessReductionTechniques/AuthenticNose/DoubleNose.mat" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/GingerVR/SicknessReductionTechniques/Construction/Materials/vignette.mat" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/GingerVR/SicknessReductionTechniques/Construction/Materials/vignette.mat" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/GingerVR/SicknessReductionTechniques/SingleNose/SingleNose.mat" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/GingerVR/SicknessReductionTechniques/SingleNose/SingleNose.mat" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/Prefabs/Player/Head/Helmet2.prefab" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Prefabs/Player/Head/Helmet2.prefab" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/Scenes/MainScene.unity" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Scenes/MainScene.unity" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/Scripts/SicknessReduction/Visual/VirtualNose.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Scripts/SicknessReduction/Visual/VirtualNose.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/XR/Settings/Open VR Settings.asset" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/XR/Settings/Open VR Settings.asset" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/XR/XRGeneralSettings.asset" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/XR/XRGeneralSettings.asset" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/SteamVR.csproj" beforeDir="false" afterPath="$PROJECT_DIR$/SteamVR.csproj" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/SteamVR_Editor.csproj" beforeDir="false" afterPath="$PROJECT_DIR$/SteamVR_Editor.csproj" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/SteamVR_Input_Editor.csproj" beforeDir="false" afterPath="$PROJECT_DIR$/SteamVR_Input_Editor.csproj" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/SteamVR_Windows_EditorHelper.csproj" beforeDir="false" afterPath="$PROJECT_DIR$/SteamVR_Windows_EditorHelper.csproj" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/obj/Debug/Assembly-CSharp-Editor.csprojAssemblyReference.cache" beforeDir="false" afterPath="$PROJECT_DIR$/obj/Debug/Assembly-CSharp-Editor.csprojAssemblyReference.cache" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/obj/Debug/Assembly-CSharp.csprojAssemblyReference.cache" beforeDir="false" afterPath="$PROJECT_DIR$/obj/Debug/Assembly-CSharp.csprojAssemblyReference.cache" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
@@ -107,9 +120,9 @@
         <option value="$PROJECT_DIR$/Assets/Scripts/Wheels/SwitchColliderOnStanding.cs" />
         <option value="$PROJECT_DIR$/Assets/Scripts/Wheels/SlopeCollider.cs" />
         <option value="$PROJECT_DIR$/Assets/Scripts/Controller/Bicycle/RbBicycleController.cs" />
-        <option value="$PROJECT_DIR$/Assets/Scripts/SicknessReduction/Visual/VirtualNose.cs" />
         <option value="$PROJECT_DIR$/Assets/Scripts/Tracking/MatchPlayerPositionAndCalibrate.cs" />
         <option value="$PROJECT_DIR$/Assets/Scripts/SicknessReduction/Visual/DoF/DynamicDoF.cs" />
+        <option value="$PROJECT_DIR$/Assets/Scripts/SicknessReduction/Visual/VirtualNose.cs" />
       </list>
     </option>
   </component>
@@ -179,7 +192,7 @@
       <workItem from="1612525325840" duration="2419000" />
       <workItem from="1612943190960" duration="73000" />
       <workItem from="1612943623931" duration="618000" />
-      <workItem from="1614156263136" duration="383000" />
+      <workItem from="1614156263136" duration="4544000" />
     </task>
     <task id="LOCAL-00001" summary="VR Stuff, Bicycle Animations">
       <created>1606399745852</created>
@@ -272,7 +285,14 @@
       <option name="project" value="LOCAL" />
       <updated>1612529432943</updated>
     </task>
-    <option name="localTasksCounter" value="14" />
+    <task id="LOCAL-00014" summary="GingerVR">
+      <created>1614156818036</created>
+      <option name="number" value="00014" />
+      <option name="presentableId" value="LOCAL-00014" />
+      <option name="project" value="LOCAL" />
+      <updated>1614156818036</updated>
+    </task>
+    <option name="localTasksCounter" value="15" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -307,7 +327,8 @@
     <MESSAGE value="fixes" />
     <MESSAGE value="Removed logs and added additional steering options" />
     <MESSAGE value="DoF and Vive Tracker Update" />
-    <option name="LAST_COMMIT_MESSAGE" value="DoF and Vive Tracker Update" />
+    <MESSAGE value="GingerVR" />
+    <option name="LAST_COMMIT_MESSAGE" value="GingerVR" />
   </component>
   <component name="WindowStateProjectService">
     <state x="704" y="291" key="#com.intellij.openapi.updateSettings.impl.PluginUpdateInfoDialog" timestamp="1612943194023">
@@ -451,13 +472,13 @@
     <state x="69" y="80" width="1302" height="741" key="VCS.FileHistoryDialog/0.0.1440.900@0.0.1440.900" timestamp="1608635342446" />
     <state x="92" y="92" width="1736" height="856" key="VCS.FileHistoryDialog/0.0.1920.1040@0.0.1920.1040" timestamp="1607591027227" />
     <state x="98" y="98" width="1852" height="916" key="VCS.FileHistoryDialog/0.0.2048.1112@0.0.2048.1112" timestamp="1611752386302" />
-    <state x="589" y="269" key="Vcs.Push.Dialog.v2" timestamp="1612529445465">
+    <state x="589" y="269" key="Vcs.Push.Dialog.v2" timestamp="1614156819588">
       <screen x="0" y="0" width="2048" height="1112" />
     </state>
     <state x="414" y="208" key="Vcs.Push.Dialog.v2/0.0.1440.860@0.0.1440.860" timestamp="1610362459013" />
     <state x="414" y="218" key="Vcs.Push.Dialog.v2/0.0.1440.900@0.0.1440.900" timestamp="1608628624093" />
     <state x="552" y="252" key="Vcs.Push.Dialog.v2/0.0.1920.1040@0.0.1920.1040" timestamp="1610531923390" />
-    <state x="589" y="269" key="Vcs.Push.Dialog.v2/0.0.2048.1112@0.0.2048.1112" timestamp="1612529445465" />
+    <state x="589" y="269" key="Vcs.Push.Dialog.v2/0.0.2048.1112@0.0.2048.1112" timestamp="1614156819588" />
     <state width="726" height="436" key="XDebugger.FullValuePopup" timestamp="1608570184149">
       <screen x="0" y="0" width="1440" height="860" />
     </state>
@@ -484,24 +505,24 @@
     </state>
     <state x="300" y="85" width="1140" height="689" key="editAsTableFormatDialogDimension/0.0.1440.860@0.0.1440.860" timestamp="1610362422263" />
     <state x="400" y="103" key="editAsTableFormatDialogDimension/0.0.1920.1040@0.0.1920.1040" timestamp="1610533263726" />
-    <state x="524" y="37" width="1001" height="1037" key="find.popup" timestamp="1611921383656">
+    <state x="524" y="37" width="1001" height="1037" key="find.popup" timestamp="1614156731422">
       <screen x="0" y="0" width="2048" height="1112" />
     </state>
     <state x="368" y="29" width="703" height="801" key="find.popup/0.0.1440.860@0.0.1440.860" timestamp="1610363676930" />
     <state x="491" y="35" width="938" height="969" key="find.popup/0.0.1920.1040@0.0.1920.1040" timestamp="1610533618773" />
-    <state x="524" y="37" width="1001" height="1037" key="find.popup/0.0.2048.1112@0.0.2048.1112" timestamp="1611921383656" />
+    <state x="524" y="37" width="1001" height="1037" key="find.popup/0.0.2048.1112@0.0.2048.1112" timestamp="1614156731422" />
     <state x="539" y="255" key="run.anything.popup" timestamp="1611924507844">
       <screen x="0" y="0" width="2048" height="1112" />
     </state>
     <state x="379" y="197" key="run.anything.popup/0.0.1440.860@0.0.1440.860" timestamp="1610374243030" />
     <state x="539" y="255" key="run.anything.popup/0.0.2048.1112@0.0.2048.1112" timestamp="1611924507844" />
-    <state x="665" y="241" width="717" height="725" key="search.everywhere.popup" timestamp="1612526476875">
+    <state x="665" y="241" width="717" height="725" key="search.everywhere.popup" timestamp="1614159534097">
       <screen x="0" y="0" width="2048" height="1112" />
     </state>
     <state x="478" y="197" width="672" height="561" key="search.everywhere.popup/0.0.1440.860@0.0.1440.860" timestamp="1610362007792" />
     <state x="476" y="204" width="672" height="588" key="search.everywhere.popup/0.0.1440.900@0.0.1440.900" timestamp="1608636877159" />
     <state x="623" y="225" width="672" height="678" key="search.everywhere.popup/0.0.1920.1040@0.0.1920.1040" timestamp="1610538285122" />
-    <state x="665" y="241" width="717" height="725" key="search.everywhere.popup/0.0.2048.1112@0.0.2048.1112" timestamp="1612526476875" />
+    <state x="665" y="241" width="717" height="725" key="search.everywhere.popup/0.0.2048.1112@0.0.2048.1112" timestamp="1614159534097" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>

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


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


+ 8 - 0
Assets/GingerVR/Extras.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 89f2d3dd87655c04184c09785e634a69
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 8 - 0
Assets/GingerVR/Liscense.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: ec28ae2121fbbd04cb182b21ec2d9f87
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 7 - 0
Assets/GingerVR/Liscense/Liscense.txt.txt.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 593a8efd914dcea4bac3e1e7a0b24afd
+TextScriptImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 8 - 0
Assets/GingerVR/SicknessReductionTechniques.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 91bc3bda090cfeb48803df0ba366d9c6
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 37 - 3
Assets/GingerVR/SicknessReductionTechniques/AuthenticNose/DoubleNose.mat

@@ -1,5 +1,18 @@
 %YAML 1.1
 %TAG !u! tag:unity3d.com,2011:
+--- !u!114 &-6994379672591702935
+MonoBehaviour:
+  m_ObjectHideFlags: 11
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  version: 2
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -8,17 +21,22 @@ Material:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_Name: DoubleNose
-  m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
+  m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3}
   m_ShaderKeywords: 
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
-  m_CustomRenderQueue: -1
-  stringTagMap: {}
+  m_CustomRenderQueue: 2000
+  stringTagMap:
+    RenderType: Opaque
   disabledShaderPasses: []
   m_SavedProperties:
     serializedVersion: 3
     m_TexEnvs:
+    - _BaseMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     - _BumpMap:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
@@ -55,11 +73,19 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - _SpecGlossMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
+    - _AlphaClip: 0
+    - _Blend: 0
     - _BumpScale: 1
+    - _Cull: 2
     - _Cutoff: 0.5
     - _DetailNormalMapScale: 1
     - _DstBlend: 0
+    - _EnvironmentReflections: 1
     - _GlossMapScale: 1
     - _Glossiness: 0.5
     - _GlossyReflections: 1
@@ -67,11 +93,19 @@ Material:
     - _Mode: 0
     - _OcclusionStrength: 1
     - _Parallax: 0.02
+    - _QueueOffset: 0
+    - _ReceiveShadows: 1
+    - _Smoothness: 0.5
     - _SmoothnessTextureChannel: 0
     - _SpecularHighlights: 1
     - _SrcBlend: 1
+    - _Surface: 0
     - _UVSec: 0
+    - _WorkflowMode: 1
     - _ZWrite: 1
     m_Colors:
+    - _BaseColor: {r: 0, g: 0, b: 1, a: 1}
     - _Color: {r: 0, g: 0, b: 1, a: 1}
     - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
+    - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
+  m_BuildTextureStacks: []

+ 58 - 6
Assets/GingerVR/SicknessReductionTechniques/Construction/Materials/vignette.mat

@@ -1,5 +1,18 @@
 %YAML 1.1
 %TAG !u! tag:unity3d.com,2011:
+--- !u!114 &-5337700047696414843
+MonoBehaviour:
+  m_ObjectHideFlags: 11
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  version: 2
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -8,20 +21,59 @@ Material:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_Name: vignette
-  m_Shader: {fileID: 10703, guid: 0000000000000000f000000000000000, type: 0}
-  m_ShaderKeywords: 
+  m_Shader: {fileID: 4800000, guid: 8d2bb70cbf9db8d4da26e15b26e74248, type: 3}
+  m_ShaderKeywords: _GLOSSINESS_FROM_BASE_ALPHA _SPECULAR_COLOR
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
-  m_CustomRenderQueue: -1
-  stringTagMap: {}
+  m_CustomRenderQueue: 2000
+  stringTagMap:
+    RenderType: Opaque
   disabledShaderPasses: []
   m_SavedProperties:
     serializedVersion: 3
     m_TexEnvs:
+    - _BaseMap:
+        m_Texture: {fileID: 2800000, guid: 9ba38df879e3ead4dad51a4d21eca446, type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _BumpMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _EmissionMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     - _MainTex:
         m_Texture: {fileID: 2800000, guid: 9ba38df879e3ead4dad51a4d21eca446, type: 3}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
-    m_Floats: []
-    m_Colors: []
+    - _SpecGlossMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    m_Floats:
+    - _AlphaClip: 0
+    - _Blend: 0
+    - _BumpScale: 1
+    - _Cull: 2
+    - _Cutoff: 0.5
+    - _DstBlend: 0
+    - _GlossinessSource: 0
+    - _QueueOffset: 0
+    - _ReceiveShadows: 1
+    - _Shininess: 0
+    - _Smoothness: 0
+    - _SmoothnessSource: 1
+    - _SpecSource: 0
+    - _SpecularHighlights: 0
+    - _SrcBlend: 1
+    - _Surface: 0
+    - _ZWrite: 1
+    m_Colors:
+    - _BaseColor: {r: 1, g: 1, b: 1, a: 0}
+    - _Color: {r: 1, g: 1, b: 1, a: 1}
+    - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
+    - _SpecColor: {r: 0.5, g: 0.5, b: 0.5, a: 0.5}
+  m_BuildTextureStacks: []

+ 37 - 3
Assets/GingerVR/SicknessReductionTechniques/SingleNose/SingleNose.mat

@@ -8,17 +8,22 @@ Material:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_Name: SingleNose
-  m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
+  m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3}
   m_ShaderKeywords: 
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
-  m_CustomRenderQueue: -1
-  stringTagMap: {}
+  m_CustomRenderQueue: 2000
+  stringTagMap:
+    RenderType: Opaque
   disabledShaderPasses: []
   m_SavedProperties:
     serializedVersion: 3
     m_TexEnvs:
+    - _BaseMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     - _BumpMap:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
@@ -55,11 +60,19 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - _SpecGlossMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
+    - _AlphaClip: 0
+    - _Blend: 0
     - _BumpScale: 1
+    - _Cull: 2
     - _Cutoff: 0.5
     - _DetailNormalMapScale: 1
     - _DstBlend: 0
+    - _EnvironmentReflections: 1
     - _GlossMapScale: 1
     - _Glossiness: 0.5
     - _GlossyReflections: 1
@@ -67,11 +80,32 @@ Material:
     - _Mode: 0
     - _OcclusionStrength: 1
     - _Parallax: 0.02
+    - _QueueOffset: 0
+    - _ReceiveShadows: 1
+    - _Smoothness: 0.5
     - _SmoothnessTextureChannel: 0
     - _SpecularHighlights: 1
     - _SrcBlend: 1
+    - _Surface: 0
     - _UVSec: 0
+    - _WorkflowMode: 1
     - _ZWrite: 1
     m_Colors:
+    - _BaseColor: {r: 0.6816837, g: 0.6886792, b: 0.16567281, a: 1}
     - _Color: {r: 0.6816837, g: 0.6886792, b: 0.16567281, a: 1}
     - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
+    - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
+  m_BuildTextureStacks: []
+--- !u!114 &223781033550139352
+MonoBehaviour:
+  m_ObjectHideFlags: 11
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  version: 2

+ 2 - 2
Assets/Prefabs/Player/Head/Helmet2.prefab

@@ -46,12 +46,12 @@ PrefabInstance:
     - target: {fileID: -8679921383154817045, guid: 467f13307a55b724c8c538e204d1dfe4,
         type: 3}
       propertyPath: m_LocalScale.x
-      value: 5
+      value: 4
       objectReference: {fileID: 0}
     - target: {fileID: -8679921383154817045, guid: 467f13307a55b724c8c538e204d1dfe4,
         type: 3}
       propertyPath: m_LocalScale.y
-      value: 5
+      value: 6
       objectReference: {fileID: 0}
     - target: {fileID: -8679921383154817045, guid: 467f13307a55b724c8c538e204d1dfe4,
         type: 3}

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


+ 37 - 2
Assets/Scripts/SicknessReduction/Visual/VirtualNose.cs

@@ -1,4 +1,8 @@
-using UnityEngine;
+using System;
+using System.Collections.Generic;
+using UnityEngine;
+using UnityEngine.XR;
+using Valve.VR;
 
 namespace SicknessReduction.Visual
 {
@@ -7,10 +11,15 @@ namespace SicknessReduction.Visual
         public GameObject prefabToSpawn;
         public Vector3 padding;
 
+        public bool adjustToIpd = true;
+
         private Camera cam;
         private GameObject nose;
 
-        private void Start()
+        private InputDevice leftEye;
+        private InputDevice rightEye;
+
+        private void OnEnable()
         {
             cam = Camera.main;
             if (cam == null)
@@ -19,8 +28,34 @@ namespace SicknessReduction.Visual
                 return;
             }
 
+            Debug.Log($"Main Camera IPD: {cam.stereoSeparation}");
+
             nose = Instantiate(prefabToSpawn, cam.transform);
             nose.transform.localPosition = Vector3.forward * cam.nearClipPlane + padding;
         }
+
+        private void Start()
+        {
+            List<InputDevice> devices = new List<InputDevice>();
+            InputDevices.GetDevicesWithCharacteristics(
+                InputDeviceCharacteristics.Camera | InputDeviceCharacteristics.HeadMounted, devices);
+
+            if (devices.Count == 0)
+            {
+                Debug.LogWarning("No devices");
+                return;
+            }
+
+            devices[0].TryGetFeatureValue(CommonUsages.rightEyePosition, out var reye);
+            devices[0].TryGetFeatureValue(CommonUsages.leftEyePosition, out var leye);
+
+            Debug.Log($"Eyes: {leye}, {reye}");
+        }
+
+        private void OnDisable()
+        {
+            if (nose == null) return;
+            Destroy(nose);
+        }
     }
 }

+ 32 - 1
Assets/XR/XRGeneralSettings.asset

@@ -14,6 +14,22 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   m_LoaderManagerInstance: {fileID: 2438291999060406676}
   m_InitManagerOnStart: 1
+--- !u!114 &-3073175912502265144
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: f4c3631f5e58749a59194e0cf6baf6d5, type: 3}
+  m_Name: Android Providers
+  m_EditorClassIdentifier: 
+  m_RequiresSettingsUpdate: 0
+  m_AutomaticLoading: 0
+  m_AutomaticRunning: 0
+  m_Loaders: []
 --- !u!114 &11400000
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -26,9 +42,24 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: d2dc886499c26824283350fa532d087d, type: 3}
   m_Name: XRGeneralSettings
   m_EditorClassIdentifier: 
-  Keys: 01000000
+  Keys: 0100000007000000
   Values:
   - {fileID: -7140682783324643030}
+  - {fileID: 1476431570816398674}
+--- !u!114 &1476431570816398674
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d236b7d11115f2143951f1e14045df39, type: 3}
+  m_Name: Android Settings
+  m_EditorClassIdentifier: 
+  m_LoaderManagerInstance: {fileID: -3073175912502265144}
+  m_InitManagerOnStart: 1
 --- !u!114 &2438291999060406676
 MonoBehaviour:
   m_ObjectHideFlags: 0

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


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


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


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


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


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


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