From 350596b94f3d886812cb453e05540a16c3db5e5b Mon Sep 17 00:00:00 2001 From: ShadowNinja Date: Tue, 5 Mar 2013 17:23:03 -0500 Subject: [PATCH] Add cloud menu background by Krisi, configurable with the menu_clouds option. Also add a menuheader, menusplash, menufooter_clouds, and allow HD menu footers. And finally don't git-ignore textures/base/. --- .gitignore | 3 +- minetest.conf.example | 2 + src/clouds.cpp | 6 +- src/clouds.h | 3 +- src/defaultsettings.cpp | 1 + src/guiMainMenu.cpp | 11 +- src/main.cpp | 203 +++++++++++++++++++++++------- textures/base/pack/logo.png | Bin 0 -> 13156 bytes textures/base/pack/menufooter.png | Bin 0 -> 356 bytes textures/base/pack/menuheader.png | Bin 0 -> 578 bytes textures/base/pack/menulogo.png | Bin 364 -> 0 bytes 11 files changed, 175 insertions(+), 54 deletions(-) create mode 100644 textures/base/pack/logo.png create mode 100644 textures/base/pack/menufooter.png create mode 100644 textures/base/pack/menuheader.png delete mode 100644 textures/base/pack/menulogo.png diff --git a/.gitignore b/.gitignore index 803d8cb23..1ebd43e0d 100644 --- a/.gitignore +++ b/.gitignore @@ -12,7 +12,8 @@ tags /games/* !/games/minimal/ /cache/ -/textures/ +/textures/* +!/textures/base/ /sounds/ /mods/* !/mods/minetest/ diff --git a/minetest.conf.example b/minetest.conf.example index 1f2a764f2..daca1616d 100644 --- a/minetest.conf.example +++ b/minetest.conf.example @@ -125,6 +125,8 @@ #farmesh_distance = 40 # Enable/disable clouds #enable_clouds = true +# Use a cloud animation for the main menu background +#menu_clouds = true # Path for screenshots #screenshot_path = . # Amount of view bobbing (0 = no view bobbing, 1.0 = normal, 2.0 = double) diff --git a/src/clouds.cpp b/src/clouds.cpp index 9f0bc06d8..55ec8965a 100644 --- a/src/clouds.cpp +++ b/src/clouds.cpp @@ -29,7 +29,8 @@ Clouds::Clouds( scene::ISceneNode* parent, scene::ISceneManager* mgr, s32 id, - u32 seed + u32 seed, + s16 cloudheight ): scene::ISceneNode(parent, mgr, id), m_seed(seed), @@ -45,7 +46,8 @@ Clouds::Clouds( //m_material.MaterialType = video::EMT_TRANSPARENT_VERTEX_ALPHA; m_material.MaterialType = video::EMT_TRANSPARENT_ALPHA_CHANNEL; - m_cloud_y = BS * g_settings->getS16("cloud_height"); + m_cloud_y = BS * (cloudheight ? cloudheight : + g_settings->getS16("cloud_height")); m_box = core::aabbox3d(-BS*1000000,m_cloud_y-BS,-BS*1000000, BS*1000000,m_cloud_y+BS,BS*1000000); diff --git a/src/clouds.h b/src/clouds.h index 72923c2c5..8f8b19faf 100644 --- a/src/clouds.h +++ b/src/clouds.h @@ -30,7 +30,8 @@ public: scene::ISceneNode* parent, scene::ISceneManager* mgr, s32 id, - u32 seed + u32 seed, + s16 cloudheight=0 ); ~Clouds(); diff --git a/src/defaultsettings.cpp b/src/defaultsettings.cpp index a8954be72..3ec0ad9fc 100644 --- a/src/defaultsettings.cpp +++ b/src/defaultsettings.cpp @@ -109,6 +109,7 @@ void set_default_settings(Settings *settings) settings->setDefault("view_bobbing_amount", "1.0"); settings->setDefault("enable_3d_clouds", "true"); settings->setDefault("cloud_height", "120"); + settings->setDefault("menu_clouds", "true"); settings->setDefault("opaque_water", "false"); settings->setDefault("console_color", "(0,0,0)"); settings->setDefault("console_alpha", "200"); diff --git a/src/guiMainMenu.cpp b/src/guiMainMenu.cpp index c2e68579e..4accbaa27 100644 --- a/src/guiMainMenu.cpp +++ b/src/guiMainMenu.cpp @@ -209,7 +209,6 @@ void GUIMainMenu::regenerateGui(v2u32 screensize) changeCtype(""); // Version - //if(m_data->selected_tab != TAB_CREDITS) { core::rect rect(0, 0, size.X, 40); rect += v2s32(4, 0); @@ -219,7 +218,7 @@ void GUIMainMenu::regenerateGui(v2u32 screensize) } //v2s32 center(size.X/2, size.Y/2); - v2s32 c800(size.X/2-400, size.Y/2-300); + v2s32 c800(size.X/2-400, size.Y/2-270); m_topleft_client = c800 + v2s32(90, 70+50+30); m_size_client = v2s32(620, 270); @@ -237,7 +236,6 @@ void GUIMainMenu::regenerateGui(v2u32 screensize) m_topleft_server = m_topleft_client + v2s32(0, m_size_client.Y+20); // Tabs -#if 1 { core::rect rect(0, 0, m_size_client.X, 30); rect += m_topleft_client + v2s32(0, -30); @@ -250,7 +248,6 @@ void GUIMainMenu::regenerateGui(v2u32 screensize) e->addTab(wgettext("Credits")); e->setActiveTab(m_data->selected_tab); } -#endif if(m_data->selected_tab == TAB_SINGLEPLAYER) { @@ -786,15 +783,15 @@ void GUIMainMenu::drawMenu() driver->draw2DRectangle(bgcolor, rect, &AbsoluteClippingRect); } video::ITexture *logotexture = - driver->getTexture(getTexturePath("menulogo.png").c_str()); + driver->getTexture(getTexturePath("logo.png").c_str()); if(logotexture) { v2s32 logosize(logotexture->getOriginalSize().Width, logotexture->getOriginalSize().Height); - logosize *= 2; + core::rect rect(0,0,logosize.X,logosize.Y); rect += AbsoluteRect.UpperLeftCorner + m_topleft_client; - rect += v2s32(130, 50); + rect += v2s32(500, 30); driver->draw2DImage(logotexture, rect, core::rect(core::position2d(0,0), core::dimension2di(logotexture->getSize())), diff --git a/src/main.cpp b/src/main.cpp index 696468049..73be969ad 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -50,6 +50,7 @@ with this program; if not, write to the Free Software Foundation, Inc., #include "irrlichttypes_extrabloated.h" #include "debug.h" #include "test.h" +#include "clouds.h" #include "server.h" #include "constants.h" #include "porting.h" @@ -596,50 +597,120 @@ private: bool rightreleased; }; -void drawMenuBackground(video::IVideoDriver* driver) -{ +//Draw the tiled menu background +void drawMenuBackground(video::IVideoDriver* driver) { core::dimension2d screensize = driver->getScreenSize(); + + std::string path = getTexturePath("menubg.png"); + if (path[0]) { + video::ITexture *bgtexture = + driver->getTexture(path.c_str()); + + if (bgtexture) { + s32 scaledsize = 128; - video::ITexture *bgtexture = - driver->getTexture(getTexturePath("menubg.png").c_str()); - if(bgtexture) - { - s32 scaledsize = 128; + // The important difference between destsize and screensize is + // that destsize is rounded to whole scaled pixels. + // These formulas use component-wise multiplication and division of v2u32. + v2u32 texturesize = bgtexture->getSize(); + v2u32 sourcesize = texturesize * screensize / scaledsize + v2u32(1,1); + v2u32 destsize = scaledsize * sourcesize / texturesize; - // The important difference between destsize and screensize is - // that destsize is rounded to whole scaled pixels. - // These formulas use component-wise multiplication and division of v2u32. - v2u32 texturesize = bgtexture->getSize(); - v2u32 sourcesize = texturesize * screensize / scaledsize + v2u32(1,1); - v2u32 destsize = scaledsize * sourcesize / texturesize; - - // Default texture wrapping mode in Irrlicht is ETC_REPEAT. - driver->draw2DImage(bgtexture, - core::rect(0, 0, destsize.X, destsize.Y), - core::rect(0, 0, sourcesize.X, sourcesize.Y), - NULL, NULL, true); + // Default texture wrapping mode in Irrlicht is ETC_REPEAT. + driver->draw2DImage(bgtexture, + core::rect(0, 0, destsize.X, destsize.Y), + core::rect(0, 0, sourcesize.X, sourcesize.Y), + NULL, NULL, true); + } } - - video::ITexture *logotexture = - driver->getTexture(getTexturePath("menulogo.png").c_str()); - if(logotexture) - { - v2s32 logosize(logotexture->getOriginalSize().Width, - logotexture->getOriginalSize().Height); - logosize *= 4; +} - video::SColor bgcolor(255,50,50,50); - core::rect bgrect(0, screensize.Height-logosize.Y-20, - screensize.Width, screensize.Height); - driver->draw2DRectangle(bgcolor, bgrect, NULL); +//Draw the footer at the bottom of the window +void drawMenuFooter(video::IVideoDriver* driver, bool clouds) { + core::dimension2d screensize = driver->getScreenSize(); + std::string path = getTexturePath(clouds ? + "menufooter_clouds.png" : "menufooter.png"); + if (path[0]) { + video::ITexture *footertexture = + driver->getTexture(path.c_str()); - core::rect rect(0,0,logosize.X,logosize.Y); - rect += v2s32(screensize.Width/2,screensize.Height-10-logosize.Y); - rect -= v2s32(logosize.X/2, 0); - driver->draw2DImage(logotexture, rect, - core::rect(core::position2d(0,0), - core::dimension2di(logotexture->getSize())), - NULL, NULL, true); + if (footertexture) { + f32 mult = (((f32)screensize.Width)) / + ((f32)footertexture->getOriginalSize().Width); + + v2s32 footersize(((f32)footertexture->getOriginalSize().Width) * mult, + ((f32)footertexture->getOriginalSize().Height) * mult); + + // Don't draw the footer if there isn't enough room + s32 free_space = (((s32)screensize.Height)-320)/2; + if (free_space > footersize.Y) { + core::rect rect(0,0,footersize.X,footersize.Y); + rect += v2s32(screensize.Width/2,screensize.Height-footersize.Y); + rect -= v2s32(footersize.X/2, 0); + + driver->draw2DImage(footertexture, rect, + core::rect(core::position2d(0,0), + core::dimension2di(footertexture->getSize())), + NULL, NULL, true); + } + } + } +} + +// Draw the Header over the main menu +void drawMenuHeader(video::IVideoDriver* driver) { + core::dimension2d screensize = driver->getScreenSize(); + + std::string path = getTexturePath("menuheader.png"); + if (path[0]) { + video::ITexture *splashtexture = + driver->getTexture(path.c_str()); + + if(splashtexture) { + //v2s32 splashsize((splashtexture->getOriginalSize().Width*100)/ + // splashtexture->getOriginalSize().Height, 80); + + f32 mult = (((f32)screensize.Width / 2)) / + ((f32)splashtexture->getOriginalSize().Width); + + v2s32 splashsize(((f32)splashtexture->getOriginalSize().Width) * mult, + ((f32)splashtexture->getOriginalSize().Height) * mult); + + // Don't draw the header is there isn't enough room + s32 free_space = (((s32)screensize.Height)-320)/2; + if (free_space > splashsize.Y) { + core::rect splashrect(0, 0, splashsize.X, splashsize.Y); + splashrect += v2s32((screensize.Width/2)-(splashsize.X/2), + ((free_space/2)-splashsize.Y/2)+10); + + video::SColor bgcolor(255,50,50,50); + + driver->draw2DImage(splashtexture, splashrect, + core::rect(core::position2d(0,0), + core::dimension2di(splashtexture->getSize())), + NULL, NULL, true); + } + } + } +} + +// Draw the Splash over the clouds and under the main menu +void drawMenuSplash(video::IVideoDriver* driver) { + core::dimension2d screensize = driver->getScreenSize(); + if (getTexturePath("menusplash.png") != "") { + video::ITexture *splashtexture = + driver->getTexture(getTexturePath("menusplash.png").c_str()); + + if(splashtexture) { + core::rect splashrect(0, 0, screensize.Width, screensize.Height); + + video::SColor bgcolor(255,50,50,50); + + driver->draw2DImage(splashtexture, splashrect, + core::rect(core::position2d(0,0), + core::dimension2di(splashtexture->getSize())), + NULL, NULL, true); + } } } @@ -1540,6 +1611,22 @@ int main(int argc, char *argv[]) &g_menumgr, &menudata, g_gamecallback); menu->allowFocusRemoval(true); + // Clouds for the main menu + bool cloud_menu_background = false; + Clouds *clouds = NULL; + if (g_settings->getBool("menu_clouds")) { + cloud_menu_background = true; + clouds = new Clouds(smgr->getRootSceneNode(), + smgr, -1, rand(), 100); + clouds->update(v2f(0, 0), video::SColor(255,200,200,255)); + + // A camera to see the clouds + scene::ICameraSceneNode* camera; + camera = smgr->addCameraSceneNode(0, + v3f(0,0,0), v3f(0, 60, 100)); + camera->setFarValue(10000); + } + if(error_message != L"") { verbosestream<<"error_message = " @@ -1552,6 +1639,9 @@ int main(int argc, char *argv[]) error_message = L""; } + // Time is in milliseconds, for clouds + u32 lasttime = device->getTimer()->getTime(); + infostream<<"Created main menu"<run() && kill == false) @@ -1559,23 +1649,50 @@ int main(int argc, char *argv[]) if(menu->getStatus() == true) break; - //driver->beginScene(true, true, video::SColor(255,0,0,0)); - driver->beginScene(true, true, video::SColor(255,128,128,128)); + // Time calc for the clouds + f32 dtime; // in seconds + if (cloud_menu_background) { + u32 time = device->getTimer()->getTime(); + if(time > lasttime) + dtime = (time - lasttime) / 1000.0; + else + dtime = 0; + lasttime = time; + } - drawMenuBackground(driver); + //driver->beginScene(true, true, video::SColor(255,0,0,0)); + driver->beginScene(true, true, video::SColor(255,140,186,250)); + + if (cloud_menu_background) { + // *3 otherwise the clouds would move very slowly + clouds->step(dtime*3); + clouds->render(); + smgr->drawAll(); + drawMenuSplash(driver); + drawMenuFooter(driver, true); + drawMenuHeader(driver); + } else { + drawMenuBackground(driver); + drawMenuFooter(driver, false); + } guienv->drawAll(); - + driver->endScene(); // On some computers framerate doesn't seem to be // automatically limited - sleep_ms(25); + if (!cloud_menu_background) + sleep_ms(25); } infostream<<"Dropping main menu"<drop(); + if (cloud_menu_background) { + clouds->drop(); + smgr->clear(); + } } playername = wide_to_narrow(menudata.name); diff --git a/textures/base/pack/logo.png b/textures/base/pack/logo.png new file mode 100644 index 0000000000000000000000000000000000000000..f341e88925a2b9fd935d60627cc2ab6a009922d1 GIT binary patch literal 13156 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 KMNUMnLSTXp-0yb) literal 0 HcmV?d00001 diff --git a/textures/base/pack/menufooter.png b/textures/base/pack/menufooter.png new file mode 100644 index 0000000000000000000000000000000000000000..fd431846eb4cfa923dcf938ec9c28fca216e9467 GIT binary patch literal 356 zcmeAS@N?(olHy`uVBq!ia0y~yU~~YnS(t&O7XPaGKuRvaC&ZP3;XgwIh|ty5_3`m( zaA0U?XgF}-!2kaZ|NsAwUSVPZRLNQ35n0T@z;^_M8K-LVNdpDhOFVsD+3zy*G05?K z`?MHDbuKfxSNuP08`fTP-)px(Q7KKz(x6`_d!}Xg8`T$Exr$1s-BgI% z;K#c5`#jfFKduKd1`?94J#(68FMY$`;8C%bHA9j4)`~Mt5<4AEO*?Yjx?6_vyjo}E^7sIj_HXN=m)HC1uH#OS^-z ymP=pZwYEUVj56b`boOkx>iB*fZ1^j`YWbkzLb6Mw<&;$S|uY~CU literal 0 HcmV?d00001 diff --git a/textures/base/pack/menuheader.png b/textures/base/pack/menuheader.png new file mode 100644 index 0000000000000000000000000000000000000000..66fd6def577f6c8862469c37f5382f91d184001d GIT binary patch literal 578 zcmeAS@N?(olHy`uVBq!ia0y~yV4M$RyKt}p$+#SgGeC+h$=lt9;Xep2*t>i(P=vF< zBeIx*fm;}a85w5HkpSv@d1rw6D*%J%8^1(`@F3b1nP~hu9e& zGQ-J+Uw!;_&psZ%KL6 zLJfm}9ST{Xl)U}+)w_PboFyt=akR{0M2~{wEzGB literal 0 HcmV?d00001 diff --git a/textures/base/pack/menulogo.png b/textures/base/pack/menulogo.png deleted file mode 100644 index 578c9db15405765aff154acafe745e9b999f97ca..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 364 zcmeAS@N?(olHy`uVBq!ia0vp^wLr|l!VDzU9N(q@Db50q$YKTtz9S&aI8~cZ8YswK z;_2(kewUd`*qHO?zW)(GA;kcn5LY10!0?};0YvEP>iYQjG&nFcG&CGIaNz&{hX4Qn zHwFq%1}b4J3GxeOaCmkj4a7lu`PJX1_?+yoE1L|}8kQ<)O?W94OmuE-Dcig@i;w&2&Dsy`A(x8B()(!3`75AU^uDXw3*7f%KHhr!d;&t;ucLK6Ti C8