BRNSystems/minetest
1
0
Fork 0
forked from Mirrorlandia_minetest/minetest
Code Pull Requests 1 Activity

Camera: Improve subpixel movement (#7319)

Browse Source
This commit is contained in:
SmallJoker 2018-05-12 14:30:52 +02:00 committed by GitHub
parent 9dd432c29f
commit d5d248ccbd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/game.cpp
View File

@ -2333,13 +2333,15 @@ void Game::updateCameraDirection(CameraOrientation *cam, float dtime)
} }
#endif #endif
if (m_first_loop_after_window_activation) if (m_first_loop_after_window_activation) {
m_first_loop_after_window_activation = false; m_first_loop_after_window_activation = false;
else
updateCameraOrientation(cam, dtime);
input->setMousePos((driver->getScreenSize().Width / 2), input->setMousePos(driver->getScreenSize().Width / 2,
(driver->getScreenSize().Height / 2)); driver->getScreenSize().Height / 2);
} else {
updateCameraOrientation(cam, dtime);
}
} else { } else {
#ifndef ANDROID #ifndef ANDROID
@ -2361,17 +2363,18 @@ void Game::updateCameraOrientation(CameraOrientation *cam, float dtime)
cam->camera_pitch = g_touchscreengui->getPitch(); cam->camera_pitch = g_touchscreengui->getPitch();
} else { } else {
#endif #endif
v2s32 center(driver->getScreenSize().Width / 2, driver->getScreenSize().Height / 2);
s32 dx = input->getMousePos().X - (driver->getScreenSize().Width / 2); v2s32 dist = input->getMousePos() - center;
s32 dy = input->getMousePos().Y - (driver->getScreenSize().Height / 2);
if (m_invert_mouse || camera->getCameraMode() == CAMERA_MODE_THIRD_FRONT) { if (m_invert_mouse || camera->getCameraMode() == CAMERA_MODE_THIRD_FRONT) {
dy = -dy; dist.Y = -dist.Y;
} }
cam->camera_yaw -= dx * m_cache_mouse_sensitivity; cam->camera_yaw -= dist.X * m_cache_mouse_sensitivity;
cam->camera_pitch += dy * m_cache_mouse_sensitivity; cam->camera_pitch += dist.Y * m_cache_mouse_sensitivity;
if (dist.X != 0 || dist.Y != 0)
input->setMousePos(center.X, center.Y);
#ifdef HAVE_TOUCHSCREENGUI #ifdef HAVE_TOUCHSCREENGUI
} }
#endif #endif