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

Move android GUI buttons around

Browse Source
This commit is contained in:
OttoLidenbrock 2015-05-02 20:28:09 +10:00
parent d0c6354f3a
commit ff3d30df0f
2 changed files with 22 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/touchscreengui.cpp
View File

@ -206,10 +206,7 @@ void TouchScreenGUI::init(ISimpleTextureSource* tsrc, float density)
v2s32 tl; v2s32 tl;
tl.X = y * (button_size + spacing) + spacing; tl.X = y * (button_size + spacing) + spacing;
tl.Y = m_screensize.Y - (button_size + spacing) * (3 - x); tl.Y = m_screensize.Y - (button_size + spacing) * (3 - x);
// rect<s32> button_rect(
// y * (button_size) + spacing * y, m_screensize.Y - button_size * (3 - x ) - spacing * (3 - x),
// (y + 1) * button_size + spacing * y, m_screensize.Y - button_size * (2 - x ) - spacing * (2 - 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 + button_size, tl.Y + button_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;
@ -251,17 +248,17 @@ void TouchScreenGUI::init(ISimpleTextureSource* tsrc, float density)
/* init inventory button */ /* init inventory button */
initButton(inventory_id, initButton(inventory_id,
rect<s32>(m_screensize.X-(3*button_size), rect<s32>(m_screensize.X-(0.5*button_size),
m_screensize.Y - (0.5*button_size), m_screensize.Y - (0.5*button_size),
m_screensize.X-(2.5*button_size), m_screensize.X-(0.0*button_size),
m_screensize.Y), m_screensize.Y),
L"inv", true); L"inv", true);
/* init drop button */ /* init drop button */
initButton(drop_id, initButton(drop_id,
rect<s32>(m_screensize.X-(0.5*button_size), rect<s32>(m_screensize.X-(3*button_size),
m_screensize.Y - (0.5*button_size), m_screensize.Y - (0.5*button_size),
m_screensize.X-(0.0*button_size), m_screensize.X-(2.5*button_size),
m_screensize.Y), m_screensize.Y),
L"drop", true); L"drop", true);
@ -276,22 +273,27 @@ void TouchScreenGUI::init(ISimpleTextureSource* tsrc, float density)
/* init fly button */ /* init fly button */
initButton(fly_id, initButton(fly_id,
rect<s32>(m_screensize.X - (0.75*button_size), rect<s32>(m_screensize.X - (0.75*button_size),
m_screensize.Y - (2.25*button_size), m_screensize.Y - (3.25*button_size),
m_screensize.X, m_screensize.Y - (button_size*1.5)), m_screensize.X,
m_screensize.Y - (button_size*2.5)),
L"fly", false, SLOW_BUTTON_REPEAT); L"fly", false, SLOW_BUTTON_REPEAT);
#ifdef ENABLE_ANDROID_NOCLIP #ifdef ENABLE_ANDROID_NOCLIP
/* init noclip button */ /* init noclip button */
initButton(noclip_id, initButton(noclip_id,
rect<s32>(m_screensize.X - (0.75*button_size), m_screensize.Y - (3.75*button_size), rect<s32>(m_screensize.X - (0.75*button_size),
m_screensize.X, m_screensize.Y - (button_size*3)), m_screensize.Y - (4.75*button_size),
m_screensize.X,
m_screensize.Y - (button_size*4)),
L"clip", false, SLOW_BUTTON_REPEAT); L"clip", false, SLOW_BUTTON_REPEAT);
#endif #endif
/* init fast button */ /* init fast button */
initButton(fast_id, initButton(fast_id,
rect<s32>(m_screensize.X - (0.75*button_size), m_screensize.Y - (3*button_size), rect<s32>(m_screensize.X - (0.75*button_size),
m_screensize.X, m_screensize.Y - (button_size*2.25)), m_screensize.Y - (4*button_size),
m_screensize.X,
m_screensize.Y - (button_size*3.25)),
L"fast", false, SLOW_BUTTON_REPEAT); L"fast", false, SLOW_BUTTON_REPEAT);
#ifndef NDEBUG #ifndef NDEBUG

2
src/touchscreengui.h
View File

@ -29,6 +29,8 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#include "game.h" #include "game.h"
#include "client/tile.h" #include "client/tile.h"
//#define ENABLE_ANDROID_NOCLIP
using namespace irr; using namespace irr;
using namespace irr::core; using namespace irr::core;
using namespace irr::gui; using namespace irr::gui;