Merge branch 'CreateInputBaseClass' into CreateSliderClass

CrosshairMod/CrosshairMod.csproj

@@ -44,9 +44,10 @@
     </Reference>
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="Button.cs" />
+    <Compile Include="Interface\Button.cs" />
     <Compile Include="Crosshair.cs" />
     <Compile Include="Interface.cs" />
+    <Compile Include="Interface\InputObject.cs" />
     <Compile Include="Logging.cs" />
     <Compile Include="Main.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />

CrosshairMod/Interface.cs

@@ -39,7 +39,7 @@ namespace CrosshairMod
         // Returns the index of the button
         private static int AddButton(uint x, uint y, uint width, uint height, string label, params EventHandler[] onClickEvent)
         {
-            GUIButton buttonObj = new GUIButton(x, y, width, height, label, onClickEvent);
+            GUIButton buttonObj = new GUIButton(label, onClickEvent);
             m_buttons.Add(buttonObj);
             return m_buttons.Count - 1;
         }

CrosshairMod/Interface/Button.cs

@@ -14,34 +14,24 @@ namespace CrosshairMod
      * I made this class for easy handling.
      * 
      */
-    class GUIButton
+    class GUIButton : InputObject
     {
         // da_google thinks this Button Wrapper is stupid, so let's see what ths Button Wrapper thinks about him
         private const bool IS_DA_GOOGLE_STUPID = true;
         // Interesting.
 
-        // Position / Dimension of the Button.
+        // OnClick event
-        public Vector2 position = new Vector2(0, 0);
+        public event EventHandler OnClick;
-        public Vector2 dimensions = new Vector2(0, 0);
-
-        // Visibilty variables
-        private bool m_visible = true;
-        private bool m_active = true;
 
         // Label of the Button
         public string label { get; set; } = "";
 
-        // OnClick event
-        public event EventHandler OnClick;
-
         // Initialize Button
-        public GUIButton(uint x, uint y, uint width, uint height, string label, params EventHandler[] OnClickEvent)
+        public GUIButton(string label, params EventHandler[] OnClickEvent)
         {
             Logging.Debug.Log("Button Constructor");
 
             // Assign position, dimension and label
-            this.position = new Vector2(x, y);
-            this.dimensions = new Vector2(width, height);
             this.label = label;
 
             // Push OnClickEvents
@@ -54,29 +44,14 @@ namespace CrosshairMod
             // Empty
         }
 
-
-        // Changes visibilty of the Button
-        public void Toggle()
-        {
-            m_visible = !m_visible;
-        }
-
-        // Changes Usabilty of the button
-        public void Activate()
-        {
-            m_active = !m_active;
-        }
-
         // Updates and Draws the Button.
-        public void Update()
+        public override float Update()
         {
-            if (m_visible)
+            // Get if the Button was pressed and invoke OnClick event accordingly
-            {
+            bool buttonPressed = GUILayout.Button(label);
-                // Get if the Button was pressed and invoke OnClick event accordingly
+                OnClick?.Invoke(this, EventArgs.Empty);
-                bool buttonPressed = GUI.Button(new Rect(position, dimensions), label);
+
-                if (buttonPressed && m_active)
+            return (buttonPressed ? 1.0f : 0.0f);
-                    OnClick?.Invoke(this, EventArgs.Empty);
-            }
         }
     }
 }

CrosshairMod/Interface/InputObject.cs

@@ -0,0 +1,15 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+using UnityEngine;
+
+namespace CrosshairMod
+{
+    abstract class InputObject
+    {
+        public abstract float Update();
+    }
+}

CrosshairMod/Main.cs

@@ -31,6 +31,7 @@ namespace CrosshairMod
         // This will be executed first
         void Start()
         {
+
             // Update the settings
             Settings.LoadSettings(".\\Blackwake_Data\\Managed\\Mods\\chSettings.sett");
             // Create Crosshair