Merge branch 'InterfaceRework' into development

CrosshairMod/Interface.cs

@@ -19,8 +19,7 @@ namespace CrosshairMod
         /// A list of all Objects (That includes buttons, sliders etc) inside the GUI Window
         /// This makes it easy to add more components if it is needed.
         /// </summary>
-        private static List<InputObject> m_inputs = new List<InputObject>();
+        private static Dictionary<string, Input.InputObject> m_inputs = new Dictionary<string, Input.InputObject>();
-        // TODO: Replace with dictionary, the whole concept of having IDs inside the objects is stupid and unnecessary
 
         /// <summary>
         /// RGBA Slider values
@@ -43,8 +42,8 @@ namespace CrosshairMod
         /// <param name="onClickEvent">Action to be executed when the button is pressed</param>
         private static void AddButton(float x, float y, float width, float height, string label, string ID, params EventHandler[] onClickEvent)
         {
-            Input.Button buttonObj = new Input.Button(x, y, width, height, label, ID, onClickEvent);
+            Input.Button buttonObj = new Input.Button(x, y, width, height, label, onClickEvent);
-            m_inputs.Add(buttonObj);
+            m_inputs.Add(ID, buttonObj);
         }
 
         /// <summary>
@@ -60,8 +59,8 @@ namespace CrosshairMod
         /// <param name="ID">Key of the slider</param>
         private static void AddSlider(float x, float y, float width, float height, float min, float max, float init, string ID)
         {
-            Input.Slider sliderObj = new Input.Slider(x, y, width, height, min, max, init, ID);
+            Input.Slider sliderObj = new Input.Slider(x, y, width, height, min, max, init);
-            m_inputs.Add(sliderObj);
+            m_inputs.Add(ID, sliderObj);
         }
 
         /// <summary>
@@ -111,7 +110,6 @@ namespace CrosshairMod
 
         public static void Render()
         {
-            // TODO: Think about making this a GUILayout.ModalWindow
             if (m_visible)
                 GUI.Window(420, new Rect(m_position, m_dimension), RenderFunc, "Crosshair Settings");
         }
@@ -136,10 +134,10 @@ namespace CrosshairMod
 
             // Set crosshair Colour after getting slider values
             IEnumerable<Input.Slider> it = m_inputs.OfType<Input.Slider>();
-            rSliderValue = (int)it.First(slider => slider.ID == "red").Value;
+            rSliderValue = (int)((Input.Slider)m_inputs["red"]).Value;
-            gSliderValue = (int)it.First(slider => slider.ID == "green").Value;
+            gSliderValue = (int)((Input.Slider)m_inputs["green"]).Value;
-            bSliderValue = (int)it.First(slider => slider.ID == "blue").Value;
+            bSliderValue = (int)((Input.Slider)m_inputs["blue"]).Value;
-            aSliderValue = (int)it.First(slider => slider.ID == "alpha").Value;
+            aSliderValue = (int)((Input.Slider)m_inputs["alpha"]).Value;
 
             Crosshair.SetColor(rSliderValue, gSliderValue, bSliderValue, aSliderValue);
 
@@ -153,9 +151,9 @@ namespace CrosshairMod
         /// </summary>
         private static void HandleInputObjects()
         {
-            foreach(InputObject obj in m_inputs)
+            foreach(KeyValuePair<string, Input.InputObject> obj in m_inputs)
             {
-                obj.Update();
+                obj.Value.Update();
             }
         }
     }

CrosshairMod/Interface/Button.cs

@@ -29,10 +29,9 @@ namespace CrosshairMod.Input
         /// <param name="width">Width</param>
         /// <param name="height">Height</param>
         /// <param name="label">Text inside the button</param>
-        /// <param name="ID">Button ID</param>
         /// <param name="OnClickEvent">Action to execute when button is pressed</param>
-        public Button(float x, float y, float width, float height, string label, string ID, params EventHandler[] OnClickEvent)
+        public Button(float x, float y, float width, float height, string label, params EventHandler[] OnClickEvent)
-            : base(x, y, width, height, ID)
+            : base(x, y, width, height)
         {
             Logging.Debug.Log("Button Constructor: " + label);
 
@@ -47,9 +46,8 @@ namespace CrosshairMod.Input
         /// <summary>
         /// Sad, pathetic default constructor
         /// </summary>
-        /// <param name="ID"></param>
+        public Button()
-        public Button(string ID)
+            : base(0, 0, 0, 0)
-            : base(0, 0, 0, 0, ID)
         {
             // Empty
         }

CrosshairMod/Interface/InputObject.cs

@@ -6,7 +6,7 @@ using System.Text;
 
 using UnityEngine;
 
-namespace CrosshairMod
+namespace CrosshairMod.Input
 {
     /// <summary>
     /// Base class for all InputObjects. Defines basic attributes that
@@ -15,9 +15,6 @@ namespace CrosshairMod
     abstract class InputObject
     {
         public Vector2 position, dimensions;
-        
-        // TODO: Remove once dictionary was implemented
-        public readonly string ID;
 
         /// <summary>
         /// Create new InputObject
@@ -26,12 +23,10 @@ namespace CrosshairMod
         /// <param name="y">Y-Position</param>
         /// <param name="width">Width</param>
         /// <param name="height">Height</param>
-        /// <param name="ID">ID</param>
+        public InputObject(float x, float y, float width, float height)
-        public InputObject(float x, float y, float width, float height, string ID)
         {
             this.position = new Vector2(x, y);
             this.dimensions = new Vector2(width, height);
-            this.ID = ID;
         }
 
         /// <summary>

CrosshairMod/Interface/Slider.cs

@@ -31,9 +31,8 @@ namespace CrosshairMod.Input
         /// <param name="min">Minimum Slider value</param>
         /// <param name="max">Maximum Slider value</param>
         /// <param name="init">Initial Slider value</param>
-        /// <param name="ID">ID</param>
+        public Slider(float x, float y, float width, float height, float min, float max, float init)
-        public Slider(float x, float y, float width, float height, float min, float max, float init, string ID)
+            : base(x, y, width, height)
-            : base(x, y, width, height, ID)
         {
             Min = min;
             Max = max;
@@ -43,9 +42,8 @@ namespace CrosshairMod.Input
         /// <summary>
         /// Sad, pathetic default constructor
         /// </summary>
-        /// <param name="ID"></param>
+        public Slider()
-        public Slider(string ID)
+            :base (0, 0, 0, 0)
-            :base (0, 0, 0, 0, ID)
         {
 
         }