X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2FguiEngine.cpp;h=0a1d722069ebd6c573bf5381b9839e14a0693057;hb=6929206bc29960b0fab8c0a0a65a48992cfff398;hp=f89ad873130486c54377a3962aafa974bc7c0c8d;hpb=09a50d0458f46c6129b4bea94502908241b3aed3;p=oweals%2Fminetest.git diff --git a/src/guiEngine.cpp b/src/guiEngine.cpp index f89ad8731..0a1d72206 100644 --- a/src/guiEngine.cpp +++ b/src/guiEngine.cpp @@ -21,6 +21,7 @@ with this program; if not, write to the Free Software Foundation, Inc., #include "scripting_mainmenu.h" #include "config.h" +#include "version.h" #include "porting.h" #include "filesys.h" #include "main.h" @@ -28,14 +29,19 @@ with this program; if not, write to the Free Software Foundation, Inc., #include "guiMainMenu.h" #include "sound.h" #include "sound_openal.h" +#include "clouds.h" +#include "httpfetch.h" +#include "util/numeric.h" +#ifdef __ANDROID__ +#include "tile.h" +#include +#endif #include #include -#if USE_CURL -#include -#endif - +/******************************************************************************/ +/** TextDestGuiEngine */ /******************************************************************************/ TextDestGuiEngine::TextDestGuiEngine(GUIEngine* engine) { @@ -54,6 +60,48 @@ void TextDestGuiEngine::gotText(std::wstring text) m_engine->getScriptIface()->handleMainMenuEvent(wide_to_narrow(text)); } +/******************************************************************************/ +/** MenuTextureSource */ +/******************************************************************************/ +MenuTextureSource::MenuTextureSource(video::IVideoDriver *driver) +{ + m_driver = driver; +} + +/******************************************************************************/ +MenuTextureSource::~MenuTextureSource() +{ + for (std::set::iterator it = m_to_delete.begin(); + it != m_to_delete.end(); ++it) { + const char *tname = (*it).c_str(); + video::ITexture *texture = m_driver->getTexture(tname); + m_driver->removeTexture(texture); + } +} + +/******************************************************************************/ +video::ITexture* MenuTextureSource::getTexture(const std::string &name, u32 *id) +{ + if(id) + *id = 0; + if(name.empty()) + return NULL; + m_to_delete.insert(name); + +#ifdef __ANDROID__ + video::IImage *image = m_driver->createImageFromFile(name.c_str()); + if (image) { + image = Align2Npot2(image, m_driver); + video::ITexture* retval = m_driver->addTexture(name.c_str(), image); + image->drop(); + return retval; + } +#endif + return m_driver->getTexture(name.c_str()); +} + +/******************************************************************************/ +/** MenuMusicFetcher */ /******************************************************************************/ void MenuMusicFetcher::fetchSounds(const std::string &name, std::set &dst_paths, @@ -74,21 +122,26 @@ void MenuMusicFetcher::fetchSounds(const std::string &name, dst_paths.insert(base + DIR_DELIM + name + "."+itos(i)+".ogg"); } +/******************************************************************************/ +/** GUIEngine */ /******************************************************************************/ GUIEngine::GUIEngine( irr::IrrlichtDevice* dev, gui::IGUIElement* parent, IMenuManager *menumgr, scene::ISceneManager* smgr, - MainMenuData* data) : + MainMenuData* data, + bool& kill) : m_device(dev), m_parent(parent), m_menumanager(menumgr), m_smgr(smgr), m_data(data), + m_texture_source(NULL), m_sound_manager(NULL), m_formspecgui(0), m_buttonhandler(0), m_menu(0), + m_kill(kill), m_startgame(false), m_script(0), m_scriptdir(""), @@ -98,11 +151,14 @@ GUIEngine::GUIEngine( irr::IrrlichtDevice* dev, { //initialize texture pointers for (unsigned int i = 0; i < TEX_LAYER_MAX; i++) { - m_textures[i] = 0; + m_textures[i].texture = NULL; } // is deleted by guiformspec! m_buttonhandler = new TextDestGuiEngine(this); + //create texture source + m_texture_source = new MenuTextureSource(m_device->getVideoDriver()); + //create soundmanager MenuMusicFetcher soundfetcher; #if USE_SOUND @@ -112,46 +168,48 @@ GUIEngine::GUIEngine( irr::IrrlichtDevice* dev, m_sound_manager = &dummySoundManager; //create topleft header - core::rect rect(0, 0, 500, 40); + core::rect rect(0, 0, 500, 20); rect += v2s32(4, 0); - std::string t = "Minetest " VERSION_STRING; + std::string t = std::string("Minetest ") + minetest_version_hash; m_irr_toplefttext = m_device->getGUIEnvironment()->addStaticText(narrow_to_wide(t).c_str(), rect,false,true,0,-1); //create formspecsource - m_formspecgui = new FormspecFormSource("",&m_formspecgui); + m_formspecgui = new FormspecFormSource(""); /* Create menu */ - m_menu = - new GUIFormSpecMenu( m_device, - m_parent, - -1, - m_menumanager, - 0 /* &client */, - 0 /* gamedef */); + m_menu = new GUIFormSpecMenu(m_device, + m_parent, + -1, + m_menumanager, + NULL /* &client */, + NULL /* gamedef */, + m_texture_source, + m_formspecgui, + m_buttonhandler, + NULL); m_menu->allowClose(false); m_menu->lockSize(true,v2u32(800,600)); - m_menu->setFormSource(m_formspecgui); - m_menu->setTextDest(m_buttonhandler); // Initialize scripting - infostream<<"GUIEngine: Initializing Lua"<errormessage != "") - { + if (m_data->errormessage != "") { m_script->setMainMenuErrorMessage(m_data->errormessage); m_data->errormessage = ""; } - if (!loadMainMenuScript()) - assert("no future without mainmenu" == 0); + if (!loadMainMenuScript()) { + errorstream << "No future without mainmenu" << std::endl; + abort(); + } run(); } @@ -161,49 +219,29 @@ GUIEngine::GUIEngine( irr::IrrlichtDevice* dev, } m_menu->quitMenu(); - m_menu->drop(); - m_menu = 0; + m_menu->remove(); + delete m_menu; + m_menu = NULL; } /******************************************************************************/ bool GUIEngine::loadMainMenuScript() { - // Try custom menu script (main_menu_script) - - std::string menuscript = g_settings->get("main_menu_script"); - if(menuscript != "") { - m_scriptdir = fs::RemoveLastPathComponent(menuscript); + // Try custom menu script (main_menu_path) - if(m_script->loadMod(menuscript, "__custommenu")) { - // custom menu script loaded - return true; - } - else { - infostream - << "GUIEngine: execution of custom menu failed!" - << std::endl - << "\tfalling back to builtin menu" - << std::endl; - } + m_scriptdir = g_settings->get("main_menu_path"); + if (m_scriptdir.empty()) { + m_scriptdir = porting::path_share + DIR_DELIM "builtin" + DIR_DELIM "mainmenu"; } - // Try builtin menu script (main_menu_script) - - std::string builtin_menuscript = - porting::path_share + DIR_DELIM + "builtin" - + DIR_DELIM + "mainmenu.lua"; - - m_scriptdir = fs::RemoveRelativePathComponents( - fs::RemoveLastPathComponent(builtin_menuscript)); - - if(m_script->loadMod(builtin_menuscript, "__builtinmenu")) { - // builtin menu script loaded + std::string script = porting::path_share + DIR_DELIM "builtin" + DIR_DELIM "init.lua"; + if (m_script->loadScript(script)) { + // Menu script loaded return true; - } - else { - errorstream - << "GUIEngine: unable to load builtin menu" - << std::endl; + } else { + infostream + << "GUIEngine: execution of menu script in: \"" + << m_scriptdir << "\" failed!" << std::endl; } return false; @@ -212,14 +250,13 @@ bool GUIEngine::loadMainMenuScript() /******************************************************************************/ void GUIEngine::run() { - // Always create clouds because they may or may not be // needed based on the game selected video::IVideoDriver* driver = m_device->getVideoDriver(); cloudInit(); - while(m_device->run() && (!m_startgame)) { + while(m_device->run() && (!m_startgame) && (!m_kill)) { driver->beginScene(true, true, video::SColor(255,140,186,250)); if (m_clouds_enabled) @@ -241,6 +278,12 @@ void GUIEngine::run() cloudPostProcess(); else sleep_ms(25); + + m_script->step(); + +#ifdef __ANDROID__ + m_menu->getAndroidUIInput(); +#endif } } @@ -255,19 +298,19 @@ GUIEngine::~GUIEngine() m_sound_manager = NULL; } - //TODO: clean up m_menu here - infostream<<"GUIEngine: Deinitializing scripting"<setText(L""); - //initialize texture pointers + //clean up texture pointers for (unsigned int i = 0; i < TEX_LAYER_MAX; i++) { - if (m_textures[i] != 0) - driver->removeTexture(m_textures[i]); + if (m_textures[i].texture != NULL) + driver->removeTexture(m_textures[i].texture); } - + + delete m_texture_source; + if (m_cloud.clouds) m_cloud.clouds->drop(); } @@ -332,7 +375,7 @@ void GUIEngine::drawBackground(video::IVideoDriver* driver) { v2u32 screensize = driver->getScreenSize(); - video::ITexture* texture = m_textures[TEX_LAYER_BACKGROUND]; + video::ITexture* texture = m_textures[TEX_LAYER_BACKGROUND].texture; /* If no texture, draw background of solid color */ if(!texture){ @@ -342,8 +385,27 @@ void GUIEngine::drawBackground(video::IVideoDriver* driver) return; } + v2u32 sourcesize = texture->getOriginalSize(); + + if (m_textures[TEX_LAYER_BACKGROUND].tile) + { + v2u32 tilesize( + MYMAX(sourcesize.X,m_textures[TEX_LAYER_BACKGROUND].minsize), + MYMAX(sourcesize.Y,m_textures[TEX_LAYER_BACKGROUND].minsize)); + for (unsigned int x = 0; x < screensize.X; x += tilesize.X ) + { + for (unsigned int y = 0; y < screensize.Y; y += tilesize.Y ) + { + driver->draw2DImage(texture, + core::rect(x, y, x+tilesize.X, y+tilesize.Y), + core::rect(0, 0, sourcesize.X, sourcesize.Y), + NULL, NULL, true); + } + } + return; + } + /* Draw background texture */ - v2u32 sourcesize = texture->getSize(); driver->draw2DImage(texture, core::rect(0, 0, screensize.X, screensize.Y), core::rect(0, 0, sourcesize.X, sourcesize.Y), @@ -355,14 +417,14 @@ void GUIEngine::drawOverlay(video::IVideoDriver* driver) { v2u32 screensize = driver->getScreenSize(); - video::ITexture* texture = m_textures[TEX_LAYER_OVERLAY]; + video::ITexture* texture = m_textures[TEX_LAYER_OVERLAY].texture; /* If no texture, draw background of solid color */ if(!texture) return; /* Draw background texture */ - v2u32 sourcesize = texture->getSize(); + v2u32 sourcesize = texture->getOriginalSize(); driver->draw2DImage(texture, core::rect(0, 0, screensize.X, screensize.Y), core::rect(0, 0, sourcesize.X, sourcesize.Y), @@ -374,13 +436,13 @@ void GUIEngine::drawHeader(video::IVideoDriver* driver) { core::dimension2d screensize = driver->getScreenSize(); - video::ITexture* texture = m_textures[TEX_LAYER_HEADER]; + video::ITexture* texture = m_textures[TEX_LAYER_HEADER].texture; /* If no texture, draw nothing */ if(!texture) return; - f32 mult = (((f32)screensize.Width / 2)) / + f32 mult = (((f32)screensize.Width / 2.0)) / ((f32)texture->getOriginalSize().Width); v2s32 splashsize(((f32)texture->getOriginalSize().Width) * mult, @@ -398,7 +460,7 @@ void GUIEngine::drawHeader(video::IVideoDriver* driver) driver->draw2DImage(texture, splashrect, core::rect(core::position2d(0,0), - core::dimension2di(texture->getSize())), + core::dimension2di(texture->getOriginalSize())), NULL, NULL, true); } } @@ -408,7 +470,7 @@ void GUIEngine::drawFooter(video::IVideoDriver* driver) { core::dimension2d screensize = driver->getScreenSize(); - video::ITexture* texture = m_textures[TEX_LAYER_FOOTER]; + video::ITexture* texture = m_textures[TEX_LAYER_FOOTER].texture; /* If no texture, draw nothing */ if(!texture) @@ -430,84 +492,74 @@ void GUIEngine::drawFooter(video::IVideoDriver* driver) driver->draw2DImage(texture, rect, core::rect(core::position2d(0,0), - core::dimension2di(texture->getSize())), + core::dimension2di(texture->getOriginalSize())), NULL, NULL, true); } } /******************************************************************************/ -bool GUIEngine::setTexture(texture_layer layer,std::string texturepath) { - +bool GUIEngine::setTexture(texture_layer layer, std::string texturepath, + bool tile_image, unsigned int minsize) +{ video::IVideoDriver* driver = m_device->getVideoDriver(); assert(driver != 0); - if (m_textures[layer] != 0) + if (m_textures[layer].texture != NULL) { - driver->removeTexture(m_textures[layer]); - m_textures[layer] = 0; + driver->removeTexture(m_textures[layer].texture); + m_textures[layer].texture = NULL; } if ((texturepath == "") || !fs::PathExists(texturepath)) + { return false; + } - m_textures[layer] = driver->getTexture(texturepath.c_str()); + m_textures[layer].texture = driver->getTexture(texturepath.c_str()); + m_textures[layer].tile = tile_image; + m_textures[layer].minsize = minsize; - if (m_textures[layer] == 0) return false; + if (m_textures[layer].texture == NULL) + { + return false; + } return true; } /******************************************************************************/ -#if USE_CURL -static size_t WriteCallback(void *contents, size_t size, size_t nmemb, void *userp) +bool GUIEngine::downloadFile(std::string url,std::string target) { - FILE* targetfile = (FILE*) userp; - fwrite(contents,size,nmemb,targetfile); - return size * nmemb; -} -#endif -bool GUIEngine::downloadFile(std::string url,std::string target) { #if USE_CURL - //download file via curl - CURL *curl; + std::ofstream targetfile(target.c_str(), std::ios::out | std::ios::binary); - curl = curl_easy_init(); + if (!targetfile.good()) { + return false; + } - if (curl) - { - CURLcode res; - bool retval = true; - - FILE* targetfile = fopen(target.c_str(),"wb"); - - if (targetfile) { - curl_easy_setopt(curl, CURLOPT_NOSIGNAL, 1); - curl_easy_setopt(curl, CURLOPT_URL, url.c_str()); - curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, WriteCallback); - curl_easy_setopt(curl, CURLOPT_WRITEDATA, targetfile); - - res = curl_easy_perform(curl); - if (res != CURLE_OK) { - errorstream << "File at url \"" << url - <<"\" not found (" << curl_easy_strerror(res) << ")" <getS32("curl_file_download_timeout"); + httpfetch_sync(fetchrequest, fetchresult); - curl_easy_cleanup(curl); - return retval; + if (fetchresult.succeeded) { + targetfile << fetchresult.data; + } else { + return false; } -#endif + + return true; +#else return false; +#endif } /******************************************************************************/ -void GUIEngine::setTopleftText(std::string append) { - std::string toset = "Minetest " VERSION_STRING; +void GUIEngine::setTopleftText(std::string append) +{ + std::string toset = std::string("Minetest ") + minetest_version_hash; if (append != "") { toset += " / "; @@ -529,3 +581,11 @@ void GUIEngine::stopSound(s32 handle) { m_sound_manager->stopSound(handle); } + +/******************************************************************************/ +unsigned int GUIEngine::queueAsync(std::string serialized_func, + std::string serialized_params) +{ + return m_script->queueAsync(serialized_func, serialized_params); +} +