X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2FguiEngine.cpp;h=d8d8d3b1193cb99ac015294b23c112d13e5f0fe3;hb=b5f7249a7edc25077d84b27b38552228b92ff763;hp=e941003fadb4ca799dfd0786aac38f0005753717;hpb=dceb9f7d6058785cf60d9dbcc8eecdcee1053412;p=oweals%2Fminetest.git diff --git a/src/guiEngine.cpp b/src/guiEngine.cpp index e941003fa..d8d8d3b11 100644 --- a/src/guiEngine.cpp +++ b/src/guiEngine.cpp @@ -21,13 +21,13 @@ with this program; if not, write to the Free Software Foundation, Inc., #include #include +#include "client/renderingengine.h" #include "scripting_mainmenu.h" #include "util/numeric.h" #include "config.h" #include "version.h" #include "porting.h" #include "filesys.h" -#include "main.h" #include "settings.h" #include "guiMainMenu.h" #include "sound.h" @@ -36,39 +36,25 @@ with this program; if not, write to the Free Software Foundation, Inc., #include "httpfetch.h" #include "log.h" #include "fontengine.h" +#include "guiscalingfilter.h" +#include "irrlicht_changes/static_text.h" #ifdef __ANDROID__ -#include "tile.h" +#include "client/tile.h" #include #endif /******************************************************************************/ -/** TextDestGuiEngine */ -/******************************************************************************/ -TextDestGuiEngine::TextDestGuiEngine(GUIEngine* engine) -{ - m_engine = engine; -} - -/******************************************************************************/ -void TextDestGuiEngine::gotText(std::map fields) +void TextDestGuiEngine::gotText(const StringMap &fields) { m_engine->getScriptIface()->handleMainMenuButtons(fields); } /******************************************************************************/ -void TextDestGuiEngine::gotText(std::wstring text) -{ - m_engine->getScriptIface()->handleMainMenuEvent(wide_to_narrow(text)); -} - -/******************************************************************************/ -/** MenuTextureSource */ -/******************************************************************************/ -MenuTextureSource::MenuTextureSource(video::IVideoDriver *driver) +void TextDestGuiEngine::gotText(const std::wstring &text) { - m_driver = driver; + m_engine->getScriptIface()->handleMainMenuEvent(wide_to_utf8(text)); } /******************************************************************************/ @@ -83,7 +69,7 @@ MenuTextureSource::~MenuTextureSource() } /******************************************************************************/ -video::ITexture* MenuTextureSource::getTexture(const std::string &name, u32 *id) +video::ITexture *MenuTextureSource::getTexture(const std::string &name, u32 *id) { if(id) *id = 0; @@ -128,29 +114,16 @@ void MenuMusicFetcher::fetchSounds(const std::string &name, /******************************************************************************/ /** GUIEngine */ /******************************************************************************/ -GUIEngine::GUIEngine( irr::IrrlichtDevice* dev, - gui::IGUIElement* parent, - IMenuManager *menumgr, - scene::ISceneManager* smgr, - MainMenuData* data, - bool& kill) : - m_device(dev), +GUIEngine::GUIEngine(JoystickController *joystick, + gui::IGUIElement *parent, + IMenuManager *menumgr, + MainMenuData *data, + bool &kill) : m_parent(parent), m_menumanager(menumgr), - m_smgr(smgr), + m_smgr(RenderingEngine::get_scene_manager()), 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(""), - m_irr_toplefttext(0), - m_clouds_enabled(true), - m_cloud() + m_kill(kill) { //initialize texture pointers for (unsigned int i = 0; i < TEX_LAYER_MAX; i++) { @@ -160,7 +133,7 @@ GUIEngine::GUIEngine( irr::IrrlichtDevice* dev, m_buttonhandler = new TextDestGuiEngine(this); //create texture source - m_texture_source = new MenuTextureSource(m_device->getVideoDriver()); + m_texture_source = new MenuTextureSource(RenderingEngine::get_video_driver()); //create soundmanager MenuMusicFetcher soundfetcher; @@ -171,30 +144,29 @@ GUIEngine::GUIEngine( irr::IrrlichtDevice* dev, m_sound_manager = &dummySoundManager; //create topleft header - std::wstring t = narrow_to_wide(std::string("Minetest ") + - minetest_version_hash); + m_toplefttext = L""; - core::rect rect(0, 0, glb_fontengine->getTextWidth(t), glb_fontengine->getTextHeight()); + core::rect rect(0, 0, g_fontengine->getTextWidth(m_toplefttext.c_str()), + g_fontengine->getTextHeight()); rect += v2s32(4, 0); m_irr_toplefttext = - m_device->getGUIEnvironment()->addStaticText(t.c_str(), - rect,false,true,0,-1); + addStaticText(RenderingEngine::get_gui_env(), m_toplefttext, + rect, false, true, 0, -1); //create formspecsource m_formspecgui = new FormspecFormSource(""); /* Create menu */ - m_menu = new GUIFormSpecMenu(m_device, + m_menu = new GUIFormSpecMenu(joystick, m_parent, -1, m_menumanager, NULL /* &client */, - NULL /* gamedef */, m_texture_source, m_formspecgui, m_buttonhandler, - NULL); + false); m_menu->allowClose(false); m_menu->lockSize(true,v2u32(800,600)); @@ -206,21 +178,18 @@ GUIEngine::GUIEngine( irr::IrrlichtDevice* dev, m_script = new MainMenuScripting(this); try { - if (m_data->errormessage != "") { - m_script->setMainMenuErrorMessage(m_data->errormessage); - m_data->errormessage = ""; - } + m_script->setMainMenuData(&m_data->script_data); + m_data->script_data.errormessage = ""; if (!loadMainMenuScript()) { - errorstream << "No future without mainmenu" << std::endl; + errorstream << "No future without main menu!" << std::endl; abort(); } run(); - } - catch(LuaError &e) { - errorstream << "MAINMENU ERROR: " << e.what() << std::endl; - m_data->errormessage = e.what(); + } catch (LuaError &e) { + errorstream << "Main menu error: " << e.what() << std::endl; + m_data->script_data.errormessage = e.what(); } m_menu->quitMenu(); @@ -231,21 +200,21 @@ GUIEngine::GUIEngine( irr::IrrlichtDevice* dev, /******************************************************************************/ bool GUIEngine::loadMainMenuScript() { - // Try custom menu script (main_menu_path) - + // Set main menu path (for core.get_mainmenu_path()) m_scriptdir = g_settings->get("main_menu_path"); if (m_scriptdir.empty()) { - m_scriptdir = porting::path_share + DIR_DELIM "builtin" + DIR_DELIM "mainmenu"; + m_scriptdir = porting::path_share + DIR_DELIM + "builtin" + DIR_DELIM + "mainmenu"; } + // Load builtin (which will load the main menu script) std::string script = porting::path_share + DIR_DELIM "builtin" + DIR_DELIM "init.lua"; - if (m_script->loadScript(script)) { + try { + m_script->loadScript(script); // Menu script loaded return true; - } else { - infostream - << "GUIEngine: execution of menu script in: \"" - << m_scriptdir << "\" failed!" << std::endl; + } catch (const ModError &e) { + errorstream << "GUIEngine: execution of menu script failed: " + << e.what() << std::endl; } return false; @@ -256,18 +225,34 @@ 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(); + video::IVideoDriver *driver = RenderingEngine::get_video_driver(); cloudInit(); - unsigned int text_height = glb_fontengine->getTextHeight(); + unsigned int text_height = g_fontengine->getTextHeight(); + + irr::core::dimension2d previous_screen_size(g_settings->getU16("screen_w"), + g_settings->getU16("screen_h")); + + while (RenderingEngine::run() && (!m_startgame) && (!m_kill)) { + + const irr::core::dimension2d ¤t_screen_size = + RenderingEngine::get_video_driver()->getScreenSize(); + // Verify if window size has changed and save it if it's the case + // Ensure evaluating settings->getBool after verifying screensize + // First condition is cheaper + if (previous_screen_size != current_screen_size && + current_screen_size != irr::core::dimension2d(0,0) && + g_settings->getBool("autosave_screensize")) { + g_settings->setU16("screen_w", current_screen_size.Width); + g_settings->setU16("screen_h", current_screen_size.Height); + previous_screen_size = current_screen_size; + } - while(m_device->run() && (!m_startgame) && (!m_kill)) - { //check if we need to update the "upper left corner"-text - if (text_height != glb_fontengine->getTextHeight()) { + if (text_height != g_fontengine->getTextHeight()) { updateTopLeftTextSize(); - text_height = glb_fontengine->getTextHeight(); + text_height = g_fontengine->getTextHeight(); } driver->beginScene(true, true, video::SColor(255,140,186,250)); @@ -283,7 +268,7 @@ void GUIEngine::run() drawHeader(driver); drawFooter(driver); - m_device->getGUIEnvironment()->drawAll(); + RenderingEngine::get_gui_env()->drawAll(); driver->endScene(); @@ -303,10 +288,7 @@ void GUIEngine::run() /******************************************************************************/ GUIEngine::~GUIEngine() { - video::IVideoDriver* driver = m_device->getVideoDriver(); - assert(driver != 0); - - if(m_sound_manager != &dummySoundManager){ + if (m_sound_manager != &dummySoundManager){ delete m_sound_manager; m_sound_manager = NULL; } @@ -318,8 +300,8 @@ GUIEngine::~GUIEngine() //clean up texture pointers for (unsigned int i = 0; i < TEX_LAYER_MAX; i++) { - if (m_textures[i].texture != NULL) - driver->removeTexture(m_textures[i].texture); + if (m_textures[i].texture) + RenderingEngine::get_video_driver()->removeTexture(m_textures[i].texture); } delete m_texture_source; @@ -331,21 +313,21 @@ GUIEngine::~GUIEngine() /******************************************************************************/ void GUIEngine::cloudInit() { - m_cloud.clouds = new Clouds(m_smgr->getRootSceneNode(), - m_smgr, -1, rand(), 100); - m_cloud.clouds->update(v2f(0, 0), video::SColor(255,200,200,255)); + m_cloud.clouds = new Clouds(m_smgr, -1, rand()); + m_cloud.clouds->setHeight(100.0f); + m_cloud.clouds->update(v3f(0, 0, 0), video::SColor(255,200,200,255)); m_cloud.camera = m_smgr->addCameraSceneNode(0, v3f(0,0,0), v3f(0, 60, 100)); m_cloud.camera->setFarValue(10000); - m_cloud.lasttime = m_device->getTimer()->getTime(); + m_cloud.lasttime = RenderingEngine::get_timer_time(); } /******************************************************************************/ void GUIEngine::cloudPreProcess() { - u32 time = m_device->getTimer()->getTime(); + u32 time = RenderingEngine::get_timer_time(); if(time > m_cloud.lasttime) m_cloud.dtime = (time - m_cloud.lasttime) / 1000.0; @@ -362,29 +344,28 @@ void GUIEngine::cloudPreProcess() /******************************************************************************/ void GUIEngine::cloudPostProcess() { - float fps_max = g_settings->getFloat("fps_max"); + float fps_max = g_settings->getFloat("pause_fps_max"); // Time of frame without fps limit - float busytime; u32 busytime_u32; + // not using getRealTime is necessary for wine - u32 time = m_device->getTimer()->getTime(); + u32 time = RenderingEngine::get_timer_time(); if(time > m_cloud.lasttime) busytime_u32 = time - m_cloud.lasttime; else busytime_u32 = 0; - busytime = busytime_u32 / 1000.0; // FPS limiter u32 frametime_min = 1000./fps_max; - if(busytime_u32 < frametime_min) { + if (busytime_u32 < frametime_min) { u32 sleeptime = frametime_min - busytime_u32; - m_device->sleep(sleeptime); + RenderingEngine::get_raw_device()->sleep(sleeptime); } } /******************************************************************************/ -void GUIEngine::drawBackground(video::IVideoDriver* driver) +void GUIEngine::drawBackground(video::IVideoDriver *driver) { v2u32 screensize = driver->getScreenSize(); @@ -409,7 +390,7 @@ void GUIEngine::drawBackground(video::IVideoDriver* driver) { for (unsigned int y = 0; y < screensize.Y; y += tilesize.Y ) { - driver->draw2DImage(texture, + draw2DImageFilterScaled(driver, texture, core::rect(x, y, x+tilesize.X, y+tilesize.Y), core::rect(0, 0, sourcesize.X, sourcesize.Y), NULL, NULL, true); @@ -419,33 +400,33 @@ void GUIEngine::drawBackground(video::IVideoDriver* driver) } /* Draw background texture */ - driver->draw2DImage(texture, + draw2DImageFilterScaled(driver, texture, core::rect(0, 0, screensize.X, screensize.Y), core::rect(0, 0, sourcesize.X, sourcesize.Y), NULL, NULL, true); } /******************************************************************************/ -void GUIEngine::drawOverlay(video::IVideoDriver* driver) +void GUIEngine::drawOverlay(video::IVideoDriver *driver) { v2u32 screensize = driver->getScreenSize(); video::ITexture* texture = m_textures[TEX_LAYER_OVERLAY].texture; - /* If no texture, draw background of solid color */ + /* If no texture, draw nothing */ if(!texture) return; /* Draw background texture */ v2u32 sourcesize = texture->getOriginalSize(); - driver->draw2DImage(texture, + draw2DImageFilterScaled(driver, texture, core::rect(0, 0, screensize.X, screensize.Y), core::rect(0, 0, sourcesize.X, sourcesize.Y), NULL, NULL, true); } /******************************************************************************/ -void GUIEngine::drawHeader(video::IVideoDriver* driver) +void GUIEngine::drawHeader(video::IVideoDriver *driver) { core::dimension2d screensize = driver->getScreenSize(); @@ -461,7 +442,7 @@ void GUIEngine::drawHeader(video::IVideoDriver* driver) v2s32 splashsize(((f32)texture->getOriginalSize().Width) * mult, ((f32)texture->getOriginalSize().Height) * mult); - // Don't draw the header is there isn't enough room + // Don't draw the header if there isn't enough room s32 free_space = (((s32)screensize.Height)-320)/2; if (free_space > splashsize.Y) { @@ -471,7 +452,7 @@ void GUIEngine::drawHeader(video::IVideoDriver* driver) video::SColor bgcolor(255,50,50,50); - driver->draw2DImage(texture, splashrect, + draw2DImageFilterScaled(driver, texture, splashrect, core::rect(core::position2d(0,0), core::dimension2di(texture->getOriginalSize())), NULL, NULL, true); @@ -479,7 +460,7 @@ void GUIEngine::drawHeader(video::IVideoDriver* driver) } /******************************************************************************/ -void GUIEngine::drawFooter(video::IVideoDriver* driver) +void GUIEngine::drawFooter(video::IVideoDriver *driver) { core::dimension2d screensize = driver->getScreenSize(); @@ -503,7 +484,7 @@ void GUIEngine::drawFooter(video::IVideoDriver* driver) rect += v2s32(screensize.Width/2,screensize.Height-footersize.Y); rect -= v2s32(footersize.X/2, 0); - driver->draw2DImage(texture, rect, + draw2DImageFilterScaled(driver, texture, rect, core::rect(core::position2d(0,0), core::dimension2di(texture->getOriginalSize())), NULL, NULL, true); @@ -514,17 +495,14 @@ void GUIEngine::drawFooter(video::IVideoDriver* driver) bool GUIEngine::setTexture(texture_layer layer, std::string texturepath, bool tile_image, unsigned int minsize) { - video::IVideoDriver* driver = m_device->getVideoDriver(); - assert(driver != 0); + video::IVideoDriver *driver = RenderingEngine::get_video_driver(); - if (m_textures[layer].texture != NULL) - { + if (m_textures[layer].texture) { driver->removeTexture(m_textures[layer].texture); m_textures[layer].texture = NULL; } - if ((texturepath == "") || !fs::PathExists(texturepath)) - { + if ((texturepath == "") || !fs::PathExists(texturepath)) { return false; } @@ -532,8 +510,7 @@ bool GUIEngine::setTexture(texture_layer layer, std::string texturepath, m_textures[layer].tile = tile_image; m_textures[layer].minsize = minsize; - if (m_textures[layer].texture == NULL) - { + if (m_textures[layer].texture == NULL) { return false; } @@ -541,7 +518,7 @@ bool GUIEngine::setTexture(texture_layer layer, std::string texturepath, } /******************************************************************************/ -bool GUIEngine::downloadFile(std::string url, std::string target) +bool GUIEngine::downloadFile(const std::string &url, const std::string &target) { #if USE_CURL std::ofstream target_file(target.c_str(), std::ios::out | std::ios::binary); @@ -569,18 +546,9 @@ bool GUIEngine::downloadFile(std::string url, std::string target) } /******************************************************************************/ -void GUIEngine::setTopleftText(std::string append) +void GUIEngine::setTopleftText(const std::string &text) { - std::wstring toset = narrow_to_wide( std::string("Minetest ") + - minetest_version_hash); - - if (append != "") - { - toset += L" / "; - toset += narrow_to_wide(append); - } - - m_irr_toplefttext->setText(toset.c_str()); + m_toplefttext = utf8_to_wide(text); updateTopLeftTextSize(); } @@ -588,15 +556,14 @@ void GUIEngine::setTopleftText(std::string append) /******************************************************************************/ void GUIEngine::updateTopLeftTextSize() { - std::wstring text = m_irr_toplefttext->getText(); - - core::rect rect(0, 0, glb_fontengine->getTextWidth(text), glb_fontengine->getTextHeight()); - rect += v2s32(4, 0); + core::rect rect(0, 0, g_fontengine->getTextWidth(m_toplefttext.c_str()), + g_fontengine->getTextHeight()); + rect += v2s32(4, 0); m_irr_toplefttext->remove(); m_irr_toplefttext = - m_device->getGUIEnvironment()->addStaticText(text.c_str(), - rect,false,true,0,-1); + addStaticText(RenderingEngine::get_gui_env(), m_toplefttext, + rect, false, true, 0, -1); } /******************************************************************************/ @@ -613,8 +580,8 @@ void GUIEngine::stopSound(s32 handle) } /******************************************************************************/ -unsigned int GUIEngine::queueAsync(std::string serialized_func, - std::string serialized_params) +unsigned int GUIEngine::queueAsync(const std::string &serialized_func, + const std::string &serialized_params) { return m_script->queueAsync(serialized_func, serialized_params); }