X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;f=src%2Fmap.h;h=ab5f45ab96443920652dfca62f62e18174d2674b;hb=06f328207fa0a3e606992d3569b061b335eb0f48;hp=34456d6825dd2116a3f6fb5beeb172a38f7b9fb7;hpb=95e4a93b1bb98eb94b4ca00fb73a0162bd5c8c0e;p=dragonfireclient.git diff --git a/src/map.h b/src/map.h index 34456d682..ab5f45ab9 100644 --- a/src/map.h +++ b/src/map.h @@ -41,7 +41,7 @@ class ServerMapSector; class MapBlock; class NodeMetadata; class IGameDef; -class IRollbackReportSink; +class IRollbackManager; class EmergeManager; class ServerEnvironment; struct BlockMakeData; @@ -61,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, @@ -78,9 +80,9 @@ struct MapEditEvent MapEditEvent(): type(MEET_OTHER), + n(CONTENT_AIR), already_known_by_peer(0) - { - } + { } MapEditEvent * clone() { @@ -99,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; @@ -185,7 +189,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 @@ -193,14 +197,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, @@ -236,7 +239,8 @@ class Map /*: public NodeContainer*/ 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); @@ -245,7 +249,7 @@ class Map /*: public NodeContainer*/ 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); /* @@ -263,43 +267,33 @@ class Map /*: public NodeContainer*/ virtual void save(ModifiedState save_level){assert(0);}; - // 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 @@ -307,7 +301,22 @@ class Map /*: public NodeContainer*/ */ 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,9 +340,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; @@ -351,6 +357,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; }; /* @@ -385,7 +397,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); /* @@ -402,7 +414,18 @@ 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); // Helper for placing objects on ground level s16 findGroundLevel(v2s16 p2d); @@ -433,8 +456,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(); @@ -458,32 +481,27 @@ class ServerMap : public Map // 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); // 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); bool isSavingEnabled(){ return m_map_saving_enabled; } - u64 getSeed(){ return m_seed; } - - MapgenParams *getMapgenParams(){ return m_mgparams; } - - // Parameters fed to the Mapgen - MapgenParams *m_mgparams; - - virtual s16 getHeat(ServerEnvironment *env, v3s16 p, MapBlock *block = NULL); - virtual s16 getHumidity(ServerEnvironment *env, v3s16 p, MapBlock *block = NULL); + u64 getSeed(); + s16 getWaterLevel(); private: - // Seed used for all kinds of randomness in generation - u64 m_seed; - // Emerge manager EmergeManager *m_emerge; @@ -506,14 +524,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() { @@ -521,39 +540,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 -