add: ui elements and adjust ui

Signed-off-by: Alptuğ Cırıt <[email protected]>

Assets/AWSIM/Scripts/UI/DemoUI.cs

@@ -19,7 +19,7 @@ private void Start()
             timeScaleText.text = "x " + timeScaleSlider.value.ToString("F2");
             var version = Application.version;
             print(version);
-            versionText.text = "AWSIM Labs v \n" + version;
+            versionText.text = "AWSIM Labs\nv" + version;
         }
 
         public void SetTimeScale(float timeScale)

Assets/AWSIM/Scripts/UI/HotkeyHandler.cs

@@ -1,31 +1,34 @@
 using UnityEngine;
+using UnityEngine.Serialization;
 
 namespace AWSIM.Scripts.UI
 {
     public class HotkeyHandler : MonoBehaviour
     {
-        [SerializeField] private Canvas mainMenu;
+        [SerializeField] private UISideBarHandler uiSideBarHandler;
 
         private EgoVehiclePositionManager egoVehiclePositionManager;
+        private TrafficControlManager trafficControlManager;
 
         private void Awake()
         {
             egoVehiclePositionManager = GetComponent<EgoVehiclePositionManager>();
+            trafficControlManager = GetComponent<TrafficControlManager>();
         }
 
         void Update()
         {
             // Toggle the main menu
             if (Input.GetKeyDown(KeyCode.Escape))
             {
-                if (!mainMenu)
+                if (!uiSideBarHandler)
                 {
                     Debug.LogWarning(
                         "The mainMenu reference is null. Please ensure the mainMenu Canvas object is assigned to mainMenu in the Inspector. Without it, the GUI cannot be toggled on/off.");
                 }
                 else
                 {
-                    mainMenu.enabled = !mainMenu.enabled;
+                    uiSideBarHandler.ToggleSideBar();
                 }
             }
 
@@ -37,6 +40,15 @@ void Update()
                     egoVehiclePositionManager.ResetEgoToSpawnPoint();
                 }
             }
+
+            // Toggle traffic visibility
+            if (Input.GetKey(KeyCode.LeftControl))
+            {
+                if (Input.GetKeyDown(KeyCode.T))
+                {
+                    trafficControlManager.TrafficManagerVisibilityToggle();
+                }
+            }
         }
     }
-}
+}

Assets/AWSIM/Scripts/UI/Toggle/UITrafficControlPlayToggle.cs

@@ -0,0 +1,33 @@
+using UnityEngine;
+using UnityEngine.UI;
+
+namespace AWSIM.Scripts.UI.Toggle
+{
+    public class UITrafficControlPlayToggle : MonoBehaviour
+    {
+        [SerializeField] public Sprite sprite1;
+        [SerializeField] public Sprite sprite2;
+
+        private TrafficControlManager trafficControlManager;
+        private Image image;
+
+        private void Start()
+        {
+            image = GetComponent<Image>();
+            trafficControlManager = FindObjectOfType<TrafficControlManager>();
+            trafficControlManager.trafficPlayToggleEvent.AddListener(OnStatusChangeUpdateImage);
+        }
+
+        private void OnStatusChangeUpdateImage(bool isToggled)
+        {
+            Debug.Log("OnStatusChangeUpdateImage called. isToggled: " + isToggled);
+
+            image.sprite = isToggled ? sprite1 : sprite2;
+        }
+
+        private void OnDestroy()
+        {
+            trafficControlManager.trafficPlayToggleEvent.RemoveListener(OnStatusChangeUpdateImage);
+        }
+    }
+}

Assets/AWSIM/Scripts/UI/Toggle/UITrafficControlVisibilityToggle.cs

@@ -0,0 +1,33 @@
+using UnityEngine;
+using UnityEngine.UI;
+
+namespace AWSIM.Scripts.UI.Toggle
+{
+    public class UITrafficControlVisibilityToggle : MonoBehaviour
+    {
+        [SerializeField] private Sprite sprite1;
+        [SerializeField] private Sprite sprite2;
+
+        private TrafficControlManager trafficControlManager;
+        private Image image;
+
+        private void Start()
+        {
+            image = GetComponent<Image>();
+            trafficControlManager = FindObjectOfType<TrafficControlManager>();
+            trafficControlManager.trafficVisibilityToggleEvent.AddListener(OnStatusChangeUpdateImage);
+        }
+
+        private void OnStatusChangeUpdateImage(bool isToggled)
+        {
+            Debug.Log("OnStatusChangeUpdateImage called. isToggled: " + isToggled);
+
+            image.sprite = isToggled ? sprite1 : sprite2;
+        }
+
+        private void OnDestroy()
+        {
+            trafficControlManager.trafficVisibilityToggleEvent.RemoveListener(OnStatusChangeUpdateImage);
+        }
+    }
+}

Assets/AWSIM/Scripts/UI/TrafficControlManager.cs

@@ -1,32 +1,58 @@
-using System;
 using AWSIM.TrafficSimulation;
 using UnityEngine;
+using UnityEngine.Events;
 
 namespace AWSIM.Scripts.UI
 {
+    public class TrafficPlayToggleEvent : UnityEvent<bool>
+    {
+    }
+
+    public class TrafficVisibilityToggleEvent : UnityEvent<bool>
+    {
+    }
+
     public class TrafficControlManager : MonoBehaviour
     {
         public TrafficManager TrafficManager { private get; set; }
 
-        public void TrafficManagerPauseResumeToggle()
+        public TrafficPlayToggleEvent trafficPlayToggleEvent;
+        public TrafficVisibilityToggleEvent trafficVisibilityToggleEvent;
+
+        private void Awake()
+        {
+            trafficPlayToggleEvent ??= new TrafficPlayToggleEvent();
+            trafficVisibilityToggleEvent ??= new TrafficVisibilityToggleEvent();
+        }
+
+        public void TrafficManagerPlayToggle()
         {
             if (TrafficManager.gameObject.activeSelf)
             {
                 TrafficManager.enabled = !TrafficManager.enabled;
+                trafficPlayToggleEvent.Invoke(TrafficManager.enabled);
             }
             else
                 Debug.Log("TrafficManager is not active. Can't pause/resume!");
         }
 
-        public void TrafficManagerEnable()
+        public void TrafficManagerVisibilityToggle()
         {
-            TrafficManager.gameObject.SetActive(true);
-            TrafficManager.enabled = true;
-        }
+            if (!TrafficManager.gameObject.activeSelf)
+            {
+                TrafficManager.gameObject.SetActive(true);
+            }
+            else
+            {
+                TrafficManager.enabled = false;
+                TrafficManager.gameObject.SetActive(false);
 
-        public void TrafficManagerDisable()
-        {
-            TrafficManager.gameObject.SetActive(false);
+                // Invoke event
+                trafficPlayToggleEvent.Invoke(TrafficManager.enabled);
+            }
+
+            //Invoke event
+            trafficVisibilityToggleEvent.Invoke(TrafficManager.gameObject.activeSelf);
         }
 
         public void TrafficManagerReset()
@@ -41,7 +67,13 @@ public void TrafficManagerReset()
                 TrafficManager.gameObject.SetActive(true);
                 TrafficManager.enabled = true;
                 TrafficManager.npcVehicleSimulator.ClearAll();
+
+                // Invoke event
+                trafficVisibilityToggleEvent.Invoke(TrafficManager.gameObject.activeSelf);
             }
+
+            // Invoke event
+            trafficPlayToggleEvent.Invoke(TrafficManager.enabled);
         }
 
         public void TrafficMangerSetSeed(int seed)
@@ -54,4 +86,4 @@ public void TrafficMangerSetSeed(int seed)
             TrafficManager.seed = seed;
         }
     }
-}
+}

Assets/AWSIM/Scripts/UI/UIBridge.cs

@@ -8,7 +8,8 @@ public class UIBridge : MonoBehaviour
     {
         private EgoVehiclePositionManager egoVehiclePositionManager;
         private TrafficControlManager trafficControlManager;
-        [SerializeField] InputField trafficSeedInputField;
+
+        [SerializeField] private InputField trafficSeedInputField;
 
         private void Awake()
         {
@@ -21,19 +22,14 @@ public void ResetEgoToSpawnPoint()
             egoVehiclePositionManager.ResetEgoToSpawnPoint();
         }
 
-        public void TrafficManagerPauseResumeToggle()
-        {
-            trafficControlManager.TrafficManagerPauseResumeToggle();
-        }
-
-        public void TrafficManagerEnable()
+        public void TrafficManagerPlayToggle(bool isOn)
         {
-            trafficControlManager.TrafficManagerEnable();
+            trafficControlManager.TrafficManagerPlayToggle();
         }
 
-        public void TrafficManagerDisable()
+        public void TrafficManagerVisibilityToggle(bool isOn)
         {
-            trafficControlManager.TrafficManagerDisable();
+            trafficControlManager.TrafficManagerVisibilityToggle();
         }
 
         public void TrafficManagerReset()
@@ -53,4 +49,4 @@ public void TrafficMangerSetSeed()
             trafficControlManager.TrafficMangerSetSeed(seed);
         }
     }
-}
+}

Assets/AWSIM/Scripts/UI/UIFunctions.cs

@@ -0,0 +1,56 @@
+using System.Collections;
+using UnityEngine;
+
+namespace AWSIM.Scripts.UI
+{
+    // Functions used by the UI elements
+    public static class UIFunctions
+    {
+        // Lerp UI objects position
+        public static IEnumerator LerpUIRectPosition(RectTransform uiRect, Vector2 targetPosition, float lerpValue, bool willDisableAtEnd)
+        {
+            float elapsedTime = 0f;
+            Vector2 currentPosition = uiRect.anchoredPosition;
+
+            while (elapsedTime < 1f)
+            {
+                elapsedTime += Time.deltaTime * lerpValue;
+                uiRect.anchoredPosition = Vector2.Lerp(currentPosition, targetPosition, elapsedTime);
+                yield return null;
+            }
+
+            // Ensure the UI element is exactly at the target position
+            uiRect.anchoredPosition = targetPosition;
+
+            // Disable at end if wanted
+            if (willDisableAtEnd)
+            {
+                uiRect.gameObject.SetActive(false);
+            }
+        }
+
+        // Lerp UI objects height
+        public static IEnumerator LerpUIRectHeight(RectTransform uiRect, float targetHeight, float lerpValue, bool willDisableAtEnd)
+        {
+            float elapsedTime = 0f;
+            float currentHeight = uiRect.sizeDelta.y;
+
+            while (elapsedTime < 1f)
+            {
+                elapsedTime += Time.deltaTime * lerpValue;
+                float lerpedHeight = Mathf.Lerp(currentHeight, targetHeight, elapsedTime);
+                uiRect.sizeDelta = new Vector2(uiRect.sizeDelta.x, lerpedHeight);
+                yield return null;
+            }
+
+            // Ensure the UI element has the target height
+            uiRect.sizeDelta = new Vector2(uiRect.sizeDelta.x, targetHeight);
+
+            // Disable at end if wanted
+            if (willDisableAtEnd)
+            {
+                uiRect.gameObject.SetActive(false);
+            }
+        }
+    }
+}