X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;f=src%2Fmapblock.h;h=6b5015cabdb5f1177e9679a632fb658c51180112;hb=f780bae05cc2fdd23a6d7326c770783da8d94ea3;hp=8a7dfc11db9dc2a6bef0907e015cc67adf56c725;hpb=f8ad01ab7c4cf012781bd4caa821544e676c9267;p=dragonfireclient.git diff --git a/src/mapblock.h b/src/mapblock.h index 8a7dfc11d..6b5015cab 100644 --- a/src/mapblock.h +++ b/src/mapblock.h @@ -17,11 +17,9 @@ with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifndef MAPBLOCK_HEADER -#define MAPBLOCK_HEADER +#pragma once #include -#include "debug.h" #include "irr_v3d.h" #include "mapnode.h" #include "exceptions.h" @@ -32,6 +30,7 @@ with this program; if not, write to the Free Software Foundation, Inc., #include "modifiedstate.h" #include "util/numeric.h" // getContainerPos #include "settings.h" +#include "mapgen/mapgen.h" class Map; class NodeMetadataList; @@ -41,63 +40,6 @@ class VoxelManipulator; #define BLOCK_TIMESTAMP_UNDEFINED 0xffffffff -/*// Named by looking towards z+ -enum{ - FACE_BACK=0, - FACE_TOP, - FACE_RIGHT, - FACE_FRONT, - FACE_BOTTOM, - FACE_LEFT -};*/ - -// NOTE: If this is enabled, set MapBlock to be initialized with -// CONTENT_IGNORE. -/*enum BlockGenerationStatus -{ - // Completely non-generated (filled with CONTENT_IGNORE). - BLOCKGEN_UNTOUCHED=0, - // Trees or similar might have been blitted from other blocks to here. - // Otherwise, the block contains CONTENT_IGNORE - BLOCKGEN_FROM_NEIGHBORS=2, - // Has been generated, but some neighbors might put some stuff in here - // when they are generated. - // Does not contain any CONTENT_IGNORE - BLOCKGEN_SELF_GENERATED=4, - // The block and all its neighbors have been generated - BLOCKGEN_FULLY_GENERATED=6 -};*/ - -#if 0 -enum -{ - NODECONTAINER_ID_MAPBLOCK, - NODECONTAINER_ID_MAPSECTOR, - NODECONTAINER_ID_MAP, - NODECONTAINER_ID_MAPBLOCKCACHE, - NODECONTAINER_ID_VOXELMANIPULATOR, -}; - -class NodeContainer -{ -public: - virtual bool isValidPosition(v3s16 p) = 0; - virtual MapNode getNode(v3s16 p) = 0; - virtual void setNode(v3s16 p, MapNode & n) = 0; - virtual u16 nodeContainerId() const = 0; - - MapNode getNodeNoEx(v3s16 p) - { - try{ - return getNode(p); - } - catch(InvalidPositionException &e){ - return MapNode(CONTENT_IGNORE); - } - } -}; -#endif - //// //// MapBlock modified reason flags //// @@ -121,13 +63,14 @@ class NodeContainer #define MOD_REASON_STATIC_DATA_REMOVED (1 << 16) #define MOD_REASON_STATIC_DATA_CHANGED (1 << 17) #define MOD_REASON_EXPIRE_DAYNIGHTDIFF (1 << 18) -#define MOD_REASON_UNKNOWN (1 << 19) +#define MOD_REASON_VMANIP (1 << 19) +#define MOD_REASON_UNKNOWN (1 << 20) //// //// MapBlock itself //// -class MapBlock /*: public NodeContainer*/ +class MapBlock { public: MapBlock(Map *parent, v3s16 pos, IGameDef *gamedef, bool dummy=false); @@ -153,6 +96,11 @@ class MapBlock /*: public NodeContainer*/ raiseModified(MOD_STATE_WRITE_NEEDED, MOD_REASON_REALLOCATE); } + MapNode* getData() + { + return data; + } + //// //// Modification tracking methods //// @@ -166,6 +114,8 @@ class MapBlock /*: public NodeContainer*/ } else if (mod == m_modified) { m_modified_reason |= reason; } + if (mod == MOD_STATE_WRITE_NEEDED) + contents_cached = false; } inline u32 getModified() @@ -192,7 +142,7 @@ class MapBlock /*: public NodeContainer*/ inline bool isDummy() { - return (data == NULL); + return !data; } inline void unDummify() @@ -292,7 +242,7 @@ class MapBlock /*: public NodeContainer*/ inline bool isValidPosition(s16 x, s16 y, s16 z) { - return data != NULL + return data && x >= 0 && x < MAP_BLOCKSIZE && y >= 0 && y < MAP_BLOCKSIZE && z >= 0 && z < MAP_BLOCKSIZE; @@ -308,7 +258,7 @@ class MapBlock /*: public NodeContainer*/ *valid_position = isValidPosition(x, y, z); if (!*valid_position) - return MapNode(CONTENT_IGNORE); + return {CONTENT_IGNORE}; return data[z * zstride + y * ystride + x]; } @@ -344,9 +294,9 @@ class MapBlock /*: public NodeContainer*/ inline MapNode getNodeNoCheck(s16 x, s16 y, s16 z, bool *valid_position) { - *valid_position = data != NULL; - if (!valid_position) - return MapNode(CONTENT_IGNORE); + *valid_position = data != nullptr; + if (!*valid_position) + return {CONTENT_IGNORE}; return data[z * zstride + y * ystride + x]; } @@ -374,7 +324,7 @@ class MapBlock /*: public NodeContainer*/ inline void setNodeNoCheck(s16 x, s16 y, s16 z, MapNode & n) { - if (data == NULL) + if (!data) throw InvalidPositionException(); data[z * zstride + y * ystride + x] = n; @@ -400,10 +350,6 @@ class MapBlock /*: public NodeContainer*/ setNode(x0 + x, y0 + y, z0 + z, node); } - // See comments in mapblock.cpp - bool propagateSunlight(std::set &light_sources, - bool remove_light=false, bool *black_air_left=NULL); - // Copies data to VoxelManipulator to getPosRelative() void copyTo(VoxelManipulator &dst); @@ -509,12 +455,12 @@ class MapBlock /*: public NodeContainer*/ //// Node Timers //// - inline NodeTimer getNodeTimer(v3s16 p) + inline NodeTimer getNodeTimer(const v3s16 &p) { return m_node_timers.get(p); } - inline void removeNodeTimer(v3s16 p) + inline void removeNodeTimer(const v3s16 &p) { m_node_timers.remove(p); } @@ -573,7 +519,7 @@ class MapBlock /*: public NodeContainer*/ */ #ifndef SERVER // Only on client - MapBlockMesh *mesh; + MapBlockMesh *mesh = nullptr; #endif NodeMetadataList m_node_metadata; @@ -585,6 +531,14 @@ class MapBlock /*: public NodeContainer*/ static const u32 nodecount = MAP_BLOCKSIZE * MAP_BLOCKSIZE * MAP_BLOCKSIZE; + //// ABM optimizations //// + // Cache of content types + std::unordered_set contents; + // True if content types are cached + bool contents_cached = false; + // True if we never want to cache content types for this block + bool do_not_cache_contents = false; + private: /* Private member variables @@ -609,15 +563,15 @@ class MapBlock /*: public NodeContainer*/ If NULL, block is a dummy block. Dummy blocks are used for caching not-found-on-disk blocks. */ - MapNode *data; + MapNode *data = nullptr; /* - On the server, this is used for telling whether the block has been modified from the one on disk. - On the client, this is used for nothing. */ - u32 m_modified; - u32 m_modified_reason; + u32 m_modified = MOD_STATE_WRITE_NEEDED; + u32 m_modified_reason = MOD_REASON_INITIAL; /* When propagating sunlight and the above block doesn't exist, @@ -627,116 +581,83 @@ class MapBlock /*: public NodeContainer*/ undeground with nothing visible above the ground except caves. */ - bool is_underground; + bool is_underground = false; /*! * Each bit indicates if light spreading was finished * in a direction. (Because the neighbor could also be unloaded.) - * Bits: day X+, day Y+, day Z+, day Z-, day Y-, day X-, - * night X+, night Y+, night Z+, night Z-, night Y-, night X-, - * nothing, nothing, nothing, nothing. + * Bits (most significant first): + * nothing, nothing, nothing, nothing, + * night X-, night Y-, night Z-, night Z+, night Y+, night X+, + * day X-, day Y-, day Z-, day Z+, day Y+, day X+. */ - u16 m_lighting_complete; + u16 m_lighting_complete = 0xFFFF; // Whether day and night lighting differs - bool m_day_night_differs; - bool m_day_night_differs_expired; + bool m_day_night_differs = false; + bool m_day_night_differs_expired = true; - bool m_generated; + bool m_generated = false; /* When block is removed from active blocks, this is set to gametime. Value BLOCK_TIMESTAMP_UNDEFINED=0xffffffff means there is no timestamp. */ - u32 m_timestamp; + u32 m_timestamp = BLOCK_TIMESTAMP_UNDEFINED; // The on-disk (or to-be on-disk) timestamp value - u32 m_disk_timestamp; + u32 m_disk_timestamp = BLOCK_TIMESTAMP_UNDEFINED; /* When the block is accessed, this is set to 0. Map will unload the block when this reaches a timeout. */ - float m_usage_timer; + float m_usage_timer = 0; /* Reference count; currently used for determining if this block is in the list of blocks to be drawn. */ - int m_refcount; + int m_refcount = 0; }; typedef std::vector MapBlockVect; inline bool objectpos_over_limit(v3f p) { - // MAP_BLOCKSIZE must be subtracted to avoid an object being spawned just - // within the map generation limit but in a block and sector that extend - // beyond the map generation limit. - // This avoids crashes caused by sector over limit in createSector(). - const float object_limit = (MYMIN(MAX_MAP_GENERATION_LIMIT, - g_settings->getU16("map_generation_limit")) - MAP_BLOCKSIZE) * BS; - return (p.X < -object_limit - || p.X > object_limit - || p.Y < -object_limit - || p.Y > object_limit - || p.Z < -object_limit - || p.Z > object_limit); + const float max_limit_bs = MAX_MAP_GENERATION_LIMIT * BS; + return p.X < -max_limit_bs || + p.X > max_limit_bs || + p.Y < -max_limit_bs || + p.Y > max_limit_bs || + p.Z < -max_limit_bs || + p.Z > max_limit_bs; } -/* - We are checking for any node of the mapblock being beyond the limit. - - At the negative limit we are checking for - block minimum nodepos < -mapgenlimit. - At the positive limit we are checking for - block maximum nodepos > mapgenlimit. - - Block minimum nodepos = blockpos * mapblocksize. - Block maximum nodepos = (blockpos + 1) * mapblocksize - 1. -*/ -inline bool blockpos_over_limit(v3s16 p) +inline bool blockpos_over_max_limit(v3s16 p) { - const u16 map_gen_limit = MYMIN(MAX_MAP_GENERATION_LIMIT, - g_settings->getU16("map_generation_limit")); - return (p.X * MAP_BLOCKSIZE < -map_gen_limit - || (p.X + 1) * MAP_BLOCKSIZE - 1 > map_gen_limit - || p.Y * MAP_BLOCKSIZE < -map_gen_limit - || (p.Y + 1) * MAP_BLOCKSIZE - 1 > map_gen_limit - || p.Z * MAP_BLOCKSIZE < -map_gen_limit - || (p.Z + 1) * MAP_BLOCKSIZE - 1 > map_gen_limit); + const s16 max_limit_bp = MAX_MAP_GENERATION_LIMIT / MAP_BLOCKSIZE; + return p.X < -max_limit_bp || + p.X > max_limit_bp || + p.Y < -max_limit_bp || + p.Y > max_limit_bp || + p.Z < -max_limit_bp || + p.Z > max_limit_bp; } /* Returns the position of the block where the node is located */ -inline v3s16 getNodeBlockPos(v3s16 p) -{ - return getContainerPos(p, MAP_BLOCKSIZE); -} - -inline v2s16 getNodeSectorPos(v2s16 p) +inline v3s16 getNodeBlockPos(const v3s16 &p) { return getContainerPos(p, MAP_BLOCKSIZE); } -inline s16 getNodeBlockY(s16 y) -{ - return getContainerPos(y, MAP_BLOCKSIZE); -} - inline void getNodeBlockPosWithOffset(const v3s16 &p, v3s16 &block, v3s16 &offset) { getContainerPosWithOffset(p, MAP_BLOCKSIZE, block, offset); } -inline void getNodeSectorPosWithOffset(const v2s16 &p, v2s16 &block, v2s16 &offset) -{ - getContainerPosWithOffset(p, MAP_BLOCKSIZE, block, offset); -} - /* Get a quick string to describe what a block actually contains */ std::string analyze_block(MapBlock *block); - -#endif