Compare commits
18 Commits
bca2922a58
...
package
Author | SHA1 | Date | |
---|---|---|---|
d15c05d53f | |||
0fcee32f71 | |||
545c9734de | |||
8963df6f46 | |||
fc49961ef3 | |||
34c3a3bc8e | |||
d57961f5f1 | |||
c8105122fb | |||
f2faa86f65 | |||
444782b724 | |||
e7cd457091 | |||
d7e3b0e1db | |||
d3db00722a | |||
01c76e36ad | |||
bf75b53086 | |||
ac1cdfec18 | |||
25edbb5e37 | |||
1cc02b2c92 |
@@ -1,4 +1,4 @@
|
|||||||
# Trigger
|
# Trigger
|
||||||
|
|
||||||
## Dependencies
|
## Dependencies
|
||||||
1. [ToggleState Module](https://git.syntriax.com/Syntriax/ToggleState)
|
1. [State Module](https://git.syntriax.com/Syntriax/State)
|
||||||
|
@@ -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 ? Color.green : Color.red;
|
Gizmos.color = previousTriggerCount > 0 && StateEnable.IsEnabled ? 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);
|
||||||
|
@@ -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 ? Color.green : Color.red;
|
Gizmos.color = previousTriggerCount > 0 && StateEnable.IsEnabled ? 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;
|
||||||
|
@@ -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 ? Color.green : Color.red;
|
Gizmos.color = previousTriggerCount > 0 && StateEnable.IsEnabled ? Color.green : Color.red;
|
||||||
else
|
else
|
||||||
Gizmos.color = TriggerCount > 0 ? Color.green : Color.red;
|
Gizmos.color = TriggerCount > 0 ? Color.green : Color.red;
|
||||||
|
|
||||||
|
@@ -1,4 +1,4 @@
|
|||||||
using Syntriax.Modules.ToggleState;
|
using Syntriax.Modules.State;
|
||||||
|
|
||||||
namespace Syntriax.Modules.Trigger
|
namespace Syntriax.Modules.Trigger
|
||||||
{
|
{
|
||||||
@@ -13,7 +13,7 @@ namespace Syntriax.Modules.Trigger
|
|||||||
|
|
||||||
private void FixedUpdate()
|
private void FixedUpdate()
|
||||||
{
|
{
|
||||||
if (!ToggleStateMember.IsToggledNullChecked())
|
if (!StateEnable.IsEnabledNullChecked())
|
||||||
return;
|
return;
|
||||||
|
|
||||||
IsTrigerred = colliderTrigger.Check();
|
IsTrigerred = colliderTrigger.Check();
|
||||||
|
@@ -45,5 +45,17 @@ 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
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@@ -1,14 +1,14 @@
|
|||||||
using System;
|
using System;
|
||||||
using Syntriax.Modules.ToggleState;
|
using Syntriax.Modules.State;
|
||||||
|
|
||||||
namespace Syntriax.Modules.Trigger
|
namespace Syntriax.Modules.Trigger
|
||||||
{
|
{
|
||||||
public interface ITrigger
|
public interface ITrigger
|
||||||
{
|
{
|
||||||
/// <summary>
|
/// <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>
|
/// </summary>
|
||||||
IToggleState ToggleStateMember { get; }
|
IStateEnable StateEnable { get; }
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Called everytime the IsTrigerred field is changed
|
/// Called everytime the IsTrigerred field is changed
|
||||||
|
@@ -1,22 +1,43 @@
|
|||||||
using System;
|
using System;
|
||||||
using Syntriax.Modules.ToggleState;
|
using Syntriax.Modules.State;
|
||||||
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 || !ToggleStateMember.IsToggledNullChecked())
|
if (value == _isTrigerred || !StateEnable.IsEnabledNullChecked())
|
||||||
return;
|
return;
|
||||||
|
|
||||||
_isTrigerred = value;
|
_isTrigerred = value;
|
||||||
|
@@ -1,10 +1,12 @@
|
|||||||
{
|
{
|
||||||
"name": "com.syntriax.trigger",
|
"name": "com.syntriax.trigger",
|
||||||
"version": "0.6.4",
|
"version": "0.7.1",
|
||||||
"displayName": "Trigger Module",
|
"displayName": "Trigger Module",
|
||||||
"unity": "2019.1",
|
"unity": "2019.1",
|
||||||
"documentationUrl": "https://git.syntriax.com/Syntriax/Trigger.git",
|
"documentationUrl": "https://git.syntriax.com/Syntriax/Trigger.git",
|
||||||
"dependencies": {},
|
"dependencies": {
|
||||||
|
"com.syntriax.state": "0.2.0"
|
||||||
|
},
|
||||||
"keywords": ["Trigger"],
|
"keywords": ["Trigger"],
|
||||||
"author": {
|
"author": {
|
||||||
"name": "Syntriax",
|
"name": "Syntriax",
|
||||||
|
Reference in New Issue
Block a user