mapgen tweaking

[dragonfireclient.git] / src / mapnode.h

diff --git a/src/mapnode.h b/src/mapnode.h
index fcbb80fd123f025011907cfcde6d376277ec4f83..03a294ad27bddc2b4fc6575540ab3c47439031df 100644 (file)
--- a/src/mapnode.h
+++ b/src/mapnode.h
@@ -33,9 +33,15 @@ with this program; if not, write to the Free Software Foundation, Inc.,
        Initializes all kind of stuff in here.
        Many things depend on this.
 
-       irrlicht: Used for getting texture ids.
+       This accesses g_texturesource; if it is non-NULL, textures are set.
+
+       Client first calls this with g_texturesource=NULL to run some
+       unit tests and stuff, then it runs this again with g_texturesource
+       defined to get the textures.
+
+       Server only calls this once with g_texturesource=NULL.
 */
-void init_mapnode(IIrrlichtWrapper *irrlicht);
+void init_mapnode();
 
 // Initializes g_content_inventory_texture_paths
 void init_content_inventory_texture_paths();
@@ -132,9 +138,12 @@ struct ContentFeatures
                5: front
        */
        TileSpec tiles[6];
-
+       
+       // TODO: Somehow specify inventory image
        //std::string inventory_image_path;
-       TextureSpec inventory_texture;
+       //TextureSpec inventory_texture;
+       //u32 inventory_texture_id;
+       video::ITexture *inventory_texture;
 
        bool is_ground_content; //TODO: Remove, use walkable instead
        bool light_propagates;
@@ -145,7 +154,13 @@ struct ContentFeatures
        bool diggable;
        bool buildable_to;
        enum LiquidType liquid_type;
-       bool wall_mounted; // If true, param2 is set to direction when placed
+       // If true, param2 is set to direction when placed
+       // NOTE: the direction format is quite inefficient and should be changed
+       bool wall_mounted;
+       
+       // Inventory item string as which the node appears in inventory when dug.
+       // Mineral overrides this.
+       std::string dug_item;
 
        //TODO: Move more properties here
 
@@ -153,6 +168,7 @@ struct ContentFeatures
        {
                translate_to = NULL;
                param_type = CPT_NONE;
+               inventory_texture = NULL;
                is_ground_content = false;
                light_propagates = false;
                sunlight_propagates = false;
@@ -163,40 +179,41 @@ struct ContentFeatures
                buildable_to = false;
                liquid_type = LIQUID_NONE;
                wall_mounted = false;
+               dug_item = "";
        }
 
        ~ContentFeatures();
        
-       void setAllTextures(const TextureSpec &spec, u8 alpha=255)
+       /*
+               Quickhands for simple materials
+       */
+       
+       void setTexture(u16 i, std::string name, u8 alpha=255);
+
+       void setAllTextures(std::string name, u8 alpha=255)
        {
                for(u16 i=0; i<6; i++)
                {
-                       tiles[i].spec = spec;
-                       tiles[i].alpha = alpha;
+                       setTexture(i, name, alpha);
                }
-               
-               // Set this too so it can be left as is most times
-               /*if(inventory_image_path == "")
-                       inventory_image_path = porting::getDataPath(imgname.c_str());*/
-
-               if(inventory_texture.empty())
-                       inventory_texture = spec;
        }
-       void setTexture(u16 i, const TextureSpec &spec, u8 alpha=255)
+
+       void setTile(u16 i, const TileSpec &tile)
        {
-               tiles[i].spec = spec;
-               tiles[i].alpha = alpha;
+               tiles[i] = tile;
        }
-
-       void setInventoryTexture(const TextureSpec &spec)
+       void setAllTiles(const TileSpec &tile)
        {
-               inventory_texture = spec;
+               for(u16 i=0; i<6; i++)
+               {
+                       setTile(i, tile);
+               }
        }
 
-       /*void setInventoryImage(std::string imgname)
-       {
-               inventory_image_path = porting::getDataPath(imgname.c_str());
-       }*/
+       void setInventoryTexture(std::string imgname);
+       
+       void setInventoryTextureCube(std::string top,
+                       std::string left, std::string right);
 };
 
 /*
@@ -417,12 +434,11 @@ struct MapNode
        
        union
        {
-               u8 param2;
-
                /*
-                       Direction for torches and other stuff.
-                       Format is freeform. e.g. packDir or encode_dirs can be used.
+                       The second parameter. Initialized to 0.
+                       Direction for torches and flowing water.
                */
+               u8 param2;
                u8 dir;
        };
 
@@ -650,32 +666,6 @@ struct MapNode
        }
 };
 
-/*
-       Returns integer position of the node in given
-       floating point position.
-*/
-inline v3s16 floatToInt(v3f p)
-{
-       v3s16 p2(
-               (p.X + (p.X>0 ? BS/2 : -BS/2))/BS,
-               (p.Y + (p.Y>0 ? BS/2 : -BS/2))/BS,
-               (p.Z + (p.Z>0 ? BS/2 : -BS/2))/BS);
-       return p2;
-}
-
-/*
-       The same thing backwards
-*/
-inline v3f intToFloat(v3s16 p)
-{
-       v3f p2(
-               p.X * BS,
-               p.Y * BS,
-               p.Z * BS
-       );
-       return p2;
-}
-
 
 
 #endif