From d1689752082bb702d7a8df6a00f46cd0f762850d Mon Sep 17 00:00:00 2001 From: Maksim Gamarnik Date: Fri, 12 Feb 2016 23:06:12 +0200 Subject: [PATCH] TouchScreenGui improvent. Stable --- src/defaultsettings.cpp | 5 ++--- src/touchscreengui.cpp | 10 +++++----- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/src/defaultsettings.cpp b/src/defaultsettings.cpp index 4f629f4ee..d083d4787 100644 --- a/src/defaultsettings.cpp +++ b/src/defaultsettings.cpp @@ -145,7 +145,7 @@ void set_default_settings(Settings *settings) settings->setDefault("gui_scaling", "1.0"); settings->setDefault("gui_scaling_filter", "false"); 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("sound_volume", "1"); settings->setDefault("desynchronize_mapblock_texture_animation", "true"); @@ -179,7 +179,7 @@ void set_default_settings(Settings *settings) settings->setDefault("enable_shaders", "true"); settings->setDefault("repeat_rightclick_time", "0.25"); settings->setDefault("enable_particles", "true"); - settings->setDefault("enable_mesh_cache", "false"); + settings->setDefault("enable_mesh_cache", "true"); settings->setDefault("enable_minimap", "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_min", "5"); settings->setDefault("inventory_image_hack", "true"); - settings->setDefault("mouse_sensitivity", "0.05"); settings->setDefault("enable_3d_clouds", "false"); settings->setDefault("wanted_fps", "25"); settings->setDefault("fps_max", "35"); diff --git a/src/touchscreengui.cpp b/src/touchscreengui.cpp index 693d60a8a..e46eaef8c 100644 --- a/src/touchscreengui.cpp +++ b/src/touchscreengui.cpp @@ -287,7 +287,7 @@ void TouchScreenGUI::init(ISimpleTextureSource* tsrc) m_screensize.Y - (button_size), m_screensize.X, m_screensize.Y), - L"inv", true); + L"inv", false, SLOW_BUTTON_REPEAT); /* init drop button */ initButton(drop_id, @@ -295,7 +295,7 @@ void TouchScreenGUI::init(ISimpleTextureSource* tsrc) m_screensize.Y/2-(1.75*button_size), m_screensize.X, m_screensize.Y/2-(1*button_size)), - L"drop", true); + L"drop", false, SLOW_BUTTON_REPEAT); /* init crunch button */ initButton(crunch_id, @@ -303,7 +303,7 @@ void TouchScreenGUI::init(ISimpleTextureSource* tsrc) m_screensize.Y-(0.5*button_size), m_screensize.X-(1.2*button_size), m_screensize.Y), - L"H",false); + L"H", false, SLOW_BUTTON_REPEAT); /*#ifdef ENABLE_ANDROID_NOCLIP // init fly button @@ -348,7 +348,7 @@ void TouchScreenGUI::init(ISimpleTextureSource* tsrc) initButton(chat_id, rect(m_screensize.X - (0.75*button_size), 0, m_screensize.X, 0.75*button_size), - L"Chat", true); + L"Chat", false, SLOW_BUTTON_REPEAT); /* init camera button initButton(camera_id, @@ -643,7 +643,7 @@ void TouchScreenGUI::translateEvent(const SEvent &event) s32 dy = Y - m_pointerpos[event.TouchInput.ID].Y; /* 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_pitch = m_camera_pitch;