From aa77ee66c56f1f081b2d278da4a238ab2f5c9ff8 Mon Sep 17 00:00:00 2001 From: PilzAdam Date: Wed, 6 Mar 2013 21:34:39 +0100 Subject: Change libjson to libjsoncpp in .gitignore --- .gitignore | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to '.gitignore') diff --git a/.gitignore b/.gitignore index 353032637..803d8cb23 100644 --- a/.gitignore +++ b/.gitignore @@ -4,6 +4,8 @@ *bak* tags *.vim +*.orig +*.rej ## Non-static Minetest directories /bin/ @@ -41,7 +43,7 @@ src/cguittfont/libcguittfont.a src/cguittfont/cmake_install.cmake src/cguittfont/Makefile src/json/CMakeFiles/ -src/json/libjson.a +src/json/libjsoncpp.a CMakeCache.txt CPackConfig.cmake CPackSourceConfig.cmake -- cgit v1.2.3 From 350596b94f3d886812cb453e05540a16c3db5e5b Mon Sep 17 00:00:00 2001 From: ShadowNinja Date: Tue, 5 Mar 2013 17:23:03 -0500 Subject: 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 | 207 +++++++++++++++++++++++++++++--------- 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, 177 insertions(+), 56 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 (limited to '.gitignore') 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); - - 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); +} + +//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()); + + 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 000000000..f341e8892 Binary files /dev/null and b/textures/base/pack/logo.png differ diff --git a/textures/base/pack/menufooter.png b/textures/base/pack/menufooter.png new file mode 100644 index 000000000..fd431846e Binary files /dev/null and b/textures/base/pack/menufooter.png differ diff --git a/textures/base/pack/menuheader.png b/textures/base/pack/menuheader.png new file mode 100644 index 000000000..66fd6def5 Binary files /dev/null and b/textures/base/pack/menuheader.png differ diff --git a/textures/base/pack/menulogo.png b/textures/base/pack/menulogo.png deleted file mode 100644 index 578c9db15..000000000 Binary files a/textures/base/pack/menulogo.png and /dev/null differ -- cgit v1.2.3 From 450e7ef0c577f0684f25a35c5ce28ba770979f60 Mon Sep 17 00:00:00 2001 From: Juhani Numminen Date: Sun, 4 Nov 2012 09:23:23 +0200 Subject: Git-ignore SQLite build files --- .gitignore | 2 ++ 1 file changed, 2 insertions(+) (limited to '.gitignore') diff --git a/.gitignore b/.gitignore index 1ebd43e0d..21e2371a8 100644 --- a/.gitignore +++ b/.gitignore @@ -45,6 +45,8 @@ src/cguittfont/cmake_install.cmake src/cguittfont/Makefile src/json/CMakeFiles/ src/json/libjsoncpp.a +src/sqlite/CMakeFiles/* +src/sqlite/libsqlite3.a CMakeCache.txt CPackConfig.cmake CPackSourceConfig.cmake -- cgit v1.2.3