Skip to content

Commit d435ef7

Browse files
MelvMay-UnityMelvMay-Unity
committed
Sandbox refactoring.
1 parent 133b5b2 commit d435ef7

File tree

50 files changed

+61
-5
lines changed

Some content is hidden

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

50 files changed

+61
-5
lines changed

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

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,8 @@ public float CameraZoom
2222
set => m_CameraZoomElement.value = value;
2323
}
2424

25+
public UIDocument SceneOptionsUI { get; set; }
26+
2527
private bool ColorShapeState { get; set; }
2628

2729
public string StartScene = string.Empty;
@@ -305,10 +307,14 @@ private void Update()
305307

306308
// Toggle Shortcut Men.
307309
ShortcutMenu.gameObject.SetActive(!ShortcutMenu.gameObject.activeInHierarchy);
308-
310+
309311
// Main Menu.
310312
m_MainMenuDocument.rootVisualElement.style.display = m_ShowUI ? DisplayStyle.Flex : DisplayStyle.None;
311313

314+
// If we have an assigned scene options UI then toggle it.
315+
if (SceneOptionsUI != null)
316+
SceneOptionsUI.enabled = m_ShowUI;
317+
312318
return;
313319
}
314320

@@ -694,6 +700,7 @@ private void TreeSelectionChanged()
694700
DebuggingMenu.ResetStats();
695701
m_CameraManipulator.OverlapUI = 0;
696702

703+
SceneOptionsUI = null;
697704
SceneResetAction = null;
698705
m_SceneManifest.LoadScene(sceneName, ResetSceneState);
699706
}

‎LowLevel/Sandbox/Assets/Sandbox/UI/Styling/SandboxStyleOverrides.uss

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,6 @@ Label {
2828
justify-content: center;
2929
}
3030

31-
/*
32-
background-color: rgba(80, 100, 110, 1.0)
33-
*/
34-
3531
.unity-progress-bar__progress {
3632
background-color: var(--foreground);
3733
}
@@ -44,6 +40,11 @@ background-color: rgba(80, 100, 110, 1.0)
4440
margin-top: 2px;
4541
}
4642

43+
/* Make TabView fill whole window */
44+
TabView, .unity-tab-view__content-container, Tab, .unity-tab__content-container {
45+
flex-grow: 1;
46+
}
47+
4748
/* By default, each tab header has an underline. This hides the header underline */
4849
.unity-tab__header-underline {
4950
opacity: 0;

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ private void OnEnable()
3434
m_SandboxManager = FindFirstObjectByType<SandboxManager>();
3535
m_SceneManifest = FindFirstObjectByType<SceneManifest>();
3636
m_UIDocument = GetComponent<UIDocument>();
37+
m_SandboxManager.SceneOptionsUI = m_UIDocument;
3738

3839
m_CameraManipulator = FindFirstObjectByType<CameraManipulator>();
3940
m_CameraManipulator.CameraSize = 12f;

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ private void OnEnable()
3232
m_SandboxManager = FindFirstObjectByType<SandboxManager>();
3333
m_SceneManifest = FindFirstObjectByType<SceneManifest>();
3434
m_UIDocument = GetComponent<UIDocument>();
35+
m_SandboxManager.SceneOptionsUI = m_UIDocument;
3536

3637
m_CameraManipulator = FindFirstObjectByType<CameraManipulator>();
3738
m_CameraManipulator.CameraSize = 12f;

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ private void OnEnable()
3232
m_SandboxManager = FindFirstObjectByType<SandboxManager>();
3333
m_SceneManifest = FindFirstObjectByType<SceneManifest>();
3434
m_UIDocument = GetComponent<UIDocument>();
35+
m_SandboxManager.SceneOptionsUI = m_UIDocument;
3536

3637
m_CameraManipulator = FindFirstObjectByType<CameraManipulator>();
3738
m_CameraManipulator.CameraSize = 60f;

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ private void OnEnable()
3939
m_SandboxManager = FindFirstObjectByType<SandboxManager>();
4040
m_SceneManifest = FindFirstObjectByType<SceneManifest>();
4141
m_UIDocument = GetComponent<UIDocument>();
42+
m_SandboxManager.SceneOptionsUI = m_UIDocument;
4243

4344
m_CameraManipulator = FindFirstObjectByType<CameraManipulator>();
4445
m_CameraManipulator.CameraSize = 35f;

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ private void OnEnable()
1919
m_SandboxManager = FindFirstObjectByType<SandboxManager>();
2020
m_SceneManifest = FindFirstObjectByType<SceneManifest>();
2121
m_UIDocument = GetComponent<UIDocument>();
22+
m_SandboxManager.SceneOptionsUI = m_UIDocument;
2223

2324
m_CameraManipulator = FindFirstObjectByType<CameraManipulator>();
2425
m_CameraManipulator.CameraPosition = new Vector2(-10f, -10f);

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ private void OnEnable()
1616
m_SandboxManager = FindFirstObjectByType<SandboxManager>();
1717
m_SceneManifest = FindFirstObjectByType<SceneManifest>();
1818
m_UIDocument = GetComponent<UIDocument>();
19+
m_SandboxManager.SceneOptionsUI = m_UIDocument;
1920

2021
m_CameraManipulator = FindFirstObjectByType<CameraManipulator>();
2122
m_CameraManipulator.CameraSize = 100f;

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ private void OnEnable()
1818
m_SandboxManager = FindFirstObjectByType<SandboxManager>();
1919
m_SceneManifest = FindFirstObjectByType<SceneManifest>();
2020
m_UIDocument = GetComponent<UIDocument>();
21+
m_SandboxManager.SceneOptionsUI = m_UIDocument;
2122

2223
m_CameraManipulator = FindFirstObjectByType<CameraManipulator>();
2324
m_CameraManipulator.CameraSize = 80f;

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ private void OnEnable()
1818
m_SandboxManager = FindFirstObjectByType<SandboxManager>();
1919
m_SceneManifest = FindFirstObjectByType<SceneManifest>();
2020
m_UIDocument = GetComponent<UIDocument>();
21+
m_SandboxManager.SceneOptionsUI = m_UIDocument;
2122

2223
m_CameraManipulator = FindFirstObjectByType<CameraManipulator>();
2324
m_CameraManipulator.CameraSize = 80f;

0 commit comments

Comments
 (0)