From 2e5aae7f67e7e6451c4c44427f1c91aad6db9b6d Mon Sep 17 00:00:00 2001 From: Jamie Greunbaum Date: Sat, 9 Sep 2023 17:28:41 -0400 Subject: [PATCH] Initial commit. --- .gitignore | 2 + ComboInput.uplugin | 32 +++ Resources/Icon128.png | Bin 0 -> 12699 bytes Source/ComboInput/ComboInput.Build.cs | 74 +++++++ Source/ComboInput/Private/ComboInput.cpp | 24 +++ .../Components/ComboManagerComponent.cpp | 97 +++++++++ .../Components/InputBufferComponent.cpp | 191 ++++++++++++++++++ .../Interfaces/ComboHandlerInterface.cpp | 17 ++ Source/ComboInput/Public/ComboInput.h | 37 ++++ .../Public/Components/ComboManagerComponent.h | 90 +++++++++ .../Public/Components/InputBufferComponent.h | 122 +++++++++++ .../Public/Interfaces/ComboHandlerInterface.h | 32 +++ .../ComboInputEditor.build.cs | 53 +++++ .../Private/ComboInputEditor.cpp | 23 +++ .../Public/ComboInputEditor.h | 70 +++++++ 15 files changed, 864 insertions(+) create mode 100644 .gitignore create mode 100644 ComboInput.uplugin create mode 100644 Resources/Icon128.png create mode 100644 Source/ComboInput/ComboInput.Build.cs create mode 100644 Source/ComboInput/Private/ComboInput.cpp create mode 100644 Source/ComboInput/Private/Components/ComboManagerComponent.cpp create mode 100644 Source/ComboInput/Private/Components/InputBufferComponent.cpp create mode 100644 Source/ComboInput/Private/Interfaces/ComboHandlerInterface.cpp create mode 100644 Source/ComboInput/Public/ComboInput.h create mode 100644 Source/ComboInput/Public/Components/ComboManagerComponent.h create mode 100644 Source/ComboInput/Public/Components/InputBufferComponent.h create mode 100644 Source/ComboInput/Public/Interfaces/ComboHandlerInterface.h create mode 100644 Source/ComboInputEditor/ComboInputEditor.build.cs create mode 100644 Source/ComboInputEditor/Private/ComboInputEditor.cpp create mode 100644 Source/ComboInputEditor/Public/ComboInputEditor.h diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..cfbcb6f --- /dev/null +++ b/.gitignore @@ -0,0 +1,2 @@ +Binaries/ +Intermediate/ diff --git a/ComboInput.uplugin b/ComboInput.uplugin new file mode 100644 index 0000000..322c587 --- /dev/null +++ b/ComboInput.uplugin @@ -0,0 +1,32 @@ +{ + "FileVersion": 3, + "Version": 1, + "VersionName": "0.1.0.0", + "FriendlyName": "Combo Input", + "Description": "A set of components and classes for capturing Enhanced Input actions for buffering actions and stringing them into complex combos.", + "Category": "Input", + "CreatedBy": "Jamie Greunbaum", + "EngineVersion": "5.2.0", + "CanContainContent": true, + "IsBetaVersion": true, + "IsExperimentalVersion": true, + "Installed": true, + "Modules": [ + { + "Name": "ComboInput", + "Type": "Runtime", + "LoadingPhase": "PreDefault" + }, + { + "Name": "ComboInputEditor", + "Type": "Editor", + "LoadingPhase": "Default" + } + ], + "Plugins": [ + { + "Name": "EnhancedInput", + "Enabled": true + } + ] +} \ No newline at end of file diff --git a/Resources/Icon128.png b/Resources/Icon128.png new file mode 100644 index 0000000000000000000000000000000000000000..1231d4aad4d0d462fb7b178eb5b30aa61a10df0b GIT binary patch literal 12699 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 a;7#~yJh_ha>A&A^fRdb=Y>l)<=>Gxy=2LS3 literal 0 HcmV?d00001 diff --git a/Source/ComboInput/ComboInput.Build.cs b/Source/ComboInput/ComboInput.Build.cs new file mode 100644 index 0000000..e8ee8b2 --- /dev/null +++ b/Source/ComboInput/ComboInput.Build.cs @@ -0,0 +1,74 @@ +// Copyright Epic Games, Inc. All Rights Reserved. + +using UnrealBuildTool; + +public class ComboInput : ModuleRules +{ + public ComboInput(ReadOnlyTargetRules Target) : base(Target) + { + PCHUsage = PCHUsageMode.UseExplicitOrSharedPCHs; + bLegacyPublicIncludePaths = false; + ShadowVariableWarningLevel = WarningLevel.Error; + + PublicIncludePaths.AddRange + ( + new string[] + { + // ... add public include paths required here ... + } + ); + + + PrivateIncludePaths.AddRange + ( + new string[] + { + "ComboInput/Private" + } + ); + + + PublicDependencyModuleNames.AddRange + ( + new string[] + { + "Core", + "CoreUObject", + "Engine", + "UMG", + + "EnhancedInput", + // ... add other public dependencies that you statically link with here ... + } + ); + + + PrivateDependencyModuleNames.AddRange + ( + new string[] + { + "Engine", + "Slate", + "SlateCore", + "GameplayTags", + "DeveloperSettings", + "UMG", + "Projects" + // ... add private dependencies that you statically link with here ... + } + ); + + if (Target.bBuildEditor) + { + PrivateDependencyModuleNames.Add("UnrealEd"); + } + + DynamicallyLoadedModuleNames.AddRange + ( + new string[] + { + // ... add any modules that your module loads dynamically here ... + } + ); + } +} diff --git a/Source/ComboInput/Private/ComboInput.cpp b/Source/ComboInput/Private/ComboInput.cpp new file mode 100644 index 0000000..f938502 --- /dev/null +++ b/Source/ComboInput/Private/ComboInput.cpp @@ -0,0 +1,24 @@ +// ©2023 Batty Bovine Productions, LLC. All Rights Reserved. + +#include "ComboInput.h" + +#include "GameplayTagsManager.h" +#include "Interfaces/IPluginManager.h" + +#define LOCTEXT_NAMESPACE "FComboInputModule" + + +void FComboInputModule::StartupModule() +{ + // This code will execute after your module is loaded into memory; the exact timing is specified in the .uplugin file per-module +} + +void FComboInputModule::ShutdownModule() +{ + // This function may be called during shutdown to clean up your module. For modules that support dynamic reloading, + // we call this function before unloading the module. +} + +#undef LOCTEXT_NAMESPACE + +IMPLEMENT_MODULE(FComboInputModule, ComboInput) \ No newline at end of file diff --git a/Source/ComboInput/Private/Components/ComboManagerComponent.cpp b/Source/ComboInput/Private/Components/ComboManagerComponent.cpp new file mode 100644 index 0000000..074c629 --- /dev/null +++ b/Source/ComboInput/Private/Components/ComboManagerComponent.cpp @@ -0,0 +1,97 @@ +// ©2022 Batty Bovine Productions, LLC. All Rights Reserved. + +#include "Components/ComboManagerComponent.h" + +#include "Components/InputBufferComponent.h" +#include "Interfaces/ComboHandlerInterface.h" + +DEFINE_LOG_CATEGORY(LogComboManagerComponent); + + +UComboManagerComponent::UComboManagerComponent() +{ + PrimaryComponentTick.bStartWithTickEnabled = false; + PrimaryComponentTick.bTickEvenWhenPaused = false; + PrimaryComponentTick.bCanEverTick = false; +} + +void UComboManagerComponent::BeginPlay() +{ + Super::BeginPlay(); + + const AActor *OwningActor = this->GetOwner(); + if (const IComboHandlerInterface *ComboHandler = Cast(OwningActor)) + { + if (UInputBufferComponent *InputBuffer = IComboHandlerInterface::Execute_GetInputBuffer(OwningActor)) + { + this->AttachedInputBuffer = InputBuffer; + this->AttachedInputBuffer->NewComboInput.BindUObject(this, &UComboManagerComponent::ComboInputReceived); + } + } +} + + +void UComboManagerComponent::ComboInputReceived(const UComboInputAsset *Input) +{ + /************ DEBUG ************/ + for (const TPair, float> &Pair : this->DEBUG__UnlockTimers) + { + if (!this->DEBUG__TimerHandles.Contains(Pair.Key)) + { + this->DEBUG__TimerHandles.Add(Pair.Key); + } + this->GetWorld()->GetTimerManager().ClearTimer(this->DEBUG__TimerHandles[Pair.Key]); + this->GetWorld()->GetTimerManager().SetTimer(this->DEBUG__TimerHandles[Pair.Key], FTimerDelegate::CreateUObject(this, &UComboManagerComponent::DEBUG__UnlockAction, Pair.Key), Pair.Value, false); + } + /********** END DEBUG **********/ + + // If we received an offset input, perform the offset here and then leave. + if (Input == this->OffsetInput) + { + this->ActiveNode = this->PreviousNode; + this->GetWorld()->GetTimerManager().ClearTimer(this->FinishTransitionTimer); + UE_LOG(LogComboManagerComponent, Verbose, TEXT("Combo has been offset by %s"), *Input->ComboInputName.ToString()); + return; + } + + const TObjectPtr CurrentNode = (this->ActiveNode ? this->ActiveNode : this->DefaultStartNode); + checkf(CurrentNode, TEXT("No combo sequence nodes available.")); + + if (CurrentNode->ComboBranch.Contains(Input)) + { + const FComboSequenceAction &ActionData = CurrentNode->ComboBranch[Input]; + if (ActionData.ComboAction) + { + this->BeginNodeTransition(ActionData.NextNode); + + UE_LOG(LogComboManagerComponent, Verbose, TEXT("%s activated"), *ActionData.ComboAction->ActionName.ToString()); + } + } + else + { + UE_LOG(LogComboManagerComponent, Verbose, TEXT("No branch found for this action")); + } +} +void UComboManagerComponent::DEBUG__UnlockAction(TObjectPtr Unlock) +{ + this->AttachedInputBuffer->UnlockComboInput(Unlock); +} + + +void UComboManagerComponent::BeginNodeTransition(const UComboSequenceNode *NextNode) +{ + this->PreviousNode = this->ActiveNode; + this->ActiveNode = NextNode; + this->GetWorld()->GetTimerManager().SetTimer(this->FinishTransitionTimer, this, &UComboManagerComponent::FinishTransition, 0.5f); + + this->GetWorld()->GetTimerManager().SetTimer(this->DEBUG__ResetComboTimer, this, &UComboManagerComponent::DEBUG__ResetCombo, 1.0f); +} +void UComboManagerComponent::DEBUG__ResetCombo() +{ + this->ActiveNode = this->PreviousNode = nullptr; +} + +void UComboManagerComponent::FinishTransition() +{ + this->PreviousNode = this->ActiveNode; +} diff --git a/Source/ComboInput/Private/Components/InputBufferComponent.cpp b/Source/ComboInput/Private/Components/InputBufferComponent.cpp new file mode 100644 index 0000000..bcdc54a --- /dev/null +++ b/Source/ComboInput/Private/Components/InputBufferComponent.cpp @@ -0,0 +1,191 @@ +// ©2022 Batty Bovine Productions, LLC. All Rights Reserved. + +#include "Components/InputBufferComponent.h" + +#include "Components/InputComponent.h" +#include "GameFramework/PlayerController.h" + +DEFINE_LOG_CATEGORY(LogInputBufferComponent); + + +UInputBufferComponent::UInputBufferComponent() +{ + PrimaryComponentTick.bStartWithTickEnabled = false; + PrimaryComponentTick.bTickEvenWhenPaused = false; + PrimaryComponentTick.bCanEverTick = false; +} + +void UInputBufferComponent::BeginPlay() +{ + Super::BeginPlay(); + + // Get all unique EnhancedInput actions bound to combo input actions. + TSet InputActionsToBind; + for (const UComboInputAsset *ComboInput : this->ComboActions) + { + for (const UInputAction *InputAction : ComboInput->ActionGroup) + { + InputActionsToBind.Add(InputAction); + } + } + + APlayerController *Controller = Cast(this->GetOwner()); + checkf(Controller, TEXT("No player controller found as owner of %s"), *this->GetName()); + + if (this->EnhancedInputComponent = Cast(Controller->InputComponent)) + { + // Bind the input actions we found to the buffer management functions. + for (const UInputAction *InputAction : InputActionsToBind) + { + this->EnhancedInputComponent->BindAction(InputAction, ETriggerEvent::Started, this, &UInputBufferComponent::AddActionToBuffer, InputAction); + this->EnhancedInputComponent->BindAction(InputAction, ETriggerEvent::Completed, this, &UInputBufferComponent::ExpireAction, InputAction); + } + } + else + { + UE_LOG(LogInputBufferComponent, Error, TEXT("Parent of %s is not a UEnhancedInputComponent type."), *this->GetName()); + } +} + + +void UInputBufferComponent::AddActionToBuffer(const FInputActionValue &Value, const class UInputAction *Action) +{ + this->MostRecentActions.Add(Action); + this->ExpiringActions.Remove(Action); + + // Find any combo input that matches this action, plus buffered actions. + for (const UComboInputAsset *Combo : this->ComboActions) + { + if (Combo->MatchesInputActions(this->MostRecentActions)) + { + this->ActivateComboInput(Combo); + + break; + } + } + + this->GetWorld()->GetTimerManager().SetTimer(this->MultiPressTimerHandle, this, &UInputBufferComponent::ClearMultiPresses, this->MultiPressTimerLength); +} +void UInputBufferComponent::ClearMultiPresses() +{ +#if WITH_EDITOR + TArray ActionNames; + for (const UInputAction *Action : this->MostRecentActions) + { + ActionNames.Add(Action->GetName()); + } + UE_LOG(LogInputBufferComponent, Verbose, TEXT("Multi-press buffer cleared (%s)"), *FString::Join(ActionNames, TEXT(" | "))); +#endif + this->MostRecentActions.Empty(); +} + +void UInputBufferComponent::ActivateComboInput(const UComboInputAsset *ComboInput) +{ + checkf(ComboInput, TEXT("Invalid UComboInputAsset")); + + // Make this combo input active if it isn't being locked, or if we are + // overwriting a previous combo input with a multi-press combo input. + const bool bMultiPressTimerActive = this->GetWorld()->GetTimerManager().IsTimerActive(this->MultiPressTimerHandle); + const bool bComboInputLocked = this->LockedComboInputs.Contains(ComboInput); + if (bMultiPressTimerActive || !bComboInputLocked) + { + if (!ComboInput->LockedComboInputs.IsEmpty()) + { + // Set the combo input as active, and copy its lock data. + this->InputBufferActive = ComboInput; + this->LockedComboInputs = ComboInput->LockedComboInputs; + + // Make sure the hold is clear if we're coming off of a multi-press action. + if (bMultiPressTimerActive) + { + this->InputBufferHold = nullptr; + } + + //this->GetWorld()->GetTimerManager().SetTimer(this->ForceUnlockTimerHandle, this, &UInputBufferComponent::ForceUnlockComboInputs, this->ForceUnlockTimerLength); + + UE_LOG(LogInputBufferComponent, Verbose, TEXT("%s is active."), *ComboInput->ComboInputName.ToString()); + } + else + { + UE_LOG(LogInputBufferComponent, Verbose, TEXT("%s is active and won't lock inputs."), *ComboInput->ComboInputName.ToString()); + } + + this->NewComboInput.Execute(ComboInput); + } + else + { + this->InputBufferHold = ComboInput; + + if (bComboInputLocked) + { + UE_LOG(LogInputBufferComponent, Verbose, TEXT("%s is locked and won't be activated yet."), *ComboInput->ComboInputName.ToString()); + } + else + { + UE_LOG(LogInputBufferComponent, Verbose, TEXT("%s added to buffer."), *ComboInput->ComboInputName.ToString()); + } + } +} + +void UInputBufferComponent::UnlockComboInput(const UComboInputAsset *Unlocked) +{ + // Remove the newly-unlocked asset from the locked combo inputs. + UE_CLOG(this->LockedComboInputs.Contains(Unlocked), LogInputBufferComponent, Verbose, TEXT("%s has unlocked."), *Unlocked->ComboInputName.ToString()); + this->LockedComboInputs.Remove(Unlocked); + + // Check if the newly unlocked combo input is in the hold. + if (Unlocked == this->InputBufferHold) + { + const UComboInputAsset *OriginalActive = this->InputBufferActive; + + // Activate the held combo input. + const UComboInputAsset *HeldAsset = this->InputBufferHold; + this->InputBufferHold = nullptr; + if (HeldAsset) + { + this->ActivateComboInput(HeldAsset); + } + + UE_LOG(LogInputBufferComponent, Verbose, TEXT("%s has expired."), *OriginalActive->ComboInputName.ToString()); + } +} + +void UInputBufferComponent::ExpireAction(const FInputActionValue &Value, const class UInputAction *Action) +{ + this->ExpiringActions.Add(Action); + this->GetWorld()->GetTimerManager().SetTimer(this->InputReleaseExpirationTimerHandle, this, &UInputBufferComponent::ExpireBufferedActions, this->InputReleaseExpirationTimerLength); +} +void UInputBufferComponent::ExpireBufferedActions() +{ + // Only bother dealing with this if there's something to deal with in the first place. + if (!this->ExpiringActions.IsEmpty()) + { + UE_SUPPRESS(LogInputBufferComponent, Verbose, + { + TArray ActionNames; + for (const UInputAction *Action : this->ExpiringActions) + { + ActionNames.Add(Action->GetName()); + } + UE_LOG(LogInputBufferComponent, Verbose, TEXT("Released actions expired (%s)"), *FString::Join(ActionNames, TEXT(" | "))); + } + ); + + // If there is an action in the hold, check if it's related + // to our current released buttons, and if so cancel it. + if (this->InputBufferHold) + { + for (const UInputAction *Action : this->ExpiringActions) + { + if (this->InputBufferHold->MatchesInputAction(Action)) + { + UE_LOG(LogInputBufferComponent, Verbose, TEXT("%s has been cancelled."), *this->InputBufferHold->ComboInputName.ToString()); + this->InputBufferHold = nullptr; + break; + } + } + } + + this->ExpiringActions.Empty(); + } +} diff --git a/Source/ComboInput/Private/Interfaces/ComboHandlerInterface.cpp b/Source/ComboInput/Private/Interfaces/ComboHandlerInterface.cpp new file mode 100644 index 0000000..7a66c33 --- /dev/null +++ b/Source/ComboInput/Private/Interfaces/ComboHandlerInterface.cpp @@ -0,0 +1,17 @@ +// ©2022 Batty Bovine Productions, LLC. All Rights Reserved. + +#include "Interfaces/ComboHandlerInterface.h" + +#include "Components/ComboManagerComponent.h" +#include "Components/InputBufferComponent.h" + + +UInputBufferComponent *IComboHandlerInterface::GetInputBuffer_Implementation() const +{ + return nullptr; +} + +UComboManagerComponent *IComboHandlerInterface::GetComboManager_Implementation() const +{ + return nullptr; +} diff --git a/Source/ComboInput/Public/ComboInput.h b/Source/ComboInput/Public/ComboInput.h new file mode 100644 index 0000000..03441a7 --- /dev/null +++ b/Source/ComboInput/Public/ComboInput.h @@ -0,0 +1,37 @@ +// ©2023 Batty Bovine Productions, LLC. All Rights Reserved. + +#pragma once + +#include "CoreMinimal.h" +#include "Modules/ModuleManager.h" + + +class FComboInputModule : public IModuleInterface +{ +public: + + /** + * Singleton-like access to this module's interface. This is just for convenience! + * Beware of calling this during the shutdown phase, though. Your module might have been unloaded already. + * + * @return Returns singleton instance, loading the module on demand if needed + */ + static FComboInputModule &Get() + { + return FModuleManager::LoadModuleChecked("ComboInput"); + } + + /** + * Checks to see if this module is loaded and ready. It is only valid to call Get() if IsAvailable() returns true. + * + * @return True if the module is loaded and ready to use + */ + static bool IsAvailable() + { + return FModuleManager::Get().IsModuleLoaded("ComboInput"); + } + + /** IModuleInterface implementation */ + virtual void StartupModule() override; + virtual void ShutdownModule() override; +}; diff --git a/Source/ComboInput/Public/Components/ComboManagerComponent.h b/Source/ComboInput/Public/Components/ComboManagerComponent.h new file mode 100644 index 0000000..d364f79 --- /dev/null +++ b/Source/ComboInput/Public/Components/ComboManagerComponent.h @@ -0,0 +1,90 @@ +// ©2022 Batty Bovine Productions, LLC. All Rights Reserved. + +#pragma once + +#include "CoreMinimal.h" + +#include "Components/ActorComponent.h" +#include "Engine/DataAsset.h" + +#include "ComboManagerComponent.generated.h" + +DECLARE_LOG_CATEGORY_EXTERN(LogComboManagerComponent, Log, All); + + +USTRUCT(BlueprintType) +struct COMBOINPUT_API FComboSequenceAction +{ + GENERATED_BODY() +public: + // Action to perform when the associated combo sequence node is activated. + UPROPERTY(BlueprintReadOnly, EditAnywhere) + TObjectPtr ComboAction; + + // Sequence node to switch to once this action is complete. + UPROPERTY(BlueprintReadOnly, EditAnywhere) + TObjectPtr NextNode; +}; + +UCLASS(BlueprintType) +class COMBOINPUT_API UComboAction : public UDataAsset +{ + GENERATED_BODY() + +public: + // Human-readable name of this combo action. + UPROPERTY(BlueprintReadOnly, EditAnywhere) + FName ActionName; +}; + +UCLASS(BlueprintType) +class COMBOINPUT_API UComboSequenceNode : public UDataAsset +{ + GENERATED_BODY() + +public: + UPROPERTY(BlueprintReadOnly, EditAnywhere) + TMap ComboBranch; +}; + +UCLASS(BlueprintType, ClassGroup=(Input), meta=(BlueprintSpawnableComponent)) +class COMBOINPUT_API UComboManagerComponent : public UActorComponent +{ + GENERATED_BODY() + +public: + UComboManagerComponent(); + virtual void BeginPlay() override; + +protected: + UPROPERTY(BlueprintReadOnly, EditDefaultsOnly) + TObjectPtr DefaultStartNode; + + // This input will be recognised as an offset input, which cancels a node transition + // if activated early enough in the transition. This locks the current place in the + // combo and allows this combo string to be continued after this input has executed. + UPROPERTY(BlueprintReadOnly, EditDefaultsOnly) + TObjectPtr OffsetInput; + + UPROPERTY(BlueprintReadOnly, EditDefaultsOnly) + TMap, float> DEBUG__UnlockTimers; + +private: + void ComboInputReceived(const class UComboInputAsset *Input); + + void BeginNodeTransition(const class UComboSequenceNode *NextNode); + void FinishTransition(); + + void DEBUG__UnlockAction(TObjectPtr Unlock); + void DEBUG__ResetCombo(); + + const class UComboSequenceNode *ActiveNode = nullptr; + const class UComboSequenceNode *PreviousNode = nullptr; + + TObjectPtr AttachedInputBuffer; + + FTimerHandle FinishTransitionTimer; + FTimerHandle DEBUG__ResetComboTimer; + + TMap, FTimerHandle> DEBUG__TimerHandles; +}; diff --git a/Source/ComboInput/Public/Components/InputBufferComponent.h b/Source/ComboInput/Public/Components/InputBufferComponent.h new file mode 100644 index 0000000..960780b --- /dev/null +++ b/Source/ComboInput/Public/Components/InputBufferComponent.h @@ -0,0 +1,122 @@ +// ©2022 Batty Bovine Productions, LLC. All Rights Reserved. + +#pragma once + +#include "CoreMinimal.h" +#include "EnhancedInputComponent.h" +#include "Components/ActorComponent.h" + +#include "InputBufferComponent.generated.h" + +DECLARE_LOG_CATEGORY_EXTERN(LogInputBufferComponent, Log, All); + + +UCLASS(BlueprintType) +class COMBOINPUT_API UComboInputAsset : public UDataAsset +{ + GENERATED_BODY() + +public: + bool MatchesInputAction(const class UInputAction* Action) const + { + if (this->ActionGroup.Num() == 1 && this->ActionGroup.Contains(Action)) + { + return true; + } + return false; + } + bool MatchesInputActions(TSet Actions) const + { + if (this->ActionGroup.Num() == Actions.Num()) + { + for (const UInputAction *Action : Actions) + { + if (!this->ActionGroup.Contains(Action)) + { + return false; + } + } + return true; + } + return false; + } + + // Human-readable name of this combo input. + UPROPERTY(BlueprintReadWrite, EditAnywhere) + FName ComboInputName; + + // Combined actions that add up to this combo input when activated + // within a short time of one another. If only one is present, then + // this combo input asset will simply represent that action. + UPROPERTY(BlueprintReadWrite, EditAnywhere) + TSet> ActionGroup; + + // Combo inputs that should be prevented from occurring during this + // action. These will be locked when the action is broadcast, and + // should be unlocked by the receiving actor by sending an unlock + // event. + UPROPERTY(BlueprintReadWrite, EditAnywhere) + TSet> LockedComboInputs; +}; + + +UCLASS(BlueprintType, ClassGroup=(Input), meta=(BlueprintSpawnableComponent)) +class COMBOINPUT_API UInputBufferComponent : public UActorComponent +{ + GENERATED_BODY() + +public: + UInputBufferComponent(); + virtual void BeginPlay() override; + + UFUNCTION(BlueprintCallable) + void UnlockComboInput(const class UComboInputAsset *Unlocked); + + // List of possible combo inputs that can be taken. A combo input is selected from this list + // either if an action is made while the current combo is inactive, or when the previous + // action expires. + UPROPERTY(BlueprintReadOnly, EditDefaultsOnly) + TSet ComboActions; + + // Length of time after releasing an input to keep the associated combo action buffered before clearing it. + UPROPERTY(BlueprintReadOnly, EditDefaultsOnly, meta=(UIMin="0.0", UIMax="0.5")) + float InputReleaseExpirationTimerLength = 0.0666666666666666667f; + + // Length of time within which we can recognise multiple button presses as one input. + UPROPERTY(BlueprintReadOnly, EditDefaultsOnly, meta=(UIMin="0.02", UIMax="0.25")) + float MultiPressTimerLength = 0.025f; + + // Lenght of time before forcibly unlocking any locked combo inputs. + UPROPERTY(BlueprintReadOnly, EditDefaultsOnly, meta=(UIMin="1.0", UIMax="10.0")) + float ForceUnlockTimerLength = 5.0f; + + DECLARE_DELEGATE_OneParam(FNewComboInput, const class UComboInputAsset*); + FNewComboInput NewComboInput; + +private: + void AddActionToBuffer(const FInputActionValue &Value, const class UInputAction *Action); + void ExpireAction(const FInputActionValue &Value, const class UInputAction *Action); + + void ActivateComboInput(const class UComboInputAsset *ComboInput); + + void ClearMultiPresses(); + void ExpireBufferedActions(); + + TObjectPtr EnhancedInputComponent; + + // Currently active combo input. + TObjectPtr InputBufferActive; + + // Combo input held until the current input has expired. + TObjectPtr InputBufferHold; + + // Set of currently locked actions; will not be activated until an unlock signal is received. + TSet> LockedComboInputs; + + TSet MostRecentActions; + TSet ExpiringActions; + + FTimerHandle MultiPressTimerHandle; + FTimerHandle InputReleaseExpirationTimerHandle; + FTimerHandle ForceUnlockTimerHandle; +}; diff --git a/Source/ComboInput/Public/Interfaces/ComboHandlerInterface.h b/Source/ComboInput/Public/Interfaces/ComboHandlerInterface.h new file mode 100644 index 0000000..ef07ed3 --- /dev/null +++ b/Source/ComboInput/Public/Interfaces/ComboHandlerInterface.h @@ -0,0 +1,32 @@ +// ©2022 Batty Bovine Productions, LLC. All Rights Reserved. + +#pragma once + +#include "CoreMinimal.h" +#include "UObject/Interface.h" +#include "ComboHandlerInterface.generated.h" + + +// This class does not need to be modified. +UINTERFACE(MinimalAPI, meta=(Blueprintable)) +class UComboHandlerInterface : public UInterface +{ + GENERATED_BODY() +}; +/** + * Interface for anything that handles combo inputs and contains a + * UComboManagerComponent. + */ +class COMBOINPUT_API IComboHandlerInterface +{ + GENERATED_BODY() + + // Add interface functions to this class. This is the class that will be inherited to implement this interface. +public: + UFUNCTION(BlueprintCallable, BlueprintNativeEvent) + class UInputBufferComponent *GetInputBuffer() const; + virtual class UInputBufferComponent *GetInputBuffer_Implementation() const; + UFUNCTION(BlueprintCallable, BlueprintNativeEvent) + class UComboManagerComponent *GetComboManager() const; + virtual class UComboManagerComponent *GetComboManager_Implementation() const; +}; diff --git a/Source/ComboInputEditor/ComboInputEditor.build.cs b/Source/ComboInputEditor/ComboInputEditor.build.cs new file mode 100644 index 0000000..b3c3437 --- /dev/null +++ b/Source/ComboInputEditor/ComboInputEditor.build.cs @@ -0,0 +1,53 @@ +using UnrealBuildTool; + +public class ComboInputEditor : ModuleRules +{ + public ComboInputEditor(ReadOnlyTargetRules Target) : base(Target) + { + PCHUsage = PCHUsageMode.UseExplicitOrSharedPCHs; + bLegacyPublicIncludePaths = false; + ShadowVariableWarningLevel = WarningLevel.Error; + + PrecompileForTargets = PrecompileTargetsType.None; + bPrecompile = false; + bUsePrecompiled = false; + + PublicDependencyModuleNames.AddRange + (new string[] + { + "Core", + "CoreUObject", + "Engine", + "UnrealEd", + "AssetTools" + } + ); + + PrivateDependencyModuleNames.AddRange + ( + new string[] + { + "ComboInput", + + "AssetTools", + "Slate", + "SlateCore", + "GraphEditor", + "PropertyEditor", + "EditorStyle", + "Kismet", + "KismetWidgets", + "ApplicationCore", + "ToolMenus", + "DeveloperSettings", + "Projects", + + "BlueprintGraph", + "InputCore", + + "MainFrame" + // ... add private dependencies that you statically link with here ... + } + ); + } +} \ No newline at end of file diff --git a/Source/ComboInputEditor/Private/ComboInputEditor.cpp b/Source/ComboInputEditor/Private/ComboInputEditor.cpp new file mode 100644 index 0000000..a43946c --- /dev/null +++ b/Source/ComboInputEditor/Private/ComboInputEditor.cpp @@ -0,0 +1,23 @@ +// ©2023 Batty Bovine Productions, LLC. All Rights Reserved. + +#include "ComboInputEditor.h" + +#include "Interfaces/IPluginManager.h" + +#define LOCTEXT_NAMESPACE "FComboInputEditorModule" + + +void FComboInputEditorModule::StartupModule() +{ + // This code will execute after your module is loaded into memory; the exact timing is specified in the .uplugin file per-module +} + +void FComboInputEditorModule::ShutdownModule() +{ + // This function may be called during shutdown to clean up your module. For modules that support dynamic reloading, + // we call this function before unloading the module. +} + +#undef LOCTEXT_NAMESPACE + +IMPLEMENT_MODULE(FComboInputEditorModule, ComboInputEditorModule) \ No newline at end of file diff --git a/Source/ComboInputEditor/Public/ComboInputEditor.h b/Source/ComboInputEditor/Public/ComboInputEditor.h new file mode 100644 index 0000000..b162af8 --- /dev/null +++ b/Source/ComboInputEditor/Public/ComboInputEditor.h @@ -0,0 +1,70 @@ +// ©2023 Batty Bovine Productions, LLC. All Rights Reserved. + +#pragma once + +#include "Modules/ModuleManager.h" +#include "EdGraphUtilities.h" +#include "IAssetTools.h" +// #include "Interfaces/IHttpRequest.h" + +// class FHttpModule; +// class FSlateStyleSet; + +class FComboInputEditorModule : public IModuleInterface +{ + public: + + /** + * Singleton-like access to this module's interface. This is just for convenience! + * Beware of calling this during the shutdown phase, though. Your module might have been unloaded already. + * + * @return Returns singleton instance, loading the module on demand if needed + */ + static FComboInputEditorModule &Get() + { + return FModuleManager::LoadModuleChecked( "ComboInputEditor" ); + } + + /** + * Checks to see if this module is loaded and ready. It is only valid to call Get() if IsAvailable() returns true. + * + * @return True if the module is loaded and ready to use + */ + static bool IsAvailable() + { + return FModuleManager::Get().IsModuleLoaded("ComboInputEditor"); + } + + /* Called when the module is loaded */ + virtual void StartupModule() override; + + /* Called when the module is unloaded */ + virtual void ShutdownModule() override; + +private: + + // void RegisterAssetTypeAction(IAssetTools& AssetTools, TSharedRef Action); + + // void OnGetResponse(FHttpRequestPtr Request, FHttpResponsePtr Response, bool bWasSuccessful); + // UFUNCTION() void SendHTTPGet(); + + // void PluginButtonClicked(); + // void RegisterMenus(); + +private: + + // TSharedPtr PluginCommands; + // TSharedPtr DialogueTreeSet; + // TSharedPtr MounteaDialogueGraphAssetActions; + // TSharedPtr MounteaDialogueAdditionalDataAssetActions; + // TSharedPtr MounteaDialogueDecoratorAssetAction; + + // TSharedPtr GraphPanelNodeFactory_MounteaDialogueGraph; + // TArray< TSharedPtr > CreatedAssetTypeActions; + + // EAssetTypeCategories::Type MounteaDialogueGraphAssetCategoryBit; + // FHttpModule* Http; + + // TArray RegisteredCustomClassLayouts; + // TArray RegisteredCustomPropertyTypeLayout; +}; \ No newline at end of file