Compare commits

18 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
e7cd457091 0.6.2 2023-02-16 13:29:49 +03:00
d7e3b0e1db 0.6.1 2023-02-16 13:20:51 +03:00
d3db00722a 0.6.0 2023-02-16 13:09:12 +03:00
01c76e36ad 5.1.0 2022-12-17 22:45:25 +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
9 changed files with 50 additions and 15 deletions

View File

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

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 ? 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);

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

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

View File

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

View File

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

View File

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

View File

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

View File

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