Skip to content
This repository was archived by the owner on Aug 10, 2021. It is now read-only.

Commit 580db6a

Browse files
committed
Cleanup scripts, update style
1 parent 3eafb64 commit 580db6a

File tree

6 files changed

+8
-71
lines changed

6 files changed

+8
-71
lines changed

Editor/GameEvents/Game/GameEventEditor.cs

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,8 @@ namespace GameEvents.Game
88
[CustomEditor(typeof(GameEvent))]
99
public class GameEventEditor : Editor
1010
{
11-
#region Pirvate Fields
12-
1311
private const int GroupSpacingPixels = 8;
1412

15-
#endregion
16-
17-
#region Public Methods
18-
1913
public override void OnInspectorGUI()
2014
{
2115
base.OnInspectorGUI();
@@ -40,7 +34,5 @@ private static void DrawRaise(IGameEvent gameEvent)
4034
gameEvent.RaiseGameEvent();
4135
}
4236
}
43-
44-
#endregion
4537
}
4638
}

Editor/GameEvents/Generic/ArgumentGameEventEditor.cs

Lines changed: 4 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -7,28 +7,10 @@ namespace GameEvents.Generic
77
public abstract class ArgumentGameEventEditor<TGameEvent, TArgument> : Editor
88
where TGameEvent : class, IArgumentGameEvent<TArgument>
99
{
10-
#region Protected Methods
11-
12-
/// <returns>
13-
/// Value that is entered in the argument field.
14-
/// </returns>
15-
protected virtual TArgument DrawArgumentField(TArgument value)
16-
{
17-
return value;
18-
}
19-
20-
#endregion
21-
22-
#region Pirvate Fields
23-
2410
private const int GroupSpacingPixels = 8;
2511

2612
private TArgument argumentValue = default;
2713

28-
#endregion
29-
30-
#region Public Methods
31-
3214
public override void OnInspectorGUI()
3315
{
3416
base.OnInspectorGUI();
@@ -58,6 +40,9 @@ private void DrawRaise(TGameEvent gameEvent)
5840
GUILayout.EndHorizontal();
5941
}
6042

61-
#endregion
43+
/// <returns>
44+
/// Value that is entered in the argument field.
45+
/// </returns>
46+
protected abstract TArgument DrawArgumentField(TArgument value);
6247
}
6348
}

Runtime/GameEvents/Game/GameEvent.cs

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,19 +7,13 @@ namespace GameEvents.Game
77
[CreateAssetMenu(fileName = "GameEvent", menuName = "Game Events/Game Event")]
88
public class GameEvent : ScriptableObject, IGameEvent
99
{
10-
#region Private Fields
11-
1210
[SerializeField]
1311
[Tooltip("Should debug messages be logged for this event")]
1412
private bool debug = false;
1513

1614
private readonly List<IGameEventListener> listeners =
1715
new List<IGameEventListener>();
1816

19-
#endregion
20-
21-
#region Public Methods
22-
2317
public void RaiseGameEvent()
2418
{
2519
if (debug)
@@ -58,7 +52,5 @@ public void UnregisterListener(IGameEventListener listener)
5852

5953
listeners.Remove(listener);
6054
}
61-
62-
#endregion
6355
}
6456
}

Runtime/GameEvents/Game/GameEventListener.cs

Lines changed: 4 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -7,17 +7,6 @@ namespace GameEvents.Game
77
[AddComponentMenu("Game Events/Game Event Listener")]
88
public class GameEventListener : MonoBehaviour, IGameEventListener
99
{
10-
#region Public Methods
11-
12-
public void OnGameEvent()
13-
{
14-
onGameEvent.Invoke();
15-
}
16-
17-
#endregion
18-
19-
#region Private Fields
20-
2110
[SerializeField]
2211
[Tooltip("Game event to listen to which will trigger the onGameEvent event")]
2312
private GameEvent gameEvent = default;
@@ -26,10 +15,6 @@ public void OnGameEvent()
2615
[Tooltip("Called when the listener is triggered with an argument")]
2716
private UnityEvent onGameEvent = default;
2817

29-
#endregion
30-
31-
#region Unity Event Methods
32-
3318
private void OnEnable()
3419
{
3520
if (gameEvent == null)
@@ -52,6 +37,9 @@ private void OnDisable()
5237
gameEvent.UnregisterListener(this);
5338
}
5439

55-
#endregion
40+
public void OnGameEvent()
41+
{
42+
onGameEvent.Invoke();
43+
}
5644
}
5745
}

Runtime/GameEvents/Generic/ArgumentGameEvent.cs

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,19 +6,13 @@ namespace GameEvents.Generic
66
public abstract class ArgumentGameEvent<TArgument>
77
: ScriptableObject, IArgumentGameEvent<TArgument>
88
{
9-
#region Private Fields
10-
119
[SerializeField]
1210
[Tooltip("Should debug messages be logged for this event")]
1311
private bool debug = false;
1412

1513
private readonly List<IArgumentGameEventListener<TArgument>> listeners =
1614
new List<IArgumentGameEventListener<TArgument>>();
1715

18-
#endregion
19-
20-
#region Public Methods
21-
2216
public void RaiseGameEvent(TArgument argument)
2317
{
2418
if (debug)
@@ -57,7 +51,5 @@ public void UnregisterListener(IArgumentGameEventListener<TArgument> listener)
5751

5852
listeners.Remove(listener);
5953
}
60-
61-
#endregion
6254
}
6355
}

Runtime/GameEvents/Generic/ArgumentGameEventListener.cs

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,6 @@ public abstract class ArgumentGameEventListener<TGameEvent, TUnityEvent, TArgume
88
where TGameEvent : IArgumentGameEvent<TArgument>
99
where TUnityEvent : UnityEvent<TArgument>
1010
{
11-
#region Public Methods
12-
1311
/// <summary>
1412
/// Trigger this listener with an argument.
1513
/// </summary>
@@ -18,10 +16,6 @@ public void OnGameEvent(TArgument argument)
1816
onGameEvent.Invoke(argument);
1917
}
2018

21-
#endregion
22-
23-
#region Private Fields
24-
2519
[SerializeField]
2620
[Tooltip("Game event to listen to which will trigger the onGameEvent event")]
2721
private TGameEvent gameEvent = default;
@@ -32,10 +26,6 @@ public void OnGameEvent(TArgument argument)
3226
[Tooltip("Called when the listener is triggered with an argument")]
3327
private TUnityEvent onGameEvent = default;
3428

35-
#endregion
36-
37-
#region Unity Event Methods
38-
3929
private void OnEnable()
4030
{
4131
if (gameEvent == null)
@@ -63,7 +53,5 @@ private void OnDisable()
6353

6454
gameEvent.UnregisterListener(this);
6555
}
66-
67-
#endregion
6856
}
6957
}

0 commit comments

Comments
 (0)