Spring Changes

Boomslangnz · Aug 27, 2023 · 55b96f6 · 55b96f6
1 parent 363341b
commit 55b96f6
Show file tree

Hide file tree

Showing 6 changed files with 28 additions and 4 deletions.
diff --git a/AutoSetup.cmd b/AutoSetup.cmd
@@ -16,6 +16,8 @@ xcopy ".\Release.x64\dinput8.dll" ".\Release.Win32\PokkenTournament" /Y
 xcopy ".\Release.x64\SDL2.dll" ".\Release.Win32\PokkenTournament" /Y
 xcopy ".\Release.x64\dinput8.dll" ".\Release.Win32\Supermodel 64bit Outputs" /Y
 xcopy ".\Release.x64\SDL2.dll" ".\Release.Win32\Supermodel 64bit Outputs" /Y
+xcopy ".\Release.x64\dinput8.dll" ".\Release.Win32\Spring Effect 64bit" /Y
+xcopy ".\Release.x64\SDL2.dll" ".\Release.Win32\Spring Effect 64bit" /Y
 xcopy ".\Release.x64\dinput8.dll" ".\Release.Win32\Flycast" /Y
 xcopy ".\Release.x64\SDL2.dll" ".\Release.Win32\Flycast" /Y
 xcopy ".\Release.x64\dinput8.dll" ".\Release.Win32\WMMT5" /Y

diff --git a/Config/FFBPlugin.ini b/Config/FFBPlugin.ini
@@ -121,11 +121,20 @@ EnableDamper=0
 DamperStrength=100
 FFBOrRumble=0
 
-[Spring Effect]
+[Spring Effect 32bit]
 GameId=74
 FeedbackLength=500
 EnableDamper=0
 DamperStrength=100
+SpringEnable=1
+SpringStrength=100
+
+[Spring Effect 64bit]
+GameId=74
+FeedbackLength=500
+EnableDamper=0
+DamperStrength=100
+SpringEnable=1
 SpringStrength=100
 
 [GRID Real]

diff --git a/DInput8Wrapper.aps b/DInput8Wrapper.aps
diff --git a/DInput8Wrapper.rc b/DInput8Wrapper.rc
diff --git a/DllMain.cpp b/DllMain.cpp
@@ -1811,8 +1811,21 @@ void TriggerSpringEffectInfinite(double strength)
 	tempEffect.condition.direction.dir[0] = 1;
 	tempEffect.constant.direction.dir[1] = 1; //Y Position
 
-	SHORT minForce = (SHORT)(strength > 0.001 ? (configMinForce / 100.0 * 32767.0) : 0); // strength is a double so we do an epsilon check of 0.001 instead of > 0.
-	SHORT maxForce = (SHORT)(configMaxForce / 100.0 * 32767.0);
+	SHORT minForce;
+	SHORT maxForce;
+
+	if (EnableForceSpringEffect)
+	{
+		minForce = (SHORT)(0); // strength is a double so we do an epsilon check of 0.001 instead of > 0.
+		maxForce = (SHORT)(ForceSpringStrength / 100.0 * 32767.0);
+
+	}
+	else
+	{
+		minForce = (SHORT)(strength > 0.001 ? (configMinForce / 100.0 * 32767.0) : 0); // strength is a double so we do an epsilon check of 0.001 instead of > 0.
+		maxForce = (SHORT)(configMaxForce / 100.0 * 32767.0);
+	}
+
 	SHORT range = maxForce - minForce;
 	SHORT coeff = (SHORT)(strength * range + minForce);
 

diff --git a/Version.txt b/Version.txt
@@ -1 +1 @@
-v2.0.0.32
+v2.0.0.33