51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-#ifndef MAP_HEADER
-#define MAP_HEADER
+#pragma once
#include <iostream>
#include <sstream>
#include "modifiedstate.h"
#include "util/container.h"
#include "nodetimer.h"
+#include "map_settings_manager.h"
+#include "debug.h"
-class Database;
+class Settings;
+class MapDatabase;
class ClientMap;
class MapSector;
class ServerMapSector;
class MapBlock;
class NodeMetadata;
class IGameDef;
-class IRollbackReportSink;
+class IRollbackManager;
class EmergeManager;
class ServerEnvironment;
struct BlockMakeData;
-struct MapgenParams;
-
/*
MapEditEvent
struct MapEditEvent
{
- MapEditEventType type;
+ MapEditEventType type = MEET_OTHER;
v3s16 p;
- MapNode n;
+ MapNode n = CONTENT_AIR;
std::set<v3s16> modified_blocks;
- u16 already_known_by_peer;
+ u16 already_known_by_peer = 0;
- MapEditEvent():
- type(MEET_OTHER),
- already_known_by_peer(0)
- {
- }
+ MapEditEvent() = default;
MapEditEvent * clone()
{
case MEET_OTHER:
{
VoxelArea a;
- for(std::set<v3s16>::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);
Map(std::ostream &dout, IGameDef *gamedef);
virtual ~Map();
-
- /*virtual u16 nodeContainerId() const
- {
- return NODECONTAINER_ID_MAP;
- }*/
+ DISABLE_CLASS_COPY(Map);
virtual s32 mapType() const
{
their differing fetch methods.
*/
virtual MapSector * emergeSector(v2s16 p){ return NULL; }
- virtual MapSector * emergeSector(v2s16 p,
- std::map<v3s16, MapBlock*> &changed_blocks){ return NULL; }
// Returns InvalidPositionException if not found
MapBlock * getBlockNoCreate(v3s16 p);
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); }
+ inline INodeDefManager * getNodeDefManager() { return m_nodedef; }
+
// Returns InvalidPositionException if not found
bool isNodeUnderground(v3s16 p);
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);
-
- void unspreadLight(enum LightBank bank,
- std::map<v3s16, u8> & from_nodes,
- std::set<v3s16> & light_sources,
- std::map<v3s16, MapBlock*> & modified_blocks);
-
- void unLightNeighbors(enum LightBank bank,
- v3s16 pos, u8 lightwas,
- std::set<v3s16> & light_sources,
- std::map<v3s16, MapBlock*> & modified_blocks);
-
- void spreadLight(enum LightBank bank,
- std::set<v3s16> & from_nodes,
- std::map<v3s16, MapBlock*> & modified_blocks);
-
- void lightNeighbors(enum LightBank bank,
- v3s16 pos,
- std::map<v3s16, MapBlock*> & modified_blocks);
-
- v3s16 getBrightestNeighbour(enum LightBank bank, v3s16 p);
-
- s16 propagateSunlight(v3s16 start,
- std::map<v3s16, MapBlock*> & modified_blocks);
-
- void updateLighting(enum LightBank bank,
- std::map<v3s16, MapBlock*> & a_blocks,
- std::map<v3s16, MapBlock*> & modified_blocks);
-
- void updateLighting(std::map<v3s16, MapBlock*> & a_blocks,
- std::map<v3s16, MapBlock*> & modified_blocks);
+ // 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);
/*
These handle lighting but not faces.
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<s16> 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){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<v3s16> *unloaded_blocks=NULL);
+ void timerUpdate(float dtime, float unload_timeout, u32 max_loaded_blocks,
+ std::vector<v3s16> *unloaded_blocks=NULL);
/*
Unloads all blocks with a zero refCount().
Saves modified blocks before unloading on MAPTYPE_SERVER.
*/
- void unloadUnreferencedBlocks(std::list<v3s16> *unloaded_blocks=NULL);
+ void unloadUnreferencedBlocks(std::vector<v3s16> *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<v2s16> &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<v3s16> *deleted_blocks=NULL);
-#endif
+ void deleteSectors(std::vector<v2s16> &list);
// For debug printing. Prints "Map: ", "ServerMap: " or "ClientMap: "
virtual void PrintInfo(std::ostream &out);
- void transformLiquids(std::map<v3s16, MapBlock*> & modified_blocks);
+ void transformLiquids(std::map<v3s16, MapBlock*> & modified_blocks,
+ ServerEnvironment *env);
/*
Node metadata
These are basically coordinate wrappers to MapBlock
*/
- NodeMetadata* getNodeMetadata(v3s16 p);
+ std::vector<v3s16> findNodesWithMetadata(v3s16 p1, v3s16 p2);
+ NodeMetadata *getNodeMetadata(v3s16 p);
/**
* Sets metadata for a node.
*/
NodeTimer getNodeTimer(v3s16 p);
- void setNodeTimer(v3s16 p, NodeTimer t);
+ void setNodeTimer(const NodeTimer &t);
void removeNodeTimer(v3s16 p);
/*
void transforming_liquid_add(v3s16 p);
s32 transforming_liquid_size();
+ bool isBlockOccluded(MapBlock *block, v3s16 cam_pos_nodes);
protected:
friend class LuaVoxelManip;
std::map<v2s16, MapSector*> 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<v3s16> m_transforming_liquid;
+
+ // This stores the properties of the nodes on the map.
+ INodeDefManager *m_nodedef;
+
+ bool isOccluded(v3s16 p0, v3s16 p1, float step, float stepfac,
+ float start_off, float end_off, 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;
};
/*
/*
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);
~ServerMap();
s32 mapType() const
- Check disk (doesn't load blocks)
- Create blank one
*/
- ServerMapSector * createSector(v2s16 p);
+ MapSector *createSector(v2s16 p);
+
+ bool saoPositionOverLimit(const v3f &p);
/*
Blocks are generated by using these and makeBlock().
*/
- bool initBlockMake(BlockMakeData *data, v3s16 blockpos);
+ bool blockpos_over_mapgen_limit(v3s16 p);
+ bool initBlockMake(v3s16 blockpos, BlockMakeData *data);
void finishBlockMake(BlockMakeData *data,
- std::map<v3s16, MapBlock*> &changed_blocks);
+ std::map<v3s16, MapBlock*> *changed_blocks);
/*
Get a block from somewhere.
- Memory
- Create blank
*/
- MapBlock * createBlock(v3s16 p);
+ MapBlock *createBlock(v3s16 p);
/*
Forcefully get a block from somewhere.
- 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.
*/
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);
// 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);
+ v2s16 getSectorPos(const std::string &dirname);
+ v3s16 getBlockPos(const std::string §ordir, const std::string &blockfile);
static std::string getBlockFilename(v3s16 p);
/*
Database functions
*/
- // Verify we can read/write to the database
- void verifyDatabase();
+ static MapDatabase *createDatabase(const std::string &name, const std::string &savedir, Settings &conf);
// Returns true if the database file does not exist
bool loadFromFolders();
void endSave();
void save(ModifiedState save_level);
- void listAllLoadableBlocks(std::list<v3s16> &dst);
- void listAllLoadedBlocks(std::list<v3s16> &dst);
- // Saves map seed and possibly other stuff
- void saveMapMeta();
- void loadMapMeta();
-
- /*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);
-
- void saveBlock(MapBlock *block);
+ void listAllLoadableBlocks(std::vector<v3s16> &dst);
+ void listAllLoadedBlocks(std::vector<v3s16> &dst);
+
+ MapgenParams *getMapgenParams();
+
+ bool saveBlock(MapBlock *block);
+ static bool saveBlock(MapBlock *block, MapDatabase *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);
+ void loadBlock(const std::string §ordir, const 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);
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<v3s16, MapBlock *> *modified_blocks);
+
+ MapSettingsManager settings_mgr;
+
private:
// Emerge manager
EmergeManager *m_emerge;
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;
};
#define VMANIP_BLOCK_DATA_INEXIST 1
#define VMANIP_BLOCK_CONTAINS_CIGNORE 2
-class ManualMapVoxelManipulator : public VoxelManipulator
+class MMVManip : public VoxelManipulator
{
public:
- ManualMapVoxelManipulator(Map *map);
- virtual ~ManualMapVoxelManipulator();
+ MMVManip(Map *map);
+ virtual ~MMVManip() = default;
virtual void clear()
{
m_loaded_blocks.clear();
}
- void setMap(Map *map)
- {m_map = map;}
-
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<v3s16, MapBlock*> * modified_blocks);
+ void blitBackAll(std::map<v3s16, MapBlock*> * modified_blocks,
+ bool overwrite_generated = true);
+
+ bool m_is_dirty = false;
protected:
- bool m_create_area;
Map *m_map;
/*
key = blockpos
*/
std::map<v3s16, u8> m_loaded_blocks;
};
-
-#endif
-
projects / minetest.git / blobdiff