From eb3967ca7eea060ee419be0a313b0be2c5327c6a Mon Sep 17 00:00:00 2001 From: Dominik Pavlicek Date: Tue, 21 Feb 2023 17:21:47 +0100 Subject: [PATCH 1/3] Updated Icons --- .../Private/Components/ActorInteractableComponentBase.cpp | 4 ++-- .../Private/Components/ActorInteractorComponentTrace.cpp | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Source/ActorInteractionPlugin/Private/Components/ActorInteractableComponentBase.cpp b/Source/ActorInteractionPlugin/Private/Components/ActorInteractableComponentBase.cpp index 8605873..f07fa0a 100644 --- a/Source/ActorInteractionPlugin/Private/Components/ActorInteractableComponentBase.cpp +++ b/Source/ActorInteractionPlugin/Private/Components/ActorInteractableComponentBase.cpp @@ -1912,7 +1912,7 @@ void UActorInteractableComponentBase::PostEditChangeChainProperty(FPropertyChang ( interactableName.Append(TEXT(": UI Space changed! Component Scale has been updated. Update 'DrawSize' to match new Widget Space!")) ); - FEditorHelper::DisplayEditorNotification(ErrorMessage, SNotificationItem::CS_Fail, 5.f, 2.f, TEXT("Icons.Info")); + FEditorHelper::DisplayEditorNotification(ErrorMessage, SNotificationItem::CS_Fail, 5.f, 2.f, TEXT("NotificationList.DefaultMessage")); } } @@ -2054,7 +2054,7 @@ bool UActorInteractableComponentBase::Modify(bool bAlwaysMarkDirty) ( interactableName.Append(" from ").Append(ownerName).Append(TEXT(": Interactable Data or Widget Class are not valid! Use 'SetDefaults' to avoid issues!")) ); - FEditorHelper::DisplayEditorNotification(ErrorMessage, SNotificationItem::CS_Fail, 5.f, 2.f, TEXT("Icons.Info")); + FEditorHelper::DisplayEditorNotification(ErrorMessage, SNotificationItem::CS_Fail, 5.f, 2.f, TEXT("NotificationList.DefaultMessage")); } diff --git a/Source/ActorInteractionPlugin/Private/Components/ActorInteractorComponentTrace.cpp b/Source/ActorInteractionPlugin/Private/Components/ActorInteractorComponentTrace.cpp index 084a99c..47637b9 100644 --- a/Source/ActorInteractionPlugin/Private/Components/ActorInteractorComponentTrace.cpp +++ b/Source/ActorInteractionPlugin/Private/Components/ActorInteractorComponentTrace.cpp @@ -459,7 +459,7 @@ void UActorInteractorComponentTrace::PostEditChangeChainProperty(FPropertyChange ( InteractorName.Append(TEXT(": TraceInterval is more than 3s! This might be unintentional and cause gameplay issues.")) ); - FEditorHelper::DisplayEditorNotification(ErrorMessage, SNotificationItem::CS_Fail, 5.f, 2.f, TEXT("Icons.Warning")); + FEditorHelper::DisplayEditorNotification(ErrorMessage, SNotificationItem::CS_Fail, 5.f, 2.f, TEXT("NotificationList.DefaultMessage")); } } @@ -482,7 +482,7 @@ void UActorInteractorComponentTrace::PostEditChangeChainProperty(FPropertyChange ( InteractorName.Append(TEXT(": TraceRange is more than 5000cm! This might be unintentional and cause gameplay issues.")) ); - FEditorHelper::DisplayEditorNotification(ErrorMessage, SNotificationItem::CS_Fail, 5.f, 2.f, TEXT("Icons.Warning")); + FEditorHelper::DisplayEditorNotification(ErrorMessage, SNotificationItem::CS_Fail, 5.f, 2.f, TEXT("NotificationList.DefaultMessage")); } } @@ -494,7 +494,7 @@ void UActorInteractorComponentTrace::PostEditChangeChainProperty(FPropertyChange ( InteractorName.Append(TEXT(": TraceShapeHalfSize is more than 25cm! This might be unintentional and cause gameplay issues.")) ); - FEditorHelper::DisplayEditorNotification(ErrorMessage, SNotificationItem::CS_Fail, 5.f, 2.f, TEXT("Icons.Warning")); + FEditorHelper::DisplayEditorNotification(ErrorMessage, SNotificationItem::CS_Fail, 5.f, 2.f, TEXT("NotificationList.DefaultMessage")); } } } From 36b0b87d936013bbee04aeef5f4e64cabdb1655e Mon Sep 17 00:00:00 2001 From: Dominik Pavlicek Date: Tue, 21 Feb 2023 17:21:57 +0100 Subject: [PATCH 2/3] Made FKey input optional --- .../Components/ActorInteractorComponentBase.cpp | 4 ++-- .../Public/Components/ActorInteractorComponentBase.h | 4 ++-- .../Public/Interfaces/ActorInteractorInterface.h | 12 ++++++------ 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/Source/ActorInteractionPlugin/Private/Components/ActorInteractorComponentBase.cpp b/Source/ActorInteractionPlugin/Private/Components/ActorInteractorComponentBase.cpp index 510c9ba..efd6d46 100644 --- a/Source/ActorInteractionPlugin/Private/Components/ActorInteractorComponentBase.cpp +++ b/Source/ActorInteractionPlugin/Private/Components/ActorInteractorComponentBase.cpp @@ -152,7 +152,7 @@ void UActorInteractorComponentBase::EvaluateInteractable(const TScriptInterface< } } -void UActorInteractorComponentBase::StartInteraction(const float StartTime, const FKey& InputKey) +void UActorInteractorComponentBase::StartInteraction(const float StartTime, FKey InputKey) { if (CanInteract() && ActiveInteractable.GetInterface()) { @@ -161,7 +161,7 @@ void UActorInteractorComponentBase::StartInteraction(const float StartTime, cons } } -void UActorInteractorComponentBase::StopInteraction(const float StartTime, const FKey& InputKey) +void UActorInteractorComponentBase::StopInteraction(const float StartTime, FKey InputKey) { if (CanInteract() && ActiveInteractable.GetInterface()) { diff --git a/Source/ActorInteractionPlugin/Public/Components/ActorInteractorComponentBase.h b/Source/ActorInteractionPlugin/Public/Components/ActorInteractorComponentBase.h index 43096fc..a8739c5 100644 --- a/Source/ActorInteractionPlugin/Public/Components/ActorInteractorComponentBase.h +++ b/Source/ActorInteractionPlugin/Public/Components/ActorInteractorComponentBase.h @@ -103,13 +103,13 @@ class ACTORINTERACTIONPLUGIN_API UActorInteractorComponentBase : public UActorCo * @param InputKey Optional Key. Some Interactions might require this value to perform checks. */ UFUNCTION(BlueprintCallable, Category="Interaction") - virtual void StartInteraction(const float StartTime, const FKey& InputKey) override; + virtual void StartInteraction(const float StartTime, FKey InputKey) override; /** * Function to stop interaction. * No conditions required. */ UFUNCTION(BlueprintCallable, Category="Interaction") - virtual void StopInteraction(const float StartTime, const FKey& InputKey) override; + virtual void StopInteraction(const float StartTime, FKey InputKey) override; /** diff --git a/Source/ActorInteractionPlugin/Public/Interfaces/ActorInteractorInterface.h b/Source/ActorInteractionPlugin/Public/Interfaces/ActorInteractorInterface.h index 71fc4ea..950e273 100644 --- a/Source/ActorInteractionPlugin/Public/Interfaces/ActorInteractorInterface.h +++ b/Source/ActorInteractionPlugin/Public/Interfaces/ActorInteractorInterface.h @@ -20,8 +20,8 @@ DECLARE_DYNAMIC_MULTICAST_DELEGATE_OneParam(FInteractableSelected, const TScript DECLARE_DYNAMIC_MULTICAST_DELEGATE_OneParam(FInteractableFound, const TScriptInterface&, FoundInteractable); DECLARE_DYNAMIC_MULTICAST_DELEGATE_OneParam(FInteractableLost, const TScriptInterface&, LostInteractable); -DECLARE_DYNAMIC_MULTICAST_DELEGATE_TwoParams(FInteractionKeyPressed, const float&, TimeKeyPressed, const FKey&, PressedKey); -DECLARE_DYNAMIC_MULTICAST_DELEGATE_TwoParams(FInteractionKeyReleased, const float&, TimeKeyReleased, const FKey&, ReleasedKey); +DECLARE_DYNAMIC_MULTICAST_DELEGATE_TwoParams(FInteractionKeyPressed, const float&, TimeKeyPressed, FKey, PressedKey); +DECLARE_DYNAMIC_MULTICAST_DELEGATE_TwoParams(FInteractionKeyReleased, const float&, TimeKeyReleased, FKey, ReleasedKey); DECLARE_DYNAMIC_MULTICAST_DELEGATE_OneParam(FIgnoredActorAdded, const AActor*, AddedActor); DECLARE_DYNAMIC_MULTICAST_DELEGATE_OneParam(FIgnoredActorRemoved, const AActor*, RemovedActor); @@ -80,7 +80,7 @@ class ACTORINTERACTIONPLUGIN_API IActorInteractorInterface * @param PressedKey Key which was pressed */ UFUNCTION(BlueprintNativeEvent, BlueprintCallable, Category="Interaction") - void OnInteractionKeyPressedEvent(const float& TimeKeyPressed, const FKey& PressedKey); + void OnInteractionKeyPressedEvent(const float& TimeKeyPressed, FKey PressedKey); void OnInteractionKeyPressedEvent_Implementation(const float& TimeKeyPressed, const FKey& PressedKey) { StartInteraction(TimeKeyPressed, PressedKey); @@ -95,7 +95,7 @@ class ACTORINTERACTIONPLUGIN_API IActorInteractorInterface * @param ReleasedKey Key which was released */ UFUNCTION(BlueprintNativeEvent, BlueprintCallable, Category="Interaction") - void OnInteractionKeyReleasedEvent(const float& TimeKeyReleased, const FKey& ReleasedKey); + void OnInteractionKeyReleasedEvent(const float& TimeKeyReleased, FKey ReleasedKey); void OnInteractionKeyReleasedEvent_Implementation(const float& TimeKeyReleased, const FKey& ReleasedKey) { StopInteraction(TimeKeyReleased, ReleasedKey); @@ -158,8 +158,8 @@ class ACTORINTERACTIONPLUGIN_API IActorInteractorInterface virtual bool IsValidInteractor() const = 0; - virtual void StartInteraction(const float StartTime, const FKey& InputKey) = 0; - virtual void StopInteraction(const float StartTime, const FKey& InputKey) = 0; + virtual void StartInteraction(const float StartTime, FKey InputKey) = 0; + virtual void StopInteraction(const float StartTime, FKey InputKey) = 0; virtual bool ActivateInteractor(FString& ErrorMessage) = 0; virtual bool WakeUpInteractor(FString& ErrorMessage) = 0; From 4fb0f4dbeab464e54a511ae5e275aab252a62c84 Mon Sep 17 00:00:00 2001 From: Dominik Pavlicek Date: Tue, 21 Feb 2023 17:53:17 +0100 Subject: [PATCH 3/3] Update AIntPPopup.cpp --- .../Private/Popup/AIntPPopup.cpp | 25 ++++++++++++++++--- 1 file changed, 21 insertions(+), 4 deletions(-) diff --git a/Source/ActorInteractionPluginEditor/Private/Popup/AIntPPopup.cpp b/Source/ActorInteractionPluginEditor/Private/Popup/AIntPPopup.cpp index 30a4f7f..d8cc699 100644 --- a/Source/ActorInteractionPluginEditor/Private/Popup/AIntPPopup.cpp +++ b/Source/ActorInteractionPluginEditor/Private/Popup/AIntPPopup.cpp @@ -20,7 +20,7 @@ void AIntPPopup::Register() { const FString PluginDirectory = IPluginManager::Get().FindPlugin(TEXT("ActorInteractionPlugin"))->GetBaseDir(); const FString UpdatedConfigFile = PluginDirectory + "/Config/UpdateConfig.ini"; - const FString CurrentPluginVersion = "3.0"; + const FString CurrentPluginVersion = "3.0.1.3"; UAIntPPopupConfig* AIntPPopupConfig = GetMutableDefault(); @@ -79,7 +79,7 @@ void AIntPPopup::Open() [ SNew(STextBlock) .Font(HeadingFont) - .Text(FText::FromString("Actor Interaction Plugin v3.0")) + .Text(FText::FromString("Actor Interaction Plugin v3.1")) .Justification(ETextJustify::Center) ] + SVerticalBox::Slot() @@ -99,9 +99,24 @@ void AIntPPopup::Open() First thing first, if you've been enjoying using it, it would mean a lot if you could just drop a small review on the marketplace page :). -I also made a paid Modular Sword Pack. It's a simple yet powerful tool which allows creating thousands upon thousands unique swords with simple click, not coming with free upgrade of Modular Scabbard System! +I also made a paid Modular Sword Pack. It's a simple yet powerful tool that allows creating thousands upon thousands of unique swords with a simple click, now with a free upgrade of Modular Scabbard System! -But let's keep it short, here are the cool new features (and bugfixes) of version 3.0! +But let's keep it short, here are the cool new features (and bugfixes) of version 3.1! + +Version 3.1 + +Features + +* Improved performance for Consoles and Mobile devices + +Bugfixes + +* Fixed issue when swapping states of Interactable returns to Default state + +Updates +* Add DEPRECATED to SnoozeInteractable +* DEPRECATED Interactable State Asleep +* Interactor does not longer require Key input and it has become optional Version 3.0 @@ -118,6 +133,8 @@ But let's keep it short, here are the cool new features (and bugfixes) of versio Bugfixes * Fix missed descriptions + +Updates * Add DEPRECATED to old Component Classes )")) .TextStyle(FEditorStyle::Get(), "NormalText")