lauchmelder/CrosshairMod
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Merge branch 'InterfaceRework' into development

Browse source
This commit is contained in:
Robert 2019-08-04 16:21:41 +02:00
parent 001e016488 d908c8d70f
commit 15d55e9cb0
4 changed files with 21 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
CrosshairMod/Interface.cs
View file

@ -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>();
// TODO: Replace with dictionary, the whole concept of having IDs inside the objects is stupid and unnecessary
private static Dictionary<string, Input.InputObject> m_inputs = new Dictionary<string, Input.InputObject>();
/// <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);
m_inputs.Add(buttonObj);
Input.Button buttonObj = new Input.Button(x, y, width, height, label, onClickEvent);
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);
m_inputs.Add(sliderObj);
Input.Slider sliderObj = new Input.Slider(x, y, width, height, min, max, init);
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;
gSliderValue = (int)it.First(slider => slider.ID == "green").Value;
bSliderValue = (int)it.First(slider => slider.ID == "blue").Value;
aSliderValue = (int)it.First(slider => slider.ID == "alpha").Value;
rSliderValue = (int)((Input.Slider)m_inputs["red"]).Value;
gSliderValue = (int)((Input.Slider)m_inputs["green"]).Value;
bSliderValue = (int)((Input.Slider)m_inputs["blue"]).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();
}
}
}

10
CrosshairMod/Interface/Button.cs
View file

@ -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)
: base(x, y, width, height, ID)
public Button(float x, float y, float width, float height, string label, params EventHandler[] OnClickEvent)
: 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(string ID)
: base(0, 0, 0, 0, ID)
public Button()
: base(0, 0, 0, 0)
{
// Empty
}

9
CrosshairMod/Interface/InputObject.cs
View file

@ -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, string ID)
public InputObject(float x, float y, float width, float height)
{
this.position = new Vector2(x, y);
this.dimensions = new Vector2(width, height);
this.ID = ID;
}
/// <summary>

10
CrosshairMod/Interface/Slider.cs
View file

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