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

Compare commits

base: Syntriax:c244ddeb984592f30e45061506a59d469eef48cc
Branches Tags
Syntriax:master
Syntriax:package
Syntriax:development
..
compare: Syntriax:fa521c0e7e6c20a5f020d7a00eca259dd1b8db7f
Branches Tags
Syntriax:package
Syntriax:master
Syntriax:development

No commits in common. "c244ddeb984592f30e45061506a59d469eef48cc" and "fa521c0e7e6c20a5f020d7a00eca259dd1b8db7f" have entirely different histories.
c244ddeb98 ... fa521c0e7e

14 changed files with 18 additions and 48 deletions
Show Stats Expand all files Collapse all files

6
Editor/DefinitionCreatorEditor.cs
View File

@ -75,7 +75,7 @@ namespace Syntriax.Modules.Movement.Editor
movementDefinition.MovementConfigs = new MovementConfig[] movementDefinition.MovementConfigs = new MovementConfig[]
{ {
new MovementConfig(typeof(Samples.GroundMovement1D).FullName, 5f) new MovementConfig(typeof(Implementations.GroundMovement1D).FullName, 5f)
}; };
movementDefinition.MonoBehaviours = new string[] movementDefinition.MonoBehaviours = new string[]
@ -92,8 +92,8 @@ namespace Syntriax.Modules.Movement.Editor
movementDefinition.MovementConfigs = new MovementConfig[] movementDefinition.MovementConfigs = new MovementConfig[]
{ {
new MovementConfig(typeof(Samples.AirMovement1D).FullName, 5f), new MovementConfig(typeof(Implementations.AirMovement1D).FullName, 5f),
new MovementConfig(typeof(Samples.GroundMovement1D).FullName, 5f) new MovementConfig(typeof(Implementations.GroundMovement1D).FullName, 5f)
}; };
movementDefinition.MonoBehaviours = new string[] movementDefinition.MonoBehaviours = new string[]

3
Editor/Syntriax.Modules.Movement.Editor.asmdef
View File

@ -4,8 +4,7 @@
"references": [ "references": [
"GUID:d4c952ed5f59c5a449cda1b0080ed841", "GUID:d4c952ed5f59c5a449cda1b0080ed841",
"GUID:efa9a9bc94c60c74684aafb7428fbf61", "GUID:efa9a9bc94c60c74684aafb7428fbf61",
"GUID:c967acc4be781ca44b42a1887eb1ac7a", "GUID:c967acc4be781ca44b42a1887eb1ac7a"
"GUID:863b8995abde2cf40b8b4cb709452a32"
], ],
"includePlatforms": [ "includePlatforms": [
"Editor" "Editor"

4
Runtime/IMovementController.cs
View File

@ -7,9 +7,9 @@ namespace Syntriax.Modules.Movement
public interface IMovementController public interface IMovementController
{ {
/// <summary> /// <summary>
/// Member <see cref="IToggleState"/> to switch on or off /// Member Toggle State
/// </summary> /// </summary>
IToggleState ToggleStateMember { get; } IToggleState ToggleState { get; }
/// <summary> /// <summary>
/// Currently active <see cref="IMovement"/> /// Currently active <see cref="IMovement"/>

2
Samples.meta → Runtime/Implementations.meta
View File

@ -1,5 +1,5 @@
fileFormatVersion: 2 fileFormatVersion: 2
guid: 231b2d16dd7862d41bc2111d759f6ca2 guid: 15528ebd51d27d54398c55826710f23e
folderAsset: yes folderAsset: yes
DefaultImporter: DefaultImporter:
externalObjects: {} externalObjects: {}

4
Samples/AirMovement1D.cs → Runtime/Implementations/AirMovement1D.cs
View File

@ -1,7 +1,7 @@
using Syntriax.Modules.Trigger; using Syntriax.Modules.Trigger;
using UnityEngine; using UnityEngine;
namespace Syntriax.Modules.Movement.Samples namespace Syntriax.Modules.Movement.Implementations
{ {
[RequireComponent(typeof(Rigidbody2D))] [RequireComponent(typeof(Rigidbody2D))]
public class AirMovement1D : MovementBase1D public class AirMovement1D : MovementBase1D
@ -19,7 +19,7 @@ namespace Syntriax.Modules.Movement.Samples
if (groundTrigger != null) if (groundTrigger != null)
{ {
groundTrigger.OnTriggerStateChanged += OnGroundTrigger; groundTrigger.OnTriggered += OnGroundTrigger;
CanTakeOver = false; CanTakeOver = false;
} }
} }

0
Samples/AirMovement1D.cs.meta → Runtime/Implementations/AirMovement1D.cs.meta
View File

5
Runtime/DefaultMovement.cs → Runtime/Implementations/DefaultMovement.cs
View File

@ -1,10 +1,7 @@
using UnityEngine; using UnityEngine;
namespace Syntriax.Modules.Movement namespace Syntriax.Modules.Movement.Implementations
{ {
/// <summary>
/// A <see cref="IMovement" with no implementation, added by <see cref="MovementController" by default as a fallback implementation/>/>
/// </summary>
public class DefaultMovement : MovementBase public class DefaultMovement : MovementBase
{ {
public override void ApplyMovement() { } public override void ApplyMovement() { }

0
Runtime/DefaultMovement.cs.meta → Runtime/Implementations/DefaultMovement.cs.meta
View File

4
Samples/GroundMovement1D.cs → Runtime/Implementations/GroundMovement1D.cs
View File

@ -1,7 +1,7 @@
using Syntriax.Modules.Trigger; using Syntriax.Modules.Trigger;
using UnityEngine; using UnityEngine;
namespace Syntriax.Modules.Movement.Samples namespace Syntriax.Modules.Movement.Implementations
{ {
[RequireComponent(typeof(Rigidbody2D))] [RequireComponent(typeof(Rigidbody2D))]
public class GroundMovement1D : MovementBase1D public class GroundMovement1D : MovementBase1D
@ -21,7 +21,7 @@ namespace Syntriax.Modules.Movement.Samples
if (groundTrigger != null) if (groundTrigger != null)
{ {
groundTrigger.OnTriggerStateChanged += OnGroundTrigger; groundTrigger.OnTriggered += OnGroundTrigger;
CanTakeOver = false; CanTakeOver = false;
} }
} }

0
Samples/GroundMovement1D.cs.meta → Runtime/Implementations/GroundMovement1D.cs.meta
View File

10
Runtime/MovementController.cs
View File

@ -31,24 +31,24 @@ namespace Syntriax.Modules.Movement
} }
} }
private bool areBothToggleStatesToggled => ToggleStateMember.IsToggledNullChecked() && toggleStateOnGameObject.IsToggledNullChecked(); private bool areBothToggleStatesToggled => ToggleState.IsToggledNullChecked() && toggleStateOnGameObject.IsToggledNullChecked();
public List<IMovement> Movements { get; protected set; } = new List<IMovement>(32); public List<IMovement> Movements { get; protected set; } = new List<IMovement>(32);
public IToggleState ToggleStateMember { get; protected set; } = new ToggleStateMember(true); public IToggleState ToggleState { get; protected set; } = new ToggleStateMember(true);
protected IToggleState toggleStateOnGameObject = null; protected IToggleState toggleStateOnGameObject = null;
protected virtual void Start() protected virtual void Start()
{ {
if (GetComponent<DefaultMovement>() == null) if (GetComponent<Implementations.DefaultMovement>() == null)
gameObject.AddComponent<DefaultMovement>(); gameObject.AddComponent<Implementations.DefaultMovement>();
RecacheMovements(); RecacheMovements();
toggleStateOnGameObject = GetComponent<IToggleState>(); toggleStateOnGameObject = GetComponent<IToggleState>();
toggleStateOnGameObject.OnToggleStateChanged += (_) => InvokeOnMoveAction(); toggleStateOnGameObject.OnToggleStateChanged += (_) => InvokeOnMoveAction();
ToggleStateMember.OnToggleStateChanged += (_) => InvokeOnMoveAction(); ToggleState.OnToggleStateChanged += (_) => InvokeOnMoveAction();
} }
protected virtual void FixedUpdate() protected virtual void FixedUpdate()

19
Samples/Syntriax.Modules.Movement.Samples.asmdef
View File

@ -1,19 +0,0 @@
{
"name": "Syntriax.Modules.Movement.Samples",
"rootNamespace": "",
"references": [
"GUID:efa9a9bc94c60c74684aafb7428fbf61",
"GUID:1f5f15fe7e49bdb48a76c5ce9b1c9f2f",
"GUID:d4c952ed5f59c5a449cda1b0080ed841",
"GUID:c967acc4be781ca44b42a1887eb1ac7a"
],
"includePlatforms": [],
"excludePlatforms": [],
"allowUnsafeCode": false,
"overrideReferences": false,
"precompiledReferences": [],
"autoReferenced": true,
"defineConstraints": [],
"versionDefines": [],
"noEngineReferences": false
}

7
Samples/Syntriax.Modules.Movement.Samples.asmdef.meta
View File

@ -1,7 +0,0 @@
fileFormatVersion: 2
guid: 863b8995abde2cf40b8b4cb709452a32
AssemblyDefinitionImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

2
package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "com.syntriax.movement", "name": "com.syntriax.movement",
"version": "0.1.4", "version": "0.1.2",
"displayName": "Movement Module", "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/ToggleState.git\nhttps://git.syntriax.com/Syntriax/Trigger.git\nhttps://git.syntriax.com/Syntriax/Factory.git",
"unity": "2019.1", "unity": "2019.1",