Node definition names

[oweals/minetest.git] / src / nodedef.h

diff --git a/src/nodedef.h b/src/nodedef.h
index b78b09d4c558448f725f7159657552f7ed378d09..055ed7a4b46b571d52539388aa9232b665152077 100644 (file)
--- a/src/nodedef.h
+++ b/src/nodedef.h
@@ -32,28 +32,6 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 class ITextureSource;
 class IGameDef;
 
-/*
-       TODO: Rename to nodedef.h
-*/
-
-#if 0
-
-/*
-       Content feature list
-       
-       Used for determining properties of MapNodes by content type without
-       storing such properties in the nodes itself.
-*/
-
-/*
-       Initialize content feature table.
-
-       Must be called before accessing the table.
-*/
-void init_contentfeatures(ITextureSource *tsrc);
-
-#endif
-
 enum ContentParamType
 {
        CPT_NONE,
@@ -98,7 +76,7 @@ struct NodeBox
                wall_side(-BS/2, -BS/2, -BS/2, -BS/2+BS/16., BS/2, BS/2)
        {}
 
-       void serialize(std::ostream &os);
+       void serialize(std::ostream &os) const;
        void deSerialize(std::istream &is);
 };
 
@@ -115,7 +93,7 @@ struct MaterialSpec
                backface_culling(backface_culling_)
        {}
 
-       void serialize(std::ostream &os);
+       void serialize(std::ostream &os) const;
        void deSerialize(std::istream &is);
 };
 
@@ -156,24 +134,22 @@ struct ContentFeatures
        bool backface_culling;
 #endif
        
-       // List of all block textures that have been used (value is dummy)
-       // Used for texture atlas making.
-       // Exists on server too for cleaner code in content_mapnode.cpp.
+       // List of textures that are used and are wanted to be included in
+       // the texture atlas
        std::set<std::string> used_texturenames;
        
-       // True if this actually contains non-default data
-       bool modified;
-
        /*
                Actual data
        */
 
+       std::string name; // "" = undefined node
+
        // Visual definition
        enum NodeDrawType drawtype;
        float visual_scale; // Misc. scale parameter
        std::string tname_tiles[6];
        std::string tname_inventory;
-       MaterialSpec mspec_special[CF_SPECIAL_COUNT];
+       MaterialSpec mspec_special[CF_SPECIAL_COUNT]; // Use setter methods
        u8 alpha;
 
        // Post effect color, drawn when the camera is inside the node.
@@ -210,6 +186,7 @@ struct ContentFeatures
        std::string dug_item;
        // Extra dug item and its rarity
        std::string extra_dug_item;
+       // Usual get interval for extra dug item
        s32 extra_dug_item_rarity;
        // Initial metadata is cloned from this
        NodeMetadata *initial_metadata;
@@ -228,6 +205,9 @@ struct ContentFeatures
        u32 damage_per_second;
        NodeBox selection_box;
        MaterialProperties material;
+       std::string cookresult_item;
+       float furnace_cooktime;
+       float furnace_burntime;
 
        /*
                Methods
@@ -240,24 +220,19 @@ struct ContentFeatures
        void deSerialize(std::istream &is, IGameDef *gamedef);
 
        /*
-               Quickhands for simple materials
+               Texture setters.
+               
        */
        
+       // Texture setters. They also add stuff to used_texturenames.
        void setTexture(u16 i, std::string name);
-
-       void setAllTextures(std::string name, u8 alpha=255)
-       {
-               for(u16 i=0; i<6; i++)
-                       setTexture(i, name);
-               alpha = alpha;
-               // Force inventory texture too
-               setInventoryTexture(name);
-       }
+       void setAllTextures(std::string name);
+       void setSpecialMaterial(u16 i, const MaterialSpec &mspec);
 
        void setInventoryTexture(std::string imgname);
        void setInventoryTextureCube(std::string top,
                        std::string left, std::string right);
-
+       
        /*
                Some handy methods
        */
@@ -278,6 +253,7 @@ public:
        // Get node definition
        virtual const ContentFeatures& get(content_t c) const=0;
        virtual const ContentFeatures& get(const MapNode &n) const=0;
+       virtual bool getId(const std::string &name, content_t &result) const=0;
        
        virtual void serialize(std::ostream &os)=0;
 };
@@ -291,10 +267,16 @@ public:
        // Get node definition
        virtual const ContentFeatures& get(content_t c) const=0;
        virtual const ContentFeatures& get(const MapNode &n) const=0;
+       virtual bool getId(const std::string &name, content_t &result) const=0;
                
        // Register node definition
        virtual void set(content_t c, const ContentFeatures &def)=0;
-       virtual ContentFeatures* getModifiable(content_t c)=0;
+       // Register node definition by name (allocate an id)
+       // If returns CONTENT_IGNORE, could not allocate id
+       virtual content_t set(const std::string &name,
+                       const ContentFeatures &def)=0;
+       // If returns CONTENT_IGNORE, could not allocate id
+       virtual content_t allocateDummy(const std::string &name)=0;
 
        /*
                Update tile textures to latest return values of TextueSource.