]> git.lizzy.rs Git - dragonfireclient.git/blobdiff - src/mapnode.cpp
fixed tree placement in farmesh
[dragonfireclient.git] / src / mapnode.cpp
index 06d1be8a3ba0f16d32cdf245e5f48c2987f7c114..dae21e7ccc463f33b0af8d24914d977a684f89a7 100644 (file)
@@ -25,11 +25,15 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "mineral.h"
 // For g_settings
 #include "main.h"
+#include "content_mapnode.h"
+#include "nodemetadata.h"
 
 ContentFeatures::~ContentFeatures()
 {
        if(translate_to)
                delete translate_to;
+       if(initial_metadata)
+               delete initial_metadata;
 }
 
 void ContentFeatures::setTexture(u16 i, std::string name, u8 alpha)
@@ -44,6 +48,39 @@ void ContentFeatures::setTexture(u16 i, std::string name, u8 alpha)
                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;
+       
+       imgname += "^[forcesingle";
+       
+       inventory_texture = g_texturesource->getTextureRaw(imgname);
+}
+
+void ContentFeatures::setInventoryTextureCube(std::string top,
+               std::string left, std::string right)
+{
+       if(g_texturesource == NULL)
+               return;
+       
+       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[256];
@@ -53,11 +90,27 @@ ContentFeatures & content_features(u8 i)
        return g_content_features[i];
 }
 
-void init_mapnode(IIrrlichtWrapper *irrlicht)
+/*
+       See mapnode.h for description.
+*/
+void init_mapnode()
 {
-       // Read some settings
+       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 new_style_leaves = g_settings.getBool("new_style_leaves");*/
 
        /*
                Initialize content feature table
@@ -78,162 +131,48 @@ void init_mapnode(IIrrlichtWrapper *irrlicht)
        for(u16 i=0; i<256; 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;
        }
-       
-       u8 i;
-       ContentFeatures *f = NULL;
 
-       i = CONTENT_STONE;
-       f = &g_content_features[i];
-       f->setAllTextures("stone.png");
-       f->param_type = CPT_MINERAL;
-       f->is_ground_content = true;
-       
-       i = CONTENT_GRASS;
-       f = &g_content_features[i];
-       f->setAllTextures("mud.png^grass_side.png");
-       f->setTexture(0, "grass.png");
-       f->setTexture(1, "mud.png");
-       //f->setInventoryTexture(irrlicht->getTextureId("grass.png"));
-       f->param_type = CPT_MINERAL;
-       f->is_ground_content = true;
-       
-       i = CONTENT_GRASS_FOOTSTEPS;
-       f = &g_content_features[i];
-       //f->setInventoryTexture(irrlicht->getTextureId("grass_footsteps.png"));
-       f->setAllTextures("mud.png^grass_side.png");
-       f->setTexture(0, "grass_footsteps.png");
-       f->setTexture(1, "mud.png");
-       f->param_type = CPT_MINERAL;
-       f->is_ground_content = true;
-       
-       i = CONTENT_MUD;
-       f = &g_content_features[i];
-       f->setAllTextures("mud.png");
-       f->param_type = CPT_MINERAL;
-       f->is_ground_content = true;
-       
-       i = CONTENT_SAND;
-       f = &g_content_features[i];
-       f->setAllTextures("sand.png");
-       f->param_type = CPT_MINERAL;
-       f->is_ground_content = true;
-       
-       i = CONTENT_TREE;
-       f = &g_content_features[i];
-       f->setAllTextures("tree.png");
-       f->setTexture(0, "tree_top.png");
-       f->setTexture(1, "tree_top.png");
-       //f->setInventoryTexture(irrlicht->getTextureId("tree_top.png"));
-       f->param_type = CPT_MINERAL;
-       f->is_ground_content = true;
-       
-       i = CONTENT_LEAVES;
-       f = &g_content_features[i];
-       f->light_propagates = true;
-       //f->param_type = CPT_MINERAL;
-       f->param_type = CPT_LIGHT;
-       f->is_ground_content = true;
-       if(new_style_leaves)
-       {
-               f->solidness = 0; // drawn separately, makes no faces
-       }
-       else
-       {
-               f->setAllTextures("[noalpha:leaves.png");
-       }
-       
-       i = CONTENT_COALSTONE;
-       f = &g_content_features[i];
-       //f->translate_to = new MapNode(CONTENT_STONE, MINERAL_COAL);
-       /*f->setAllTextures(TextureSpec(irrlicht->getTextureId("coal.png"),
-                       irrlicht->getTextureId("mineral_coal.png")));*/
-       f->setAllTextures("stone.png^mineral_coal.png");
-       f->is_ground_content = true;
-       
-       i = CONTENT_WOOD;
-       f = &g_content_features[i];
-       //f->setAllTextures(irrlicht->getTextureId("wood.png"));
-       f->setAllTextures("wood.png");
-       f->is_ground_content = true;
-       
-       i = CONTENT_MESE;
-       f = &g_content_features[i];
-       //f->setAllTextures(irrlicht->getTextureId("mese.png"));
-       f->setAllTextures("mese.png");
-       f->is_ground_content = true;
-       
-       i = CONTENT_CLOUD;
-       f = &g_content_features[i];
-       //f->setAllTextures(irrlicht->getTextureId("cloud.png"));
-       f->setAllTextures("cloud.png");
-       f->is_ground_content = true;
-       
-       i = CONTENT_AIR;
-       f = &g_content_features[i];
-       f->param_type = CPT_LIGHT;
-       f->light_propagates = true;
-       f->sunlight_propagates = true;
-       f->solidness = 0;
-       f->walkable = false;
-       f->pointable = false;
-       f->diggable = false;
-       f->buildable_to = true;
-       
-       i = CONTENT_WATER;
-       f = &g_content_features[i];
-       //f->setInventoryTexture(irrlicht->getTextureId("water.png"));
-       f->param_type = CPT_LIGHT;
-       f->light_propagates = true;
-       f->solidness = 0; // Drawn separately, makes no faces
-       f->walkable = false;
-       f->pointable = false;
-       f->diggable = false;
-       f->buildable_to = true;
-       f->liquid_type = LIQUID_FLOWING;
+       /*
+               Initialize mapnode content
+       */
+       content_mapnode_init();
        
-       i = CONTENT_WATERSOURCE;
-       f = &g_content_features[i];
-       //f->setInventoryTexture(irrlicht->getTextureId("water.png"));
-       if(new_style_water)
-       {
-               f->solidness = 0; // drawn separately, makes no faces
-       }
-       else // old style
-       {
-               f->solidness = 1;
+}
 
-               TileSpec t;
-               if(g_texturesource)
-                       t.texture = g_texturesource->getTexture("water.png");
-               
-               t.alpha = WATER_ALPHA;
-               t.material_type = MATERIAL_ALPHA_VERTEX;
-               t.material_flags &= ~MATERIAL_FLAG_BACKFACE_CULLING;
-               f->setAllTiles(t);
-       }
-       f->param_type = CPT_LIGHT;
-       f->light_propagates = true;
-       f->walkable = false;
-       f->pointable = false;
-       f->diggable = false;
-       f->buildable_to = true;
-       f->liquid_type = LIQUID_SOURCE;
-       
-       i = CONTENT_TORCH;
-       f = &g_content_features[i];
-       f->param_type = CPT_LIGHT;
-       f->light_propagates = true;
-       f->solidness = 0; // drawn separately, makes no faces
-       f->walkable = false;
-       f->wall_mounted = true;
-       
+v3s16 facedir_rotate(u8 facedir, v3s16 dir)
+{
+       /*
+               Face 2 (normally Z-) direction:
+               facedir=0: Z-
+               facedir=1: X-
+               facedir=2: Z+
+               facedir=3: X+
+       */
+       v3s16 newdir;
+       if(facedir==0) // Same
+               newdir = v3s16(dir.X, dir.Y, dir.Z);
+       else if(facedir == 1) // Face is taken from rotXZccv(-90)
+               newdir = v3s16(-dir.Z, dir.Y, dir.X);
+       else if(facedir == 2) // Face is taken from rotXZccv(180)
+               newdir = v3s16(-dir.X, dir.Y, -dir.Z);
+       else if(facedir == 3) // Face is taken from rotXZccv(90)
+               newdir = v3s16(dir.Z, dir.Y, -dir.X);
+       else
+               newdir = dir;
+       return newdir;
 }
 
 TileSpec MapNode::getTile(v3s16 dir)
 {
+       if(content_features(d).param_type == CPT_FACEDIR_SIMPLE)
+               dir = facedir_rotate(param1, dir);
+       
        TileSpec spec;
        
        s32 dir_i = -1;
@@ -291,16 +230,54 @@ u8 MapNode::getMineral()
        return MINERAL_NONE;
 }
 
-// Pointers to c_str()s g_content_features[i].inventory_image_path
-//const char * g_content_inventory_texture_paths[USEFUL_CONTENT_COUNT] = {0};
+/*
+       Gets lighting value at face of node
+       
+       Parameters must consist of air and !air.
+       Order doesn't matter.
 
-void init_content_inventory_texture_paths()
+       If either of the nodes doesn't exist, light is 0.
+       
+       parameters:
+               daynight_ratio: 0...1000
+               n: getNodeParent(p)
+               n2: getNodeParent(p + face_dir)
+               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)
 {
-       dstream<<"DEPRECATED "<<__FUNCTION_NAME<<std::endl;
-       /*for(u16 i=0; i<USEFUL_CONTENT_COUNT; i++)
+       try{
+               u8 light;
+               u8 l1 = n.getLightBlend(daynight_ratio);
+               u8 l2 = n2.getLightBlend(daynight_ratio);
+               if(l1 > l2)
+                       light = l1;
+               else
+                       light = l2;
+
+               // Make some nice difference to different sides
+
+               // This makes light come from a corner
+               /*if(face_dir.X == 1 || face_dir.Z == 1 || face_dir.Y == -1)
+                       light = diminish_light(diminish_light(light));
+               else if(face_dir.X == -1 || face_dir.Z == -1)
+                       light = diminish_light(light);*/
+               
+               // All neighboring faces have different shade (like in minecraft)
+               if(face_dir.X == 1 || face_dir.X == -1 || face_dir.Y == -1)
+                       light = diminish_light(diminish_light(light));
+               else if(face_dir.Z == 1 || face_dir.Z == -1)
+                       light = diminish_light(light);
+
+               return light;
+       }
+       catch(InvalidPositionException &e)
        {
-               g_content_inventory_texture_paths[i] =
-                               g_content_features[i].inventory_image_path.c_str();
-       }*/
+               return 0;
+       }
 }
 
+