0.7.1

- Fixed the State dependency version

README.md

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

Runtime/Collider/Box2DColliderTriggerArea.cs

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

Runtime/Collider/BoxColliderTriggerArea.cs

@@ -0,0 +1,23 @@
+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

@@ -0,0 +1,11 @@
+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.ToggleState;
+using Syntriax.Modules.State;
 
 namespace Syntriax.Modules.Trigger
 {
@@ -13,7 +13,7 @@ namespace Syntriax.Modules.Trigger
 
         private void FixedUpdate()
         {
-            if (!ToggleStateMember.IsToggledNullChecked())
+            if (!StateEnable.IsEnabledNullChecked())
                 return;
 
             IsTrigerred = colliderTrigger.Check();

Runtime/Collider/ColliderTriggerAreaBase.cs

@@ -4,16 +4,16 @@ using UnityEngine;
 
 namespace Syntriax.Modules.Trigger
 {
-    public abstract class ColliderTriggerAreaBase : MonoBehaviour, IColliderTriggerArea
+    public abstract class ColliderTriggerAreaBase<T> : MonoBehaviour, IColliderTriggerArea where T : Component
     {
         [SerializeField] private LayerMask colliderMask = ~0;
 
-        protected Collider2D[] nonAllocResults = new Collider2D[32];
+        protected T[] nonAllocResults = new T[32];
         protected int previousTriggerCount = 0;
 
         public LayerMask ColliderMask { get => colliderMask; set => colliderMask = value; }
-        public Action<List<Collider2D>> OnTriggeredCollidersUpdated { get; set; } = null;
+        public Action<List<Transform>> OnTriggeredTransformsUpdated { get; set; } = null;
-        public List<Collider2D> ColliderList { get; protected set; } = new List<Collider2D>(32);
+        public List<Transform> TriggeredTransforms { get; protected set; } = new List<Transform>(32);
 
         protected abstract int TriggerCount { get; }
 
@@ -23,11 +23,11 @@ namespace Syntriax.Modules.Trigger
 
             if (!IsArrayAndListIdentical(triggerCount))
             {
-                ColliderList.Clear();
+                TriggeredTransforms.Clear();
                 for (int i = 0; i < triggerCount; i++)
-                    ColliderList.Add(nonAllocResults[i]);
+                    TriggeredTransforms.Add(nonAllocResults[i].transform);
 
-                OnTriggeredCollidersUpdated?.Invoke(ColliderList);
+                OnTriggeredTransformsUpdated?.Invoke(TriggeredTransforms);
             }
 
             previousTriggerCount = triggerCount;
@@ -40,10 +40,22 @@ namespace Syntriax.Modules.Trigger
                 return false;
 
             for (int i = 0; i < triggerCount; i++)
-                if (!ColliderList.Contains(nonAllocResults[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

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

Runtime/Collider/Ground/BoxGroundTriggerArea.cs.meta

@@ -0,0 +1,11 @@
+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="Collider2D"/> changes
+        /// Called whenever the list of <see cref="Transform"/> changes
         /// </summary>
-        /// <value>List of <see cref="Collider2D"/> that triggered the <see cref="IColliderTriggerArea"/></value>
+        /// <value>List of <see cref="Transform"/> that their colliders triggered the <see cref="IColliderTriggerArea"/></value>
-        Action<List<Collider2D>> OnTriggeredCollidersUpdated { get; set; }
+        Action<List<Transform>> OnTriggeredTransformsUpdated { get; set; }
 
-        /// <value>List of <see cref="Collider2D"/> that triggered the <see cref="IColliderTriggerArea"/></value>
+        /// <value>List of <see cref="Transform"/> that their colliders triggered the <see cref="IColliderTriggerArea"/></value>
-        List<Collider2D> ColliderList { get; }
+        List<Transform> TriggeredTransforms { get; }
     }
 }

Runtime/ITrigger.cs

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

Runtime/TriggerBase.cs

@@ -1,22 +1,43 @@
 using System;
-using Syntriax.Modules.ToggleState;
+using Syntriax.Modules.State;
 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 || !ToggleStateMember.IsToggledNullChecked())
+                if (value == _isTrigerred || !StateEnable.IsEnabledNullChecked())
                     return;
 
                 _isTrigerred = value;

package.json

@@ -1,10 +1,12 @@
 {
   "name": "com.syntriax.trigger",
-  "version": "0.3.0",
+  "version": "0.7.1",
   "displayName": "Trigger Module",
   "unity": "2019.1",
   "documentationUrl": "https://git.syntriax.com/Syntriax/Trigger.git",
-  "dependencies": {},
+  "dependencies": {
+    "com.syntriax.state": "0.2.0"
+  },
   "keywords": ["Trigger"],
   "author": {
     "name": "Syntriax",