Compare commits
11 Commits
developmen
...
d3db00722a
Author | SHA1 | Date | |
---|---|---|---|
d3db00722a | |||
cc1e4facbb | |||
01c76e36ad | |||
1f36b44cfd | |||
bf75b53086 | |||
a8acea4151 | |||
ac1cdfec18 | |||
3ccaea0434 | |||
25edbb5e37 | |||
c0de234086 | |||
1cc02b2c92 |
@@ -1,4 +1,4 @@
|
||||
# Trigger
|
||||
|
||||
## Dependencies
|
||||
1. [State Module](https://git.syntriax.com/Syntriax/State)
|
||||
1. [ToggleState Module](https://git.syntriax.com/Syntriax/ToggleState)
|
||||
|
@@ -11,7 +11,7 @@ namespace Syntriax.Modules.Trigger
|
||||
private void OnDrawGizmosSelected()
|
||||
{
|
||||
if (UnityEditor.EditorApplication.isPlaying)
|
||||
Gizmos.color = previousTriggerCount > 0 && StateEnable.IsEnabled ? Color.green : Color.red;
|
||||
Gizmos.color = previousTriggerCount > 0 ? Color.green : Color.red;
|
||||
else
|
||||
Gizmos.color = TriggerCount > 0 ? Color.green : Color.red;
|
||||
Gizmos.DrawWireCube(transform.position, transform.lossyScale);
|
||||
|
@@ -11,7 +11,7 @@ namespace Syntriax.Modules.Trigger
|
||||
private void OnDrawGizmosSelected()
|
||||
{
|
||||
if (UnityEditor.EditorApplication.isPlaying)
|
||||
Gizmos.color = previousTriggerCount > 0 && StateEnable.IsEnabled ? Color.green : Color.red;
|
||||
Gizmos.color = previousTriggerCount > 0 ? Color.green : Color.red;
|
||||
else
|
||||
Gizmos.color = TriggerCount > 0 ? Color.green : Color.red;
|
||||
Gizmos.matrix = transform.localToWorldMatrix;
|
||||
|
@@ -11,12 +11,11 @@ namespace Syntriax.Modules.Trigger
|
||||
private void OnDrawGizmosSelected()
|
||||
{
|
||||
if (UnityEditor.EditorApplication.isPlaying)
|
||||
Gizmos.color = previousTriggerCount > 0 && StateEnable.IsEnabled ? Color.green : Color.red;
|
||||
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);
|
||||
Gizmos.DrawWireCube(transform.position, transform.lossyScale);
|
||||
}
|
||||
#endif
|
||||
}
|
||||
|
@@ -1,4 +1,4 @@
|
||||
using Syntriax.Modules.State;
|
||||
using Syntriax.Modules.ToggleState;
|
||||
|
||||
namespace Syntriax.Modules.Trigger
|
||||
{
|
||||
@@ -13,7 +13,7 @@ namespace Syntriax.Modules.Trigger
|
||||
|
||||
private void FixedUpdate()
|
||||
{
|
||||
if (!StateEnable.IsEnabledNullChecked())
|
||||
if (!ToggleStateMember.IsToggledNullChecked())
|
||||
return;
|
||||
|
||||
IsTrigerred = colliderTrigger.Check();
|
||||
|
@@ -45,17 +45,5 @@ namespace Syntriax.Modules.Trigger
|
||||
|
||||
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,11 +0,0 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 44c565f53b853aa4a99a307b70f8288f
|
||||
MonoImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 2
|
||||
defaultReferences: []
|
||||
executionOrder: 0
|
||||
icon: {instanceID: 0}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
@@ -1,14 +1,14 @@
|
||||
using System;
|
||||
using Syntriax.Modules.State;
|
||||
using Syntriax.Modules.ToggleState;
|
||||
|
||||
namespace Syntriax.Modules.Trigger
|
||||
{
|
||||
public interface ITrigger
|
||||
{
|
||||
/// <summary>
|
||||
/// <see cref="IStateEnable"/> to control the state of the <see cref="ITrigger"/> is on or off
|
||||
/// Member <see cref="IToggleState"/> to switch on or off
|
||||
/// </summary>
|
||||
IStateEnable StateEnable { get; }
|
||||
IToggleState ToggleStateMember { get; }
|
||||
|
||||
/// <summary>
|
||||
/// Called everytime the IsTrigerred field is changed
|
||||
|
@@ -1,43 +1,22 @@
|
||||
using System;
|
||||
using Syntriax.Modules.State;
|
||||
using Syntriax.Modules.ToggleState;
|
||||
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 || !StateEnable.IsEnabledNullChecked())
|
||||
if (value == _isTrigerred || !ToggleStateMember.IsToggledNullChecked())
|
||||
return;
|
||||
|
||||
_isTrigerred = value;
|
||||
|
@@ -1,10 +1,12 @@
|
||||
{
|
||||
"name": "com.syntriax.trigger",
|
||||
"version": "0.3.0",
|
||||
"version": "0.5.1",
|
||||
"displayName": "Trigger Module",
|
||||
"unity": "2019.1",
|
||||
"documentationUrl": "https://git.syntriax.com/Syntriax/Trigger.git",
|
||||
"dependencies": {},
|
||||
"dependencies": {
|
||||
"com.syntriax.toggle-state": "0.1.0"
|
||||
},
|
||||
"keywords": ["Trigger"],
|
||||
"author": {
|
||||
"name": "Syntriax",
|
||||
|
Reference in New Issue
Block a user