#include "guiEngine.h"
+#include <IGUIStaticText.h>
+#include <ICameraSceneNode.h>
+#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"
#include "sound_openal.h"
#include "clouds.h"
#include "httpfetch.h"
-#include "util/numeric.h"
-
-#include <IGUIStaticText.h>
-#include <ICameraSceneNode.h>
+#include "log.h"
+#include "fontengine.h"
+#include "guiscalingfilter.h"
+#include "irrlicht_changes/static_text.h"
+
+#ifdef __ANDROID__
+#include "client/tile.h"
+#include <GLES/gl.h>
+#endif
-/******************************************************************************/
-/** TextDestGuiEngine */
-/******************************************************************************/
-TextDestGuiEngine::TextDestGuiEngine(GUIEngine* engine)
-{
- m_engine = engine;
-}
/******************************************************************************/
-void TextDestGuiEngine::gotText(std::map<std::string, std::string> fields)
+void TextDestGuiEngine::gotText(const StringMap &fields)
{
m_engine->getScriptIface()->handleMainMenuButtons(fields);
}
/******************************************************************************/
-void TextDestGuiEngine::gotText(std::wstring text)
+void TextDestGuiEngine::gotText(const std::wstring &text)
{
- m_engine->getScriptIface()->handleMainMenuEvent(wide_to_narrow(text));
-}
-
-/******************************************************************************/
-/** MenuTextureSource */
-/******************************************************************************/
-MenuTextureSource::MenuTextureSource(video::IVideoDriver *driver)
-{
- m_driver = driver;
+ m_engine->getScriptIface()->handleMainMenuEvent(wide_to_utf8(text));
}
/******************************************************************************/
MenuTextureSource::~MenuTextureSource()
{
- for (std::set<std::string>::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;
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());
}
/******************************************************************************/
/** 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++) {
- 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;
m_sound_manager = &dummySoundManager;
//create topleft header
- core::rect<s32> rect(0, 0, 500, 20);
+ m_toplefttext = L"";
+
+ core::rect<s32> rect(0, 0, g_fontengine->getTextWidth(m_toplefttext.c_str()),
+ g_fontengine->getTextHeight());
rect += v2s32(4, 0);
- 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);
+ 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));
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();
- m_menu->remove();
- delete m_menu;
+ m_menu->drop();
m_menu = NULL;
}
/******************************************************************************/
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;
{
// 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();
- while(m_device->run() && (!m_startgame) && (!m_kill)) {
+ unsigned int text_height = g_fontengine->getTextHeight();
+
+ irr::core::dimension2d<u32> previous_screen_size(g_settings->getU16("screen_w"),
+ g_settings->getU16("screen_h"));
+
+ while (RenderingEngine::run() && (!m_startgame) && (!m_kill)) {
+
+ const irr::core::dimension2d<u32> ¤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<u32>(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;
+ }
+
+ //check if we need to update the "upper left corner"-text
+ if (text_height != g_fontengine->getTextHeight()) {
+ updateTopLeftTextSize();
+ text_height = g_fontengine->getTextHeight();
+ }
+
driver->beginScene(true, true, video::SColor(255,140,186,250));
if (m_clouds_enabled)
drawHeader(driver);
drawFooter(driver);
- m_device->getGUIEnvironment()->drawAll();
+ RenderingEngine::get_gui_env()->drawAll();
driver->endScene();
sleep_ms(25);
m_script->step();
+
+#ifdef __ANDROID__
+ m_menu->getAndroidUIInput();
+#endif
}
}
/******************************************************************************/
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;
}
m_irr_toplefttext->setText(L"");
//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);
+ for (image_definition &texture : m_textures) {
+ if (texture.texture)
+ RenderingEngine::get_video_driver()->removeTexture(texture.texture);
}
delete m_texture_source;
/******************************************************************************/
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;
/******************************************************************************/
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();
{
for (unsigned int y = 0; y < screensize.Y; y += tilesize.Y )
{
- driver->draw2DImage(texture,
+ draw2DImageFilterScaled(driver, texture,
core::rect<s32>(x, y, x+tilesize.X, y+tilesize.Y),
core::rect<s32>(0, 0, sourcesize.X, sourcesize.Y),
NULL, NULL, true);
}
/* Draw background texture */
- driver->draw2DImage(texture,
+ draw2DImageFilterScaled(driver, texture,
core::rect<s32>(0, 0, screensize.X, screensize.Y),
core::rect<s32>(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<s32>(0, 0, screensize.X, screensize.Y),
core::rect<s32>(0, 0, sourcesize.X, sourcesize.Y),
NULL, NULL, true);
}
/******************************************************************************/
-void GUIEngine::drawHeader(video::IVideoDriver* driver)
+void GUIEngine::drawHeader(video::IVideoDriver *driver)
{
core::dimension2d<u32> screensize = driver->getScreenSize();
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) {
video::SColor bgcolor(255,50,50,50);
- driver->draw2DImage(texture, splashrect,
+ draw2DImageFilterScaled(driver, texture, splashrect,
core::rect<s32>(core::position2d<s32>(0,0),
core::dimension2di(texture->getOriginalSize())),
NULL, NULL, true);
}
/******************************************************************************/
-void GUIEngine::drawFooter(video::IVideoDriver* driver)
+void GUIEngine::drawFooter(video::IVideoDriver *driver)
{
core::dimension2d<u32> screensize = driver->getScreenSize();
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<s32>(core::position2d<s32>(0,0),
core::dimension2di(texture->getOriginalSize())),
NULL, NULL, true);
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.empty() || !fs::PathExists(texturepath)) {
return false;
}
m_textures[layer].tile = tile_image;
m_textures[layer].minsize = minsize;
- if (m_textures[layer].texture == NULL)
- {
+ if (!m_textures[layer].texture) {
return false;
}
}
/******************************************************************************/
-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 targetfile(target.c_str(), std::ios::out | std::ios::binary);
+ std::ofstream target_file(target.c_str(), std::ios::out | std::ios::binary);
- if (!targetfile.good()) {
+ if (!target_file.good()) {
return false;
}
- HTTPFetchRequest fetchrequest;
- HTTPFetchResult fetchresult;
- fetchrequest.url = url;
- fetchrequest.caller = HTTPFETCH_SYNC;
- fetchrequest.timeout = g_settings->getS32("curl_file_download_timeout");
- httpfetch_sync(fetchrequest, fetchresult);
+ HTTPFetchRequest fetch_request;
+ HTTPFetchResult fetch_result;
+ fetch_request.url = url;
+ fetch_request.caller = HTTPFETCH_SYNC;
+ fetch_request.timeout = g_settings->getS32("curl_file_download_timeout");
+ httpfetch_sync(fetch_request, fetch_result);
- if (fetchresult.succeeded) {
- targetfile << fetchresult.data;
- } else {
+ if (!fetch_result.succeeded) {
return false;
}
+ target_file << fetch_result.data;
return true;
#else
}
/******************************************************************************/
-void GUIEngine::setTopleftText(std::string append)
+void GUIEngine::setTopleftText(const std::string &text)
{
- std::string toset = std::string("Minetest ") + minetest_version_hash;
+ m_toplefttext = translate_string(utf8_to_wide(text));
- if (append != "") {
- toset += " / ";
- toset += append;
- }
+ updateTopLeftTextSize();
+}
+
+/******************************************************************************/
+void GUIEngine::updateTopLeftTextSize()
+{
+ core::rect<s32> rect(0, 0, g_fontengine->getTextWidth(m_toplefttext.c_str()),
+ g_fontengine->getTextHeight());
+ rect += v2s32(4, 0);
- m_irr_toplefttext->setText(narrow_to_wide(toset).c_str());
+ m_irr_toplefttext->remove();
+ m_irr_toplefttext =
+ addStaticText(RenderingEngine::get_gui_env(), m_toplefttext,
+ rect, false, true, 0, -1);
}
/******************************************************************************/
}
/******************************************************************************/
-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);
}
projects / dragonfireclient.git / blobdiff