Skip to content

Commit 2e9ea20

Browse files
YannickComteNovelabYannickComteNovelab
committed
Upgraded to Unity 2020.1 + Fixed Quest compilation
1 parent 7d701b5 commit 2e9ea20

File tree

126 files changed

+11796
-306
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

126 files changed

+11796
-306
lines changed

‎Assets/Materials/DebugMat.mat‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ MonoBehaviour:
1212
m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
1313
m_Name:
1414
m_EditorClassIdentifier:
15-
version: 1
15+
version: 2
1616
--- !u!21 &2100000
1717
Material:
1818
serializedVersion: 6
@@ -26,7 +26,7 @@ Material:
2626
m_LightmapFlags: 4
2727
m_EnableInstancingVariants: 0
2828
m_DoubleSidedGI: 0
29-
m_CustomRenderQueue: 3050
29+
m_CustomRenderQueue: 3000
3030
stringTagMap:
3131
RenderType: Transparent
3232
disabledShaderPasses:
@@ -89,3 +89,4 @@ Material:
8989
- _Color: {r: 0.5, g: 0.5, b: 0.5, a: 1}
9090
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
9191
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
92+
m_BuildTextureStacks: []

‎Assets/Materials/GridMath.mat‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ Material:
1313
m_LightmapFlags: 4
1414
m_EnableInstancingVariants: 0
1515
m_DoubleSidedGI: 0
16-
m_CustomRenderQueue: 2050
16+
m_CustomRenderQueue: 2000
1717
stringTagMap:
1818
RenderType: Opaque
1919
disabledShaderPasses: []
@@ -75,6 +75,7 @@ Material:
7575
- _Color: {r: 0.5, g: 0.5, b: 0.5, a: 1}
7676
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
7777
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
78+
m_BuildTextureStacks: []
7879
--- !u!114 &9104054243086097926
7980
MonoBehaviour:
8081
m_ObjectHideFlags: 11
@@ -87,4 +88,4 @@ MonoBehaviour:
8788
m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
8889
m_Name:
8990
m_EditorClassIdentifier:
90-
version: 1
91+
version: 2

‎Assets/Resources/Input/TESInputActions.inputactions‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -673,7 +673,7 @@
673673
{
674674
"name": "",
675675
"id": "289e944e-aa2c-46b7-beaa-4447d72ecf49",
676-
"path": "<XRController>{LeftHand}/joystickClicked",
676+
"path": "<XRController>{LeftHand}/grip",
677677
"interactions": "",
678678
"processors": "",
679679
"groups": "",
@@ -684,7 +684,7 @@
684684
{
685685
"name": "",
686686
"id": "b29dc1de-480a-43c8-ba69-c9ac6efffbf1",
687-
"path": "<XRController>{RightHand}/joystickClicked",
687+
"path": "<XRController>{RightHand}/grip",
688688
"interactions": "",
689689
"processors": "",
690690
"groups": "",

‎Assets/Resources/Prefabs/Spectator.prefab‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -392,7 +392,8 @@ PrefabInstance:
392392
propertyPath: m_LocalEulerAnglesHint.z
393393
value: 0
394394
objectReference: {fileID: 0}
395-
m_RemovedComponents: []
395+
m_RemovedComponents:
396+
- {fileID: 2517026290458435720, guid: e3405669209f6024ba276d1170d50dee, type: 3}
396397
m_SourcePrefab: {fileID: 100100000, guid: e3405669209f6024ba276d1170d50dee, type: 3}
397398
--- !u!4 &8404783985154368076 stripped
398399
Transform:
@@ -467,7 +468,8 @@ PrefabInstance:
467468
propertyPath: m_Name
468469
value: OculusTouchForQuestAndRiftS_Left
469470
objectReference: {fileID: 0}
470-
m_RemovedComponents: []
471+
m_RemovedComponents:
472+
- {fileID: 3023270788309581594, guid: 1d88c17fdc43fd54f875b777a5280d81, type: 3}
471473
m_SourcePrefab: {fileID: 100100000, guid: 1d88c17fdc43fd54f875b777a5280d81, type: 3}
472474
--- !u!4 &1722930402696785955 stripped
473475
Transform:

‎Assets/Resources/Rendering/UniversalRP/Materials/URP-Lit.mat‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ MonoBehaviour:
1212
m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
1313
m_Name:
1414
m_EditorClassIdentifier:
15-
version: 1
15+
version: 2
1616
--- !u!21 &2100000
1717
Material:
1818
serializedVersion: 6
@@ -26,7 +26,7 @@ Material:
2626
m_LightmapFlags: 4
2727
m_EnableInstancingVariants: 0
2828
m_DoubleSidedGI: 0
29-
m_CustomRenderQueue: 2050
29+
m_CustomRenderQueue: 2000
3030
stringTagMap:
3131
MotionVector: User
3232
RenderType: Opaque
@@ -120,3 +120,4 @@ Material:
120120
- _Color: {r: 0.5, g: 0.5, b: 0.5, a: 1}
121121
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
122122
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
123+
m_BuildTextureStacks: []

‎Assets/Resources/Rendering/UniversalRP/Materials/URP-SimpleLit-Cutout.mat‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ MonoBehaviour:
1212
m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
1313
m_Name:
1414
m_EditorClassIdentifier:
15-
version: 1
15+
version: 2
1616
--- !u!21 &2100000
1717
Material:
1818
serializedVersion: 6
@@ -26,7 +26,7 @@ Material:
2626
m_LightmapFlags: 4
2727
m_EnableInstancingVariants: 0
2828
m_DoubleSidedGI: 0
29-
m_CustomRenderQueue: 2500
29+
m_CustomRenderQueue: 2450
3030
stringTagMap:
3131
MotionVector: User
3232
RenderType: TransparentCutout
@@ -124,3 +124,4 @@ Material:
124124
- _Color: {r: 0.5, g: 0.5, b: 0.5, a: 1}
125125
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
126126
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
127+
m_BuildTextureStacks: []

‎Assets/Resources/Rendering/UniversalRP/Materials/URP-SimpleLit.mat‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ MonoBehaviour:
1212
m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
1313
m_Name:
1414
m_EditorClassIdentifier:
15-
version: 1
15+
version: 2
1616
--- !u!21 &2100000
1717
Material:
1818
serializedVersion: 6
@@ -26,7 +26,7 @@ Material:
2626
m_LightmapFlags: 4
2727
m_EnableInstancingVariants: 0
2828
m_DoubleSidedGI: 0
29-
m_CustomRenderQueue: 2050
29+
m_CustomRenderQueue: 2000
3030
stringTagMap:
3131
MotionVector: User
3232
RenderType: Opaque
@@ -124,3 +124,4 @@ Material:
124124
- _Color: {r: 0.5, g: 0.5, b: 0.5, a: 1}
125125
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
126126
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
127+
m_BuildTextureStacks: []

‎Assets/Resources/Rendering/UniversalRP/Materials/URP-TerrainLit.mat‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,6 +126,7 @@ Material:
126126
- Vector2_7FB4D234: {r: -2.62, g: -0.3, b: 0, a: 0}
127127
- Vector2_91BF8B61: {r: 4, g: 4, b: 0, a: 0}
128128
- _BaseColor: {r: 1, g: 1, b: 1, a: 1}
129+
m_BuildTextureStacks: []
129130
--- !u!114 &4543296596505370837
130131
MonoBehaviour:
131132
m_ObjectHideFlags: 11
@@ -138,4 +139,4 @@ MonoBehaviour:
138139
m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
139140
m_Name:
140141
m_EditorClassIdentifier:
141-
version: 1
142+
version: 2

‎Assets/Scripts/TES/Components/Graphics/GraphicsManager.cs‎

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -74,15 +74,6 @@ private void Awake()
7474

7575
instanceProfile.DisableEffect<MotionBlur>();
7676
instanceProfile.DisableEffect<Vignette>();
77-
78-
#if UNITY_ANDROID
79-
// Apply Fixed Foveated Rendering on Qo/Quest
80-
var tes3 = TES3Engine.Instance;
81-
if (tes3 != null && XRManager.GetXRVendor() == XRVendor.Oculus)
82-
{
83-
tes3.CurrentCellChanged += Instance_CurrentCellChanged;
84-
}
85-
#endif
8677
}
8778

8879
if (config.PostProcessingQuality == PostProcessingQuality.Low)
@@ -141,13 +132,5 @@ private IEnumerator Start()
141132
break;
142133
}
143134
}
144-
145-
#if UNITY_ANDROID
146-
private void Instance_CurrentCellChanged(ESM.Records.CELLRecord obj)
147-
{
148-
var level = obj.isInterior ? 1 : 3;
149-
Unity.XR.Oculus.Utils.SetFoveationLevel(level);
150-
}
151-
#endif
152135
}
153136
}

‎Assets/Scripts/TES/Components/Graphics/LODGenerator.cs‎

Lines changed: 0 additions & 69 deletions
This file was deleted.

0 commit comments

Comments
 (0)