Skip to content

animation custom asc #265

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
May 28, 2024
Merged

animation custom asc #265

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9f8ced4
get asc
Fr0oZzFred May 28, 2024
d54b2e3
clang format
Fr0oZzFred May 28, 2024
50236c8
add callable
Fr0oZzFred May 28, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 12 additions & 5 deletions Source/GameBaseFramework/Private/Animation/GBFAnimInstance.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,16 @@ void UGBFAnimInstance::InitializeWithAbilitySystem( UAbilitySystemComponent * as
GameplayTagPropertyMap.Initialize( this, asc );
}

UAbilitySystemComponent * UGBFAnimInstance::GetAbilitySystemComponent_Implementation() const
{
if ( const auto * owning_actor = GetOwningActor() )
{
return UAbilitySystemGlobals::GetAbilitySystemComponentFromActor( owning_actor );
}

return nullptr;
}

#if WITH_EDITOR
EDataValidationResult UGBFAnimInstance::IsDataValid( FDataValidationContext & context ) const
{
Expand All @@ -28,11 +38,8 @@ void UGBFAnimInstance::NativeInitializeAnimation()
{
Super::NativeInitializeAnimation();

if ( const auto * owning_actor = GetOwningActor() )
if ( auto * asc = GetAbilitySystemComponent() )
{
if ( auto * asc = UAbilitySystemGlobals::GetAbilitySystemComponentFromActor( owning_actor ) )
{
InitializeWithAbilitySystem( asc );
}
InitializeWithAbilitySystem( asc );
}
}
2 changes: 1 addition & 1 deletion Source/GameBaseFramework/Private/Animation/GBFAnimationFunctionLibrary.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

#include "Animation/GBFAnimLayerSelectionSet.h"

TSubclassOf<UAnimInstance> UGBFAnimationFunctionLibrary::SelectBestLayerFromAnimLayerSelectionSet( const FGBFAnimLayerSelectionSet & anim_layer_selection_set, const FGameplayTagContainer & cosmetic_tags )
TSubclassOf< UAnimInstance > UGBFAnimationFunctionLibrary::SelectBestLayerFromAnimLayerSelectionSet( const FGBFAnimLayerSelectionSet & anim_layer_selection_set, const FGameplayTagContainer & cosmetic_tags )
{
return anim_layer_selection_set.SelectBestLayer( cosmetic_tags );
}
4 changes: 4 additions & 0 deletions Source/GameBaseFramework/Public/Animation/GBFAnimInstance.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,13 @@ class GAMEBASEFRAMEWORK_API UGBFAnimInstance : public UAnimInstance
GENERATED_BODY()

public:
UFUNCTION( BlueprintCallable )
virtual void InitializeWithAbilitySystem( UAbilitySystemComponent * asc );

protected:
UFUNCTION( BlueprintCallable, BlueprintNativeEvent )
UAbilitySystemComponent * GetAbilitySystemComponent() const;

#if WITH_EDITOR
EDataValidationResult IsDataValid( FDataValidationContext & context ) const override;
#endif // WITH_EDITOR
Expand Down
1 change: 0 additions & 1 deletion Source/GameBaseFramework/Public/Animation/GBFAnimationFunctionLibrary.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ class GAMEBASEFRAMEWORK_API UGBFAnimationFunctionLibrary final : public UBluepri
GENERATED_BODY()

public:

UFUNCTION( BlueprintCallable )
static TSubclassOf< UAnimInstance > SelectBestLayerFromAnimLayerSelectionSet( const FGBFAnimLayerSelectionSet & anim_layer_selection_set, const FGameplayTagContainer & cosmetic_tags );
};
Loading