LocalPlayer::getStandingNodePos()
[oweals/minetest.git] / src / tile.cpp
index d71055c7a33b85317a049d549af3a4f3a36b49c4..4af7a327273d0059ad32aecdff3416836f6d2132 100644 (file)
@@ -1,6 +1,6 @@
 /*
 Minetest-c55
-Copyright (C) 2010 celeron55, Perttu Ahola <celeron55@gmail.com>
+Copyright (C) 2010-2011 celeron55, Perttu Ahola <celeron55@gmail.com>
 
 This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
@@ -19,6 +19,389 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 
 #include "tile.h"
 #include "debug.h"
+#include "main.h" // for g_settings
+#include "filesys.h"
+#include "utility.h"
+#include "settings.h"
+#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"
+
+/*
+       A cache from texture name to texture path
+*/
+MutexedMap<std::string, std::string> g_texturename_to_path_cache;
+
+/*
+       Replaces the filename extension.
+       eg:
+               std::string image = "a/image.png"
+               replace_ext(image, "jpg")
+               -> image = "a/image.jpg"
+       Returns true on success.
+*/
+static bool replace_ext(std::string &path, const char *ext)
+{
+       if(ext == NULL)
+               return false;
+       // Find place of last dot, fail if \ or / found.
+       s32 last_dot_i = -1;
+       for(s32 i=path.size()-1; i>=0; i--)
+       {
+               if(path[i] == '.')
+               {
+                       last_dot_i = i;
+                       break;
+               }
+               
+               if(path[i] == '\\' || path[i] == '/')
+                       break;
+       }
+       // If not found, return an empty string
+       if(last_dot_i == -1)
+               return false;
+       // Else make the new path
+       path = path.substr(0, last_dot_i+1) + ext;
+       return true;
+}
+
+/*
+       Find out the full path of an image by trying different filename
+       extensions.
+
+       If failed, return "".
+*/
+static std::string getImagePath(std::string path)
+{
+       // A NULL-ended list of possible image extensions
+       const char *extensions[] = {
+               "png", "jpg", "bmp", "tga",
+               "pcx", "ppm", "psd", "wal", "rgb",
+               NULL
+       };
+
+       const char **ext = extensions;
+       do{
+               bool r = replace_ext(path, *ext);
+               if(r == false)
+                       return "";
+               if(fs::PathExists(path))
+                       return path;
+       }
+       while((++ext) != NULL);
+       
+       return "";
+}
+
+/*
+       Gets the path to a texture by first checking if the texture exists
+       in texture_path and if not, using the data path.
+
+       Checks all supported extensions by replacing the original extension.
+
+       If not found, returns "".
+
+       Utilizes a thread-safe cache.
+*/
+std::string getTexturePath(const std::string &filename)
+{
+       std::string fullpath = "";
+       /*
+               Check from cache
+       */
+       bool incache = g_texturename_to_path_cache.get(filename, &fullpath);
+       if(incache)
+               return fullpath;
+       
+       /*
+               Check from texture_path
+       */
+       std::string texture_path = g_settings->get("texture_path");
+       if(texture_path != "")
+       {
+               std::string testpath = texture_path + DIR_DELIM + filename;
+               // Check all filename extensions. Returns "" if not found.
+               fullpath = getImagePath(testpath);
+       }
+       
+       /*
+               Check from default data directory
+       */
+       if(fullpath == "")
+       {
+               std::string base_path = porting::path_share + DIR_DELIM + "textures"
+                               + DIR_DELIM + "base" + DIR_DELIM + "pack";
+               std::string testpath = base_path + DIR_DELIM + 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;
+}
+
+/*
+       An internal variant of AtlasPointer with more data.
+       (well, more like a wrapper)
+*/
+
+struct SourceAtlasPointer
+{
+       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;
+
+       SourceAtlasPointer(
+                       const std::string &name_,
+                       AtlasPointer a_=AtlasPointer(0, NULL),
+                       video::IImage *atlas_img_=NULL,
+                       v2s32 intpos_=v2s32(0,0),
+                       v2u32 intsize_=v2u32(0,0)
+               ):
+               name(name_),
+               a(a_),
+               atlas_img(atlas_img_),
+               intpos(intpos_),
+               intsize(intsize_)
+       {
+       }
+};
+
+/*
+       SourceImageCache: A cache used for storing source images.
+*/
+
+class SourceImageCache
+{
+public:
+       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;
+               n = m_images.find(name);
+               if(n){
+                       video::IImage *oldimg = n->getValue();
+                       if(oldimg)
+                               oldimg->drop();
+               }
+               // 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;
+                               }
+                       }
+               }
+               img->grab();
+               m_images[name] = img;
+       }
+       video::IImage* get(const std::string &name)
+       {
+               core::map<std::string, video::IImage*>::Node *n;
+               n = m_images.find(name);
+               if(n)
+                       return n->getValue();
+               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;
+               n = m_images.find(name);
+               if(n){
+                       n->getValue()->grab(); // Grab for caller
+                       return n->getValue();
+               }
+               video::IVideoDriver* driver = device->getVideoDriver();
+               std::string path = getTexturePath(name.c_str());
+               if(path == ""){
+                       infostream<<"SourceImageCache::getOrLoad(): No path found for \""
+                                       <<name<<"\""<<std::endl;
+                       return NULL;
+               }
+               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
+               }
+               return img;
+       }
+private:
+       core::map<std::string, video::IImage*> m_images;
+};
+
+/*
+       TextureSource
+*/
+
+class TextureSource : public IWritableTextureSource
+{
+public:
+       TextureSource(IrrlichtDevice *device);
+       ~TextureSource();
+
+       /*
+               Example case:
+               Now, assume a texture with the id 1 exists, and has the name
+               "stone.png^mineral1".
+               Then a random thread calls getTextureId for a texture called
+               "stone.png^mineral1^crack0".
+               ...Now, WTF should happen? Well:
+               - getTextureId strips off stuff recursively from the end until
+                 the remaining part is found, or nothing is left when
+                 something is stripped out
+
+               But it is slow to search for textures by names and modify them
+               like that?
+               - ContentFeatures is made to contain ids for the basic plain
+                 textures
+               - Crack textures can be slow by themselves, but the framework
+                 must be fast.
+
+               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.
+               - Now getNodeTile() stumbles upon a node which uses
+                 texture id 1, and determines that MATERIAL_FLAG_CRACK
+                 must be applied to the tile
+               - MapBlockMesh::animate() finds the MATERIAL_FLAG_CRACK and
+                 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").
+
+       */
+       
+       /*
+               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"
+               "stone.png^crack2"
+               "stone.png^mineral_coal.png"
+               "stone.png^mineral_coal.png^crack1"
+
+               - If texture specified by name is found from cache, return the
+                 cached id.
+               - Otherwise generate the texture, add to cache and return id.
+                 Recursion is used to find out the largest found part of the
+                 texture and continue based on it.
+
+               The id 0 points to a NULL texture. It is returned in case of error.
+       */
+       u32 getTextureIdDirect(const std::string &name);
+
+       // Finds out the name of a cached texture.
+       std::string getTextureName(u32 id);
+
+       /*
+               If texture specified by the name pointed by the id doesn't
+               exist, create it, then return the cached texture.
+
+               Can be called from any thread. If called from some other thread
+               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;
+       }
+
+       // Gets a separate texture atlas pointer
+       AtlasPointer getTextureRawAP(const AtlasPointer &ap)
+       {
+               return getTexture(getTextureName(ap.id) + "^[forcesingle");
+       }
+
+       // Returns a pointer to the irrlicht device
+       virtual IrrlichtDevice* getDevice()
+       {
+               return m_device;
+       }
+
+       // Update new texture pointer and texture coordinates to an
+       // AtlasPointer based on it's texture id
+       void updateAP(AtlasPointer &ap);
+
+       // 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);
+       
+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;
+
+       // A texture id is index in this array.
+       // The first position contains a NULL texture.
+       core::array<SourceAtlasPointer> m_atlaspointer_cache;
+       // Maps a texture name to an index in the former.
+       core::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;
+
+       // Queued texture fetches (to be processed by the main thread)
+       RequestQueue<std::string, u32, u8, u8> m_get_texture_queue;
+};
+
+IWritableTextureSource* createTextureSource(IrrlichtDevice *device)
+{
+       return new TextureSource(device);
+}
 
 TextureSource::TextureSource(IrrlichtDevice *device):
                m_device(device),
@@ -34,43 +417,15 @@ TextureSource::TextureSource(IrrlichtDevice *device):
        // Add a NULL AtlasPointer as the first index, named ""
        m_atlaspointer_cache.push_back(SourceAtlasPointer(""));
        m_name_to_id[""] = 0;
-
-       // Build main texture atlas
-       buildMainAtlas();
 }
 
 TextureSource::~TextureSource()
 {
 }
 
-void TextureSource::processQueue()
-{
-       /*
-               Fetch textures
-       */
-       if(m_get_texture_queue.size() > 0)
-       {
-               GetRequest<std::string, u32, u8, u8>
-                               request = m_get_texture_queue.pop();
-
-               dstream<<"INFO: TextureSource::processQueue(): "
-                               <<"got texture request with "
-                               <<"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);
-       }
-}
-
 u32 TextureSource::getTextureId(const std::string &name)
 {
-       //dstream<<"INFO: getTextureId(): name="<<name<<std::endl;
+       //infostream<<"getTextureId(): \""<<name<<"\""<<std::endl;
 
        {
                /*
@@ -94,7 +449,7 @@ u32 TextureSource::getTextureId(const std::string &name)
        }
        else
        {
-               dstream<<"INFO: getTextureId(): Queued: name="<<name<<std::endl;
+               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;
@@ -102,8 +457,8 @@ u32 TextureSource::getTextureId(const std::string &name)
                // Throw a request in
                m_get_texture_queue.add(name, 0, 0, &result_queue);
                
-               dstream<<"INFO: Waiting for texture from main thread, name="
-                               <<name<<std::endl;
+               infostream<<"Waiting for texture from main thread, name=\""
+                               <<name<<"\""<<std::endl;
                
                try
                {
@@ -118,25 +473,28 @@ u32 TextureSource::getTextureId(const std::string &name)
                }
                catch(ItemNotFoundException &e)
                {
-                       dstream<<"WARNING: Waiting for texture timed out."<<std::endl;
+                       infostream<<"Waiting for texture timed out."<<std::endl;
                        return 0;
                }
        }
        
-       dstream<<"WARNING: getTextureId(): Failed"<<std::endl;
+       infostream<<"getTextureId(): Failed"<<std::endl;
 
        return 0;
 }
 
-// Draw a progress bar on the image
-void make_progressbar(float value, video::IImage *image);
+// Overlay image on top of another image (used for cracks)
+void overlay(video::IImage *image, video::IImage *overlay);
+
+// Brighten image
+void brighten(video::IImage *image);
 
 /*
        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,
-               video::IVideoDriver* driver);
+               IrrlichtDevice *device, SourceImageCache *sourcecache);
 
 /*
        Generates an image from a full string like
@@ -145,19 +503,19 @@ bool generate_image(std::string part_of_name, video::IImage *& baseimg,
        This is used by buildMainAtlas().
 */
 video::IImage* generate_image_from_scratch(std::string name,
-               video::IVideoDriver* driver);
+               IrrlichtDevice *device, SourceImageCache *sourcecache);
 
 /*
        This method generates all the textures
 */
 u32 TextureSource::getTextureIdDirect(const std::string &name)
 {
-       dstream<<"INFO: getTextureIdDirect(): name="<<name<<std::endl;
+       //infostream<<"getTextureIdDirect(): name=\""<<name<<"\""<<std::endl;
 
        // Empty name means texture 0
        if(name == "")
        {
-               dstream<<"INFO: getTextureIdDirect(): name is empty"<<std::endl;
+               infostream<<"getTextureIdDirect(): name is empty"<<std::endl;
                return 0;
        }
        
@@ -166,7 +524,7 @@ u32 TextureSource::getTextureIdDirect(const std::string &name)
        */
        if(get_current_thread_id() != m_main_thread)
        {
-               dstream<<"ERROR: TextureSource::getTextureIdDirect() "
+               errorstream<<"TextureSource::getTextureIdDirect() "
                                "called not from main thread"<<std::endl;
                return 0;
        }
@@ -181,14 +539,14 @@ u32 TextureSource::getTextureIdDirect(const std::string &name)
                n = m_name_to_id.find(name);
                if(n != NULL)
                {
-                       dstream<<"INFO: getTextureIdDirect(): name="<<name
-                                       <<" found in cache"<<std::endl;
+                       /*infostream<<"getTextureIdDirect(): \""<<name
+                                       <<"\" found in cache"<<std::endl;*/
                        return n->getValue();
                }
        }
 
-       dstream<<"INFO: getTextureIdDirect(): name="<<name
-                       <<" NOT found in cache. Creating it."<<std::endl;
+       /*infostream<<"getTextureIdDirect(): \""<<name
+                       <<"\" NOT found in cache. Creating it."<<std::endl;*/
        
        /*
                Get the base image
@@ -222,12 +580,13 @@ u32 TextureSource::getTextureIdDirect(const std::string &name)
        {
                // Construct base name
                base_image_name = name.substr(0, last_separator_position);
-               dstream<<"INFO: getTextureIdDirect(): Calling itself recursively"
-                               " to get base image, name="<<base_image_name<<std::endl;
+               /*infostream<<"getTextureIdDirect(): Calling itself recursively"
+                               " to get base image of \""<<name<<"\" = \""
+                <<base_image_name<<"\""<<std::endl;*/
                base_image_id = getTextureIdDirect(base_image_name);
        }
        
-       dstream<<"base_image_id="<<base_image_id<<std::endl;
+       //infostream<<"base_image_id="<<base_image_id<<std::endl;
        
        video::IVideoDriver* driver = m_device->getVideoDriver();
        assert(driver);
@@ -247,23 +606,32 @@ u32 TextureSource::getTextureIdDirect(const std::string &name)
                SourceAtlasPointer ap = m_atlaspointer_cache[base_image_id];
 
                video::IImage *image = ap.atlas_img;
+               
+               if(image == NULL)
+               {
+                       infostream<<"getTextureIdDirect(): WARNING: NULL image in "
+                                       <<"cache: \""<<base_image_name<<"\""
+                                       <<std::endl;
+               }
+               else
+               {
+                       core::dimension2d<u32> dim = ap.intsize;
 
-               core::dimension2d<u32> dim = ap.intsize;
-
-               baseimg = driver->createImage(video::ECF_A8R8G8B8, dim);
+                       baseimg = driver->createImage(video::ECF_A8R8G8B8, dim);
 
-               core::position2d<s32> pos_to(0,0);
-               core::position2d<s32> pos_from = ap.intpos;
-               
-               image->copyTo(
-                               baseimg, // target
-                               v2s32(0,0), // position in target
-                               core::rect<s32>(pos_from, dim) // from
-               );
-
-               dstream<<"INFO: getTextureIdDirect(): Loaded \""
-                               <<base_image_name<<"\" from image cache"
-                               <<std::endl;
+                       core::position2d<s32> pos_to(0,0);
+                       core::position2d<s32> pos_from = ap.intpos;
+                       
+                       image->copyTo(
+                                       baseimg, // target
+                                       v2s32(0,0), // position in target
+                                       core::rect<s32>(pos_from, dim) // from
+                       );
+
+                       /*infostream<<"getTextureIdDirect(): Loaded \""
+                                       <<base_image_name<<"\" from image cache"
+                                       <<std::endl;*/
+               }
        }
        
        /*
@@ -272,34 +640,31 @@ u32 TextureSource::getTextureIdDirect(const std::string &name)
        */
 
        std::string last_part_of_name = name.substr(last_separator_position+1);
-       dstream<<"last_part_of_name="<<last_part_of_name<<std::endl;
-       
+       //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, driver) == false)
+       if(!generate_image(last_part_of_name, baseimg, m_device, &m_sourcecache))
        {
-               dstream<<"INFO: getTextureIdDirect(): "
+               errorstream<<"getTextureIdDirect(): "
                                "failed to generate \""<<last_part_of_name<<"\""
                                <<std::endl;
-               return 0;
        }
 
-       // If no resulting image, return NULL
+       // If no resulting image, print a warning
        if(baseimg == NULL)
        {
-               dstream<<"WARNING: getTextureIdDirect(): baseimg is NULL (attempted to"
+               errorstream<<"getTextureIdDirect(): baseimg is NULL (attempted to"
                                " create texture \""<<name<<"\""<<std::endl;
-               return 0;
        }
-
-       // Create texture from resulting image
-       t = driver->addTexture(name.c_str(), baseimg);
        
-       // If no texture
-       if(t == NULL)
-               return 0;
-
+       if(baseimg != NULL)
+       {
+               // Create texture from resulting image
+               t = driver->addTexture(name.c_str(), baseimg);
+       }
+       
        /*
-               Add texture to caches
+               Add texture to caches (add NULL textures too)
        */
 
        JMutexAutoLock lock(m_atlaspointer_cache_mutex);
@@ -310,12 +675,15 @@ u32 TextureSource::getTextureIdDirect(const std::string &name)
        ap.pos = v2f(0,0);
        ap.size = v2f(1,1);
        ap.tiled = 0;
-       SourceAtlasPointer nap(name, ap, baseimg, v2s32(0,0), baseimg->getDimension());
+       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);
 
-       dstream<<"INFO: getTextureIdDirect(): name="<<name
-                       <<": succesfully returning id="<<id<<std::endl;
+       /*infostream<<"getTextureIdDirect(): "
+                       <<"Returning id="<<id<<" for name \""<<name<<"\""<<std::endl;*/
        
        return id;
 }
@@ -326,7 +694,7 @@ std::string TextureSource::getTextureName(u32 id)
 
        if(id >= m_atlaspointer_cache.size())
        {
-               dstream<<"WARNING: TextureSource::getTextureName(): id="<<id
+               errorstream<<"TextureSource::getTextureName(): id="<<id
                                <<" >= m_atlaspointer_cache.size()="
                                <<m_atlaspointer_cache.size()<<std::endl;
                return "";
@@ -346,9 +714,91 @@ AtlasPointer TextureSource::getTexture(u32 id)
        return m_atlaspointer_cache[id].a;
 }
 
-void TextureSource::buildMainAtlas() 
+void TextureSource::updateAP(AtlasPointer &ap)
+{
+       AtlasPointer ap2 = getTexture(ap.id);
+       ap = ap2;
+}
+
+void TextureSource::processQueue()
 {
-       dstream<<"TextureSource::buildMainAtlas()"<<std::endl;
+       /*
+               Fetch textures
+       */
+       if(m_get_texture_queue.size() > 0)
+       {
+               GetRequest<std::string, u32, u8, u8>
+                               request = m_get_texture_queue.pop();
+
+               /*infostream<<"TextureSource::processQueue(): "
+                               <<"got texture request with "
+                               <<"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);
+       }
+}
+
+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());
+}
+       
+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();*/
+
+       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);
+               // Create texture from resulting image
+               video::ITexture *t = NULL;
+               if(img)
+                       t = driver->addTexture(sap->name.c_str(), img);
+               
+               // 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();
+       }
+}
+
+void TextureSource::buildMainAtlas(class IGameDef *gamedef) 
+{
+       assert(gamedef->tsrc() == this);
+       INodeDefManager *ndef = gamedef->ndef();
+
+       infostream<<"TextureSource::buildMainAtlas()"<<std::endl;
 
        //return; // Disable (for testing)
        
@@ -361,76 +811,158 @@ void TextureSource::buildMainAtlas()
        core::dimension2d<u32> atlas_dim(1024,1024);
        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;
+       }
 
        /*
-               A list of stuff to add. This should contain as much of the
-               stuff shown in game as possible, to minimize texture changes.
+               Grab list of stuff to include in the texture atlas from the
+               main content features
        */
 
-       core::array<std::string> sourcelist;
-
-       sourcelist.push_back("stone.png");
-       sourcelist.push_back("mud.png");
-       sourcelist.push_back("sand.png");
-       sourcelist.push_back("grass.png");
-       sourcelist.push_back("grass_footsteps.png");
-       sourcelist.push_back("tree.png");
-       sourcelist.push_back("tree_top.png");
-       sourcelist.push_back("water.png");
-       sourcelist.push_back("leaves.png");
-       sourcelist.push_back("mud.png^grass_side.png");
-       
-       sourcelist.push_back("stone.png^mineral_coal.png");
-       sourcelist.push_back("stone.png^mineral_iron.png");
-       sourcelist.push_back("mud.png^mineral_coal.png");
-       sourcelist.push_back("mud.png^mineral_iron.png");
-       sourcelist.push_back("sand.png^mineral_coal.png");
-       sourcelist.push_back("sand.png^mineral_iron.png");
+       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.tname_tiles[i];
+                       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
+       s32 padding = 16;
+
+       s32 column_width = 256;
+       s32 column_padding = 16;
+
        /*
                First pass: generate almost everything
        */
        core::position2d<s32> pos_in_atlas(0,0);
-       for(u32 i=0; i<sourcelist.size(); i++)
+       
+       pos_in_atlas.Y = padding;
+
+       for(core::map<std::string, bool>::Iterator
+                       i = sourcelist.getIterator();
+                       i.atEnd() == false; i++)
        {
-               std::string name = sourcelist[i];
+               std::string name = i.getNode()->getKey();
 
-               /*video::IImage *img = driver->createImageFromFile(
-                               porting::getDataPath(name.c_str()).c_str());
-               if(img == NULL)
-                       continue;
-               
-               core::dimension2d<u32> dim = img->getDimension();
-               // Make a copy with the right color format
-               video::IImage *img2 =
-                               driver->createImage(video::ECF_A8R8G8B8, dim);
-               img->copyTo(img2);
-               img->drop();*/
-               
                // Generate image by name
-               video::IImage *img2 = generate_image_from_scratch(name, driver);
+               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 large
+               core::dimension2d<u32> max_size_in_atlas(32,32);
+               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 - 256 - 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;
+               }
                
+               /*infostream<<"TextureSource::buildMainAtlas(): Adding \""<<name
+                               <<"\" to texture atlas"<<std::endl;*/
+
                // Tile it a few times in the X direction
-               u16 xwise_tiling = 16;
+               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++)
                {
                        // Copy the copy to the atlas
-                       img2->copyToWithAlpha(atlas_img,
+                       /*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);
                }
 
+               // 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);
+               }
+
                img2->drop();
 
                /*
                        Add texture to caches
                */
                
-               // Get next id
+               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);
@@ -443,11 +975,14 @@ void TextureSource::buildMainAtlas()
 
                // Create SourceAtlasPointer and add to containers
                SourceAtlasPointer nap(name, ap, atlas_img, pos_in_atlas, dim);
-               m_atlaspointer_cache.push_back(nap);
-               m_name_to_id.insert(name, id);
+               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;
+               pos_in_atlas.Y += dim.Height + padding * 2;
        }
 
        /*
@@ -459,26 +994,38 @@ void TextureSource::buildMainAtlas()
        /*
                Second pass: set texture pointer in generated AtlasPointers
        */
-       for(u32 i=0; i<sourcelist.size(); i++)
+       for(core::map<std::string, bool>::Iterator
+                       i = sourcelist.getIterator();
+                       i.atEnd() == false; i++)
        {
-               std::string name = sourcelist[i];
+               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;
        }
 
        /*
                Write image to file so that it can be inspected
        */
-       driver->writeImageToFile(atlas_img, 
-                       porting::getDataPath("main_atlas.png").c_str());
+       /*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());*/
 }
 
 video::IImage* generate_image_from_scratch(std::string name,
-               video::IVideoDriver* driver)
+               IrrlichtDevice *device, SourceImageCache *sourcecache)
 {
-       dstream<<"INFO: generate_image_from_scratch(): "
-                       "name="<<name<<std::endl;
+       /*infostream<<"generate_image_from_scratch(): "
+                       "\""<<name<<"\""<<std::endl;*/
        
+       video::IVideoDriver* driver = device->getVideoDriver();
+       assert(driver);
+
        /*
                Get the base image
        */
@@ -488,17 +1035,11 @@ video::IImage* generate_image_from_scratch(std::string name,
        char separator = '^';
 
        // Find last meta separator in name
-       s32 last_separator_position = -1;
-       for(s32 i=name.size()-1; i>=0; i--)
-       {
-               if(name[i] == separator)
-               {
-                       last_separator_position = i;
-                       break;
-               }
-       }
+       s32 last_separator_position = name.find_last_of(separator);
+       //if(last_separator_position == std::npos)
+       //      last_separator_position = -1;
 
-       /*dstream<<"INFO: generate_image_from_scratch(): "
+       /*infostream<<"generate_image_from_scratch(): "
                        <<"last_separator_position="<<last_separator_position
                        <<std::endl;*/
 
@@ -511,9 +1052,11 @@ video::IImage* generate_image_from_scratch(std::string name,
        {
                // Construct base name
                base_image_name = name.substr(0, last_separator_position);
-               dstream<<"INFO: generate_image_from_scratch(): Calling itself recursively"
-                               " to get base image, name="<<base_image_name<<std::endl;
-               baseimg = generate_image_from_scratch(base_image_name, driver);
+               /*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);
        }
        
        /*
@@ -522,12 +1065,12 @@ video::IImage* generate_image_from_scratch(std::string name,
        */
 
        std::string last_part_of_name = name.substr(last_separator_position+1);
-       dstream<<"last_part_of_name="<<last_part_of_name<<std::endl;
+       //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, driver) == false)
+       if(!generate_image(last_part_of_name, baseimg, device, sourcecache))
        {
-               dstream<<"INFO: generate_image_from_scratch(): "
+               errorstream<<"generate_image_from_scratch(): "
                                "failed to generate \""<<last_part_of_name<<"\""
                                <<std::endl;
                return NULL;
@@ -537,30 +1080,48 @@ video::IImage* generate_image_from_scratch(std::string name,
 }
 
 bool generate_image(std::string part_of_name, video::IImage *& baseimg,
-               video::IVideoDriver* driver)
+               IrrlichtDevice *device, SourceImageCache *sourcecache)
 {
+       video::IVideoDriver* driver = device->getVideoDriver();
+       assert(driver);
+
        // Stuff starting with [ are special commands
-       if(part_of_name[0] != '[')
+       if(part_of_name.size() == 0 || part_of_name[0] != '[')
        {
-               // A normal texture; load it from a file
-               std::string path = porting::getDataPath(part_of_name.c_str());
-               dstream<<"INFO: getTextureIdDirect(): Loading path \""<<path
-                               <<"\""<<std::endl;
-               
-               video::IImage *image = driver->createImageFromFile(path.c_str());
+               video::IImage *image = sourcecache->getOrLoad(part_of_name, device);
 
                if(image == NULL)
                {
-                       dstream<<"WARNING: Could not load image \""<<part_of_name
-                                       <<"\" from path \""<<path<<"\""
-                                       <<" while building texture"<<std::endl;
-                       return false;
+                       if(part_of_name != ""){
+                               errorstream<<"generate_image(): Could not load image \""
+                                               <<part_of_name<<"\""<<" while building texture"<<std::endl;
+                               errorstream<<"generate_image(): Creating a dummy"
+                                               <<" image for \""<<part_of_name<<"\""<<std::endl;
+                       }
+
+                       // Just create a dummy image
+                       //core::dimension2d<u32> dim(2,2);
+                       core::dimension2d<u32> dim(1,1);
+                       image = driver->createImage(video::ECF_A8R8G8B8, dim);
+                       assert(image);
+                       /*image->setPixel(0,0, video::SColor(255,255,0,0));
+                       image->setPixel(1,0, video::SColor(255,0,255,0));
+                       image->setPixel(0,1, video::SColor(255,0,0,255));
+                       image->setPixel(1,1, video::SColor(255,255,0,255));*/
+                       image->setPixel(0,0, video::SColor(255,myrand()%256,
+                                       myrand()%256,myrand()%256));
+                       /*image->setPixel(1,0, video::SColor(255,myrand()%256,
+                                       myrand()%256,myrand()%256));
+                       image->setPixel(0,1, video::SColor(255,myrand()%256,
+                                       myrand()%256,myrand()%256));
+                       image->setPixel(1,1, video::SColor(255,myrand()%256,
+                                       myrand()%256,myrand()%256));*/
                }
 
                // If base image is NULL, load as base.
                if(baseimg == NULL)
                {
-                       dstream<<"INFO: Setting "<<part_of_name<<" as base"<<std::endl;
+                       //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 
@@ -574,7 +1135,7 @@ bool generate_image(std::string part_of_name, video::IImage *& baseimg,
                // Else blit on base.
                else
                {
-                       dstream<<"INFO: Blitting "<<part_of_name<<" on base"<<std::endl;
+                       //infostream<<"Blitting "<<part_of_name<<" on base"<<std::endl;
                        // Size of the copied area
                        core::dimension2d<u32> dim = image->getDimension();
                        //core::dimension2d<u32> dim(16,16);
@@ -595,62 +1156,134 @@ bool generate_image(std::string part_of_name, video::IImage *& baseimg,
        {
                // A special texture modification
 
-               dstream<<"INFO: getTextureIdDirect(): generating special "
+               /*infostream<<"generate_image(): generating special "
                                <<"modification \""<<part_of_name<<"\""
-                               <<std::endl;
+                               <<std::endl;*/
+               
+               /*
+                       This is the simplest of all; it just adds stuff to the
+                       name so that a separate texture is created.
 
-               if(part_of_name.substr(0,6) == "[crack")
+                       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)
                        {
-                               dstream<<"WARNING: getTextureIdDirect(): baseimg==NULL "
-                                               <<"for part_of_name="<<part_of_name
-                                               <<", cancelling."<<std::endl;
+                               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
+                       Adds a cracking texture
+               */
+               else if(part_of_name.substr(0,6) == "[crack")
+               {
+                       if(baseimg == NULL)
+                       {
+                               errorstream<<"generate_image(): 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;
+                       }
 
-                       u16 progression = stoi(part_of_name.substr(6));
                        // Size of the base image
                        core::dimension2d<u32> dim_base = baseimg->getDimension();
-                       // Crack will be drawn at this size
-                       u32 cracksize = 16;
-                       // Size of the crack image
-                       core::dimension2d<u32> dim_crack(cracksize,cracksize);
-                       // Position to copy the crack from in the crack image
-                       core::position2d<s32> pos_other(0, 16 * progression);
-
-                       video::IImage *crackimage = driver->createImageFromFile(
-                                       porting::getDataPath("crack.png").c_str());
+                       
+                       /*
+                               Load crack image.
+
+                               It is an image with a number of cracking stages
+                               horizontally tiled.
+                       */
+                       video::IImage *img_crack = sourcecache->getOrLoad("crack.png", device);
                
-                       if(crackimage)
+                       if(img_crack && progression >= 0)
                        {
-                               /*crackimage->copyToWithAlpha(baseimg, v2s32(0,0),
-                                               core::rect<s32>(pos_other, dim_base),
-                                               video::SColor(255,255,255,255),
-                                               NULL);*/
-
-                               for(u32 y0=0; y0<dim_base.Height/dim_crack.Height; y0++)
-                               for(u32 x0=0; x0<dim_base.Width/dim_crack.Width; x0++)
+                               // 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)
                                {
-                                       // Position to copy the crack to in the base image
-                                       core::position2d<s32> pos_base(x0*cracksize, y0*cracksize);
-                                       crackimage->copyToWithAlpha(baseimg, pos_base,
-                                                       core::rect<s32>(pos_other, dim_crack),
-                                                       video::SColor(255,255,255,255),
-                                                       NULL);
+                                       // 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));
+                                       }
                                }
 
-                               crackimage->drop();
+                               if(img_crack_scaled)
+                                       img_crack_scaled->drop();
+
+                               if(img_crack_cropped)
+                                       img_crack_cropped->drop();
+                               
+                               img_crack->drop();
                        }
                }
+               /*
+                       [combine:WxH:X,Y=filename:X,Y=filename2
+                       Creates a bigger texture from an amount of smaller ones
+               */
                else if(part_of_name.substr(0,8) == "[combine")
                {
-                       // "[combine:16x128:0,0=stone.png:0,16=grass.png"
                        Strfnd sf(part_of_name);
                        sf.next(":");
                        u32 w0 = stoi(sf.next("x"));
                        u32 h0 = stoi(sf.next(":"));
-                       dstream<<"INFO: combined w="<<w0<<" h="<<h0<<std::endl;
+                       infostream<<"combined w="<<w0<<" h="<<h0<<std::endl;
                        core::dimension2d<u32> dim(w0,h0);
                        baseimg = driver->createImage(video::ECF_A8R8G8B8, dim);
                        while(sf.atend() == false)
@@ -658,15 +1291,14 @@ bool generate_image(std::string part_of_name, video::IImage *& baseimg,
                                u32 x = stoi(sf.next(","));
                                u32 y = stoi(sf.next("="));
                                std::string filename = sf.next(":");
-                               dstream<<"INFO: Adding \""<<filename
+                               infostream<<"Adding \""<<filename
                                                <<"\" to combined ("<<x<<","<<y<<")"
                                                <<std::endl;
-                               video::IImage *img = driver->createImageFromFile(
-                                               porting::getDataPath(filename.c_str()).c_str());
+                               video::IImage *img = sourcecache->getOrLoad(filename, device);
                                if(img)
                                {
                                        core::dimension2d<u32> dim = img->getDimension();
-                                       dstream<<"INFO: Size "<<dim.Width
+                                       infostream<<"Size "<<dim.Width
                                                        <<"x"<<dim.Height<<std::endl;
                                        core::position2d<s32> pos_base(x, y);
                                        video::IImage *img2 =
@@ -681,71 +1313,210 @@ bool generate_image(std::string part_of_name, video::IImage *& baseimg,
                                }
                                else
                                {
-                                       dstream<<"WARNING: img==NULL"<<std::endl;
+                                       infostream<<"img==NULL"<<std::endl;
                                }
                        }
                }
-               else if(part_of_name.substr(0,12) == "[progressbar")
+               /*
+                       "[brighten"
+               */
+               else if(part_of_name.substr(0,9) == "[brighten")
                {
                        if(baseimg == NULL)
                        {
-                               dstream<<"WARNING: getTextureIdDirect(): baseimg==NULL "
-                                               <<"for part_of_name="<<part_of_name
-                                               <<", cancelling."<<std::endl;
+                               errorstream<<"generate_image(): baseimg==NULL "
+                                               <<"for part_of_name=\""<<part_of_name
+                                               <<"\", cancelling."<<std::endl;
                                return false;
                        }
 
-                       float value = stof(part_of_name.substr(12));
-                       make_progressbar(value, baseimg);
+                       brighten(baseimg);
                }
-               // "[noalpha:filename.png"
-               // Use an image without it's alpha channel
+               /*
+                       "[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 
+                       when simple alpha channel is used for rendering.
+               */
                else if(part_of_name.substr(0,8) == "[noalpha")
                {
-                       if(baseimg != NULL)
+                       if(baseimg == NULL)
                        {
-                               dstream<<"WARNING: getTextureIdDirect(): baseimg!=NULL "
-                                               <<"for part_of_name="<<part_of_name
-                                               <<", cancelling."<<std::endl;
+                               errorstream<<"generate_image(): baseimg==NULL "
+                                               <<"for part_of_name=\""<<part_of_name
+                                               <<"\", cancelling."<<std::endl;
                                return false;
                        }
 
-                       std::string filename = part_of_name.substr(9);
+                       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++)
+                       {
+                               video::SColor c = baseimg->getPixel(x,y);
+                               c.setAlpha(255);
+                               baseimg->setPixel(x,y,c);
+                       }
+               }
+               /*
+                       "[makealpha:R,G,B"
+                       Convert one color to transparent.
+               */
+               else if(part_of_name.substr(0,11) == "[makealpha:")
+               {
+                       if(baseimg == NULL)
+                       {
+                               errorstream<<"generate_image(): baseimg==NULL "
+                                               <<"for part_of_name=\""<<part_of_name
+                                               <<"\", cancelling."<<std::endl;
+                               return false;
+                       }
 
-                       std::string path = porting::getDataPath(filename.c_str());
+                       Strfnd sf(part_of_name.substr(11));
+                       u32 r1 = stoi(sf.next(","));
+                       u32 g1 = stoi(sf.next(","));
+                       u32 b1 = stoi(sf.next(""));
+                       std::string filename = sf.next("");
 
-                       dstream<<"INFO: getTextureIdDirect(): Loading path \""<<path
-                                       <<"\""<<std::endl;
+                       core::dimension2d<u32> dim = baseimg->getDimension();
                        
-                       video::IImage *image = driver->createImageFromFile(path.c_str());
+                       /*video::IImage *oldbaseimg = baseimg;
+                       baseimg = driver->createImage(video::ECF_A8R8G8B8, dim);
+                       oldbaseimg->copyTo(baseimg);
+                       oldbaseimg->drop();*/
+
+                       // Set alpha to full
+                       for(u32 y=0; y<dim.Height; y++)
+                       for(u32 x=0; x<dim.Width; x++)
+                       {
+                               video::SColor c = baseimg->getPixel(x,y);
+                               u32 r = c.getRed();
+                               u32 g = c.getGreen();
+                               u32 b = c.getBlue();
+                               if(!(r == r1 && g == g1 && b == b1))
+                                       continue;
+                               c.setAlpha(0);
+                               baseimg->setPixel(x,y,c);
+                       }
+               }
+               /*
+                       [inventorycube{topimage{leftimage{rightimage
+                       In every subimage, replace ^ with &.
+                       Create an "inventory cube".
+                       NOTE: This should be used only on its own.
+                       Example (a grass block (not actually used in game):
+                       "[inventorycube{grass.png{mud.png&grass_side.png{mud.png&grass_side.png"
+               */
+               else if(part_of_name.substr(0,14) == "[inventorycube")
+               {
+                       if(baseimg != NULL)
+                       {
+                               errorstream<<"generate_image(): baseimg!=NULL "
+                                               <<"for part_of_name=\""<<part_of_name
+                                               <<"\", cancelling."<<std::endl;
+                               return false;
+                       }
+
+                       str_replace_char(part_of_name, '&', '^');
+                       Strfnd sf(part_of_name);
+                       sf.next("{");
+                       std::string imagename_top = sf.next("{");
+                       std::string imagename_left = sf.next("{");
+                       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);
+                       assert(img_top && img_left && img_right);
+
+                       // Create textures from images
+                       video::ITexture *texture_top = driver->addTexture(
+                                       (imagename_top + "__temp__").c_str(), img_top);
+                       video::ITexture *texture_left = driver->addTexture(
+                                       (imagename_left + "__temp__").c_str(), img_left);
+                       video::ITexture *texture_right = driver->addTexture(
+                                       (imagename_right + "__temp__").c_str(), img_right);
+                       assert(texture_top && texture_left && texture_right);
+
+                       // Drop images
+                       img_top->drop();
+                       img_left->drop();
+                       img_right->drop();
+                       
+                       /*
+                               Draw a cube mesh into a render target texture
+                       */
+                       scene::IMesh* cube = createCubeMesh(v3f(1, 1, 1));
+                       setMeshColor(cube, video::SColor(255, 255, 255, 255));
+                       cube->getMeshBuffer(0)->getMaterial().setTexture(0, texture_top);
+                       cube->getMeshBuffer(1)->getMaterial().setTexture(0, texture_top);
+                       cube->getMeshBuffer(2)->getMaterial().setTexture(0, texture_right);
+                       cube->getMeshBuffer(3)->getMaterial().setTexture(0, texture_right);
+                       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;
+                       // Set orthogonal projection
+                       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);
                        
-                       if(image == NULL)
+                       // Drop mesh
+                       cube->drop();
+
+                       // Free textures of images
+                       driver->removeTexture(texture_top);
+                       driver->removeTexture(texture_left);
+                       driver->removeTexture(texture_right);
+                       
+                       if(rtt == NULL)
                        {
-                               dstream<<"WARNING: getTextureIdDirect(): Loading path \""
-                                               <<path<<"\" failed"<<std::endl;
+                               baseimg = generate_image_from_scratch(
+                                               imagename_top, device, sourcecache);
+                               return true;
                        }
-                       else
+
+                       // Create image of render target
+                       video::IImage *image = driver->createImage(rtt, v2s32(0,0), dim);
+                       assert(image);
+
+                       baseimg = driver->createImage(video::ECF_A8R8G8B8, dim);
+
+                       if(image)
                        {
-                               core::dimension2d<u32> dim = image->getDimension();
-                               baseimg = driver->createImage(video::ECF_A8R8G8B8, dim);
-                               
-                               // Set alpha to full
-                               for(u32 y=0; y<dim.Height; y++)
-                               for(u32 x=0; x<dim.Width; x++)
-                               {
-                                       video::SColor c = image->getPixel(x,y);
-                                       c.setAlpha(255);
-                                       image->setPixel(x,y,c);
-                               }
-                               // Blit
                                image->copyTo(baseimg);
-
                                image->drop();
                        }
                }
                else
                {
-                       dstream<<"WARNING: getTextureIdDirect(): Invalid "
+                       errorstream<<"generate_image(): Invalid "
                                        " modification: \""<<part_of_name<<"\""<<std::endl;
                }
        }
@@ -753,35 +1524,52 @@ bool generate_image(std::string part_of_name, video::IImage *& baseimg,
        return true;
 }
 
-void make_progressbar(float value, video::IImage *image)
+void overlay(video::IImage *image, video::IImage *overlay)
 {
-       if(image == NULL)
+       /*
+               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> size = image->getDimension();
-
-       u32 barheight = 1;
-       u32 barpad_x = 1;
-       u32 barpad_y = 1;
-       u32 barwidth = size.Width - barpad_x*2;
-       v2u32 barpos(barpad_x, size.Height - barheight - barpad_y);
+       core::dimension2d<u32> dim = image->getDimension();
+       core::dimension2d<u32> dim_overlay = overlay->getDimension();
+       assert(dim == dim_overlay);
 
-       u32 barvalue_i = (u32)(((float)barwidth * value) + 0.5);
-
-       video::SColor active(255,255,0,0);
-       video::SColor inactive(255,0,0,0);
-       for(u32 x0=0; x0<barwidth; x0++)
+       for(u32 y=0; y<dim.Height; y++)
+       for(u32 x=0; x<dim.Width; x++)
        {
-               video::SColor *c;
-               if(x0 < barvalue_i)
-                       c = &active;
-               else
-                       c = &inactive;
-               u32 x = x0 + barpos.X;
-               for(u32 y=barpos.Y; y<barpos.Y+barheight; y++)
+               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)
                {
-                       image->setPixel(x,y, *c);
+                       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);
+       }
+}
+
+void brighten(video::IImage *image)
+{
+       if(image == NULL)
+               return;
+       
+       core::dimension2d<u32> dim = image->getDimension();
+
+       for(u32 y=0; y<dim.Height; y++)
+       for(u32 x=0; x<dim.Width; x++)
+       {
+               video::SColor c = image->getPixel(x,y);
+               c.setRed(0.5 * 255 + 0.5 * (float)c.getRed());
+               c.setGreen(0.5 * 255 + 0.5 * (float)c.getGreen());
+               c.setBlue(0.5 * 255 + 0.5 * (float)c.getBlue());
+               image->setPixel(x,y,c);
        }
 }