mirror of
https://github.com/OpenMW/openmw.git
synced 2025-04-14 08:36:44 +00:00
Merge branch 'cursorspeedmerge' into 'master'
Updated: Change cursor speed with settings.cfg (#6312) Closes #6312 See merge request OpenMW/openmw!1255
This commit is contained in:
commit
1d342f80ed
2 changed files with 3 additions and 2 deletions
|
@ -229,6 +229,7 @@ Programmers
|
||||||
Yuri Krupenin
|
Yuri Krupenin
|
||||||
zelurker
|
zelurker
|
||||||
Noah Gooder
|
Noah Gooder
|
||||||
|
Andrew Appuhamy (andrew-app)
|
||||||
|
|
||||||
Documentation
|
Documentation
|
||||||
-------------
|
-------------
|
||||||
|
|
|
@ -99,8 +99,8 @@ namespace MWInput
|
||||||
// We keep track of our own mouse position, so that moving the mouse while in
|
// We keep track of our own mouse position, so that moving the mouse while in
|
||||||
// game mode does not move the position of the GUI cursor
|
// game mode does not move the position of the GUI cursor
|
||||||
float uiScale = MWBase::Environment::get().getWindowManager()->getScalingFactor();
|
float uiScale = MWBase::Environment::get().getWindowManager()->getScalingFactor();
|
||||||
float xMove = xAxis * dt * 1500.0f / uiScale;
|
float xMove = xAxis * dt * 1500.0f / uiScale * mGamepadCursorSpeed;
|
||||||
float yMove = yAxis * dt * 1500.0f / uiScale;
|
float yMove = yAxis * dt * 1500.0f / uiScale * mGamepadCursorSpeed;
|
||||||
|
|
||||||
float mouseWheelMove = -zAxis * dt * 1500.0f;
|
float mouseWheelMove = -zAxis * dt * 1500.0f;
|
||||||
if (xMove != 0 || yMove != 0 || mouseWheelMove != 0)
|
if (xMove != 0 || yMove != 0 || mouseWheelMove != 0)
|
||||||
|
|
Loading…
Reference in a new issue