fr.jeanf.eventsystem 0.1.85 → 0.1.87

package/Runtime/BaseClasses/DescriptionBaseSO.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using UnityEngine;
 
 namespace jeanf.EventSystem
@@ -9,5 +9,12 @@ namespace jeanf.EventSystem
 	public abstract class DescriptionBaseSO : SerializableScriptableObject
 	{
 		[TextArea] public string description;
+
+
+		public void DelegateMethod(Action action)
+        {
+			action?.Invoke();
+        }
+
 	}
 }

package/Runtime/Editor/SendActionRebindEventOnClick.cs

@@ -0,0 +1,43 @@
+
+#if UNITY_EDITOR
+
+using jeanf.EventSystem;
+using UnityEditor;
+using UnityEngine;
+using UnityEngine.InputSystem;
+namespace jeanf.EventSystem
+{
+    public class SendActionRebindEventOnClick : MonoBehaviour
+    {
+
+        [Header("Broadcasting on:")]
+        [SerializeField]
+        private ActionRebindEventChannelSO TestChannel;
+
+        [Space(20)]
+        [SerializeField] private InputActionReference actionToSend;
+        [SerializeField] private string bindingPath;
+        public void CallFunction()
+        {
+            TestChannel.RaiseEvent(actionToSend, bindingPath);
+        }
+    }
+
+    [CustomEditor(typeof(SendActionRebindEventOnClick))]
+    public class ActionRebindEventOnClickEditor : Editor
+    {
+        override public void OnInspectorGUI()
+        {
+            DrawDefaultInspector();
+            var eventToSend = (SendActionRebindEventOnClick)target;
+            if (GUILayout.Button("Send ActionInt", GUILayout.Height(30)))
+            {
+                eventToSend.CallFunction(); // how do i call this?
+            }
+            GUILayout.Space(10);
+        }
+    }
+}
+
+#endif
+

package/Runtime/Editor/SendActionRebindEventOnClick.cs.meta

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

package/Runtime/Editor/SendInputActionIntEventOnClick.cs

@@ -0,0 +1,41 @@
+#if UNITY_EDITOR
+
+using jeanf.EventSystem;
+using UnityEditor;
+using UnityEngine;
+using UnityEngine.InputSystem;
+namespace jeanf.EventSystem
+{
+    public class SendInputActionIntEventOnClick : MonoBehaviour
+    {
+
+        [Header("Broadcasting on:")]
+        [SerializeField]
+        private InputActionIntEventChannelSO TestChannel;
+
+        [Space(20)]
+        [SerializeField] private InputActionReference actionToSend;
+        [SerializeField] private int intToSend;
+        public void CallFunction()
+        {
+            TestChannel.RaiseEvent(actionToSend, intToSend);
+        }
+    }
+
+    [CustomEditor(typeof(SendInputActionIntEventOnClick))]
+    public class InputActionIntEventOnClickEditor : Editor
+    {
+        override public void OnInspectorGUI()
+        {
+            DrawDefaultInspector();
+            var eventToSend = (SendInputActionIntEventOnClick)target;
+            if (GUILayout.Button("Send ActionInt", GUILayout.Height(30)))
+            {
+                eventToSend.CallFunction(); // how do i call this?
+            }
+            GUILayout.Space(10);
+        }
+    }
+}
+
+#endif

package/Runtime/Editor/SendInputActionIntEventOnClick.cs.meta

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

package/Runtime/Editor/SendInputEventOnClick.cs

@@ -0,0 +1,40 @@
+#if UNITY_EDITOR
+
+using jeanf.EventSystem;
+using UnityEditor;
+using UnityEngine;
+using UnityEngine.InputSystem;
+namespace jeanf.EventSystem
+{
+    public class SendInputEventOnClick : MonoBehaviour
+    {
+
+        [Header("Broadcasting on:")]
+        [SerializeField]
+        private InputActionEventChannelSO TestChannel;
+
+        [Space(20)]
+        [SerializeField] private InputAction messageToSend;
+        public void CallFunction()
+        {
+            TestChannel.RaiseEvent(messageToSend);
+        }
+    }
+
+    [CustomEditor(typeof(SendInputEventOnClick))]
+    public class InputActionEventOnClickEditor : Editor
+    {
+        override public void OnInspectorGUI()
+        {
+            DrawDefaultInspector();
+            var eventToSend = (SendInputEventOnClick)target;
+            if (GUILayout.Button("Send Action", GUILayout.Height(30)))
+            {
+                eventToSend.CallFunction(); // how do i call this?
+            }
+            GUILayout.Space(10);
+        }
+    }
+}
+
+#endif

package/Runtime/Editor/SendInputEventOnClick.cs.meta

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

package/Runtime/Listeners/InputActionEventListener.cs

@@ -0,0 +1,44 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+using UnityEngine.InputSystem;
+using UnityEngine.Events;
+
+namespace jeanf.EventSystem
+{
+    [System.Serializable]
+    public class InputActionEvent : UnityEvent<InputAction>
+    {
+
+    }
+    public class InputActionEventListener : MonoBehaviour
+    {
+        public InputActionEventChannelSO _channel = default;
+
+        public InputActionEvent OnInputActionEventRaised;
+
+        private void OnEnable()
+        {
+            if (_channel != null)
+                _channel.OnEventRaised += Respond;
+        }
+
+        private void OnDisable()
+        {
+            if (_channel != null)
+                _channel.OnEventRaised -= Respond;
+        }
+
+        private void Respond(InputAction value)
+        {
+            OnInputActionEventRaised?.Invoke(value);
+        }
+
+        public InputActionEventListener(InputActionEventChannelSO _channel, InputActionEvent OnInputActionEventRaised)
+        {
+            this._channel = _channel;
+            this.OnInputActionEventRaised = OnInputActionEventRaised;
+        }
+    }
+}
+

package/Runtime/Listeners/InputActionEventListener.cs.meta

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

package/Runtime/Listeners/InputActionIntEventListener.cs

@@ -0,0 +1,49 @@
+using UnityEngine;
+using UnityEngine.Events;
+using UnityEngine.InputSystem;
+/// <summary>
+/// To use a generic UnityEvent type you must override the generic type.
+/// </summary>
+namespace jeanf.EventSystem
+{
+	[System.Serializable]
+	public class InputActionIntEvent : UnityEvent<InputAction, int>
+	{
+
+	}
+
+	/// <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 InputActionIntEventListener : MonoBehaviour, IDebugBehaviour
+	{
+		public bool isDebug
+		{
+			get => _isDebug;
+			set => _isDebug = value;
+		}
+		[SerializeField] private bool _isDebug = false;
+
+		[SerializeField] private InputActionIntEventChannelSO _channel = default;
+
+		public InputActionIntEvent OnEventRaised;
+
+		private void OnEnable()
+		{
+			if (_channel != null)
+				_channel.OnEventRaised += Respond;
+		}
+
+		private void OnDisable()
+		{
+			if (_channel != null)
+				_channel.OnEventRaised -= Respond;
+		}
+
+		private void Respond(InputAction action, int value)
+		{
+			OnEventRaised?.Invoke(action, value);
+			if (isDebug) Debug.Log($" int-bool event raised: <{action},{value}>");
+		}
+	}
+}

package/Runtime/Listeners/InputActionIntEventListener.cs.meta

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

package/Runtime/PingSystem/PingableScriptableObject.cs

@@ -1,9 +1,9 @@
 using System;
 using UnityEngine;
+using jeanf.propertyDrawer;
 
 namespace jeanf.EventSystem
 {
-    using jeanf.propertyDrawer;
     public class PingableScriptableObject : MonoBehaviour, IScriptableObjectEventSender, IScriptableObjectEventListener, IDebugBehaviour
     {
         public bool isDebug

package/Runtime/ScriptableObjects/ActionRebindEventChannelSO.cs

@@ -0,0 +1,37 @@
+using UnityEngine;
+using UnityEngine.Events;
+using UnityEngine.InputSystem;
+
+namespace jeanf.EventSystem
+{
+    [CreateAssetMenu(menuName = "Events/Rebind/ActionRebind Event Channel")]
+
+    public class ActionRebindEventChannelSO : DescriptionBaseSO
+    {
+        public UnityAction<InputAction, int> OnEventRaised;
+
+        public void RaiseEvent(InputAction action, string bindingPath)
+        {
+            int index = 0;
+            foreach (var binding in action.bindings)
+            {
+                InputBinding bindingToRebind = new InputBinding { path = bindingPath };
+                if (!bindingToRebind.Matches(binding))
+                {
+                    continue;
+                }
+                index = action.GetBindingIndex(bindingToRebind);
+            }
+            OnEventRaised?.Invoke(action, index);
+        }
+
+        public void RaiseEvent(InputAction action, int index)
+        {
+            
+            OnEventRaised?.Invoke(action, index);
+        }
+    }
+
+
+}
+

package/Runtime/ScriptableObjects/ActionRebindEventChannelSO.cs.meta

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

package/Runtime/ScriptableObjects/InputActionEventChannelSO.cs

@@ -0,0 +1,19 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+using UnityEngine.Events;
+using UnityEngine.InputSystem;
+
+namespace jeanf.EventSystem
+{
+    public class InputActionEventChannelSO : DescriptionBaseSO
+    {
+        public UnityAction<InputAction> OnEventRaised;
+
+        public void RaiseEvent(InputAction value)
+        {
+            if (OnEventRaised != null)
+                OnEventRaised?.Invoke(value);
+        }
+    }
+}

package/Runtime/ScriptableObjects/InputActionEventChannelSO.cs.meta

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

package/Runtime/ScriptableObjects/InputActionIntEventChannelSO.cs

@@ -0,0 +1,19 @@
+using UnityEngine;
+using UnityEngine.Events;
+using UnityEngine.InputSystem;
+
+namespace jeanf.EventSystem
+{
+    [CreateAssetMenu(menuName = "Events/Advanced/<InputAction,Int> Event Channel")]
+
+    public class InputActionIntEventChannelSO : DescriptionBaseSO
+    {
+        public UnityAction<InputAction, int> OnEventRaised;
+
+        public void RaiseEvent(InputAction action, int value)
+        {
+            OnEventRaised?.Invoke(action, value);
+        }
+    }
+}
+

package/Runtime/ScriptableObjects/InputActionIntEventChannelSO.cs.meta

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

package/Runtime/ScriptableObjects/QuaternionEventChannelSO.cs

@@ -0,0 +1,21 @@
+using UnityEngine;
+using UnityEngine.Events;
+
+/// <summary>
+/// This class is used for Events that have one int argument.
+/// Example: An Achievement unlock event, where the int is the Achievement ID.
+/// </summary>
+namespace jeanf.EventSystem
+{
+	[CreateAssetMenu(menuName = "Events/Quaternion Event Channel")]
+	public class QuaternionEventChannelSO : DescriptionBaseSO
+	{
+		public UnityAction<Quaternion> OnEventRaised;
+
+		public void RaiseEvent(Quaternion value)
+		{
+			if (OnEventRaised != null)
+				OnEventRaised.Invoke(value);
+		}
+	}
+}

package/Runtime/ScriptableObjects/QuaternionEventChannelSO.cs.meta

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

package/Runtime/ScriptableObjects/Vector2EventChannelSO.cs

@@ -0,0 +1,21 @@
+using UnityEngine;
+using UnityEngine.Events;
+
+/// <summary>
+/// This class is used for Events that have one int argument.
+/// Example: An Achievement unlock event, where the int is the Achievement ID.
+/// </summary>
+namespace jeanf.EventSystem
+{
+	[CreateAssetMenu(menuName = "Events/Vector2 Event Channel")]
+	public class Vector2EventChannelSO : DescriptionBaseSO
+	{
+		public UnityAction<Vector2> OnEventRaised;
+
+		public void RaiseEvent(Vector2 value)
+		{
+			if (OnEventRaised != null)
+				OnEventRaised.Invoke(value);
+		}
+	}
+}

package/Runtime/ScriptableObjects/Vector2EventChannelSO.cs.meta

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

package/Runtime/ScriptableObjects/Vector3EventChannelSO.cs

@@ -0,0 +1,21 @@
+using UnityEngine;
+using UnityEngine.Events;
+
+/// <summary>
+/// This class is used for Events that have one int argument.
+/// Example: An Achievement unlock event, where the int is the Achievement ID.
+/// </summary>
+namespace jeanf.EventSystem
+{
+	[CreateAssetMenu(menuName = "Events/Vector3 Event Channel")]
+	public class Vector3EventChannelSO : DescriptionBaseSO
+	{
+		public UnityAction<Vector3> OnEventRaised;
+
+		public void RaiseEvent(Vector3 value)
+		{
+			if (OnEventRaised != null)
+				OnEventRaised.Invoke(value);
+		}
+	}
+}

package/Runtime/ScriptableObjects/Vector3EventChannelSO.cs.meta

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

package/Runtime/SenderInterfaces/IInputActionEventSender.cs

@@ -0,0 +1,11 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+namespace jeanf.EventSystem
+{
+    public interface IInputActionEventSender
+    {
+        InputActionEventChannelSO inputActionMessageChannel { get; set; }
+    }
+}

package/Runtime/SenderInterfaces/IInputActionEventSender.cs.meta

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

package/Runtime/SenderInterfaces/IInputActionIntEventSender.cs

@@ -0,0 +1,23 @@
+using UnityEngine;
+
+namespace jeanf.EventSystem
+{
+    public class IInputActionIntEventSender : MonoBehaviour, IDebugBehaviour
+    {
+        public bool isDebug
+        {
+            get => _isDebug;
+            set => _isDebug = value;
+        }
+        [SerializeField] private bool _isDebug = false;
+
+        [field: Header("Broadcasting on:")] public IntBoolEventChannelSO boolMessageChannel;
+
+        public void SendIntBool(int nb, bool value)
+        {
+            boolMessageChannel.RaiseEvent(nb, value);
+        }
+    }
+}
+
+

package/Runtime/SenderInterfaces/IInputActionIntEventSender.cs.meta

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

package/Runtime/SenderInterfaces/TransformEventSender.cs

@@ -1,10 +1,8 @@
-using System;
 using UnityEngine;
-using UnityEngine.Serialization;
+using jeanf.propertyDrawer;
 
 namespace jeanf.EventSystem
 {
-    using jeanf.propertyDrawer;
     public class TransformEventSender : MonoBehaviour, IDebugBehaviour
     {
         public bool isDebug

package/Runtime/jeanf.eventSystem.asmdef

@@ -2,7 +2,8 @@
     "name": "jeanf.eventsystem",
     "rootNamespace": "",
     "references": [
-        "GUID:e8958e6939af7314a97769de4be4ce25"
+        "GUID:e8958e6939af7314a97769de4be4ce25",
+        "GUID:75469ad4d38634e559750d17036d5f7c"
     ],
     "includePlatforms": [],
     "excludePlatforms": [],

package/package.json

@@ -1,31 +1,31 @@
 {
-  "name":"fr.jeanf.eventsystem",
-  "version":"0.1.85",
-  "displayName":"Event System",
-  "description":"This package contains a basic Event System based on Scriptable Objects as communication medium",
+  "name": "fr.jeanf.eventsystem",
+  "version": "0.1.87",
+  "displayName": "Event System",
+  "description": "This package contains a basic Event System based on Scriptable Objects as communication medium",
   "unity": "2021.3",
   "keywords": [
     "jeanf",
     "event system"
   ],
-  "author":{
-    "name":"Jean-François Robin",
-    "email":"robin.jeanfrancois@gmail.com",
-    "url":"https://jeanfrancoisrobin.art"
+  "author": {
+    "name": "Jean-François Robin",
+    "email": "robin.jeanfrancois@gmail.com",
+    "url": "https://jeanfrancoisrobin.art"
   },
   "dependencies": {
     "fr.jeanf.propertydrawer": "1.0.5"
   },
   "samples": [
-        {
-          "displayName": "Player Channels",
-          "description": "A set of channels used for the vr_player package",
-          "path": "Samples/PlayerChannels"
-        },
-        {
-          "displayName": "Event filters",
-          "description": "A set of filters to segregate messages sent on the same channel",
-          "path": "Samples/Filters"
-        }
-    ]
-}
+    {
+      "displayName": "Player Channels",
+      "description": "A set of channels used for the vr_player package",
+      "path": "Samples/PlayerChannels"
+    },
+    {
+      "displayName": "Event filters",
+      "description": "A set of filters to segregate messages sent on the same channel",
+      "path": "Samples/Filters"
+    }
+  ]
+}