Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Mouse improvements #12176

Merged
merged 3 commits into from Jul 15, 2019
Merged

Mouse improvements #12176

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1f64e81
Update all values for mouse axis.
LunaMoo Jul 15, 2019
3f77bb1
Reduce in-game axis bind threshold for mouse control.
LunaMoo Jul 15, 2019
b87e958
Replace mouse control with device ID mouse check for threshold.
LunaMoo Jul 15, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions Common/KeyMap.h
View file
Open in desktop
Expand Up @@ -71,6 +71,7 @@ enum DefaultMaps {
};

const float AXIS_BIND_THRESHOLD = 0.75f;
const float AXIS_BIND_THRESHOLD_MOUSE = 0.01f;

typedef std::map<int, std::vector<KeyDef>> KeyMapping;

Expand Down
5 changes: 3 additions & 2 deletions UI/EmuScreen.cpp
View file
Open in desktop
Expand Up @@ -884,9 +884,10 @@ void EmuScreen::processAxis(const AxisInput &axis, int direction) {
KeyMap::AxisToPspButton(axis.deviceId, axis.axisId, -direction, &resultsOpposite);

int axisState = 0;
if ((direction == 1 && axis.value >= AXIS_BIND_THRESHOLD)) {
float threshold = axis.deviceId == DEVICE_ID_MOUSE ? AXIS_BIND_THRESHOLD_MOUSE : AXIS_BIND_THRESHOLD;
if (direction == 1 && axis.value >= threshold) {
axisState = 1;
} else if (direction == -1 && axis.value <= -AXIS_BIND_THRESHOLD) {
} else if (direction == -1 && axis.value <= -threshold) {
axisState = -1;
} else {
axisState = 0;
Expand Down
4 changes: 2 additions & 2 deletions Windows/WindowsHost.cpp
View file
Open in desktop
Expand Up @@ -246,8 +246,8 @@ void WindowsHost::PollControllers() {
axisY.value = my;

if (GetUIState() == UISTATE_INGAME || g_Config.bMapMouse) {
if (fabsf(mx) > 0.01f) NativeAxis(axisX);
if (fabsf(my) > 0.01f) NativeAxis(axisY);
NativeAxis(axisX);
NativeAxis(axisY);
}
}

Expand Down