Add protection against NaN when calculating velocity blend amounts

Sixze · Jul 6, 2024 · aca0383 · aca0383
1 parent 3d22d20
commit aca0383
Showing 1 changed file with 8 additions and 5 deletions.
diff --git a/Source/ALS/Private/AlsAnimationInstance.cpp b/Source/ALS/Private/AlsAnimationInstance.cpp
@@ -632,12 +632,15 @@ void UAlsAnimationInstance::RefreshVelocityBlend()
 
 	auto& VelocityBlend{GroundedState.VelocityBlend};
 
-	const auto RelativeVelocityDirection{GetRelativeVelocity().GetSafeNormal()};
+	auto RelativeVelocityDirection{GetRelativeVelocity()};
+	auto TargetVelocityBlend{FVector3f::ZeroVector};
 
-	const auto TargetVelocityBlend{
-		RelativeVelocityDirection /
-		(FMath::Abs(RelativeVelocityDirection.X) + FMath::Abs(RelativeVelocityDirection.Y) + FMath::Abs(RelativeVelocityDirection.Z))
-	};
+	if (RelativeVelocityDirection.Normalize())
+	{
+		TargetVelocityBlend =
+			RelativeVelocityDirection /
+			(FMath::Abs(RelativeVelocityDirection.X) + FMath::Abs(RelativeVelocityDirection.Y) + FMath::Abs(RelativeVelocityDirection.Z));
+	}
 
 	if (VelocityBlend.bInitializationRequired)
 	{