Upgraded to Unity 2020.1 + Fixed Quest compilation

demonixis · Sep 25, 2020 · 2e9ea20 · 2e9ea20
1 parent 7d701b5
commit 2e9ea20
Show file tree

Hide file tree

Showing 126 changed files with 11,796 additions and 306 deletions.
diff --git a/Assets/Materials/DebugMat.mat b/Assets/Materials/DebugMat.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 1
+  version: 2
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -26,7 +26,7 @@ Material:
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
-  m_CustomRenderQueue: 3050
+  m_CustomRenderQueue: 3000
   stringTagMap:
     RenderType: Transparent
   disabledShaderPasses:
@@ -89,3 +89,4 @@ Material:
     - _Color: {r: 0.5, g: 0.5, b: 0.5, 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: []
diff --git a/Assets/Materials/GridMath.mat b/Assets/Materials/GridMath.mat
@@ -13,7 +13,7 @@ Material:
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
-  m_CustomRenderQueue: 2050
+  m_CustomRenderQueue: 2000
   stringTagMap:
     RenderType: Opaque
   disabledShaderPasses: []
@@ -75,6 +75,7 @@ Material:
     - _Color: {r: 0.5, g: 0.5, b: 0.5, 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 &9104054243086097926
 MonoBehaviour:
   m_ObjectHideFlags: 11
@@ -87,4 +88,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 1
+  version: 2
diff --git a/Assets/Resources/Input/TESInputActions.inputactions b/Assets/Resources/Input/TESInputActions.inputactions
@@ -673,7 +673,7 @@
                 {
                     "name": "",
                     "id": "289e944e-aa2c-46b7-beaa-4447d72ecf49",
-                    "path": "<XRController>{LeftHand}/joystickClicked",
+                    "path": "<XRController>{LeftHand}/grip",
                     "interactions": "",
                     "processors": "",
                     "groups": "",
@@ -684,7 +684,7 @@
                 {
                     "name": "",
                     "id": "b29dc1de-480a-43c8-ba69-c9ac6efffbf1",
-                    "path": "<XRController>{RightHand}/joystickClicked",
+                    "path": "<XRController>{RightHand}/grip",
                     "interactions": "",
                     "processors": "",
                     "groups": "",

diff --git a/Assets/Resources/Prefabs/Spectator.prefab b/Assets/Resources/Prefabs/Spectator.prefab
@@ -392,7 +392,8 @@ PrefabInstance:
       propertyPath: m_LocalEulerAnglesHint.z
       value: 0
       objectReference: {fileID: 0}
-    m_RemovedComponents: []
+    m_RemovedComponents:
+    - {fileID: 2517026290458435720, guid: e3405669209f6024ba276d1170d50dee, type: 3}
   m_SourcePrefab: {fileID: 100100000, guid: e3405669209f6024ba276d1170d50dee, type: 3}
 --- !u!4 &8404783985154368076 stripped
 Transform:
@@ -467,7 +468,8 @@ PrefabInstance:
       propertyPath: m_Name
       value: OculusTouchForQuestAndRiftS_Left
       objectReference: {fileID: 0}
-    m_RemovedComponents: []
+    m_RemovedComponents:
+    - {fileID: 3023270788309581594, guid: 1d88c17fdc43fd54f875b777a5280d81, type: 3}
   m_SourcePrefab: {fileID: 100100000, guid: 1d88c17fdc43fd54f875b777a5280d81, type: 3}
 --- !u!4 &1722930402696785955 stripped
 Transform:

diff --git a/Assets/Resources/Rendering/UniversalRP/Materials/URP-Lit.mat b/Assets/Resources/Rendering/UniversalRP/Materials/URP-Lit.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 1
+  version: 2
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -26,7 +26,7 @@ Material:
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
-  m_CustomRenderQueue: 2050
+  m_CustomRenderQueue: 2000
   stringTagMap:
     MotionVector: User
     RenderType: Opaque
@@ -120,3 +120,4 @@ Material:
     - _Color: {r: 0.5, g: 0.5, b: 0.5, 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: []
diff --git a/Assets/Resources/Rendering/UniversalRP/Materials/URP-SimpleLit-Cutout.mat b/Assets/Resources/Rendering/UniversalRP/Materials/URP-SimpleLit-Cutout.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 1
+  version: 2
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -26,7 +26,7 @@ Material:
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
-  m_CustomRenderQueue: 2500
+  m_CustomRenderQueue: 2450
   stringTagMap:
     MotionVector: User
     RenderType: TransparentCutout
@@ -124,3 +124,4 @@ Material:
     - _Color: {r: 0.5, g: 0.5, b: 0.5, 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: []
diff --git a/Assets/Resources/Rendering/UniversalRP/Materials/URP-SimpleLit.mat b/Assets/Resources/Rendering/UniversalRP/Materials/URP-SimpleLit.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 1
+  version: 2
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -26,7 +26,7 @@ Material:
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
-  m_CustomRenderQueue: 2050
+  m_CustomRenderQueue: 2000
   stringTagMap:
     MotionVector: User
     RenderType: Opaque
@@ -124,3 +124,4 @@ Material:
     - _Color: {r: 0.5, g: 0.5, b: 0.5, 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: []
diff --git a/Assets/Resources/Rendering/UniversalRP/Materials/URP-TerrainLit.mat b/Assets/Resources/Rendering/UniversalRP/Materials/URP-TerrainLit.mat
@@ -126,6 +126,7 @@ Material:
     - Vector2_7FB4D234: {r: -2.62, g: -0.3, b: 0, a: 0}
     - Vector2_91BF8B61: {r: 4, g: 4, b: 0, a: 0}
     - _BaseColor: {r: 1, g: 1, b: 1, a: 1}
+  m_BuildTextureStacks: []
 --- !u!114 &4543296596505370837
 MonoBehaviour:
   m_ObjectHideFlags: 11
@@ -138,4 +139,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 1
+  version: 2
diff --git a/Assets/Scripts/TES/Components/Graphics/GraphicsManager.cs b/Assets/Scripts/TES/Components/Graphics/GraphicsManager.cs
@@ -74,15 +74,6 @@ private void Awake()
 
                 instanceProfile.DisableEffect<MotionBlur>();
                 instanceProfile.DisableEffect<Vignette>();
-
-#if UNITY_ANDROID
-                // Apply Fixed Foveated Rendering on Qo/Quest
-                var tes3 = TES3Engine.Instance;
-                if (tes3 != null && XRManager.GetXRVendor() == XRVendor.Oculus)
-                {
-                    tes3.CurrentCellChanged += Instance_CurrentCellChanged;
-                }
-#endif
             }
 
             if (config.PostProcessingQuality == PostProcessingQuality.Low)
@@ -141,13 +132,5 @@ private IEnumerator Start()
                     break;
             }
         }
-
-#if UNITY_ANDROID
-        private void Instance_CurrentCellChanged(ESM.Records.CELLRecord obj)
-        {
-            var level = obj.isInterior ? 1 : 3;
-            Unity.XR.Oculus.Utils.SetFoveationLevel(level);
-        }
-#endif
     }
 }
diff --git a/Assets/Scripts/TES/Components/Graphics/LODGenerator.cs b/Assets/Scripts/TES/Components/Graphics/LODGenerator.cs
diff --git a/Assets/Scripts/TES/Components/Graphics/MeshMerger.cs b/Assets/Scripts/TES/Components/Graphics/MeshMerger.cs