Skip to content

Commit

Permalink
Improvements: KM in window, more parameters in config & fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
@r57zone
r57zone committed Feb 8, 2021
1 parent 459391a commit 1fe4cb8
Show file tree
Hide file tree
Showing 3 changed files with 52 additions and 62 deletions.
7 changes: 5 additions & 2 deletions README.RU.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
2. Установите Microsoft Visual C++ Redistributable 2017 или новее.
3. Распаковать и запустить DualShock4 emulator.
4. Запустить "PlayStation Now" или другое приложение.
5. При необходимости можно инвертировать оси, изменить параметры `InvertX` и `InvertY` на `1` в конфигурационном файле "Config.ini", в разделе "DS4".
5. При необходимости можно инвертировать оси, измените параметры `InvertX` и `InvertY` на `1`, в конфигурационном файле "Config.ini", в разделе "DS4".

## Xbox контроллер
Кнопка "Назад" на Xbox контроллере эмулирует нажатие тачпада на Sony DualShock4.
Expand All @@ -24,8 +24,11 @@
------------ | -------------
Uncharted 3: Иллюзии Дрейка (2011) | Кнопка "Share" (F12) дублирует нажатие левой части тачпада.

## Гироскоп
Эмуляция гироскопа не поддерживается.

## Клавиатура и мышь
В конфигурационном файле "Config.ini" можно заменить привязки кнопок. Коды кнопок можно найти [здесь](https://github.com/r57zone/Half-Life-Alyx-novr/blob/master/BINDINGS.RU.md);
В конфигурационном файле "Config.ini" можно заменить привязки кнопок. Коды кнопок можно найти [здесь](https://github.com/r57zone/Half-Life-Alyx-novr/blob/master/BINDINGS.RU.md). По умолчанию мышь и клавиатура работает только в "PlayStation Now". По умолчанию мышь и клавиатура работает только в "PlayStation Now". Можно включить работу во всех окнах (изменить параметр `ActivateInAnyWindow` на `1`, в конфиге) или изменить название окна (параметр `ActivateOnlyInWindow`), в котором захватываются действия. Это необходимо, чтобы курсор центрировался только в одном окне и не нажимались кнопки при свёрнутом окне.
DualShock 4 | Клавиатура и мышь
------------ | -------------
LEFT TRIGGER | Правая кнопка мыши
Expand Down
2 changes: 1 addition & 1 deletion README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ Game | Action
Uncharted 3: Drake’s Deception (2011) | The "Share" button (F12) duplicates pressing the left side of the touchpad.

## Keyboard and mouse
Сan replace button bindings in the "Config.ini" configuration file. Button codes can be found [here](https://github.com/r57zone/Half-Life-Alyx-novr/blob/master/BINDINGS.md).
Сan replace button bindings in the "Config.ini" configuration file. Button codes can be found [here](https://github.com/r57zone/Half-Life-Alyx-novr/blob/master/BINDINGS.md). By default, the mouse and keyboard only work in "PlayStation Now". You can enable the work in all windows (change the `ActivateInAnyWindow` parameter to `1`, in the config) or change the name of the window (the `ActivateOnlyInWindow` parameter) in which the actions are captured. This is necessary so that the cursor is centered only in one window and no buttons are pressed when the window is minimized.
DualShock 4 | Keyboard and mouse
------------ | -------------
LEFT TRIGGER | Right mouse button
Expand Down
105 changes: 46 additions & 59 deletions Source/DS4Emulator.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ typedef DWORD(__stdcall *_XInputSetState)(_In_ DWORD dwUserIndex, _In_ XINPUT_VI
_XInputGetState MyXInputGetState;
_XInputSetState MyXInputSetState;
_XINPUT_STATE myPState;
HMODULE hDll;
HMODULE hDll = NULL;
DWORD XboxUserIndex = 0;

static std::mutex m;
Expand Down Expand Up @@ -162,26 +162,28 @@ int main(int argc, char **argv)
{
SetConsoleTitle("DS4Emulator");

#define XboxMode 0
#define KBMode 1
unsigned char EmulationMode = XboxMode;
#define XboxMode 1
#define KBMode 0
int EmulationMode = KBMode;

//Config
CIniReader IniFile("Config.ini");
bool InvertX = IniFile.ReadBoolean("DS4", "InvertX", false);
bool InvertY = IniFile.ReadBoolean("DS4", "InvertY", false);

int SleepTimeOut = IniFile.ReadInteger("DS4", "SleepTimeOut", 2);

int SleepTimeOutXbox = IniFile.ReadInteger("Xbox", "SleepTimeOut", 1);
bool SwapTriggersShoulders = IniFile.ReadBoolean("Xbox", "SwapTriggersShoulders", false);
bool SwapShareTouchPad = IniFile.ReadBoolean("Xbox", "SwapShareTouchPad", false);
bool EmulateAnalogTriggers = IniFile.ReadBoolean("Mouse", "EmulateAnalogTriggers", false);

int SleepTimeOutKB = IniFile.ReadInteger("KeyboardMouse", "SleepTimeOut", 2);
std::string WindowTitle = IniFile.ReadString("KeyboardMouse", "ActivateOnlyInWindow", "PlayStation™Now");
bool ActivateInAnyWindow = IniFile.ReadBoolean("KeyboardMouse", "ActivateInAnyWindow", false);
bool EmulateAnalogTriggers = IniFile.ReadBoolean("KeyboardMouse", "EmulateAnalogTriggers", false);
float LeftTriggerValue = 0;
float RightTriggerValue = 0;
float StepTriggerValue = IniFile.ReadFloat("Mouse", "AnalogTriggerStep", 15);

mouseSensetiveX = IniFile.ReadFloat("Mouse", "SensX", 15);
mouseSensetiveY = IniFile.ReadFloat("Mouse", "SensY", 15);
float StepTriggerValue = IniFile.ReadFloat("KeyboardMouse", "AnalogTriggerStep", 15);
mouseSensetiveX = IniFile.ReadFloat("KeyboardMouse", "SensX", 15);
mouseSensetiveY = IniFile.ReadFloat("KeyboardMouse", "SensY", 15);

KEY_ID_LEFT_TRIGGER = IniFile.ReadInteger("Keys", "LEFT_TRIGGER", VK_RBUTTON);
KEY_ID_RIGHT_TRIGGER = IniFile.ReadInteger("Keys", "RIGHT_TRIGGER", VK_LBUTTON);
Expand Down Expand Up @@ -211,33 +213,23 @@ int main(int argc, char **argv)

printf("Press \"~\" key to exit\r\n");

//Forced keyboard and mouse mode
if (argv[1] != NULL && strcmp(argv[1], "-mk") == 0)
EmulationMode = KBMode;

//Load library and scan Xbox gamepads only in Xbox mode (default)
if (EmulationMode == XboxMode) {
//printf("Xbox mode\r\n");
//TCHAR XInputPath[MAX_PATH] = { 0 };
//GetSystemWindowsDirectory(XInputPath, sizeof(XInputPath));
//_tcscat_s(XInputPath, sizeof(XInputPath), _T("\\System32\\xinput1_3.dll")); //Separate paths for different architectures are not required. Windows does it by itself.
hDll = LoadLibrary("xinput1_3.dll"); //x360ce support
if (hDll != NULL) {
MyXInputGetState = (_XInputGetState)GetProcAddress(hDll, "XInputGetState");
MyXInputSetState = (_XInputSetState)GetProcAddress(hDll, "XInputSetState");
if (MyXInputGetState == NULL || MyXInputSetState == NULL)
hDll = NULL;
}
hDll = LoadLibrary("xinput1_3.dll"); //x360ce support
if (hDll != NULL) {
MyXInputGetState = (_XInputGetState)GetProcAddress(hDll, "XInputGetState");
MyXInputSetState = (_XInputSetState)GetProcAddress(hDll, "XInputSetState");
if (MyXInputGetState == NULL || MyXInputSetState == NULL)
hDll = NULL;
}

for (DWORD i = 0; i < XUSER_MAX_COUNT; ++i)
if (hDll != NULL)
for (int i = 0; i < XUSER_MAX_COUNT; ++i)
if (MyXInputGetState(XboxUserIndex, &myPState) == ERROR_SUCCESS)
{
XboxUserIndex = i;
EmulationMode = XboxMode;
break;
} else
if (i == 3) //if don't have gamepad
EmulationMode = KBMode;
}
}

if (EmulationMode == KBMode) {
m_HalfWidth = GetSystemMetrics(SM_CXSCREEN) / 2;
Expand All @@ -252,22 +244,17 @@ int main(int argc, char **argv)

while (!(GetAsyncKeyState(192) & 0x8000)) //~
{
report.wButtons = 0;
DS4_SET_DPAD(&report, DS4_BUTTON_DPAD_NONE);
report.bTriggerL = 0;
report.bTriggerR = 0;
report.bSpecial = 0;
DS4_REPORT_INIT(&report);

//Xbox mode
if (EmulationMode == XboxMode) {
DWORD myStatus = ERROR_DEVICE_NOT_CONNECTED;
if (hDll != NULL)
myStatus = MyXInputGetState(XboxUserIndex, &myPState);

if (myStatus == ERROR_SUCCESS) {

//Convert axis from - https://github.com/sam0x17/XJoy/blob/236b5539cc15ea1c83e1e5f0260937f69a78866d/Include/ViGEmUtil.h

report.bThumbLX = ((myPState.Gamepad.sThumbLX + ((USHRT_MAX / 2) + 1)) / 257);
report.bThumbLY = (-(myPState.Gamepad.sThumbLY + ((USHRT_MAX / 2) - 1)) / 257);
report.bThumbLY = (report.bThumbLY == 0) ? 0xFF : report.bThumbLY;
Expand Down Expand Up @@ -362,16 +349,15 @@ int main(int argc, char **argv)
if (myPState.Gamepad.wButtons & XINPUT_GAMEPAD_DPAD_RIGHT && myPState.Gamepad.wButtons & XINPUT_GAMEPAD_DPAD_DOWN)
DS4_SET_DPAD(&report, DS4_BUTTON_DPAD_SOUTHEAST);
}
} else

}
//Mouse and keyboard mode
if (EmulationMode == KBMode) {
else if (EmulationMode == KBMode) {

PSNowWindow = FindWindow(NULL, WindowTitle.c_str());
bool PSNowFound = (PSNowWindow != 0) && (IsWindowVisible(PSNowWindow)) && (PSNowWindow == GetForegroundWindow());

//PSNowWindow = FindWindow(NULL, "PlayStation™Now");
//if ( (PSNowWindow != 0) && (IsWindowVisible(PSNowWindow)) && (PSNowWindow == GetForegroundWindow()) ) {
if (ActivateInAnyWindow || PSNowFound) {
GetMouseState();
report.bThumbRX = 0x80;
report.bThumbRY = 0x80;

if (InvertX)
DeltaMouseX = DeltaMouseX * -1;
Expand All @@ -387,16 +373,14 @@ int main(int argc, char **argv)
report.bThumbRY = 128 + round( Clamp(DeltaMouseY * mouseSensetiveY, -127, 0) );
if (DeltaMouseY > 0)
report.bThumbRY = 128 + round( Clamp(DeltaMouseY * mouseSensetiveY, 0, 127) );

report.bThumbLY = 0x80;

if ((GetAsyncKeyState('W') & 0x8000) != 0) report.bThumbLY = 0;
if ((GetAsyncKeyState('S') & 0x8000) != 0) report.bThumbLY = 255;
report.bThumbLX = 0x80;
if ((GetAsyncKeyState('A') & 0x8000) != 0) report.bThumbLX = 0;
if ((GetAsyncKeyState('D') & 0x8000) != 0) report.bThumbLX = 255;

if (EmulateAnalogTriggers == false) {

if (EmulateAnalogTriggers == false){
if ((GetAsyncKeyState(KEY_ID_LEFT_TRIGGER) & 0x8000) != 0)
report.bTriggerL = 255;
if ((GetAsyncKeyState(KEY_ID_RIGHT_TRIGGER) & 0x8000) != 0)
Expand Down Expand Up @@ -427,14 +411,12 @@ int main(int argc, char **argv)
}

report.bTriggerR = Clamp(round(RightTriggerValue), 0, 255);

}

//Strange specific of DualShock
if (report.bTriggerL > 0)
report.wButtons |= DS4_BUTTON_TRIGGER_LEFT;
if (report.bTriggerR > 0)
report.wButtons |= DS4_BUTTON_TRIGGER_RIGHT;
if (report.bTriggerL > 0) //Strange specific of DualShock
report.wButtons |= DS4_BUTTON_TRIGGER_LEFT;
if (report.bTriggerR > 0) //Strange specific of DualShock
report.wButtons |= DS4_BUTTON_TRIGGER_RIGHT;

if ((GetAsyncKeyState(KEY_ID_OPTIONS) & 0x8000) != 0)
report.wButtons |= DS4_BUTTON_OPTIONS;
Expand Down Expand Up @@ -472,16 +454,21 @@ int main(int argc, char **argv)
DS4_SET_DPAD(&report, DS4_BUTTON_DPAD_WEST);
if ((GetAsyncKeyState(KEY_ID_DPAD_RIGHT) & 0x8000) != 0)
DS4_SET_DPAD(&report, DS4_BUTTON_DPAD_EAST);
//}
}
}

ret = vigem_target_ds4_update(client, ds4, report);

//Don't over load the CPU with reading
Sleep(SleepTimeOut);
//Don't overload the CPU with reading
if (EmulationMode == XboxMode)
Sleep(SleepTimeOutXbox);
else
Sleep(SleepTimeOutKB);
}

vigem_target_remove(client, ds4);
vigem_target_free(ds4);
vigem_free(client);
FreeLibrary(hDll);
hDll = nullptr;
}

0 comments on commit 1fe4cb8

Please sign in to comment.