Emulation/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2025-04-02 11:01:50 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #18597 from hrydgard/combo-key-behavior

Browse source 
Combo key: Only trigger when keys are pressed in the mapped order
This commit is contained in:
Henrik Rydgård 2023-12-22 22:52:23 +01:00 • committed by GitHub
commit 33c0052c70
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 44 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

49
Core/ControlMapper.cpp
View file

@ -269,7 +269,7 @@ bool ControlMapper::UpdatePSPState(const InputMapping &changedMapping, double no
case ROTATION_LOCKED_VERTICAL180: rotations = 3; break;
}
// For the PSP's button inputs, we just go through and put the flags together.
// For the PSP's digital button inputs, we just go through and put the flags together.
uint32_t buttonMask = 0;
uint32_t changedButtonMask = 0;
std::vector<MultiInputMapping> inputMappings;
@ -297,9 +297,21 @@ bool ControlMapper::UpdatePSPState(const InputMapping &changedMapping, double no
}
// Check if all inputs are "on".
bool all = true;
double curTime = 0.0;
for (auto mapping : multiMapping.mappings) {
auto iter = curInput_.find(mapping);
bool down = iter != curInput_.end() && iter->second.value > GetDeviceAxisThreshold(iter->first.deviceId);
if (iter == curInput_.end()) {
all = false;
continue;
}
// Stop reverse ordering from triggering.
if (iter->second.timestamp < curTime) {
all = false;
break;
} else {
curTime = iter->second.timestamp;
}
bool down = iter->second.value > GetDeviceAxisThreshold(iter->first.deviceId);
if (!down)
all = false;
}
@ -338,12 +350,23 @@ bool ControlMapper::UpdatePSPState(const InputMapping &changedMapping, double no
}
float product = 1.0f; // We multiply the various inputs in a combo mapping with each other.
double curTime = 0.0;
for (auto mapping : multiMapping.mappings) {
auto iter = curInput_.find(mapping);
if (iter != curInput_.end()) {
// Stop reverse ordering from triggering.
if (iter->second.timestamp < curTime) {
product = 0.0f;
break;
} else {
curTime = iter->second.timestamp;
}
if (mapping.IsAxis()) {
threshold = GetDeviceAxisThreshold(iter->first.deviceId);
product *= MapAxisValue(iter->second.value, idForMapping, mapping, changedMapping, &touchedByMapping);
float value = MapAxisValue(iter->second.value, idForMapping, mapping, changedMapping, &touchedByMapping);
product *= value;
} else {
product *= iter->second.value;
}
@ -484,6 +507,18 @@ void ControlMapper::ToggleSwapAxes() {
UpdateAnalogOutput(1);
}
void ControlMapper::UpdateCurInputAxis(const InputMapping &mapping, float value, double timestamp) {
InputSample &input = curInput_[mapping];
input.value = value;
if (value > GetDeviceAxisThreshold(mapping.deviceId)) {
if (input.timestamp == 0.0) {
input.timestamp = time_now_d();
}
} else {
input.timestamp = 0.0;
}
}
void ControlMapper::Axis(const AxisInput *axes, size_t count) {
double now = time_now_d();
@ -499,15 +534,15 @@ void ControlMapper::Axis(const AxisInput *axes, size_t count) {
if (axis.value >= 0.0f) {
InputMapping mapping(axis.deviceId, axis.axisId, 1);
InputMapping opposite(axis.deviceId, axis.axisId, -1);
curInput_[mapping] = { axis.value, now };
curInput_[opposite] = { 0.0f, now };
UpdateCurInputAxis(mapping, axis.value, now);
UpdateCurInputAxis(opposite, 0.0f, now);
UpdatePSPState(mapping, now);
UpdatePSPState(opposite, now);
} else if (axis.value < 0.0f) {
InputMapping mapping(axis.deviceId, axis.axisId, -1);
InputMapping opposite(axis.deviceId, axis.axisId, 1);
curInput_[mapping] = { -axis.value, now };
curInput_[opposite] = { 0.0f, now };
UpdateCurInputAxis(mapping, -axis.value, now);
UpdateCurInputAxis(opposite, 0.0f, now);
UpdatePSPState(mapping, now);
UpdatePSPState(opposite, now);
}

2
Core/ControlMapper.h
View file

@ -58,6 +58,8 @@ private:
void onVKey(int vkey, bool down);
void onVKeyAnalog(int deviceId, int vkey, float value);
void UpdateCurInputAxis(const InputMapping &mapping, float value, double timestamp);
// To track mappable virtual keys. We can have as many as we want.
float virtKeys_[VIRTKEY_COUNT]{};
bool virtKeyOn_[VIRTKEY_COUNT]{}; // Track boolean output separaately since thresholds may differ.