X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Fmapsector.h;h=44f45d8f03ec98fd971307ef44d2510f2392955a;hb=91cfbe2891a3fbec2aac019ccfba74b667d94fc4;hp=de93806b5a88703b91c7885eb2b6e8c67f211db0;hpb=be851871cd43316d12fd9a5f2cc6dec98a1c9ce0;p=oweals%2Fminetest.git diff --git a/src/mapsector.h b/src/mapsector.h index de93806b5..44f45d8f0 100644 --- a/src/mapsector.h +++ b/src/mapsector.h @@ -26,38 +26,26 @@ with this program; if not, write to the Free Software Foundation, Inc., #include #include "common_irrlicht.h" -#include "mapblock.h" -#include "heightmap.h" #include "exceptions.h" +#include + +class MapBlock; +class Map; /* This is an Y-wise stack of MapBlocks. */ -#define SECTOR_OBJECT_TEST 0 -#define SECTOR_OBJECT_TREE_1 1 -#define SECTOR_OBJECT_BUSH_1 2 -#define SECTOR_OBJECT_RAVINE 3 - -//#define MAPSECTOR_FIXEDHEIGHTMAPS_MAXCOUNT 4 -#define MAPSECTOR_FIXEDHEIGHTMAPS_MAXCOUNT \ - (SECTOR_HEIGHTMAP_SPLIT * SECTOR_HEIGHTMAP_SPLIT) - #define MAPSECTOR_SERVER 0 #define MAPSECTOR_CLIENT 1 -class MapSector: public NodeContainer, public Heightmappish +class MapSector { public: - MapSector(NodeContainer *parent, v2s16 pos); + MapSector(Map *parent, v2s16 pos); virtual ~MapSector(); - virtual u16 nodeContainerId() const - { - return NODECONTAINER_ID_MAPSECTOR; - } - virtual u32 getId() const = 0; void deleteBlocks(); @@ -68,173 +56,32 @@ public: } MapBlock * getBlockNoCreateNoEx(s16 y); - MapBlock * getBlockNoCreate(s16 y); MapBlock * createBlankBlockNoInsert(s16 y); MapBlock * createBlankBlock(s16 y); - //MapBlock * getBlock(s16 y, bool generate=true); void insertBlock(MapBlock *block); - // This is used to remove a dummy from the sector while generating it. - // Block is only removed from internal container, not deleted. - void removeBlock(MapBlock *block); + void deleteBlock(MapBlock *block); - /* - This might not be a thread-safe depending on the day. - See the implementation. - */ void getBlocks(core::list &dest); - /* - If all nodes in area can be accessed, returns true and - adds all blocks in area to blocks. - - If all nodes in area cannot be accessed, returns false. - - The implementation of this is quite slow - - if blocks==NULL; it is not accessed at all. - */ - bool isValidArea(v3s16 p_min_nodes, v3s16 p_max_nodes, - core::map *blocks) - { - core::map bs; - - v3s16 p_min = getNodeBlockPos(p_min_nodes); - v3s16 p_max = getNodeBlockPos(p_max_nodes); - if(p_min.X != 0 || p_min.Z != 0 - || p_max.X != 0 || p_max.Z != 0) - return false; - v3s16 y; - for(s16 y=p_min.Y; y<=p_max.Y; y++) - { - try{ - MapBlock *block = getBlockNoCreate(y); - if(block->isDummy()) - return false; - if(blocks!=NULL) - bs[y] = block; - } - catch(InvalidPositionException &e) - { - return false; - } - } - - if(blocks!=NULL) - { - for(core::map::Iterator i=bs.getIterator(); - i.atEnd()==false; i++) - { - MapBlock *block = i.getNode()->getValue(); - s16 y = i.getNode()->getKey(); - blocks->insert(y, block); - } - } - return true; - } - - void getBlocksInArea(v3s16 p_min_nodes, v3s16 p_max_nodes, - core::map &blocks) - { - v3s16 p_min = getNodeBlockPos(p_min_nodes); - v3s16 p_max = getNodeBlockPos(p_max_nodes); - v3s16 y; - for(s16 y=p_min.Y; y<=p_max.Y; y++) - { - try{ - MapBlock *block = getBlockNoCreate(y); - blocks.insert(block->getPos(), block); - } - catch(InvalidPositionException &e) - { - } - } - } - - // virtual from NodeContainer - bool isValidPosition(v3s16 p) - { - v3s16 blockpos = getNodeBlockPos(p); - - if(blockpos.X != 0 || blockpos.Z != 0) - return false; - - MapBlock *blockref; - try{ - blockref = getBlockNoCreate(blockpos.Y); - } - catch(InvalidPositionException &e) - { - return false; - } - - return true; - } - - // virtual from NodeContainer - MapNode getNode(v3s16 p) - { - v3s16 blockpos = getNodeBlockPos(p); - if(blockpos.X != 0 || blockpos.Z != 0) - throw InvalidPositionException - ("MapSector only allows Y"); - - MapBlock * blockref = getBlockNoCreate(blockpos.Y); - v3s16 relpos = p - blockpos*MAP_BLOCKSIZE; - - return blockref->getNode(relpos); - } - // virtual from NodeContainer - void setNode(v3s16 p, MapNode & n) - { - v3s16 blockpos = getNodeBlockPos(p); - if(blockpos.X != 0 || blockpos.Z != 0) - throw InvalidPositionException - ("MapSector only allows Y"); - - MapBlock * blockref = getBlockNoCreate(blockpos.Y); - v3s16 relpos = p - blockpos*MAP_BLOCKSIZE; - blockref->setNode(relpos, n); - } - - virtual f32 getGroundHeight(v2s16 p, bool generate=false) - { - return GROUNDHEIGHT_NOTFOUND_SETVALUE; - } - virtual void setGroundHeight(v2s16 p, f32 y, bool generate=false) - { - } - - // When true, sector metadata is changed from the one on disk - // (sector metadata = all but blocks) - // Basically, this should be changed to true in every setter method + // Always false at the moment, because sector contains no metadata. bool differs_from_disk; - // Counts seconds from last usage. - // Sector can be deleted from memory after some time of inactivity. - // NOTE: It has to be made very sure no other thread is accessing - // the sector and it doesn't remain in any cache when - // deleting it. - float usage_timer; - protected: // The pile of MapBlocks core::map m_blocks; - //JMutex m_blocks_mutex; // For public access functions - NodeContainer *m_parent; + Map *m_parent; // Position on parent (in MapBlock widths) v2s16 m_pos; - + + // Last-used block is cached here for quicker access. // Be sure to set this to NULL when the cached block is deleted MapBlock *m_block_cache; s16 m_block_cache_y; - // This is used for protecting m_blocks - JMutex m_mutex; - /* Private methods */ @@ -245,7 +92,7 @@ protected: class ServerMapSector : public MapSector { public: - ServerMapSector(NodeContainer *parent, v2s16 pos, u16 hm_split); + ServerMapSector(Map *parent, v2s16 pos); ~ServerMapSector(); u32 getId() const @@ -253,70 +100,28 @@ public: return MAPSECTOR_SERVER; } - void setHeightmap(v2s16 hm_p, FixedHeightmap *hm); - FixedHeightmap * getHeightmap(v2s16 hm_p); - - void printHeightmaps() - { - for(s16 y=0; yprint(); - } - } - - void setObjects(core::map *objects) - { - m_objects = objects; - differs_from_disk = true; - } - - core::map * getObjects() - { - differs_from_disk = true; - return m_objects; - } - - f32 getGroundHeight(v2s16 p, bool generate=false); - void setGroundHeight(v2s16 p, f32 y, bool generate=false); - /* These functions handle metadata. They do not handle blocks. */ + void serialize(std::ostream &os, u8 version); static ServerMapSector* deSerialize( std::istream &is, - NodeContainer *parent, + Map *parent, v2s16 p2d, - Heightmap *master_hm, core::map & sectors ); private: - // Heightmap(s) for the sector - FixedHeightmap *m_heightmaps[MAPSECTOR_FIXEDHEIGHTMAPS_MAXCOUNT]; - // Sector is split in m_hm_split^2 heightmaps. - // Value of 0 means there is no heightmap. - u16 m_hm_split; - // These are removed when they are drawn to blocks. - // - Each is drawn when generating blocks; When the last one of - // the needed blocks is being generated. - core::map *m_objects; }; #ifndef SERVER class ClientMapSector : public MapSector { public: - ClientMapSector(NodeContainer *parent, v2s16 pos); + ClientMapSector(Map *parent, v2s16 pos); ~ClientMapSector(); u32 getId() const @@ -324,16 +129,7 @@ public: return MAPSECTOR_CLIENT; } - void deSerialize(std::istream &is); - - s16 getCorner(u16 i) - { - return m_corners[i]; - } - private: - // The ground height of the corners is stored in here - s16 m_corners[4]; }; #endif