R5Reloaded/r5sdk
1
0
Fork 0
mirror of https://github.com/Mauler125/r5sdk.git synced 2025-02-09 19:15:03 +01:00
Code Issues Packages Projects Releases Wiki Activity

Recast: don't apply keyboard movement if imgui wants it

Browse Source 
Fix a bug where causing the camera to still move while using the keyboard on the GUI.
This commit is contained in:
Kawe Mazidjatari 2024-07-15 00:26:44 +02:00
parent 3f2de9ac6d
commit 22e25964c6
1 changed files with 30 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
src/naveditor/main.cpp
View File

@ -852,34 +852,37 @@ int not_main(int argc, char** argv)
rayEnd[1] = (float)y;
rayEnd[2] = (float)z;
// Handle keyboard movement.
const Uint8* keystate = SDL_GetKeyboardState(NULL);
moveFront = rcClamp(moveFront + dt * 4 * ((keystate[SDL_SCANCODE_W] || keystate[SDL_SCANCODE_UP ]) ? 1 : -1), 0.0f, 1.0f);
moveLeft = rcClamp(moveLeft + dt * 4 * ((keystate[SDL_SCANCODE_A] || keystate[SDL_SCANCODE_LEFT ]) ? 1 : -1), 0.0f, 1.0f);
moveBack = rcClamp(moveBack + dt * 4 * ((keystate[SDL_SCANCODE_S] || keystate[SDL_SCANCODE_DOWN ]) ? 1 : -1), 0.0f, 1.0f);
moveRight = rcClamp(moveRight + dt * 4 * ((keystate[SDL_SCANCODE_D] || keystate[SDL_SCANCODE_RIGHT ]) ? 1 : -1), 0.0f, 1.0f);
moveUp = rcClamp(moveUp + dt * 4 * ((keystate[SDL_SCANCODE_Q] || keystate[SDL_SCANCODE_PAGEUP ]) ? 1 : -1), 0.0f, 1.0f);
moveDown = rcClamp(moveDown + dt * 4 * ((keystate[SDL_SCANCODE_E] || keystate[SDL_SCANCODE_PAGEDOWN ]) ? 1 : -1), 0.0f, 1.0f);
float keybSpeed = 8800.0f;
if (SDL_GetModState() & KMOD_SHIFT)
if (!mouseOverMenu)
{
keybSpeed *= 2.0f;
// Handle keyboard movement.
const Uint8* keystate = SDL_GetKeyboardState(NULL);
moveFront = rcClamp(moveFront + dt * 4 * ((keystate[SDL_SCANCODE_W] || keystate[SDL_SCANCODE_UP ]) ? 1 : -1), 0.0f, 1.0f);
moveLeft = rcClamp(moveLeft + dt * 4 * ((keystate[SDL_SCANCODE_A] || keystate[SDL_SCANCODE_LEFT ]) ? 1 : -1), 0.0f, 1.0f);
moveBack = rcClamp(moveBack + dt * 4 * ((keystate[SDL_SCANCODE_S] || keystate[SDL_SCANCODE_DOWN ]) ? 1 : -1), 0.0f, 1.0f);
moveRight = rcClamp(moveRight + dt * 4 * ((keystate[SDL_SCANCODE_D] || keystate[SDL_SCANCODE_RIGHT ]) ? 1 : -1), 0.0f, 1.0f);
moveUp = rcClamp(moveUp + dt * 4 * ((keystate[SDL_SCANCODE_Q] || keystate[SDL_SCANCODE_PAGEUP ]) ? 1 : -1), 0.0f, 1.0f);
moveDown = rcClamp(moveDown + dt * 4 * ((keystate[SDL_SCANCODE_E] || keystate[SDL_SCANCODE_PAGEDOWN ]) ? 1 : -1), 0.0f, 1.0f);
float keybSpeed = 8800.0f;
if (SDL_GetModState() & KMOD_SHIFT)
{
keybSpeed *= 2.0f;
}
float movex = (moveRight - moveLeft) * keybSpeed * dt;
float movey = (moveBack - moveFront) * keybSpeed * dt + scrollZoom * 2.0f;
scrollZoom = 0;
cameraPos[0] += movex * static_cast<float>(modelviewMatrix[0]);
cameraPos[1] += movex * static_cast<float>(modelviewMatrix[4]);
cameraPos[2] += movex * static_cast<float>(modelviewMatrix[8]);
cameraPos[0] += movey * static_cast<float>(modelviewMatrix[2]);
cameraPos[1] += movey * static_cast<float>(modelviewMatrix[6]);
cameraPos[2] += movey * static_cast<float>(modelviewMatrix[10]);
cameraPos[2] += (moveUp - moveDown) * keybSpeed * dt;
}
float movex = (moveRight - moveLeft) * keybSpeed * dt;
float movey = (moveBack - moveFront) * keybSpeed * dt + scrollZoom * 2.0f;
scrollZoom = 0;
cameraPos[0] += movex * static_cast<float>(modelviewMatrix[0]);
cameraPos[1] += movex * static_cast<float>(modelviewMatrix[4]);
cameraPos[2] += movex * static_cast<float>(modelviewMatrix[8]);
cameraPos[0] += movey * static_cast<float>(modelviewMatrix[2]);
cameraPos[1] += movey * static_cast<float>(modelviewMatrix[6]);
cameraPos[2] += movey * static_cast<float>(modelviewMatrix[10]);
cameraPos[2] += (moveUp - moveDown) * keybSpeed * dt;
glEnable(GL_FOG);
@ -899,7 +902,7 @@ int not_main(int argc, char** argv)
glLoadIdentity();
ImGuiIO& io = ImGui::GetIO();
mouseOverMenu = io.WantCaptureMouse;
mouseOverMenu = io.WantCaptureMouse||io.WantCaptureKeyboard;
ImGui_ImplOpenGL2_NewFrame();
ImGui_ImplSDL2_NewFrame();