mirror of
https://github.com/minetest/minetest.git
synced 2024-12-25 07:32:24 +01:00
Simplify loading of Android version of menu
This commit is contained in:
parent
d2b5ba83b0
commit
c4e393deea
@ -38,18 +38,22 @@ dofile(menupath .. DIR_DELIM .. "gamemgr.lua")
|
|||||||
dofile(menupath .. DIR_DELIM .. "modmgr.lua")
|
dofile(menupath .. DIR_DELIM .. "modmgr.lua")
|
||||||
dofile(menupath .. DIR_DELIM .. "store.lua")
|
dofile(menupath .. DIR_DELIM .. "store.lua")
|
||||||
dofile(menupath .. DIR_DELIM .. "dlg_config_world.lua")
|
dofile(menupath .. DIR_DELIM .. "dlg_config_world.lua")
|
||||||
|
dofile(menupath .. DIR_DELIM .. "tab_credits.lua")
|
||||||
|
dofile(menupath .. DIR_DELIM .. "tab_mods.lua")
|
||||||
|
dofile(menupath .. DIR_DELIM .. "tab_settings.lua")
|
||||||
|
if PLATFORM ~= "Android" then
|
||||||
dofile(menupath .. DIR_DELIM .. "dlg_create_world.lua")
|
dofile(menupath .. DIR_DELIM .. "dlg_create_world.lua")
|
||||||
dofile(menupath .. DIR_DELIM .. "dlg_delete_mod.lua")
|
dofile(menupath .. DIR_DELIM .. "dlg_delete_mod.lua")
|
||||||
dofile(menupath .. DIR_DELIM .. "dlg_delete_world.lua")
|
dofile(menupath .. DIR_DELIM .. "dlg_delete_world.lua")
|
||||||
dofile(menupath .. DIR_DELIM .. "dlg_rename_modpack.lua")
|
dofile(menupath .. DIR_DELIM .. "dlg_rename_modpack.lua")
|
||||||
dofile(menupath .. DIR_DELIM .. "tab_credits.lua")
|
|
||||||
dofile(menupath .. DIR_DELIM .. "tab_mods.lua")
|
|
||||||
dofile(menupath .. DIR_DELIM .. "tab_multiplayer.lua")
|
dofile(menupath .. DIR_DELIM .. "tab_multiplayer.lua")
|
||||||
dofile(menupath .. DIR_DELIM .. "tab_server.lua")
|
dofile(menupath .. DIR_DELIM .. "tab_server.lua")
|
||||||
dofile(menupath .. DIR_DELIM .. "tab_settings.lua")
|
|
||||||
dofile(menupath .. DIR_DELIM .. "tab_singleplayer.lua")
|
dofile(menupath .. DIR_DELIM .. "tab_singleplayer.lua")
|
||||||
dofile(menupath .. DIR_DELIM .. "tab_texturepacks.lua")
|
dofile(menupath .. DIR_DELIM .. "tab_texturepacks.lua")
|
||||||
dofile(menupath .. DIR_DELIM .. "textures.lua")
|
dofile(menupath .. DIR_DELIM .. "textures.lua")
|
||||||
|
else
|
||||||
|
dofile(menupath .. DIR_DELIM .. "tab_simple_main.lua")
|
||||||
|
end
|
||||||
|
|
||||||
--------------------------------------------------------------------------------
|
--------------------------------------------------------------------------------
|
||||||
local function main_event_handler(tabview, event)
|
local function main_event_handler(tabview, event)
|
||||||
@ -61,24 +65,22 @@ end
|
|||||||
|
|
||||||
--------------------------------------------------------------------------------
|
--------------------------------------------------------------------------------
|
||||||
local function init_globals()
|
local function init_globals()
|
||||||
--init gamedata
|
-- Init gamedata
|
||||||
gamedata.worldindex = 0
|
gamedata.worldindex = 0
|
||||||
|
|
||||||
|
|
||||||
|
if PLATFORM ~= "Android" then
|
||||||
menudata.worldlist = filterlist.create(
|
menudata.worldlist = filterlist.create(
|
||||||
core.get_worlds,
|
core.get_worlds,
|
||||||
compare_worlds,
|
compare_worlds,
|
||||||
|
-- Unique id comparison function
|
||||||
function(element, uid)
|
function(element, uid)
|
||||||
if element.name == uid then
|
return element.name == uid
|
||||||
return true
|
end,
|
||||||
end
|
-- Filter function
|
||||||
return false
|
|
||||||
end, --unique id compare fct
|
|
||||||
function(element, gameid)
|
function(element, gameid)
|
||||||
if element.gameid == gameid then
|
return element.gameid == gameid
|
||||||
return true
|
|
||||||
end
|
end
|
||||||
return false
|
|
||||||
end --filter fct
|
|
||||||
)
|
)
|
||||||
|
|
||||||
menudata.worldlist:add_sort_mechanism("alphabetic", sort_worlds_alphabetic)
|
menudata.worldlist:add_sort_mechanism("alphabetic", sort_worlds_alphabetic)
|
||||||
@ -90,26 +92,68 @@ local function init_globals()
|
|||||||
end
|
end
|
||||||
|
|
||||||
mm_texture.init()
|
mm_texture.init()
|
||||||
|
else
|
||||||
|
local world_list = core.get_worlds()
|
||||||
|
|
||||||
--create main tabview
|
local found_singleplayerworld = false
|
||||||
|
|
||||||
|
for world in pairs(world_list) do
|
||||||
|
if world.name == "singleplayerworld" then
|
||||||
|
found_singleplayerworld = true
|
||||||
|
gamedata.worldindex = i
|
||||||
|
break
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
if not found_singleplayerworld then
|
||||||
|
core.create_world("singleplayerworld", 1)
|
||||||
|
|
||||||
|
local world_list = core.get_worlds()
|
||||||
|
|
||||||
|
for world in pairs(world_list) do
|
||||||
|
if world.name == "singleplayerworld" then
|
||||||
|
gamedata.worldindex = i
|
||||||
|
return
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
-- Create main tabview
|
||||||
local tv_main = tabview_create("maintab",{x=12,y=5.2},{x=0,y=0})
|
local tv_main = tabview_create("maintab",{x=12,y=5.2},{x=0,y=0})
|
||||||
|
if PLATFORM ~= "Android" then
|
||||||
tv_main:set_autosave_tab(true)
|
tv_main:set_autosave_tab(true)
|
||||||
|
end
|
||||||
|
if PLATFORM ~= "Android" then
|
||||||
tv_main:add(tab_singleplayer)
|
tv_main:add(tab_singleplayer)
|
||||||
tv_main:add(tab_multiplayer)
|
tv_main:add(tab_multiplayer)
|
||||||
tv_main:add(tab_server)
|
tv_main:add(tab_server)
|
||||||
|
else
|
||||||
|
tv_main:add(tab_simple_main)
|
||||||
|
end
|
||||||
tv_main:add(tab_settings)
|
tv_main:add(tab_settings)
|
||||||
|
if PLATFORM ~= "Android" then
|
||||||
tv_main:add(tab_texturepacks)
|
tv_main:add(tab_texturepacks)
|
||||||
|
end
|
||||||
tv_main:add(tab_mods)
|
tv_main:add(tab_mods)
|
||||||
tv_main:add(tab_credits)
|
tv_main:add(tab_credits)
|
||||||
|
|
||||||
tv_main:set_global_event_handler(main_event_handler)
|
tv_main:set_global_event_handler(main_event_handler)
|
||||||
|
|
||||||
|
if PLATFORM == "Android" then
|
||||||
|
tv_main:set_fixed_size(false)
|
||||||
|
else
|
||||||
tv_main:set_tab(core.setting_get("maintab_LAST"))
|
tv_main:set_tab(core.setting_get("maintab_LAST"))
|
||||||
|
end
|
||||||
ui.set_default("maintab")
|
ui.set_default("maintab")
|
||||||
tv_main:show()
|
tv_main:show()
|
||||||
|
|
||||||
--create modstore ui
|
-- Create modstore ui
|
||||||
|
if PLATFORM == "Android" then
|
||||||
|
modstore.init({x=12, y=6}, 3, 2)
|
||||||
|
else
|
||||||
modstore.init({x=12, y=8}, 4, 3)
|
modstore.init({x=12, y=8}, 4, 3)
|
||||||
|
end
|
||||||
|
|
||||||
ui.update()
|
ui.update()
|
||||||
|
|
||||||
@ -117,3 +161,4 @@ local function init_globals()
|
|||||||
end
|
end
|
||||||
|
|
||||||
init_globals()
|
init_globals()
|
||||||
|
|
||||||
|
@ -1,102 +0,0 @@
|
|||||||
--Minetest
|
|
||||||
--Copyright (C) 2014 sapier
|
|
||||||
--
|
|
||||||
--This program is free software; you can redistribute it and/or modify
|
|
||||||
--it under the terms of the GNU Lesser General Public License as published by
|
|
||||||
--the Free Software Foundation; either version 2.1 of the License, or
|
|
||||||
--(at your option) any later version.
|
|
||||||
--
|
|
||||||
--This program is distributed in the hope that it will be useful,
|
|
||||||
--but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
--MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
--GNU Lesser General Public License for more details.
|
|
||||||
--
|
|
||||||
--You should have received a copy of the GNU Lesser General Public License along
|
|
||||||
--with this program; if not, write to the Free Software Foundation, Inc.,
|
|
||||||
--51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
|
||||||
|
|
||||||
mt_color_grey = "#AAAAAA"
|
|
||||||
mt_color_blue = "#0000DD"
|
|
||||||
mt_color_green = "#00DD00"
|
|
||||||
mt_color_dark_green = "#003300"
|
|
||||||
|
|
||||||
--marker for android specific code
|
|
||||||
ANDROID = true
|
|
||||||
|
|
||||||
local menupath = core.get_mainmenu_path()
|
|
||||||
local basepath = core.get_builtin_path()
|
|
||||||
defaulttexturedir = core.get_texturepath_share() .. DIR_DELIM .. "base" ..
|
|
||||||
DIR_DELIM .. "pack" .. DIR_DELIM
|
|
||||||
|
|
||||||
dofile(basepath .. DIR_DELIM .. "common" .. DIR_DELIM .. "async_event.lua")
|
|
||||||
dofile(basepath .. DIR_DELIM .. "common" .. DIR_DELIM .. "filterlist.lua")
|
|
||||||
dofile(basepath .. DIR_DELIM .. "fstk" .. DIR_DELIM .. "buttonbar.lua")
|
|
||||||
dofile(basepath .. DIR_DELIM .. "fstk" .. DIR_DELIM .. "dialog.lua")
|
|
||||||
dofile(basepath .. DIR_DELIM .. "fstk" .. DIR_DELIM .. "tabview.lua")
|
|
||||||
dofile(basepath .. DIR_DELIM .. "fstk" .. DIR_DELIM .. "ui.lua")
|
|
||||||
dofile(menupath .. DIR_DELIM .. "common.lua")
|
|
||||||
dofile(menupath .. DIR_DELIM .. "gamemgr.lua")
|
|
||||||
dofile(menupath .. DIR_DELIM .. "modmgr.lua")
|
|
||||||
dofile(menupath .. DIR_DELIM .. "store.lua")
|
|
||||||
dofile(menupath .. DIR_DELIM .. "dlg_config_world.lua")
|
|
||||||
dofile(menupath .. DIR_DELIM .. "tab_simple_main.lua")
|
|
||||||
dofile(menupath .. DIR_DELIM .. "tab_credits.lua")
|
|
||||||
dofile(menupath .. DIR_DELIM .. "tab_mods.lua")
|
|
||||||
dofile(menupath .. DIR_DELIM .. "tab_settings.lua")
|
|
||||||
|
|
||||||
--------------------------------------------------------------------------------
|
|
||||||
local function main_event_handler(tabview,event)
|
|
||||||
if event == "MenuQuit" then
|
|
||||||
core.close()
|
|
||||||
end
|
|
||||||
return true
|
|
||||||
end
|
|
||||||
|
|
||||||
local function init_globals()
|
|
||||||
--init gamedata
|
|
||||||
gamedata.worldindex = 0
|
|
||||||
|
|
||||||
local worldlist = core.get_worlds()
|
|
||||||
|
|
||||||
local found_singleplayerworld = false
|
|
||||||
|
|
||||||
for i=1,#worldlist,1 do
|
|
||||||
if worldlist[i].name == "singleplayerworld" then
|
|
||||||
found_singleplayerworld = true
|
|
||||||
gamedata.worldindex = i
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
if not found_singleplayerworld then
|
|
||||||
core.create_world("singleplayerworld", 1)
|
|
||||||
|
|
||||||
local worldlist = core.get_worlds()
|
|
||||||
|
|
||||||
for i=1,#worldlist,1 do
|
|
||||||
if worldlist[i].name == "singleplayerworld" then
|
|
||||||
gamedata.worldindex = i
|
|
||||||
end
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
--create main tabview
|
|
||||||
local tv_main = tabview_create("maintab",{x=12,y=5.2},{x=-0,y=-0})
|
|
||||||
tv_main:add(tab_simple_main)
|
|
||||||
tv_main:add(tab_mods)
|
|
||||||
tv_main:add(tab_settings)
|
|
||||||
tv_main:add(tab_credits)
|
|
||||||
tv_main:set_global_event_handler(main_event_handler)
|
|
||||||
tv_main:set_fixed_size(false)
|
|
||||||
ui.set_default("maintab")
|
|
||||||
tv_main:show()
|
|
||||||
|
|
||||||
--create modstore ui
|
|
||||||
modstore.init({x=12,y=6},3,2)
|
|
||||||
|
|
||||||
ui.update()
|
|
||||||
|
|
||||||
core.sound_play("main_menu", true)
|
|
||||||
end
|
|
||||||
|
|
||||||
init_globals()
|
|
||||||
|
|
@ -160,7 +160,7 @@ local function formspec(tabview, name, tabdata)
|
|||||||
"box[7.75,0;4,4;#999999]" ..
|
"box[7.75,0;4,4;#999999]" ..
|
||||||
"checkbox[8,0;cb_shaders;".. fgettext("Shaders") .. ";"
|
"checkbox[8,0;cb_shaders;".. fgettext("Shaders") .. ";"
|
||||||
.. dump(core.setting_getbool("enable_shaders")) .. "]"
|
.. dump(core.setting_getbool("enable_shaders")) .. "]"
|
||||||
if not ANDROID then
|
if PLATFORM ~= "Android" then
|
||||||
tab_string = tab_string ..
|
tab_string = tab_string ..
|
||||||
"button[8,4.75;3.75,0.5;btn_change_keys;".. fgettext("Change keys") .. "]"
|
"button[8,4.75;3.75,0.5;btn_change_keys;".. fgettext("Change keys") .. "]"
|
||||||
else
|
else
|
||||||
@ -176,7 +176,7 @@ local function formspec(tabview, name, tabdata)
|
|||||||
fgettext("Scaling factor applied to menu elements: ") ..
|
fgettext("Scaling factor applied to menu elements: ") ..
|
||||||
dump(core.setting_get("gui_scaling")) .. "]"
|
dump(core.setting_get("gui_scaling")) .. "]"
|
||||||
|
|
||||||
if ANDROID then
|
if PLATFORM == "Android" then
|
||||||
tab_string = tab_string ..
|
tab_string = tab_string ..
|
||||||
"box[4.25,2.75;3.25,2.15;#999999]" ..
|
"box[4.25,2.75;3.25,2.15;#999999]" ..
|
||||||
"checkbox[4.5,2.75;cb_touchscreen_target;".. fgettext("Touch free target") .. ";"
|
"checkbox[4.5,2.75;cb_touchscreen_target;".. fgettext("Touch free target") .. ";"
|
||||||
|
@ -289,7 +289,6 @@ void set_default_settings(Settings *settings)
|
|||||||
settings->setDefault("enable_particles", "false");
|
settings->setDefault("enable_particles", "false");
|
||||||
settings->setDefault("video_driver", "ogles1");
|
settings->setDefault("video_driver", "ogles1");
|
||||||
settings->setDefault("touchtarget", "true");
|
settings->setDefault("touchtarget", "true");
|
||||||
settings->setDefault("main_menu_script","/sdcard/Minetest/builtin/mainmenu/init_android.lua");
|
|
||||||
settings->setDefault("TMPFolder","/sdcard/Minetest/tmp/");
|
settings->setDefault("TMPFolder","/sdcard/Minetest/tmp/");
|
||||||
settings->setDefault("touchscreen_threshold","20");
|
settings->setDefault("touchscreen_threshold","20");
|
||||||
settings->setDefault("smooth_lighting", "false");
|
settings->setDefault("smooth_lighting", "false");
|
||||||
|
@ -371,6 +371,46 @@ v2u32 getDisplaySize();
|
|||||||
v2u32 getWindowSize();
|
v2u32 getWindowSize();
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
inline const char * getPlatformName()
|
||||||
|
{
|
||||||
|
return
|
||||||
|
#if defined(ANDROID)
|
||||||
|
"Android"
|
||||||
|
#elif defined(linux) || defined(__linux) || defined(__linux__)
|
||||||
|
"Linux"
|
||||||
|
#elif defined(_WIN32) || defined(_WIN64)
|
||||||
|
"Windows"
|
||||||
|
#elif defined(__DragonFly__) || defined(__FreeBSD__) || \
|
||||||
|
defined(__NetBSD__) || defined(__OpenBSD__)
|
||||||
|
"BSD"
|
||||||
|
#elif defined(__APPLE__) && defined(__MACH__)
|
||||||
|
#if TARGET_OS_MAC
|
||||||
|
"OSX"
|
||||||
|
#elif TARGET_OS_IPHONE
|
||||||
|
"iOS"
|
||||||
|
#else
|
||||||
|
"Apple"
|
||||||
|
#endif
|
||||||
|
#elif defined(_AIX)
|
||||||
|
"AIX"
|
||||||
|
#elif defined(__hpux)
|
||||||
|
"HP-UX"
|
||||||
|
#elif defined(__sun) && defined(__SVR4)
|
||||||
|
"Solaris"
|
||||||
|
#elif defined(__CYGWIN__)
|
||||||
|
"Cygwin"
|
||||||
|
#elif defined(__unix__) || defined(__unix)
|
||||||
|
#if defined(_POSIX_VERSION)
|
||||||
|
"Posix"
|
||||||
|
#else
|
||||||
|
"Unix"
|
||||||
|
#endif
|
||||||
|
#else
|
||||||
|
"?"
|
||||||
|
#endif
|
||||||
|
;
|
||||||
|
}
|
||||||
|
|
||||||
} // namespace porting
|
} // namespace porting
|
||||||
|
|
||||||
#ifdef __ANDROID__
|
#ifdef __ANDROID__
|
||||||
|
@ -25,6 +25,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
|
|||||||
#include "filesys.h"
|
#include "filesys.h"
|
||||||
#include "log.h"
|
#include "log.h"
|
||||||
#include "mods.h"
|
#include "mods.h"
|
||||||
|
#include "porting.h"
|
||||||
#include "util/string.h"
|
#include "util/string.h"
|
||||||
|
|
||||||
|
|
||||||
@ -98,6 +99,9 @@ ScriptApiBase::ScriptApiBase()
|
|||||||
lua_pushstring(m_luastack, DIR_DELIM);
|
lua_pushstring(m_luastack, DIR_DELIM);
|
||||||
lua_setglobal(m_luastack, "DIR_DELIM");
|
lua_setglobal(m_luastack, "DIR_DELIM");
|
||||||
|
|
||||||
|
lua_pushstring(m_luastack, porting::getPlatformName());
|
||||||
|
lua_setglobal(m_luastack, "PLATFORM");
|
||||||
|
|
||||||
m_server = NULL;
|
m_server = NULL;
|
||||||
m_environment = NULL;
|
m_environment = NULL;
|
||||||
m_guiengine = NULL;
|
m_guiengine = NULL;
|
||||||
|
Loading…
Reference in New Issue
Block a user