1.2

-added acceleration option for all values
R1PeR · Jul 20, 2017 · f371d61 · f371d61
1 parent c039837
commit f371d61
Show file tree

Hide file tree

Showing 2 changed files with 66 additions and 53 deletions.
diff --git a/MouseToVJoy/MouseToVJoy.cpp b/MouseToVJoy/MouseToVJoy.cpp
@@ -15,6 +15,7 @@
 #include <string>
 #include <sstream>
 #include <cstdlib>
+#include <iomanip>
 #define DEV_ID 1
 DOUBLE VerApp = 1.1;
 
@@ -38,7 +39,7 @@ UINT	IoCode = LOAD_POSITIONS;
 UINT	IoSize = sizeof(JOYSTICK_POSITION);
 // HID_DEVICE_ATTRIBUTES attrib;
 UINT iInterface = 1;
-DOUBLE Sensitivity, AttackTimeThrottle, ReleaseTimeThrottle, AttackTimeBreak, ReleaseTimeBreak, AttackTimeClutch, ReleaseTimeClutch, ThrottleKey, BreakKey, ClutchKey, MouseLockKey, UseMouse;
+DOUBLE Sensitivity, AttackTimeThrottle, ReleaseTimeThrottle, AttackTimeBreak, ReleaseTimeBreak, AttackTimeClutch, ReleaseTimeClutch, ThrottleKey, BreakKey, ClutchKey, MouseLockKey, UseMouse, AccelerationThrottle, AccelerationBreak, AccelerationClutch;
 
 //Vjoy
 // Step 4: the Window Procedure
@@ -264,55 +265,53 @@ void vJoyInput::FeedDevice() {
 	}
 
 void vJoyInput::AccelerationLogic() {
-	if (UseMouse == 1) {
-		if (rInput.IsLeftMouseButtonDown() && Y < 32767) {
-			Y += AttackTimeThrottle;
-		}
-		if (!rInput.IsLeftMouseButtonDown() && Y > 1) {
-			Y -= ReleaseTimeThrottle;
-		}
-		if (rInput.IsRightMouseButtonDown() && Z < 32767) {
-			Z += AttackTimeBreak;
-		}
-		if (!rInput.IsRightMouseButtonDown() && Z > 1) {
-			Z -= ReleaseTimeBreak;
-		}
-	}
-	else {
-		if (rInput.IsAlphabeticKeyDown(ThrottleKey - 0x41) && Y < 32767) {
-			Y += AttackTimeThrottle;
+
+		if (UseMouse == 1) {
+			if (rInput.IsLeftMouseButtonDown() && Y < 32767) {
+				Y = (Y + AttackTimeThrottle) * AccelerationThrottle;
+			}
+			if (!rInput.IsLeftMouseButtonDown() && Y > 1) {
+				Y = (Y - ReleaseTimeThrottle) / AccelerationThrottle;;
+			}
+			if (rInput.IsRightMouseButtonDown() && Z < 32767) {
+				Z = (Z + AttackTimeBreak) * AccelerationBreak;
+			}
+			if (!rInput.IsRightMouseButtonDown() && Z > 1) {
+				Z = (Z + ReleaseTimeBreak) / AccelerationBreak;
+			}
 		}
-		if (!rInput.IsAlphabeticKeyDown(ThrottleKey - 0x41) && Y > 1) {
-			Y -= ReleaseTimeThrottle;
+		else {
+			if (rInput.IsAlphabeticKeyDown(ThrottleKey - 0x41) && Y < 32767) {
+				Y = (Y + AttackTimeThrottle) * AccelerationThrottle;
+			}
+			if (!rInput.IsAlphabeticKeyDown(ThrottleKey - 0x41) && Y > 1) {
+				Y = (Y - AttackTimeThrottle) / AccelerationThrottle;
+			}
+			if (rInput.IsAlphabeticKeyDown(BreakKey - 0x41) && Z < 32767) {
+				Z = (Z + AttackTimeThrottle) * AccelerationBreak;
+			}
+			if (!rInput.IsAlphabeticKeyDown(BreakKey - 0x41) && Z > 1) {
+				Z = (Z - AttackTimeThrottle) / AccelerationBreak;
+			}
 		}
-		if (rInput.IsAlphabeticKeyDown(BreakKey - 0x41) && Z < 32767) {
-			Z += AttackTimeBreak;
+		if (rInput.IsAlphabeticKeyDown(ClutchKey - 0x41) && RX < 32767) {
+			RX = (RX + AttackTimeClutch) * AccelerationClutch;
 		}
-		if (!rInput.IsAlphabeticKeyDown(BreakKey - 0x41) && Z > 1) {
-			Z -= ReleaseTimeBreak;
+		if (!rInput.IsAlphabeticKeyDown(ClutchKey - 0x41) && RX > 1) {
+			RX = (RX - ReleaseTimeClutch) / AccelerationClutch;
 		}
-	}
-	if (rInput.IsAlphabeticKeyDown(ClutchKey - 0x41) && RX < 32767) {
-		RX += AttackTimeClutch;
-	}
-	if (!rInput.IsAlphabeticKeyDown(ClutchKey - 0x41) && RX > 1) {
-		RX -= ReleaseTimeClutch;
-	}
-	if (rInput.IsAlphabeticKeyDown(MouseLockKey - 0x41)) {
-		SleepEx(250,!(rInput.IsAlphabeticKeyDown(MouseLockKey - 0x41)));
-		if (CursorLocked == false) {
-			CursorLocked = true;
+		if (rInput.IsAlphabeticKeyDown(MouseLockKey - 0x41)) {
+			SleepEx(250, !(rInput.IsAlphabeticKeyDown(MouseLockKey - 0x41)));
+			if (CursorLocked == false) {
+				CursorLocked = true;
+			}
+			else {
+				CursorLocked = false;
+			}
 		}
-		else {
-			CursorLocked = false;
+		if (CursorLocked == true) {
+			SetCursorPos(0, 0);
 		}
-	}
-	if (CursorLocked == true) {
-		SetCursorPos(0, 0);
-	}
-	else {
-
-	}
 }
 
 void ReadConfigFile() {
@@ -324,7 +323,7 @@ void ReadConfigFile() {
 		while (getline(file_, line_)) {
 			std::stringstream ss(line_);
 			std::string tmp;
-			int value;
+			double value;
 			char c;
 			ss >> tmp >> c >> value;
 
@@ -364,10 +363,18 @@ void ReadConfigFile() {
 			else if (tmp == "UseMouse") {
 				UseMouse = value;
 			}
-
+			else if (tmp == "AccelerationThrottle") {
+				AccelerationThrottle = value;
+			}
+			else if (tmp == "AccelerationBreak") {
+				AccelerationBreak = value;
+			}
+			else if (tmp == "AccelerationClutch") {
+				AccelerationClutch = value;
+			}
 		}
 		std::cout << "==================================\n";
-		std::cout << "Sensitivity = " << Sensitivity << "\n" << "Throttle Attack Time = " << AttackTimeThrottle << "\n" << "Throttle Release Time = " << ReleaseTimeThrottle << "\n" << "Break Attack Time = " << AttackTimeBreak << "\n" << "Break Release Time = " << ReleaseTimeBreak << "\n" << "Clutch Attack Time = " << AttackTimeClutch << "\n" << "Clutch Release Time = " << ReleaseTimeClutch << "\n" << "Throttle key = " << ThrottleKey << "\n" << "Break key = " << BreakKey << "\n" << "Clutch key = " << ClutchKey << "\n" << "Mouse Lock key = " << MouseLockKey << "\n" << "Use Mouse = " << UseMouse << "\n";
+		std::cout << "Sensitivity = " << Sensitivity << "\n" << "Throttle Attack Time = " << AttackTimeThrottle << "\n" << "Throttle Release Time = " << ReleaseTimeThrottle << "\n" << "Break Attack Time = " << AttackTimeBreak << "\n" << "Break Release Time = " << ReleaseTimeBreak << "\n" << "Clutch Attack Time = " << AttackTimeClutch << "\n" << "Clutch Release Time = " << ReleaseTimeClutch << "\n" << "Throttle key = " << ThrottleKey << "\n" << "Break key = " << BreakKey << "\n" << "Clutch key = " << ClutchKey << "\n" << "Mouse Lock key = " << MouseLockKey << "\n" << "Use Mouse = " << UseMouse << "\n" << "Acceleration Throttle = " << AccelerationThrottle << "\n" << "Acceleration Break = " << AccelerationBreak << "\n" << "Acceleration Clutch = " << AccelerationClutch << "\n";
 		std::cout << "==================================\n";
 		file_.close();
 	}

diff --git a/MouseToVJoy/config.txt b/MouseToVJoy/config.txt
@@ -1,15 +1,21 @@
 Sensitivity = 5
-AttackTimeThrottle = 400
-ReleaseTimeThrottle = 400
-AttackTimeBreak = 400
-ReleaseTimeBreak = 400
-AttackTimeClutch = 400
-ReleaseTimeClutch = 400
+AttackTimeThrottle = 1
+ReleaseTimeThrottle = 1
+AttackTimeBreak = 1
+ReleaseTimeBreak = 1
+AttackTimeClutch = 1
+ReleaseTimeClutch = 1
 ThrottleKey = 87
 BreakKey = 83
 ClutchKey = 67
 MouseLockKey = 79
 UseMouse = 1
+AccelerationThrottle = 1.01
+AccelerationBreak = 1.01
+AccelerationClutch = 1.01
 
+
+Acceleration works like this: X = (X + AttackTime) * Acceleration, X = (X - ReleaseTime) / Acceleration
+If you want raw acceleration use 1 for time variables and scale acceleration
 Use keycodes from 65 to 90 (65 for A, 90 for Z)