Merge branch '5.4-Preview' of https://github.com/mordentral/VRExpansi…

…onPlugin into 5.4-Preview
JasonShaojiesun · Apr 12, 2024 · 62632bb · 62632bb
2 parents aba26a2 + 7bda72c
commit 62632bb
Show file tree

Hide file tree

Showing 4 changed files with 60 additions and 31 deletions.
diff --git a/OpenXRExpansionPlugin/OpenXRExpansionPlugin.uplugin b/OpenXRExpansionPlugin/OpenXRExpansionPlugin.uplugin
@@ -1,7 +1,7 @@
 {
 	"FileVersion": 3,
-	"Version": 5.3,
-	"VersionName": "5.3",
+	"Version": 5.4,
+	"VersionName": "5.4",
 	"FriendlyName": "OpenXRExpansionPlugin",
 	"Description": "An set of utility functions for OpenXR",
 	"Category": "Virtual Reality",

diff --git a/VRExpansionPlugin/Source/VRExpansionPlugin/Private/VRBPDatatypes.cpp b/VRExpansionPlugin/Source/VRExpansionPlugin/Private/VRBPDatatypes.cpp
@@ -3,6 +3,7 @@
 #include "VRBPDatatypes.h"
 #include UE_INLINE_GENERATED_CPP_BY_NAME(VRBPDatatypes)
 
+#include "VRGlobalSettings.h"
 #include "HAL/IConsoleManager.h"
 #include "Chaos/ChaosEngineInterface.h"
 
@@ -219,3 +220,53 @@ FTransform FBPEuroLowPassFilterTrans::RunFilterSmoothing(const FTransform& InRaw
 	// Filter passed value 
 	return NewTrans;
 }
+
+bool FBPAdvancedPhysicsHandleSettings::FillTo(FBPActorPhysicsHandleInformation* HandleInfo, bool bModifyWithScalers) const
+{
+	if (!HandleInfo)
+		return false;
+
+	float DampingMod = 0.0f;
+	float StiffnessMod = 0.0f;
+	float ADampingMod = 0.0f;
+	float AStiffnessMod = 0.0f;
+	const UVRGlobalSettings& VRSettings = *GetDefault<UVRGlobalSettings>();
+
+	if (VRSettings.bUseChaosTranslationScalers)
+	{
+		StiffnessMod = VRSettings.LinearDriveStiffnessScale;
+		DampingMod = VRSettings.LinearDriveDampingScale;
+		AStiffnessMod = VRSettings.AngularDriveStiffnessScale;
+		ADampingMod = VRSettings.AngularDriveDampingScale;
+	}
+	else
+	{
+		auto CVarLinearDriveStiffnessScale = IConsoleManager::Get().FindConsoleVariable(TEXT("p.Chaos.JointConstraint.LinearDriveStiffnessScale"));
+		auto CVarLinearDriveDampingScale = IConsoleManager::Get().FindConsoleVariable(TEXT("p.Chaos.JointConstraint.LinaearDriveDampingScale"));
+		auto CVarAngularDriveStiffnessScale = IConsoleManager::Get().FindConsoleVariable(TEXT("p.Chaos.JointConstraint.AngularDriveStiffnessScale"));
+		auto CVarAngularDriveDampingScale = IConsoleManager::Get().FindConsoleVariable(TEXT("p.Chaos.JointConstraint.AngularDriveDampingScale"));
+
+		StiffnessMod = CVarLinearDriveStiffnessScale->GetFloat();
+		DampingMod = CVarLinearDriveDampingScale->GetFloat();
+		AStiffnessMod = CVarAngularDriveStiffnessScale->GetFloat();
+		ADampingMod = CVarAngularDriveDampingScale->GetFloat();
+	}
+
+	XAxisSettings.FillTo(HandleInfo->LinConstraint.XDrive, DampingMod, StiffnessMod);
+	YAxisSettings.FillTo(HandleInfo->LinConstraint.YDrive, DampingMod, StiffnessMod);
+	ZAxisSettings.FillTo(HandleInfo->LinConstraint.ZDrive, DampingMod, StiffnessMod);
+
+	if ((SlerpSettings.bEnablePositionDrive || SlerpSettings.bEnableVelocityDrive))
+	{
+		HandleInfo->AngConstraint.AngularDriveMode = EAngularDriveMode::SLERP;
+		SlerpSettings.FillTo(HandleInfo->AngConstraint.SlerpDrive, ADampingMod, AStiffnessMod);
+	}
+	else
+	{
+		HandleInfo->AngConstraint.AngularDriveMode = EAngularDriveMode::TwistAndSwing;
+		TwistSettings.FillTo(HandleInfo->AngConstraint.TwistDrive, ADampingMod, AStiffnessMod);
+		SwingSettings.FillTo(HandleInfo->AngConstraint.SwingDrive, ADampingMod, AStiffnessMod);
+	}
+
+	return true;
+}
diff --git a/VRExpansionPlugin/Source/VRExpansionPlugin/Public/VRBPDatatypes.h b/VRExpansionPlugin/Source/VRExpansionPlugin/Public/VRBPDatatypes.h
@@ -1868,11 +1868,11 @@ struct VREXPANSIONPLUGIN_API FBPAdvancedPhysicsHandleAxisSettings
 		bEnableVelocityDrive = ConstraintDrive.bEnableVelocityDrive;
 	}
 
-	void FillTo(FConstraintDrive& ConstraintDrive) const
+	void FillTo(FConstraintDrive& ConstraintDrive, float DampingScaler = 1.0f, float StiffnessScaler = 1.0f) const
 	{
-		ConstraintDrive.Damping = Damping;
-		ConstraintDrive.Stiffness = Stiffness;
-		ConstraintDrive.MaxForce = MaxForceCoefficient * Stiffness;
+		ConstraintDrive.Damping = Damping * DampingScaler;
+		ConstraintDrive.Stiffness = Stiffness * StiffnessScaler;
+		ConstraintDrive.MaxForce = (float)FMath::Clamp<double>((double)ConstraintDrive.Stiffness * (double)MaxForceCoefficient, 0, (double)MAX_FLT);
 		ConstraintDrive.bEnablePositionDrive = bEnablePositionDrive;
 		ConstraintDrive.bEnableVelocityDrive = bEnableVelocityDrive;
 	}
@@ -1929,27 +1929,5 @@ struct VREXPANSIONPLUGIN_API FBPAdvancedPhysicsHandleSettings
 		return true;
 	}
 
-	bool FillTo(FBPActorPhysicsHandleInformation* HandleInfo) const
-	{
-		if (!HandleInfo)
-			return false;
-
-		XAxisSettings.FillTo(HandleInfo->LinConstraint.XDrive);
-		YAxisSettings.FillTo(HandleInfo->LinConstraint.YDrive);
-		ZAxisSettings.FillTo(HandleInfo->LinConstraint.ZDrive);
-
-		if ((SlerpSettings.bEnablePositionDrive || SlerpSettings.bEnableVelocityDrive))
-		{
-			HandleInfo->AngConstraint.AngularDriveMode = EAngularDriveMode::SLERP;
-			SlerpSettings.FillTo(HandleInfo->AngConstraint.SlerpDrive);
-		}
-		else
-		{
-			HandleInfo->AngConstraint.AngularDriveMode = EAngularDriveMode::TwistAndSwing;
-			TwistSettings.FillTo(HandleInfo->AngConstraint.TwistDrive);
-			SwingSettings.FillTo(HandleInfo->AngConstraint.SwingDrive);
-		}
-
-		return true;
-	}
+	bool FillTo(FBPActorPhysicsHandleInformation* HandleInfo, bool bModifyWithScalers = true) const;
 };
diff --git a/VRExpansionPlugin/VRExpansionPlugin.uplugin b/VRExpansionPlugin/VRExpansionPlugin.uplugin
@@ -1,7 +1,7 @@
 {
   "FileVersion": 3,
-  "Version": 5.3,
-  "VersionName": "5.3",
+  "Version": 5.4,
+  "VersionName": "5.4",
   "FriendlyName": "VRExpansionPlugin",
   "Description": "Adds several new VR features & components to UE4",
   "Category": "VRExpansion",