Skip to content

Commit 3fa384c

Browse files
committed
Fix current graphics tests
1 parent 1937cbc commit 3fa384c

File tree

14 files changed

+285
-57
lines changed

14 files changed

+285
-57
lines changed

Assets/Objects/misc/Main Camera.prefab

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -106,6 +106,7 @@ MonoBehaviour:
106106
m_StopNaN: 0
107107
m_Dithering: 1
108108
m_ClearDepth: 1
109+
m_AllowXRRendering: 1
109110
m_RequiresDepthTexture: 0
110111
m_RequiresColorTexture: 0
111112
m_Version: 2
Lines changed: 2 additions & 2 deletions
Loading

Assets/ReferenceImages/Linear/OSXEditor/Metal/None/benchmark_island-static.png.meta

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Lines changed: 3 additions & 0 deletions
Loading

Assets/ReferenceImages/Linear/OSXEditor/Metal/None/level_Island.png.meta

Lines changed: 96 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Lines changed: 3 additions & 0 deletions
Loading

Assets/ReferenceImages/Linear/OSXEditor/Metal/None/main_menu.png.meta

Lines changed: 96 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Assets/Scripts/Environment/WindsurferManager.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,9 @@ private void Update()
5353
_smoothPositions[i].y += Time.deltaTime;
5454
else
5555
_smoothPositions[i].y -= Time.deltaTime * 0.25f;
56+
#if !STATIC_EVERYTHING
5657
surfers[i].position = _smoothPositions[i];
58+
#endif
5759
}
5860
}
5961
}

Assets/Scripts/GameSystem/AppSettings.cs

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -69,20 +69,13 @@ private void Awake()
6969
SetRenderScale();
7070
SceneManager.sceneLoaded += LevelWasLoaded;
7171
}
72-
72+
7373
private void Initialize()
7474
{
7575
Instance = this;
7676
ConsoleCanvas = Instantiate(consoleCanvas);
7777
DontDestroyOnLoad(ConsoleCanvas);
7878
MainCamera = Camera.main;
79-
80-
#if STATIC_EVERYTHING
81-
// Set the static flag if enabled
82-
Shader.EnableKeyword("_STATIC_SHADER");
83-
#else
84-
Shader.DisableKeyword("_STATIC_SHADER");
85-
#endif
8679
}
8780

8881
private void OnDisable()
@@ -93,6 +86,9 @@ private void OnDisable()
9386
private static void LevelWasLoaded(Scene scene, LoadSceneMode mode)
9487
{
9588
CleanupCameras();
89+
#if STATIC_EVERYTHING
90+
Utility.StaticObjects();
91+
#endif
9692
Instance.Invoke(nameof(CleanupLoadingScreen), 0.5f);
9793
}
9894

Assets/Scripts/GameSystem/InputControls.cs

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
//------------------------------------------------------------------------------
22
// <auto-generated>
33
// This code was auto-generated by com.unity.inputsystem:InputActionCodeGenerator
4-
// version 1.1.0
4+
// version 1.1.1
55
// from Assets/Data/InputControls.inputactions
66
//
77
// Changes to this file may cause incorrect behavior and will be lost if
@@ -33,31 +33,35 @@ public @InputControls()
3333
""id"": ""591093b7-743c-42e6-b71e-bab02d178bd1"",
3434
""expectedControlType"": ""Axis"",
3535
""processors"": ""AxisDeadzone(min=0.1,max=1)"",
36-
""interactions"": """"
36+
""interactions"": """",
37+
""initialStateCheck"": true
3738
},
3839
{
3940
""name"": ""Steering"",
4041
""type"": ""Value"",
4142
""id"": ""67e3403a-b3e8-43af-ab52-4575ba23afef"",
4243
""expectedControlType"": ""Axis"",
4344
""processors"": ""AxisDeadzone(min=0.1,max=1)"",
44-
""interactions"": """"
45+
""interactions"": """",
46+
""initialStateCheck"": true
4547
},
4648
{
4749
""name"": ""Reset"",
4850
""type"": ""Button"",
4951
""id"": ""218640d2-e6dc-4136-842e-4621c0883e15"",
5052
""expectedControlType"": """",
5153
""processors"": ""AxisDeadzone(min=0.1,max=1)"",
52-
""interactions"": """"
54+
""interactions"": """",
55+
""initialStateCheck"": false
5356
},
5457
{
5558
""name"": ""Pause"",
5659
""type"": ""Button"",
5760
""id"": ""097a2ec8-8df3-4d48-96e5-fbf096270878"",
5861
""expectedControlType"": """",
5962
""processors"": ""AxisDeadzone(min=0.1,max=1)"",
60-
""interactions"": """"
63+
""interactions"": """",
64+
""initialStateCheck"": false
6165
}
6266
],
6367
""bindings"": [
@@ -348,15 +352,17 @@ public @InputControls()
348352
""id"": ""c57759c4-f215-4fe9-bd6c-1c835c6074bd"",
349353
""expectedControlType"": ""Button"",
350354
""processors"": """",
351-
""interactions"": """"
355+
""interactions"": """",
356+
""initialStateCheck"": false
352357
},
353358
{
354359
""name"": ""TimeOfDay"",
355360
""type"": ""Value"",
356361
""id"": ""bfb079cd-5e64-4031-b061-eb65384dacba"",
357362
""expectedControlType"": """",
358363
""processors"": ""AxisDeadzone(min=0.1,max=1)"",
359-
""interactions"": """"
364+
""interactions"": """",
365+
""initialStateCheck"": true
360366
}
361367
],
362368
""bindings"": [

0 commit comments

Comments
 (0)