Node highlighting.

[oweals/minetest.git] / src / guiEngine.cpp

diff --git a/src/guiEngine.cpp b/src/guiEngine.cpp
index ef018021e8fa150a2e5717f8c37df89fe1b00dfa..0a1d722069ebd6c573bf5381b9839e14a0693057 100644 (file)
--- a/src/guiEngine.cpp
+++ b/src/guiEngine.cpp
@@ -31,14 +31,15 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "sound_openal.h"
 #include "clouds.h"
 #include "httpfetch.h"
+#include "util/numeric.h"
+#ifdef __ANDROID__
+#include "tile.h"
+#include <GLES/gl.h>
+#endif
 
 #include <IGUIStaticText.h>
 #include <ICameraSceneNode.h>
 
-#if USE_CURL
-#include <curl/curl.h>
-#endif
-
 /******************************************************************************/
 /** TextDestGuiEngine                                                         */
 /******************************************************************************/
@@ -86,6 +87,16 @@ video::ITexture* MenuTextureSource::getTexture(const std::string &name, u32 *id)
        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());
 }
 
@@ -140,7 +151,7 @@ GUIEngine::GUIEngine(       irr::IrrlichtDevice* dev,
 {
        //initialize texture pointers
        for (unsigned int i = 0; i < TEX_LAYER_MAX; i++) {
-               m_textures[i] = 0;
+               m_textures[i].texture = NULL;
        }
        // is deleted by guiformspec!
        m_buttonhandler = new TextDestGuiEngine(this);
@@ -208,8 +219,9 @@ GUIEngine::GUIEngine(       irr::IrrlichtDevice* dev,
        }
 
        m_menu->quitMenu();
-       m_menu->drop();
-       m_menu = 0;
+       m_menu->remove();
+       delete m_menu;
+       m_menu = NULL;
 }
 
 /******************************************************************************/
@@ -238,7 +250,6 @@ bool GUIEngine::loadMainMenuScript()
 /******************************************************************************/
 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();
@@ -269,6 +280,10 @@ void GUIEngine::run()
                        sleep_ms(25);
 
                m_script->step();
+
+#ifdef __ANDROID__
+               m_menu->getAndroidUIInput();
+#endif
        }
 }
 
@@ -283,8 +298,6 @@ GUIEngine::~GUIEngine()
                m_sound_manager = NULL;
        }
 
-       //TODO: clean up m_menu here
-
        infostream<<"GUIEngine: Deinitializing scripting"<<std::endl;
        delete m_script;
 
@@ -292,12 +305,12 @@ GUIEngine::~GUIEngine()
 
        //clean up texture pointers
        for (unsigned int i = 0; i < TEX_LAYER_MAX; i++) {
-               if (m_textures[i] != 0)
-                       driver->removeTexture(m_textures[i]);
+               if (m_textures[i].texture != NULL)
+                       driver->removeTexture(m_textures[i].texture);
        }
 
        delete m_texture_source;
-       
+
        if (m_cloud.clouds)
                m_cloud.clouds->drop();
 }
@@ -362,7 +375,7 @@ void GUIEngine::drawBackground(video::IVideoDriver* driver)
 {
        v2u32 screensize = driver->getScreenSize();
 
-       video::ITexture* texture = m_textures[TEX_LAYER_BACKGROUND];
+       video::ITexture* texture = m_textures[TEX_LAYER_BACKGROUND].texture;
 
        /* If no texture, draw background of solid color */
        if(!texture){
@@ -372,8 +385,27 @@ void GUIEngine::drawBackground(video::IVideoDriver* driver)
                return;
        }
 
-       /* Draw background texture */
        v2u32 sourcesize = texture->getOriginalSize();
+
+       if (m_textures[TEX_LAYER_BACKGROUND].tile)
+       {
+               v2u32 tilesize(
+                               MYMAX(sourcesize.X,m_textures[TEX_LAYER_BACKGROUND].minsize),
+                               MYMAX(sourcesize.Y,m_textures[TEX_LAYER_BACKGROUND].minsize));
+               for (unsigned int x = 0; x < screensize.X; x += tilesize.X )
+               {
+                       for (unsigned int y = 0; y < screensize.Y; y += tilesize.Y )
+                       {
+                               driver->draw2DImage(texture,
+                                       core::rect<s32>(x, y, x+tilesize.X, y+tilesize.Y),
+                                       core::rect<s32>(0, 0, sourcesize.X, sourcesize.Y),
+                                       NULL, NULL, true);
+                       }
+               }
+               return;
+       }
+
+       /* Draw background texture */
        driver->draw2DImage(texture,
                core::rect<s32>(0, 0, screensize.X, screensize.Y),
                core::rect<s32>(0, 0, sourcesize.X, sourcesize.Y),
@@ -385,7 +417,7 @@ void GUIEngine::drawOverlay(video::IVideoDriver* driver)
 {
        v2u32 screensize = driver->getScreenSize();
 
-       video::ITexture* texture = m_textures[TEX_LAYER_OVERLAY];
+       video::ITexture* texture = m_textures[TEX_LAYER_OVERLAY].texture;
 
        /* If no texture, draw background of solid color */
        if(!texture)
@@ -404,7 +436,7 @@ void GUIEngine::drawHeader(video::IVideoDriver* driver)
 {
        core::dimension2d<u32> screensize = driver->getScreenSize();
 
-       video::ITexture* texture = m_textures[TEX_LAYER_HEADER];
+       video::ITexture* texture = m_textures[TEX_LAYER_HEADER].texture;
 
        /* If no texture, draw nothing */
        if(!texture)
@@ -438,7 +470,7 @@ void GUIEngine::drawFooter(video::IVideoDriver* driver)
 {
        core::dimension2d<u32> screensize = driver->getScreenSize();
 
-       video::ITexture* texture = m_textures[TEX_LAYER_FOOTER];
+       video::ITexture* texture = m_textures[TEX_LAYER_FOOTER].texture;
 
        /* If no texture, draw nothing */
        if(!texture)
@@ -466,29 +498,38 @@ void GUIEngine::drawFooter(video::IVideoDriver* driver)
 }
 
 /******************************************************************************/
-bool GUIEngine::setTexture(texture_layer layer,std::string texturepath) {
-
+bool GUIEngine::setTexture(texture_layer layer, std::string texturepath,
+               bool tile_image, unsigned int minsize)
+{
        video::IVideoDriver* driver = m_device->getVideoDriver();
        assert(driver != 0);
 
-       if (m_textures[layer] != 0)
+       if (m_textures[layer].texture != NULL)
        {
-               driver->removeTexture(m_textures[layer]);
-               m_textures[layer] = 0;
+               driver->removeTexture(m_textures[layer].texture);
+               m_textures[layer].texture = NULL;
        }
 
        if ((texturepath == "") || !fs::PathExists(texturepath))
+       {
                return false;
+       }
 
-       m_textures[layer] = driver->getTexture(texturepath.c_str());
+       m_textures[layer].texture = driver->getTexture(texturepath.c_str());
+       m_textures[layer].tile    = tile_image;
+       m_textures[layer].minsize = minsize;
 
-       if (m_textures[layer] == 0) return false;
+       if (m_textures[layer].texture == NULL)
+       {
+               return false;
+       }
 
        return true;
 }
 
 /******************************************************************************/
-bool GUIEngine::downloadFile(std::string url,std::string target) {
+bool GUIEngine::downloadFile(std::string url,std::string target)
+{
 #if USE_CURL
        std::ofstream targetfile(target.c_str(), std::ios::out | std::ios::binary);
 
@@ -500,6 +541,7 @@ bool GUIEngine::downloadFile(std::string url,std::string target) {
        HTTPFetchResult fetchresult;
        fetchrequest.url = url;
        fetchrequest.caller = HTTPFETCH_SYNC;
+       fetchrequest.timeout = g_settings->getS32("curl_file_download_timeout");
        httpfetch_sync(fetchrequest, fetchresult);
 
        if (fetchresult.succeeded) {
@@ -515,7 +557,8 @@ bool GUIEngine::downloadFile(std::string url,std::string target) {
 }
 
 /******************************************************************************/
-void GUIEngine::setTopleftText(std::string append) {
+void GUIEngine::setTopleftText(std::string append)
+{
        std::string toset = std::string("Minetest ") + minetest_version_hash;
 
        if (append != "") {
@@ -541,7 +584,8 @@ void GUIEngine::stopSound(s32 handle)
 
 /******************************************************************************/
 unsigned int GUIEngine::queueAsync(std::string serialized_func,
-               std::string serialized_params) {
+               std::string serialized_params)
+{
        return m_script->queueAsync(serialized_func, serialized_params);
 }