Some scene refactoring.

Author: MelvMay-Unity

LowLevel/Sandbox/Assets/Sandbox.unity

@@ -303,8 +303,8 @@ MonoBehaviour:
     Name: Spinner
     Category: Benchmarks
     Description: A simulation of Centripetal forces.
-  - ScenePath: Assets/Scenes/Benchmark/TriggerFunnel/TriggerFunnel.unity
-    Name: Trigger Funnel
+  - ScenePath: Assets/Scenes/Benchmark/Funnel/Funnel.unity
+    Name: Funnel
     Category: Benchmarks
     Description: Checking the performance of various collision interactions in a
       constrained space.

LowLevel/Sandbox/Assets/Scenes/Batching/Shooter/Shooter.cs

@@ -41,6 +41,7 @@ private void OnEnable()
         m_SandboxManager.SceneResetAction = SetupScene;
 
         // Set Overrides.
+        m_SandboxManager.SetOverrideColorShapeState(false);
         m_SandboxManager.SetOverrideDrawOptions(overridenOptions: PhysicsWorld.DrawOptions.AllJoints, fixedOptions: PhysicsWorld.DrawOptions.AllJoints);
 
         m_OldGravity = PhysicsWorld.defaultWorld.gravity;
@@ -59,6 +60,8 @@ private void OnDisable()
 
         PhysicsEvents.PreSimulate -= OnPreSimulation;
 
+        // Reset overrides.
+        m_SandboxManager.ResetOverrideColorShapeState();        
         m_SandboxManager.ResetOverrideDrawOptions();
     }
 

LowLevel/Sandbox/Assets/Scenes/Benchmark/TriggerFunnel.meta renamed to LowLevel/Sandbox/Assets/Scenes/Benchmark/Funnel.meta

@@ -6,7 +6,7 @@
 using UnityEngine.UIElements;
 using Random = Unity.Mathematics.Random;
 
-public class TriggerFunnel : MonoBehaviour
+public class Funnel : MonoBehaviour
 {
     private SandboxManager m_SandboxManager;
     private SceneManifest m_SceneManifest;

LowLevel/Sandbox/Assets/Scenes/Benchmark/TriggerFunnel/TriggerFunnel.cs renamed to LowLevel/Sandbox/Assets/Scenes/Benchmark/Funnel/Funnel.cs

@@ -3,7 +3,7 @@
     <ui:VisualElement name="VisualElement" picking-mode="Ignore" style="width: 100%; height: 100%; align-items: flex-start; justify-content: flex-end; align-content: auto; padding-left: 8px; padding-bottom: 8px;">
         <ui:VisualElement name="menu-region" style="width: 18%; height: auto; margin-top: 2px; margin-right: 2px; margin-bottom: 2px; margin-left: 2px; align-items: auto;">
             <ui:TabView tabindex="0" style="width: 100%; height: 100%;">
-                <ui:Tab label="Sensor Funnel Options" tabindex="0" name="Tab">
+                <ui:Tab label="Funnel Options" tabindex="0" name="Tab">
                     <ui:DropdownField label="Object Type" name="object-type" choices="Circle,Capsule,Polygon,Compound,Ragdoll,Softbody,Random" index="0" focusable="false"/>
                     <ui:Slider label="Object Scale" value="1" high-value="3" name="object-scale" show-input-field="true" low-value="1" fill="true" focusable="false"/>
                     <ui:Slider label="Spawn Period" value="1" high-value="1" name="spawn-period" show-input-field="true" low-value="0.1" fill="true" focusable="false"/>

LowLevel/Sandbox/Assets/Scenes/Benchmark/TriggerFunnel/TriggerFunnel.cs.meta renamed to LowLevel/Sandbox/Assets/Scenes/Benchmark/Funnel/Funnel.cs.meta

@@ -36,6 +36,9 @@ private void OnEnable()
         // Set up the scene reset action.
         m_SandboxManager.SceneResetAction = SetupScene;
 
+        // Set Overrides.
+        m_SandboxManager.SetOverrideColorShapeState(true);
+        
         SetupOptions();
 
         SetupScene();
@@ -46,6 +49,9 @@ private void OnEnable()
     private void OnDisable()
     {
         PhysicsEvents.PostSimulate -= OnPostSimulation;
+        
+        // Reset overrides.
+        m_SandboxManager.ResetOverrideColorShapeState();        
     }
 
     private void SetupOptions()