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

Compare commits

base: Syntriax:c8105122fbfb3b855b4a4e9214711cd0cfb83a1b
Branches Tags
Syntriax:main
Syntriax:package
Syntriax:development
..
compare: Syntriax:e97119befc38c31ec7ea4ed166c66f92b259ec65
Branches Tags
Syntriax:package
Syntriax:main
Syntriax:development

No commits in common. "c8105122fbfb3b855b4a4e9214711cd0cfb83a1b" and "e97119befc38c31ec7ea4ed166c66f92b259ec65" have entirely different histories.
c8105122fb ... e97119befc

8 changed files with 13 additions and 46 deletions
Show Stats Expand all files Collapse all files

2
README.md
View File

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

2
Runtime/Collider/Box2DColliderTriggerArea.cs
View File

@ -11,7 +11,7 @@ namespace Syntriax.Modules.Trigger
private void OnDrawGizmosSelected() private void OnDrawGizmosSelected()
{ {
if (UnityEditor.EditorApplication.isPlaying) if (UnityEditor.EditorApplication.isPlaying)
Gizmos.color = previousTriggerCount > 0 && StateEnable.IsEnabled ? Color.green : Color.red; Gizmos.color = previousTriggerCount > 0 ? Color.green : Color.red;
else else
Gizmos.color = TriggerCount > 0 ? Color.green : Color.red; Gizmos.color = TriggerCount > 0 ? Color.green : Color.red;
Gizmos.DrawWireCube(transform.position, transform.lossyScale); Gizmos.DrawWireCube(transform.position, transform.lossyScale);

2
Runtime/Collider/Box2DColliderTriggerAreaWithRotation.cs
View File

@ -11,7 +11,7 @@ namespace Syntriax.Modules.Trigger
private void OnDrawGizmosSelected() private void OnDrawGizmosSelected()
{ {
if (UnityEditor.EditorApplication.isPlaying) if (UnityEditor.EditorApplication.isPlaying)
Gizmos.color = previousTriggerCount > 0 && StateEnable.IsEnabled ? Color.green : Color.red; Gizmos.color = previousTriggerCount > 0 ? Color.green : Color.red;
else else
Gizmos.color = TriggerCount > 0 ? Color.green : Color.red; Gizmos.color = TriggerCount > 0 ? Color.green : Color.red;
Gizmos.matrix = transform.localToWorldMatrix; Gizmos.matrix = transform.localToWorldMatrix;

2
Runtime/Collider/BoxColliderTriggerArea.cs
View File

@ -11,7 +11,7 @@ namespace Syntriax.Modules.Trigger
private void OnDrawGizmosSelected() private void OnDrawGizmosSelected()
{ {
if (UnityEditor.EditorApplication.isPlaying) if (UnityEditor.EditorApplication.isPlaying)
Gizmos.color = previousTriggerCount > 0 && StateEnable.IsEnabled ? Color.green : Color.red; Gizmos.color = previousTriggerCount > 0 ? Color.green : Color.red;
else else
Gizmos.color = TriggerCount > 0 ? Color.green : Color.red; Gizmos.color = TriggerCount > 0 ? Color.green : Color.red;

4
Runtime/Collider/ColliderTrigger.cs
View File

@ -1,4 +1,4 @@
using Syntriax.Modules.State; using Syntriax.Modules.ToggleState;
namespace Syntriax.Modules.Trigger namespace Syntriax.Modules.Trigger
{ {
@ -13,7 +13,7 @@ namespace Syntriax.Modules.Trigger
private void FixedUpdate() private void FixedUpdate()
{ {
if (!StateEnable.IsEnabledNullChecked()) if (!ToggleStateMember.IsToggledNullChecked())
return; return;
IsTrigerred = colliderTrigger.Check(); IsTrigerred = colliderTrigger.Check();

12
Runtime/Collider/ColliderTriggerAreaBase.cs
View File

@ -45,17 +45,5 @@ namespace Syntriax.Modules.Trigger
return true; 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
} }
} }

6
Runtime/ITrigger.cs
View File

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

29
Runtime/TriggerBase.cs
View File

@ -1,43 +1,22 @@
using System; using System;
using Syntriax.Modules.State; using Syntriax.Modules.ToggleState;
using UnityEngine; using UnityEngine;
namespace Syntriax.Modules.Trigger namespace Syntriax.Modules.Trigger
{ {
public class TriggerBase : MonoBehaviour, ITrigger public class TriggerBase : MonoBehaviour, ITrigger
{ {
public IToggleState ToggleStateMember { get; protected set; } = new ToggleStateMember(true);
public Action<bool> OnTriggerStateChanged { get; set; } = null; 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; private bool _isTrigerred = false;
public bool IsTrigerred public bool IsTrigerred
{ {
get => _isTrigerred; get => _isTrigerred;
protected set protected set
{ {
if (value == _isTrigerred || !StateEnable.IsEnabledNullChecked()) if (value == _isTrigerred || !ToggleStateMember.IsToggledNullChecked())
return; return;
_isTrigerred = value; _isTrigerred = value;