Merge branch 'XVibrationCheat2' into TemporaryHackishBranch

Core/CwCheat.cpp

@@ -24,6 +24,9 @@
 static int CheatEvent = -1;
 static CWCheatEngine *cheatEngine;
 static bool cheatsEnabled;
+SceCtrl vibrationCheat;
+static u16 checkLeftVibration = 0;
+static u16 checkRightVibration = 0;
 void hleCheat(u64 userdata, int cyclesLate);
 
 static inline std::string TrimString(const std::string &s) {
@@ -596,6 +599,19 @@ CheatOperation CWCheatEngine::InterpretNextCwCheat(const CheatCode &cheat, size_
 		}
 		return { CheatOp::Invalid };
 
+	case 0xA: // Vibration command(PPSSPP specific)
+		checkLeftVibration = line1.part1 & 0x0000FFFF;
+		checkRightVibration = line1.part2 & 0x0000FFFF;
+		if (checkLeftVibration > 0) {
+			vibrationCheat.SetLeftVibration(checkLeftVibration);
+			vibrationCheat.SetVibrationLeftDropout(line1.part1 >> 16 & 0x000000FF);
+		}
+		if (checkRightVibration > 0) {
+			vibrationCheat.SetRightVibration(checkRightVibration);
+			vibrationCheat.SetVibrationRightDropout(line1.part2 >> 16 & 0x000000FF);
+		}
+		return { CheatOp::Invalid };
+
 	case 0xB: // Delay command.
 		return { CheatOp::Delay, 0, 0, arg };
 

Core/CwCheat.h

@@ -53,7 +53,6 @@ public:
 	std::string CheatFilename();
 	void Run();
 	bool HasCheats();
-
 	void InvalidateICache(u32 addr, int size);
 private:
 	u32 GetAddress(u32 value);

Core/HLE/sceCtrl.cpp

@@ -87,6 +87,12 @@ static std::mutex ctrlMutex;
 
 static int ctrlTimer = -1;
 
+static u16 leftVibration = 0;
+static u16 rightVibration = 0;
+// The higher the dropout, the longer Vibration will run
+static u8 vibrationLeftDropout = 160;
+static u8 vibrationRightDropout = 160;
+
 // STATE END
 //////////////////////////////////////////////////////////////////////////
 
@@ -288,6 +294,10 @@ static void __CtrlVblank()
 {
 	emuRapidFireFrames++;
 
+	// Reduce gamepad Vibration by set % each frame
+	leftVibration *= (float)vibrationLeftDropout / 256.0f;
+	rightVibration *= (float)vibrationRightDropout / 256.0f;
+
 	// This always runs, so make sure we're in vblank mode.
 	if (ctrlCycle == 0)
 		__CtrlDoSample();
@@ -563,3 +573,25 @@ void Register_sceCtrl_driver()
 {
 	RegisterModule("sceCtrl_driver", ARRAY_SIZE(sceCtrl), sceCtrl);
 }
+
+u16 GetRightVibration() {
+	return rightVibration;
+}
+
+u16 GetLeftVibration() {
+	return leftVibration;
+}
+
+void SceCtrl::SetRightVibration(u16 rVibration) {
+	rightVibration = rVibration;
+}
+void SceCtrl::SetLeftVibration(u16 lVibration) {
+	leftVibration = lVibration;
+}
+void SceCtrl::SetVibrationRightDropout(u8 vibrationRDropout) {
+	vibrationRightDropout = vibrationRDropout;
+
+}
+void SceCtrl::SetVibrationLeftDropout(u8 vibrationLDropout) {
+	vibrationLeftDropout = vibrationLDropout;
+}

Core/HLE/sceCtrl.h

@@ -87,3 +87,14 @@ void __CtrlPeekAnalog(int stick, float *x, float *y);
 u32 __CtrlReadLatch();
 
 void Register_sceCtrl_driver();
+
+u16 GetRightVibration();
+u16 GetLeftVibration();
+
+class SceCtrl {
+public:
+	void SetLeftVibration(u16 lVibration);
+	void SetRightVibration(u16 rVibration);
+	void SetVibrationLeftDropout(u8 vibrationLDropout);
+	void SetVibrationRightDropout(u8 vibrationRDropout);
+};

Windows/XinputDevice.cpp

@@ -11,14 +11,18 @@
 #include "input/input_state.h"
 #include "input/keycodes.h"
 #include "XinputDevice.h"
+#include "Core/Core.h"
+#include "Core/HLE/sceCtrl.h"
 
 // Utilities to dynamically load XInput. Adapted from SDL.
 
 #if !PPSSPP_PLATFORM(UWP)
 
 typedef DWORD (WINAPI *XInputGetState_t) (DWORD dwUserIndex, XINPUT_STATE* pState);
+typedef DWORD (WINAPI *XInputSetState_t) (DWORD dwUserIndex, XINPUT_VIBRATION* pVibration);
 
 static XInputGetState_t PPSSPP_XInputGetState = NULL;
+static XInputSetState_t PPSSPP_XInputSetState = NULL;
 static DWORD PPSSPP_XInputVersion = 0;
 static HMODULE s_pXInputDLL = 0;
 static int s_XInputDLLRefCount = 0;
@@ -65,6 +69,17 @@ static int LoadXInputDLL() {
 		return -1;
 	}
 
+	/* Let's try the name first, then fall back to a non-Ex version (xinput9_1_0.dll doesn't have Ex) */
+	PPSSPP_XInputSetState = (XInputSetState_t)GetProcAddress((HMODULE)s_pXInputDLL, "XInputSetStateEx");
+	if (!PPSSPP_XInputSetState) {
+		PPSSPP_XInputSetState = (XInputSetState_t)GetProcAddress((HMODULE)s_pXInputDLL, "XInputSetState");
+	}
+
+	if (!PPSSPP_XInputSetState) {
+		UnloadXInputDLL();
+		return -1;
+	}
+
 	return 0;
 }
 
@@ -81,6 +96,7 @@ static void UnloadXInputDLL() {
 static int LoadXInputDLL() { return 0; }
 static void UnloadXInputDLL() {}
 #define PPSSPP_XInputGetState XInputGetState
+#define PPSSPP_XInputSetState XInputSetState
 #endif
 
 #ifndef XUSER_MAX_COUNT
@@ -231,11 +247,13 @@ int XinputDevice::UpdateState() {
 	for (int i = 0; i < XUSER_MAX_COUNT; i++) {
 		XINPUT_STATE state;
 		ZeroMemory(&state, sizeof(XINPUT_STATE));
+		XINPUT_VIBRATION vibration;
+		ZeroMemory(&vibration, sizeof(XINPUT_VIBRATION));
 		if (check_delay[i]-- > 0)
 			continue;
 		DWORD dwResult = PPSSPP_XInputGetState(i, &state);
 		if (dwResult == ERROR_SUCCESS) {
-			UpdatePad(i, state);
+			UpdatePad(i, state, vibration);
 			anySuccess = true;
 		} else {
 			check_delay[i] = 30;
@@ -247,13 +265,14 @@ int XinputDevice::UpdateState() {
 	return anySuccess ? (g_Config.bEnableDInputWithXInput ? 0 : UPDATESTATE_SKIP_PAD) : 0;
 }
 
-void XinputDevice::UpdatePad(int pad, const XINPUT_STATE &state) {
+void XinputDevice::UpdatePad(int pad, const XINPUT_STATE &state, XINPUT_VIBRATION &vibration) {
 	static bool notified = false;
 	if (!notified) {
 		notified = true;
 		KeyMap::NotifyPadConnected("Xbox 360 Pad");
 	}
 	ApplyButtons(pad, state);
+	ApplyVibration(pad, vibration);
 
 	const float STICK_DEADZONE = g_Config.fXInputAnalogDeadzone;
 	const int STICK_INV_MODE = g_Config.iXInputAnalogInverseMode;
@@ -338,3 +357,21 @@ void XinputDevice::ApplyButtons(int pad, const XINPUT_STATE &state) {
 		}
 	}
 }
+
+
+void XinputDevice::ApplyVibration(int pad, XINPUT_VIBRATION &vibration) {
+	if (PSP_IsInited()) {
+		vibration.wLeftMotorSpeed = GetLeftVibration(); // use any value between 0-65535 here
+		vibration.wRightMotorSpeed = GetRightVibration(); // use any value between 0-65535 here
+		if (prevVibration[pad].wLeftMotorSpeed != vibration.wLeftMotorSpeed || prevVibration[pad].wRightMotorSpeed != vibration.wRightMotorSpeed) {
+			PPSSPP_XInputSetState(pad, &vibration);
+			prevVibration[pad] = vibration;
+		}
+	} else {
+		DWORD dwResult = PPSSPP_XInputSetState(pad, &vibration);
+		if (dwResult != ERROR_SUCCESS) {
+			check_delay[pad] = 30;
+		}
+	}
+}
+

Windows/XinputDevice.h

@@ -2,7 +2,7 @@
 
 #include "InputDevice.h"
 #include "Xinput.h"
-
+#include "Core/HLE/sceCtrl.h"
 
 class XinputDevice final : public InputDevice {
 public:
@@ -11,9 +11,12 @@ public:
 	virtual int UpdateState() override;
 
 private:
-	void UpdatePad(int pad, const XINPUT_STATE &state);
+	void UpdatePad(int pad, const XINPUT_STATE &state, XINPUT_VIBRATION &vibration);
 	void ApplyButtons(int pad, const XINPUT_STATE &state);
+	void ApplyVibration(int pad, XINPUT_VIBRATION &vibration);
 	int check_delay[4]{};
 	XINPUT_STATE prevState[4]{};
+	XINPUT_VIBRATION prevVibration[4]{};
+
 	u32 prevButtons[4]{};
 };