Merge remote-tracking branch 'origin/main'

Added curves into RFoot Stop Cycle for both walk and run.
Implemented stop cycle foot based.

Source/OLSAnimation/Private/AnimInstances/OLSBaseLinkedLayerAnimInstance.cpp

@@ -180,18 +180,16 @@ UAnimSequence* UOLSBaseLinkedLayerAnimInstance::SelectPivotAnimation(const bool
                                                                      const EOLSGait gait,
                                                                      const EOLSCardinalDirection velocityDirection,
                                                                      const EOLSHipDirection hipDirection,
-                                                                     const float angle,
-                                                                     float& outPivotTime) const
+                                                                     const float angle) const
 {
 	if (isAiming)
 	{
-		outPivotTime = 0.2f;
 		return GetGaitAnimSets(isCrouching, gait).GaitAnimSet_CameraFacing.GetPivotFromHipDirection(hipDirection).
 		                                          GetMovementAnimationByCardinalDirection(velocityDirection);
 	}
 
 	return GetGaitAnimSets(isCrouching, gait).GaitAnimSet_ForwardFacing.Pivot.GetLeftOrRightByAngle(
-		angle, bIsLeftFootPlanted, bIsRightFootPlanted, outPivotTime);
+		angle, bIsLeftFootPlanted, bIsRightFootPlanted);
 }
 
 UAnimSequence* UOLSBaseLinkedLayerAnimInstance::SelectStopCycleAnimation(const bool isCrouching,
@@ -207,7 +205,7 @@ UAnimSequence* UOLSBaseLinkedLayerAnimInstance::SelectStopCycleAnimation(const b
 		       GetMovementAnimationByCardinalDirection(velocityDirection);
 	}
 
-	return GetGaitAnimSets(isCrouching, gait).GaitAnimSet_ForwardFacing.StopCycle;
+	return GetGaitAnimSets(isCrouching, gait).GaitAnimSet_ForwardFacing.StopCycle.GetLeftOrRightAnim(bIsRightFootPlanted);
 }
 
 FVector2D UOLSBaseLinkedLayerAnimInstance::SelectPlayRateByLocomotionState(

Source/OLSAnimation/Private/Data/OLSAnimationData.cpp

@@ -130,14 +130,18 @@ void FOLSMovementAnimSets_ForwardFacing_Pivot::GetLeftOrRightAnimSet(const bool
 	}
 }
 
+UAnimSequence* FOLSMovementAnimSets_ForwardFacing_StopCycle::GetLeftOrRightAnim(const bool isRightFootPlanted) const
+{
+	return (isRightFootPlanted ? StopCycle_RightFoot : StopCycle_LeftFoot);
+}
+
 class UAnimSequence* FOLSMovementAnimSets_ForwardFacing_Pivot::GetLeftOrRightByAngle(const float angle,
-	const bool isLeftFootPlanted, const bool isRightFootPlanted, float& outPivotTime) const
+                                                                                     const bool isLeftFootPlanted,
+                                                                                     const bool isRightFootPlanted) const
 {
 	FOLSMovementAnimSet_ForwardFacing_Pivot animSet;
 	GetLeftOrRightAnimSet(isLeftFootPlanted, isRightFootPlanted, animSet);
 
-	outPivotTime = PivotTime;
-
 	return (angle > 0.f) ? animSet.Pivot180R : animSet.Pivot180L;
 }
 

Source/OLSAnimation/Public/AnimInstances/OLSBaseLinkedLayerAnimInstance.h

@@ -82,8 +82,7 @@ protected:
 											  const EOLSGait gait,
 											  const EOLSCardinalDirection velocityDirection,
 											  const EOLSHipDirection hipDirection,
-											  const float angle,
-											  float& outPivotTime) const;
+											  const float angle) const;
 
 	UFUNCTION(BlueprintCallable, meta = (BlueprintThreadSafe), Category = "ThreadSafe|Selectors")
 	class UAnimSequence* SelectStopCycleAnimation(const bool isCrouching,
@@ -225,9 +224,6 @@ protected:
 	
 	UPROPERTY(BlueprintReadWrite, Category = "ThreadSafe|Pivots")
 	float TimeAtPivotStop = 0.f;
-	
-	UPROPERTY(BlueprintReadWrite, Category = "ThreadSafe|Pivots")
-	float PivotTime = 0.f;
 
 protected:
 

Source/OLSAnimation/Public/Data/OLSAnimationData.h

@@ -209,8 +209,7 @@ public:
 	
 	class UAnimSequence* GetLeftOrRightByAngle(const float angle,
 	                                           const bool isLeftFootPlanted,
-	                                           const bool isRightFootPlanted,
-	                                           float& outPivotTime) const;
+	                                           const bool isRightFootPlanted) const;
 	
 public:
 	
@@ -219,9 +218,24 @@ public:
 
 	UPROPERTY(EditAnywhere, BlueprintReadOnly, Category = "Movement Pivot Anim Set")
 	FOLSMovementAnimSet_ForwardFacing_Pivot Pivot_RightFoot;
+};
+
+USTRUCT(BlueprintType)
+struct FOLSMovementAnimSets_ForwardFacing_StopCycle
+{
+	GENERATED_BODY()
+
+public:
+	
+	class UAnimSequence* GetLeftOrRightAnim(const bool isRightFootPlanted) const;
+	
+public:
 	
 	UPROPERTY(EditAnywhere, BlueprintReadOnly, Category = "Movement Pivot Anim Set")
-	float PivotTime = 0.0f;
+	TObjectPtr<class UAnimSequence> StopCycle_LeftFoot;
+
+	UPROPERTY(EditAnywhere, BlueprintReadOnly, Category = "Movement Pivot Anim Set")
+	TObjectPtr<class UAnimSequence> StopCycle_RightFoot;
 };
 
 USTRUCT(BlueprintType)
@@ -272,7 +286,7 @@ public:
 	FOLSMovementAnimSets_ForwardFacing_Pivot Pivot;
 	
 	UPROPERTY(EditAnywhere, BlueprintReadOnly, Category = "Gait Anim Set")
-	TObjectPtr<class UAnimSequence> StopCycle = nullptr;
+	FOLSMovementAnimSets_ForwardFacing_StopCycle StopCycle;
 };
 
 USTRUCT(BlueprintType)