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

Virtual joystick: Use s32 when using m_screensize as a subtrahend (#12814)

Browse Source 
If still uses u32, m_screensize will yield a big value (underflow) when used as a subtrahend.
ETIE_MOVED is allowed to be run if joystick's ID is available and virtual joystick is fixed.
Add .0f for some float values.
This commit is contained in:
Muhammad Rifqi Priyo Susanto 2022-11-26 21:16:14 +07:00 committed by GitHub
parent f04d4d0291
commit 40a45b8c99
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/gui/touchscreengui.cpp
View File

@ -773,7 +773,7 @@ void TouchScreenGUI::translateEvent(const SEvent &event)
m_rarecontrolsbar.deactivate(); m_rarecontrolsbar.deactivate();
s32 dxj = event.TouchInput.X - button_size * 5.0f / 2.0f; s32 dxj = event.TouchInput.X - button_size * 5.0f / 2.0f;
s32 dyj = event.TouchInput.Y - m_screensize.Y + button_size * 5.0f / 2.0f; s32 dyj = event.TouchInput.Y - (s32)m_screensize.Y + button_size * 5.0f / 2.0f;
/* Select joystick when left 1/3 of screen dragged or /* Select joystick when left 1/3 of screen dragged or
* when joystick tapped (fixed joystick position) * when joystick tapped (fixed joystick position)
@ -824,8 +824,9 @@ void TouchScreenGUI::translateEvent(const SEvent &event)
} else { } else {
assert(event.TouchInput.Event == ETIE_MOVED); assert(event.TouchInput.Event == ETIE_MOVED);
if (m_pointerpos[event.TouchInput.ID] == if (!(m_has_joystick_id && m_fixed_joystick) &&
v2s32(event.TouchInput.X, event.TouchInput.Y)) m_pointerpos[event.TouchInput.ID] ==
v2s32(event.TouchInput.X, event.TouchInput.Y))
return; return;
if (m_has_move_id) { if (m_has_move_id) {
@ -878,14 +879,14 @@ void TouchScreenGUI::translateEvent(const SEvent &event)
s32 dx = X - m_pointerpos[event.TouchInput.ID].X; s32 dx = X - m_pointerpos[event.TouchInput.ID].X;
s32 dy = Y - m_pointerpos[event.TouchInput.ID].Y; s32 dy = Y - m_pointerpos[event.TouchInput.ID].Y;
if (m_fixed_joystick) { if (m_fixed_joystick) {
dx = X - button_size * 5 / 2; dx = X - button_size * 5.0f / 2.0f;
dy = Y - m_screensize.Y + button_size * 5 / 2; dy = Y - (s32)m_screensize.Y + button_size * 5.0f / 2.0f;
} }
double distance_sq = dx * dx + dy * dy; double distance_sq = dx * dx + dy * dy;
s32 dxj = event.TouchInput.X - button_size * 5.0f / 2.0f; s32 dxj = event.TouchInput.X - button_size * 5.0f / 2.0f;
s32 dyj = event.TouchInput.Y - m_screensize.Y + button_size * 5.0f / 2.0f; s32 dyj = event.TouchInput.Y - (s32)m_screensize.Y + button_size * 5.0f / 2.0f;
bool inside_joystick = (dxj * dxj + dyj * dyj <= button_size * button_size * 1.5 * 1.5); bool inside_joystick = (dxj * dxj + dyj * dyj <= button_size * button_size * 1.5 * 1.5);
if (m_joystick_has_really_moved || inside_joystick || if (m_joystick_has_really_moved || inside_joystick ||
@ -936,8 +937,8 @@ void TouchScreenGUI::translateEvent(const SEvent &event)
s32 ndy = button_size * dy / distance - button_size / 2.0f; s32 ndy = button_size * dy / distance - button_size / 2.0f;
if (m_fixed_joystick) { if (m_fixed_joystick) {
m_joystick_btn_center->guibutton->setRelativePosition(v2s32( m_joystick_btn_center->guibutton->setRelativePosition(v2s32(
button_size * 5 / 2 + ndx, button_size * 5.0f / 2.0f + ndx,
m_screensize.Y - button_size * 5 / 2 + ndy)); m_screensize.Y - button_size * 5.0f / 2.0f + ndy));
} else { } else {
m_joystick_btn_center->guibutton->setRelativePosition(v2s32( m_joystick_btn_center->guibutton->setRelativePosition(v2s32(
m_pointerpos[event.TouchInput.ID].X + ndx, m_pointerpos[event.TouchInput.ID].X + ndx,