xevion/Boids
1
0
Fork 0
mirror of https://github.com/Xevion/Boids.git synced 2025-12-09 04:06:34 -06:00
Code Issues Packages Projects Releases 1 Wiki Activity

added escape keybind for exiting menus, adjustment panel close behavior, tweaked adjustment panel sliders/toggles/labels positioning and scaling

Browse Source
This commit is contained in:
Xevion
2020-05-22 19:22:46 -05:00
parent 6fb2a8d869
commit 5a265cdc75
2 changed files with 2332 additions and 161 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2457
Boids/Assets/Scenes/Project.unity
View File

File diff suppressed because it is too large Load Diff

36
Boids/Assets/Scripts/UIController.cs
View File

@@ -1,5 +1,6 @@
using System; using System;
using TMPro; using TMPro;
using UnityEditor;
using UnityEngine; using UnityEngine;
using UnityEngine.UI; using UnityEngine.UI;
@@ -57,7 +58,7 @@ public class UIController : MonoBehaviour {
// Add event functions // Add event functions
startButton.onClick.AddListener(OnStartButton); startButton.onClick.AddListener(OnStartButton);
aboutButton.onClick.AddListener(OnAboutButton); aboutButton.onClick.AddListener(OnAboutButton);
aboutCloseButton.onClick.AddListener(OnAboutClose); aboutCloseButton.onClick.AddListener(OnAboutCloseButton);
settingsButton.onClick.AddListener(OnSettingsButton); settingsButton.onClick.AddListener(OnSettingsButton);
settingsCloseButton.onClick.AddListener(OnSettingsCloseButton); settingsCloseButton.onClick.AddListener(OnSettingsCloseButton);
@@ -78,6 +79,27 @@ public class UIController : MonoBehaviour {
_titleElements = new[] {titleText.gameObject, startButton.gameObject, settingsButton.gameObject}; _titleElements = new[] {titleText.gameObject, startButton.gameObject, settingsButton.gameObject};
} }
private void Update() {
// Exit to the title screen with Escape key
if (Input.GetKeyDown(KeyCode.Escape)) {
Debug.Log($"Escape key pressed");
switch (_currentUI) {
case UIStance.About:
OnAboutCloseButton();
break;
case UIStance.Play:
OnPlayCloseButton();
break;
case UIStance.Settings:
OnSettingsCloseButton();
break;
case UIStance.Title:
break;
default:
throw new ArgumentOutOfRangeException();
}
}
}
// Move Title Elements In/Out // Move Title Elements In/Out
private void MoveTitleElements(bool away) { private void MoveTitleElements(bool away) {
@@ -157,7 +179,7 @@ public class UIController : MonoBehaviour {
} }
// Handle returning to the Title Screen, closing the About Screen // Handle returning to the Title Screen, closing the About Screen
private void OnAboutClose() { private void OnAboutCloseButton() {
if (_currentUI == UIStance.About) { if (_currentUI == UIStance.About) {
Debug.Log($"Screen Transition: {_currentUI} -> {UIStance.Title}"); Debug.Log($"Screen Transition: {_currentUI} -> {UIStance.Title}");
MoveAboutElements(true); MoveAboutElements(true);
@@ -165,4 +187,14 @@ public class UIController : MonoBehaviour {
_currentUI = UIStance.Title; _currentUI = UIStance.Title;
} }
} }
// Handle returning to the Title Screen, closing the Play Screen
private void OnPlayCloseButton() {
if (_currentUI == UIStance.Play) {
Debug.Log($"Screen Transition: {_currentUI} -> {UIStance.Title}");
MoveAdjustmentElements(true);
MoveTitleElements(false);
_currentUI = UIStance.Title;
}
}
} }