Multiple changes:

Prefix the names of functions that are used to bind to delegates with the name of the object to whose delegates they are bound Replace EditDefaultsOnly usages with EditAnywhere Remove redundant ANSI_TO_TCHAR() usages Use ForceUnits in more places Other minor changes
danieljcage · Feb 1, 2023 · 2aa9237 · 2aa9237
1 parent e4ebd80
commit 2aa9237
Show file tree

Hide file tree

Showing 27 changed files with 138 additions and 143 deletions.
diff --git a/Config/DefaultInput.ini b/Config/DefaultInput.ini
@@ -15,12 +15,12 @@ DefaultInputComponentClass=/Script/EnhancedInput.EnhancedInputComponent
 +DebugExecBindings=(Key=Eight,Command="ShowDebug Als.CameraTraces",Shift=True)
 
 [/Script/EngineSettings.ConsoleSettings]
-+ManualAutoCompleteList=(Command="Stat Als",Desc="Displays ALS performance stats.")
-+ManualAutoCompleteList=(Command="ShowDebug Als.Curves",Desc="Toggles display of animation curves.")
-+ManualAutoCompleteList=(Command="ShowDebug Als.State",Desc="Toggles display of character state.")
-+ManualAutoCompleteList=(Command="ShowDebug Als.Shapes",Desc="Toggles display of debug shapes.")
-+ManualAutoCompleteList=(Command="ShowDebug Als.Traces",Desc="Toggles display of animation traces.")
-+ManualAutoCompleteList=(Command="ShowDebug Als.Mantling",Desc="Toggles display of mantling traces.")
-+ManualAutoCompleteList=(Command="ShowDebug Als.CameraCurves",Desc="Toggles display of camera animation curves.")
-+ManualAutoCompleteList=(Command="ShowDebug Als.CameraShapes",Desc="Toggles display of camera debug shapes.")
-+ManualAutoCompleteList=(Command="ShowDebug Als.CameraTraces",Desc="Toggles display of camera traces.")
++ManualAutoCompleteList=(Command="Stat Als",Desc="Displays ALS performance statistics.")
++ManualAutoCompleteList=(Command="ShowDebug Als.Curves",Desc="Displays animation curves.")
++ManualAutoCompleteList=(Command="ShowDebug Als.State",Desc="Displays character state.")
++ManualAutoCompleteList=(Command="ShowDebug Als.Shapes",Desc="Displays debug shapes.")
++ManualAutoCompleteList=(Command="ShowDebug Als.Traces",Desc="Displays animation traces.")
++ManualAutoCompleteList=(Command="ShowDebug Als.Mantling",Desc="Displays mantling traces.")
++ManualAutoCompleteList=(Command="ShowDebug Als.CameraCurves",Desc="Displays camera animation curves.")
++ManualAutoCompleteList=(Command="ShowDebug Als.CameraShapes",Desc="Displays camera debug shapes.")
++ManualAutoCompleteList=(Command="ShowDebug Als.CameraTraces",Desc="Displays camera traces.")
diff --git a/LICENSE.md b/LICENSE.md
@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2022 Sixze, Doğa Can Yanıkoğlu, Caleb Longmire and Advanced Locomotion System Refactored contributors
+Copyright (c) 2023 Sixze, Caleb Longmire, Doğa Can Yanıkoğlu, and Advanced Locomotion System Refactored contributors
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 

diff --git a/Source/ALS/Private/AlsAnimationInstance.cpp b/Source/ALS/Private/AlsAnimationInstance.cpp
@@ -827,7 +827,7 @@ void UAlsAnimationInstance::RefreshGroundPredictionAmount()
 	FHitResult Hit;
 	GetWorld()->SweepSingleByObjectType(Hit, SweepStartLocation, SweepStartLocation + SweepVector, FQuat::Identity, ObjectQueryParameters,
 	                                    FCollisionShape::MakeCapsule(LocomotionState.CapsuleRadius, LocomotionState.CapsuleHalfHeight),
-	                                    {ANSI_TO_TCHAR(__FUNCTION__), false, Character});
+	                                    {__FUNCTION__, false, Character});
 
 	const auto bGroundValid{Hit.IsValidBlockingHit() && Hit.ImpactNormal.Z >= LocomotionState.WalkableFloorZ};
 
@@ -1164,7 +1164,7 @@ void UAlsAnimationInstance::RefreshFootOffset(FAlsFootState& FootState, const fl
 		                                     0.0f, 0.0f, Settings->Feet.IkTraceDistanceDownward * LocomotionState.Scale
 	                                     },
 	                                     UEngineTypes::ConvertToCollisionChannel(Settings->Feet.IkTraceChannel),
-	                                     {ANSI_TO_TCHAR(__FUNCTION__), true, Character});
+	                                     {__FUNCTION__, true, Character});
 
 	const auto bGroundValid{Hit.IsValidBlockingHit() && Hit.ImpactNormal.Z >= LocomotionState.WalkableFloorZ};
 

diff --git a/Source/ALS/Private/AlsCharacter.cpp b/Source/ALS/Private/AlsCharacter.cpp
@@ -121,7 +121,7 @@ void AAlsCharacter::PostInitializeComponents()
 
 	GetMesh()->AddTickPrerequisiteActor(this);
 
-	AlsCharacterMovement->OnPhysicsRotation.AddUObject(this, &ThisClass::PhysicsRotation);
+	AlsCharacterMovement->OnPhysicsRotation.AddUObject(this, &ThisClass::CharacterMovement_OnPhysicsRotation);
 
 	// Pass current movement settings to the movement component.
 
@@ -1109,7 +1109,7 @@ void AAlsCharacter::FaceRotation(const FRotator NewRotation, const float DeltaTi
 	// Left empty intentionally.
 }
 
-void AAlsCharacter::PhysicsRotation(const float DeltaTime)
+void AAlsCharacter::CharacterMovement_OnPhysicsRotation(const float DeltaTime)
 {
 	RefreshRollingPhysics(DeltaTime);
 }
@@ -1424,7 +1424,7 @@ void AAlsCharacter::LockRotation(const float TargetYawAngle)
 {
 	if (LocomotionState.bRotationLocked)
 	{
-		UE_LOG(LogAls, Warning, TEXT("%s: Trying to lock a rotation when it is already locked!"), ANSI_TO_TCHAR(__FUNCTION__));
+		UE_LOG(LogAls, Warning, __FUNCTION__ TEXT(": Trying to lock a rotation when it is already locked!"));
 		return;
 	}
 
@@ -1435,7 +1435,7 @@ void AAlsCharacter::UnLockRotation()
 {
 	if (!LocomotionState.bRotationLocked)
 	{
-		UE_LOG(LogAls, Log, TEXT("%s: Trying to unlock a rotation when it is already unlocked!"), ANSI_TO_TCHAR(__FUNCTION__));
+		UE_LOG(LogAls, Log, __FUNCTION__ TEXT(": Trying to unlock a rotation when it is already unlocked!"));
 		return;
 	}
 

diff --git a/Source/ALS/Private/AlsCharacter_Actions.cpp b/Source/ALS/Private/AlsCharacter_Actions.cpp
@@ -2,14 +2,9 @@
 
 #include "AlsAnimationInstance.h"
 #include "AlsCharacterMovementComponent.h"
-#include "DrawDebugHelpers.h"
-#include "Animation/AnimInstance.h"
 #include "Components/CapsuleComponent.h"
 #include "Curves/CurveVector.h"
-#include "Engine/CollisionProfile.h"
-#include "GameFramework/CharacterMovementComponent.h"
-#include "GameFramework/GameStateBase.h"
-#include "Net/Core/PushModel/PushModel.h"
+#include "Engine/NetConnection.h"
 #include "RootMotionSources/AlsRootMotionSource_Mantling.h"
 #include "Settings/AlsCharacterSettings.h"
 #include "Utility/AlsConstants.h"
@@ -211,7 +206,7 @@ bool AAlsCharacter::TryStartMantling(const FAlsMantlingTraceSettings& TraceSetti
 
 	// Trace forward to find an object the character cannot walk on.
 
-	static const FName ForwardTraceTag{FString::Format(TEXT("{0} (Forward Trace)"), {ANSI_TO_TCHAR(__FUNCTION__)})};
+	static const FName ForwardTraceTag{__FUNCTION__ TEXT(" (Forward Trace)")};
 
 	auto ForwardTraceStart{CapsuleBottomLocation - ForwardTraceDirection * CapsuleRadius};
 	ForwardTraceStart.Z += (TraceSettings.LedgeHeight.X + TraceSettings.LedgeHeight.Y) *
@@ -248,7 +243,7 @@ bool AAlsCharacter::TryStartMantling(const FAlsMantlingTraceSettings& TraceSetti
 
 	// Trace downward from the first trace's impact point and determine if the hit location is walkable.
 
-	static const FName DownwardTraceTag{FString::Format(TEXT("{0} (Downward Trace)"), {ANSI_TO_TCHAR(__FUNCTION__)})};
+	static const FName DownwardTraceTag{__FUNCTION__ TEXT(" (Downward Trace)")};
 
 	const auto TargetLocationOffset{
 		FVector2D{ForwardTraceHit.ImpactNormal.GetSafeNormal2D()} * (TraceSettings.TargetLocationOffset * CapsuleScale)
@@ -293,7 +288,7 @@ bool AAlsCharacter::TryStartMantling(const FAlsMantlingTraceSettings& TraceSetti
 	// Check if the capsule has room to stand at the downward trace's location. If so,
 	// set that location as the target transform and calculate the mantling height.
 
-	static const FName FreeSpaceTraceTag{FString::Format(TEXT("{0} (Free Space Overlap)"), {ANSI_TO_TCHAR(__FUNCTION__)})};
+	static const FName FreeSpaceTraceTag{__FUNCTION__ TEXT(" (Free Space Overlap)")};
 
 	const FVector TargetLocation{
 		DownwardTraceHit.ImpactPoint.X,
@@ -460,7 +455,7 @@ void AAlsCharacter::StartMantlingImplementation(const FAlsMantlingParameters& Pa
 	// Apply mantling root motion.
 
 	const auto Mantling{MakeShared<FAlsRootMotionSource_Mantling>()};
-	Mantling->InstanceName = ANSI_TO_TCHAR(__FUNCTION__);
+	Mantling->InstanceName = __FUNCTION__;
 	Mantling->Duration = Duration / PlayRate;
 	Mantling->MantlingSettings = MantlingSettings;
 	Mantling->TargetPrimitive = bUseRelativeLocation ? Parameters.TargetPrimitive : nullptr;
@@ -741,7 +736,7 @@ void AAlsCharacter::RefreshRagdollingActorTransform(const float DeltaTime)
 		                                        RagdollTargetLocation.X,
 		                                        RagdollTargetLocation.Y,
 		                                        RagdollTargetLocation.Z - GetCapsuleComponent()->GetScaledCapsuleHalfHeight()
-	                                        }, ObjectQueryParameters, {ANSI_TO_TCHAR(__FUNCTION__), false, this});
+	                                        }, ObjectQueryParameters, {__FUNCTION__, false, this});
 
 	auto NewActorLocation{RagdollTargetLocation};
 
@@ -882,7 +877,7 @@ void AAlsCharacter::FinalizeRagdolling()
 	if (!IsNetMode(NM_Client))
 	{
 		GetMesh()->bOnlyAllowAutonomousTickPose = GetRemoteRole() == ROLE_AutonomousProxy &&
-		                                          GetNetConnection() != nullptr && IsPawnControlled();
+		                                          IsValid(GetNetConnection()) && IsPawnControlled();
 	}
 }
 

diff --git a/Source/ALS/Private/AlsCharacter_Debug.cpp b/Source/ALS/Private/AlsCharacter_Debug.cpp
@@ -12,7 +12,7 @@
 
 #define LOCTEXT_NAMESPACE "AlsCharacterDebug"
 
-void AAlsCharacter::DisplayDebug(UCanvas* Canvas, const FDebugDisplayInfo& DebugDisplay, float& Unused, float& VerticalLocation)
+void AAlsCharacter::DisplayDebug(UCanvas* Canvas, const FDebugDisplayInfo& DisplayInfo, float& Unused, float& VerticalLocation)
 {
 	const auto Scale{FMath::Min(Canvas->SizeX / (1280.0f * Canvas->GetDPIScale()), Canvas->SizeY / (720.0f * Canvas->GetDPIScale()))};
 
@@ -29,21 +29,21 @@ void AAlsCharacter::DisplayDebug(UCanvas* Canvas, const FDebugDisplayInfo& Debug
 	VerticalLocation += RowOffset;
 	MaxVerticalLocation = FMath::Max(MaxVerticalLocation, VerticalLocation);
 
-	if (!DebugDisplay.IsDisplayOn(UAlsConstants::CurvesDisplayName()) && !DebugDisplay.IsDisplayOn(UAlsConstants::StateDisplayName()) &&
-	    !DebugDisplay.IsDisplayOn(UAlsConstants::ShapesDisplayName()) && !DebugDisplay.IsDisplayOn(UAlsConstants::TracesDisplayName()) &&
-	    !DebugDisplay.IsDisplayOn(UAlsConstants::MantlingDisplayName()))
+	if (!DisplayInfo.IsDisplayOn(UAlsConstants::CurvesDisplayName()) && !DisplayInfo.IsDisplayOn(UAlsConstants::StateDisplayName()) &&
+	    !DisplayInfo.IsDisplayOn(UAlsConstants::ShapesDisplayName()) && !DisplayInfo.IsDisplayOn(UAlsConstants::TracesDisplayName()) &&
+	    !DisplayInfo.IsDisplayOn(UAlsConstants::MantlingDisplayName()))
 	{
 		VerticalLocation = MaxVerticalLocation;
 
-		Super::DisplayDebug(Canvas, DebugDisplay, Unused, VerticalLocation);
+		Super::DisplayDebug(Canvas, DisplayInfo, Unused, VerticalLocation);
 		return;
 	}
 
 	const auto InitialVerticalLocation{VerticalLocation};
 
 	static const auto CurvesHeaderText{FText::AsCultureInvariant(TEXT("Als.Curves (Shift + 1)"))};
 
-	if (DebugDisplay.IsDisplayOn(UAlsConstants::CurvesDisplayName()))
+	if (DisplayInfo.IsDisplayOn(UAlsConstants::CurvesDisplayName()))
 	{
 		DisplayDebugHeader(Canvas, CurvesHeaderText, FLinearColor::Green, Scale, HorizontalLocation, VerticalLocation);
 		DisplayDebugCurves(Canvas, Scale, HorizontalLocation, VerticalLocation);
@@ -63,7 +63,7 @@ void AAlsCharacter::DisplayDebug(UCanvas* Canvas, const FDebugDisplayInfo& Debug
 
 	static const auto StateHeaderText{FText::AsCultureInvariant(TEXT("Als.State (Shift + 2)"))};
 
-	if (DebugDisplay.IsDisplayOn(UAlsConstants::StateDisplayName()))
+	if (DisplayInfo.IsDisplayOn(UAlsConstants::StateDisplayName()))
 	{
 		DisplayDebugHeader(Canvas, StateHeaderText, FLinearColor::Green, Scale, HorizontalLocation, VerticalLocation);
 		DisplayDebugState(Canvas, Scale, HorizontalLocation, VerticalLocation);
@@ -78,7 +78,7 @@ void AAlsCharacter::DisplayDebug(UCanvas* Canvas, const FDebugDisplayInfo& Debug
 
 	static const auto ShapesHeaderText{FText::AsCultureInvariant(TEXT("Als.Shapes (Shift + 3)"))};
 
-	if (DebugDisplay.IsDisplayOn(UAlsConstants::ShapesDisplayName()))
+	if (DisplayInfo.IsDisplayOn(UAlsConstants::ShapesDisplayName()))
 	{
 		DisplayDebugHeader(Canvas, ShapesHeaderText, FLinearColor::Green, Scale, HorizontalLocation, VerticalLocation);
 		DisplayDebugShapes(Canvas, Scale, HorizontalLocation, VerticalLocation);
@@ -93,7 +93,7 @@ void AAlsCharacter::DisplayDebug(UCanvas* Canvas, const FDebugDisplayInfo& Debug
 
 	static const auto TracesHeaderText{FText::AsCultureInvariant(TEXT("Als.Traces (Shift + 4)"))};
 
-	if (DebugDisplay.IsDisplayOn(UAlsConstants::TracesDisplayName()))
+	if (DisplayInfo.IsDisplayOn(UAlsConstants::TracesDisplayName()))
 	{
 		DisplayDebugHeader(Canvas, TracesHeaderText, FLinearColor::Green, Scale, HorizontalLocation, VerticalLocation);
 		DisplayDebugTraces(Canvas, Scale, HorizontalLocation, VerticalLocation);
@@ -108,7 +108,7 @@ void AAlsCharacter::DisplayDebug(UCanvas* Canvas, const FDebugDisplayInfo& Debug
 
 	static const auto MantlingHeaderText{FText::AsCultureInvariant(TEXT("Als.Mantling (Shift + 5)"))};
 
-	if (DebugDisplay.IsDisplayOn(UAlsConstants::MantlingDisplayName()))
+	if (DisplayInfo.IsDisplayOn(UAlsConstants::MantlingDisplayName()))
 	{
 		DisplayDebugHeader(Canvas, MantlingHeaderText, FLinearColor::Green, Scale, HorizontalLocation, VerticalLocation);
 		DisplayDebugMantling(Canvas, Scale, HorizontalLocation, VerticalLocation);
@@ -123,7 +123,7 @@ void AAlsCharacter::DisplayDebug(UCanvas* Canvas, const FDebugDisplayInfo& Debug
 
 	VerticalLocation = MaxVerticalLocation;
 
-	Super::DisplayDebug(Canvas, DebugDisplay, Unused, VerticalLocation);
+	Super::DisplayDebug(Canvas, DisplayInfo, Unused, VerticalLocation);
 }
 
 void AAlsCharacter::DisplayDebugHeader(const UCanvas* Canvas, const FText& HeaderText, const FLinearColor& HeaderColor,

diff --git a/Source/ALS/Private/Nodes/AlsRigUnits.cpp b/Source/ALS/Private/Nodes/AlsRigUnits.cpp
@@ -48,7 +48,7 @@ FAlsRigUnit_CalculatePoleVector_Execute()
 	DECLARE_SCOPE_HIERARCHICAL_COUNTER_RIGUNIT()
 
 	const auto* Hierarchy{Context.Hierarchy};
-	if (Hierarchy == nullptr)
+	if (!IsValid(Hierarchy))
 	{
 		return;
 	}
@@ -102,7 +102,7 @@ FAlsRigUnit_HandIkRetargeting_Execute()
 	DECLARE_SCOPE_HIERARCHICAL_COUNTER_RIGUNIT()
 
 	auto* Hierarchy{ExecuteContext.Hierarchy};
-	if (Hierarchy == nullptr)
+	if (!IsValid(Hierarchy))
 	{
 		return;
 	}

diff --git a/Source/ALS/Private/Notifies/AlsAnimNotifyState_SetRootMotionScale.cpp b/Source/ALS/Private/Notifies/AlsAnimNotifyState_SetRootMotionScale.cpp
@@ -46,8 +46,8 @@ void UAlsAnimNotifyState_SetRootMotionScale::NotifyEnd(USkeletalMeshComponent* M
 		}
 		else
 		{
-			UE_LOG(LogAls, Warning, TEXT("%s: The current translation scale does not match the translation scale from the animation notify!"
-				       " Probably something changed it before the animation notify ended."), ANSI_TO_TCHAR(__FUNCTION__));
+			UE_LOG(LogAls, Warning, __FUNCTION__ TEXT(": The current translation scale does not match the translation scale"
+				       " from the animation notify! Probably something changed it before the animation notify ended."));
 		}
 	}
 }
diff --git a/Source/ALS/Private/Notifies/AlsAnimNotify_FootstepEffects.cpp b/Source/ALS/Private/Notifies/AlsAnimNotify_FootstepEffects.cpp
@@ -55,7 +55,7 @@ void UAlsAnimNotify_FootstepEffects::Notify(USkeletalMeshComponent* Mesh, UAnimS
 	const auto bDisplayDebug{UAlsUtility::ShouldDisplayDebug(Mesh->GetOwner(), UAlsConstants::TracesDisplayName())};
 #endif
 
-	FCollisionQueryParams QueryParameters{ANSI_TO_TCHAR(__FUNCTION__), true, Mesh->GetOwner()};
+	FCollisionQueryParams QueryParameters{__FUNCTION__, true, Mesh->GetOwner()};
 	QueryParameters.bReturnPhysicalMaterial = true;
 
 	FHitResult Hit;

diff --git a/Source/ALS/Private/Utility/AlsMath.cpp b/Source/ALS/Private/Utility/AlsMath.cpp
@@ -1,6 +1,6 @@
 #include "Utility/AlsMath.h"
 
-template <class ValueType, class StateType>
+template <typename ValueType, typename StateType>
 ValueType UAlsMath::SpringDamp(const ValueType& Current, const ValueType& Target, StateType& SpringState, const float DeltaTime,
                                const float Frequency, const float DampingRatio, const float TargetVelocityAmount)
 {

diff --git a/Source/ALS/Public/AlsCharacter.h b/Source/ALS/Public/AlsCharacter.h
@@ -24,10 +24,10 @@ class ALS_API AAlsCharacter : public ACharacter
 	UPROPERTY(VisibleDefaultsOnly, BlueprintReadOnly, Category = "Als Character")
 	TObjectPtr<UAlsCharacterMovementComponent> AlsCharacterMovement;
 
-	UPROPERTY(EditDefaultsOnly, BlueprintReadOnly, Category = "Settings|Als Character")
+	UPROPERTY(EditAnywhere, BlueprintReadOnly, Category = "Settings|Als Character")
 	TObjectPtr<UAlsCharacterSettings> Settings;
 
-	UPROPERTY(EditDefaultsOnly, BlueprintReadOnly, Category = "Settings|Als Character")
+	UPROPERTY(EditAnywhere, BlueprintReadOnly, Category = "Settings|Als Character")
 	TObjectPtr<UAlsMovementSettings> MovementSettings;
 
 	UPROPERTY(EditAnywhere, BlueprintReadOnly, Category = "Settings|Als Character|Desired State",
@@ -362,7 +362,7 @@ class ALS_API AAlsCharacter : public ACharacter
 public:
 	virtual void FaceRotation(FRotator NewRotation, float DeltaTime) override final;
 
-	void PhysicsRotation(float DeltaTime);
+	void CharacterMovement_OnPhysicsRotation(float DeltaTime);
 
 private:
 	void RefreshGroundedRotation(float DeltaTime);
@@ -541,7 +541,7 @@ class ALS_API AAlsCharacter : public ACharacter
 	// Debug
 
 public:
-	virtual void DisplayDebug(UCanvas* Canvas, const FDebugDisplayInfo& DebugDisplay, float& Unused, float& VerticalLocation) override;
+	virtual void DisplayDebug(UCanvas* Canvas, const FDebugDisplayInfo& DisplayInfo, float& Unused, float& VerticalLocation) override;
 
 private:
 	static void DisplayDebugHeader(const UCanvas* Canvas, const FText& HeaderText, const FLinearColor& HeaderColor,

diff --git a/Source/ALS/Public/Nodes/AlsAnimNode_CurvesBlend.h b/Source/ALS/Public/Nodes/AlsAnimNode_CurvesBlend.h
@@ -33,7 +33,7 @@ struct ALS_API FAlsAnimNode_CurvesBlend : public FAnimNode_Base
 	FPoseLink CurvesPose;
 
 #if WITH_EDITORONLY_DATA
-	UPROPERTY(EditAnywhere, Category = "Settings", Meta = (FoldProperty, PinShownByDefault))
+	UPROPERTY(EditAnywhere, Category = "Settings", Meta = (ClampMin = 0, ClampMax = 1, FoldProperty, PinShownByDefault))
 	float BlendAmount{1.0f};
 
 	UPROPERTY(EditAnywhere, Category = "Settings", Meta = (FoldProperty))

diff --git a/Source/ALS/Public/Nodes/AlsAnimNode_GameplayTagsBlend.h b/Source/ALS/Public/Nodes/AlsAnimNode_GameplayTagsBlend.h
@@ -9,8 +9,8 @@ struct ALS_API FAlsAnimNode_GameplayTagsBlend : public FAnimNode_BlendListBase
 {
 	GENERATED_BODY()
 
-#if WITH_EDITORONLY_DATA
 public:
+#if WITH_EDITORONLY_DATA
 	UPROPERTY(EditAnywhere, Category = "Settings", Meta = (FoldProperty, PinShownByDefault))
 	FGameplayTag ActiveTag;
 

diff --git a/Source/ALS/Public/Nodes/AlsRigUnits.h b/Source/ALS/Public/Nodes/AlsRigUnits.h
@@ -22,7 +22,7 @@ struct ALS_API FAlsRigUnit_SimulationBase : public FRigUnit
 };
 
 // Calculates the intersection location and direction of the perpendicular to AC through B.
-USTRUCT(DisplayName = "Calculate Pole Vector", Meta = (Category = "ALS|Als"))
+USTRUCT(DisplayName = "Calculate Pole Vector", Meta = (Category = "ALS"))
 struct ALS_API FAlsRigUnit_CalculatePoleVector : public FAlsRigUnit_MathBase
 {
 	GENERATED_BODY()
@@ -73,7 +73,7 @@ struct ALS_API FAlsRigUnit_CalculatePoleVector : public FAlsRigUnit_MathBase
 	virtual void Execute(const FRigUnitContext& Context) override;
 };
 
-USTRUCT(DisplayName = "Exponential Decay (Vector)", Meta = (Category = "ALS|Als"))
+USTRUCT(DisplayName = "Exponential Decay (Vector)", Meta = (Category = "ALS"))
 struct ALS_API FAlsRigUnit_ExponentialDecayVector : public FAlsRigUnit_SimulationBase
 {
 	GENERATED_BODY()
@@ -94,7 +94,7 @@ struct ALS_API FAlsRigUnit_ExponentialDecayVector : public FAlsRigUnit_Simulatio
 	virtual void Execute(const FRigUnitContext& Context) override;
 };
 
-USTRUCT(DisplayName = "Hand Ik Retargeting", Meta = (Category = "ALS|Als"))
+USTRUCT(DisplayName = "Hand Ik Retargeting", Meta = (Category = "ALS"))
 struct ALS_API FAlsRigUnit_HandIkRetargeting : public FAlsRigUnit_HighLevelBase
 {
 	GENERATED_BODY()

diff --git a/Source/ALS/Public/Settings/AlsMantlingSettings.h b/Source/ALS/Public/Settings/AlsMantlingSettings.h
@@ -30,7 +30,7 @@ struct ALS_API FAlsMantlingParameters
 	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = "ALS")
 	FRotator TargetRelativeRotation{ForceInit};
 
-	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = "ALS")
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = "ALS", Meta = (ForceUnits = "cm"))
 	float MantlingHeight{0.0f};
 
 	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = "ALS")

diff --git a/Source/ALS/Public/State/AlsLocomotionAnimationState.h b/Source/ALS/Public/State/AlsLocomotionAnimationState.h
@@ -79,7 +79,7 @@ struct ALS_API FAlsLocomotionAnimationState
 	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = "ALS", Meta = (ForceUnits = "deg/s"))
 	float YawSpeed{0.0f};
 
-	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = "ALS")
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = "ALS", Meta = (ForceUnits = "x"))
 	float Scale{1.0f};
 
 	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = "ALS", Meta = (ClampMin = 0, ForceUnits = "cm"))