X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Fmap.h;h=9b505d8e66984807d19d305910f00126062dfc1f;hb=e5b4748bb44a12fd09a92f7d36986b4bda86e6bf;hp=31001e4c397b9342a430671bf2e85d4f668b00a6;hpb=ca7043e52d6a5d0ee1b91f287371fbe7f216697e;p=oweals%2Fminetest.git diff --git a/src/map.h b/src/map.h index 31001e4c3..9b505d8e6 100644 --- a/src/map.h +++ b/src/map.h @@ -20,9 +20,6 @@ with this program; if not, write to the Free Software Foundation, Inc., #ifndef MAP_HEADER #define MAP_HEADER -#include -#include -#include #include #include #include @@ -33,15 +30,11 @@ with this program; if not, write to the Free Software Foundation, Inc., #include "mapnode.h" #include "constants.h" #include "voxel.h" -#include "mapgen.h" //for BlockMakeData and EmergeManager #include "modifiedstate.h" #include "util/container.h" #include "nodetimer.h" -extern "C" { - #include "sqlite3.h" -} - +class Database; class ClientMap; class MapSector; class ServerMapSector; @@ -50,7 +43,9 @@ class NodeMetadata; class IGameDef; class IRollbackReportSink; class EmergeManager; +class ServerEnvironment; struct BlockMakeData; +struct MapgenParams; /* @@ -66,6 +61,8 @@ enum MapEditEventType{ MEET_ADDNODE, // Node removed (changed to air) MEET_REMOVENODE, + // Node swapped (changed without metadata change) + MEET_SWAPNODE, // Node metadata of block changed (not knowing which node exactly) // p stores block coordinate MEET_BLOCK_NODE_METADATA_CHANGED, @@ -104,6 +101,8 @@ struct MapEditEvent return VoxelArea(p); case MEET_REMOVENODE: return VoxelArea(p); + case MEET_SWAPNODE: + return VoxelArea(p); case MEET_BLOCK_NODE_METADATA_CHANGED: { v3s16 np1 = p*MAP_BLOCKSIZE; @@ -241,7 +240,8 @@ public: These handle lighting but not faces. */ void addNodeAndUpdate(v3s16 p, MapNode n, - std::map &modified_blocks); + std::map &modified_blocks, + bool remove_metadata = true); void removeNodeAndUpdate(v3s16 p, std::map &modified_blocks); @@ -250,7 +250,7 @@ public: These emit events. Return true if succeeded, false if not. */ - bool addNodeWithEvent(v3s16 p, MapNode n); + bool addNodeWithEvent(v3s16 p, MapNode n, bool remove_metadata = true); bool removeNodeWithEvent(v3s16 p); /* @@ -270,7 +270,7 @@ public: // Server implements this. // Client leaves it as no-op. - virtual void saveBlock(MapBlock *block){}; + virtual bool saveBlock(MapBlock *block) { return false; }; /* Updates usage timers and unloads unused blocks and sectors. @@ -279,6 +279,12 @@ public: void timerUpdate(float dtime, float unload_timeout, std::list *unloaded_blocks=NULL); + /* + Unloads all blocks with a zero refCount(). + Saves modified blocks before unloading on MAPTYPE_SERVER. + */ + void unloadUnreferencedBlocks(std::list *unloaded_blocks=NULL); + // Deletes sectors and their blocks from memory // Takes cache into account // If deleted sector is in sector cache, clears cache @@ -298,7 +304,6 @@ public: virtual void PrintInfo(std::ostream &out); void transformLiquids(std::map & modified_blocks); - void transformLiquidsFinite(std::map & modified_blocks); /* Node metadata @@ -306,7 +311,22 @@ public: */ NodeMetadata* getNodeMetadata(v3s16 p); - void setNodeMetadata(v3s16 p, NodeMetadata *meta); + + /** + * Sets metadata for a node. + * This method sets the metadata for a given node. + * On success, it returns @c true and the object pointed to + * by @p meta is then managed by the system and should + * not be deleted by the caller. + * + * In case of failure, the method returns @c false and the + * caller is still responsible for deleting the object! + * + * @param p node coordinates + * @param meta pointer to @c NodeMetadata object + * @return @c true on success, false on failure + */ + bool setNodeMetadata(v3s16 p, NodeMetadata *meta); void removeNodeMetadata(v3s16 p); /* @@ -331,6 +351,7 @@ public: s32 transforming_liquid_size(); protected: + friend class LuaVoxelManip; std::ostream &m_dout; // A bit deprecated, could be removed @@ -380,7 +401,7 @@ public: Blocks are generated by using these and makeBlock(). */ bool initBlockMake(BlockMakeData *data, v3s16 blockpos); - MapBlock *finishBlockMake(BlockMakeData *data, + void finishBlockMake(BlockMakeData *data, std::map &changed_blocks); /* @@ -399,6 +420,17 @@ public: */ MapBlock * emergeBlock(v3s16 p, bool create_blank=true); + /* + Try to get a block. + If it does not exist in memory, add it to the emerge queue. + - Memory + - Emerge Queue (deferred disk or generate) + */ + MapBlock *getBlockOrEmerge(v3s16 p3d); + + // Carries out any initialization necessary before block is sent + void prepareBlock(MapBlock *block); + // Helper for placing objects on ground level s16 findGroundLevel(v2s16 p2d); @@ -417,13 +449,8 @@ public: /* 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(); @@ -433,8 +460,8 @@ public: void endSave(); void save(ModifiedState save_level); - //void loadAll(); void listAllLoadableBlocks(std::list &dst); + void listAllLoadedBlocks(std::list &dst); // Saves map seed and possibly other stuff void saveMapMeta(); void loadMapMeta(); @@ -458,7 +485,8 @@ public: // Returns true if sector now resides in memory //bool deFlushSector(v2s16 p2d); - void saveBlock(MapBlock *block); + bool saveBlock(MapBlock *block, Database *db); + bool saveBlock(MapBlock *block); // 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); @@ -470,16 +498,10 @@ public: bool isSavingEnabled(){ return m_map_saving_enabled; } - u64 getSeed(){ return m_seed; } - - MapgenParams *getMapgenParams(){ return m_mgparams; } + u64 getSeed(); + s16 getWaterLevel(); - // Parameters fed to the Mapgen - MapgenParams *m_mgparams; private: - // Seed used for all kinds of randomness in generation - u64 m_seed; - // Emerge manager EmergeManager *m_emerge; @@ -499,24 +521,18 @@ private: 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; + Database *dbase; }; + #define VMANIP_BLOCK_DATA_INEXIST 1 #define VMANIP_BLOCK_CONTAINS_CIGNORE 2 -class MapVoxelManipulator : public VoxelManipulator +class ManualMapVoxelManipulator : public VoxelManipulator { public: - MapVoxelManipulator(Map *map); - virtual ~MapVoxelManipulator(); + ManualMapVoxelManipulator(Map *map); + virtual ~ManualMapVoxelManipulator(); virtual void clear() { @@ -524,11 +540,18 @@ public: m_loaded_blocks.clear(); } - virtual void emerge(VoxelArea a, s32 caller_id=-1); + void setMap(Map *map) + {m_map = map;} + + void initialEmerge(v3s16 blockpos_min, v3s16 blockpos_max, + bool load_if_inexistent = true); - void blitBack(std::map & modified_blocks); + // This is much faster with big chunks of generated data + void blitBackAll(std::map * modified_blocks, + bool overwrite_generated = true); protected: + bool m_create_area; Map *m_map; /* key = blockpos @@ -537,25 +560,4 @@ protected: std::map m_loaded_blocks; }; -class ManualMapVoxelManipulator : public MapVoxelManipulator -{ -public: - ManualMapVoxelManipulator(Map *map); - virtual ~ManualMapVoxelManipulator(); - - void setMap(Map *map) - {m_map = map;} - - virtual void emerge(VoxelArea a, s32 caller_id=-1); - - void initialEmerge(v3s16 blockpos_min, v3s16 blockpos_max); - - // This is much faster with big chunks of generated data - void blitBackAll(std::map * modified_blocks); - -protected: - bool m_create_area; -}; - #endif -