Merge branch 'development'

README.md

@@ -1,4 +1,4 @@
 # Trigger
 
 ## Dependencies
-1. [State Module](https://git.syntriax.com/Syntriax/State)
+1. [ToggleState Module](https://git.syntriax.com/Syntriax/ToggleState)

Runtime/Collider/Box2DColliderTriggerArea.cs

@@ -2,7 +2,7 @@ using UnityEngine;
 
 namespace Syntriax.Modules.Trigger
 {
-    public class Box2DColliderTriggerArea : ColliderTriggerAreaBase<Collider2D>
+    public class Box2DColliderTriggerArea : ColliderTriggerAreaBase
     {
         protected override int TriggerCount
             => Physics2D.OverlapBoxNonAlloc(transform.position, transform.localScale, 0, nonAllocResults, ColliderMask);
@@ -10,10 +10,7 @@ namespace Syntriax.Modules.Trigger
 #if UNITY_EDITOR
         private void OnDrawGizmosSelected()
         {
-            if (UnityEditor.EditorApplication.isPlaying)
-                Gizmos.color = previousTriggerCount > 0 && StateEnable.IsEnabled ? Color.green : Color.red;
-            else
-                Gizmos.color = TriggerCount > 0 ? Color.green : Color.red;
+            Gizmos.color = previousTriggerCount > 0 ? Color.green : Color.red;
             Gizmos.DrawWireCube(transform.position, transform.lossyScale);
         }
 #endif

Runtime/Collider/Box2DColliderTriggerAreaWithRotation.cs

@@ -2,7 +2,7 @@ using UnityEngine;
 
 namespace Syntriax.Modules.Trigger
 {
-    public class Box2DColliderTriggerAreaWithRotation : ColliderTriggerAreaBase<Collider2D>
+    public class Box2DColliderTriggerAreaWithRotation : ColliderTriggerAreaBase
     {
         protected override int TriggerCount
             => Physics2D.OverlapBoxNonAlloc(transform.position, transform.localScale, transform.rotation.eulerAngles.z, nonAllocResults, ColliderMask);
@@ -10,10 +10,7 @@ namespace Syntriax.Modules.Trigger
 #if UNITY_EDITOR
         private void OnDrawGizmosSelected()
         {
-            if (UnityEditor.EditorApplication.isPlaying)
-                Gizmos.color = previousTriggerCount > 0 && StateEnable.IsEnabled ? Color.green : Color.red;
-            else
-                Gizmos.color = TriggerCount > 0 ? Color.green : Color.red;
+            Gizmos.color = previousTriggerCount > 0 ? Color.green : Color.red;
             Gizmos.matrix = transform.localToWorldMatrix;
             Gizmos.DrawWireCube(Vector3.zero, Vector3.one);
         }

Runtime/Collider/BoxColliderTriggerArea.cs

@@ -1,23 +0,0 @@
-using UnityEngine;
-
-namespace Syntriax.Modules.Trigger
-{
-    public class BoxColliderTriggerArea : ColliderTriggerAreaBase<Collider>
-    {
-        protected override int TriggerCount
-            => Physics.OverlapBoxNonAlloc(transform.position, transform.localScale * .5f, nonAllocResults, transform.rotation, ColliderMask);
-
-#if UNITY_EDITOR
-        private void OnDrawGizmosSelected()
-        {
-            if (UnityEditor.EditorApplication.isPlaying)
-                Gizmos.color = previousTriggerCount > 0 && StateEnable.IsEnabled ? Color.green : Color.red;
-            else
-                Gizmos.color = TriggerCount > 0 ? Color.green : Color.red;
-
-            Gizmos.matrix = transform.localToWorldMatrix;
-            Gizmos.DrawWireCube(Vector3.zero, Vector3.one);
-        }
-#endif
-    }
-}

Runtime/Collider/BoxColliderTriggerArea.cs.meta

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

Runtime/Collider/ColliderTrigger.cs

@@ -1,4 +1,4 @@
-using Syntriax.Modules.State;
+using Syntriax.Modules.ToggleState;
 
 namespace Syntriax.Modules.Trigger
 {
@@ -13,7 +13,7 @@ namespace Syntriax.Modules.Trigger
 
         private void FixedUpdate()
         {
-            if (!StateEnable.IsEnabledNullChecked())
+            if (!ToggleStateMember.IsToggledNullChecked())
                 return;
 
             IsTrigerred = colliderTrigger.Check();

Runtime/Collider/ColliderTriggerAreaBase.cs

@@ -4,16 +4,16 @@ using UnityEngine;
 
 namespace Syntriax.Modules.Trigger
 {
-    public abstract class ColliderTriggerAreaBase<T> : MonoBehaviour, IColliderTriggerArea where T : Component
+    public abstract class ColliderTriggerAreaBase : MonoBehaviour, IColliderTriggerArea
     {
         [SerializeField] private LayerMask colliderMask = ~0;
 
-        protected T[] nonAllocResults = new T[32];
+        protected Collider2D[] nonAllocResults = new Collider2D[32];
         protected int previousTriggerCount = 0;
 
         public LayerMask ColliderMask { get => colliderMask; set => colliderMask = value; }
-        public Action<List<Transform>> OnTriggeredTransformsUpdated { get; set; } = null;
-        public List<Transform> TriggeredTransforms { get; protected set; } = new List<Transform>(32);
+        public Action<List<Collider2D>> OnTriggeredCollidersUpdated { get; set; } = null;
+        public List<Collider2D> ColliderList { get; protected set; } = new List<Collider2D>(32);
 
         protected abstract int TriggerCount { get; }
 
@@ -21,41 +21,17 @@ namespace Syntriax.Modules.Trigger
         {
             int triggerCount = TriggerCount;
 
-            if (!IsArrayAndListIdentical(triggerCount))
+            if (triggerCount != previousTriggerCount)
             {
-                TriggeredTransforms.Clear();
+                ColliderList.Clear();
                 for (int i = 0; i < triggerCount; i++)
-                    TriggeredTransforms.Add(nonAllocResults[i].transform);
+                    ColliderList.Add(nonAllocResults[i]);
 
-                OnTriggeredTransformsUpdated?.Invoke(TriggeredTransforms);
+                OnTriggeredCollidersUpdated?.Invoke(ColliderList);
             }
 
             previousTriggerCount = triggerCount;
             return triggerCount > 0;
         }
-
-        private bool IsArrayAndListIdentical(int triggerCount)
-        {
-            if (previousTriggerCount != triggerCount)
-                return false;
-
-            for (int i = 0; i < triggerCount; i++)
-                if (!TriggeredTransforms.Contains(nonAllocResults[i].transform))
-                    return false;
-
-            return true;
-        }
-
-#if UNITY_EDITOR
-        private State.IStateEnable _stateEnable = null;
-        public State.IStateEnable StateEnable
-        {
-            get
-            {
-                _stateEnable = _stateEnable ?? GetComponent<State.IStateEnable>() ?? gameObject.AddComponent<State.StateEnableMonoBehaviour>();
-                return _stateEnable;
-            }
-        }
-#endif
     }
 }

Runtime/Collider/Ground/BoxGroundTriggerArea.cs

@@ -1,4 +0,0 @@
-namespace Syntriax.Modules.Trigger
-{
-    public class BoxGroundTriggerArea : BoxColliderTriggerArea, IGroundTriggerArea { }
-}

Runtime/Collider/Ground/BoxGroundTriggerArea.cs.meta

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

Runtime/Collider/IColliderTriggerArea.cs

@@ -12,12 +12,12 @@ namespace Syntriax.Modules.Trigger
         LayerMask ColliderMask { get; set; }
 
         /// <summary>
-        /// Called whenever the list of <see cref="Transform"/> changes
+        /// Called whenever the list of <see cref="Collider2D"/> changes
         /// </summary>
-        /// <value>List of <see cref="Transform"/> that their colliders triggered the <see cref="IColliderTriggerArea"/></value>
-        Action<List<Transform>> OnTriggeredTransformsUpdated { get; set; }
+        /// <value>List of <see cref="Collider2D"/> that triggered the <see cref="IColliderTriggerArea"/></value>
+        Action<List<Collider2D>> OnTriggeredCollidersUpdated { get; set; }
 
-        /// <value>List of <see cref="Transform"/> that their colliders triggered the <see cref="IColliderTriggerArea"/></value>
-        List<Transform> TriggeredTransforms { get; }
+        /// <value>List of <see cref="Collider2D"/> that triggered the <see cref="IColliderTriggerArea"/></value>
+        List<Collider2D> ColliderList { get; }
     }
 }

Runtime/ITrigger.cs

@@ -1,14 +1,14 @@
 using System;
-using Syntriax.Modules.State;
+using Syntriax.Modules.ToggleState;
 
 namespace Syntriax.Modules.Trigger
 {
     public interface ITrigger
     {
         /// <summary>
-        /// <see cref="IStateEnable"/> to control the state of the <see cref="ITrigger"/> is on or off
+        /// Member <see cref="IToggleState"/> to switch on or off
         /// </summary>
-        IStateEnable StateEnable { get; }
+        IToggleState ToggleStateMember { get; }
 
         /// <summary>
         /// Called everytime the IsTrigerred field is changed

Runtime/TriggerBase.cs

@@ -1,43 +1,22 @@
 using System;
-using Syntriax.Modules.State;
+using Syntriax.Modules.ToggleState;
 using UnityEngine;
 
 namespace Syntriax.Modules.Trigger
 {
     public class TriggerBase : MonoBehaviour, ITrigger
     {
+        public IToggleState ToggleStateMember { get; protected set; } = new ToggleStateMember(true);
+
         public Action<bool> OnTriggerStateChanged { get; set; } = null;
 
-        private IStateEnable _stateEnable = null;
-        public IStateEnable StateEnable
-        {
-            get
-            {
-                if (_stateEnable == null)
-                {
-                    _stateEnable = GetComponent<IStateEnable>() ?? gameObject.AddComponent<StateEnableMonoBehaviour>();
-                    _stateEnable.OnEnabledChanged += OnEnabledChanged;
-                }
-                return _stateEnable;
-            }
-        }
-
-        private void OnEnabledChanged(bool enabled)
-        {
-            if (enabled)
-                return;
-
-            _isTrigerred = false;
-            OnTriggerStateChanged?.Invoke(false);
-        }
-
         private bool _isTrigerred = false;
         public bool IsTrigerred
         {
             get => _isTrigerred;
             protected set
             {
-                if (value == _isTrigerred || !StateEnable.IsEnabledNullChecked())
+                if (value == _isTrigerred || !ToggleStateMember.IsToggledNullChecked())
                     return;
 
                 _isTrigerred = value;