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

Fix camera jumping on Android when panning past 0/360 mark

Browse Source
This commit is contained in:
rubenwardy 2016-12-11 21:57:43 +00:00
parent d9675d3d92
commit 0fdf24d64a
3 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/game.cpp
View File

@ -3362,8 +3362,8 @@ void Game::updateCameraOrientation(CameraOrientation *cam,
{ {
#ifdef HAVE_TOUCHSCREENGUI #ifdef HAVE_TOUCHSCREENGUI
if (g_touchscreengui) { if (g_touchscreengui) {
cam->camera_yaw = g_touchscreengui->getYaw(); cam->camera_yaw += g_touchscreengui->getYawChange();
cam->camera_pitch = g_touchscreengui->getPitch(); cam->camera_pitch = g_touchscreengui->getPitch();
} else { } else {
#endif #endif

14
src/touchscreengui.cpp
View File

@ -414,7 +414,7 @@ void AutoHideButtonBar::show()
TouchScreenGUI::TouchScreenGUI(IrrlichtDevice *device, IEventReceiver* receiver): TouchScreenGUI::TouchScreenGUI(IrrlichtDevice *device, IEventReceiver* receiver):
m_device(device), m_device(device),
m_guienv(device->getGUIEnvironment()), m_guienv(device->getGUIEnvironment()),
m_camera_yaw(0.0), m_camera_yaw_change(0.0),
m_camera_pitch(0.0), m_camera_pitch(0.0),
m_visible(false), m_visible(false),
m_move_id(-1), m_move_id(-1),
@ -835,17 +835,11 @@ void TouchScreenGUI::translateEvent(const SEvent &event)
/* adapt to similar behaviour as pc screen */ /* adapt to similar behaviour as pc screen */
double d = g_settings->getFloat("mouse_sensitivity") *4; double d = g_settings->getFloat("mouse_sensitivity") *4;
double old_yaw = m_camera_yaw; double old_yaw = m_camera_yaw_change;
double old_pitch = m_camera_pitch; double old_pitch = m_camera_pitch;
m_camera_yaw -= dx * d; m_camera_yaw_change -= dx * d;
m_camera_pitch = MYMIN(MYMAX( m_camera_pitch + (dy * d),-180),180); m_camera_pitch = MYMIN(MYMAX(m_camera_pitch + (dy * d), -180), 180);
while (m_camera_yaw < 0)
m_camera_yaw += 360;
while (m_camera_yaw > 360)
m_camera_yaw -= 360;
// update shootline // update shootline
m_shootline = m_device m_shootline = m_device

10
src/touchscreengui.h
View File

@ -147,8 +147,14 @@ public:
void init(ISimpleTextureSource* tsrc); void init(ISimpleTextureSource* tsrc);
double getYaw() { return m_camera_yaw; } double getYawChange() {
double res = m_camera_yaw_change;
m_camera_yaw_change = 0;
return res;
}
double getPitch() { return m_camera_pitch; } double getPitch() { return m_camera_pitch; }
line3d<f32> getShootline() { return m_shootline; } line3d<f32> getShootline() { return m_shootline; }
void step(float dtime); void step(float dtime);
@ -170,7 +176,7 @@ private:
bool m_visible; // is the gui visible bool m_visible; // is the gui visible
/* value in degree */ /* value in degree */
double m_camera_yaw; double m_camera_yaw_change;
double m_camera_pitch; double m_camera_pitch;
line3d<f32> m_shootline; line3d<f32> m_shootline;