minetest
/
minetest
mirror of https://github.com/minetest/minetest.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Avoid visible camera jumps because of touchscreen_threshold

This commit is contained in:
Gregor Parzefall 2024-01-29 18:38:03 +01:00 committed by grorp
parent fa0745f7da
commit aac616fcc5
2 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/gui/touchscreengui.cpp
View File

@ -718,6 +718,7 @@ void TouchScreenGUI::handleReleaseEvent(size_t evt_id)
// By the way: Android reuses pointer IDs, so m_pointer_pos[evt_id]
// will be overwritten soon anyway.
m_pointer_downpos.erase(evt_id);
m_pointer_pos.erase(evt_id);
}
@ -808,6 +809,7 @@ void TouchScreenGUI::translateEvent(const SEvent &event)
}
}
m_pointer_downpos[event.TouchInput.ID] = touch_pos;
m_pointer_pos[event.TouchInput.ID] = touch_pos;
}
else if (event.TouchInput.Event == ETIE_LEFT_UP) {
@ -820,25 +822,24 @@ void TouchScreenGUI::translateEvent(const SEvent &event)
m_pointer_pos[event.TouchInput.ID] == touch_pos)
return;
const v2s32 dir_free_original = touch_pos - m_pointer_downpos[event.TouchInput.ID];
const v2s32 free_joystick_center = m_pointer_pos[event.TouchInput.ID];
const v2s32 dir_free = touch_pos - free_joystick_center;
const double touch_threshold_sq = m_touchscreen_threshold * m_touchscreen_threshold;
if (m_has_move_id && event.TouchInput.ID == m_move_id) {
if (dir_free.getLengthSQ() > touch_threshold_sq || m_move_has_really_moved) {
m_move_pos = touch_pos;
m_pointer_pos[event.TouchInput.ID] = touch_pos;
// update camera_yaw and camera_pitch
const double d = g_settings->getFloat("touchscreen_sensitivity", 0.001f, 10.0f)
* 6.0f / RenderingEngine::getDisplayDensity();
m_camera_yaw_change -= dir_free.X * d;
m_camera_pitch_change += dir_free.Y * d;
if (dir_free_original.getLengthSQ() > touch_threshold_sq)
m_move_has_really_moved = true;
m_move_pos = touch_pos;
m_pointer_pos[event.TouchInput.ID] = touch_pos;
const double d = g_settings->getFloat("touchscreen_sensitivity", 0.001f, 10.0f)
* 6.0f / RenderingEngine::getDisplayDensity();
// update camera_yaw and camera_pitch
m_camera_yaw_change -= dir_free.X * d;
m_camera_pitch_change += dir_free.Y * d;
}
}
if (m_has_joystick_id && event.TouchInput.ID == m_joystick_id) {

2
src/gui/touchscreengui.h
View File

@ -295,6 +295,8 @@ private:
// apply joystick status
void applyJoystickStatus();
// map to store the IDs and original positions of currently pressed pointers
std::unordered_map<size_t, v2s32> m_pointer_downpos;
// map to store the IDs and positions of currently pressed pointers
std::unordered_map<size_t, v2s32> m_pointer_pos;