Merge pull request #70 from dyanikoglu/dev

Release v4.8

ALSV4_CPP.uplugin

@@ -1,7 +1,7 @@
 {
 	"FileVersion": 3,
 	"Version": 1,
-	"VersionName": "4.7",
+	"VersionName": "4.8",
 	"FriendlyName": "Advanced Locomotion System V4 on C++",
 	"Description": "Performance optimized C++ port of LongmireLocomotion's Advanced Locomotion System V4",
 	"Category": "Animation",

Source/ALSV4_CPP/Private/Character/AI/ALS_BTTask_GetRandomLocation.cpp

@@ -25,7 +25,7 @@ EBTNodeResult::Type UALS_BTTask_GetRandomLocation::ExecuteTask(UBehaviorTreeComp
 
 	if (NavSys && Pawn)
 	{
-		FSharedConstNavQueryFilter SharedFilter = 0;
+		FSharedConstNavQueryFilter SharedFilter = nullptr;
 
 		if (Filter)
 		{

Source/ALSV4_CPP/Private/Character/ALSBaseCharacter.cpp

@@ -21,10 +21,11 @@
 #include "Kismet/KismetMathLibrary.h"
 #include "Kismet/GameplayStatics.h"
 #include "TimerManager.h"
+#include "Logging/TokenizedMessage.h"
 #include "Net/UnrealNetwork.h"
 
 AALSBaseCharacter::AALSBaseCharacter(const FObjectInitializer& ObjectInitializer)
-	: Super(ObjectInitializer.SetDefaultSubobjectClass<UALSCharacterMovementComponent>(ACharacter::CharacterMovementComponentName))
+	: Super(ObjectInitializer.SetDefaultSubobjectClass<UALSCharacterMovementComponent>(CharacterMovementComponentName))
 {
 	PrimaryActorTick.bCanEverTick = true;
 	MantleTimeline = CreateDefaultSubobject<UTimelineComponent>(FName(TEXT("MantleTimeline")));
@@ -112,7 +113,7 @@ void AALSBaseCharacter::BeginPlay()
 	TimelineFinished.BindUFunction(this, FName(TEXT("MantleEnd")));
 	MantleTimeline->SetTimelineFinishedFunc(TimelineFinished);
 	MantleTimeline->SetLooping(false);
-	MantleTimeline->SetTimelineLengthMode(ETimelineLengthMode::TL_TimelineLength);
+	MantleTimeline->SetTimelineLengthMode(TL_TimelineLength);
 	MantleTimeline->AddInterpFloat(MantleTimelineCurve, TimelineUpdated);
 
 	// Make sure the mesh and animbp update after the CharacterBP to ensure it gets the most recent values.
@@ -227,7 +228,7 @@ void AALSBaseCharacter::RagdollStart()
 	ServerRagdollPull = 0;
 
 	// Step 1: Clear the Character Movement Mode and set the Movement State to Ragdoll
-	GetCharacterMovement()->SetMovementMode(EMovementMode::MOVE_None);
+	GetCharacterMovement()->SetMovementMode(MOVE_None);
 	SetMovementState(EALSMovementState::Ragdoll);
 
 	// Step 2: Disable capsule collision and enable mesh physics simulation starting from the pelvis.
@@ -1011,9 +1012,9 @@ void AALSBaseCharacter::UpdateDynamicMovementSettings(EALSGait AllowedGait)
 		{
 			MyCharacterMovementComponent->SetMaxWalkingSpeed(NewMaxSpeed);
 		}
-		if	(GetCharacterMovement()->MaxAcceleration != CurveVec.X
-		  || GetCharacterMovement()->BrakingDecelerationWalking != CurveVec.Y
-		  || GetCharacterMovement()->GroundFriction != CurveVec.Z)
+		if (GetCharacterMovement()->MaxAcceleration != CurveVec.X
+			|| GetCharacterMovement()->BrakingDecelerationWalking != CurveVec.Y
+			|| GetCharacterMovement()->GroundFriction != CurveVec.Z)
 		{
 			MyCharacterMovementComponent->SetMovementSettings(CurveVec);
 		}
@@ -1082,7 +1083,8 @@ void AALSBaseCharacter::UpdateGroundedRotation(float DeltaTime)
 			{
 				if (GetLocalRole() == ROLE_AutonomousProxy)
 				{
-					TargetRotation.Yaw = UKismetMathLibrary::NormalizeAxis(TargetRotation.Yaw + (RotAmountCurve * (DeltaTime / (1.0f / 30.0f))));
+					TargetRotation.Yaw = UKismetMathLibrary::NormalizeAxis(
+						TargetRotation.Yaw + (RotAmountCurve * (DeltaTime / (1.0f / 30.0f))));
 					SetActorRotation(TargetRotation);
 				}
 				else

Source/ALSV4_CPP/Private/Character/ALSCharacter.cpp

@@ -81,8 +81,6 @@ ECollisionChannel AALSCharacter::GetThirdPersonTraceParams(FVector& TraceOrigin,
 {
 	FName CameraSocketName = bRightShoulder ? TEXT("TP_CameraTrace_R") : TEXT("TP_CameraTrace_L");
 	TraceOrigin = GetMesh()->GetSocketLocation(CameraSocketName);
-	float Pelvis_Z_Offset = GetMesh()->GetSocketTransform(TEXT("pelvis")).GetLocation().Z - 96;
-	TraceOrigin.Z += Pelvis_Z_Offset;
 	TraceRadius = 15.0f;
 	return ECC_Camera;
 }

Source/ALSV4_CPP/Private/Character/ALSCharacterMovementComponent.cpp

@@ -32,8 +32,8 @@ void UALSCharacterMovementComponent::OnMovementUpdated(float DeltaTime, const FV
 
 		// Ensures server Movement Settings values updates to latest
 		bRequestMovementSettingsChange = MaxAcceleration != RealMaxAcceleration
-									  || BrakingDecelerationWalking != RealBraking
-									  || GroundFriction != RealGroundFriction;
+			|| BrakingDecelerationWalking != RealBraking
+			|| GroundFriction != RealGroundFriction;
 	}
 }
 
@@ -118,16 +118,15 @@ UALSCharacterMovementComponent::FNetworkPredictionData_Client_My::FNetworkPredic
 
 FSavedMovePtr UALSCharacterMovementComponent::FNetworkPredictionData_Client_My::AllocateNewMove()
 {
-	return FSavedMovePtr(new FSavedMove_My());
+	return MakeShared<FSavedMove_My>();
 }
 
 // Set Movement Settings RPC to transfer the current Movement Settings from the Owning Client to the Server
 bool UALSCharacterMovementComponent::Server_SetMaxWalkingSpeed_Validate(const float NewMaxWalkSpeed)
 {
 	if (NewMaxWalkSpeed < 0.f || NewMaxWalkSpeed > 2000.f)
 		return false;
-	else
-		return true;
+	return true;
 }
 
 void UALSCharacterMovementComponent::Server_SetMaxWalkingSpeed_Implementation(const float NewMaxWalkSpeed)
@@ -148,7 +147,7 @@ void UALSCharacterMovementComponent::SetMaxWalkingSpeed(float NewMaxWalkSpeed)
 // Set Max Walking Speed RPC to transfer the current Max Walking Speed from the Owning Client to the Server
 bool UALSCharacterMovementComponent::Server_SetMovementSettings_Validate(const FVector NewMovementSettings)
 {
-		return true;
+	return true;
 }
 
 void UALSCharacterMovementComponent::Server_SetMovementSettings_Implementation(const FVector NewMovementSettings)
@@ -174,4 +173,4 @@ void UALSCharacterMovementComponent::SetMovementSettings(FVector NewMovementSett
 	RealMaxAcceleration = NewMovementSettings.X;
 	RealBraking = NewMovementSettings.Y;
 	RealGroundFriction = NewMovementSettings.Z;
-}
+}

Source/ALSV4_CPP/Private/Character/ALSPlayerCameraManager.cpp

@@ -157,7 +157,7 @@ bool AALSPlayerCameraManager::CustomCameraBehavior(float DeltaTime, FVector& Loc
 	World->SweepSingleByChannel(HitResult, TraceOrigin, TargetCameraLocation, FQuat::Identity,
 	                            TraceChannel, FCollisionShape::MakeSphere(TraceRadius), Params);
 
-	if (HitResult.bBlockingHit)
+	if (HitResult.IsValidBlockingHit())
 	{
 		TargetCameraLocation += (HitResult.Location - HitResult.TraceEnd);
 	}

Source/ALSV4_CPP/Private/Character/Animation/ALSCharacterAnimInstance.cpp

@@ -317,7 +317,7 @@ void UALSCharacterAnimInstance::SetFootLocking(float DeltaSeconds, FName EnableF
 	if (CurFootLockAlpha >= 0.99f)
 	{
 		const FTransform& OwnerTransform =
-			GetOwningComponent()->GetSocketTransform(IKFootBone, ERelativeTransformSpace::RTS_Component);
+			GetOwningComponent()->GetSocketTransform(IKFootBone, RTS_Component);
 		CurFootLockLoc = OwnerTransform.GetLocation();
 		CurFootLockRot = OwnerTransform.Rotator();
 	}
@@ -421,7 +421,7 @@ void UALSCharacterAnimInstance::SetFootOffsets(float DeltaSeconds, FName EnableF
 	World->LineTraceSingleByChannel(HitResult,
 	                                IKFootFloorLoc + FVector(0.0, 0.0, Config.IK_TraceDistanceAboveFoot),
 	                                IKFootFloorLoc - FVector(0.0, 0.0, Config.IK_TraceDistanceBelowFoot),
-	                                ECollisionChannel::ECC_Visibility, Params);
+	                                ECC_Visibility, Params);
 
 	FRotator TargetRotOffset = FRotator::ZeroRotator;
 	if (Character->GetCharacterMovement()->IsWalkable(HitResult))

Source/ALSV4_CPP/Private/Character/Animation/Notify/ALSNotifyStateOverlayOverride.cpp

@@ -31,6 +31,6 @@ void UALSNotifyStateOverlayOverride::NotifyEnd(USkeletalMeshComponent* MeshComp,
 FString UALSNotifyStateOverlayOverride::GetNotifyName_Implementation() const
 {
 	FString Name(TEXT("Overlay Override State: "));
-	Name.Append(GetEnumerationToString(EALSOverlayState(OverlayOverrideState)));
+	Name.Append(GetEnumerationToString(static_cast<EALSOverlayState>(OverlayOverrideState)));
 	return Name;
 }

Source/ALSV4_CPP/Public/Character/ALSCharacterMovementComponent.h

@@ -48,7 +48,7 @@ class ALSV4_CPP_API UALSCharacterMovementComponent : public UCharacterMovementCo
 
 	virtual void UpdateFromCompressedFlags(uint8 Flags) override;
 	virtual class FNetworkPredictionData_Client* GetPredictionData_Client() const override;
-	void OnMovementUpdated(float DeltaTime, const FVector& OldLocation, const FVector& OldVelocity);
+	virtual void OnMovementUpdated(float DeltaTime, const FVector& OldLocation, const FVector& OldVelocity) override;
 
 
 	// Movement Settings Variables
@@ -68,12 +68,12 @@ class ALSV4_CPP_API UALSCharacterMovementComponent : public UCharacterMovementCo
 	void SetMaxWalkingSpeed(float NewMaxWalkSpeed);
 
 	UFUNCTION(reliable, Server, WithValidation)
-	void Server_SetMaxWalkingSpeed(const float NewMaxWalkSpeed);
+	void Server_SetMaxWalkingSpeed(float NewMaxWalkSpeed);
 
 	// Set Movement Settings (Called from the owning client)
 	UFUNCTION(BlueprintCallable, Category = "Movement Settings")
 	void SetMovementSettings(FVector NewMovementSettings);
 
 	UFUNCTION(reliable, Server, WithValidation)
-	void Server_SetMovementSettings(const FVector NewMovementSettings);
+	void Server_SetMovementSettings(FVector NewMovementSettings);
 };

Source/ALSV4_CPP/Public/Character/Animation/Notify/ALSNotifyStateMovementAction.h

@@ -22,9 +22,9 @@ class ALSV4_CPP_API UALSNotifyStateMovementAction : public UAnimNotifyState
 {
 	GENERATED_BODY()
 
-	virtual void NotifyBegin(USkeletalMeshComponent* MeshComp, UAnimSequenceBase* Animation, float TotalDuration);
+	virtual void NotifyBegin(USkeletalMeshComponent* MeshComp, UAnimSequenceBase* Animation, float TotalDuration) override;
 
-	virtual void NotifyEnd(USkeletalMeshComponent* MeshComp, UAnimSequenceBase* Animation);
+	virtual void NotifyEnd(USkeletalMeshComponent* MeshComp, UAnimSequenceBase* Animation) override;
 
 	FString GetNotifyName_Implementation() const override;
 

Source/ALSV4_CPP/Public/Character/Animation/Notify/ALSNotifyStateOverlayOverride.h

@@ -20,9 +20,9 @@ class ALSV4_CPP_API UALSNotifyStateOverlayOverride : public UAnimNotifyState
 {
 	GENERATED_BODY()
 
-	virtual void NotifyBegin(USkeletalMeshComponent* MeshComp, UAnimSequenceBase* Animation, float TotalDuration);
+	virtual void NotifyBegin(USkeletalMeshComponent* MeshComp, UAnimSequenceBase* Animation, float TotalDuration) override;
 
-	virtual void NotifyEnd(USkeletalMeshComponent* MeshComp, UAnimSequenceBase* Animation);
+	virtual void NotifyEnd(USkeletalMeshComponent* MeshComp, UAnimSequenceBase* Animation) override;
 
 	FString GetNotifyName_Implementation() const override;
 

Source/ALSV4_CPP/Public/Library/ALSAnimationStructLibrary.h

@@ -329,7 +329,7 @@ struct FALSAnimGraphFootIK
 	float FootLock_R_Alpha = 0.0f;
 
 	UPROPERTY(VisibleDefaultsOnly, BlueprintReadOnly)
-  bool UseFootLockCurve_L;
+	bool UseFootLockCurve_L;
 
 	UPROPERTY(VisibleDefaultsOnly, BlueprintReadOnly)
 	bool UseFootLockCurve_R;

Source/ALSV4_CPP/Public/Library/ALSStructEnumLibrary.h

@@ -38,14 +38,17 @@ struct FALSMovementState
 	bool Ragdoll_ = false;
 
 public:
-	FALSMovementState() {}
+	FALSMovementState()
+	{
+	}
+
 	FALSMovementState(const EALSMovementState InitialState) { *this = InitialState; }
 
-	FORCEINLINE const bool& None()     const { return None_; }
+	FORCEINLINE const bool& None() const { return None_; }
 	FORCEINLINE const bool& Grounded() const { return Grounded_; }
-	FORCEINLINE const bool& InAir()    const { return InAir_; }
+	FORCEINLINE const bool& InAir() const { return InAir_; }
 	FORCEINLINE const bool& Mantling() const { return Mantling_; }
-	FORCEINLINE const bool& Ragdoll()  const { return Ragdoll_; }
+	FORCEINLINE const bool& Ragdoll() const { return Ragdoll_; }
 
 	FORCEINLINE operator EALSMovementState() const { return State; }
 
@@ -76,10 +79,13 @@ struct FALSStance
 	bool Crouching_ = false;
 
 public:
-	FALSStance() {}
+	FALSStance()
+	{
+	}
+
 	FALSStance(const EALSStance InitialStance) { *this = InitialStance; }
 
-	FORCEINLINE const bool& Standing()     const { return Standing_; }
+	FORCEINLINE const bool& Standing() const { return Standing_; }
 	FORCEINLINE const bool& Crouching() const { return Crouching_; }
 
 	FORCEINLINE operator EALSStance() const { return Stance; }
@@ -111,7 +117,10 @@ struct FALSRotationMode
 	bool Aiming_ = false;
 
 public:
-	FALSRotationMode() {}
+	FALSRotationMode()
+	{
+	}
+
 	FALSRotationMode(const EALSRotationMode InitialRotationMode) { *this = InitialRotationMode; }
 
 	FORCEINLINE const bool& VelocityDirection() const { return VelocityDirection_; }
@@ -151,7 +160,10 @@ struct FALSMovementDirection
 	bool Backward_ = false;
 
 public:
-	FALSMovementDirection() {}
+	FALSMovementDirection()
+	{
+	}
+
 	FALSMovementDirection(const EALSMovementDirection InitialMovementDirection) { *this = InitialMovementDirection; }
 
 	FORCEINLINE const bool& Forward() const { return Forward_; }
@@ -196,7 +208,10 @@ struct FALSMovementAction
 	bool GettingUp_ = false;
 
 public:
-	FALSMovementAction() {}
+	FALSMovementAction()
+	{
+	}
+
 	FALSMovementAction(const EALSMovementAction InitialAction) { *this = InitialAction; }
 
 	FORCEINLINE const bool& None() const { return None_; }
@@ -237,7 +252,10 @@ struct FALSGait
 	bool Sprinting_ = false;
 
 public:
-	FALSGait() {}
+	FALSGait()
+	{
+	}
+
 	FALSGait(const EALSGait InitialGait) { *this = InitialGait; }
 
 	FORCEINLINE const bool& Walking() const { return Walking_; }
@@ -251,7 +269,7 @@ struct FALSGait
 		Gait = NewGait;
 		Walking_ = Gait == EALSGait::Walking;
 		Running_ = Gait == EALSGait::Running,
-		Sprinting_ = Gait == EALSGait::Sprinting;
+			Sprinting_ = Gait == EALSGait::Sprinting;
 	}
 };
 
@@ -304,7 +322,10 @@ struct FALSOverlayState
 	bool Barrel_ = false;
 
 public:
-	FALSOverlayState() {}
+	FALSOverlayState()
+	{
+	}
+
 	FALSOverlayState(const EALSOverlayState InitialState) { *this = InitialState; }
 
 	FORCEINLINE const bool& Default() const { return Default_; }
@@ -358,7 +379,10 @@ struct FALSGroundedEntryState
 	bool Roll_ = false;
 
 public:
-	FALSGroundedEntryState() {}
+	FALSGroundedEntryState()
+	{
+	}
+
 	FALSGroundedEntryState(const EALSGroundedEntryState InitialState) { *this = InitialState; }
 
 	FORCEINLINE const bool& None() const { return None_; }
@@ -373,4 +397,3 @@ struct FALSGroundedEntryState
 		Roll_ = State == EALSGroundedEntryState::Roll;
 	}
 };
-