Compare commits

29 Commits

Author SHA1 Message Date
d15c05d53f 0.7.1
- Fixed the State dependency version
2023-03-20 23:01:50 +03:00
0fcee32f71 Merge branch 'main' into package 2023-03-20 23:01:07 +03:00
545c9734de 0.7.1 2023-03-20 23:00:59 +03:00
8963df6f46 docs: ITrigger.StateEnable Documentation Updated 2023-03-20 23:00:17 +03:00
fc49961ef3 refactor: Back Fields Are Renamed 2023-03-20 22:59:20 +03:00
34c3a3bc8e 0.7.0 2023-03-20 22:28:24 +03:00
d57961f5f1 0.7.0 2023-03-20 22:27:40 +03:00
c8105122fb feat: Added State Enabled Integration to Editor Visualization Of Collider Triggers 2023-03-20 22:24:18 +03:00
f2faa86f65 BREAKING CHANGE: State 0.2.0 2023-03-20 22:24:01 +03:00
444782b724 0.6.4 2023-02-16 13:55:14 +03:00
bca2922a58 0.6.4 2023-02-16 13:54:56 +03:00
e97119befc fix: BoxColliderTriggerArea Visualisation Not Rotating 2023-02-16 13:54:18 +03:00
e7cd457091 0.6.2 2023-02-16 13:29:49 +03:00
76835af6b5 0.6.2 2023-02-16 13:29:25 +03:00
ea44c11e56 fix: BoxGroundTriggerArea Meta File 2023-02-16 13:28:52 +03:00
d7e3b0e1db 0.6.1 2023-02-16 13:20:51 +03:00
52de02bc1e 0.6.1 2023-02-16 13:19:52 +03:00
d3db00722a 0.6.0 2023-02-16 13:09:12 +03:00
cc1e4facbb Merge branch 'development' 2023-02-16 13:08:05 +03:00
cee04f5da3 feat: 3D Box Area ColliderTriggerArea & GroundTriggerArea Added 2023-02-16 13:07:14 +03:00
8356f72d6d feat: In Editor TriggerArea Visual Checking Added 2023-02-16 13:06:35 +03:00
8b3721eba3 BREAKING CHANGE: IColiderTriggerArea Now Returns Transforms Instead Of Collider2Ds 2023-02-16 13:05:14 +03:00
01c76e36ad 5.1.0 2022-12-17 22:45:25 +03:00
1f36b44cfd Merge branch 'development' 2022-12-17 22:44:54 +03:00
a4fd3343b1 Check Fix 2022-12-17 22:44:44 +03:00
bf75b53086 0.5.0 2022-12-17 15:29:27 +03:00
ac1cdfec18 0.4.0 2022-12-17 14:58:10 +03:00
25edbb5e37 Merge branch 'main' into package 2022-12-17 14:43:13 +03:00
1cc02b2c92 Package Branch (0.2.0) 2022-12-17 11:56:47 +03:00
13 changed files with 131 additions and 29 deletions

View File

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

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

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 && 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);
}

View File

@@ -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
}
}

View File

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

View File

@@ -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();

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; }
@@ -21,17 +21,41 @@ namespace Syntriax.Modules.Trigger
{
int triggerCount = TriggerCount;
if (triggerCount != previousTriggerCount)
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;
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
}
}

View File

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

View File

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

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; }
}
}

View File

@@ -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

View File

@@ -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;

View File

@@ -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",