Update inventory texture too
[oweals/minetest.git] / src / mapnode.cpp
index 956abe5c714b86d36f828f31beb20ae030f42c7e..9aceab17ea058cef6966316c1eb3374cf07e856c 100644 (file)
@@ -19,146 +19,67 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 
 #include "common_irrlicht.h"
 #include "mapnode.h"
-#include "tile.h"
 #include "porting.h"
 #include <string>
 #include "mineral.h"
-// For g_settings
-#include "main.h"
-#include "content_mapnode.h"
-#include "nodemetadata.h"
+#include "main.h" // For g_settings
+#include "nodedef.h"
+#include "content_mapnode.h" // For mapnode_translate_*_internal
 
-ContentFeatures::~ContentFeatures()
+/*
+       Nodes make a face if contents differ and solidness differs.
+       Return value:
+               0: No face
+               1: Face uses m1's content
+               2: Face uses m2's content
+       equivalent: Whether the blocks share the same face (eg. water and glass)
+
+       TODO: Add 3: Both faces drawn with backface culling, remove equivalent
+*/
+u8 face_contents(content_t m1, content_t m2, bool *equivalent,
+               INodeDefManager *nodemgr)
 {
-       delete initial_metadata;
-       delete special_material;
-       delete special_atlas;
-}
+       *equivalent = false;
 
-void ContentFeatures::setTexture(u16 i, std::string name, u8 alpha)
-{
-       if(g_texturesource)
-       {
-               tiles[i].texture = g_texturesource->getTexture(name);
-       }
-       
-       if(alpha != 255)
-       {
-               tiles[i].alpha = alpha;
-               tiles[i].material_type = MATERIAL_ALPHA_VERTEX;
-       }
-
-       if(inventory_texture == NULL)
-               setInventoryTexture(name);
-}
-
-void ContentFeatures::setInventoryTexture(std::string imgname)
-{
-       if(g_texturesource == NULL)
-               return;
+       if(m1 == CONTENT_IGNORE || m2 == CONTENT_IGNORE)
+               return 0;
        
-       imgname += "^[forcesingle";
+       bool contents_differ = (m1 != m2);
        
-       inventory_texture = g_texturesource->getTextureRaw(imgname);
-}
+       const ContentFeatures &f1 = nodemgr->get(m1);
+       const ContentFeatures &f2 = nodemgr->get(m2);
 
-void ContentFeatures::setInventoryTextureCube(std::string top,
-               std::string left, std::string right)
-{
-       if(g_texturesource == NULL)
-               return;
+       // Contents don't differ for different forms of same liquid
+       if(f1.sameLiquid(f2))
+               contents_differ = false;
        
-       str_replace_char(top, '^', '&');
-       str_replace_char(left, '^', '&');
-       str_replace_char(right, '^', '&');
-
-       std::string imgname_full;
-       imgname_full += "[inventorycube{";
-       imgname_full += top;
-       imgname_full += "{";
-       imgname_full += left;
-       imgname_full += "{";
-       imgname_full += right;
-       inventory_texture = g_texturesource->getTextureRaw(imgname_full);
-}
-
-struct ContentFeatures g_content_features[MAX_CONTENT+1];
-
-ContentFeatures & content_features(content_t i)
-{
-       return g_content_features[i];
-}
-ContentFeatures & content_features(MapNode &n)
-{
-       return content_features(n.getContent());
-}
+       u8 c1 = f1.solidness;
+       u8 c2 = f2.solidness;
 
-/*
-       See mapnode.h for description.
-*/
-void init_mapnode()
-{
-       if(g_texturesource == NULL)
-       {
-               dstream<<"INFO: Initial run of init_mapnode with "
-                               "g_texturesource=NULL. If this segfaults, "
-                               "there is a bug with something not checking for "
-                               "the NULL value."<<std::endl;
-       }
-       else
-       {
-               dstream<<"INFO: Full run of init_mapnode with "
-                               "g_texturesource!=NULL"<<std::endl;
-       }
-
-       /*// Read some settings
-       bool new_style_water = g_settings.getBool("new_style_water");
-       bool new_style_leaves = g_settings.getBool("new_style_leaves");*/
+       bool solidness_differs = (c1 != c2);
+       bool makes_face = contents_differ && solidness_differs;
 
-       /*
-               Initialize content feature table
-       */
+       if(makes_face == false)
+               return 0;
        
-       /*
-               Set initial material type to same in all tiles, so that the
-               same material can be used in more stuff.
-               This is set according to the leaves because they are the only
-               differing material to which all materials can be changed to
-               get this optimization.
-       */
-       u8 initial_material_type = MATERIAL_ALPHA_SIMPLE;
-       /*if(new_style_leaves)
-               initial_material_type = MATERIAL_ALPHA_SIMPLE;
-       else
-               initial_material_type = MATERIAL_ALPHA_NONE;*/
-       for(u16 i=0; i<MAX_CONTENT+1; i++)
-       {
-               ContentFeatures *f = &g_content_features[i];
-               // Re-initialize
-               f->reset();
-
-               for(u16 j=0; j<6; j++)
-                       f->tiles[j].material_type = initial_material_type;
-       }
-
-       /*
-               Initially set every block to be shown as an unknown block.
-               Don't touch CONTENT_IGNORE or CONTENT_AIR.
-       */
-       for(u16 i=0; i<MAX_CONTENT+1; i++)
-       {
-               if(i == CONTENT_IGNORE || i == CONTENT_AIR)
-                       continue;
-               ContentFeatures *f = &g_content_features[i];
-               f->setAllTextures("unknown_block.png");
-               f->dug_item = std::string("MaterialItem2 ")+itos(i)+" 1";
+       if(c1 == 0)
+               c1 = f1.visual_solidness;
+       if(c2 == 0)
+               c2 = f2.visual_solidness;
+       
+       if(c1 == c2){
+               *equivalent = true;
+               // If same solidness, liquid takes precense
+               if(f1.isLiquid())
+                       return 1;
+               if(f2.isLiquid())
+                       return 2;
        }
-
-       /*
-               Initialize mapnode content
-       */
-       content_mapnode_init();
        
+       if(c1 > c2)
+               return 1;
+       else
+               return 2;
 }
 
 v3s16 facedir_rotate(u8 facedir, v3s16 dir)
@@ -184,9 +105,112 @@ v3s16 facedir_rotate(u8 facedir, v3s16 dir)
        return newdir;
 }
 
-TileSpec MapNode::getTile(v3s16 dir)
+u8 packDir(v3s16 dir)
+{
+       u8 b = 0;
+
+       if(dir.X > 0)
+               b |= (1<<0);
+       else if(dir.X < 0)
+               b |= (1<<1);
+
+       if(dir.Y > 0)
+               b |= (1<<2);
+       else if(dir.Y < 0)
+               b |= (1<<3);
+
+       if(dir.Z > 0)
+               b |= (1<<4);
+       else if(dir.Z < 0)
+               b |= (1<<5);
+       
+       return b;
+}
+v3s16 unpackDir(u8 b)
+{
+       v3s16 d(0,0,0);
+
+       if(b & (1<<0))
+               d.X = 1;
+       else if(b & (1<<1))
+               d.X = -1;
+
+       if(b & (1<<2))
+               d.Y = 1;
+       else if(b & (1<<3))
+               d.Y = -1;
+
+       if(b & (1<<4))
+               d.Z = 1;
+       else if(b & (1<<5))
+               d.Z = -1;
+       
+       return d;
+}
+
+/*
+       MapNode
+*/
+
+void MapNode::setLight(enum LightBank bank, u8 a_light, INodeDefManager *nodemgr)
+{
+       // If node doesn't contain light data, ignore this
+       if(nodemgr->get(*this).param_type != CPT_LIGHT)
+               return;
+       if(bank == LIGHTBANK_DAY)
+       {
+               param1 &= 0xf0;
+               param1 |= a_light & 0x0f;
+       }
+       else if(bank == LIGHTBANK_NIGHT)
+       {
+               param1 &= 0x0f;
+               param1 |= (a_light & 0x0f)<<4;
+       }
+       else
+               assert(0);
+}
+
+u8 MapNode::getLight(enum LightBank bank, INodeDefManager *nodemgr) const
+{
+       // Select the brightest of [light source, propagated light]
+       u8 light = 0;
+       if(nodemgr->get(*this).param_type == CPT_LIGHT)
+       {
+               if(bank == LIGHTBANK_DAY)
+                       light = param1 & 0x0f;
+               else if(bank == LIGHTBANK_NIGHT)
+                       light = (param1>>4)&0x0f;
+               else
+                       assert(0);
+       }
+       if(nodemgr->get(*this).light_source > light)
+               light = nodemgr->get(*this).light_source;
+       return light;
+}
+
+u8 MapNode::getLightBanksWithSource(INodeDefManager *nodemgr) const
+{
+       // Select the brightest of [light source, propagated light]
+       u8 lightday = 0;
+       u8 lightnight = 0;
+       if(nodemgr->get(*this).param_type == CPT_LIGHT)
+       {
+               lightday = param1 & 0x0f;
+               lightnight = (param1>>4)&0x0f;
+       }
+       if(nodemgr->get(*this).light_source > lightday)
+               lightday = nodemgr->get(*this).light_source;
+       if(nodemgr->get(*this).light_source > lightnight)
+               lightnight = nodemgr->get(*this).light_source;
+       return (lightday&0x0f) | ((lightnight<<4)&0xf0);
+}
+
+#ifndef SERVER
+TileSpec MapNode::getTile(v3s16 dir, ITextureSource *tsrc,
+               INodeDefManager *nodemgr) const
 {
-       if(content_features(*this).param_type == CPT_FACEDIR_SIMPLE)
+       if(nodemgr->get(*this).param_type == CPT_FACEDIR_SIMPLE)
                dir = facedir_rotate(param1, dir);
        
        TileSpec spec;
@@ -210,35 +234,36 @@ TileSpec MapNode::getTile(v3s16 dir)
        
        if(dir_i == -1)
                // Non-directional
-               spec = content_features(*this).tiles[0];
+               spec = nodemgr->get(*this).tiles[0];
        else 
-               spec = content_features(*this).tiles[dir_i];
+               spec = nodemgr->get(*this).tiles[dir_i];
        
        /*
                If it contains some mineral, change texture id
        */
-       if(content_features(*this).param_type == CPT_MINERAL && g_texturesource)
+       if(nodemgr->get(*this).param_type == CPT_MINERAL && tsrc)
        {
-               u8 mineral = getMineral();
+               u8 mineral = getMineral(nodemgr);
                std::string mineral_texture_name = mineral_block_texture(mineral);
                if(mineral_texture_name != "")
                {
                        u32 orig_id = spec.texture.id;
-                       std::string texture_name = g_texturesource->getTextureName(orig_id);
+                       std::string texture_name = tsrc->getTextureName(orig_id);
                        //texture_name += "^blit:";
                        texture_name += "^";
                        texture_name += mineral_texture_name;
-                       u32 new_id = g_texturesource->getTextureId(texture_name);
-                       spec.texture = g_texturesource->getTexture(new_id);
+                       u32 new_id = tsrc->getTextureId(texture_name);
+                       spec.texture = tsrc->getTexture(new_id);
                }
        }
 
        return spec;
 }
+#endif
 
-u8 MapNode::getMineral()
+u8 MapNode::getMineral(INodeDefManager *nodemgr) const
 {
-       if(content_features(*this).param_type == CPT_MINERAL)
+       if(nodemgr->get(*this).param_type == CPT_MINERAL)
        {
                return param1 & 0x0f;
        }
@@ -295,7 +320,7 @@ void MapNode::serialize(u8 *dest, u8 version)
                dest[2] = n_foreign.param2;
        }
 }
-void MapNode::deSerialize(u8 *source, u8 version)
+void MapNode::deSerialize(u8 *source, u8 version, INodeDefManager *nodemgr)
 {
        if(!ser_ver_supported(version))
                throw VersionMismatchException("ERROR: MapNode format not supported");
@@ -308,7 +333,7 @@ void MapNode::deSerialize(u8 *source, u8 version)
        {
                param0 = source[0];
                // This version doesn't support saved lighting
-               if(light_propagates() || light_source() > 0)
+               if(nodemgr->get(*this).light_propagates || nodemgr->get(*this).light_source > 0)
                        param1 = 0;
                else
                        param1 = source[1];
@@ -358,19 +383,19 @@ void MapNode::deSerialize(u8 *source, u8 version)
        
        parameters:
                daynight_ratio: 0...1000
-               n: getNodeParent(p)
-               n2: getNodeParent(p + face_dir)
+               n: getNode(p) (uses only the lighting value)
+               n2: getNode(p + face_dir) (uses only the lighting value)
                face_dir: axis oriented unit vector from p to p2
        
        returns encoded light value.
 */
 u8 getFaceLight(u32 daynight_ratio, MapNode n, MapNode n2,
-               v3s16 face_dir)
+               v3s16 face_dir, INodeDefManager *nodemgr)
 {
        try{
                u8 light;
-               u8 l1 = n.getLightBlend(daynight_ratio);
-               u8 l2 = n2.getLightBlend(daynight_ratio);
+               u8 l1 = n.getLightBlend(daynight_ratio, nodemgr);
+               u8 l2 = n2.getLightBlend(daynight_ratio, nodemgr);
                if(l1 > l2)
                        light = l1;
                else