Extracted Trigger Checking into TriggerAreas

This commit is contained in:
2022-12-17 14:39:54 +03:00
parent f137f1202b
commit bbbf2b5609
35 changed files with 213 additions and 130 deletions

View File

@@ -0,0 +1,18 @@
using UnityEngine;
namespace Syntriax.Modules.Trigger
{
public class Box2DColliderTriggerArea : ColliderTriggerAreaBase
{
protected override int TriggerCount
=> Physics2D.OverlapBoxNonAlloc(transform.position, transform.localScale, 0, nonAllocResults, ColliderMask);
#if UNITY_EDITOR
private void OnDrawGizmosSelected()
{
Gizmos.color = previousTriggerCount > 0 ? Color.green : Color.red;
Gizmos.DrawWireCube(transform.position, transform.lossyScale);
}
#endif
}
}

View File

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

View File

@@ -0,0 +1,19 @@
using UnityEngine;
namespace Syntriax.Modules.Trigger
{
public class Box2DColliderTriggerAreaWithRotation : ColliderTriggerAreaBase
{
protected override int TriggerCount
=> Physics2D.OverlapBoxNonAlloc(transform.position, transform.localScale, transform.rotation.eulerAngles.z, nonAllocResults, ColliderMask);
#if UNITY_EDITOR
private void OnDrawGizmosSelected()
{
Gizmos.color = previousTriggerCount > 0 ? Color.green : Color.red;
Gizmos.matrix = transform.localToWorldMatrix;
Gizmos.DrawWireCube(Vector3.zero, Vector3.one);
}
#endif
}
}

View File

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

View File

@@ -0,0 +1,22 @@
using Syntriax.Modules.ToggleState;
namespace Syntriax.Modules.Trigger
{
public class ColliderTrigger : TriggerBase
{
protected IColliderTrigger colliderTrigger = null;
private void Awake()
{
colliderTrigger = GetComponent<IColliderTrigger>();
}
private void FixedUpdate()
{
if (!ToggleStateMember.IsToggledNullChecked())
return;
IsTrigerred = colliderTrigger.Check();
}
}
}

View File

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

View File

@@ -0,0 +1,36 @@
using System;
using System.Collections.Generic;
using UnityEngine;
namespace Syntriax.Modules.Trigger
{
public abstract class ColliderTriggerAreaBase : MonoBehaviour, IColliderTrigger
{
protected List<Collider2D> results = new List<Collider2D>(32);
protected Collider2D[] nonAllocResults = new Collider2D[32];
protected int previousTriggerCount = 0;
public LayerMask ColliderMask { get; set; } = ~0;
public Action<List<Collider2D>> OnTriggeredCollidersUpdated { get; set; } = null;
protected abstract int TriggerCount { get; }
public virtual bool Check()
{
int triggerCount = TriggerCount;
if (triggerCount != previousTriggerCount)
{
results.Clear();
for (int i = 0; i < triggerCount; i++)
results.Add(nonAllocResults[i]);
OnTriggeredCollidersUpdated?.Invoke(results);
}
previousTriggerCount = triggerCount;
return triggerCount > 0;
}
}
}

View File

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

View File

@@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 8747cc51a59e7a14fae4687c7136d15b
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

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

View File

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

View File

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

View File

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

View File

@@ -0,0 +1,4 @@
namespace Syntriax.Modules.Trigger
{
public class GroundTrigger : ColliderTrigger, IGroundTrigger { }
}

View File

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

View File

@@ -0,0 +1,4 @@
namespace Syntriax.Modules.Trigger
{
public interface IGroundTrigger : ITrigger { }
}

View File

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

View File

@@ -0,0 +1,4 @@
namespace Syntriax.Modules.Trigger
{
public interface IGroundTriggerArea : ITriggerArea { }
}

View File

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

View File

@@ -0,0 +1,20 @@
using System;
using System.Collections.Generic;
using UnityEngine;
namespace Syntriax.Modules.Trigger
{
public interface IColliderTrigger : ITriggerArea
{
/// <summary>
/// <see cref="LayerMask"/> value for checking triggers
/// </summary>
LayerMask ColliderMask { get; set; }
/// <summary>
/// Called whenever the list of <see cref="Collider2D"/> changes
/// </summary>
/// <value>List of <see cref="Collider2D"/> that triggered the <see cref="IColliderTrigger"/></value>
Action<List<Collider2D>> OnTriggeredCollidersUpdated { get; set; }
}
}

View File

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

View File

@@ -0,0 +1,11 @@
namespace Syntriax.Modules.Trigger
{
public interface ITriggerArea
{
/// <summary>
/// Check if the <see cref="ITriggerArea"/> is Triggered
/// </summary>
/// <returns>true if <see cref="ITriggerArea"/> is triggered, false if not</returns>
bool Check();
}
}

View File

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