]> git.lizzy.rs Git - minetest.git/blobdiff - src/tile.cpp
Remove liquid_finite and weather
[minetest.git] / src / tile.cpp
index 7286293d894affba1fb2f986fa215c0210758c5d..b8080c7084b9742a7749bef5b17b7e1daf872634 100644 (file)
@@ -18,6 +18,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 */
 
 #include "tile.h"
+#include "irrlichttypes_extrabloated.h"
 #include "debug.h"
 #include "main.h" // for g_settings
 #include "filesys.h"
@@ -25,8 +26,6 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "mesh.h"
 #include <ICameraSceneNode.h>
 #include "log.h"
-#include "mapnode.h" // For texture atlas making
-#include "nodedef.h" // For texture atlas making
 #include "gamedef.h"
 #include "util/string.h"
 #include "util/container.h"
@@ -59,7 +58,7 @@ static bool replace_ext(std::string &path, const char *ext)
                        last_dot_i = i;
                        break;
                }
-               
+
                if(path[i] == '\\' || path[i] == '/')
                        break;
        }
@@ -77,7 +76,7 @@ static bool replace_ext(std::string &path, const char *ext)
 
        If failed, return "".
 */
-static std::string getImagePath(std::string path)
+std::string getImagePath(std::string path)
 {
        // A NULL-ended list of possible image extensions
        const char *extensions[] = {
@@ -98,7 +97,7 @@ static std::string getImagePath(std::string path)
                        return path;
        }
        while((++ext) != NULL);
-       
+
        return "";
 }
 
@@ -121,7 +120,7 @@ std::string getTexturePath(const std::string &filename)
        bool incache = g_texturename_to_path_cache.get(filename, &fullpath);
        if(incache)
                return fullpath;
-       
+
        /*
                Check from texture_path
        */
@@ -132,18 +131,6 @@ std::string getTexturePath(const std::string &filename)
                // Check all filename extensions. Returns "" if not found.
                fullpath = getImagePath(testpath);
        }
-       
-       /*
-               Check from $user/textures/all
-       */
-       if(fullpath == "")
-       {
-               std::string texture_path = porting::path_user + DIR_DELIM
-                               + "textures" + DIR_DELIM + "all";
-               std::string testpath = texture_path + DIR_DELIM + filename;
-               // Check all filename extensions. Returns "" if not found.
-               fullpath = getImagePath(testpath);
-       }
 
        /*
                Check from default data directory
@@ -156,40 +143,37 @@ std::string getTexturePath(const std::string &filename)
                // Check all filename extensions. Returns "" if not found.
                fullpath = getImagePath(testpath);
        }
-       
+
        // Add to cache (also an empty result is cached)
        g_texturename_to_path_cache.set(filename, fullpath);
-       
+
        // Finally return it
        return fullpath;
 }
 
+void clearTextureNameCache()
+{
+       g_texturename_to_path_cache.clear();
+}
+
 /*
-       An internal variant of AtlasPointer with more data.
-       (well, more like a wrapper)
+       Stores internal information about a texture.
 */
 
-struct SourceAtlasPointer
+struct TextureInfo
 {
        std::string name;
-       AtlasPointer a;
-       video::IImage *atlas_img; // The source image of the atlas
-       // Integer variants of position and size
-       v2s32 intpos;
-       v2u32 intsize;
+       video::ITexture *texture;
+       video::IImage *img; // The source image
 
-       SourceAtlasPointer(
+       TextureInfo(
                        const std::string &name_,
-                       AtlasPointer a_=AtlasPointer(0, NULL),
-                       video::IImage *atlas_img_=NULL,
-                       v2s32 intpos_=v2s32(0,0),
-                       v2u32 intsize_=v2u32(0,0)
+                       video::ITexture *texture_=NULL,
+                       video::IImage *img_=NULL
                ):
                name(name_),
-               a(a_),
-               atlas_img(atlas_img_),
-               intpos(intpos_),
-               intsize(intsize_)
+               texture(texture_),
+               img(img_)
        {
        }
 };
@@ -201,48 +185,60 @@ struct SourceAtlasPointer
 class SourceImageCache
 {
 public:
+       ~SourceImageCache() {
+               for(std::map<std::string, video::IImage*>::iterator iter = m_images.begin();
+                               iter != m_images.end(); iter++) {
+                       iter->second->drop();
+               }
+               m_images.clear();
+       }
        void insert(const std::string &name, video::IImage *img,
                        bool prefer_local, video::IVideoDriver *driver)
        {
                assert(img);
                // Remove old image
-               core::map<std::string, video::IImage*>::Node *n;
+               std::map<std::string, video::IImage*>::iterator n;
                n = m_images.find(name);
-               if(n){
-                       video::IImage *oldimg = n->getValue();
-                       if(oldimg)
-                               oldimg->drop();
+               if(n != m_images.end()){
+                       if(n->second)
+                               n->second->drop();
                }
+
+               video::IImage* toadd = img;
+               bool need_to_grab = true;
+
                // Try to use local texture instead if asked to
                if(prefer_local){
                        std::string path = getTexturePath(name.c_str());
                        if(path != ""){
                                video::IImage *img2 = driver->createImageFromFile(path.c_str());
                                if(img2){
-                                       m_images[name] = img2;
-                                       return;
+                                       toadd = img2;
+                                       need_to_grab = false;
                                }
                        }
                }
-               img->grab();
-               m_images[name] = img;
+
+               if (need_to_grab)
+                       toadd->grab();
+               m_images[name] = toadd;
        }
        video::IImage* get(const std::string &name)
        {
-               core::map<std::string, video::IImage*>::Node *n;
+               std::map<std::string, video::IImage*>::iterator n;
                n = m_images.find(name);
-               if(n)
-                       return n->getValue();
+               if(n != m_images.end())
+                       return n->second;
                return NULL;
        }
        // Primarily fetches from cache, secondarily tries to read from filesystem
        video::IImage* getOrLoad(const std::string &name, IrrlichtDevice *device)
        {
-               core::map<std::string, video::IImage*>::Node *n;
+               std::map<std::string, video::IImage*>::iterator n;
                n = m_images.find(name);
-               if(n){
-                       n->getValue()->grab(); // Grab for caller
-                       return n->getValue();
+               if(n != m_images.end()){
+                       n->second->grab(); // Grab for caller
+                       return n->second;
                }
                video::IVideoDriver* driver = device->getVideoDriver();
                std::string path = getTexturePath(name.c_str());
@@ -254,8 +250,7 @@ class SourceImageCache
                infostream<<"SourceImageCache::getOrLoad(): Loading path \""<<path
                                <<"\""<<std::endl;
                video::IImage *img = driver->createImageFromFile(path.c_str());
-               // Even if could not be loaded, put as NULL
-               //m_images[name] = img;
+
                if(img){
                        m_images[name] = img;
                        img->grab(); // Grab for caller
@@ -263,7 +258,7 @@ class SourceImageCache
                return img;
        }
 private:
-       core::map<std::string, video::IImage*> m_images;
+       std::map<std::string, video::IImage*> m_images;
 };
 
 /*
@@ -274,7 +269,7 @@ class TextureSource : public IWritableTextureSource
 {
 public:
        TextureSource(IrrlichtDevice *device);
-       ~TextureSource();
+       virtual ~TextureSource();
 
        /*
                Example case:
@@ -296,7 +291,7 @@ class TextureSource : public IWritableTextureSource
 
                Example case #2:
                - Assume a texture with the id 1 exists, and has the name
-                 "stone.png^mineral1" and is specified as a part of some atlas.
+                 "stone.png^mineral_coal.png".
                - Now getNodeTile() stumbles upon a node which uses
                  texture id 1, and determines that MATERIAL_FLAG_CRACK
                  must be applied to the tile
@@ -304,17 +299,17 @@ class TextureSource : public IWritableTextureSource
                  has received the current crack level 0 from the client. It
                  finds out the name of the texture with getTextureName(1),
                  appends "^crack0" to it and gets a new texture id with
-                 getTextureId("stone.png^mineral1^crack0").
+                 getTextureId("stone.png^mineral_coal.png^crack0").
 
        */
-       
+
        /*
                Gets a texture id from cache or
                - if main thread, from getTextureIdDirect
                - if other thread, adds to request queue and waits for main thread
        */
        u32 getTextureId(const std::string &name);
-       
+
        /*
                Example names:
                "stone.png"
@@ -343,25 +338,9 @@ class TextureSource : public IWritableTextureSource
                and not found in cache, the call is queued to the main thread
                for processing.
        */
-       AtlasPointer getTexture(u32 id);
-       
-       AtlasPointer getTexture(const std::string &name)
-       {
-               return getTexture(getTextureId(name));
-       }
-       
-       // Gets a separate texture
-       video::ITexture* getTextureRaw(const std::string &name)
-       {
-               AtlasPointer ap = getTexture(name + "^[forcesingle");
-               return ap.atlas;
-       }
+       video::ITexture* getTexture(u32 id);
 
-       // Gets a separate texture atlas pointer
-       AtlasPointer getTextureRawAP(const AtlasPointer &ap)
-       {
-               return getTexture(getTextureName(ap.id) + "^[forcesingle");
-       }
+       video::ITexture* getTexture(const std::string &name, u32 *id);
 
        // Returns a pointer to the irrlicht device
        virtual IrrlichtDevice* getDevice()
@@ -369,10 +348,6 @@ class TextureSource : public IWritableTextureSource
                return m_device;
        }
 
-       // Update new texture pointer and texture coordinates to an
-       // AtlasPointer based on it's texture id
-       void updateAP(AtlasPointer &ap);
        bool isKnownSourceImage(const std::string &name)
        {
                bool is_known = false;
@@ -388,26 +363,38 @@ class TextureSource : public IWritableTextureSource
        // Processes queued texture requests from other threads.
        // Shall be called from the main thread.
        void processQueue();
-       
+
        // Insert an image into the cache without touching the filesystem.
        // Shall be called from the main thread.
        void insertSourceImage(const std::string &name, video::IImage *img);
-       
+
        // Rebuild images and textures from the current set of source images
        // Shall be called from the main thread.
        void rebuildImagesAndTextures();
 
-       // Build the main texture atlas which contains most of the
-       // textures.
-       void buildMainAtlas(class IGameDef *gamedef);
-       
+       // Render a mesh to a texture.
+       // Returns NULL if render-to-texture failed.
+       // Shall be called from the main thread.
+       video::ITexture* generateTextureFromMesh(
+                       const TextureFromMeshParams &params);
+
+       // Generates an image from a full string like
+       // "stone.png^mineral_coal.png^[crack:1:0".
+       // Shall be called from the main thread.
+       video::IImage* generateImageFromScratch(std::string name);
+
+       // Generate image based on a string like "stone.png" or "[crack:1:0".
+       // if baseimg is NULL, it is created. Otherwise stuff is made on it.
+       // Shall be called from the main thread.
+       bool generateImage(std::string part_of_name, video::IImage *& baseimg);
+
 private:
-       
+
        // The id of the thread that is allowed to use irrlicht directly
        threadid_t m_main_thread;
        // The irrlicht device
        IrrlichtDevice *m_device;
-       
+
        // Cache of source images
        // This should be only accessed from the main thread
        SourceImageCache m_sourcecache;
@@ -417,18 +404,23 @@ class TextureSource : public IWritableTextureSource
 
        // A texture id is index in this array.
        // The first position contains a NULL texture.
-       core::array<SourceAtlasPointer> m_atlaspointer_cache;
+       std::vector<TextureInfo> m_textureinfo_cache;
        // Maps a texture name to an index in the former.
-       core::map<std::string, u32> m_name_to_id;
+       std::map<std::string, u32> m_name_to_id;
        // The two former containers are behind this mutex
-       JMutex m_atlaspointer_cache_mutex;
-       
-       // Main texture atlas. This is filled at startup and is then not touched.
-       video::IImage *m_main_atlas_image;
-       video::ITexture *m_main_atlas_texture;
+       JMutex m_textureinfo_cache_mutex;
 
        // Queued texture fetches (to be processed by the main thread)
        RequestQueue<std::string, u32, u8, u8> m_get_texture_queue;
+
+       // Textures that have been overwritten with other ones
+       // but can't be deleted because the ITexture* might still be used
+       std::list<video::ITexture*> m_texture_trash;
+
+       // Cached settings needed for making textures from meshes
+       bool m_setting_trilinear_filter;
+       bool m_setting_bilinear_filter;
+       bool m_setting_anisotropic_filter;
 };
 
 IWritableTextureSource* createTextureSource(IrrlichtDevice *device)
@@ -437,23 +429,56 @@ IWritableTextureSource* createTextureSource(IrrlichtDevice *device)
 }
 
 TextureSource::TextureSource(IrrlichtDevice *device):
-               m_device(device),
-               m_main_atlas_image(NULL),
-               m_main_atlas_texture(NULL)
+               m_device(device)
 {
        assert(m_device);
-       
-       m_atlaspointer_cache_mutex.Init();
-       
+
        m_main_thread = get_current_thread_id();
-       
-       // Add a NULL AtlasPointer as the first index, named ""
-       m_atlaspointer_cache.push_back(SourceAtlasPointer(""));
+
+       // Add a NULL TextureInfo as the first index, named ""
+       m_textureinfo_cache.push_back(TextureInfo(""));
        m_name_to_id[""] = 0;
+
+       // Cache some settings
+       // Note: Since this is only done once, the game must be restarted
+       // for these settings to take effect
+       m_setting_trilinear_filter = g_settings->getBool("trilinear_filter");
+       m_setting_bilinear_filter = g_settings->getBool("bilinear_filter");
+       m_setting_anisotropic_filter = g_settings->getBool("anisotropic_filter");
 }
 
 TextureSource::~TextureSource()
 {
+       video::IVideoDriver* driver = m_device->getVideoDriver();
+
+       unsigned int textures_before = driver->getTextureCount();
+
+       for (std::vector<TextureInfo>::iterator iter =
+                       m_textureinfo_cache.begin();
+                       iter != m_textureinfo_cache.end(); iter++)
+       {
+               //cleanup texture
+               if (iter->texture)
+                       driver->removeTexture(iter->texture);
+
+               //cleanup source image
+               if (iter->img)
+                       iter->img->drop();
+       }
+       m_textureinfo_cache.clear();
+
+       for (std::list<video::ITexture*>::iterator iter =
+                       m_texture_trash.begin(); iter != m_texture_trash.end();
+                       iter++)
+       {
+               video::ITexture *t = *iter;
+
+               //cleanup trashed texture
+               driver->removeTexture(t);
+       }
+
+       infostream << "~TextureSource() "<< textures_before << "/"
+                       << driver->getTextureCount() << std::endl;
 }
 
 u32 TextureSource::getTextureId(const std::string &name)
@@ -464,15 +489,15 @@ u32 TextureSource::getTextureId(const std::string &name)
                /*
                        See if texture already exists
                */
-               JMutexAutoLock lock(m_atlaspointer_cache_mutex);
-               core::map<std::string, u32>::Node *n;
+               JMutexAutoLock lock(m_textureinfo_cache_mutex);
+               std::map<std::string, u32>::iterator n;
                n = m_name_to_id.find(name);
-               if(n != NULL)
+               if(n != m_name_to_id.end())
                {
-                       return n->getValue();
+                       return n->second;
                }
        }
-       
+
        /*
                Get texture
        */
@@ -485,45 +510,53 @@ u32 TextureSource::getTextureId(const std::string &name)
                infostream<<"getTextureId(): Queued: name=\""<<name<<"\""<<std::endl;
 
                // We're gonna ask the result to be put into here
-               ResultQueue<std::string, u32, u8, u8> result_queue;
-               
+               static ResultQueue<std::string, u32, u8, u8> result_queue;
+
                // Throw a request in
                m_get_texture_queue.add(name, 0, 0, &result_queue);
-               
-               infostream<<"Waiting for texture from main thread, name=\""
-                               <<name<<"\""<<std::endl;
-               
+
+               /*infostream<<"Waiting for texture from main thread, name=\""
+                               <<name<<"\""<<std::endl;*/
+
                try
                {
-                       // Wait result for a second
-                       GetResult<std::string, u32, u8, u8>
+                       while(true) {
+                               // Wait result for a second
+                               GetResult<std::string, u32, u8, u8>
                                        result = result_queue.pop_front(1000);
-               
-                       // Check that at least something worked OK
-                       assert(result.key == name);
 
-                       return result.item;
+                               if (result.key == name) {
+                                       return result.item;
+                               }
+                       }
                }
                catch(ItemNotFoundException &e)
                {
-                       infostream<<"Waiting for texture timed out."<<std::endl;
+                       errorstream<<"Waiting for texture " << name << " timed out."<<std::endl;
                        return 0;
                }
        }
-       
+
        infostream<<"getTextureId(): Failed"<<std::endl;
 
        return 0;
 }
 
-// Overlay image on top of another image (used for cracks)
-void overlay(video::IImage *image, video::IImage *overlay);
-
 // Draw an image on top of an another one, using the alpha channel of the
 // source image
 static void blit_with_alpha(video::IImage *src, video::IImage *dst,
                v2s32 src_pos, v2s32 dst_pos, v2u32 size);
 
+// Like blit_with_alpha, but only modifies destination pixels that
+// are fully opaque
+static void blit_with_alpha_overlay(video::IImage *src, video::IImage *dst,
+               v2s32 src_pos, v2s32 dst_pos, v2u32 size);
+
+// Draw or overlay a crack
+static void draw_crack(video::IImage *crack, video::IImage *dst,
+               bool use_overlay, s32 frame_count, s32 progression,
+               video::IVideoDriver *driver);
+
 // Brighten image
 void brighten(video::IImage *image);
 // Parse a transform name
@@ -533,22 +566,6 @@ core::dimension2d<u32> imageTransformDimension(u32 transform, core::dimension2d<
 // Apply transform to image data
 void imageTransform(u32 transform, video::IImage *src, video::IImage *dst);
 
-/*
-       Generate image based on a string like "stone.png" or "[crack0".
-       if baseimg is NULL, it is created. Otherwise stuff is made on it.
-*/
-bool generate_image(std::string part_of_name, video::IImage *& baseimg,
-               IrrlichtDevice *device, SourceImageCache *sourcecache);
-
-/*
-       Generates an image from a full string like
-       "stone.png^mineral_coal.png^[crack0".
-
-       This is used by buildMainAtlas().
-*/
-video::IImage* generate_image_from_scratch(std::string name,
-               IrrlichtDevice *device, SourceImageCache *sourcecache);
-
 /*
        This method generates all the textures
 */
@@ -562,7 +579,7 @@ u32 TextureSource::getTextureIdDirect(const std::string &name)
                infostream<<"getTextureIdDirect(): name is empty"<<std::endl;
                return 0;
        }
-       
+
        /*
                Calling only allowed from main thread
        */
@@ -577,21 +594,21 @@ u32 TextureSource::getTextureIdDirect(const std::string &name)
                See if texture already exists
        */
        {
-               JMutexAutoLock lock(m_atlaspointer_cache_mutex);
+               JMutexAutoLock lock(m_textureinfo_cache_mutex);
 
-               core::map<std::string, u32>::Node *n;
+               std::map<std::string, u32>::iterator n;
                n = m_name_to_id.find(name);
-               if(n != NULL)
+               if(n != m_name_to_id.end())
                {
                        /*infostream<<"getTextureIdDirect(): \""<<name
                                        <<"\" found in cache"<<std::endl;*/
-                       return n->getValue();
+                       return n->second;
                }
        }
 
        /*infostream<<"getTextureIdDirect(): \""<<name
                        <<"\" NOT found in cache. Creating it."<<std::endl;*/
-       
+
        /*
                Get the base image
        */
@@ -604,7 +621,7 @@ u32 TextureSource::getTextureIdDirect(const std::string &name)
                is made.
        */
        u32 base_image_id = 0;
-       
+
        // Find last meta separator in name
        s32 last_separator_position = -1;
        for(s32 i=name.size()-1; i>=0; i--)
@@ -629,9 +646,9 @@ u32 TextureSource::getTextureIdDirect(const std::string &name)
                 <<base_image_name<<"\""<<std::endl;*/
                base_image_id = getTextureIdDirect(base_image_name);
        }
-       
+
        //infostream<<"base_image_id="<<base_image_id<<std::endl;
-       
+
        video::IVideoDriver* driver = m_device->getVideoDriver();
        assert(driver);
 
@@ -641,17 +658,15 @@ u32 TextureSource::getTextureIdDirect(const std::string &name)
                An image will be built from files and then converted into a texture.
        */
        video::IImage *baseimg = NULL;
-       
+
        // If a base image was found, copy it to baseimg
        if(base_image_id != 0)
        {
-               JMutexAutoLock lock(m_atlaspointer_cache_mutex);
+               JMutexAutoLock lock(m_textureinfo_cache_mutex);
 
-               SourceAtlasPointer ap = m_atlaspointer_cache[base_image_id];
+               TextureInfo *ti = &m_textureinfo_cache[base_image_id];
 
-               video::IImage *image = ap.atlas_img;
-               
-               if(image == NULL)
+               if(ti->img == NULL)
                {
                        infostream<<"getTextureIdDirect(): WARNING: NULL image in "
                                        <<"cache: \""<<base_image_name<<"\""
@@ -659,17 +674,14 @@ u32 TextureSource::getTextureIdDirect(const std::string &name)
                }
                else
                {
-                       core::dimension2d<u32> dim = ap.intsize;
+                       core::dimension2d<u32> dim = ti->img->getDimension();
 
                        baseimg = driver->createImage(video::ECF_A8R8G8B8, dim);
 
-                       core::position2d<s32> pos_to(0,0);
-                       core::position2d<s32> pos_from = ap.intpos;
-                       
-                       image->copyTo(
+                       ti->img->copyTo(
                                        baseimg, // target
                                        v2s32(0,0), // position in target
-                                       core::rect<s32>(pos_from, dim) // from
+                                       core::rect<s32>(v2s32(0,0), dim) // from
                        );
 
                        /*infostream<<"getTextureIdDirect(): Loaded \""
@@ -677,7 +689,7 @@ u32 TextureSource::getTextureIdDirect(const std::string &name)
                                        <<std::endl;*/
                }
        }
-       
+
        /*
                Parse out the last part of the name of the image and act
                according to it
@@ -687,7 +699,7 @@ u32 TextureSource::getTextureIdDirect(const std::string &name)
        //infostream<<"last_part_of_name=\""<<last_part_of_name<<"\""<<std::endl;
 
        // Generate image according to part of name
-       if(!generate_image(last_part_of_name, baseimg, m_device, &m_sourcecache))
+       if(!generateImage(last_part_of_name, baseimg))
        {
                errorstream<<"getTextureIdDirect(): "
                                "failed to generate \""<<last_part_of_name<<"\""
@@ -700,68 +712,62 @@ u32 TextureSource::getTextureIdDirect(const std::string &name)
                errorstream<<"getTextureIdDirect(): baseimg is NULL (attempted to"
                                " create texture \""<<name<<"\""<<std::endl;
        }
-       
+
        if(baseimg != NULL)
        {
                // Create texture from resulting image
                t = driver->addTexture(name.c_str(), baseimg);
        }
-       
+
        /*
                Add texture to caches (add NULL textures too)
        */
 
-       JMutexAutoLock lock(m_atlaspointer_cache_mutex);
-       
-       u32 id = m_atlaspointer_cache.size();
-       AtlasPointer ap(id);
-       ap.atlas = t;
-       ap.pos = v2f(0,0);
-       ap.size = v2f(1,1);
-       ap.tiled = 0;
-       core::dimension2d<u32> baseimg_dim(0,0);
-       if(baseimg)
-               baseimg_dim = baseimg->getDimension();
-       SourceAtlasPointer nap(name, ap, baseimg, v2s32(0,0), baseimg_dim);
-       m_atlaspointer_cache.push_back(nap);
-       m_name_to_id.insert(name, id);
+       JMutexAutoLock lock(m_textureinfo_cache_mutex);
+
+       u32 id = m_textureinfo_cache.size();
+       TextureInfo ti(name, t, baseimg);
+       m_textureinfo_cache.push_back(ti);
+       m_name_to_id[name] = id;
 
        /*infostream<<"getTextureIdDirect(): "
                        <<"Returning id="<<id<<" for name \""<<name<<"\""<<std::endl;*/
-       
+
        return id;
 }
 
 std::string TextureSource::getTextureName(u32 id)
 {
-       JMutexAutoLock lock(m_atlaspointer_cache_mutex);
+       JMutexAutoLock lock(m_textureinfo_cache_mutex);
 
-       if(id >= m_atlaspointer_cache.size())
+       if(id >= m_textureinfo_cache.size())
        {
                errorstream<<"TextureSource::getTextureName(): id="<<id
-                               <<" >= m_atlaspointer_cache.size()="
-                               <<m_atlaspointer_cache.size()<<std::endl;
+                               <<" >= m_textureinfo_cache.size()="
+                               <<m_textureinfo_cache.size()<<std::endl;
                return "";
        }
-       
-       return m_atlaspointer_cache[id].name;
-}
 
+       return m_textureinfo_cache[id].name;
+}
 
-AtlasPointer TextureSource::getTexture(u32 id)
+video::ITexture* TextureSource::getTexture(u32 id)
 {
-       JMutexAutoLock lock(m_atlaspointer_cache_mutex);
+       JMutexAutoLock lock(m_textureinfo_cache_mutex);
 
-       if(id >= m_atlaspointer_cache.size())
-               return AtlasPointer(0, NULL);
-       
-       return m_atlaspointer_cache[id].a;
+       if(id >= m_textureinfo_cache.size())
+               return NULL;
+
+       return m_textureinfo_cache[id].texture;
 }
 
-void TextureSource::updateAP(AtlasPointer &ap)
+video::ITexture* TextureSource::getTexture(const std::string &name, u32 *id)
 {
-       AtlasPointer ap2 = getTexture(ap.id);
-       ap = ap2;
+       u32 actual_id = getTextureId(name);
+       if(id){
+               *id = actual_id;
+       }
+       return getTexture(actual_id);
 }
 
 void TextureSource::processQueue()
@@ -769,7 +775,8 @@ void TextureSource::processQueue()
        /*
                Fetch textures
        */
-       if(m_get_texture_queue.size() > 0)
+       //NOTE this is only thread safe for ONE consumer thread!
+       if(!m_get_texture_queue.empty())
        {
                GetRequest<std::string, u32, u8, u8>
                                request = m_get_texture_queue.pop();
@@ -779,323 +786,128 @@ void TextureSource::processQueue()
                                <<"name=\""<<request.key<<"\""
                                <<std::endl;*/
 
-               GetResult<std::string, u32, u8, u8>
-                               result;
-               result.key = request.key;
-               result.callers = request.callers;
-               result.item = getTextureIdDirect(request.key);
-
-               request.dest->push_back(result);
+               m_get_texture_queue.pushResult(request,getTextureIdDirect(request.key));
        }
 }
 
 void TextureSource::insertSourceImage(const std::string &name, video::IImage *img)
 {
        //infostream<<"TextureSource::insertSourceImage(): name="<<name<<std::endl;
-       
+
        assert(get_current_thread_id() == m_main_thread);
-       
+
        m_sourcecache.insert(name, img, true, m_device->getVideoDriver());
        m_source_image_existence.set(name, true);
 }
-       
+
 void TextureSource::rebuildImagesAndTextures()
 {
-       JMutexAutoLock lock(m_atlaspointer_cache_mutex);
-
-       /*// Oh well... just clear everything, they'll load sometime.
-       m_atlaspointer_cache.clear();
-       m_name_to_id.clear();*/
+       JMutexAutoLock lock(m_textureinfo_cache_mutex);
 
        video::IVideoDriver* driver = m_device->getVideoDriver();
-       
-       // Remove source images from textures to disable inheriting textures
-       // from existing textures
-       /*for(u32 i=0; i<m_atlaspointer_cache.size(); i++){
-               SourceAtlasPointer *sap = &m_atlaspointer_cache[i];
-               sap->atlas_img->drop();
-               sap->atlas_img = NULL;
-       }*/
-       
+
        // Recreate textures
-       for(u32 i=0; i<m_atlaspointer_cache.size(); i++){
-               SourceAtlasPointer *sap = &m_atlaspointer_cache[i];
-               video::IImage *img =
-                       generate_image_from_scratch(sap->name, m_device, &m_sourcecache);
+       for(u32 i=0; i<m_textureinfo_cache.size(); i++){
+               TextureInfo *ti = &m_textureinfo_cache[i];
+               video::IImage *img = generateImageFromScratch(ti->name);
                // Create texture from resulting image
                video::ITexture *t = NULL;
                if(img)
-                       t = driver->addTexture(sap->name.c_str(), img);
-               
+                       t = driver->addTexture(ti->name.c_str(), img);
+               video::ITexture *t_old = ti->texture;
                // Replace texture
-               sap->a.atlas = t;
-               sap->a.pos = v2f(0,0);
-               sap->a.size = v2f(1,1);
-               sap->a.tiled = 0;
-               sap->atlas_img = img;
-               sap->intpos = v2s32(0,0);
-               sap->intsize = img->getDimension();
+               ti->texture = t;
+               ti->img = img;
+
+               if (t_old != 0)
+                       m_texture_trash.push_back(t_old);
        }
 }
 
-void TextureSource::buildMainAtlas(class IGameDef *gamedef) 
+video::ITexture* TextureSource::generateTextureFromMesh(
+               const TextureFromMeshParams &params)
 {
-       assert(gamedef->tsrc() == this);
-       INodeDefManager *ndef = gamedef->ndef();
-
-       infostream<<"TextureSource::buildMainAtlas()"<<std::endl;
-
-       //return; // Disable (for testing)
-       
-       video::IVideoDriver* driver = m_device->getVideoDriver();
+       video::IVideoDriver *driver = m_device->getVideoDriver();
        assert(driver);
 
-       JMutexAutoLock lock(m_atlaspointer_cache_mutex);
-
-       // Create an image of the right size
-       core::dimension2d<u32> max_dim = driver->getMaxTextureSize();
-       core::dimension2d<u32> atlas_dim(2048,2048);
-       atlas_dim.Width  = MYMIN(atlas_dim.Width,  max_dim.Width);
-       atlas_dim.Height = MYMIN(atlas_dim.Height, max_dim.Height);
-       video::IImage *atlas_img =
-                       driver->createImage(video::ECF_A8R8G8B8, atlas_dim);
-       //assert(atlas_img);
-       if(atlas_img == NULL)
-       {
-               errorstream<<"TextureSource::buildMainAtlas(): Failed to create atlas "
-                               "image; not building texture atlas."<<std::endl;
-               return;
-       }
-
-       /*
-               Grab list of stuff to include in the texture atlas from the
-               main content features
-       */
-
-       core::map<std::string, bool> sourcelist;
-
-       for(u16 j=0; j<MAX_CONTENT+1; j++)
-       {
-               if(j == CONTENT_IGNORE || j == CONTENT_AIR)
-                       continue;
-               const ContentFeatures &f = ndef->get(j);
-               for(u32 i=0; i<6; i++)
-               {
-                       std::string name = f.tiledef[i].name;
-                       sourcelist[name] = true;
-               }
-       }
-       
-       infostream<<"Creating texture atlas out of textures: ";
-       for(core::map<std::string, bool>::Iterator
-                       i = sourcelist.getIterator();
-                       i.atEnd() == false; i++)
-       {
-               std::string name = i.getNode()->getKey();
-               infostream<<"\""<<name<<"\" ";
-       }
-       infostream<<std::endl;
-
-       // Padding to disallow texture bleeding
-       // (16 needed if mipmapping is used; otherwise less will work too)
-       s32 padding = 16;
-       s32 column_padding = 16;
-       s32 column_width = 256; // Space for 16 pieces of 16x16 textures
-
-       /*
-               First pass: generate almost everything
-       */
-       core::position2d<s32> pos_in_atlas(0,0);
-       
-       pos_in_atlas.X = column_padding;
-       pos_in_atlas.Y = padding;
-
-       for(core::map<std::string, bool>::Iterator
-                       i = sourcelist.getIterator();
-                       i.atEnd() == false; i++)
+       if(driver->queryFeature(video::EVDF_RENDER_TO_TARGET) == false)
        {
-               std::string name = i.getNode()->getKey();
-
-               // Generate image by name
-               video::IImage *img2 = generate_image_from_scratch(name, m_device,
-                               &m_sourcecache);
-               if(img2 == NULL)
-               {
-                       errorstream<<"TextureSource::buildMainAtlas(): "
-                                       <<"Couldn't generate image \""<<name<<"\""<<std::endl;
-                       continue;
-               }
-
-               core::dimension2d<u32> dim = img2->getDimension();
-
-               // Don't add to atlas if image is too large
-               core::dimension2d<u32> max_size_in_atlas(64,64);
-               if(dim.Width > max_size_in_atlas.Width
-               || dim.Height > max_size_in_atlas.Height)
-               {
-                       infostream<<"TextureSource::buildMainAtlas(): Not adding "
-                                       <<"\""<<name<<"\" because image is large"<<std::endl;
-                       continue;
-               }
-
-               // Wrap columns and stop making atlas if atlas is full
-               if(pos_in_atlas.Y + dim.Height > atlas_dim.Height)
-               {
-                       if(pos_in_atlas.X > (s32)atlas_dim.Width - column_width - column_padding){
-                               errorstream<<"TextureSource::buildMainAtlas(): "
-                                               <<"Atlas is full, not adding more textures."
-                                               <<std::endl;
-                               break;
-                       }
-                       pos_in_atlas.Y = padding;
-                       pos_in_atlas.X += column_width + column_padding*2;
-               }
-               
-               /*infostream<<"TextureSource::buildMainAtlas(): Adding \""<<name
-                               <<"\" to texture atlas"<<std::endl;*/
-
-               // Tile it a few times in the X direction
-               u16 xwise_tiling = column_width / dim.Width;
-               if(xwise_tiling > 16) // Limit to 16 (more gives no benefit)
-                       xwise_tiling = 16;
-               for(u32 j=0; j<xwise_tiling; j++)
+               static bool warned = false;
+               if(!warned)
                {
-                       // Copy the copy to the atlas
-                       /*img2->copyToWithAlpha(atlas_img,
-                                       pos_in_atlas + v2s32(j*dim.Width,0),
-                                       core::rect<s32>(v2s32(0,0), dim),
-                                       video::SColor(255,255,255,255),
-                                       NULL);*/
-                       img2->copyTo(atlas_img,
-                                       pos_in_atlas + v2s32(j*dim.Width,0),
-                                       core::rect<s32>(v2s32(0,0), dim),
-                                       NULL);
+                       errorstream<<"TextureSource::generateTextureFromMesh(): "
+                               <<"EVDF_RENDER_TO_TARGET not supported."<<std::endl;
+                       warned = true;
                }
-
-               // Copy the borders a few times to disallow texture bleeding
-               for(u32 side=0; side<2; side++) // top and bottom
-               for(s32 y0=0; y0<padding; y0++)
-               for(s32 x0=0; x0<(s32)xwise_tiling*(s32)dim.Width; x0++)
-               {
-                       s32 dst_y;
-                       s32 src_y;
-                       if(side==0)
-                       {
-                               dst_y = y0 + pos_in_atlas.Y + dim.Height;
-                               src_y = pos_in_atlas.Y + dim.Height - 1;
-                       }
-                       else
-                       {
-                               dst_y = -y0 + pos_in_atlas.Y-1;
-                               src_y = pos_in_atlas.Y;
-                       }
-                       s32 x = x0 + pos_in_atlas.X;
-                       video::SColor c = atlas_img->getPixel(x, src_y);
-                       atlas_img->setPixel(x,dst_y,c);
-               }
-
-               for(u32 side=0; side<2; side++) // left and right
-               for(s32 x0=0; x0<column_padding; x0++)
-               for(s32 y0=-padding; y0<(s32)dim.Height+padding; y0++)
-               {
-                       s32 dst_x;
-                       s32 src_x;
-                       if(side==0)
-                       {
-                               dst_x = x0 + pos_in_atlas.X + dim.Width*xwise_tiling;
-                               src_x = pos_in_atlas.X + dim.Width*xwise_tiling - 1;
-                       }
-                       else
-                       {
-                               dst_x = -x0 + pos_in_atlas.X-1;
-                               src_x = pos_in_atlas.X;
-                       }
-                       s32 y = y0 + pos_in_atlas.Y;
-                       s32 src_y = MYMAX((int)pos_in_atlas.Y, MYMIN((int)pos_in_atlas.Y + (int)dim.Height - 1, y));
-                       s32 dst_y = y;
-                       video::SColor c = atlas_img->getPixel(src_x, src_y);
-                       atlas_img->setPixel(dst_x,dst_y,c);
-               }
-
-               img2->drop();
-
-               /*
-                       Add texture to caches
-               */
-               
-               bool reuse_old_id = false;
-               u32 id = m_atlaspointer_cache.size();
-               // Check old id without fetching a texture
-               core::map<std::string, u32>::Node *n;
-               n = m_name_to_id.find(name);
-               // If it exists, we will replace the old definition
-               if(n){
-                       id = n->getValue();
-                       reuse_old_id = true;
-                       /*infostream<<"TextureSource::buildMainAtlas(): "
-                                       <<"Replacing old AtlasPointer"<<std::endl;*/
-               }
-
-               // Create AtlasPointer
-               AtlasPointer ap(id);
-               ap.atlas = NULL; // Set on the second pass
-               ap.pos = v2f((float)pos_in_atlas.X/(float)atlas_dim.Width,
-                               (float)pos_in_atlas.Y/(float)atlas_dim.Height);
-               ap.size = v2f((float)dim.Width/(float)atlas_dim.Width,
-                               (float)dim.Width/(float)atlas_dim.Height);
-               ap.tiled = xwise_tiling;
-
-               // Create SourceAtlasPointer and add to containers
-               SourceAtlasPointer nap(name, ap, atlas_img, pos_in_atlas, dim);
-               if(reuse_old_id)
-                       m_atlaspointer_cache[id] = nap;
-               else
-                       m_atlaspointer_cache.push_back(nap);
-               m_name_to_id[name] = id;
-                       
-               // Increment position
-               pos_in_atlas.Y += dim.Height + padding * 2;
+               return NULL;
        }
 
-       /*
-               Make texture
-       */
-       video::ITexture *t = driver->addTexture("__main_atlas__", atlas_img);
-       assert(t);
-
-       /*
-               Second pass: set texture pointer in generated AtlasPointers
-       */
-       for(core::map<std::string, bool>::Iterator
-                       i = sourcelist.getIterator();
-                       i.atEnd() == false; i++)
+       // Create render target texture
+       video::ITexture *rtt = driver->addRenderTargetTexture(
+                       params.dim, params.rtt_texture_name.c_str(),
+                       video::ECF_A8R8G8B8);
+       if(rtt == NULL)
        {
-               std::string name = i.getNode()->getKey();
-               if(m_name_to_id.find(name) == NULL)
-                       continue;
-               u32 id = m_name_to_id[name];
-               //infostream<<"id of name "<<name<<" is "<<id<<std::endl;
-               m_atlaspointer_cache[id].a.atlas = t;
+               errorstream<<"TextureSource::generateTextureFromMesh(): "
+                       <<"addRenderTargetTexture returned NULL."<<std::endl;
+               return NULL;
        }
 
-       /*
-               Write image to file so that it can be inspected
-       */
-       /*std::string atlaspath = porting::path_user
-                       + DIR_DELIM + "generated_texture_atlas.png";
-       infostream<<"Removing and writing texture atlas for inspection to "
-                       <<atlaspath<<std::endl;
-       fs::RecursiveDelete(atlaspath);
-       driver->writeImageToFile(atlas_img, atlaspath.c_str());*/
+       // Set render target
+       driver->setRenderTarget(rtt, false, true, video::SColor(0,0,0,0));
+
+       // Get a scene manager
+       scene::ISceneManager *smgr_main = m_device->getSceneManager();
+       assert(smgr_main);
+       scene::ISceneManager *smgr = smgr_main->createNewSceneManager();
+       assert(smgr);
+
+       scene::IMeshSceneNode* meshnode = smgr->addMeshSceneNode(params.mesh, NULL, -1, v3f(0,0,0), v3f(0,0,0), v3f(1,1,1), true);
+       meshnode->setMaterialFlag(video::EMF_LIGHTING, true);
+       meshnode->setMaterialFlag(video::EMF_ANTI_ALIASING, true);
+       meshnode->setMaterialFlag(video::EMF_TRILINEAR_FILTER, m_setting_trilinear_filter);
+       meshnode->setMaterialFlag(video::EMF_BILINEAR_FILTER, m_setting_bilinear_filter);
+       meshnode->setMaterialFlag(video::EMF_ANISOTROPIC_FILTER, m_setting_anisotropic_filter);
+
+       scene::ICameraSceneNode* camera = smgr->addCameraSceneNode(0,
+                       params.camera_position, params.camera_lookat);
+       // second parameter of setProjectionMatrix (isOrthogonal) is ignored
+       camera->setProjectionMatrix(params.camera_projection_matrix, false);
+
+       smgr->setAmbientLight(params.ambient_light);
+       smgr->addLightSceneNode(0,
+                       params.light_position,
+                       params.light_color,
+                       params.light_radius);
+
+       // Render scene
+       driver->beginScene(true, true, video::SColor(0,0,0,0));
+       smgr->drawAll();
+       driver->endScene();
+
+       // NOTE: The scene nodes should not be dropped, otherwise
+       //       smgr->drop() segfaults
+       /*cube->drop();
+       camera->drop();
+       light->drop();*/
+       // Drop scene manager
+       smgr->drop();
+
+       // Unset render target
+       driver->setRenderTarget(0, false, true, 0);
+
+       if(params.delete_texture_on_shutdown)
+               m_texture_trash.push_back(rtt);
+
+       return rtt;
 }
 
-video::IImage* generate_image_from_scratch(std::string name,
-               IrrlichtDevice *device, SourceImageCache *sourcecache)
+video::IImage* TextureSource::generateImageFromScratch(std::string name)
 {
-       /*infostream<<"generate_image_from_scratch(): "
+       /*infostream<<"generateImageFromScratch(): "
                        "\""<<name<<"\""<<std::endl;*/
-       
-       video::IVideoDriver* driver = device->getVideoDriver();
+
+       video::IVideoDriver *driver = m_device->getVideoDriver();
        assert(driver);
 
        /*
@@ -1108,12 +920,6 @@ video::IImage* generate_image_from_scratch(std::string name,
 
        // Find last meta separator in name
        s32 last_separator_position = name.find_last_of(separator);
-       //if(last_separator_position == std::npos)
-       //      last_separator_position = -1;
-
-       /*infostream<<"generate_image_from_scratch(): "
-                       <<"last_separator_position="<<last_separator_position
-                       <<std::endl;*/
 
        /*
                If separator was found, construct the base name and make the
@@ -1124,50 +930,44 @@ video::IImage* generate_image_from_scratch(std::string name,
        {
                // Construct base name
                base_image_name = name.substr(0, last_separator_position);
-               /*infostream<<"generate_image_from_scratch(): Calling itself recursively"
-                               " to get base image of \""<<name<<"\" = \""
-                <<base_image_name<<"\""<<std::endl;*/
-               baseimg = generate_image_from_scratch(base_image_name, device,
-                               sourcecache);
+               baseimg = generateImageFromScratch(base_image_name);
        }
-       
+
        /*
                Parse out the last part of the name of the image and act
                according to it
        */
 
        std::string last_part_of_name = name.substr(last_separator_position+1);
-       //infostream<<"last_part_of_name=\""<<last_part_of_name<<"\""<<std::endl;
-       
+
        // Generate image according to part of name
-       if(!generate_image(last_part_of_name, baseimg, device, sourcecache))
+       if(!generateImage(last_part_of_name, baseimg))
        {
-               errorstream<<"generate_image_from_scratch(): "
+               errorstream<<"generateImageFromScratch(): "
                                "failed to generate \""<<last_part_of_name<<"\""
                                <<std::endl;
                return NULL;
        }
-       
+
        return baseimg;
 }
 
-bool generate_image(std::string part_of_name, video::IImage *& baseimg,
-               IrrlichtDevice *device, SourceImageCache *sourcecache)
+bool TextureSource::generateImage(std::string part_of_name, video::IImage *& baseimg)
 {
-       video::IVideoDriver* driver = device->getVideoDriver();
+       video::IVideoDriver* driver = m_device->getVideoDriver();
        assert(driver);
 
        // Stuff starting with [ are special commands
        if(part_of_name.size() == 0 || part_of_name[0] != '[')
        {
-               video::IImage *image = sourcecache->getOrLoad(part_of_name, device);
+               video::IImage *image = m_sourcecache.getOrLoad(part_of_name, m_device);
 
                if(image == NULL)
                {
                        if(part_of_name != ""){
-                               errorstream<<"generate_image(): Could not load image \""
+                               errorstream<<"generateImage(): Could not load image \""
                                                <<part_of_name<<"\""<<" while building texture"<<std::endl;
-                               errorstream<<"generate_image(): Creating a dummy"
+                               errorstream<<"generateImage(): Creating a dummy"
                                                <<" image for \""<<part_of_name<<"\""<<std::endl;
                        }
 
@@ -1196,13 +996,12 @@ bool generate_image(std::string part_of_name, video::IImage *& baseimg,
                        //infostream<<"Setting "<<part_of_name<<" as base"<<std::endl;
                        /*
                                Copy it this way to get an alpha channel.
-                               Otherwise images with alpha cannot be blitted on 
+                               Otherwise images with alpha cannot be blitted on
                                images that don't have alpha in the original file.
                        */
                        core::dimension2d<u32> dim = image->getDimension();
                        baseimg = driver->createImage(video::ECF_A8R8G8B8, dim);
                        image->copyTo(baseimg);
-                       image->drop();
                }
                // Else blit on base.
                else
@@ -1221,131 +1020,55 @@ bool generate_image(std::string part_of_name, video::IImage *& baseimg,
                                        video::SColor(255,255,255,255),
                                        NULL);*/
                        blit_with_alpha(image, baseimg, pos_from, pos_to, dim);
-                       // Drop image
-                       image->drop();
                }
+               //cleanup
+               image->drop();
        }
        else
        {
                // A special texture modification
 
-               /*infostream<<"generate_image(): generating special "
+               /*infostream<<"generateImage(): generating special "
                                <<"modification \""<<part_of_name<<"\""
                                <<std::endl;*/
-               
-               /*
-                       This is the simplest of all; it just adds stuff to the
-                       name so that a separate texture is created.
 
-                       It is used to make textures for stuff that doesn't want
-                       to implement getting the texture from a bigger texture
-                       atlas.
-               */
-               if(part_of_name == "[forcesingle")
-               {
-                       // If base image is NULL, create a random color
-                       if(baseimg == NULL)
-                       {
-                               core::dimension2d<u32> dim(1,1);
-                               baseimg = driver->createImage(video::ECF_A8R8G8B8, dim);
-                               assert(baseimg);
-                               baseimg->setPixel(0,0, video::SColor(255,myrand()%256,
-                                               myrand()%256,myrand()%256));
-                       }
-               }
                /*
-                       [crackN
+                       [crack:N:P
+                       [cracko:N:P
                        Adds a cracking texture
+                       N = animation frame count, P = crack progression
                */
-               else if(part_of_name.substr(0,6) == "[crack")
+               if(part_of_name.substr(0,6) == "[crack")
                {
                        if(baseimg == NULL)
                        {
-                               errorstream<<"generate_image(): baseimg==NULL "
+                               errorstream<<"generateImage(): baseimg==NULL "
                                                <<"for part_of_name=\""<<part_of_name
                                                <<"\", cancelling."<<std::endl;
                                return false;
                        }
-                       
+
                        // Crack image number and overlay option
-                       s32 progression = 0;
-                       bool use_overlay = false;
-                       if(part_of_name.substr(6,1) == "o")
-                       {
-                               progression = stoi(part_of_name.substr(7));
-                               use_overlay = true;
-                       }
-                       else
-                       {
-                               progression = stoi(part_of_name.substr(6));
-                               use_overlay = false;
-                       }
+                       bool use_overlay = (part_of_name[6] == 'o');
+                       Strfnd sf(part_of_name);
+                       sf.next(":");
+                       s32 frame_count = stoi(sf.next(":"));
+                       s32 progression = stoi(sf.next(":"));
 
-                       // Size of the base image
-                       core::dimension2d<u32> dim_base = baseimg->getDimension();
-                       
                        /*
                                Load crack image.
 
                                It is an image with a number of cracking stages
                                horizontally tiled.
                        */
-                       video::IImage *img_crack = sourcecache->getOrLoad(
-                                       "crack_anylength.png", device);
-               
+                       video::IImage *img_crack = m_sourcecache.getOrLoad(
+                                       "crack_anylength.png", m_device);
+
                        if(img_crack && progression >= 0)
                        {
-                               // Dimension of original image
-                               core::dimension2d<u32> dim_crack
-                                               = img_crack->getDimension();
-                               // Count of crack stages
-                               s32 crack_count = dim_crack.Height / dim_crack.Width;
-                               // Limit progression
-                               if(progression > crack_count-1)
-                                       progression = crack_count-1;
-                               // Dimension of a single crack stage
-                               core::dimension2d<u32> dim_crack_cropped(
-                                       dim_crack.Width,
-                                       dim_crack.Width
-                               );
-                               // Create cropped and scaled crack images
-                               video::IImage *img_crack_cropped = driver->createImage(
-                                               video::ECF_A8R8G8B8, dim_crack_cropped);
-                               video::IImage *img_crack_scaled = driver->createImage(
-                                               video::ECF_A8R8G8B8, dim_base);
-
-                               if(img_crack_cropped && img_crack_scaled)
-                               {
-                                       // Crop crack image
-                                       v2s32 pos_crack(0, progression*dim_crack.Width);
-                                       img_crack->copyTo(img_crack_cropped,
-                                                       v2s32(0,0),
-                                                       core::rect<s32>(pos_crack, dim_crack_cropped));
-                                       // Scale crack image by copying
-                                       img_crack_cropped->copyToScaling(img_crack_scaled);
-                                       // Copy or overlay crack image
-                                       if(use_overlay)
-                                       {
-                                               overlay(baseimg, img_crack_scaled);
-                                       }
-                                       else
-                                       {
-                                               /*img_crack_scaled->copyToWithAlpha(
-                                                               baseimg,
-                                                               v2s32(0,0),
-                                                               core::rect<s32>(v2s32(0,0), dim_base),
-                                                               video::SColor(255,255,255,255));*/
-                                               blit_with_alpha(img_crack_scaled, baseimg,
-                                                               v2s32(0,0), v2s32(0,0), dim_base);
-                                       }
-                               }
-
-                               if(img_crack_scaled)
-                                       img_crack_scaled->drop();
-
-                               if(img_crack_cropped)
-                                       img_crack_cropped->drop();
-                               
+                               draw_crack(img_crack, baseimg,
+                                               use_overlay, frame_count,
+                                               progression, driver);
                                img_crack->drop();
                        }
                }
@@ -1374,7 +1097,7 @@ bool generate_image(std::string part_of_name, video::IImage *& baseimg,
                                infostream<<"Adding \""<<filename
                                                <<"\" to combined ("<<x<<","<<y<<")"
                                                <<std::endl;
-                               video::IImage *img = sourcecache->getOrLoad(filename, device);
+                               video::IImage *img = m_sourcecache.getOrLoad(filename, m_device);
                                if(img)
                                {
                                        core::dimension2d<u32> dim = img->getDimension();
@@ -1405,7 +1128,7 @@ bool generate_image(std::string part_of_name, video::IImage *& baseimg,
                {
                        if(baseimg == NULL)
                        {
-                               errorstream<<"generate_image(): baseimg==NULL "
+                               errorstream<<"generateImage(): baseimg==NULL "
                                                <<"for part_of_name=\""<<part_of_name
                                                <<"\", cancelling."<<std::endl;
                                return false;
@@ -1417,21 +1140,21 @@ bool generate_image(std::string part_of_name, video::IImage *& baseimg,
                        "[noalpha"
                        Make image completely opaque.
                        Used for the leaves texture when in old leaves mode, so
-                       that the transparent parts don't look completely black 
+                       that the transparent parts don't look completely black
                        when simple alpha channel is used for rendering.
                */
                else if(part_of_name.substr(0,8) == "[noalpha")
                {
                        if(baseimg == NULL)
                        {
-                               errorstream<<"generate_image(): baseimg==NULL "
+                               errorstream<<"generateImage(): baseimg==NULL "
                                                <<"for part_of_name=\""<<part_of_name
                                                <<"\", cancelling."<<std::endl;
                                return false;
                        }
 
                        core::dimension2d<u32> dim = baseimg->getDimension();
-                       
+
                        // Set alpha to full
                        for(u32 y=0; y<dim.Height; y++)
                        for(u32 x=0; x<dim.Width; x++)
@@ -1449,7 +1172,7 @@ bool generate_image(std::string part_of_name, video::IImage *& baseimg,
                {
                        if(baseimg == NULL)
                        {
-                               errorstream<<"generate_image(): baseimg==NULL "
+                               errorstream<<"generateImage(): baseimg==NULL "
                                                <<"for part_of_name=\""<<part_of_name
                                                <<"\", cancelling."<<std::endl;
                                return false;
@@ -1462,7 +1185,7 @@ bool generate_image(std::string part_of_name, video::IImage *& baseimg,
                        std::string filename = sf.next("");
 
                        core::dimension2d<u32> dim = baseimg->getDimension();
-                       
+
                        /*video::IImage *oldbaseimg = baseimg;
                        baseimg = driver->createImage(video::ECF_A8R8G8B8, dim);
                        oldbaseimg->copyTo(baseimg);
@@ -1506,7 +1229,7 @@ bool generate_image(std::string part_of_name, video::IImage *& baseimg,
                {
                        if(baseimg == NULL)
                        {
-                               errorstream<<"generate_image(): baseimg==NULL "
+                               errorstream<<"generateImage(): baseimg==NULL "
                                                <<"for part_of_name=\""<<part_of_name
                                                <<"\", cancelling."<<std::endl;
                                return false;
@@ -1534,7 +1257,7 @@ bool generate_image(std::string part_of_name, video::IImage *& baseimg,
                {
                        if(baseimg != NULL)
                        {
-                               errorstream<<"generate_image(): baseimg!=NULL "
+                               errorstream<<"generateImage(): baseimg!=NULL "
                                                <<"for part_of_name=\""<<part_of_name
                                                <<"\", cancelling."<<std::endl;
                                return false;
@@ -1548,12 +1271,12 @@ bool generate_image(std::string part_of_name, video::IImage *& baseimg,
                        std::string imagename_right = sf.next("{");
 
                        // Generate images for the faces of the cube
-                       video::IImage *img_top = generate_image_from_scratch(
-                                       imagename_top, device, sourcecache);
-                       video::IImage *img_left = generate_image_from_scratch(
-                                       imagename_left, device, sourcecache);
-                       video::IImage *img_right = generate_image_from_scratch(
-                                       imagename_right, device, sourcecache);
+                       video::IImage *img_top =
+                               generateImageFromScratch(imagename_top);
+                       video::IImage *img_left =
+                               generateImageFromScratch(imagename_left);
+                       video::IImage *img_right =
+                               generateImageFromScratch(imagename_right);
                        assert(img_top && img_left && img_right);
 
                        // Create textures from images
@@ -1569,7 +1292,7 @@ bool generate_image(std::string part_of_name, video::IImage *& baseimg,
                        img_top->drop();
                        img_left->drop();
                        img_right->drop();
-                       
+
                        /*
                                Draw a cube mesh into a render target texture
                        */
@@ -1582,32 +1305,26 @@ bool generate_image(std::string part_of_name, video::IImage *& baseimg,
                        cube->getMeshBuffer(4)->getMaterial().setTexture(0, texture_left);
                        cube->getMeshBuffer(5)->getMaterial().setTexture(0, texture_left);
 
-                       core::dimension2d<u32> dim(64,64);
-                       std::string rtt_texture_name = part_of_name + "_RTT";
-
-                       v3f camera_position(0, 1.0, -1.5);
-                       camera_position.rotateXZBy(45);
-                       v3f camera_lookat(0, 0, 0);
-                       core::CMatrix4<f32> camera_projection_matrix;
+                       TextureFromMeshParams params;
+                       params.mesh = cube;
+                       params.dim.set(64, 64);
+                       params.rtt_texture_name = part_of_name + "_RTT";
+                       // We will delete the rtt texture ourselves
+                       params.delete_texture_on_shutdown = false;
+                       params.camera_position.set(0, 1.0, -1.5);
+                       params.camera_position.rotateXZBy(45);
+                       params.camera_lookat.set(0, 0, 0);
                        // Set orthogonal projection
-                       camera_projection_matrix.buildProjectionMatrixOrthoLH(
+                       params.camera_projection_matrix.buildProjectionMatrixOrthoLH(
                                        1.65, 1.65, 0, 100);
 
-                       video::SColorf ambient_light(0.2,0.2,0.2);
-                       v3f light_position(10, 100, -50);
-                       video::SColorf light_color(0.5,0.5,0.5);
-                       f32 light_radius = 1000;
-
-                       video::ITexture *rtt = generateTextureFromMesh(
-                                       cube, device, dim, rtt_texture_name,
-                                       camera_position,
-                                       camera_lookat,
-                                       camera_projection_matrix,
-                                       ambient_light,
-                                       light_position,
-                                       light_color,
-                                       light_radius);
-                       
+                       params.ambient_light.set(1.0, 0.2, 0.2, 0.2);
+                       params.light_position.set(10, 100, -50);
+                       params.light_color.set(1.0, 0.5, 0.5, 0.5);
+                       params.light_radius = 1000;
+
+                       video::ITexture *rtt = generateTextureFromMesh(params);
+
                        // Drop mesh
                        cube->drop();
 
@@ -1615,19 +1332,21 @@ bool generate_image(std::string part_of_name, video::IImage *& baseimg,
                        driver->removeTexture(texture_top);
                        driver->removeTexture(texture_left);
                        driver->removeTexture(texture_right);
-                       
+
                        if(rtt == NULL)
                        {
-                               baseimg = generate_image_from_scratch(
-                                               imagename_top, device, sourcecache);
+                               baseimg = generateImageFromScratch(imagename_top);
                                return true;
                        }
 
                        // Create image of render target
-                       video::IImage *image = driver->createImage(rtt, v2s32(0,0), dim);
+                       video::IImage *image = driver->createImage(rtt, v2s32(0,0), params.dim);
                        assert(image);
 
-                       baseimg = driver->createImage(video::ECF_A8R8G8B8, dim);
+                       // Cleanup texture
+                       driver->removeTexture(rtt);
+
+                       baseimg = driver->createImage(video::ECF_A8R8G8B8, params.dim);
 
                        if(image)
                        {
@@ -1649,7 +1368,7 @@ bool generate_image(std::string part_of_name, video::IImage *& baseimg,
 
                        if(baseimg == NULL)
                                baseimg = driver->createImage(video::ECF_A8R8G8B8, v2u32(16,16));
-                       video::IImage *img = sourcecache->getOrLoad(filename, device);
+                       video::IImage *img = m_sourcecache.getOrLoad(filename, m_device);
                        if(img)
                        {
                                core::dimension2d<u32> dim = img->getDimension();
@@ -1683,19 +1402,19 @@ bool generate_image(std::string part_of_name, video::IImage *& baseimg,
                        u32 frame_index = stoi(sf.next(":"));
 
                        if(baseimg == NULL){
-                               errorstream<<"generate_image(): baseimg!=NULL "
+                               errorstream<<"generateImage(): baseimg!=NULL "
                                                <<"for part_of_name=\""<<part_of_name
                                                <<"\", cancelling."<<std::endl;
                                return false;
                        }
-                       
+
                        v2u32 frame_size = baseimg->getDimension();
                        frame_size.Y /= frame_count;
 
                        video::IImage *img = driver->createImage(video::ECF_A8R8G8B8,
                                        frame_size);
                        if(!img){
-                               errorstream<<"generate_image(): Could not create image "
+                               errorstream<<"generateImage(): Could not create image "
                                                <<"for part_of_name=\""<<part_of_name
                                                <<"\", cancelling."<<std::endl;
                                return false;
@@ -1717,7 +1436,7 @@ bool generate_image(std::string part_of_name, video::IImage *& baseimg,
                }
                else
                {
-                       errorstream<<"generate_image(): Invalid "
+                       errorstream<<"generateImage(): Invalid "
                                        " modification: \""<<part_of_name<<"\""<<std::endl;
                }
        }
@@ -1725,37 +1444,6 @@ bool generate_image(std::string part_of_name, video::IImage *& baseimg,
        return true;
 }
 
-void overlay(video::IImage *image, video::IImage *overlay)
-{
-       /*
-               Copy overlay to image, taking alpha into account.
-               Where image is transparent, don't copy from overlay.
-               Images sizes must be identical.
-       */
-       if(image == NULL || overlay == NULL)
-               return;
-       
-       core::dimension2d<u32> dim = image->getDimension();
-       core::dimension2d<u32> dim_overlay = overlay->getDimension();
-       assert(dim == dim_overlay);
-
-       for(u32 y=0; y<dim.Height; y++)
-       for(u32 x=0; x<dim.Width; x++)
-       {
-               video::SColor c1 = image->getPixel(x,y);
-               video::SColor c2 = overlay->getPixel(x,y);
-               u32 a1 = c1.getAlpha();
-               u32 a2 = c2.getAlpha();
-               if(a1 == 255 && a2 != 0)
-               {
-                       c1.setRed((c1.getRed()*(255-a2) + c2.getRed()*a2)/255);
-                       c1.setGreen((c1.getGreen()*(255-a2) + c2.getGreen()*a2)/255);
-                       c1.setBlue((c1.getBlue()*(255-a2) + c2.getBlue()*a2)/255);
-               }
-               image->setPixel(x,y,c1);
-       }
-}
-
 /*
        Draw an image on top of an another one, using the alpha channel of the
        source image
@@ -1780,11 +1468,105 @@ static void blit_with_alpha(video::IImage *src, video::IImage *dst,
        }
 }
 
+/*
+       Draw an image on top of an another one, using the alpha channel of the
+       source image; only modify fully opaque pixels in destinaion
+*/
+static void blit_with_alpha_overlay(video::IImage *src, video::IImage *dst,
+               v2s32 src_pos, v2s32 dst_pos, v2u32 size)
+{
+       for(u32 y0=0; y0<size.Y; y0++)
+       for(u32 x0=0; x0<size.X; x0++)
+       {
+               s32 src_x = src_pos.X + x0;
+               s32 src_y = src_pos.Y + y0;
+               s32 dst_x = dst_pos.X + x0;
+               s32 dst_y = dst_pos.Y + y0;
+               video::SColor src_c = src->getPixel(src_x, src_y);
+               video::SColor dst_c = dst->getPixel(dst_x, dst_y);
+               if(dst_c.getAlpha() == 255 && src_c.getAlpha() != 0)
+               {
+                       dst_c = src_c.getInterpolated(dst_c, (float)src_c.getAlpha()/255.0f);
+                       dst->setPixel(dst_x, dst_y, dst_c);
+               }
+       }
+}
+
+static void draw_crack(video::IImage *crack, video::IImage *dst,
+               bool use_overlay, s32 frame_count, s32 progression,
+               video::IVideoDriver *driver)
+{
+       // Dimension of destination image
+       core::dimension2d<u32> dim_dst = dst->getDimension();
+       // Dimension of original image
+       core::dimension2d<u32> dim_crack = crack->getDimension();
+       // Count of crack stages
+       s32 crack_count = dim_crack.Height / dim_crack.Width;
+       // Limit frame_count
+       if(frame_count > (s32) dim_dst.Height)
+               frame_count = dim_dst.Height;
+       if(frame_count < 1)
+               frame_count = 1;
+       // Limit progression
+       if(progression > crack_count-1)
+               progression = crack_count-1;
+       // Dimension of a single crack stage
+       core::dimension2d<u32> dim_crack_cropped(
+               dim_crack.Width,
+               dim_crack.Width
+       );
+       // Dimension of the scaled crack stage,
+       // which is the same as the dimension of a single destination frame
+       core::dimension2d<u32> dim_crack_scaled(
+               dim_dst.Width,
+               dim_dst.Height / frame_count
+       );
+       // Create cropped and scaled crack images
+       video::IImage *crack_cropped = driver->createImage(
+                       video::ECF_A8R8G8B8, dim_crack_cropped);
+       video::IImage *crack_scaled = driver->createImage(
+                       video::ECF_A8R8G8B8, dim_crack_scaled);
+
+       if(crack_cropped && crack_scaled)
+       {
+               // Crop crack image
+               v2s32 pos_crack(0, progression*dim_crack.Width);
+               crack->copyTo(crack_cropped,
+                               v2s32(0,0),
+                               core::rect<s32>(pos_crack, dim_crack_cropped));
+               // Scale crack image by copying
+               crack_cropped->copyToScaling(crack_scaled);
+               // Copy or overlay crack image onto each frame
+               for(s32 i = 0; i < frame_count; ++i)
+               {
+                       v2s32 dst_pos(0, dim_crack_scaled.Height * i);
+                       if(use_overlay)
+                       {
+                               blit_with_alpha_overlay(crack_scaled, dst,
+                                               v2s32(0,0), dst_pos,
+                                               dim_crack_scaled);
+                       }
+                       else
+                       {
+                               blit_with_alpha(crack_scaled, dst,
+                                               v2s32(0,0), dst_pos,
+                                               dim_crack_scaled);
+                       }
+               }
+       }
+
+       if(crack_scaled)
+               crack_scaled->drop();
+
+       if(crack_cropped)
+               crack_cropped->drop();
+}
+
 void brighten(video::IImage *image)
 {
        if(image == NULL)
                return;
-       
+
        core::dimension2d<u32> dim = image->getDimension();
 
        for(u32 y=0; y<dim.Height; y++)
@@ -1861,7 +1643,7 @@ void imageTransform(u32 transform, video::IImage *src, video::IImage *dst)
 {
        if(src == NULL || dst == NULL)
                return;
-       
+
        core::dimension2d<u32> srcdim = src->getDimension();
        core::dimension2d<u32> dstdim = dst->getDimension();