Skip to content

Commit 77ec1fd

Browse files
CiberuspsCiberusps
authored
v1.3.1 (#18)
* [InputSystem] try to fix "WhileInputActive"(not possible), "OnInputTriggered" fix activation while ability already active * [Docs] BlueprintNodes * Update README.md * Update UHLAbilitySystemComponent.cpp * [DebugSubsystem] check Blocks not empty * [Anim] ANS_UHL_Base add ShouldUseExperimentalUHLFeatures, NotifyEndOrBlendOut * ANS_EnableRootMotionZAxisMovement land check * ANS_EnableRootMotionZAxisMovement ground check * Update README.md * Update README.md * [Editor] CustomThumbnails refactoring * [Debug] experimental debug lines through "AHUD::DrawHUD" * [Debug] experimental debug lines through "AHUD::DrawHUD" 2 * ANS_UHL_Base fix critical build err * UUHLTraceUtilsBPL::SweepCapsuleMultiByChannel * Update README.md * [BPL] GetMostDistantActor * [Editor] CustomIcons add classes array support * [DebugSubsystem] fix RandomColors for DebugCategories * by default InstancingPolicy = InstancedPerActor * Revert "by default InstancingPolicy = InstancedPerActor" This reverts commit 5bf688b. * update readme.md * update readme.md
1 parent ae5a64a commit 77ec1fd

24 files changed

+555
-84
lines changed

‎Content/BP_UHL_BlueprintNode.uasset‎

151 KB
Binary file not shown.

‎Content/BP_UHL_BlueprintNodes.uasset‎

-42.2 KB
Binary file not shown.

‎README.md‎

Lines changed: 41 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,11 @@ UHL consists of 3 modules:
106106
> - [TurnTo](#turnto)
107107
> - [Subsystems](#subsystems)
108108
> - [DebugSubsystem](#debugsubsystem)
109+
> - [UHLHUD](#uhlhud)
109110
> - [UnrealHelperLibraryBPL](#unrealhelperlibrarybpl)
111+
> - Gameplay
112+
> - GetActorClosestToCenterOfScreen
113+
> - GetMostDistantActor
110114
> - GAS
111115
> - TryActivateAbilityWithTag
112116
> - TryCancelAbilityWithTag
@@ -122,13 +126,17 @@ UHL consists of 3 modules:
122126
> - [GetPointAtAngleRelativeToOtherActor](#getpointatanglerelativetootheractor)
123127
> - [GetPointAtDirectionRelativeToOtherActor](#getpointatdirectionrelativetootheractor)
124128
> - [DirectionToAngle](#directiontoangle)
129+
> - UI/Screen
130+
> - GetViewportSizeUnscaled
125131
> - Misc
126132
> - [GetProjectVersion](#getprojectversion)
127133
> - [GetNamesOfComponentsOnObject](#getnamesofcomponentsonobject)
128134
> - [GetAssetsOfClass](#getassetsofclass)
129135
> - GetBuildType
130136
> <!-- - GetActorComponentByName -->
131137
> <!-- - GetSceneComponentByName -->
138+
> - Debug
139+
> - DrawDebugLineOnCanvas
132140
> - Other
133141
> - [GetHighestPoint](#gethighestpoint)
134142
> - [LoadingUtilLibrary](#loadingutillibrary)
@@ -141,7 +149,7 @@ UHL consists of 3 modules:
141149
> - [TraceUtilsBPL](#traceutilsbpl)
142150
> - SweepCapsuleSingleByChannel
143151
> - [Settings](#settings)
144-
> - [UHL Settings](#)
152+
> - [UHL Settings](#uhl-settings)
145153
146154
**UnrealHelperEditor**
147155

@@ -647,6 +655,22 @@ void AUHLPlayerController::BeginPlay()
647655
How to add DebugCategory:
648656
1)
649657

658+
How to subscribe on debug category change in C++
659+
660+
```c++
661+
UAA_WaitDebugCategoryChange* WaitDebugCategoryChangeTask = UAA_WaitDebugCategoryChange::WaitDebugCategoryChange(
662+
Actor->GetWorld(),
663+
YourGameplayTags::TAG_DebugCategory_Combat // same as FGameplayTag("DebugCategory.Something")
664+
);
665+
WaitDebugCategoryChangeTask->OnChange.AddUniqueDynamic(this, &UCombatSubsystem::OnDebugCategoryChanged);
666+
// on activation "OnDebugCategoryChanged" will be fired
667+
WaitDebugCategoryChangeTask->Activate();
668+
```
669+
670+
#### UHLHUD
671+
672+
HUD with debugging abilities, for now used to display debug bars(e.g. HP/hidden attributes)
673+
650674
### LoadingUtilLibrary
651675

652676
**UHLLoadingUtilLibrary** - loading utils from Lyra
@@ -684,7 +708,11 @@ if you don't want to copy paste your `AttributeSets`
684708

685709
**Custom thumnails** - to override thumbnail by your own, just implement `IUHECustomThumbnail` interface and define your own icon using `GetCustomThumbnailIcon()`
686710

711+
> [!WARNING]
712+
> ⚠️ NOT sure that blueprints supported for now
713+
687714
```C++
715+
// UInventoryItem.h
688716
#if WITH_EDITOR
689717
#include "UHECustomThumbnail.h"
690718
#endif
@@ -697,19 +725,23 @@ class IUHECustomThumbnail {};
697725
class GAMECODE_API UInventoryItem : public UObject,
698726
public IUHECustomThumbnail
699727
{
700-
// ...
701-
702-
/** IUHECustomThumbnail **/
728+
/** IUHECustomThumbnail **/
703729
#if WITH_EDITOR
704-
UFUNCTION(BlueprintCallable, BlueprintNativeEvent)
705-
UTexture2D* GetCustomThumbnailIcon() { return Description.Icon; };
730+
virtual UTexture2D* GetCustomThumbnailIcon_Implementation() const override;
706731
#endif
707732
/** ~IUHECustomThumbnail **/
733+
}
708734

709-
// ...
710-
```
735+
------------------------------------------------------------------
711736

712-
⚠️ for now works only with C++, TODO add support for blueprints
737+
// UInventoryItem.cpp
738+
#if WITH_EDITOR
739+
UTexture2D* UInventoryItem::GetCustomThumbnailIcon_Implementation()
740+
{
741+
return Description.Icon;
742+
}
743+
#endif
744+
```
713745
714746
Thanks to [this post](https://forums.unrealengine.com/t/custom-thumbnail-not-display-asset-is-never-loaded/143155/2?u=ciberus) and [this](https://forums.unrealengine.com/t/custom-thumbnail-on-blueprint/337532/3?u=ciberus)
715747

‎Source/UnrealHelperEditor/Private/UHECustomThumbnail.cpp‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,9 @@
55

66
// Add default functionality here for any IUHECustomThumbnail functions that are not pure virtual.
77

8-
#include UE_INLINE_GENERATED_CPP_BY_NAME(UHECustomThumbnail)
8+
#include UE_INLINE_GENERATED_CPP_BY_NAME(UHECustomThumbnail)
9+
10+
UTexture2D* IUHECustomThumbnail::GetCustomThumbnailIcon_Implementation() const
11+
{
12+
return nullptr;
13+
}

‎Source/UnrealHelperEditor/Private/UnrealHelperEditorStyle.cpp‎

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -53,16 +53,25 @@ TSharedRef< FSlateStyleSet > FUnrealHelperEditorStyle::Create()
5353
FString Path = CustomClassIcon.Texture2D.GetLongPackageName();
5454
UObject* IconImageObject = LoadObject<UObject>(nullptr, *Path);
5555

56-
if (IsValid(IconImageObject) && IsValid(CustomClassIcon.Class))
56+
if (IsValid(IconImageObject))
5757
{
5858
UTexture2D* IconImage = Cast<UTexture2D>(IconImageObject);
5959
// FSlateDynamicImageBrush* DynamicImageBrush = new FSlateDynamicImageBrush(IconImage, Icon20x20, FName("CapsuleHitRegistrator"));
6060
FSlateImageBrush* ImageBrush = new FSlateImageBrush(IconImage, Icon20x20);
6161

62-
FString ClassName = CustomClassIcon.Class->GetName();
63-
// Modify the class icons to use our new awesome icons
64-
FString IconStyleName = FString::Printf(TEXT("ClassIcon.%s"), *ClassName);
65-
Style->Set(FName(IconStyleName), ImageBrush);
62+
TArray<TSubclassOf<UObject>> AllClasses = CustomClassIcon.Classes;
63+
// support deprecated value
64+
if (IsValid(CustomClassIcon.Class))
65+
{
66+
AllClasses.Add(CustomClassIcon.Class);
67+
}
68+
for (const TSubclassOf<UObject> Class : AllClasses)
69+
{
70+
FString ClassName = Class->GetName();
71+
// Modify the class icons to use our new awesome icons
72+
FString IconStyleName = FString::Printf(TEXT("ClassIcon.%s"), *ClassName);
73+
Style->Set(FName(IconStyleName), ImageBrush);
74+
}
6675
}
6776
}
6877

‎Source/UnrealHelperEditor/Public/Development/UHESettings.h‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,11 @@ struct UNREALHELPEREDITOR_API FUHECustomClassIconDescription
1313

1414
UPROPERTY(EditAnywhere, BlueprintReadWrite, Category="CustomClassIconDescription")
1515
TSoftObjectPtr<UTexture2D> Texture2D;
16-
UPROPERTY(EditAnywhere, BlueprintReadWrite, Category="CustomClassIconDescription")
16+
// deprecated, TODO: remove
17+
UPROPERTY(EditAnywhere, BlueprintReadWrite, Category="CustomClassIconDescription", meta=(DeprecatedProperty, DeprecationMessage="Deprecated use Classes"))
1718
TSubclassOf<UObject> Class;
19+
UPROPERTY(EditAnywhere, BlueprintReadWrite, Category="CustomClassIconDescription")
20+
TArray<TSubclassOf<UObject>> Classes;
1821
};
1922

2023
/**

‎Source/UnrealHelperEditor/Public/UHECustomThumbnail.h‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ class UNREALHELPEREDITOR_API IUHECustomThumbnail
2525

2626
/** IUHECustomThumbnail **/
2727
UFUNCTION(BlueprintCallable, BlueprintNativeEvent, Category="Custom Thumbnail")
28-
UTexture2D* GetCustomThumbnailIcon();
28+
UTexture2D* GetCustomThumbnailIcon() const;
29+
virtual UTexture2D* GetCustomThumbnailIcon_Implementation() const;
2930
/** ~IUHECustomThumbnail **/
3031
};

‎Source/UnrealHelperLibrary/Private/AbilitySystem/UHLAbilitySystemComponent.cpp‎

Lines changed: 39 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -366,12 +366,9 @@ void UUHLAbilitySystemComponent::ProcessAbilityInput(float DeltaTime, bool bGame
366366
{
367367
if (!bUseInputConfig) return;
368368

369-
// TODO: mb check how Lyra use that tag?
370369
if (HasMatchingGameplayTag(UHLGameplayTags::TAG_Gameplay_AbilityInputBlocked))
371370
{
372-
InputPressedSpecHandles.Reset();
373-
InputReleasedSpecHandles.Reset();
374-
InputHeldSpecHandles.Reset();
371+
ClearAbilityInput();
375372
return;
376373
}
377374

@@ -389,8 +386,7 @@ void UUHLAbilitySystemComponent::ProcessAbilityInput(float DeltaTime, bool bGame
389386
{
390387
if (AbilitySpec->Ability && !AbilitySpec->IsActive())
391388
{
392-
const UUHLGameplayAbility* AbilityCDO = CastChecked<UUHLGameplayAbility>(AbilitySpec->Ability);
393-
389+
const UUHLGameplayAbility* AbilityCDO = Cast<UUHLGameplayAbility>(AbilitySpec->Ability);
394390
if (AbilityCDO->GetActivationPolicy() == EUHLAbilityActivationPolicy::WhileInputActive)
395391
{
396392
AbilitiesToActivate.AddUnique(AbilitySpec->Handle);
@@ -410,30 +406,25 @@ void UUHLAbilitySystemComponent::ProcessAbilityInput(float DeltaTime, bool bGame
410406
{
411407
AbilitySpec->InputPressed = true;
412408

413-
// TODO: если абилка активна, нужно пытаться все равно ее активировать, а не просто данные слать
414-
// If ability active, we should try to activate it again, instead of sending data
415-
416-
// if (AbilitySpec->IsActive())
417-
// {
418-
// // Ability is active so pass along the input event.
419-
// AbilitySpecInputPressed(*AbilitySpec);
420-
// }
421-
// else
422-
// {
423-
const UUHLGameplayAbility* AbilityCDO = CastChecked<UUHLGameplayAbility>(AbilitySpec->Ability);
424-
425-
if (AbilityCDO->GetActivationPolicy() == EUHLAbilityActivationPolicy::OnInputTriggered)
409+
const UUHLGameplayAbility* AbilityCDO = Cast<UUHLGameplayAbility>(AbilitySpec->Ability);
410+
if (AbilitySpec->IsActive()
411+
// TODO move this logic to "OnInputTriggeredForceReactivate" ??
412+
// If ability active, we should try to activate it again, instead of sending data
413+
// so that's why if "OnInputTriggered" choosed - skip
414+
&& AbilityCDO
415+
&& AbilityCDO->GetActivationPolicy() != EUHLAbilityActivationPolicy::OnInputTriggered)
426416
{
427-
AbilitiesToActivate.AddUnique(AbilitySpec->Handle);
428-
429-
// TODO: testing
430-
// if (AbilitySpec->IsActive())
431-
// {
432-
// Ability is active so pass along the input event.
433-
AbilitySpecInputPressed(*AbilitySpec);
434-
// }
417+
// Ability is active so pass along the input event.
418+
AbilitySpecInputPressed(*AbilitySpec);
435419
}
436-
// }
420+
else
421+
{
422+
// const UUHLGameplayAbility* AbilityCDO = Cast<UUHLGameplayAbility>(AbilitySpec->Ability);
423+
if (AbilityCDO && AbilityCDO->GetActivationPolicy() == EUHLAbilityActivationPolicy::OnInputTriggered)
424+
{
425+
AbilitiesToActivate.AddUnique(AbilitySpec->Handle);
426+
}
427+
}
437428
}
438429
}
439430
}
@@ -502,6 +493,19 @@ void UUHLAbilitySystemComponent::ProcessAbilityInput(float DeltaTime, bool bGame
502493
{
503494
// Ability is active so pass along the input event.
504495
AbilitySpecInputReleased(*AbilitySpec);
496+
497+
// if "WhileInputActive" EndAbility automatically
498+
// const UUHLGameplayAbility* AbilityCDO = Cast<UUHLGameplayAbility>(AbilitySpec->Ability);
499+
// if (AbilityCDO && AbilityCDO->GetActivationPolicy() == EUHLAbilityActivationPolicy::WhileInputActive)
500+
// {
501+
// const FUHLWhileInputActiveSettings& WhileInputActiveSettings = AbilityCDO->GetWhileInputActiveSettings();
502+
// if (WhileInputActiveSettings.bCancelAbilityAutomatically)
503+
// {
504+
// // "EndAbility" not accessible, so try to cancel if "bCancelAbilityAutomatically"
505+
// AbilitySpec->Ability->CancelAbility(AbilitySpec->Handle, AbilityActorInfo.Get(), AbilitySpec->ActivationInfo, WhileInputActiveSettings.bReplicateEndAbility);
506+
// // AbilitySpec->Ability->EndAbility(AbilitySpec->Handle, AbilityActorInfo.Get(), AbilitySpec->ActivationInfo, WhileInputActiveSettings.bReplicateEndAbility, WhileInputActiveSettings.bMarkAsCanceledOnEnd);
507+
// }
508+
// }
505509
}
506510
}
507511
}
@@ -513,3 +517,10 @@ void UUHLAbilitySystemComponent::ProcessAbilityInput(float DeltaTime, bool bGame
513517
InputPressedSpecHandles.Reset();
514518
InputReleasedSpecHandles.Reset();
515519
}
520+
521+
void UUHLAbilitySystemComponent::ClearAbilityInput()
522+
{
523+
InputPressedSpecHandles.Reset();
524+
InputReleasedSpecHandles.Reset();
525+
InputHeldSpecHandles.Reset();
526+
}

‎Source/UnrealHelperLibrary/Private/Animation/Notifies/ANS_ActivateAbility.cpp‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,9 +49,7 @@ void UANS_ActivateAbility::NotifyEnd(USkeletalMeshComponent* MeshComp, UAnimSequ
4949

5050
void UANS_ActivateAbility::OnMontageBlendingOut(UAnimMontage* Montage, bool bInterrupted)
5151
{
52-
if (!bDeactivateOnMontageBlendingOut
53-
|| !CurrentAnimMontage.IsValid()
54-
|| Montage != CurrentAnimMontage)
52+
if (!bDeactivateOnMontageBlendingOut || !Montage)
5553
{
5654
return;
5755
}

0 commit comments

Comments
 (0)