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

0.1.4

Browse Source
This commit is contained in:
Syntriax
2022-12-17 12:04:58 +03:00
parent b5198d1048 c903602e3b
commit 1c06272bf6
14 changed files with 49 additions and 19 deletions
Download Patch File Download Diff File 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[]
{
new MovementConfig(typeof(Implementations.GroundMovement1D).FullName, 5f)
new MovementConfig(typeof(Samples.GroundMovement1D).FullName, 5f)
};
movementDefinition.MonoBehaviours = new string[]
@@ -92,8 +92,8 @@ namespace Syntriax.Modules.Movement.Editor
movementDefinition.MovementConfigs = new MovementConfig[]
{
new MovementConfig(typeof(Implementations.AirMovement1D).FullName, 5f),
new MovementConfig(typeof(Implementations.GroundMovement1D).FullName, 5f)
new MovementConfig(typeof(Samples.AirMovement1D).FullName, 5f),
new MovementConfig(typeof(Samples.GroundMovement1D).FullName, 5f)
};
movementDefinition.MonoBehaviours = new string[]

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

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

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

@@ -1,7 +1,10 @@
using UnityEngine;
namespace Syntriax.Modules.Movement.Implementations
namespace Syntriax.Modules.Movement
{
/// <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 override void ApplyMovement() { }

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

4
Runtime/IMovementController.cs
View File

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

10
Runtime/MovementController.cs
View File

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

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

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

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

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

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

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

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

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

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

@@ -0,0 +1,19 @@
{
"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 Normal file
View File

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

4
package.json
View File

@@ -1,13 +1,13 @@
{
"name": "com.syntriax.movement",
"version": "0.1.2",
"version": "0.1.4",
"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",
"unity": "2019.1",
"documentationUrl": "https://git.syntriax.com/Syntriax/Movement.git",
"dependencies": {
"com.syntriax.toggle-state": "0.1.0",
"com.syntriax.trigger": "0.1.0",
"com.syntriax.trigger": "0.2.0",
"com.syntriax.factory": "0.1.0"
},
"keywords": ["Movement"],