commit af96ac317400569f6fb23297d9a3f24590d2b69d parent 60b19ae881e9c443ca11922056a9293eebd159c7 Author: PlutoTank <qwolkensperg@gmail.com> Date: Fri, 17 Apr 2020 18:07:49 -0400 smoothed input swords added Diffstat:
5 files changed, 46 insertions(+), 4 deletions(-)
diff --git a/Assets/Scripts/Slimecing/Swords/Orbitals/IOrbitalTickEveryFrame.cs b/Assets/Scripts/Slimecing/Swords/Orbitals/IOrbitalTickEveryFrame.cs @@ -0,0 +1,9 @@ +using UnityEngine; + +namespace Slimecing.Swords.Orbitals +{ + public interface IOrbitalTickEveryFrame + { + void TickUpdate(GameObject owner, GameObject orbital); + } +} diff --git a/Assets/Scripts/Slimecing/Triggers/SOTrigger/SwordMovementInputTrigger.asset b/Assets/Scripts/Slimecing/Triggers/SOTrigger/SwordMovementInputTrigger.asset @@ -0,0 +1,16 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: b724fbf88219cb4459211c90795c6464, type: 3} + m_Name: SwordMovementInputTrigger + m_EditorClassIdentifier: + inputActionReference: {fileID: -2472351366228085227, guid: e5353b3c2a300ce458b25d1e62215e9c, + type: 3} diff --git a/Assets/Scripts/Slimecing/Triggers/SOTrigger/SwordMovementInputTrigger.asset.meta b/Assets/Scripts/Slimecing/Triggers/SOTrigger/SwordMovementInputTrigger.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 8e538a3d690d3d446aaf393f3d8319f3 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Slimecing/Triggers/TriggerLogic/AxisInputTriggerPolling.cs b/Assets/Scripts/Slimecing/Triggers/TriggerLogic/AxisInputTriggerPolling.cs @@ -3,8 +3,8 @@ using UnityEngine.InputSystem; namespace Slimecing.Triggers.TriggerLogic { - [CreateAssetMenu(fileName = "AxisInputTrigger ", menuName = "Triggers/InputTriggers/AxisInputTrigger ")] - public class AxisInputTrigger : TriggerInput + [CreateAssetMenu(fileName = "AxisInputTrigger(Polling)", menuName = "Triggers/InputTriggers/AxisInputTrigger(Polling)")] + public class AxisInputTriggerPolling : TriggerInput { protected override void TriggerStarted(GameObject player, InputAction.CallbackContext ctx) { @@ -15,14 +15,12 @@ namespace Slimecing.Triggers.TriggerLogic { currentTriggerState = TriggerState.Performed; inputContext = ctx; - OnTriggerStateChange(new TriggerPackage(TriggerState.Performed, player, ctx)); } protected override void TriggerCanceled(GameObject player, InputAction.CallbackContext ctx) { currentTriggerState = TriggerState.Canceled; inputContext = ctx; - OnTriggerStateChange(new TriggerPackage(TriggerState.Canceled, player, ctx)); } } } diff --git a/Assets/Scripts/Slimecing/Triggers/TriggerLogic/AxisInputTriggerPolling.cs.meta b/Assets/Scripts/Slimecing/Triggers/TriggerLogic/AxisInputTriggerPolling.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: b724fbf88219cb4459211c90795c6464 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: