X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;f=src%2FguiEngine.cpp;h=e9b4e54c19c8e1d8a86806f685097de6e7a91de7;hb=b24e6433df3c3b2926568aff9c0173459e3e8eab;hp=0abb247927e16f0ea3fbc774e56ca28fa9acb3d0;hpb=8f7785771b9e02b1a1daf7a252550d78ea93053d;p=dragonfireclient.git diff --git a/src/guiEngine.cpp b/src/guiEngine.cpp index 0abb24792..e9b4e54c1 100644 --- a/src/guiEngine.cpp +++ b/src/guiEngine.cpp @@ -19,9 +19,9 @@ with this program; if not, write to the Free Software Foundation, Inc., #include "guiEngine.h" -#include #include #include +#include "client/renderingengine.h" #include "scripting_mainmenu.h" #include "util/numeric.h" #include "config.h" @@ -45,14 +45,6 @@ with this program; if not, write to the Free Software Foundation, Inc., #endif -/******************************************************************************/ -/** TextDestGuiEngine */ -/******************************************************************************/ -TextDestGuiEngine::TextDestGuiEngine(GUIEngine* engine) -{ - m_engine = engine; -} - /******************************************************************************/ void TextDestGuiEngine::gotText(const StringMap &fields) { @@ -65,27 +57,18 @@ void TextDestGuiEngine::gotText(const std::wstring &text) m_engine->getScriptIface()->handleMainMenuEvent(wide_to_utf8(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(); + for (const std::string &texture_to_delete : m_to_delete) { + const char *tname = texture_to_delete.c_str(); video::ITexture *texture = m_driver->getTexture(tname); m_driver->removeTexture(texture); } } /******************************************************************************/ -video::ITexture* MenuTextureSource::getTexture(const std::string &name, u32 *id) +video::ITexture *MenuTextureSource::getTexture(const std::string &name, u32 *id) { if(id) *id = 0; @@ -130,29 +113,26 @@ void MenuMusicFetcher::fetchSounds(const std::string &name, /******************************************************************************/ /** GUIEngine */ /******************************************************************************/ -GUIEngine::GUIEngine( irr::IrrlichtDevice* dev, - JoystickController *joystick, - 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_kill(kill) { //initialize texture pointers - for (unsigned int i = 0; i < TEX_LAYER_MAX; i++) { - m_textures[i].texture = NULL; + for (image_definition &texture : m_textures) { + texture.texture = NULL; } // is deleted by guiformspec! 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; @@ -170,15 +150,14 @@ GUIEngine::GUIEngine( irr::IrrlichtDevice* dev, rect += v2s32(4, 0); m_irr_toplefttext = - addStaticText(m_device->getGUIEnvironment(), m_toplefttext, + 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, - joystick, + m_menu = new GUIFormSpecMenu(joystick, m_parent, -1, m_menumanager, @@ -245,7 +224,7 @@ 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(); @@ -254,10 +233,10 @@ void GUIEngine::run() irr::core::dimension2d previous_screen_size(g_settings->getU16("screen_w"), g_settings->getU16("screen_h")); - while (m_device->run() && (!m_startgame) && (!m_kill)) { + while (RenderingEngine::run() && (!m_startgame) && (!m_kill)) { const irr::core::dimension2d ¤t_screen_size = - m_device->getVideoDriver()->getScreenSize(); + 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 @@ -288,7 +267,7 @@ void GUIEngine::run() drawHeader(driver); drawFooter(driver); - m_device->getGUIEnvironment()->drawAll(); + RenderingEngine::get_gui_env()->drawAll(); driver->endScene(); @@ -308,10 +287,7 @@ void GUIEngine::run() /******************************************************************************/ GUIEngine::~GUIEngine() { - video::IVideoDriver* driver = m_device->getVideoDriver(); - FATAL_ERROR_IF(driver == 0, "Could not get video driver"); - - if(m_sound_manager != &dummySoundManager){ + if (m_sound_manager != &dummySoundManager){ delete m_sound_manager; m_sound_manager = NULL; } @@ -322,9 +298,9 @@ GUIEngine::~GUIEngine() m_irr_toplefttext->setText(L""); //clean up texture pointers - for (unsigned int i = 0; i < TEX_LAYER_MAX; i++) { - if (m_textures[i].texture) - driver->removeTexture(m_textures[i].texture); + for (image_definition &texture : m_textures) { + if (texture.texture) + RenderingEngine::get_video_driver()->removeTexture(texture.texture); } delete m_texture_source; @@ -336,21 +312,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; @@ -372,7 +348,7 @@ void GUIEngine::cloudPostProcess() 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 @@ -381,14 +357,14 @@ void GUIEngine::cloudPostProcess() // 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(); @@ -430,7 +406,7 @@ void GUIEngine::drawBackground(video::IVideoDriver* driver) } /******************************************************************************/ -void GUIEngine::drawOverlay(video::IVideoDriver* driver) +void GUIEngine::drawOverlay(video::IVideoDriver *driver) { v2u32 screensize = driver->getScreenSize(); @@ -449,7 +425,7 @@ void GUIEngine::drawOverlay(video::IVideoDriver* driver) } /******************************************************************************/ -void GUIEngine::drawHeader(video::IVideoDriver* driver) +void GUIEngine::drawHeader(video::IVideoDriver *driver) { core::dimension2d screensize = driver->getScreenSize(); @@ -483,7 +459,7 @@ void GUIEngine::drawHeader(video::IVideoDriver* driver) } /******************************************************************************/ -void GUIEngine::drawFooter(video::IVideoDriver* driver) +void GUIEngine::drawFooter(video::IVideoDriver *driver) { core::dimension2d screensize = driver->getScreenSize(); @@ -518,17 +494,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(); - FATAL_ERROR_IF(driver == 0, "Could not get video driver"); + 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.empty() || !fs::PathExists(texturepath)) { return false; } @@ -536,8 +509,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) { return false; } @@ -575,7 +547,7 @@ bool GUIEngine::downloadFile(const std::string &url, const std::string &target) /******************************************************************************/ void GUIEngine::setTopleftText(const std::string &text) { - m_toplefttext = utf8_to_wide(text); + m_toplefttext = translate_string(utf8_to_wide(text)); updateTopLeftTextSize(); } @@ -589,7 +561,7 @@ void GUIEngine::updateTopLeftTextSize() m_irr_toplefttext->remove(); m_irr_toplefttext = - addStaticText(m_device->getGUIEnvironment(), m_toplefttext, + addStaticText(RenderingEngine::get_gui_env(), m_toplefttext, rect, false, true, 0, -1); }