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

Update libs, performance improve, update gui

Browse Source
This commit is contained in:
Maksim Gamarnik 2015-08-16 17:07:40 +03:00
parent f877bda0b6
commit 2a3fb395be
4 changed files with 45 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
build/android/Makefile
View File

@ -16,7 +16,7 @@ ROOT = $(shell pwd)
GAMES_TO_COPY = MultiCraft_game GAMES_TO_COPY = MultiCraft_game
# this string will be written to Files.zip in ver.txt # this string will be written to Files.zip in ver.txt
VER_TEXT = 1.0.1 VER_TEXT = 1.0.2
################################################################################ ################################################################################
# Android Version code # Android Version code
@ -82,7 +82,7 @@ IRRLICHT_TIMESTAMP = $(IRRLICHT_DIR)timestamp
IRRLICHT_TIMESTAMP_INT = $(ROOT)/deps/irrlicht_timestamp IRRLICHT_TIMESTAMP_INT = $(ROOT)/deps/irrlicht_timestamp
IRRLICHT_URL_SVN = http://svn.code.sf.net/p/irrlicht/code/branches/ogl-es/ IRRLICHT_URL_SVN = http://svn.code.sf.net/p/irrlicht/code/branches/ogl-es/
OPENSSL_VERSION = 1.0.1l OPENSSL_VERSION = 1.0.1p
OPENSSL_BASEDIR = openssl-$(OPENSSL_VERSION) OPENSSL_BASEDIR = openssl-$(OPENSSL_VERSION)
OPENSSL_DIR = $(ROOT)/deps/$(OPENSSL_BASEDIR)/ OPENSSL_DIR = $(ROOT)/deps/$(OPENSSL_BASEDIR)/
OPENSSL_LIB = $(OPENSSL_DIR)/libssl.so.1.0.0 OPENSSL_LIB = $(OPENSSL_DIR)/libssl.so.1.0.0
@ -90,7 +90,7 @@ OPENSSL_TIMESTAMP = $(OPENSSL_DIR)timestamp
OPENSSL_TIMESTAMP_INT = $(ROOT)/deps/openssl_timestamp OPENSSL_TIMESTAMP_INT = $(ROOT)/deps/openssl_timestamp
OPENSSL_URL = http://www.openssl.org/source/openssl-$(OPENSSL_VERSION).tar.gz OPENSSL_URL = http://www.openssl.org/source/openssl-$(OPENSSL_VERSION).tar.gz
CURL_VERSION = 7.43.0 CURL_VERSION = 7.44.0
CURL_DIR = $(ROOT)/deps/curl-$(CURL_VERSION) CURL_DIR = $(ROOT)/deps/curl-$(CURL_VERSION)
CURL_LIB = $(CURL_DIR)/lib/.libs/libcurl.a CURL_LIB = $(CURL_DIR)/lib/.libs/libcurl.a
CURL_TIMESTAMP = $(CURL_DIR)/timestamp CURL_TIMESTAMP = $(CURL_DIR)/timestamp
@ -102,7 +102,7 @@ GMP_DIR = $(ROOT)/deps/gmp-$(GMP_VERSION)
GMP_LIB = $(GMP_DIR)/usr/lib/libgmp.so GMP_LIB = $(GMP_DIR)/usr/lib/libgmp.so
GMP_TIMESTAMP = $(GMP_DIR)/timestamp GMP_TIMESTAMP = $(GMP_DIR)/timestamp
GMP_TIMESTAMP_INT = $(ROOT)/deps/gmp_timestamp GMP_TIMESTAMP_INT = $(ROOT)/deps/gmp_timestamp
GMP_URL_HTTP = https://gmplib.org/download/gmp/gmp-$(GMP_VERSION).tar.bz2 GMP_URL_HTTP = https://gmplib.org/download/gmp/gmp-$(GMP_VERSION)a.tar.bz2
FREETYPE_DIR = $(ROOT)/deps/freetype2-android/ FREETYPE_DIR = $(ROOT)/deps/freetype2-android/
FREETYPE_LIB = $(FREETYPE_DIR)/Android/obj/local/$(TARGET_ABI)/libfreetype2-static.a FREETYPE_LIB = $(FREETYPE_DIR)/Android/obj/local/$(TARGET_ABI)/libfreetype2-static.a
@ -110,7 +110,7 @@ FREETYPE_TIMESTAMP = $(FREETYPE_DIR)timestamp
FREETYPE_TIMESTAMP_INT = $(ROOT)/deps/freetype_timestamp FREETYPE_TIMESTAMP_INT = $(ROOT)/deps/freetype_timestamp
FREETYPE_URL_GIT = https://github.com/cdave1/freetype2-android FREETYPE_URL_GIT = https://github.com/cdave1/freetype2-android
SQLITE3_FOLDER = sqlite-amalgamation-3081002 SQLITE3_FOLDER = sqlite-amalgamation-3081101
SQLITE3_URL = http://www.sqlite.org/2015/$(SQLITE3_FOLDER).zip SQLITE3_URL = http://www.sqlite.org/2015/$(SQLITE3_FOLDER).zip
-include $(PATHCFGFILE) -include $(PATHCFGFILE)
@ -550,8 +550,8 @@ gmp_download :
mkdir -p ${ROOT}/deps; \ mkdir -p ${ROOT}/deps; \
cd deps; \ cd deps; \
wget ${GMP_URL_HTTP} || exit 1; \ wget ${GMP_URL_HTTP} || exit 1; \
tar -xjf gmp-${GMP_VERSION}.tar.bz2 || exit 1; \ tar -xjf gmp-${GMP_VERSION}a.tar.bz2 || exit 1; \
rm gmp-${GMP_VERSION}.tar.bz2; \ rm gmp-${GMP_VERSION}a.tar.bz2; \
ln -s gmp-${GMP_VERSION} gmp; \ ln -s gmp-${GMP_VERSION} gmp; \
fi fi

27
src/defaultsettings.cpp
View File

@ -68,7 +68,7 @@ void set_default_settings(Settings *settings)
settings->setDefault("3d_mode", "none"); settings->setDefault("3d_mode", "none");
settings->setDefault("3d_paralax_strength", "0.025"); settings->setDefault("3d_paralax_strength", "0.025");
settings->setDefault("aux1_descends", "false"); settings->setDefault("aux1_descends", "false");
settings->setDefault("doubletap_jump", "false"); settings->setDefault("doubletap_jump", "true");
settings->setDefault("always_fly_fast", "true"); settings->setDefault("always_fly_fast", "true");
settings->setDefault("directional_colored_fog", "true"); settings->setDefault("directional_colored_fog", "true");
settings->setDefault("tooltip_show_delay", "400"); settings->setDefault("tooltip_show_delay", "400");
@ -87,9 +87,16 @@ void set_default_settings(Settings *settings)
settings->setDefault("show_debug", "true"); settings->setDefault("show_debug", "true");
#endif #endif
settings->setDefault("wanted_fps", "30"); #ifdef __ANDROID__
settings->setDefault("wanted_fps", "15");
settings->setDefault("fps_max", "30");
settings->setDefault("pause_fps_max", "10");
#else
settings->setDefault("wanted_fps", "20");
settings->setDefault("fps_max", "60"); settings->setDefault("fps_max", "60");
settings->setDefault("pause_fps_max", "20"); settings->setDefault("pause_fps_max", "15");
#endif
// A bit more than the server will send around the player, to make fog blend well // A bit more than the server will send around the player, to make fog blend well
settings->setDefault("viewing_range_nodes_max", "240"); settings->setDefault("viewing_range_nodes_max", "240");
settings->setDefault("viewing_range_nodes_min", "35"); settings->setDefault("viewing_range_nodes_min", "35");
@ -101,7 +108,7 @@ void set_default_settings(Settings *settings)
settings->setDefault("vsync", "false"); settings->setDefault("vsync", "false");
settings->setDefault("address", ""); settings->setDefault("address", "");
settings->setDefault("random_input", "false"); settings->setDefault("random_input", "false");
settings->setDefault("client_unload_unused_data_timeout", "600"); settings->setDefault("client_unload_unused_data_timeout", "300");
settings->setDefault("enable_fog", "true"); settings->setDefault("enable_fog", "true");
settings->setDefault("fov", "72"); settings->setDefault("fov", "72");
settings->setDefault("view_bobbing", "true"); settings->setDefault("view_bobbing", "true");
@ -124,7 +131,7 @@ void set_default_settings(Settings *settings)
settings->setDefault("enable_clouds", "true"); settings->setDefault("enable_clouds", "true");
settings->setDefault("screenshot_path", "."); settings->setDefault("screenshot_path", ".");
settings->setDefault("view_bobbing_amount", "1.0"); settings->setDefault("view_bobbing_amount", "1.0");
settings->setDefault("fall_bobbing_amount", "0.0"); settings->setDefault("fall_bobbing_amount", "1.0");
#ifdef __ANDROID__ #ifdef __ANDROID__
settings->setDefault("enable_3d_clouds", "false"); settings->setDefault("enable_3d_clouds", "false");
#else #else
@ -132,7 +139,7 @@ void set_default_settings(Settings *settings)
#endif #endif
settings->setDefault("cloud_height", "120"); settings->setDefault("cloud_height", "120");
settings->setDefault("cloud_radius", "12"); settings->setDefault("cloud_radius", "12");
settings->setDefault("menu_clouds", "true"); settings->setDefault("menu_clouds", "false");
settings->setDefault("opaque_water", "false"); settings->setDefault("opaque_water", "false");
settings->setDefault("console_color", "(0,0,0)"); settings->setDefault("console_color", "(0,0,0)");
settings->setDefault("console_alpha", "200"); settings->setDefault("console_alpha", "200");
@ -161,7 +168,7 @@ void set_default_settings(Settings *settings)
settings->setDefault("bilinear_filter", "false"); settings->setDefault("bilinear_filter", "false");
settings->setDefault("trilinear_filter", "false"); settings->setDefault("trilinear_filter", "false");
settings->setDefault("texture_clean_transparent", "false"); settings->setDefault("texture_clean_transparent", "false");
settings->setDefault("texture_min_size", "64"); settings->setDefault("texture_min_size", "32");
settings->setDefault("preload_item_visuals", "false"); settings->setDefault("preload_item_visuals", "false");
settings->setDefault("enable_bumpmapping", "false"); settings->setDefault("enable_bumpmapping", "false");
settings->setDefault("enable_parallax_occlusion", "false"); settings->setDefault("enable_parallax_occlusion", "false");
@ -341,9 +348,9 @@ void set_default_settings(Settings *settings)
settings->setDefault("emergequeue_limit_generate", "8"); settings->setDefault("emergequeue_limit_generate", "8");
settings->setDefault("preload_item_visuals", "false"); settings->setDefault("preload_item_visuals", "false");
settings->setDefault("viewing_range_nodes_max", "50"); settings->setDefault("viewing_range_nodes_max", "75");
settings->setDefault("viewing_range_nodes_min", "20"); settings->setDefault("viewing_range_nodes_min", "25");
settings->setDefault("inventory_image_hack", "false"); settings->setDefault("inventory_image_hack", "true");
//check for device with small screen //check for device with small screen
float x_inches = ((double) porting::getDisplaySize().X / float x_inches = ((double) porting::getDisplaySize().X /

34
src/touchscreengui.cpp
View File

@ -48,14 +48,14 @@ const char *touchgui_button_imagenames[] = {
"drop_btn.png", "drop_btn.png",
"jump_btn.png", "jump_btn.png",
"down.png", "down.png",
"fly_btn.png",
#ifdef ENABLE_ANDROID_NOCLIP #ifdef ENABLE_ANDROID_NOCLIP
"fly_btn.png",
"noclip_btn.png", "noclip_btn.png",
#endif
"fast_btn.png", "fast_btn.png",
#endif
"debug_btn.png", "debug_btn.png",
"chat_btn.png", "chat_btn.png",
"camera_btn.png", // "camera_btn.png",
"rangeview_btn.png" "rangeview_btn.png"
}; };
@ -87,26 +87,26 @@ static irr::EKEY_CODE id2keycode(touch_gui_button_id id)
case crunch_id: case crunch_id:
key = "sneak"; key = "sneak";
break; break;
#ifdef ENABLE_ANDROID_NOCLIP
case fly_id: case fly_id:
key = "freemove"; key = "freemove";
break; break;
#ifdef ENABLE_ANDROID_NOCLIP
case noclip_id: case noclip_id:
key = "noclip"; key = "noclip";
break; break;
#endif
case fast_id: case fast_id:
key = "fastmove"; key = "fastmove";
break; break;
#endif
case debug_id: case debug_id:
key = "toggle_debug"; key = "toggle_debug";
break; break;
case chat_id: case chat_id:
key = "chat"; key = "chat";
break; break;
case camera_id: /* case camera_id:
key = "camera_mode"; key = "camera_mode";
break; break;*/
case range_id: case range_id:
key = "rangeselect"; key = "rangeselect";
break; break;
@ -265,12 +265,13 @@ void TouchScreenGUI::init(ISimpleTextureSource* tsrc, float density)
/* init crunch button */ /* init crunch button */
initButton(crunch_id, initButton(crunch_id,
rect<s32>(m_screensize.X-(2.5*button_size), rect<s32>(m_screensize.X-(2.2*button_size),
m_screensize.Y - (0.5*button_size), m_screensize.Y - (0.5*button_size),
m_screensize.X-(1.5*button_size), m_screensize.X-(1.2*button_size),
m_screensize.Y), m_screensize.Y),
L"H",false); L"H",false);
#ifdef ENABLE_ANDROID_NOCLIP
/* 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),
@ -279,7 +280,6 @@ void TouchScreenGUI::init(ISimpleTextureSource* tsrc, float density)
m_screensize.Y - (button_size*2.5)), m_screensize.Y - (button_size*2.5)),
L"fly", false, SLOW_BUTTON_REPEAT); L"fly", false, SLOW_BUTTON_REPEAT);
#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), rect<s32>(m_screensize.X - (0.75*button_size),
@ -287,7 +287,7 @@ void TouchScreenGUI::init(ISimpleTextureSource* tsrc, float density)
m_screensize.X, m_screensize.X,
m_screensize.Y - (button_size*4)), m_screensize.Y - (button_size*4)),
L"clip", false, SLOW_BUTTON_REPEAT); L"clip", false, SLOW_BUTTON_REPEAT);
#endif
/* init fast button */ /* init fast button */
initButton(fast_id, initButton(fast_id,
@ -296,7 +296,7 @@ void TouchScreenGUI::init(ISimpleTextureSource* tsrc, float density)
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);
#endif
#ifndef NDEBUG #ifndef NDEBUG
/* init debug button */ /* init debug button */
initButton(debug_id, initButton(debug_id,
@ -311,16 +311,18 @@ void TouchScreenGUI::init(ISimpleTextureSource* tsrc, float density)
m_screensize.X, 0.75*button_size), m_screensize.X, 0.75*button_size),
L"Chat", true); L"Chat", true);
/* init camera button */ /* init camera button
initButton(camera_id, initButton(camera_id,
rect<s32>(0, 0, rect<s32>(0, 0,
0.75*button_size, 0.75*button_size), 0.75*button_size, 0.75*button_size),
L"cam", false, SLOW_BUTTON_REPEAT); L"cam", false, SLOW_BUTTON_REPEAT);*/
/* init rangeselect button */ /* init rangeselect button */
initButton(range_id, initButton(range_id,
rect<s32>(0.75 * button_size, 0, rect<s32>(0, 0,
1.5 * button_size, 0.75*button_size), 0.75*button_size, 0.75*button_size),
/*rect<s32>(0.78 * button_size, 0,
1.5 * button_size, 0.75*button_size+0.03),*/
L"far", false, SLOW_BUTTON_REPEAT); L"far", false, SLOW_BUTTON_REPEAT);
} }

6
src/touchscreengui.h
View File

@ -44,14 +44,14 @@ typedef enum {
drop_id, drop_id,
jump_id, jump_id,
crunch_id, crunch_id,
fly_id,
#ifdef ENABLE_ANDROID_NOCLIP #ifdef ENABLE_ANDROID_NOCLIP
fly_id,
noclip_id, noclip_id,
#endif
fast_id, fast_id,
#endif
debug_id, debug_id,
chat_id, chat_id,
camera_id, // camera_id,
range_id, range_id,
after_last_element_id after_last_element_id
} touch_gui_button_id; } touch_gui_button_id;