Merge pull request #172 from BasisVR/doolysbranch

Doolysbranch
BasisVR · Mar 7, 2025 · 101c673 · 101c673
2 parents 4a2e9e9 + 9e9fcfe
commit 101c673
Show file tree

Hide file tree

Showing 84 changed files with 1,559 additions and 700 deletions.
diff --git a/Basis/Assets/AddressableAssetsData/AddressableAssetSettings.asset b/Basis/Assets/AddressableAssetsData/AddressableAssetSettings.asset
@@ -15,7 +15,7 @@ MonoBehaviour:
   m_DefaultGroup: 37c75a6cf72db324eb01200602299fc8
   m_currentHash:
     serializedVersion: 2
-    Hash: 00000000000000000000000000000000
+    Hash: 1266d874380a471b501558b174201c86
   m_OptimizeCatalogSize: 0
   m_BuildRemoteCatalog: 0
   m_CatalogRequestsTimeout: 0

diff --git a/Basis/Assets/AddressableAssetsData/Linux.meta b/Basis/Assets/AddressableAssetsData/Linux.meta
diff --git a/Basis/Assets/Basis/Settings/Quality Settiings/Modified - Desktop.asset b/Basis/Assets/Basis/Settings/Quality Settiings/Modified - Desktop.asset
@@ -23,9 +23,9 @@ MonoBehaviour:
   m_RequireOpaqueTexture: 1
   m_OpaqueDownsampling: 1
   m_SupportsTerrainHoles: 0
-  m_SupportsHDR: 0
-  m_HDRColorBufferPrecision: 0
-  m_MSAA: 8
+  m_SupportsHDR: 1
+  m_HDRColorBufferPrecision: 1
+  m_MSAA: 1
   m_RenderScale: 1
   m_UpscalingFilter: 0
   m_FsrOverrideSharpness: 0

diff --git a/Basis/Assets/Basis/Settings/Quality Settiings/Modified - Quest.asset b/Basis/Assets/Basis/Settings/Quality Settiings/Modified - Quest.asset
@@ -25,7 +25,7 @@ MonoBehaviour:
   m_SupportsTerrainHoles: 0
   m_SupportsHDR: 0
   m_HDRColorBufferPrecision: 0
-  m_MSAA: 2
+  m_MSAA: 0
   m_RenderScale: 1
   m_UpscalingFilter: 0
   m_FsrOverrideSharpness: 0

diff --git a/...ssets/Basis/Settings/Unity Rendering Defaults/UniversalRenderPipelineGlobalSettings.asset b/...ssets/Basis/Settings/Unity Rendering Defaults/UniversalRenderPipelineGlobalSettings.asset
@@ -36,25 +36,25 @@ MonoBehaviour:
       - rid: 2858994164428701698
       - rid: 2858994164428701699
       - rid: 2858994164428701700
-      - rid: 3153963477245886578
+      - rid: 3153963562537582962
       - rid: 2858994164428701702
       - rid: 2858994164428701703
-      - rid: 3153963477245886579
-      - rid: 3153963477245886580
+      - rid: 3153963562537582963
+      - rid: 3153963562537582964
       - rid: 2858994164428701706
-      - rid: 3153963477245886581
+      - rid: 3153963562537582965
       - rid: 2858994164428701708
       - rid: 3153963444920385929
-      - rid: 3153963477245886582
-      - rid: 3153963477245886583
-      - rid: 3153963477245886584
-      - rid: 3153963477245886585
-      - rid: 3153963477245886586
-      - rid: 3153963477245886587
+      - rid: 3153963562537582966
+      - rid: 3153963562537582967
+      - rid: 3153963562537582938
+      - rid: 3153963562537582968
+      - rid: 3153963562537582969
+      - rid: 3153963562537582941
       - rid: 2858994164428701716
       - rid: 2858994164428701717
       - rid: 2858994164428701718
-      - rid: 3153963477245886588
+      - rid: 3153963562537582970
     m_RuntimeSettings:
       m_List:
       - rid: 2858994164428701698
@@ -65,6 +65,8 @@ MonoBehaviour:
       - rid: 2858994164428701706
       - rid: 2858994164428701708
       - rid: 3153963444920385929
+      - rid: 3153963562537582938
+      - rid: 3153963562537582941
       - rid: 2858994164428701716
       - rid: 2858994164428701717
       - rid: 2858994164428701718
@@ -171,7 +173,19 @@ MonoBehaviour:
         m_OcclusionCullingDebugKernels: {fileID: 7200000, guid: b23e766bcf50ca4438ef186b174557df, type: 3}
         m_DebugOcclusionTestPS: {fileID: 4800000, guid: d3f0849180c2d0944bc71060693df100, type: 3}
         m_DebugOccluderPS: {fileID: 4800000, guid: b3c92426a88625841ab15ca6a7917248, type: 3}
-    - rid: 3153963477245886578
+    - rid: 3153963562537582938
+      type: {class: ProbeVolumeGlobalSettings, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime}
+      data:
+        m_Version: 1
+        m_ProbeVolumeDisableStreamingAssets: 1
+    - rid: 3153963562537582941
+      type: {class: ProbeVolumeRuntimeResources, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime}
+      data:
+        m_Version: 1
+        probeVolumeBlendStatesCS: {fileID: 7200000, guid: a3f7b8c99de28a94684cb1daebeccf5d, type: 3}
+        probeVolumeUploadDataCS: {fileID: 7200000, guid: 0951de5992461754fa73650732c4954c, type: 3}
+        probeVolumeUploadDataL2CS: {fileID: 7200000, guid: 6196f34ed825db14b81fb3eb0ea8d931, type: 3}
+    - rid: 3153963562537582962
       type: {class: Renderer2DResources, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime}
       data:
         m_Version: 0
@@ -186,14 +200,14 @@ MonoBehaviour:
         m_DefaultLitMaterial: {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, type: 2}
         m_DefaultUnlitMaterial: {fileID: 2100000, guid: 9dfc825aed78fcd4ba02077103263b40, type: 2}
         m_DefaultMaskMaterial: {fileID: 2100000, guid: 15d0c3709176029428a0da2f8cecf0b5, type: 2}
-    - rid: 3153963477245886579
+    - rid: 3153963562537582963
       type: {class: URPShaderStrippingSetting, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime}
       data:
         m_Version: 0
         m_StripUnusedPostProcessingVariants: 1
         m_StripUnusedVariants: 1
         m_StripScreenCoordOverrideVariants: 1
-    - rid: 3153963477245886580
+    - rid: 3153963562537582964
       type: {class: UniversalRenderPipelineEditorMaterials, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime}
       data:
         m_DefaultMaterial: {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2}
@@ -202,7 +216,7 @@ MonoBehaviour:
         m_DefaultTerrainMaterial: {fileID: 2100000, guid: 594ea882c5a793440b60ff72d896021e, type: 2}
         m_DefaultDecalMaterial: {fileID: 2100000, guid: 31d0dcc6f2dd4e4408d18036a2c93862, type: 2}
         m_DefaultSpriteMaterial: {fileID: 2100000, guid: 9dfc825aed78fcd4ba02077103263b40, type: 2}
-    - rid: 3153963477245886581
+    - rid: 3153963562537582965
       type: {class: UniversalRenderPipelineEditorShaders, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime}
       data:
         m_AutodeskInteractive: {fileID: 4800000, guid: 0e9d5a909a1f7e84882a534d0d11e49f, type: 3}
@@ -214,13 +228,13 @@ MonoBehaviour:
         m_DefaultSpeedTree7Shader: {fileID: 4800000, guid: 0f4122b9a743b744abe2fb6a0a88868b, type: 3}
         m_DefaultSpeedTree8Shader: {fileID: -6465566751694194690, guid: 9920c1f1781549a46ba081a2a15a16ec, type: 3}
         m_DefaultSpeedTree9Shader: {fileID: -6465566751694194690, guid: cbd3e1cc4ae141c42a30e33b4d666a61, type: 3}
-    - rid: 3153963477245886582
+    - rid: 3153963562537582966
       type: {class: STP/RuntimeResources, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime}
       data:
         m_setupCS: {fileID: 7200000, guid: 33be2e9a5506b2843bdb2bdff9cad5e1, type: 3}
         m_preTaaCS: {fileID: 7200000, guid: a679dba8ec4d9ce45884a270b0e22dda, type: 3}
         m_taaCS: {fileID: 7200000, guid: 3923900e2b41b5e47bc25bfdcbcdc9e6, type: 3}
-    - rid: 3153963477245886583
+    - rid: 3153963562537582967
       type: {class: ProbeVolumeBakingResources, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime}
       data:
         m_Version: 1
@@ -233,12 +247,7 @@ MonoBehaviour:
         skyOcclusionRT: {fileID: -5126288278712620388, guid: 5a2a534753fbdb44e96c3c78b5a6999d, type: 3}
         renderingLayerCS: {fileID: -6772857160820960102, guid: 94a070d33e408384bafc1dea4a565df9, type: 3}
         renderingLayerRT: {fileID: -5126288278712620388, guid: 94a070d33e408384bafc1dea4a565df9, type: 3}
-    - rid: 3153963477245886584
-      type: {class: ProbeVolumeGlobalSettings, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime}
-      data:
-        m_Version: 1
-        m_ProbeVolumeDisableStreamingAssets: 1
-    - rid: 3153963477245886585
+    - rid: 3153963562537582968
       type: {class: ProbeVolumeDebugResources, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime}
       data:
         m_Version: 1
@@ -248,21 +257,14 @@ MonoBehaviour:
         probeVolumeOffsetDebugShader: {fileID: 4800000, guid: db8bd7436dc2c5f4c92655307d198381, type: 3}
         probeSamplingDebugMesh: {fileID: -3555484719484374845, guid: 20be25aac4e22ee49a7db76fb3df6de2, type: 3}
         numbersDisplayTex: {fileID: 2800000, guid: 73fe53b428c5b3440b7e87ee830b608a, type: 3}
-    - rid: 3153963477245886586
+    - rid: 3153963562537582969
       type: {class: IncludeAdditionalRPAssets, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime}
       data:
         m_version: 0
         m_IncludeReferencedInScenes: 0
         m_IncludeAssetsByLabel: 0
         m_LabelToInclude: 
-    - rid: 3153963477245886587
-      type: {class: ProbeVolumeRuntimeResources, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime}
-      data:
-        m_Version: 1
-        probeVolumeBlendStatesCS: {fileID: 7200000, guid: a3f7b8c99de28a94684cb1daebeccf5d, type: 3}
-        probeVolumeUploadDataCS: {fileID: 7200000, guid: 0951de5992461754fa73650732c4954c, type: 3}
-        probeVolumeUploadDataL2CS: {fileID: 7200000, guid: 6196f34ed825db14b81fb3eb0ea8d931, type: 3}
-    - rid: 3153963477245886588
+    - rid: 3153963562537582970
       type: {class: UniversalRenderPipelineEditorAssets, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime}
       data:
         m_DefaultSettingsVolumeProfile: {fileID: 11400000, guid: eda47df5b85f4f249abf7abd73db2cb2, type: 2}
diff --git a/Basis/Assets/Oculus/VR.meta b/Basis/Assets/Oculus/VR.meta
diff --git a/Basis/Assets/Oculus/VR/Editor.meta b/Basis/Assets/Oculus/VR/Editor.meta
diff --git a/Basis/Assets/Oculus/VR/Editor/Tools.meta b/Basis/Assets/Oculus/VR/Editor/Tools.meta
diff --git a/Basis/Assets/Oculus/VR/Editor/Tools/ovr-platform-util.exe b/Basis/Assets/Oculus/VR/Editor/Tools/ovr-platform-util.exe
diff --git a/Basis/Assets/Oculus/VR/Editor/Tools/ovr-platform-util.exe.meta b/Basis/Assets/Oculus/VR/Editor/Tools/ovr-platform-util.exe.meta
diff --git a/Basis/Assets/Plugins/Android/AndroidManifest.xml b/Basis/Assets/Plugins/Android/AndroidManifest.xml
@@ -16,4 +16,6 @@
     <meta-data android:name="com.oculus.supportedDevices" android:value="quest2|questpro|quest3|quest3s" tools:replace="android:value" />
   </application>
   <uses-feature android:name="android.hardware.vr.headtracking" android:version="1" android:required="true" />
+  <uses-feature android:name="oculus.software.eye_tracking" android:required="false" />
+  <uses-permission android:name="com.oculus.permission.EYE_TRACKING" />
 </manifest>
diff --git a/Basis/Assets/Resources/InputActions.asset b/Basis/Assets/Resources/InputActions.asset
@@ -0,0 +1,16 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+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: 8922a6ca86889d84f8371a29d37b6dc8, type: 3}
+  m_Name: InputActions
+  m_EditorClassIdentifier: 
+  InputActionDefinitions: []
+  InputActionSets: []
diff --git a/Basis/Assets/Resources/InputActions.asset.meta b/Basis/Assets/Resources/InputActions.asset.meta
diff --git a/Basis/Assets/Resources/OVRPlatformToolSettings.asset b/Basis/Assets/Resources/OVRPlatformToolSettings.asset
@@ -12,11 +12,77 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: cd7bb81df5b74b34dadbf531f381a26b, type: 3}
   m_Name: OVRPlatformToolSettings
   m_EditorClassIdentifier: 
-  riftRedistPackages: []
+  riftRedistPackages:
+  - include: 0
+    name: ' .NET Framework 3.5'
+    id: ' 606493776156948    '
+  - include: 0
+    name: ' .NET Framework 4.0'
+    id: ' 133610290311340    '
+  - include: 0
+    name: ' .NET Framework 4.5.1'
+    id: ' 1617306711884127   '
+  - include: 0
+    name: ' .NET Framework 4.7.1'
+    id: ' 1667821599930345   '
+  - include: 0
+    name: ' DirectX (June 2010)'
+    id: ' 822786567843179    '
+  - include: 0
+    name: ' OpenAL 1.1'
+    id: ' 1147517301974655   '
+  - include: 0
+    name: ' Visual C++ 2005'
+    id: ' 1604897159783747   '
+  - include: 0
+    name: ' Visual C++ 2008'
+    id: ' 118440348500045    '
+  - include: 0
+    name: ' Visual C++ 2010'
+    id: ' 532320330249657    '
+  - include: 0
+    name: ' Visual C++ 2010 x86'
+    id: ' 1008652072555515   '
+  - include: 0
+    name: ' Visual C++ 2012'
+    id: ' 1683508698536289   '
+  - include: 0
+    name: ' Visual C++ 2012 x86'
+    id: ' 1002692246447245   '
+  - include: 0
+    name: ' Visual C++ 2013'
+    id: ' 1675031999409058   '
+  - include: 0
+    name: ' Visual C++ 2013 x86'
+    id: ' 910524935693407    '
+  - include: 0
+    name: ' Visual C++ 2015 Update 3'
+    id: ' 1183534128364060   '
+  - include: 0
+    name: ' Visual C++ 2015 x86 Update 3'
+    id: ' 1113033105419344   '
+  - include: 0
+    name: ' Visual C++ 2017'
+    id: ' 1315322525257173   '
+  - include: 0
+    name: ' Visual C++ 2017 x86'
+    id: ' 1064693870299984   '
+  - include: 0
+    name: ' Visual C++ 2019'
+    id: ' 2657209094360789   '
+  - include: 0
+    name: ' Visual C++ 2019 x86'
+    id: ' 2556834837738356   '
+  - include: 0
+    name: ' Vulkan Runtime 1.0.65.1'
+    id: ' 1824471960899274   '
+  - include: 0
+    name: ' Vulkan Runtime 1.1.73.0'
+    id: ' 1941020095932382   '
   languagePackDirectory: 
   assetConfigs:
   - configList: []
   - configList: []
   - configList: []
-  targetPlatform: 3
-  runOvrLint: 1
+  targetPlatform: 2
+  runOvrLint: 0
diff --git a/Basis/Assets/StreamingAssets/RuntimeActionBindings.json b/Basis/Assets/StreamingAssets/RuntimeActionBindings.json
@@ -0,0 +1 @@
+{"InputActionDefinitions": [],"InputActionSets": []}
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		{"InputActionDefinitions": [],"InputActionSets": []}