Wuzzy/BlockColor-Engine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

TouchScreenGui improvent.

Browse Source 
Stable
This commit is contained in:
Maksim Gamarnik 2016-02-12 23:06:12 +02:00
parent 69f679800d
commit d168975208
2 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/defaultsettings.cpp
View File

@ -145,7 +145,7 @@ void set_default_settings(Settings *settings)
settings->setDefault("gui_scaling", "1.0"); settings->setDefault("gui_scaling", "1.0");
settings->setDefault("gui_scaling_filter", "false"); settings->setDefault("gui_scaling_filter", "false");
settings->setDefault("gui_scaling_filter_txr2img", "true"); settings->setDefault("gui_scaling_filter_txr2img", "true");
settings->setDefault("mouse_sensitivity", "0.05"); settings->setDefault("mouse_sensitivity", "0.1");
settings->setDefault("enable_sound", "true"); settings->setDefault("enable_sound", "true");
settings->setDefault("sound_volume", "1"); settings->setDefault("sound_volume", "1");
settings->setDefault("desynchronize_mapblock_texture_animation", "true"); settings->setDefault("desynchronize_mapblock_texture_animation", "true");
@ -179,7 +179,7 @@ void set_default_settings(Settings *settings)
settings->setDefault("enable_shaders", "true"); settings->setDefault("enable_shaders", "true");
settings->setDefault("repeat_rightclick_time", "0.25"); settings->setDefault("repeat_rightclick_time", "0.25");
settings->setDefault("enable_particles", "true"); settings->setDefault("enable_particles", "true");
settings->setDefault("enable_mesh_cache", "false"); settings->setDefault("enable_mesh_cache", "true");
settings->setDefault("enable_minimap", "true"); settings->setDefault("enable_minimap", "true");
settings->setDefault("minimap_shape_round", "true"); settings->setDefault("minimap_shape_round", "true");
@ -348,7 +348,6 @@ void set_default_settings(Settings *settings)
settings->setDefault("viewing_range_nodes_max", "50"); settings->setDefault("viewing_range_nodes_max", "50");
settings->setDefault("viewing_range_nodes_min", "5"); settings->setDefault("viewing_range_nodes_min", "5");
settings->setDefault("inventory_image_hack", "true"); settings->setDefault("inventory_image_hack", "true");
settings->setDefault("mouse_sensitivity", "0.05");
settings->setDefault("enable_3d_clouds", "false"); settings->setDefault("enable_3d_clouds", "false");
settings->setDefault("wanted_fps", "25"); settings->setDefault("wanted_fps", "25");
settings->setDefault("fps_max", "35"); settings->setDefault("fps_max", "35");

10
src/touchscreengui.cpp
View File

@ -287,7 +287,7 @@ void TouchScreenGUI::init(ISimpleTextureSource* tsrc)
m_screensize.Y - (button_size), m_screensize.Y - (button_size),
m_screensize.X, m_screensize.X,
m_screensize.Y), m_screensize.Y),
L"inv", true); L"inv", false, SLOW_BUTTON_REPEAT);
/* init drop button */ /* init drop button */
initButton(drop_id, initButton(drop_id,
@ -295,7 +295,7 @@ void TouchScreenGUI::init(ISimpleTextureSource* tsrc)
m_screensize.Y/2-(1.75*button_size), m_screensize.Y/2-(1.75*button_size),
m_screensize.X, m_screensize.X,
m_screensize.Y/2-(1*button_size)), m_screensize.Y/2-(1*button_size)),
L"drop", true); L"drop", false, SLOW_BUTTON_REPEAT);
/* init crunch button */ /* init crunch button */
initButton(crunch_id, initButton(crunch_id,
@ -303,7 +303,7 @@ void TouchScreenGUI::init(ISimpleTextureSource* tsrc)
m_screensize.Y-(0.5*button_size), m_screensize.Y-(0.5*button_size),
m_screensize.X-(1.2*button_size), m_screensize.X-(1.2*button_size),
m_screensize.Y), m_screensize.Y),
L"H",false); L"H", false, SLOW_BUTTON_REPEAT);
/*#ifdef ENABLE_ANDROID_NOCLIP /*#ifdef ENABLE_ANDROID_NOCLIP
// init fly button // init fly button
@ -348,7 +348,7 @@ void TouchScreenGUI::init(ISimpleTextureSource* tsrc)
initButton(chat_id, initButton(chat_id,
rect<s32>(m_screensize.X - (0.75*button_size), 0, rect<s32>(m_screensize.X - (0.75*button_size), 0,
m_screensize.X, 0.75*button_size), m_screensize.X, 0.75*button_size),
L"Chat", true); L"Chat", false, SLOW_BUTTON_REPEAT);
/* init camera button /* init camera button
initButton(camera_id, initButton(camera_id,
@ -643,7 +643,7 @@ void TouchScreenGUI::translateEvent(const SEvent &event)
s32 dy = Y - m_pointerpos[event.TouchInput.ID].Y; s32 dy = Y - m_pointerpos[event.TouchInput.ID].Y;
/* adapt to similar behaviour as pc screen */ /* adapt to similar behaviour as pc screen */
double d = g_settings->getFloat("mouse_sensitivity") *4; double d = g_settings->getFloat("mouse_sensitivity") ;
double old_yaw = m_camera_yaw; double old_yaw = m_camera_yaw;
double old_pitch = m_camera_pitch; double old_pitch = m_camera_pitch;