Fix current graphics tests

sindharta · Sep 30, 2021 · 3fa384c · 3fa384c
1 parent 1937cbc
commit 3fa384c
Show file tree

Hide file tree

Showing 14 changed files with 285 additions and 57 deletions.
diff --git a/Assets/Objects/misc/Main Camera.prefab b/Assets/Objects/misc/Main Camera.prefab
@@ -106,6 +106,7 @@ MonoBehaviour:
   m_StopNaN: 0
   m_Dithering: 1
   m_ClearDepth: 1
+  m_AllowXRRendering: 1
   m_RequiresDepthTexture: 0
   m_RequiresColorTexture: 0
   m_Version: 2

diff --git a/Assets/ReferenceImages/Linear/OSXEditor/Metal/None/benchmark_island-static.png b/Assets/ReferenceImages/Linear/OSXEditor/Metal/None/benchmark_island-static.png
diff --git a/Assets/ReferenceImages/Linear/OSXEditor/Metal/None/benchmark_island-static.png.meta b/Assets/ReferenceImages/Linear/OSXEditor/Metal/None/benchmark_island-static.png.meta
diff --git a/Assets/ReferenceImages/Linear/OSXEditor/Metal/None/level_Island.png b/Assets/ReferenceImages/Linear/OSXEditor/Metal/None/level_Island.png
diff --git a/Assets/ReferenceImages/Linear/OSXEditor/Metal/None/level_Island.png.meta b/Assets/ReferenceImages/Linear/OSXEditor/Metal/None/level_Island.png.meta
diff --git a/Assets/ReferenceImages/Linear/OSXEditor/Metal/None/main_menu.png b/Assets/ReferenceImages/Linear/OSXEditor/Metal/None/main_menu.png
diff --git a/Assets/ReferenceImages/Linear/OSXEditor/Metal/None/main_menu.png.meta b/Assets/ReferenceImages/Linear/OSXEditor/Metal/None/main_menu.png.meta
diff --git a/Assets/Scripts/Environment/WindsurferManager.cs b/Assets/Scripts/Environment/WindsurferManager.cs
@@ -53,7 +53,9 @@ private void Update()
                     _smoothPositions[i].y += Time.deltaTime;
                 else
                     _smoothPositions[i].y -= Time.deltaTime * 0.25f;
+#if !STATIC_EVERYTHING
                 surfers[i].position = _smoothPositions[i];
+#endif
             }
         }
     }

diff --git a/Assets/Scripts/GameSystem/AppSettings.cs b/Assets/Scripts/GameSystem/AppSettings.cs
@@ -69,20 +69,13 @@ private void Awake()
             SetRenderScale();
             SceneManager.sceneLoaded += LevelWasLoaded;
         }
-
+        
         private void Initialize()
         {
             Instance = this;
             ConsoleCanvas = Instantiate(consoleCanvas);
             DontDestroyOnLoad(ConsoleCanvas);
             MainCamera = Camera.main;
-
-#if STATIC_EVERYTHING
-            // Set the static flag if enabled
-            Shader.EnableKeyword("_STATIC_SHADER");
-#else
-            Shader.DisableKeyword("_STATIC_SHADER");
-#endif
         }
 
         private void OnDisable()
@@ -93,6 +86,9 @@ private void OnDisable()
         private static void LevelWasLoaded(Scene scene, LoadSceneMode mode)
         {
             CleanupCameras();
+#if STATIC_EVERYTHING
+            Utility.StaticObjects();
+#endif
             Instance.Invoke(nameof(CleanupLoadingScreen), 0.5f);
         }
 

diff --git a/Assets/Scripts/GameSystem/InputControls.cs b/Assets/Scripts/GameSystem/InputControls.cs
@@ -1,7 +1,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was auto-generated by com.unity.inputsystem:InputActionCodeGenerator
-//     version 1.1.0
+//     version 1.1.1
 //     from Assets/Data/InputControls.inputactions
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
@@ -33,31 +33,35 @@ public @InputControls()
                     ""id"": ""591093b7-743c-42e6-b71e-bab02d178bd1"",
                     ""expectedControlType"": ""Axis"",
                     ""processors"": ""AxisDeadzone(min=0.1,max=1)"",
-                    ""interactions"": """"
+                    ""interactions"": """",
+                    ""initialStateCheck"": true
                 },
                 {
                     ""name"": ""Steering"",
                     ""type"": ""Value"",
                     ""id"": ""67e3403a-b3e8-43af-ab52-4575ba23afef"",
                     ""expectedControlType"": ""Axis"",
                     ""processors"": ""AxisDeadzone(min=0.1,max=1)"",
-                    ""interactions"": """"
+                    ""interactions"": """",
+                    ""initialStateCheck"": true
                 },
                 {
                     ""name"": ""Reset"",
                     ""type"": ""Button"",
                     ""id"": ""218640d2-e6dc-4136-842e-4621c0883e15"",
                     ""expectedControlType"": """",
                     ""processors"": ""AxisDeadzone(min=0.1,max=1)"",
-                    ""interactions"": """"
+                    ""interactions"": """",
+                    ""initialStateCheck"": false
                 },
                 {
                     ""name"": ""Pause"",
                     ""type"": ""Button"",
                     ""id"": ""097a2ec8-8df3-4d48-96e5-fbf096270878"",
                     ""expectedControlType"": """",
                     ""processors"": ""AxisDeadzone(min=0.1,max=1)"",
-                    ""interactions"": """"
+                    ""interactions"": """",
+                    ""initialStateCheck"": false
                 }
             ],
             ""bindings"": [
@@ -348,15 +352,17 @@ public @InputControls()
                     ""id"": ""c57759c4-f215-4fe9-bd6c-1c835c6074bd"",
                     ""expectedControlType"": ""Button"",
                     ""processors"": """",
-                    ""interactions"": """"
+                    ""interactions"": """",
+                    ""initialStateCheck"": false
                 },
                 {
                     ""name"": ""TimeOfDay"",
                     ""type"": ""Value"",
                     ""id"": ""bfb079cd-5e64-4031-b061-eb65384dacba"",
                     ""expectedControlType"": """",
                     ""processors"": ""AxisDeadzone(min=0.1,max=1)"",
-                    ""interactions"": """"
+                    ""interactions"": """",
+                    ""initialStateCheck"": true
                 }
             ],
             ""bindings"": [