MapBlockMesh, mesh animation system, urgent mesh updates, athmospheric light, removed...

[minetest.git] / src / map.h

diff --git a/src/map.h b/src/map.h
index a8aa8e6790a32940a16e8f5638165aef1804b910..ada59a4d525114b54ce5e020388ef6775589aba9 100644 (file)
--- a/src/map.h
+++ b/src/map.h
@@ -24,18 +24,25 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include <jmutexautolock.h>
 #include <jthread.h>
 #include <iostream>
+#include <sstream>
 
 #include "common_irrlicht.h"
 #include "mapnode.h"
-#include "mapblock_nodemod.h"
 #include "constants.h"
 #include "voxel.h"
+#include "utility.h" // Needed for UniqueQueue, a member of Map
+#include "modifiedstate.h"
+
+extern "C" {
+       #include "sqlite3.h"
+}
 
 class MapSector;
 class ServerMapSector;
 class ClientMapSector;
 class MapBlock;
 class NodeMetadata;
+class IGameDef;
 
 namespace mapgen{
        struct BlockMakeData;
@@ -104,7 +111,7 @@ class Map /*: public NodeContainer*/
 {
 public:
 
-       Map(std::ostream &dout);
+       Map(std::ostream &dout, IGameDef *gamedef);
        virtual ~Map();
 
        /*virtual u16 nodeContainerId() const
@@ -152,6 +159,10 @@ class Map /*: public NodeContainer*/
        // Returns NULL if not found
        MapBlock * getBlockNoCreateNoEx(v3s16 p);
        
+       /* Server overrides */
+       virtual MapBlock * emergeBlock(v3s16 p, bool allow_generate=true)
+       { return getBlockNoCreateNoEx(p); }
+
        // Returns InvalidPositionException if not found
        bool isNodeUnderground(v3s16 p);
        
@@ -220,8 +231,12 @@ class Map /*: public NodeContainer*/
        //core::aabbox3d<s16> getDisplayedBlockArea();
 
        //bool updateChangedVisibleArea();
+
+       // Call these before and after saving of many blocks
+       virtual void beginSave() {return;};
+       virtual void endSave() {return;};
        
-       virtual void save(bool only_changed){assert(0);};
+       virtual void save(ModifiedState save_level){assert(0);};
        
        // Server implements this.
        // Client leaves it as no-op.
@@ -276,7 +291,9 @@ class Map /*: public NodeContainer*/
        
 protected:
 
-       std::ostream &m_dout;
+       std::ostream &m_dout; // A bit deprecated, could be removed
+
+       IGameDef *m_gamedef;
 
        core::map<MapEventReceiver*, bool> m_event_receivers;
        
@@ -302,7 +319,7 @@ class ServerMap : public Map
        /*
                savedir: directory to which map data should be saved
        */
-       ServerMap(std::string savedir);
+       ServerMap(std::string savedir, IGameDef *gamedef);
        ~ServerMap();
 
        s32 mapType() const
@@ -361,9 +378,29 @@ class ServerMap : public Map
        v3s16 getBlockPos(std::string sectordir, std::string blockfile);
        static std::string getBlockFilename(v3s16 p);
 
-       void save(bool only_changed);
+       /*
+               Database functions
+       */
+       // Create the database structure
+       void createDatabase();
+       // Verify we can read/write to the database
+       void verifyDatabase();
+       // Get an integer suitable for a block
+       static sqlite3_int64 getBlockAsInteger(const v3s16 pos);
+       static v3s16 getIntegerAsBlock(sqlite3_int64 i);
+
+       // Returns true if the database file does not exist
+       bool loadFromFolders();
+
+       // Call these before and after saving of blocks
+       void beginSave();
+       void endSave();
+
+       void save(ModifiedState save_level);
        //void loadAll();
        
+       void listAllLoadableBlocks(core::list<v3s16> &dst);
+       
        // Saves map seed and possibly other stuff
        void saveMapMeta();
        void loadMapMeta();
@@ -391,6 +428,8 @@ class ServerMap : public Map
        // This will generate a sector with getSector if not found.
        void loadBlock(std::string sectordir, std::string blockfile, MapSector *sector, bool save_after_load=false);
        MapBlock* loadBlock(v3s16 p);
+       // Database version
+       void loadBlock(std::string *blob, v3s16 p3d, MapSector *sector, bool save_after_load=false);
 
        // For debug printing
        virtual void PrintInfo(std::ostream &out);
@@ -400,9 +439,9 @@ class ServerMap : public Map
        u64 getSeed(){ return m_seed; }
 
 private:
-       // Seed used for all kinds of randomness
+       // Seed used for all kinds of randomness in generation
        u64 m_seed;
-
+       
        std::string m_savedir;
        bool m_map_saving_enabled;
 
@@ -419,6 +458,14 @@ class ServerMap : public Map
                This is reset to false when written on disk.
        */
        bool m_map_metadata_changed;
+       
+       /*
+               SQLite database and statements
+       */
+       sqlite3 *m_database;
+       sqlite3_stmt *m_database_read;
+       sqlite3_stmt *m_database_write;
+       sqlite3_stmt *m_database_list;
 };
 
 /*
@@ -453,6 +500,7 @@ struct MapDrawControl
 };
 
 class Client;
+class ITextureSource;
 
 /*
        ClientMap
@@ -465,6 +513,7 @@ class ClientMap : public Map, public scene::ISceneNode
 public:
        ClientMap(
                        Client *client,
+                       IGameDef *gamedef,
                        MapDrawControl &control,
                        scene::ISceneNode* parent,
                        scene::ISceneManager* mgr,
@@ -483,11 +532,12 @@ class ClientMap : public Map, public scene::ISceneNode
                ISceneNode::drop();
        }
 
-       void updateCamera(v3f pos, v3f dir)
+       void updateCamera(v3f pos, v3f dir, f32 fov)
        {
                JMutexAutoLock lock(m_camera_mutex);
                m_camera_position = pos;
                m_camera_direction = dir;
+               m_camera_fov = fov;
        }
 
        /*
@@ -517,32 +567,7 @@ class ClientMap : public Map, public scene::ISceneNode
 
        void renderMap(video::IVideoDriver* driver, s32 pass);
 
-       /*
-               Methods for setting temporary modifications to nodes for
-               drawing.
-
-               Returns true if something changed.
-               
-               All blocks whose mesh could have been changed are inserted
-               to affected_blocks.
-       */
-       bool setTempMod(v3s16 p, NodeMod mod,
-                       core::map<v3s16, MapBlock*> *affected_blocks=NULL);
-       bool clearTempMod(v3s16 p,
-                       core::map<v3s16, MapBlock*> *affected_blocks=NULL);
-       // Efficient implementation needs a cache of TempMods
-       //void clearTempMods();
-
-       void expireMeshes(bool only_daynight_diffed);
-       
-       /*
-               Update the faces of the given block and blocks on the
-               leading edge.
-       */
-       void updateMeshes(v3s16 blockpos, u32 daynight_ratio);
-       
-       // Update meshes that touch the node
-       //void updateNodeMeshes(v3s16 nodepos, u32 daynight_ratio);
+       void renderPostFx();
 
        // For debug printing
        virtual void PrintInfo(std::ostream &out);
@@ -566,6 +591,7 @@ class ClientMap : public Map, public scene::ISceneNode
 
        v3f m_camera_position;
        v3f m_camera_direction;
+       f32 m_camera_fov;
        JMutex m_camera_mutex;
        
        core::map<v2s16, bool> m_last_drawn_sectors;