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

0.2.0

This commit is contained in:
Syntriax 2023-03-20 22:53:35 +03:00
parent 1c06272bf6 0a6f26461e
commit 58b5247062
8 changed files with 32 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Editor/DefinitionCreatorEditor.cs
View File

@ -99,7 +99,7 @@ namespace Syntriax.Modules.Movement.Editor
movementDefinition.MonoBehaviours = new string[]
{
typeof(MovementController).FullName,
typeof(ToggleState.ToggleStateMonoBehaviour).FullName
typeof(State.StateEnableMonoBehaviour).FullName
};
UpdateSerializedObject();
@ -142,8 +142,9 @@ namespace Syntriax.Modules.Movement.Editor
string jsonText = JsonUtility.ToJson(definition, true);
string path = $"Assets/Resources/{MovementDefinitionFactory.ResourceDirectoryToDefinitions}{definition.Name}.json";
if (!EditorUtility.DisplayDialog("Conflict", $"\"{path}\" already exists, do you want to overwrite?", "Overwrite", "Cancel"))
return;
if (System.IO.File.Exists($"{Application.dataPath}/Resources/{MovementDefinitionFactory.ResourceDirectoryToDefinitions}{definition.Name}.json"))
if (!EditorUtility.DisplayDialog("Conflict", $"\"{path}\" already exists, do you want to overwrite?", "Overwrite", "Cancel"))
return;
System.IO.File.WriteAllText(path, jsonText);
AssetDatabase.Refresh();

6
README.md
View File

@ -1,7 +1,7 @@
# Movement (Work In Progress)
## Dependencies
1. [ToggleState Module](https://git.syntriax.com/Syntriax/ToggleState)
1. [State Module](https://git.syntriax.com/Syntriax/State)
2. [Trigger Module](https://git.syntriax.com/Syntriax/Trigger)
3. [Factory Module](https://git.syntriax.com/Syntriax/Factory)
@ -32,7 +32,7 @@ Make sure to separately clone these modules along with this one too.
#### Longer
1. Clone the module to a folder in your Assets folder
2. Add `ToggleStateMonoBehaviour` component to your Player `GameObject`
2. Add `StateEnableMonoBehaviour` component to your Player `GameObject`
3. Add `MovementController` component to your Player `GameObject`
4. Add `AirMovement1D` component to your Player `GameObject`
5. Add `GroundMovement1D` component to your Player `GameObject` (make sure it's bellow `AirMovement1D`)
@ -42,7 +42,7 @@ Make sure to separately clone these modules along with this one too.
---
This should give you a movement where you can disable the controller through the `IToggleState`, and you should be able to see a the movement changes when the character is not touching the ground.
This should give you a movement where you can disable the controller through the `IStateEnable`, and you should be able to see a the movement changes when the character is not touching the ground.
You can add your own movement implementations with bases under the `Bases` folder, or straight up from the `IMovement` interface.

8
Runtime/Bases/MovementBase.cs
View File

@ -1,12 +1,12 @@
using System;
using Syntriax.Modules.ToggleState;
using Syntriax.Modules.State;
using UnityEngine;
namespace Syntriax.Modules.Movement
{
public abstract class MovementBase : MonoBehaviour, IMovement
{
protected IToggleState toggleState = null;
protected IStateEnable stateEnable = null;
protected IMovementController movementController = null;
public float BaseSpeed { get; set; } = 1f;
@ -27,8 +27,6 @@ namespace Syntriax.Modules.Movement
}
}
public IToggleState ToggleState { get; protected set; } = null;
/// <inheritdoc/>
public abstract void ApplyMovement();
@ -46,7 +44,7 @@ namespace Syntriax.Modules.Movement
protected virtual void Start()
{
toggleState = GetComponent<IToggleState>();
stateEnable = GetComponent<IStateEnable>();
movementController = GetComponent<IMovementController>();
movementController.OnMovementActivated += OnActivated;

6
Runtime/IMovementController.cs
View File

@ -1,15 +1,15 @@
using System;
using System.Collections.Generic;
using Syntriax.Modules.ToggleState;
using Syntriax.Modules.State;
namespace Syntriax.Modules.Movement
{
public interface IMovementController
{
/// <summary>
/// Member <see cref="IToggleState"/> to switch on or off
/// <see cref="IStateEnable"/> to control the state of the <see cref="IMovementController"/> is on or off
/// </summary>
IToggleState ToggleStateMember { get; }
IStateEnable StateEnable { get; }
/// <summary>
/// Currently active <see cref="IMovement"/>

26
Runtime/MovementController.cs
View File

@ -1,6 +1,6 @@
using System;
using System.Collections.Generic;
using Syntriax.Modules.ToggleState;
using Syntriax.Modules.State;
using UnityEngine;
namespace Syntriax.Modules.Movement
@ -31,13 +31,17 @@ namespace Syntriax.Modules.Movement
}
}
private bool areBothToggleStatesToggled => ToggleStateMember.IsToggledNullChecked() && toggleStateOnGameObject.IsToggledNullChecked();
public List<IMovement> Movements { get; protected set; } = new List<IMovement>(32);
public IToggleState ToggleStateMember { get; protected set; } = new ToggleStateMember(true);
protected IToggleState toggleStateOnGameObject = null;
private IStateEnable _stateEnable = null;
public IStateEnable StateEnable
{
get
{
_stateEnable = _stateEnable ?? GetComponent<State.IStateEnable>() ?? gameObject.AddComponent<State.StateEnableMonoBehaviour>();
return _stateEnable;
}
}
protected virtual void Start()
{
@ -45,15 +49,14 @@ namespace Syntriax.Modules.Movement
gameObject.AddComponent<DefaultMovement>();
RecacheMovements();
toggleStateOnGameObject = GetComponent<IToggleState>();
toggleStateOnGameObject.OnToggleStateChanged += (_) => InvokeOnMoveAction();
ToggleStateMember.OnToggleStateChanged += (_) => InvokeOnMoveAction();
StateEnable.OnEnabledChanged += (_) => InvokeOnMoveAction();
OnMovementActivated += (newMovement) => newMovement.Move(lastMove);
}
protected virtual void FixedUpdate()
{
if (!areBothToggleStatesToggled)
if (!StateEnable.IsEnabledNullChecked())
return;
ActiveMovement?.ApplyMovement();
@ -85,6 +88,7 @@ namespace Syntriax.Modules.Movement
}
private Vector3 lastMove = Vector3.zero;
public void Move(float x = 0, float y = 0, float z = 0)
{
ActiveMovement?.Move(x, y, z);
@ -95,7 +99,7 @@ namespace Syntriax.Modules.Movement
private void InvokeOnMoveAction()
{
if (!areBothToggleStatesToggled)
if (!StateEnable.IsEnabledNullChecked())
return;
OnMoveCalled?.Invoke(lastMove.x, lastMove.y, lastMove.z);

2
Samples/AirMovement1D.cs
View File

@ -14,7 +14,7 @@ namespace Syntriax.Modules.Movement.Samples
{
base.Start();
rigid = GetComponent<Rigidbody2D>();
rigid = GetComponentInParent<Rigidbody2D>();
groundTrigger = GetComponentInChildren<IGroundTrigger>();
if (groundTrigger != null)

2
Samples/GroundMovement1D.cs
View File

@ -16,7 +16,7 @@ namespace Syntriax.Modules.Movement.Samples
{
base.Start();
rigid = GetComponent<Rigidbody2D>();
rigid = GetComponentInParent<Rigidbody2D>();
groundTrigger = GetComponentInChildren<IGroundTrigger>();
if (groundTrigger != null)

4
package.json
View File

@ -1,8 +1,8 @@
{
"name": "com.syntriax.movement",
"version": "0.1.4",
"version": "0.2.0",
"displayName": "Movement Module",
"description": "Dependends On:\nhttps://git.syntriax.com/Syntriax/ToggleState.git\nhttps://git.syntriax.com/Syntriax/Trigger.git\nhttps://git.syntriax.com/Syntriax/Factory.git",
"description": "Dependends On:\nhttps://git.syntriax.com/Syntriax/State.git\nhttps://git.syntriax.com/Syntriax/Trigger.git\nhttps://git.syntriax.com/Syntriax/Factory.git",
"unity": "2019.1",
"documentationUrl": "https://git.syntriax.com/Syntriax/Movement.git",
"dependencies": {