fix: traffic manager reference (#143)

Signed-off-by: Alptuğ Cırıt <[email protected]>
autowarefoundation · Sep 18, 2024 · a094171 · a094171
1 parent ac4ff08
commit a094171
Show file tree

Hide file tree

Showing 2 changed files with 42 additions and 14 deletions.
diff --git a/Assets/AWSIM/Scripts/UI/TrafficControlManager.cs b/Assets/AWSIM/Scripts/UI/TrafficControlManager.cs
@@ -86,22 +86,48 @@ public void TrafficManagerReset()
 
         public void TrafficManagerUpdate()
         {
-            if (!TrafficManager.gameObject.activeSelf)
+            if (!TrafficManager)
             {
-                Debug.LogWarning("TrafficManager is not active. Can't update traffic density!");
+                Debug.LogWarning("Traffic Manager does not exist!");
             }
             else
             {
-                TrafficManager.enabled = true;
-                TrafficPlayToggleEvent.Invoke(TrafficManager.enabled);
+                if (!TrafficManager.gameObject.activeSelf)
+                {
+                    Debug.LogWarning("TrafficManager is not active. Can't update traffic density!");
+                }
+                else
+                {
+                    TrafficManager.enabled = true;
+                    TrafficPlayToggleEvent.Invoke(TrafficManager.enabled);
+
+                    TrafficManager.targetVehicleCount = TargetVehicleCount;
+                    TrafficManager.seed = SeedInput;
+                    TrafficManager.RestartTraffic();
+                }
+            }
+        }
 
-                TrafficManager.targetVehicleCount = TargetVehicleCount;
-                TrafficManager.seed = SeedInput;
-                TrafficManager.RestartTraffic();
+        public int GetMaxVehicleCount()
+        {
+            if (!TrafficManager)
+            {
+                Debug.LogWarning("Traffic Manager does not exist!");
+                return -999;
             }
+
+            return TrafficManager.maxVehicleCount;
         }
 
-        public int GetMaxVehicleCount() => TrafficManager.maxVehicleCount;
-        public int GetTargetVehicleCount() => TrafficManager.targetVehicleCount;
+        public int GetTargetVehicleCount()
+        {
+            if (!TrafficManager)
+            {
+                Debug.LogWarning("Traffic Manager does not exist!");
+                return -998;
+            }
+
+            return TrafficManager.targetVehicleCount;
+        }
     }
 }
diff --git a/Assets/AWSIM/Scripts/UI/UITrafficVehicleDensity.cs b/Assets/AWSIM/Scripts/UI/UITrafficVehicleDensity.cs
@@ -31,15 +31,17 @@ public void TrafficManagerSetTargetVehicleCount()
             var targetValue = Convert.ToInt32(_trafficTargetVehicleCountSlider.value);
             _trafficControlManager.TargetVehicleCount = targetValue;
             _textField.text = targetValue.ToString();
-
             _trafficControlManager.TrafficManagerUpdate();
         }
         private void InitializeSlider()
         {
-            _trafficTargetVehicleCountSlider.maxValue = _trafficControlManager.GetMaxVehicleCount();
-            _trafficTargetVehicleCountSlider.value = _trafficControlManager.GetTargetVehicleCount();
-            _textField.text = _trafficTargetVehicleCountSlider.value.ToString(CultureInfo.InvariantCulture);
-            _textField.Rebuild(CanvasUpdate.PostLayout);
+            if (_trafficControlManager)
+            {
+                _trafficTargetVehicleCountSlider.maxValue = _trafficControlManager.GetMaxVehicleCount();
+                _trafficTargetVehicleCountSlider.value = _trafficControlManager.GetTargetVehicleCount();
+                _textField.text = _trafficTargetVehicleCountSlider.value.ToString(CultureInfo.InvariantCulture);
+                _textField.Rebuild(CanvasUpdate.PostLayout);
+            }
         }
     }
 }