Merge pull request #53 from VarLog/feature/turn-rate

Add TurnRateModAngularSpeed modificator for Steering and MaxSpeed curves
PushkinStudio · Jun 9, 2017 · 31fd8f1 · 31fd8f1
2 parents c6de4c5 + ec95e88
commit 31fd8f1
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/Source/PsRealVehiclePlugin/Classes/PrvVehicleMovementComponent.h b/Source/PsRealVehiclePlugin/Classes/PrvVehicleMovementComponent.h
@@ -683,6 +683,10 @@ class PSREALVEHICLEPLUGIN_API UPrvVehicleMovementComponent : public UPawnMovemen
 	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = SteeringSetup, meta = (editcondition = "bAngularVelocitySteering", ClampMin = "0.0", UIMin = "0.0"))
 	float AutoBrakeSteeringThreshold;
 
+	/** Steering rotation angular speed modificator for SteeringCurve and MaxSpeedCurve */
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = SteeringSetup, meta = (editcondition = "bAngularVelocitySteering", ClampMin = "0.0", UIMin = "0.0"))
+	float TurnRateModAngularSpeed;
+
 
 	/////////////////////////////////////////////////////////////////////////
 	// Brake system

diff --git a/Source/PsRealVehiclePlugin/Private/PrvVehicleMovementComponent.cpp b/Source/PsRealVehiclePlugin/Private/PrvVehicleMovementComponent.cpp
@@ -66,6 +66,7 @@ UPrvVehicleMovementComponent::UPrvVehicleMovementComponent(const FObjectInitiali
 	AngularSteeringFrictionThreshold = 0.5f;
 	AutoBrakeSteeringThreshold = 5000.f;
 	bAutoBrakeSteering = false;
+	TurnRateModAngularSpeed = 0.f;
 
 	bUseSteeringCurve = false;
 	FRichCurve* SteeringCurveData = SteeringCurve.GetRichCurve();
@@ -587,8 +588,8 @@ void UPrvVehicleMovementComponent::UpdateSteering(float DeltaTime)
 	if (bUseSteeringCurve)
 	{
 		FRichCurve* SteeringCurveData = SteeringCurve.GetRichCurve();
-		const float SteeringCurveZeroPoint = FMath::Min(SteeringCurveData->Eval(0.f), SteeringAngularSpeed);
-		const float SteeringCurvePoint = FMath::Min(SteeringCurveData->Eval(CurrentSpeed), SteeringAngularSpeed);
+		const float SteeringCurveZeroPoint = FMath::Min(SteeringCurveData->Eval(0.f) + TurnRateModAngularSpeed, SteeringAngularSpeed);
+		const float SteeringCurvePoint = FMath::Min(SteeringCurveData->Eval(CurrentSpeed) + TurnRateModAngularSpeed, SteeringAngularSpeed);
 
 		if (bMaximizeZeroThrottleSteering && FMath::IsNearlyZero(RawThrottleInput))
 		{
@@ -949,7 +950,7 @@ void UPrvVehicleMovementComponent::UpdateBrake(float DeltaTime)
 		const float CurrentSpeed = UpdatedMesh->GetComponentVelocity().Size();
 
 		FRichCurve* MaxSpeedCurveData = MaxSpeedCurve.GetRichCurve();
-		const float MaxSpeedLimit = MaxSpeedCurveData->Eval(FMath::Abs(TargetSteeringAngularSpeed));
+		const float MaxSpeedLimit = MaxSpeedCurveData->Eval(FMath::Abs(TargetSteeringAngularSpeed) - TurnRateModAngularSpeed);
 
 		if (CurrentSpeed >= MaxSpeedLimit)
 		{
@@ -1060,7 +1061,7 @@ void UPrvVehicleMovementComponent::UpdateEngine()
 	if (bLimitMaxSpeed)
 	{
 		FRichCurve* MaxSpeedCurveData = MaxSpeedCurve.GetRichCurve();
-		const float MaxSpeedLimit = MaxSpeedCurveData->Eval(FMath::Abs(TargetSteeringAngularSpeed));
+		const float MaxSpeedLimit = MaxSpeedCurveData->Eval(FMath::Abs(TargetSteeringAngularSpeed) - TurnRateModAngularSpeed);
 
 		bLimitTorqueBySpeed = (CurrentSpeed >= MaxSpeedLimit);
 	}