Redefine NodeResolver interface and replace with callback mechanism

[minetest.git] / src / nodedef.h

diff --git a/src/nodedef.h b/src/nodedef.h
index c0322d9199d18d7048dde3ed993b97f023e8606b..0c779ddccf04f513245838250705a8fc084a6451 100644 (file)
--- a/src/nodedef.h
+++ b/src/nodedef.h
@@ -28,6 +28,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "mapnode.h"
 #ifndef SERVER
 #include "tile.h"
+#include "shader.h"
 #endif
 #include "itemgroup.h"
 #include "sound.h" // SimpleSoundSpec
@@ -35,6 +36,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 
 class IItemDefManager;
 class ITextureSource;
+class IShaderSource;
 class IGameDef;
 
 typedef std::list<std::pair<content_t, int> > GroupItems;
@@ -147,9 +149,13 @@ enum NodeDrawType
        NDT_GLASSLIKE_FRAMED, // Glass-like, draw connected frames and all all
                              // visible faces
                                                  // uses 2 textures, one for frames, second for faces
+       NDT_FIRELIKE, // Draw faces slightly rotated and only on connecting nodes,
+       NDT_GLASSLIKE_FRAMED_OPTIONAL,  // enabled -> connected, disabled -> Glass-like
+                                                                       // uses 2 textures, one for frames, second for faces
+       NDT_MESH, // Uses static meshes
 };
 
-#define CF_SPECIAL_COUNT 2
+#define CF_SPECIAL_COUNT 6
 
 struct ContentFeatures
 {
@@ -158,7 +164,7 @@ struct ContentFeatures
        */
 #ifndef SERVER
        // 0     1     2     3     4     5
-       // up    down  right left  back  front 
+       // up    down  right left  back  front
        TileSpec tiles[6];
        // Special tiles
        // - Currently used for flowing liquids
@@ -182,6 +188,10 @@ struct ContentFeatures
 
        // Visual definition
        enum NodeDrawType drawtype;
+       std::string mesh;
+#ifndef SERVER
+       scene::IMesh *mesh_ptr[24];
+#endif
        float visual_scale; // Misc. scale parameter
        TileDef tiledef[6];
        TileDef tiledef_special[CF_SPECIAL_COUNT]; // eg. flowing liquid
@@ -234,6 +244,9 @@ struct ContentFeatures
        u32 damage_per_second;
        NodeBox node_box;
        NodeBox selection_box;
+       NodeBox collision_box;
+       // Used for waving leaves/plants
+       u8 waving;
        // Compatibility with old maps
        // Set to true if paramtype used to be 'facedir_simple'
        bool legacy_facedir_simple;
@@ -248,7 +261,7 @@ struct ContentFeatures
        /*
                Methods
        */
-       
+
        ContentFeatures();
        ~ContentFeatures();
        void reset();
@@ -269,6 +282,20 @@ struct ContentFeatures
        }
 };
 
+class NodeResolver;
+class INodeDefManager;
+
+struct NodeResolveInfo {
+       NodeResolveInfo(NodeResolver *nr)
+       {
+               resolver = nr;
+       }
+
+       std::list<std::string> nodenames;
+       std::list<size_t> nodename_sizes;
+       NodeResolver *resolver;
+};
+
 class INodeDefManager
 {
 public:
@@ -283,8 +310,17 @@ class INodeDefManager
        virtual void getIds(const std::string &name, std::set<content_t> &result)
                        const=0;
        virtual const ContentFeatures& get(const std::string &name) const=0;
-       
+
        virtual void serialize(std::ostream &os, u16 protocol_version)=0;
+
+       virtual void pendNodeResolve(NodeResolveInfo *nri)=0;
+       virtual void cancelNodeResolve(NodeResolver *resolver)=0;
+       virtual void runNodeResolverCallbacks()=0;
+
+       virtual bool getIdFromResolveInfo(NodeResolveInfo *nri,
+               const std::string &node_alt, content_t c_fallback, content_t &result)=0;
+       virtual bool getIdsFromResolveInfo(NodeResolveInfo *nri,
+               std::vector<content_t> &result)=0;
 };
 
 class IWritableNodeDefManager : public INodeDefManager
@@ -321,13 +357,43 @@ class IWritableNodeDefManager : public INodeDefManager
        /*
                Update tile textures to latest return values of TextueSource.
        */
-       virtual void updateTextures(ITextureSource *tsrc)=0;
+       virtual void updateTextures(IGameDef *gamedef)=0;
 
        virtual void serialize(std::ostream &os, u16 protocol_version)=0;
        virtual void deSerialize(std::istream &is)=0;
+
+       virtual void pendNodeResolve(NodeResolveInfo *nri)=0;
+       virtual void cancelNodeResolve(NodeResolver *resolver)=0;
+       virtual void runNodeResolverCallbacks()=0;
+
+       virtual bool getIdFromResolveInfo(NodeResolveInfo *nri,
+               const std::string &node_alt, content_t c_fallback, content_t &result)=0;
+       virtual bool getIdsFromResolveInfo(NodeResolveInfo *nri,
+               std::vector<content_t> &result)=0;
+};
+
+IWritableNodeDefManager *createNodeDefManager();
+
+class NodeResolver {
+public:
+       NodeResolver()
+       {
+               m_lookup_done = false;
+               m_ndef = NULL;
+       }
+
+       ~NodeResolver()
+       {
+               if (!m_lookup_done)
+                       m_ndef->cancelNodeResolve(this);
+       }
+
+       virtual void resolveNodeNames(NodeResolveInfo *nri) = 0;
+
+       bool m_lookup_done;
+       INodeDefManager *m_ndef;
 };
 
-IWritableNodeDefManager* createNodeDefManager();
 
 #endif