Skip to content

Commit b46efd9

Browse files
MelvMay-UnityMelvMay-Unity
committed
Move scene reset to the Sandbox menu and out of scene control.
1 parent d755f03 commit b46efd9

File tree

98 files changed

+17
-244
lines changed

Some content is hidden

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

98 files changed

+17
-244
lines changed

‎LowLevel/Sandbox/Assets/Sandbox/Scripts/SandboxManager.cs

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ public float CameraZoom
3030
private ControlsMenu.CustomButton m_SingleStepButton;
3131
private ControlsMenu.CustomButton m_DebugButton;
3232
private ControlsMenu.CustomButton m_UIButton;
33+
private ControlsMenu.CustomButton m_ResetButton;
3334
private ControlsMenu.CustomButton m_QuitButton;
3435

3536
public string StartScene = string.Empty;
@@ -135,15 +136,18 @@ private void Start()
135136
m_SingleStepButton = ControlsMenu.singleStepButton;
136137
m_DebugButton = ControlsMenu.debugButton;
137138
m_UIButton = ControlsMenu.uiButton;
139+
m_ResetButton = ControlsMenu.resetButton;
138140
m_QuitButton = ControlsMenu.quitButton;
139141

140142
m_PausePlayButton.button.clickable.clicked += TogglePausePlay;
141143
m_SingleStepButton.button.clickable.clicked += SingleStep;
142144
m_DebugButton.button.clickable.clicked += ToggleDebugging;
143145
m_UIButton.button.clickable.clicked += ToggleUI;
144-
146+
m_ResetButton.button.clickable.clicked += ResetScene;
147+
145148
m_PausePlayButton.button.text = WorldPaused ? "Play" : "Pause";
146149
m_SingleStepButton.button.enabledSelf = WorldPaused;
150+
147151

148152
var defaultWorld = PhysicsWorld.defaultWorld;
149153
m_MenuDefaults = new MenuDefaults
@@ -512,8 +516,7 @@ private void SetupOptions()
512516
{
513517
ColorShapeState = evt.newValue;
514518

515-
if (!m_DisableUIRestarts)
516-
SceneResetAction?.Invoke();
519+
ResetScene();
517520
});
518521

519522
// Bodies.
@@ -671,6 +674,12 @@ private void TreeSelectionChanged()
671674
m_SceneManifest.LoadScene(sceneName, ResetSceneState);
672675
}
673676

677+
private void ResetScene()
678+
{
679+
if (!m_DisableUIRestarts)
680+
SceneResetAction?.Invoke();
681+
}
682+
674683
// Reset the settings and reload the current scene.
675684
private void Restart()
676685
{

‎LowLevel/Sandbox/Assets/Sandbox/UI/ControlsMenu/ControlsMenu.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ public void Reset()
3838
public CustomButton singleStepButton { get; private set; }
3939
public CustomButton debugButton { get; private set; }
4040
public CustomButton uiButton { get; private set; }
41+
public CustomButton resetButton { get; private set; }
4142
public CustomButton quitButton { get; private set; }
4243

4344
public CustomButton this[int index]
@@ -84,6 +85,7 @@ private void OnEnable()
8485
pausePlayButton = new CustomButton(root.Q<Button>("pause-play"));
8586
singleStepButton = new CustomButton(root.Q<Button>("single-step"));
8687
debugButton = new CustomButton(root.Q<Button>("debug"));
88+
resetButton = new CustomButton(root.Q<Button>("reset"));
8789
uiButton = new CustomButton(root.Q<Button>("ui"));
8890
quitButton = new CustomButton(root.Q<Button>("quit"));
8991

‎LowLevel/Sandbox/Assets/Sandbox/UI/ControlsMenu/ControlsMenu.uxml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
<ui:Button text="Step" name="single-step" enable-rich-text="false" emoji-fallback-support="false" double-click-selects-word="false" triple-click-selects-line="false" display-tooltip-when-elided="false" focusable="false" enabled="false" style="margin-left: 1px; margin-right: 1px;"/>
1111
<ui:Button text="Debug" name="debug" enable-rich-text="false" emoji-fallback-support="false" double-click-selects-word="false" triple-click-selects-line="false" display-tooltip-when-elided="false" focusable="false" style="margin-left: 1px; margin-right: 1px;"/>
1212
<ui:Button text="UI" name="ui" enable-rich-text="false" emoji-fallback-support="false" double-click-selects-word="false" triple-click-selects-line="false" display-tooltip-when-elided="false" focusable="false" style="margin-left: 1px; margin-right: 1px;"/>
13+
<ui:Button text="Reset" name="reset" enable-rich-text="false" emoji-fallback-support="false" double-click-selects-word="false" triple-click-selects-line="false" display-tooltip-when-elided="false" focusable="false" style="margin-left: 1px; margin-right: 1px;"/>
1314
<ui:Button text="Quit" name="quit" enable-rich-text="false" emoji-fallback-support="false" double-click-selects-word="false" triple-click-selects-line="false" display-tooltip-when-elided="false" focusable="false" style="margin-left: 16px;"/>
1415
</ui:VisualElement>
1516
</ui:VisualElement>

‎LowLevel/Sandbox/Assets/Scenes/Batching/BatchQueries/BatchQueries.cs

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -116,10 +116,6 @@ private void SetupOptions()
116116
drawNormals.value = m_DrawPoints;
117117
drawNormals.RegisterValueChangedCallback(evt => { m_DrawNormals = evt.newValue; });
118118

119-
// Reset Scene.
120-
var resetScene = root.Q<Button>("reset-scene");
121-
resetScene.clicked += SetupScene;
122-
123119
// Fetch the scene description.
124120
var sceneDescription = root.Q<Label>("scene-description");
125121
sceneDescription.text = $"\"{m_SceneManifest.LoadedSceneName}\"\n{m_SceneManifest.LoadedSceneDescription}";

‎LowLevel/Sandbox/Assets/Scenes/Batching/BatchQueries/BatchQueriesMenu.uxml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
<ui:Toggle label="Draw Rays" name="draw-rays" focusable="false"/>
1212
<ui:Toggle label="Draw Points" name="draw-points" focusable="false"/>
1313
<ui:Toggle label="Draw Normals" name="draw-normals" focusable="false"/>
14-
<ui:Button text="Reset Scene" name="reset-scene" focusable="false"/>
1514
</ui:Tab>
1615
</ui:TabView>
1716
<ui:VisualElement name="description" style="flex-grow: 1; flex-shrink: 0; color: rgba(210, 210, 210, 0.5); -unity-text-align: middle-left; align-self: stretch;">

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

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -105,11 +105,7 @@ private void SetupOptions()
105105
var gravityScale = root.Q<Slider>("gravity-scale");
106106
gravityScale.value = m_GravityScale;
107107
gravityScale.RegisterValueChangedCallback(evt => { m_GravityScale = evt.newValue; });
108-
109-
// Reset Scene.
110-
var resetScene = root.Q<Button>("reset-scene");
111-
resetScene.clicked += SetupScene;
112-
108+
113109
// Fetch the scene description.
114110
var sceneDescription = root.Q<Label>("scene-description");
115111
sceneDescription.text = $"\"{m_SceneManifest.LoadedSceneName}\"\n{m_SceneManifest.LoadedSceneDescription}";

‎LowLevel/Sandbox/Assets/Scenes/Batching/Shooter/ShooterMenu.uxml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
<ui:MinMaxSlider label="Batch Speed" value="3,550" low-limit="10" high-limit="50" focusable="false" name="batch-speed"/>
1111
<ui:MinMaxSlider label="Batch Size" value="0.01,0.1" low-limit="0.01" high-limit="0.5" focusable="false" name="batch-size"/>
1212
<ui:Slider label="Gravity Scale" value="1" high-value="5" name="gravity-scale" fill="true" show-input-field="true" low-value="1" focusable="false"/>
13-
<ui:Button text="Reset Scene" name="reset-scene" focusable="false"/>
1413
</ui:Tab>
1514
</ui:TabView>
1615
<ui:VisualElement name="description" style="flex-grow: 1; flex-shrink: 0; color: rgba(210, 210, 210, 0.5); -unity-text-align: middle-left; align-self: stretch;">

‎LowLevel/Sandbox/Assets/Scenes/Benchmark/Barrel/Barrel.cs

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -76,10 +76,6 @@ private void SetupOptions()
7676
SetupScene();
7777
});
7878

79-
// Reset Scene.
80-
var resetScene = root.Q<Button>("reset-scene");
81-
resetScene.clicked += SetupScene;
82-
8379
// Fetch the scene description.
8480
var sceneDescription = root.Q<Label>("scene-description");
8581
sceneDescription.text = $"\"{m_SceneManifest.LoadedSceneName}\"\n{m_SceneManifest.LoadedSceneDescription}";

‎LowLevel/Sandbox/Assets/Scenes/Benchmark/Barrel/BarrelMenu.uxml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
<ui:Tab label="Barrel Options" tabindex="0" name="Tab">
77
<ui:DropdownField label="Object Type" name="object-type" choices="Circle,Capsule,Polygon,PrimitiveMix,Compound,Ragdoll" index="0" focusable="false"/>
88
<ui:Toggle label="Fast Collisions" name="fast-collisions" focusable="false"/>
9-
<ui:Button text="Reset Scene" name="reset-scene" focusable="false"/>
109
</ui:Tab>
1110
</ui:TabView>
1211
<ui:VisualElement name="description" style="flex-grow: 1; flex-shrink: 0; color: rgba(210, 210, 210, 0.5); -unity-text-align: middle-left; align-self: stretch;">

‎LowLevel/Sandbox/Assets/Scenes/Benchmark/Funnel/Funnel.cs

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -329,10 +329,6 @@ private void SetupOptions()
329329
fastCollisions.value = m_FastCollisions;
330330
fastCollisions.RegisterValueChangedCallback(evt => { m_FastCollisions = evt.newValue; });
331331

332-
// Reset Scene.
333-
var resetScene = root.Q<Button>("reset-scene");
334-
resetScene.clicked += SetupScene;
335-
336332
// Fetch the scene description.
337333
var sceneDescription = root.Q<Label>("scene-description");
338334
sceneDescription.text = $"\"{m_SceneManifest.LoadedSceneName}\"\n{m_SceneManifest.LoadedSceneDescription}";

0 commit comments

Comments
 (0)