MultiCraft
/
MultiCraft
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

TouchScreenGUI: update, add camera button

master
MoNTE48 2020-01-17 22:59:51 +01:00
parent fdc983d6f5
commit c4e71a602a
9 changed files with 91 additions and 103 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/game.cpp
View File

@ -2013,11 +2013,6 @@ bool Game::createClient(const std::string &playername,
return false; return false;
} }
//#ifdef __IOS__
// mapper->setMinimapMode(MINIMAP_MODE_SURFACE);
//#else
// mapper->setMinimapMode(MINIMAP_MODE_OFF);
//#endif
mapper = client->getMinimap(); mapper = client->getMinimap();
if (mapper) if (mapper)
mapper->setMinimapMode(MINIMAP_MODE_OFF); mapper->setMinimapMode(MINIMAP_MODE_OFF);
@ -2083,10 +2078,8 @@ bool Game::initGui()
guitext_profiler->setWordWrap(true); guitext_profiler->setWordWrap(true);
#ifdef HAVE_TOUCHSCREENGUI #ifdef HAVE_TOUCHSCREENGUI
if (g_touchscreengui) if (g_touchscreengui)
g_touchscreengui->init(texture_src); g_touchscreengui->init(texture_src);
#endif #endif
return true; return true;

181
src/touchscreengui.cpp
View File

@ -46,10 +46,10 @@ const char *touchgui_button_imagenames[][2] = {
{"escape_btn.png"}, {"escape_btn.png"},
{"minimap_btn.png"}, {"minimap_btn.png"},
{"rangeview_btn.png"}, {"rangeview_btn.png"},
{"camera_btn.png"},
{"chat_btn.png"} {"chat_btn.png"}
/* {"noclip_btn.png"}, // {"noclip_btn.png"},
{"fast_btn.png"}, // {"fast_btn.png"}
{"camera_btn.png"} */
}; };
static irr::EKEY_CODE id2keycode(touch_gui_button_id id) { static irr::EKEY_CODE id2keycode(touch_gui_button_id id) {
@ -102,17 +102,17 @@ static irr::EKEY_CODE id2keycode(touch_gui_button_id id) {
case range_id: case range_id:
key = "rangeselect"; key = "rangeselect";
break; break;
case camera_id:
key = "camera_mode";
break;
case chat_id: case chat_id:
key = "chat"; key = "chat";
break; break;
/* case noclip_id: /* case noclip_id:
key = "noclip"; key = "noclip";
break; break;
case fast_id: case fast_id:
key = "fast"; key = "fast";
break;
case camera_id:
key = "camera_mode";
break; */ break; */
case after_last_element_id: case after_last_element_id:
break; break;
@ -196,7 +196,6 @@ void TouchScreenGUI::initButton(touch_gui_button_id id, rect<s32> button_rect,
btn->immediate_release = immediate_release; btn->immediate_release = immediate_release;
btn->ids.clear(); btn->ids.clear();
load_button_texture(btn, id, button_rect, load_button_texture(btn, id, button_rect,
m_texturesource, m_device->getVideoDriver()); m_texturesource, m_device->getVideoDriver());
} }
@ -204,15 +203,13 @@ void TouchScreenGUI::initButton(touch_gui_button_id id, rect<s32> button_rect,
void TouchScreenGUI::init(ISimpleTextureSource *tsrc) { void TouchScreenGUI::init(ISimpleTextureSource *tsrc) {
assert(tsrc != nullptr); assert(tsrc != nullptr);
double control_pad_size = float density = porting::getDisplayDensity() * g_settings->getFloat("hud_scaling");
MYMIN(m_screensize.Y / 1.5, s32 button_size = static_cast<s32>(density * 60);
porting::getDisplayDensity() * g_settings->getFloat("hud_scaling") * 260); s32 ctlpad_size = static_cast<s32>(density * 85);
m_visible = true;
s32 button_size = static_cast<s32>(control_pad_size / 3); m_texturesource = tsrc;
m_visible = true; m_control_pad_rect = rect<s32>(0, (m_screensize.Y - ctlpad_size * 3),
m_texturesource = tsrc; (ctlpad_size * 3), m_screensize.Y);
m_control_pad_rect = rect<s32>(0, static_cast<s32>(m_screensize.Y - control_pad_size),
static_cast<s32>(control_pad_size), m_screensize.Y);
/* /*
draw control pad draw control pad
@ -225,10 +222,10 @@ void TouchScreenGUI::init(ISimpleTextureSource *tsrc) {
for (int y = 0; y < 3; ++y) for (int y = 0; y < 3; ++y)
for (int x = 0; x < 3; ++x, ++number) { for (int x = 0; x < 3; ++x, ++number) {
v2s32 tl; v2s32 tl;
tl.X = button_size * y; tl.X = ctlpad_size * y;
tl.Y = m_screensize.Y - button_size * (3 - x); tl.Y = m_screensize.Y - ctlpad_size * (3 - x);
rect<s32> button_rect(tl.X, tl.Y, tl.X + button_size, tl.Y + button_size); rect<s32> button_rect(tl.X, tl.Y, tl.X + ctlpad_size, tl.Y + ctlpad_size);
touch_gui_button_id id = after_last_element_id; touch_gui_button_id id = after_last_element_id;
std::wstring caption; std::wstring caption;
switch (number) { switch (number) {
@ -270,77 +267,94 @@ void TouchScreenGUI::init(ISimpleTextureSource *tsrc) {
default: default:
break; break;
} }
if (id != after_last_element_id) { if (id != after_last_element_id)
initButton(id, button_rect, caption, false); initButton(id, button_rect, caption, false);
}
} }
// init inventory button // init inventory button
initButton(inventory_id, initButton(inventory_id,
rect<s32>(m_screensize.X - button_size, rect<s32>(m_screensize.X - button_size * 1.5,
m_screensize.Y - button_size, m_screensize.Y - button_size * 1.5,
m_screensize.X, m_screensize.X,
m_screensize.Y), m_screensize.Y),
L"inv", false, SLOW_BUTTON_REPEAT); L"inv", false, SLOW_BUTTON_REPEAT);
// init drop button
initButton(drop_id,
rect<s32>(m_screensize.X - button_size * 0.75,
m_screensize.Y / 2 - button_size * 1.5,
m_screensize.X,
m_screensize.Y / 2 - button_size * 0.75),
L"drop", false, SLOW_BUTTON_REPEAT);
// init crunch button // init crunch button
initButton(crunch_id, initButton(crunch_id,
rect<s32>(m_screensize.X - button_size * 2, rect<s32>(m_screensize.X - button_size * 3,
m_screensize.Y - button_size / 2, m_screensize.Y - button_size / 1.5,
m_screensize.X - button_size, m_screensize.X - button_size * 1.5,
m_screensize.Y), m_screensize.Y),
L"H", false, SLOW_BUTTON_REPEAT); L"H", false, SLOW_BUTTON_REPEAT);
// init jump button // init jump button
initButton(jump_id, initButton(jump_id,
rect<s32>(m_screensize.X - button_size * 2, rect<s32>(m_screensize.X - button_size * 3,
m_screensize.Y - button_size * 2, m_screensize.Y - button_size * 3,
m_screensize.X - button_size, m_screensize.X - button_size * 1.5,
m_screensize.Y - button_size), m_screensize.Y - button_size * 1.5),
L"x", false, SLOW_BUTTON_REPEAT); L"x", false, SLOW_BUTTON_REPEAT);
// iOS does not have a physical pause button and have memory leak with minimap // init drop button
initButton(drop_id,
rect<s32>(m_screensize.X - button_size,
m_screensize.Y / 2 - button_size,
m_screensize.X,
m_screensize.Y / 2),
L"drop", false, SLOW_BUTTON_REPEAT);
//dirty implementation of positions for iOS
double button_075 = 1;
double button_05 = 1;
double button_05b = 0;
#ifdef __IOS__ #ifdef __IOS__
// init pause button button_075 = 0.75;
button_05 = 2;
button_05b = button_size / 2;
#endif
// init pause button [1]
initButton(escape_id, initButton(escape_id,
rect<s32>(m_screensize.X / 2 - button_size * 1.125, rect<s32>(m_screensize.X / 2 - button_size * 2 * button_075,
0, 0,
m_screensize.X / 2 - button_size * 0.375, m_screensize.X / 2 - button_size / button_05,
button_size * 0.75), button_size),
L"Exit", false, SLOW_BUTTON_REPEAT); L"Exit", false, SLOW_BUTTON_REPEAT);
#else // init minimap button [2]
// init minimap button #ifndef __IOS__
// iOS have memory leak with enabled minimap
initButton(minimap_id, initButton(minimap_id,
rect<s32>(m_screensize.X / 2 - button_size * 1.125, rect<s32>(m_screensize.X / 2 - button_size,
0, 0,
m_screensize.X / 2 - button_size * 0.375, m_screensize.X / 2,
button_size * 0.75), button_size),
L"minimap", false, SLOW_BUTTON_REPEAT); L"minimap", false, SLOW_BUTTON_REPEAT);
#endif #endif
// init rangeselect button
// init rangeselect button [3]
initButton(range_id, initButton(range_id,
rect<s32>(m_screensize.X / 2 - (button_size * 0.375), rect<s32>(m_screensize.X / 2 - button_05b,
0, 0,
m_screensize.X / 2 + (button_size * 0.375), m_screensize.X / 2 + button_size / button_05,
button_size * 0.75), button_size),
L"far", false, SLOW_BUTTON_REPEAT); L"far", false, SLOW_BUTTON_REPEAT);
// init camera button [4]
initButton(camera_id,
rect<s32>(m_screensize.X / 2 + button_size / button_05,
0,
m_screensize.X / 2 + button_size * 2 * button_075,
button_size),
L"cam", false, SLOW_BUTTON_REPEAT);
// init chat button // init chat button
initButton(chat_id, initButton(chat_id,
rect<s32>(m_screensize.X / 2 + (button_size * 0.375), rect<s32>(m_screensize.X - button_size * 1.25,
0, 0,
m_screensize.X / 2 + (button_size * 1.125), m_screensize.X,
button_size * 0.75), button_size),
L"Chat", false, SLOW_BUTTON_REPEAT); L"far", false, SLOW_BUTTON_REPEAT);
// init noclip button // init noclip button
/* initButton(noclip_id, /* initButton(noclip_id,
@ -355,15 +369,7 @@ void TouchScreenGUI::init(ISimpleTextureSource *tsrc) {
m_screensize.Y - button_size * 4, m_screensize.Y - button_size * 4,
m_screensize.X, m_screensize.X,
m_screensize.Y - button_size * 3.25), m_screensize.Y - button_size * 3.25),
L"fast", false, SLOW_BUTTON_REPEAT); L"fast", false, SLOW_BUTTON_REPEAT); */
// init camera button
initButton(camera_id,
rect<s32>(0,
0,
button_size * 0.75,
button_size * 0.75),
L"cam", false, SLOW_BUTTON_REPEAT); */
} }
touch_gui_button_id TouchScreenGUI::getButtonID(s32 x, s32 y) { touch_gui_button_id TouchScreenGUI::getButtonID(s32 x, s32 y) {
@ -375,9 +381,8 @@ touch_gui_button_id TouchScreenGUI::getButtonID(s32 x, s32 y) {
if (element) { if (element) {
for (unsigned int i = 0; i < after_last_element_id; i++) { for (unsigned int i = 0; i < after_last_element_id; i++) {
if (element == m_buttons[i].guibutton) { if (element == m_buttons[i].guibutton)
return (touch_gui_button_id) i; return (touch_gui_button_id) i;
}
} }
} }
} }
@ -451,8 +456,7 @@ void TouchScreenGUI::handleButtonEvent(touch_gui_button_id button,
m_receiver->OnEvent(*translated); m_receiver->OnEvent(*translated);
} }
// remove event // remove event
if ((!action) || (btn->immediate_release)) { if (!action || btn->immediate_release) {
std::vector<size_t>::iterator pos = std::vector<size_t>::iterator pos =
std::find(btn->ids.begin(),btn->ids.end(), eventID); std::find(btn->ids.begin(),btn->ids.end(), eventID);
// has to be in touch list // has to be in touch list
@ -474,11 +478,11 @@ void TouchScreenGUI::handleReleaseEvent(size_t evt_id) {
touch_gui_button_id button = getButtonID(evt_id); touch_gui_button_id button = getButtonID(evt_id);
// handle button events // handle button events
if (button != after_last_element_id) { if (button != after_last_element_id)
handleButtonEvent(button, evt_id, false); handleButtonEvent(button, evt_id, false);
}
// handle the point used for moving view // handle the point used for moving view
else if (evt_id == m_move_id) { if (evt_id == m_move_id) {
m_move_id = -1; m_move_id = -1;
// if this pointer issued a mouse event issue symmetric release here // if this pointer issued a mouse event issue symmetric release here
@ -527,9 +531,9 @@ void TouchScreenGUI::handleReleaseEvent(size_t evt_id) {
void TouchScreenGUI::handleReleaseAll() void TouchScreenGUI::handleReleaseAll()
{ {
m_known_ids.clear(); m_known_ids.clear();
if(m_move_id != -1) if (m_move_id != -1)
handleReleaseEvent(m_move_id); handleReleaseEvent(m_move_id);
for(int i = 0; i < after_last_element_id; i++) for (int i = 0; i < after_last_element_id; i++)
m_buttons[i].ids.clear(); m_buttons[i].ids.clear();
} }
@ -543,7 +547,6 @@ void TouchScreenGUI::translateEvent(const SEvent &event) {
return; return;
if (event.TouchInput.Event == ETIE_PRESSED_DOWN) { if (event.TouchInput.Event == ETIE_PRESSED_DOWN) {
/* add to own copy of eventlist ... /* add to own copy of eventlist ...
* android would provide this information but irrlicht guys don't * android would provide this information but irrlicht guys don't
* wanna design a efficient interface */ * wanna design a efficient interface */
@ -561,9 +564,8 @@ void TouchScreenGUI::translateEvent(const SEvent &event) {
// handle button events // handle button events
if (button != after_last_element_id) { if (button != after_last_element_id) {
handleButtonEvent(button, eventID, true); handleButtonEvent(button, eventID, true);
} else if (m_control_pad_rect.isPointInside(v2s32(toadd.X, toadd.Y)) || (isHUDButton(event))) { // ignore events inside the control pad and HUD if not already handled
// ignore events inside the control pad not already handled } else if (!(m_control_pad_rect.isPointInside(v2s32(toadd.X, toadd.Y)) || isHUDButton(event))) {
} else {
// handle non button events // handle non button events
// if we don't already have a moving point make this the moving one // if we don't already have a moving point make this the moving one
if (m_move_id == -1) { if (m_move_id == -1) {
@ -614,7 +616,7 @@ void TouchScreenGUI::translateEvent(const SEvent &event) {
(m_pointerpos[event.TouchInput.ID].Y - event.TouchInput.Y) * (m_pointerpos[event.TouchInput.ID].Y - event.TouchInput.Y) *
(m_pointerpos[event.TouchInput.ID].Y - event.TouchInput.Y)); (m_pointerpos[event.TouchInput.ID].Y - event.TouchInput.Y));
if ((distance > g_settings->getU16("touchscreen_threshold")) || if (distance > g_settings->getU16("touchscreen_threshold") ||
(m_move_has_really_moved)) { (m_move_has_really_moved)) {
m_move_has_really_moved = true; m_move_has_really_moved = true;
s32 X = event.TouchInput.X; s32 X = event.TouchInput.X;
@ -653,15 +655,12 @@ void TouchScreenGUI::translateEvent(const SEvent &event) {
void TouchScreenGUI::handleChangedButton(const SEvent &event) { void TouchScreenGUI::handleChangedButton(const SEvent &event) {
for (unsigned int i = 0; i < after_last_element_id; i++) { for (unsigned int i = 0; i < after_last_element_id; i++) {
if (m_buttons[i].ids.empty()) if (m_buttons[i].ids.empty())
continue; continue;
for (std::vector<size_t>::iterator iter = m_buttons[i].ids.begin(); for (std::vector<size_t>::iterator iter = m_buttons[i].ids.begin();
iter != m_buttons[i].ids.end(); ++iter) { iter != m_buttons[i].ids.end(); ++iter) {
if (event.TouchInput.ID == *iter) { if (event.TouchInput.ID == *iter) {
int current_button_id = int current_button_id =
getButtonID(event.TouchInput.X, event.TouchInput.Y); getButtonID(event.TouchInput.X, event.TouchInput.Y);
@ -676,7 +675,6 @@ void TouchScreenGUI::handleChangedButton(const SEvent &event) {
handleButtonEvent((touch_gui_button_id) current_button_id, *iter, true); handleButtonEvent((touch_gui_button_id) current_button_id, *iter, true);
return; return;
} }
} }
} }
@ -688,10 +686,9 @@ void TouchScreenGUI::handleChangedButton(const SEvent &event) {
button_info *btn = &m_buttons[current_button_id]; button_info *btn = &m_buttons[current_button_id];
if (std::find(btn->ids.begin(), btn->ids.end(), event.TouchInput.ID) if (std::find(btn->ids.begin(), btn->ids.end(), event.TouchInput.ID)
== btn->ids.end()) { == btn->ids.end())
handleButtonEvent((touch_gui_button_id) current_button_id, handleButtonEvent((touch_gui_button_id) current_button_id,
event.TouchInput.ID, true); event.TouchInput.ID, true);
}
} }
// Punch or left click // Punch or left click
@ -769,7 +766,6 @@ void TouchScreenGUI::step(float dtime) {
if ((m_move_id != -1) && if ((m_move_id != -1) &&
(!m_move_has_really_moved) && (!m_move_has_really_moved) &&
(!m_move_sent_as_mouse_event)) { (!m_move_sent_as_mouse_event)) {
u64 delta = porting::getDeltaMs(m_move_downtime, porting::getTimeMs()); u64 delta = porting::getDeltaMs(m_move_downtime, porting::getTimeMs());
if (delta > (MIN_DIG_TIME * 1000.F)) { if (delta > (MIN_DIG_TIME * 1000.F)) {
@ -807,9 +803,8 @@ void TouchScreenGUI::Toggle(bool visible) {
m_visible = visible; m_visible = visible;
for (unsigned int i = 0; i < after_last_element_id; i++) { for (unsigned int i = 0; i < after_last_element_id; i++) {
button_info *btn = &m_buttons[i]; button_info *btn = &m_buttons[i];
if (btn->guibutton != nullptr) { if (btn->guibutton != nullptr)
btn->guibutton->setVisible(visible); btn->guibutton->setVisible(visible);
}
} }
// clear all active buttons // clear all active buttons

6
src/touchscreengui.h
View File

@ -51,10 +51,10 @@ typedef enum {
escape_id, escape_id,
minimap_id, minimap_id,
range_id, range_id,
camera_id,
chat_id, chat_id,
/* noclip_id, // noclip_id,
fast_id, // fast_id,
camera_id, */
after_last_element_id after_last_element_id
} touch_gui_button_id; } touch_gui_button_id;

BIN
textures/base/camera_btn.png Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 337 B

BIN
textures/base/chat_btn.png Normal file → Executable file
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 293 B

After

Width:  |  Height:  |  Size: 278 B

BIN
textures/base/empty_btn.png Normal file → Executable file
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 210 B

After

Width:  |  Height:  |  Size: 221 B

BIN
textures/base/escape_btn.png Normal file → Executable file
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 242 B

After

Width:  |  Height:  |  Size: 245 B

BIN
textures/base/minimap_btn.png Normal file → Executable file
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 427 B

After

Width:  |  Height:  |  Size: 351 B

BIN
textures/base/rangeview_btn.png Normal file → Executable file
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 392 B

After

Width:  |  Height:  |  Size: 377 B