preserve-emulation/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2026-09-04 19:55:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

ControlMapper: Allow overriding PSP button event handling through a callback.

Browse Source
This commit is contained in:
Henrik Rydgård
2023-03-28 00:23:18 +02:00
parent 4739d6c37d
commit 534896d2ab
10 changed files with 27 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Core/ControlMapper.cpp
+7 -6
View File
@@ -4,6 +4,7 @@
#include "Common/TimeUtil.h"
#include "Common/Log.h"
#include "Core/HLE/sceCtrl.h"
#include "Core/KeyMap.h"
#include "Core/ControlMapper.h"
#include "Core/Config.h"
@@ -40,9 +41,10 @@ void ConvertAnalogStick(float &x, float &y) {
y = Clamp(y / norm * mappedNorm, -1.0f, 1.0f);
}
void ControlMapper::SetCallbacks(std::function<void(int)> onVKeyDown, std::function<void(int)> onVKeyUp, std::function<void(int, float, float)> setPSPAnalog) {
void ControlMapper::SetCallbacks(std::function<void(int)> onVKeyDown, std::function<void(int)> onVKeyUp, std::function<void(int, bool)> setPSPButtonState, std::function<void(int, float, float)> setPSPAnalog) {
onVKeyDown_ = onVKeyDown;
onVKeyUp_ = onVKeyUp;
setPSPButtonState_ = setPSPButtonState;
setPSPAnalog_ = setPSPAnalog;
}
@@ -71,7 +73,6 @@ void ControlMapper::SetPSPAxis(int device, char axis, float value, int stick) {
bool inDeadZone = fabsf(value) < g_Config.fAnalogDeadzone * 0.7f;
bool ignore = false;
if (inDeadZone && lastNonDeadzoneDeviceID_[stick] != device) {
// Ignore this event! See issue #15465
ignore = true;
@@ -221,9 +222,9 @@ void ControlMapper::pspKey(int deviceId, int pspKeyCode, int flags) {
} else {
// INFO_LOG(SYSTEM, "pspKey %i %i", pspKeyCode, flags);
if (flags & KEY_DOWN)
__CtrlButtonDown(pspKeyCode);
setPSPButtonState_(pspKeyCode, true);
if (flags & KEY_UP)
__CtrlButtonUp(pspKeyCode);
setPSPButtonState_(pspKeyCode, false);
}
}
@@ -301,12 +302,12 @@ void ControlMapper::onVKeyUp(int deviceId, int vkey) {
case VIRTKEY_ANALOG_ROTATE_CW:
autoRotatingAnalogCW_ = false;
__CtrlSetAnalogXY(0, 0.0f, 0.0f);
setPSPAnalog_(0, 0.0f, 0.0f);
break;
case VIRTKEY_ANALOG_ROTATE_CCW:
autoRotatingAnalogCCW_ = false;
__CtrlSetAnalogXY(0, 0.0f, 0.0f);
setPSPAnalog_(0, 0.0f, 0.0f);
break;
default: