fr.jeanf.eventsystem 0.1.67 → 0.1.69

package/Runtime/Listeners/IScriptableObjectEventListener.cs

@@ -0,0 +1,25 @@
+using UnityEngine;
+
+namespace jeanf.EventSystem
+{
+	public interface  IScriptableObjectEventListener
+	{
+		public ScriptableObjectEventChannelSO channel { get; set; }
+		public ScriptableObjectEvent OnEventRaised { get; set; }
+
+		private void OnEnable()
+		{
+			if (channel != null) channel.OnEventRaised += Respond;
+		}
+
+		private void OnDisable()
+		{
+			if (channel != null) channel.OnEventRaised -= Respond;
+		}
+
+		private void Respond(string id, ScriptableObject value)
+		{
+			OnEventRaised?.Invoke(value);
+		}
+	}
+}

package/Runtime/{SenderInterfaces/DateTimeEventSender.cs.meta → Listeners/IScriptableObjectEventListener.cs.meta}

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 0a31a7a249641724797e1e2e4fb0499b
+guid: 97390cba28bf774438ae731e97fe1128
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

package/Runtime/Listeners/{DateTimeEventListener.cs → ScriptableObjectEventListener.cs}

@@ -1,5 +1,4 @@
-using System;
-using UnityEngine;
+using UnityEngine;
 using UnityEngine.Events;
 
 /// <summary>
@@ -8,7 +7,7 @@ using UnityEngine.Events;
 namespace jeanf.EventSystem
 {
 	[System.Serializable]
-	public class DateTimeEvent : UnityEvent<DateTime>
+	public class ScriptableObjectEvent : UnityEvent<ScriptableObject>
 	{
 
 	}
@@ -16,7 +15,7 @@ namespace jeanf.EventSystem
 	/// <summary>
 	/// A flexible handler for int events in the form of a MonoBehaviour. Responses can be connected directly from the Unity Inspector.
 	/// </summary>
-	public class DateTimeEventListener : MonoBehaviour, IDebugBehaviour
+	public class ScriptableObjectEventListener : MonoBehaviour, IDebugBehaviour
 	{
 		public bool isDebug
 		{ 
@@ -25,9 +24,9 @@ namespace jeanf.EventSystem
 		}
 		[SerializeField] private bool _isDebug = false;
 		
-		[SerializeField] private DateTimeEventChannelSO _channel = default;
+		[SerializeField] private ScriptableObjectEventChannelSO _channel = default;
 
-		public DateTimeEvent OnEventRaised;
+		public ScriptableObjectEvent OnEventRaised;
 
 		private void OnEnable()
 		{
@@ -41,7 +40,7 @@ namespace jeanf.EventSystem
 				_channel.OnEventRaised -= Respond;
 		}
 
-		private void Respond(DateTime value)
+		private void Respond(string id, ScriptableObject value)
 		{
 			OnEventRaised?.Invoke(value);
 			if(isDebug) Debug.Log($" bool event raised: {value}");

package/Runtime/Listeners/{DateTimeEventListener.cs.meta → ScriptableObjectEventListener.cs.meta}

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 31e074f6ae236be418967598416b8727
+guid: fb20777bcb7493246bce5fcaaea49b3f
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

package/Runtime/PingSystem/PingableScriptableObject.cs

@@ -0,0 +1,67 @@
+using System;
+using System.Collections;
+using jeanf.EventSystem;
+using UnityEngine;
+
+public class PingableScriptableObject : MonoBehaviour, IScriptableObjectEventSender, IScriptableObjectEventListener, IDebugBehaviour
+{
+    public bool isDebug
+    { 
+        get => _isDebug;
+        set => _isDebug = value; 
+    }
+    [SerializeField] private bool _isDebug = false;
+
+    [SerializeField] private VoidEventChannelSO refreshPingableObjects;
+    [ReadOnly] [SerializeField] private string id = Guid.NewGuid().ToString();
+
+    public ScriptableObjectEventChannelSO channel
+    {
+        get => _channel;
+        set => _channel = value;
+    }
+
+    [SerializeField] private ScriptableObjectEventChannelSO _channel;
+    public ScriptableObjectEvent OnEventRaised { get; set; }
+
+
+    private void Awake()
+    {
+        refreshPingableObjects.OnEventRaised += RefreshPingable;
+    }
+
+    private void OnEnable()
+    {
+        if (channel != null) channel.OnEventRaised += Respond;
+        AddScriptableObjectToList(id, channel);
+    }
+    private void OnDisable() => Unsubscribe();
+    private void OnDestroy() => Unsubscribe();
+    private void Unsubscribe()
+    {
+
+        if (channel != null)
+        {
+            channel.UnsubscribeEvent(id, channel);
+            channel.OnEventRaised -= null;
+        }
+
+        if (refreshPingableObjects.OnEventRaised != null)
+            refreshPingableObjects.OnEventRaised -= null;
+    }
+
+    private void Respond(string id, ScriptableObject value)
+    {
+        OnEventRaised?.Invoke(value);
+        if(isDebug) Debug.Log($" scriptableObject event raised: {value}");
+    }
+    public void AddScriptableObjectToList(string id, ScriptableObject value)
+    {
+        channel.RaiseEvent(id, value);
+    }
+
+    public void RefreshPingable()
+    {
+        AddScriptableObjectToList(id, channel);
+    }
+}

package/Runtime/{ScriptableObjects/DateTimeEventChannelSO.cs.meta → PingSystem/PingableScriptableObject.cs.meta}

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: ba97a5c1597b7154ba7d47d2de2b0356
+guid: 1eb27c0143f328948a8d8f74efa7e6f7
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

package/Runtime/PingSystem/ScriptableObjectManager.cs

@@ -0,0 +1,81 @@
+using System;
+using System.Collections.Generic;
+using jeanf.EventSystem;
+using UnityEngine;
+using Object = UnityEngine.Object;
+
+public class ScriptableObjectManager : MonoBehaviour, IDebugBehaviour
+{
+    public bool isDebug
+    { 
+        get => _isDebug;
+        set => _isDebug = value; 
+    }
+    [SerializeField] private bool _isDebug = false;
+    
+    [SerializeField] private VoidEventChannelSO RefreshPingableObjects;
+    [SerializeField] private List<ScriptableObjectEventChannelSO> listOfPingableObjects = new List<ScriptableObjectEventChannelSO>();
+
+    private Dictionary<Object, Dictionary<string, Object>> genericDictionary = new Dictionary<Object, Dictionary<string, Object>>();
+
+    private void OnEnable() => Subscribe();
+    private void OnDisable() => Unsubscribe();
+    private void OnDestroy() => Unsubscribe();
+
+    private void Subscribe()
+    {
+        foreach (var so in listOfPingableObjects)
+        {
+            Debug.Log($"registering events for channel: {so.name}");
+            so.OnEventRaised += RegisterSO;
+            so.OnEventRemove += RemoveSOFromLists;
+        }
+        RefreshPingableObjects.RaiseEvent();
+    }
+
+    private void Unsubscribe()
+    {
+        foreach (var so in listOfPingableObjects)
+        {
+            Debug.Log($"unregistering events for channel: {so.name}");
+            so.OnEventRaised -= null;
+            so.OnEventRemove -= null;
+        }
+        genericDictionary.Clear();
+        genericDictionary.TrimExcess();
+    }
+
+    private void RegisterSO(string id, ScriptableObject so)
+    {
+        UpdateLists(id, so);
+    }
+
+    private void UpdateLists(string id, ScriptableObject so)
+    {
+        if (so is not ScriptableObjectEventChannelSO mySo) return;
+        var type = mySo.type;
+        if(genericDictionary.ContainsKey(type))
+        {
+            if (!genericDictionary[type].ContainsKey(id))
+            {
+                if(isDebug) Debug.Log($"adding [id: {id}] to the list of type {so.name}");
+                genericDictionary[type].Add(id, mySo);
+            }
+        }
+        else
+        {
+            if(isDebug) Debug.Log($"new type detected, adding a list of type {so.name} and adding [id: {id}] to it");
+            genericDictionary.Add(type, new Dictionary<string, Object>(){{id, mySo}});
+        }
+    }
+
+    private void RemoveSOFromLists(string id, ScriptableObject so)
+    {
+        if (so is not ScriptableObjectEventChannelSO mySo) return;
+        var type = mySo.type;
+        if (!genericDictionary.ContainsKey(type)) return;
+        if (!genericDictionary[type].ContainsKey(id)) return;
+        if(isDebug) Debug.Log($"removing [id: {id}] to the list of type {so.name}");
+        genericDictionary[type].Remove(id);
+    }
+}

package/Runtime/PingSystem/ScriptableObjectManager.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 7788af4eb8b4bc64fa8ef942656783ce
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

package/Runtime/PingSystem.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 3a1485ddb7699024e8bbaa6e14156380
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

package/Runtime/ScriptableObjects/ScriptableObjectEventChannelSO.cs

@@ -0,0 +1,26 @@
+using System;
+using UnityEngine;
+using UnityEngine.Events;
+using Object = UnityEngine.Object;
+
+namespace jeanf.EventSystem
+{
+	[CreateAssetMenu(menuName = "Events/ScriptableObject Event Channel")]
+	public class ScriptableObjectEventChannelSO : DescriptionBaseSO
+	{
+		public UnityAction<string, ScriptableObject> OnEventRaised;
+		public UnityAction<string, ScriptableObject> OnEventRemove;
+		public Object type;
+		[HideInInspector] public string id;
+
+		public void RaiseEvent(string id, ScriptableObject value)
+		{
+			OnEventRaised?.Invoke(id, value);
+		}
+
+		public void UnsubscribeEvent(string id, ScriptableObject value)
+		{
+			OnEventRemove?.Invoke(id, value);
+		}
+	}
+}

package/Runtime/ScriptableObjects/ScriptableObjectEventChannelSO.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: aa3e1a0bacfe3bf43a5357901d7b548d
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

package/Runtime/SenderInterfaces/IScriptableObjectEventSender.cs

@@ -0,0 +1,8 @@
+using jeanf.EventSystem;
+using UnityEngine;
+
+public interface IScriptableObjectEventSender 
+{
+   ScriptableObjectEventChannelSO channel { get; set; }
+   void AddScriptableObjectToList(string id, ScriptableObject value);
+}

package/Runtime/SenderInterfaces/IScriptableObjectEventSender.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 5adbcdbf352259246b506f4e61b4d94c
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

package/Runtime/SenderInterfaces/ScriptableObjectEventSender.cs

@@ -0,0 +1,19 @@
+using jeanf.EventSystem;
+using UnityEngine;
+
+public class ScriptableObjectEventSender : MonoBehaviour, IDebugBehaviour
+{
+    public bool isDebug
+    { 
+        get => _isDebug;
+        set => _isDebug = value; 
+    }
+    [SerializeField] private bool _isDebug = false;
+
+    [field: Header("Broadcasting on:")] public ScriptableObjectEventChannelSO scriptableObjectMessageChannel;
+    
+    public void SendScriptableObject(string id, ScriptableObject value)
+    {
+        scriptableObjectMessageChannel.RaiseEvent(id, value);
+    }
+}

package/Runtime/SenderInterfaces/ScriptableObjectEventSender.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 72fcfe0b452f6e748a560af8978e794b
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

package/Runtime/jeanf.eventSystem.asmdef

@@ -1,7 +1,9 @@
 {
     "name": "jeanf.eventsystem",
     "rootNamespace": "",
-    "references": [],
+    "references": [
+        "GUID:e8958e6939af7314a97769de4be4ce25"
+    ],
     "includePlatforms": [],
     "excludePlatforms": [],
     "allowUnsafeCode": false,

package/Samples/PlayerChannels/RefreshPingableObjects 1.asset

@@ -0,0 +1,16 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d84ad29ba75bd634eb5eda8abf406faf, type: 3}
+  m_Name: RefreshPingableObjects 1
+  m_EditorClassIdentifier: 
+  _guid: 
+  description: 

package/Samples/PlayerChannels/RefreshPingableObjects 1.asset.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 9aa4febc867c7144b8a17028b2aa9a27
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

package/Samples/PlayerChannels/RefreshPingableObjects.asset

@@ -0,0 +1,16 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d84ad29ba75bd634eb5eda8abf406faf, type: 3}
+  m_Name: RefreshPingableObjects
+  m_EditorClassIdentifier: 
+  _guid: 
+  description: 

package/Samples/PlayerChannels/RefreshPingableObjects.asset.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 509eb5f15058fdf458b9b6a237c5c05f
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name":"fr.jeanf.eventsystem",
-  "version":"0.1.67",
+  "version":"0.1.69",
   "displayName":"Event System",
   "description":"This package contains a basic Event System based on Scriptable Objects as communication medium",
   "unity": "2021.3",
@@ -14,7 +14,7 @@
     "url":"https://jeanfrancoisrobin.art"
   },
   "dependencies": {
-    "fr.jeanf.propertydrawer": "1.0.0"
+    "fr.jeanf.propertydrawer": "1.0.5"
   },
   "samples": [
         {

package/Runtime/ScriptableObjects/DateTimeEventChannelSO.cs

@@ -1,17 +0,0 @@
-using System;
-using UnityEngine;
-using UnityEngine.Events;
-
-namespace jeanf.EventSystem
-{
-	[CreateAssetMenu(menuName = "Events/DateTime Event Channel")]
-	public class DateTimeEventChannelSO : DescriptionBaseSO
-	{
-		public UnityAction<DateTime> OnEventRaised;
-
-		public void RaiseEvent(DateTime value)
-		{
-			OnEventRaised?.Invoke(value);
-		}
-	}
-}

package/Runtime/SenderInterfaces/DateTimeEventSender.cs

@@ -1,20 +0,0 @@
-using System;
-using jeanf.EventSystem;
-using UnityEngine;
-
-public class DateTimeEventSender : MonoBehaviour, IDebugBehaviour
-{
-    public bool isDebug
-    { 
-        get => _isDebug;
-        set => _isDebug = value; 
-    }
-    [SerializeField] private bool _isDebug = false;
-
-    [field: Header("Broadcasting on:")] public DateTimeEventChannelSO boolMessageChannel;
-    
-    public void SendBool(DateTime value)
-    {
-        boolMessageChannel.RaiseEvent(value);
-    }
-}