diff --git a/Runtime/Collider/ColliderTrigger.cs b/Runtime/Collider/ColliderTrigger.cs index 0ed5ede..74af49a 100644 --- a/Runtime/Collider/ColliderTrigger.cs +++ b/Runtime/Collider/ColliderTrigger.cs @@ -4,11 +4,11 @@ namespace Syntriax.Modules.Trigger { public class ColliderTrigger : TriggerBase { - protected IColliderTrigger colliderTrigger = null; + protected IColliderTriggerArea colliderTrigger = null; private void Awake() { - colliderTrigger = GetComponent(); + colliderTrigger = GetComponent(); } private void FixedUpdate() diff --git a/Runtime/Collider/ColliderTriggerAreaBase.cs b/Runtime/Collider/ColliderTriggerAreaBase.cs index 8434aa5..13b2d3c 100644 --- a/Runtime/Collider/ColliderTriggerAreaBase.cs +++ b/Runtime/Collider/ColliderTriggerAreaBase.cs @@ -4,15 +4,14 @@ using UnityEngine; namespace Syntriax.Modules.Trigger { - public abstract class ColliderTriggerAreaBase : MonoBehaviour, IColliderTrigger + public abstract class ColliderTriggerAreaBase : MonoBehaviour, IColliderTriggerArea { - protected List results = new List(32); - protected Collider2D[] nonAllocResults = new Collider2D[32]; protected int previousTriggerCount = 0; public LayerMask ColliderMask { get; set; } = ~0; public Action> OnTriggeredCollidersUpdated { get; set; } = null; + public List ColliderList { get; protected set; } = new List(32); protected abstract int TriggerCount { get; } @@ -22,11 +21,11 @@ namespace Syntriax.Modules.Trigger if (triggerCount != previousTriggerCount) { - results.Clear(); + ColliderList.Clear(); for (int i = 0; i < triggerCount; i++) - results.Add(nonAllocResults[i]); + ColliderList.Add(nonAllocResults[i]); - OnTriggeredCollidersUpdated?.Invoke(results); + OnTriggeredCollidersUpdated?.Invoke(ColliderList); } previousTriggerCount = triggerCount; diff --git a/Runtime/Collider/IColliderTrigger.cs b/Runtime/Collider/IColliderTriggerArea.cs similarity index 66% rename from Runtime/Collider/IColliderTrigger.cs rename to Runtime/Collider/IColliderTriggerArea.cs index a7f5be4..9219e9e 100644 --- a/Runtime/Collider/IColliderTrigger.cs +++ b/Runtime/Collider/IColliderTriggerArea.cs @@ -4,7 +4,7 @@ using UnityEngine; namespace Syntriax.Modules.Trigger { - public interface IColliderTrigger : ITriggerArea + public interface IColliderTriggerArea : ITriggerArea { /// /// value for checking triggers @@ -14,7 +14,10 @@ namespace Syntriax.Modules.Trigger /// /// Called whenever the list of changes /// - /// List of that triggered the + /// List of that triggered the Action> OnTriggeredCollidersUpdated { get; set; } + + /// List of that triggered the + List ColliderList { get; } } } diff --git a/Runtime/Collider/IColliderTrigger.cs.meta b/Runtime/Collider/IColliderTriggerArea.cs.meta similarity index 83% rename from Runtime/Collider/IColliderTrigger.cs.meta rename to Runtime/Collider/IColliderTriggerArea.cs.meta index dcfb010..5536c1f 100644 --- a/Runtime/Collider/IColliderTrigger.cs.meta +++ b/Runtime/Collider/IColliderTriggerArea.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: a101e5476051bb74b8012198b1594327 +guid: efbbfd3aba8fb5843a26ed5446050b32 MonoImporter: externalObjects: {} serializedVersion: 2