edg-l/ddnet
1
0
Fork 0
mirror of https://github.com/ddnet/ddnet.git synced 2024-11-10 10:08:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7352 from Robyt3/Engine-Input-Antistatic

Browse source 
Replace static variables in `MouseRelative` with member variable
This commit is contained in:
Dennis Felsing 2023-10-15 22:29:14 +00:00 committed by GitHub
parent 788a2ad1ff 9cbbc0aca6
commit 0666646f40
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
src/engine/client/input.cpp
View file

@ -259,23 +259,18 @@ bool CInput::MouseRelative(float *pX, float *pY)
if(!m_MouseFocus || !m_InputGrabbed) if(!m_MouseFocus || !m_InputGrabbed)
return false; return false;
int nx = 0, ny = 0; ivec2 Relative;
#if defined(CONF_PLATFORM_ANDROID) // No relative mouse on Android #if defined(CONF_PLATFORM_ANDROID) // No relative mouse on Android
static int s_LastX = 0; ivec2 CurrentPos;
static int s_LastY = 0; SDL_GetMouseState(&CurrentPos.x, &CurrentPos.y);
SDL_GetMouseState(&nx, &ny); Relative = CurrentPos - m_LastMousePos;
int XTmp = nx - s_LastX; m_LastMousePos = CurrentPos;
int YTmp = ny - s_LastY;
s_LastX = nx;
s_LastY = ny;
nx = XTmp;
ny = YTmp;
#else #else
SDL_GetRelativeMouseState(&nx, &ny); SDL_GetRelativeMouseState(&Relative.x, &Relative.y);
#endif #endif
*pX = nx; *pX = Relative.x;
*pY = ny; *pY = Relative.y;
return *pX != 0.0f || *pY != 0.0f; return *pX != 0.0f || *pY != 0.0f;
} }

3
src/engine/client/input.h
View file

@ -77,6 +77,9 @@ private:
bool m_MouseFocus; bool m_MouseFocus;
bool m_MouseDoubleClick; bool m_MouseDoubleClick;
#if defined(CONF_PLATFORM_ANDROID) // No relative mouse on Android
ivec2 m_LastMousePos = ivec2(0, 0);
#endif
// IME support // IME support
char m_aComposition[MAX_COMPOSITION_ARRAY_SIZE]; char m_aComposition[MAX_COMPOSITION_ARRAY_SIZE];