Skip to content

Commit 62feade

Browse files
KodexKyZeno-
KodexKy
authored and
Zeno-
committedDec 29, 2014
Add extra buttons to Android GUI. All icons are licensed by freepik.com under CC BY 3.0
·
5.11.00.4.12
1 parent 4150e53 commit 62feade

9 files changed

+86
-9
lines changed
 

‎src/touchscreengui.cpp

+78-8
Original file line numberDiff line numberDiff line change
@@ -40,10 +40,17 @@ const char** touchgui_button_imagenames = (const char*[]) {
4040
"down_arrow.png",
4141
"left_arrow.png",
4242
"right_arrow.png",
43+
"inventory_btn.png",
44+
"drop_btn.png",
4345
"jump_btn.png",
4446
"down.png",
45-
"inventory_btn.png",
46-
"chat_btn.png"
47+
"fly_btn.png",
48+
"noclip_btn.png",
49+
"fast_btn.png",
50+
"debug_btn.png",
51+
"chat_btn.png",
52+
"camera_btn.png",
53+
"rangeview_btn.png"
4754
};
4855

4956
static irr::EKEY_CODE id2keycode(touch_gui_button_id id)
@@ -62,17 +69,38 @@ static irr::EKEY_CODE id2keycode(touch_gui_button_id id)
6269
case backward_id:
6370
key = "backward";
6471
break;
72+
case inventory_id:
73+
key = "inventory";
74+
break;
75+
case drop_id:
76+
key = "drop";
77+
break;
6578
case jump_id:
6679
key = "jump";
6780
break;
68-
case inventory_id:
69-
key = "inventory";
81+
case crunch_id:
82+
key = "sneak";
83+
break;
84+
case fly_id:
85+
key = "freemove";
86+
break;
87+
case noclip_id:
88+
key = "noclip";
89+
break;
90+
case fast_id:
91+
key = "fastmove";
92+
break;
93+
case debug_id:
94+
key = "toggle_debug";
7095
break;
7196
case chat_id:
7297
key = "chat";
7398
break;
74-
case crunch_id:
75-
key = "sneak";
99+
case camera_id:
100+
key = "camera_mode";
101+
break;
102+
case range_id:
103+
key = "rangeselect";
76104
break;
77105
}
78106
assert(key != "");
@@ -186,6 +214,11 @@ void TouchScreenGUI::init(ISimpleTextureSource* tsrc, float density)
186214
rect<s32>(0, m_screensize.Y - (button_size/2),
187215
(button_size/2), m_screensize.Y), L"inv", true);
188216

217+
/* init drop button */
218+
initButton(drop_id,
219+
rect<s32>(2.5*button_size, m_screensize.Y - (button_size/2),
220+
3*button_size, m_screensize.Y), L"drop", true);
221+
189222
/* init jump button */
190223
initButton(jump_id,
191224
rect<s32>(m_screensize.X-(1.75*button_size),
@@ -202,11 +235,48 @@ void TouchScreenGUI::init(ISimpleTextureSource* tsrc, float density)
202235
m_screensize.Y),
203236
L"H",false);
204237

238+
/* init fly button */
239+
initButton(fly_id,
240+
rect<s32>(m_screensize.X - (0.75*button_size),
241+
m_screensize.Y - (2.25*button_size),
242+
m_screensize.X, m_screensize.Y - (button_size*1.5)),
243+
L"fly", true);
244+
245+
/* init noclip button */
246+
initButton(noclip_id,
247+
rect<s32>(m_screensize.X - (0.75*button_size), 2.25*button_size,
248+
m_screensize.X, 3*button_size),
249+
L"clip", true);
250+
251+
/* init fast button */
252+
initButton(fast_id,
253+
rect<s32>(m_screensize.X - (0.75*button_size), 1.5*button_size,
254+
m_screensize.X, 2.25*button_size),
255+
L"fast", true);
256+
257+
/* init debug button */
258+
initButton(debug_id,
259+
rect<s32>(m_screensize.X - (0.75*button_size), 0.75*button_size,
260+
m_screensize.X, 1.5*button_size),
261+
L"dbg", true);
262+
205263
/* init chat button */
206264
initButton(chat_id,
207-
rect<s32>(m_screensize.X-(1.5*button_size), 0,
208-
m_screensize.X, button_size),
265+
rect<s32>(m_screensize.X - (0.75*button_size), 0,
266+
m_screensize.X, 0.75*button_size),
209267
L"Chat", true);
268+
269+
/* init camera button */
270+
initButton(camera_id,
271+
rect<s32>(m_screensize.X - (1.5*button_size), 0,
272+
m_screensize.X - (0.75*button_size), 0.75*button_size),
273+
L"cam", true);
274+
275+
/* init rangeselect button */
276+
initButton(range_id,
277+
rect<s32>(m_screensize.X - (2.25*button_size), 0,
278+
m_screensize.X - (1.5*button_size), 0.75*button_size),
279+
L"far", true);
210280
}
211281

212282
touch_gui_button_id TouchScreenGUI::getButtonID(s32 x, s32 y)

‎src/touchscreengui.h

+8-1
Original file line numberDiff line numberDiff line change
@@ -38,10 +38,17 @@ typedef enum {
3838
backward_id,
3939
left_id,
4040
right_id,
41+
inventory_id,
42+
drop_id,
4143
jump_id,
4244
crunch_id,
43-
inventory_id,
45+
fly_id,
46+
noclip_id,
47+
fast_id,
48+
debug_id,
4449
chat_id,
50+
camera_id,
51+
range_id,
4552
after_last_element_id
4653
} touch_gui_button_id;
4754

‎textures/base/pack/camera_btn.png

789 Bytes
Loading

‎textures/base/pack/debug_btn.png

960 Bytes
Loading

‎textures/base/pack/drop_btn.png

561 Bytes
Loading

‎textures/base/pack/fast_btn.png

935 Bytes
Loading

‎textures/base/pack/fly_btn.png

783 Bytes
Loading

‎textures/base/pack/noclip_btn.png

1.12 KB
Loading

‎textures/base/pack/rangeview_btn.png

1.57 KB
Loading

0 commit comments

Comments
 (0)
Please sign in to comment.