Skip to content

Commit 5bb8479

Browse files
danigfedevdanigfedev
committed
Updated base events to use custom namespace
1 parent be30d53 commit 5bb8479

10 files changed

Lines changed: 190 additions & 169 deletions

‎Runtime/SOBaseEvents/BooleanEventListener.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,4 +26,4 @@ public void RiseEvent(bool arg1) //Type1 arg1, Type2 arg2, Type3 arg3...
2626
response.Invoke(arg1); //arg1, arg2, arg3...
2727
}
2828
}
29-
}
29+
}

‎Runtime/SOBaseEvents/BooleanEventScriptableObject.cs‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ public class BooleanEventScriptableObject : ScriptableObject
88
{
99
private List<BooleanEventListener> listeners = new List<BooleanEventListener>();
1010

11-
1211
public void AddListener(BooleanEventListener listener)
1312
{
1413
if (listeners.Contains(listener))
@@ -39,4 +38,4 @@ public void RiseEvent(bool arg1) //Type1 arg1, Type2 arg2, Type3 arg3...
3938
}
4039
}
4140
}
42-
}
41+
}

‎Runtime/SOBaseEvents/FloatEventListener.cs‎

Lines changed: 20 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,29 @@
11
using UnityEngine;
22
using UnityEngine.Events;
33

4-
public class FloatEventListener : MonoBehaviour
4+
namespace SOBaseEvents
55
{
6-
[System.Serializable]
7-
public class CustomUnityEvent : UnityEvent<float> { } //ARGUMENT_TYPE_LIST -> Type1, Type2, Type3...
6+
public class FloatEventListener : MonoBehaviour
7+
{
8+
[System.Serializable]
9+
public class CustomUnityEvent : UnityEvent<float> { } //ARGUMENT_TYPE_LIST -> Type1, Type2, Type3...
810

9-
[SerializeField] private FloatEventScriptableObject FloatEventScriptableObject;
10-
[SerializeField] private CustomUnityEvent response;
11+
[SerializeField] private FloatEventScriptableObject FloatEventScriptableObject;
12+
[SerializeField] private CustomUnityEvent response;
1113

12-
void OnEnable()
13-
{
14-
FloatEventScriptableObject.AddListener(this);
15-
}
14+
void OnEnable()
15+
{
16+
FloatEventScriptableObject.AddListener(this);
17+
}
1618

17-
void OnDisable()
18-
{
19-
FloatEventScriptableObject.RemoveListener(this);
20-
}
19+
void OnDisable()
20+
{
21+
FloatEventScriptableObject.RemoveListener(this);
22+
}
2123

22-
public void RiseEvent(float arg1) //Type1 arg1, Type2 arg2, Type3 arg3...
23-
{
24-
response.Invoke(arg1); //arg1, arg2, arg3...
24+
public void RiseEvent(float arg1) //Type1 arg1, Type2 arg2, Type3 arg3...
25+
{
26+
response.Invoke(arg1); //arg1, arg2, arg3...
27+
}
2528
}
26-
}
29+
}

‎Runtime/SOBaseEvents/FloatEventScriptableObject.cs‎

Lines changed: 27 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,39 +1,41 @@
11
using System.Collections.Generic;
22
using UnityEngine;
33

4-
[CreateAssetMenu(fileName ="FloatEventScriptableObject", menuName ="EspidiGames/SO Events/FloatEventScriptableObject", order = 20)]
5-
public class FloatEventScriptableObject : ScriptableObject
4+
namespace SOBaseEvents
65
{
7-
private List<FloatEventListener> listeners = new List<FloatEventListener>();
8-
9-
10-
public void AddListener(FloatEventListener listener)
6+
[CreateAssetMenu(fileName ="FloatEventScriptableObject", menuName ="EspidiGames/SO Events/FloatEventScriptableObject", order = 20)]
7+
public class FloatEventScriptableObject : ScriptableObject
118
{
12-
if (listeners.Contains(listener))
9+
private List<FloatEventListener> listeners = new List<FloatEventListener>();
10+
11+
public void AddListener(FloatEventListener listener)
1312
{
14-
Debug.LogError($"[ScriptableObjectEvents] Listener {listener.name} of GameObject {listener.gameObject.name} already registered. Aborting registration.");
15-
return;
16-
}
13+
if (listeners.Contains(listener))
14+
{
15+
Debug.LogError($"[ScriptableObjectEvents] Listener {listener.name} of GameObject {listener.gameObject.name} already registered. Aborting registration.");
16+
return;
17+
}
1718

18-
listeners.Add(listener);
19-
}
19+
listeners.Add(listener);
20+
}
2021

21-
public void RemoveListener(FloatEventListener listener)
22-
{
23-
if (!listeners.Contains(listener))
22+
public void RemoveListener(FloatEventListener listener)
2423
{
25-
Debug.LogError($"[ScriptableObjectEvents] Listener {listener.name} of GameObject {listener.gameObject.name} is not registered. Aborting removal.");
26-
return;
27-
}
24+
if (!listeners.Contains(listener))
25+
{
26+
Debug.LogError($"[ScriptableObjectEvents] Listener {listener.name} of GameObject {listener.gameObject.name} is not registered. Aborting removal.");
27+
return;
28+
}
2829

29-
listeners.Remove(listener);
30-
}
30+
listeners.Remove(listener);
31+
}
3132

32-
public void RiseEvent(float arg1) //Type1 arg1, Type2 arg2, Type3 arg3...
33-
{
34-
foreach(var listener in listeners)
33+
public void RiseEvent(float arg1) //Type1 arg1, Type2 arg2, Type3 arg3...
3534
{
36-
listener.RiseEvent(arg1); //arg1, arg2, arg3...
35+
foreach(var listener in listeners)
36+
{
37+
listener.RiseEvent(arg1); //arg1, arg2, arg3...
38+
}
3739
}
3840
}
39-
}
41+
}

‎Runtime/SOBaseEvents/IntEventListener.cs‎

Lines changed: 20 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,29 @@
11
using UnityEngine;
22
using UnityEngine.Events;
33

4-
public class IntEventListener : MonoBehaviour
4+
namespace SOBaseEvents
55
{
6-
[System.Serializable]
7-
public class CustomUnityEvent : UnityEvent<int> { } //ARGUMENT_TYPE_LIST -> Type1, Type2, Type3...
6+
public class IntEventListener : MonoBehaviour
7+
{
8+
[System.Serializable]
9+
public class CustomUnityEvent : UnityEvent<int> { } //ARGUMENT_TYPE_LIST -> Type1, Type2, Type3...
810

9-
[SerializeField] private IntEventScriptableObject IntEventScriptableObject;
10-
[SerializeField] private CustomUnityEvent response;
11+
[SerializeField] private IntEventScriptableObject IntEventScriptableObject;
12+
[SerializeField] private CustomUnityEvent response;
1113

12-
void OnEnable()
13-
{
14-
IntEventScriptableObject.AddListener(this);
15-
}
14+
void OnEnable()
15+
{
16+
IntEventScriptableObject.AddListener(this);
17+
}
1618

17-
void OnDisable()
18-
{
19-
IntEventScriptableObject.RemoveListener(this);
20-
}
19+
void OnDisable()
20+
{
21+
IntEventScriptableObject.RemoveListener(this);
22+
}
2123

22-
public void RiseEvent(int arg1) //Type1 arg1, Type2 arg2, Type3 arg3...
23-
{
24-
response.Invoke(arg1); //arg1, arg2, arg3...
24+
public void RiseEvent(int arg1) //Type1 arg1, Type2 arg2, Type3 arg3...
25+
{
26+
response.Invoke(arg1); //arg1, arg2, arg3...
27+
}
2528
}
26-
}
29+
}

‎Runtime/SOBaseEvents/IntEventScriptableObject.cs‎

Lines changed: 27 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,39 +1,41 @@
11
using System.Collections.Generic;
22
using UnityEngine;
33

4-
[CreateAssetMenu(fileName ="IntEventScriptableObject", menuName ="EspidiGames/SO Events/IntEventScriptableObject", order = 20)]
5-
public class IntEventScriptableObject : ScriptableObject
4+
namespace SOBaseEvents
65
{
7-
private List<IntEventListener> listeners = new List<IntEventListener>();
8-
9-
10-
public void AddListener(IntEventListener listener)
6+
[CreateAssetMenu(fileName ="IntEventScriptableObject", menuName ="EspidiGames/SO Events/IntEventScriptableObject", order = 20)]
7+
public class IntEventScriptableObject : ScriptableObject
118
{
12-
if (listeners.Contains(listener))
9+
private List<IntEventListener> listeners = new List<IntEventListener>();
10+
11+
public void AddListener(IntEventListener listener)
1312
{
14-
Debug.LogError($"[ScriptableObjectEvents] Listener {listener.name} of GameObject {listener.gameObject.name} already registered. Aborting registration.");
15-
return;
16-
}
13+
if (listeners.Contains(listener))
14+
{
15+
Debug.LogError($"[ScriptableObjectEvents] Listener {listener.name} of GameObject {listener.gameObject.name} already registered. Aborting registration.");
16+
return;
17+
}
1718

18-
listeners.Add(listener);
19-
}
19+
listeners.Add(listener);
20+
}
2021

21-
public void RemoveListener(IntEventListener listener)
22-
{
23-
if (!listeners.Contains(listener))
22+
public void RemoveListener(IntEventListener listener)
2423
{
25-
Debug.LogError($"[ScriptableObjectEvents] Listener {listener.name} of GameObject {listener.gameObject.name} is not registered. Aborting removal.");
26-
return;
27-
}
24+
if (!listeners.Contains(listener))
25+
{
26+
Debug.LogError($"[ScriptableObjectEvents] Listener {listener.name} of GameObject {listener.gameObject.name} is not registered. Aborting removal.");
27+
return;
28+
}
2829

29-
listeners.Remove(listener);
30-
}
30+
listeners.Remove(listener);
31+
}
3132

32-
public void RiseEvent(int arg1) //Type1 arg1, Type2 arg2, Type3 arg3...
33-
{
34-
foreach(var listener in listeners)
33+
public void RiseEvent(int arg1) //Type1 arg1, Type2 arg2, Type3 arg3...
3534
{
36-
listener.RiseEvent(arg1); //arg1, arg2, arg3...
35+
foreach(var listener in listeners)
36+
{
37+
listener.RiseEvent(arg1); //arg1, arg2, arg3...
38+
}
3739
}
3840
}
39-
}
41+
}

‎Runtime/SOBaseEvents/NoArgsEventListener.cs‎

Lines changed: 19 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,26 @@
11
using UnityEngine;
22
using UnityEngine.Events;
3-
public class NoArgsEventListener : MonoBehaviour
4-
{
5-
[SerializeField] private NoArgsEventScriptableObject NoArgsEventScriptableObject;
6-
[SerializeField] private UnityEvent response;
73

8-
void OnEnable()
4+
namespace SOBaseEvents
5+
{
6+
public class NoArgsEventListener : MonoBehaviour
97
{
10-
NoArgsEventScriptableObject.AddListener(this);
11-
}
8+
[SerializeField] private NoArgsEventScriptableObject NoArgsEventScriptableObject;
9+
[SerializeField] private UnityEvent response;
1210

13-
void OnDisable()
14-
{
15-
NoArgsEventScriptableObject.RemoveListener(this);
16-
}
11+
void OnEnable()
12+
{
13+
NoArgsEventScriptableObject.AddListener(this);
14+
}
1715

18-
public void RiseEvent()
19-
{
20-
response.Invoke();
16+
void OnDisable()
17+
{
18+
NoArgsEventScriptableObject.RemoveListener(this);
19+
}
20+
21+
public void RiseEvent()
22+
{
23+
response.Invoke();
24+
}
2125
}
22-
}
26+
}

‎Runtime/SOBaseEvents/NoArgsEventScriptableObject.cs‎

Lines changed: 28 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,38 +1,41 @@
11
using System.Collections.Generic;
22
using UnityEngine;
3-
[CreateAssetMenu(fileName ="NoArgsEventScriptableObject", menuName ="EspidiGames/SO Events/NoArgsEventScriptableObject", order = 20)]
4-
public class NoArgsEventScriptableObject : ScriptableObject
5-
{
6-
private List<NoArgsEventListener> listeners = new List<NoArgsEventListener>();
7-
83

9-
public void AddListener(NoArgsEventListener listener)
4+
namespace SOBaseEvents
5+
{
6+
[CreateAssetMenu(fileName ="NoArgsEventScriptableObject", menuName ="EspidiGames/SO Events/NoArgsEventScriptableObject", order = 20)]
7+
public class NoArgsEventScriptableObject : ScriptableObject
108
{
11-
if (listeners.Contains(listener))
9+
private List<NoArgsEventListener> listeners = new List<NoArgsEventListener>();
10+
11+
public void AddListener(NoArgsEventListener listener)
1212
{
13-
Debug.LogError($"[ScriptableObjectEvents] Listener {listener.name} of GameObject {listener.gameObject.name} already registered. Aborting registration.");
14-
return;
15-
}
13+
if (listeners.Contains(listener))
14+
{
15+
Debug.LogError($"[ScriptableObjectEvents] Listener {listener.name} of GameObject {listener.gameObject.name} already registered. Aborting registration.");
16+
return;
17+
}
1618

17-
listeners.Add(listener);
18-
}
19+
listeners.Add(listener);
20+
}
1921

20-
public void RemoveListener(NoArgsEventListener listener)
21-
{
22-
if (!listeners.Contains(listener))
22+
public void RemoveListener(NoArgsEventListener listener)
2323
{
24-
Debug.LogError($"[ScriptableObjectEvents] Listener {listener.name} of GameObject {listener.gameObject.name} is not registered. Aborting removal.");
25-
return;
26-
}
24+
if (!listeners.Contains(listener))
25+
{
26+
Debug.LogError($"[ScriptableObjectEvents] Listener {listener.name} of GameObject {listener.gameObject.name} is not registered. Aborting removal.");
27+
return;
28+
}
2729

28-
listeners.Remove(listener);
29-
}
30+
listeners.Remove(listener);
31+
}
3032

31-
public void RiseEvent()
32-
{
33-
foreach(var listener in listeners)
33+
public void RiseEvent()
3434
{
35-
listener.RiseEvent();
35+
foreach(var listener in listeners)
36+
{
37+
listener.RiseEvent();
38+
}
3639
}
3740
}
38-
}
41+
}

0 commit comments

Comments
 (0)