Syntriax
/
Trigger
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'development'

This commit is contained in:
Syntriax 2023-02-16 13:08:05 +03:00
parent 1f36b44cfd cee04f5da3
commit cc1e4facbb
7 changed files with 60 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Runtime/Collider/Box2DColliderTriggerArea.cs
View File

@ -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 ? Color.green : Color.red;
else
Gizmos.color = TriggerCount > 0 ? Color.green : Color.red;
Gizmos.DrawWireCube(transform.position, transform.lossyScale);
}
#endif

7
Runtime/Collider/Box2DColliderTriggerAreaWithRotation.cs
View File

@ -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 ? Color.green : Color.red;
else
Gizmos.color = TriggerCount > 0 ? Color.green : Color.red;
Gizmos.matrix = transform.localToWorldMatrix;
Gizmos.DrawWireCube(Vector3.zero, Vector3.one);
}

22
Runtime/Collider/BoxColliderTriggerArea.cs Normal file
View File

@ -0,0 +1,22 @@
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 ? Color.green : Color.red;
else
Gizmos.color = TriggerCount > 0 ? Color.green : Color.red;
Gizmos.DrawWireCube(transform.position, transform.lossyScale);
}
#endif
}
}

11
Runtime/Collider/BoxColliderTriggerArea.cs.meta Normal file
View File

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

16
Runtime/Collider/ColliderTriggerAreaBase.cs
View File

@ -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 List<Collider2D> ColliderList { get; protected set; } = new List<Collider2D>(32);
public Action<List<Transform>> OnTriggeredTransformsUpdated { get; set; } = null;
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,7 +40,7 @@ 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;

4
Runtime/Collider/Ground/BoxGroundTriggerArea.cs Normal file
View File

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

10
Runtime/Collider/IColliderTriggerArea.cs
View File

@ -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>
Action<List<Collider2D>> OnTriggeredCollidersUpdated { get; set; }
/// <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>
List<Collider2D> ColliderList { get; }
/// <value>List of <see cref="Transform"/> that their colliders triggered the <see cref="IColliderTriggerArea"/></value>
List<Transform> TriggeredTransforms { get; }
}
}