X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;f=src%2Fmap.h;h=5500ccf91bece71a3ac21274073c1ad2b8a47e53;hb=b2160bcecdecb00bb59e6ad8ece6518255dab4ad;hp=54d8fe9eaf30b1c83524861494084d942de47b74;hpb=5a34f40d80ea1a339b599bc11db549a6bd86912f;p=minetest.git diff --git a/src/map.h b/src/map.h index 54d8fe9ea..5500ccf91 100644 --- a/src/map.h +++ b/src/map.h @@ -34,6 +34,7 @@ with this program; if not, write to the Free Software Foundation, Inc., #include "util/container.h" #include "nodetimer.h" +class Settings; class Database; class ClientMap; class MapSector; @@ -41,7 +42,7 @@ class ServerMapSector; class MapBlock; class NodeMetadata; class IGameDef; -class IRollbackReportSink; +class IRollbackManager; class EmergeManager; class ServerEnvironment; struct BlockMakeData; @@ -80,9 +81,9 @@ struct MapEditEvent MapEditEvent(): type(MEET_OTHER), + n(CONTENT_AIR), already_known_by_peer(0) - { - } + { } MapEditEvent * clone() { @@ -189,7 +190,7 @@ class Map /*: public NodeContainer*/ MapBlock * getBlockNoCreateNoEx(v3s16 p); /* Server overrides */ - virtual MapBlock * emergeBlock(v3s16 p, bool allow_generate=true) + virtual MapBlock * emergeBlock(v3s16 p, bool create_blank=true) { return getBlockNoCreateNoEx(p); } // Returns InvalidPositionException if not found @@ -197,14 +198,13 @@ class Map /*: public NodeContainer*/ bool isValidPosition(v3s16 p); - // throws InvalidPositionException if not found - MapNode getNode(v3s16 p); - // throws InvalidPositionException if not found void setNode(v3s16 p, MapNode & n); // Returns a CONTENT_IGNORE node if not found - MapNode getNodeNoEx(v3s16 p); + // If is_valid_position is not NULL then this will be set to true if the + // position is valid, otherwise false + MapNode getNodeNoEx(v3s16 p, bool *is_valid_position = NULL); void unspreadLight(enum LightBank bank, std::map & from_nodes, @@ -263,55 +263,46 @@ class Map /*: public NodeContainer*/ //bool updateChangedVisibleArea(); // Call these before and after saving of many blocks - virtual void beginSave() {return;}; - virtual void endSave() {return;}; + virtual void beginSave() { return; } + virtual void endSave() { return; } - virtual void save(ModifiedState save_level){assert(0);}; + virtual void save(ModifiedState save_level) { FATAL_ERROR("FIXME"); } - // Server implements this. - // Client leaves it as no-op. - virtual void saveBlock(MapBlock *block){}; + // Server implements these. + // Client leaves them as no-op. + virtual bool saveBlock(MapBlock *block) { return false; } + virtual bool deleteBlock(v3s16 blockpos) { return false; } /* Updates usage timers and unloads unused blocks and sectors. Saves modified blocks before unloading on MAPTYPE_SERVER. */ void timerUpdate(float dtime, float unload_timeout, - std::list *unloaded_blocks=NULL); + std::vector *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); + void unloadUnreferencedBlocks(std::vector *unloaded_blocks=NULL); // Deletes sectors and their blocks from memory // Takes cache into account // If deleted sector is in sector cache, clears cache - void deleteSectors(std::list &list); - -#if 0 - /* - Unload unused data - = flush changed to disk and delete from memory, if usage timer of - block is more than timeout - */ - void unloadUnusedData(float timeout, - core::list *deleted_blocks=NULL); -#endif + void deleteSectors(std::vector &list); // For debug printing. Prints "Map: ", "ServerMap: " or "ClientMap: " virtual void PrintInfo(std::ostream &out); void transformLiquids(std::map & modified_blocks); - void transformLiquidsFinite(std::map & modified_blocks); /* Node metadata These are basically coordinate wrappers to MapBlock */ - NodeMetadata* getNodeMetadata(v3s16 p); + std::vector findNodesWithMetadata(v3s16 p1, v3s16 p2); + NodeMetadata *getNodeMetadata(v3s16 p); /** * Sets metadata for a node. @@ -351,9 +342,6 @@ class Map /*: public NodeContainer*/ void transforming_liquid_add(v3s16 p); s32 transforming_liquid_size(); - virtual s16 getHeat(v3s16 p); - virtual s16 getHumidity(v3s16 p); - protected: friend class LuaVoxelManip; @@ -371,6 +359,12 @@ class Map /*: public NodeContainer*/ // Queued transforming water nodes UniqueQueue m_transforming_liquid; + +private: + f32 m_transforming_liquid_loop_count_multiplier; + u32 m_unprocessed_count; + u32 m_inc_trending_up_start_time; // milliseconds + bool m_queue_size_timer_started; }; /* @@ -405,7 +399,7 @@ class ServerMap : public Map 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); /* @@ -422,8 +416,16 @@ class ServerMap : public Map - Create blank filled with CONTENT_IGNORE */ - MapBlock * emergeBlock(v3s16 p, bool create_blank=true); - + 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); @@ -445,6 +447,7 @@ class ServerMap : public Map /* Database functions */ + static Database *createDatabase(const std::string &name, const std::string &savedir, Settings &conf); // Verify we can read/write to the database void verifyDatabase(); @@ -456,8 +459,8 @@ class ServerMap : public Map void endSave(); void save(ModifiedState save_level); - void listAllLoadableBlocks(std::list &dst); - void listAllLoadedBlocks(std::list &dst); + void listAllLoadableBlocks(std::vector &dst); + void listAllLoadedBlocks(std::vector &dst); // Saves map seed and possibly other stuff void saveMapMeta(); void loadMapMeta(); @@ -481,13 +484,18 @@ class ServerMap : public Map // Returns true if sector now resides in memory //bool deFlushSector(v2s16 p2d); - void saveBlock(MapBlock *block); + bool saveBlock(MapBlock *block); + static bool saveBlock(MapBlock *block, Database *db); // 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); + bool deleteBlock(v3s16 blockpos); + + void updateVManip(v3s16 pos); + // For debug printing virtual void PrintInfo(std::ostream &out); @@ -496,9 +504,6 @@ class ServerMap : public Map u64 getSeed(); s16 getWaterLevel(); - virtual s16 updateBlockHeat(ServerEnvironment *env, v3s16 p, MapBlock *block = NULL); - virtual s16 updateBlockHumidity(ServerEnvironment *env, v3s16 p, MapBlock *block = NULL); - private: // Emerge manager EmergeManager *m_emerge; @@ -522,14 +527,15 @@ class ServerMap : public Map Database *dbase; }; + #define VMANIP_BLOCK_DATA_INEXIST 1 #define VMANIP_BLOCK_CONTAINS_CIGNORE 2 -class MapVoxelManipulator : public VoxelManipulator +class MMVManip : public VoxelManipulator { public: - MapVoxelManipulator(Map *map); - virtual ~MapVoxelManipulator(); + MMVManip(Map *map); + virtual ~MMVManip(); virtual void clear() { @@ -537,39 +543,26 @@ class MapVoxelManipulator : public VoxelManipulator m_loaded_blocks.clear(); } - virtual void emerge(VoxelArea a, s32 caller_id=-1); - - void blitBack(std::map & modified_blocks); - -protected: - Map *m_map; - /* - key = blockpos - value = flags describing the block - */ - 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, - bool load_if_inexistent = true); + bool load_if_inexistent = true); // This is much faster with big chunks of generated data - void blitBackAll(std::map * modified_blocks); + void blitBackAll(std::map * modified_blocks, + bool overwrite_generated = true); + + bool m_is_dirty; protected: bool m_create_area; + Map *m_map; + /* + key = blockpos + value = flags describing the block + */ + std::map m_loaded_blocks; }; #endif -