X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;f=src%2Fmap.h;h=e68795c4a14443fa9935c72e7a10b5570aa0c648;hb=a93712458b2f8914fdb43ec436c5caf908ba93b8;hp=c73fa92bf5913b29c3426f68983f73fc690d7047;hpb=155288ee981c70f505526347cb2bcda4df1c8e6b;p=minetest.git diff --git a/src/map.h b/src/map.h index c73fa92bf..e68795c4a 100644 --- a/src/map.h +++ b/src/map.h @@ -17,8 +17,7 @@ with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifndef MAP_HEADER -#define MAP_HEADER +#pragma once #include #include @@ -32,12 +31,13 @@ with this program; if not, write to the Free Software Foundation, Inc., #include "voxel.h" #include "modifiedstate.h" #include "util/container.h" -#include "util/cpp11_container.h" +#include "util/metricsbackend.h" #include "nodetimer.h" #include "map_settings_manager.h" +#include "debug.h" class Settings; -class Database; +class MapDatabase; class ClientMap; class MapSector; class ServerMapSector; @@ -46,6 +46,7 @@ class NodeMetadata; class IGameDef; class IRollbackManager; class EmergeManager; +class MetricsBackend; class ServerEnvironment; struct BlockMakeData; @@ -64,8 +65,7 @@ enum MapEditEventType{ MEET_REMOVENODE, // Node swapped (changed without metadata change) MEET_SWAPNODE, - // Node metadata of block changed (not knowing which node exactly) - // p stores block coordinate + // Node metadata changed MEET_BLOCK_NODE_METADATA_CHANGED, // Anything else (modified_blocks are set unsent) MEET_OTHER @@ -73,29 +73,15 @@ enum MapEditEventType{ struct MapEditEvent { - MapEditEventType type; + MapEditEventType type = MEET_OTHER; v3s16 p; - MapNode n; + MapNode n = CONTENT_AIR; std::set modified_blocks; - u16 already_known_by_peer; + bool is_private_change = false; - MapEditEvent(): - type(MEET_OTHER), - n(CONTENT_AIR), - already_known_by_peer(0) - { } + MapEditEvent() = default; - MapEditEvent * clone() - { - MapEditEvent *event = new MapEditEvent(); - event->type = type; - event->p = p; - event->n = n; - event->modified_blocks = modified_blocks; - return event; - } - - VoxelArea getArea() + VoxelArea getArea() const { switch(type){ case MEET_ADDNODE: @@ -113,11 +99,7 @@ struct MapEditEvent case MEET_OTHER: { VoxelArea a; - for(std::set::iterator - i = modified_blocks.begin(); - i != modified_blocks.end(); ++i) - { - v3s16 p = *i; + for (v3s16 p : modified_blocks) { v3s16 np1 = p*MAP_BLOCKSIZE; v3s16 np2 = np1 + v3s16(1,1,1)*MAP_BLOCKSIZE - v3s16(1,1,1); a.addPoint(np1); @@ -134,20 +116,16 @@ class MapEventReceiver { public: // event shall be deleted by caller after the call. - virtual void onMapEditEvent(MapEditEvent *event) = 0; + virtual void onMapEditEvent(const MapEditEvent &event) = 0; }; class Map /*: public NodeContainer*/ { public: - Map(std::ostream &dout, IGameDef *gamedef); + Map(IGameDef *gamedef); virtual ~Map(); - - /*virtual u16 nodeContainerId() const - { - return NODECONTAINER_ID_MAP; - }*/ + DISABLE_CLASS_COPY(Map); virtual s32 mapType() const { @@ -165,24 +143,18 @@ class Map /*: public NodeContainer*/ void addEventReceiver(MapEventReceiver *event_receiver); void removeEventReceiver(MapEventReceiver *event_receiver); // event shall be deleted by caller after the call. - void dispatchEvent(MapEditEvent *event); + void dispatchEvent(const MapEditEvent &event); // On failure returns NULL - MapSector * getSectorNoGenerateNoExNoLock(v2s16 p2d); + MapSector * getSectorNoGenerateNoLock(v2s16 p2d); // Same as the above (there exists no lock anymore) - MapSector * getSectorNoGenerateNoEx(v2s16 p2d); - // On failure throws InvalidPositionException MapSector * getSectorNoGenerate(v2s16 p2d); - // Gets an existing sector or creates an empty one - //MapSector * getSectorCreate(v2s16 p2d); /* This is overloaded by ClientMap and ServerMap to allow their differing fetch methods. */ virtual MapSector * emergeSector(v2s16 p){ return NULL; } - virtual MapSector * emergeSector(v2s16 p, - std::map &changed_blocks){ return NULL; } // Returns InvalidPositionException if not found MapBlock * getBlockNoCreate(v3s16 p); @@ -193,6 +165,8 @@ class Map /*: public NodeContainer*/ virtual MapBlock * emergeBlock(v3s16 p, bool create_blank=true) { return getBlockNoCreateNoEx(p); } + inline const NodeDefManager * getNodeDefManager() { return m_nodedef; } + // Returns InvalidPositionException if not found bool isNodeUnderground(v3s16 p); @@ -204,37 +178,7 @@ class Map /*: public NodeContainer*/ // Returns a CONTENT_IGNORE node if not found // 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, - std::set & light_sources, - std::map & modified_blocks); - - void unLightNeighbors(enum LightBank bank, - v3s16 pos, u8 lightwas, - std::set & light_sources, - std::map & modified_blocks); - - void spreadLight(enum LightBank bank, - std::set & from_nodes, - std::map & modified_blocks); - - void lightNeighbors(enum LightBank bank, - v3s16 pos, - std::map & modified_blocks); - - v3s16 getBrightestNeighbour(enum LightBank bank, v3s16 p); - - s16 propagateSunlight(v3s16 start, - std::map & modified_blocks); - - void updateLighting(enum LightBank bank, - std::map & a_blocks, - std::map & modified_blocks); - - void updateLighting(std::map & a_blocks, - std::map & modified_blocks); + MapNode getNode(v3s16 p, bool *is_valid_position = NULL); /* These handle lighting but not faces. @@ -253,18 +197,9 @@ class Map /*: public NodeContainer*/ bool addNodeWithEvent(v3s16 p, MapNode n, bool remove_metadata = true); bool removeNodeWithEvent(v3s16 p); - /* - Takes the blocks at the edges into account - */ - bool getDayNightDiff(v3s16 blockpos); - - //core::aabbox3d getDisplayedBlockArea(); - - //bool updateChangedVisibleArea(); - // Call these before and after saving of many blocks - virtual void beginSave() { return; } - virtual void endSave() { return; } + virtual void beginSave() {} + virtual void endSave() {} virtual void save(ModifiedState save_level) { FATAL_ERROR("FIXME"); } @@ -294,7 +229,8 @@ class Map /*: public NodeContainer*/ // For debug printing. Prints "Map: ", "ServerMap: " or "ClientMap: " virtual void PrintInfo(std::ostream &out); - void transformLiquids(std::map & modified_blocks); + void transformLiquids(std::map & modified_blocks, + ServerEnvironment *env); /* Node metadata @@ -330,23 +266,16 @@ class Map /*: public NodeContainer*/ void setNodeTimer(const NodeTimer &t); void removeNodeTimer(v3s16 p); - /* - Misc. - */ - std::map *getSectorsPtr(){return &m_sectors;} - /* Variables */ void transforming_liquid_add(v3s16 p); - s32 transforming_liquid_size(); + bool isBlockOccluded(MapBlock *block, v3s16 cam_pos_nodes); protected: friend class LuaVoxelManip; - std::ostream &m_dout; // A bit deprecated, could be removed - IGameDef *m_gamedef; std::set m_event_receivers; @@ -354,19 +283,26 @@ class Map /*: public NodeContainer*/ std::map m_sectors; // Be sure to set this to NULL when the cached sector is deleted - MapSector *m_sector_cache; + MapSector *m_sector_cache = nullptr; v2s16 m_sector_cache_p; // 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; + // This stores the properties of the nodes on the map. + const NodeDefManager *m_nodedef; - DISABLE_CLASS_COPY(Map); + bool determineAdditionalOcclusionCheck(const v3s16 &pos_camera, + const core::aabbox3d &block_bounds, v3s16 &check); + bool isOccluded(const v3s16 &pos_camera, const v3s16 &pos_target, + float step, float stepfac, float start_offset, float end_offset, + u32 needed_count); + +private: + f32 m_transforming_liquid_loop_count_multiplier = 1.0f; + u32 m_unprocessed_count = 0; + u64 m_inc_trending_up_start_time = 0; // milliseconds + bool m_queue_size_timer_started = false; }; /* @@ -381,7 +317,7 @@ class ServerMap : public Map /* savedir: directory to which map data should be saved */ - ServerMap(std::string savedir, IGameDef *gamedef, EmergeManager *emerge); + ServerMap(const std::string &savedir, IGameDef *gamedef, EmergeManager *emerge, MetricsBackend *mb); ~ServerMap(); s32 mapType() const @@ -395,11 +331,12 @@ class ServerMap : public Map - Check disk (doesn't load blocks) - Create blank one */ - ServerMapSector *createSector(v2s16 p); + MapSector *createSector(v2s16 p); /* Blocks are generated by using these and makeBlock(). */ + bool blockpos_over_mapgen_limit(v3s16 p); bool initBlockMake(v3s16 blockpos, BlockMakeData *data); void finishBlockMake(BlockMakeData *data, std::map *changed_blocks); @@ -428,33 +365,10 @@ class ServerMap : public Map */ 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); - - /* - Misc. helper functions for fiddling with directory and file - names when saving - */ - void createDirs(std::string path); - // returns something like "map/sectors/xxxxxxxx" - std::string getSectorDir(v2s16 pos, int layout = 2); - // dirname: final directory name - v2s16 getSectorPos(std::string dirname); - v3s16 getBlockPos(std::string sectordir, std::string blockfile); - static std::string getBlockFilename(v3s16 p); - /* 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(); - - // Returns true if the database file does not exist - bool loadFromFolders(); + static MapDatabase *createDatabase(const std::string &name, const std::string &savedir, Settings &conf); // Call these before and after saving of blocks void beginSave(); @@ -466,29 +380,8 @@ class ServerMap : public Map MapgenParams *getMapgenParams(); - /*void saveChunkMeta(); - void loadChunkMeta();*/ - - // The sector mutex should be locked when calling most of these - - // This only saves sector-specific data such as the heightmap - // (no MapBlocks) - // DEPRECATED? Sectors have no metadata anymore. - void saveSectorMeta(ServerMapSector *sector); - MapSector* loadSectorMeta(std::string dirname, bool save_after_load); - bool loadSectorMeta(v2s16 p2d); - - // Full load of a sector including all blocks. - // returns true on success, false on failure. - bool loadSectorFull(v2s16 p2d); - // If sector is not found in memory, try to load it from disk. - // Returns true if sector now resides in memory - //bool deFlushSector(v2s16 p2d); - 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); + static bool saveBlock(MapBlock *block, MapDatabase *db, int compression_level = -1); MapBlock* loadBlock(v3s16 p); // Database version void loadBlock(std::string *blob, v3s16 p3d, MapSector *sector, bool save_after_load=false); @@ -503,7 +396,16 @@ class ServerMap : public Map bool isSavingEnabled(){ return m_map_saving_enabled; } u64 getSeed(); - s16 getWaterLevel(); + + /*! + * Fixes lighting in one map block. + * May modify other blocks as well, as light can spread + * out of the specified block. + * Returns false if the block is not generated (so nothing + * changed), true otherwise. + */ + bool repairBlockLight(v3s16 blockpos, + std::map *modified_blocks); MapSettingsManager settings_mgr; @@ -514,20 +416,19 @@ class ServerMap : public Map std::string m_savedir; bool m_map_saving_enabled; -#if 0 - // Chunk size in MapSectors - // If 0, chunks are disabled. - s16 m_chunksize; - // Chunks - core::map m_chunks; -#endif + int m_map_compression_level; + + std::set m_chunks_in_progress; /* Metadata is re-written on disk only if this is true. This is reset to false when written on disk. */ - bool m_map_metadata_changed; - Database *dbase; + bool m_map_metadata_changed = true; + MapDatabase *dbase = nullptr; + MapDatabase *dbase_ro = nullptr; + + MetricCounterPtr m_save_time_counter; }; @@ -538,7 +439,7 @@ class MMVManip : public VoxelManipulator { public: MMVManip(Map *map); - virtual ~MMVManip(); + virtual ~MMVManip() = default; virtual void clear() { @@ -546,9 +447,6 @@ class MMVManip : public VoxelManipulator m_loaded_blocks.clear(); } - void setMap(Map *map) - {m_map = map;} - void initialEmerge(v3s16 blockpos_min, v3s16 blockpos_max, bool load_if_inexistent = true); @@ -556,10 +454,9 @@ class MMVManip : public VoxelManipulator void blitBackAll(std::map * modified_blocks, bool overwrite_generated = true); - bool m_is_dirty; + bool m_is_dirty = false; protected: - bool m_create_area; Map *m_map; /* key = blockpos @@ -567,5 +464,3 @@ class MMVManip : public VoxelManipulator */ std::map m_loaded_blocks; }; - -#endif