X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;f=src%2Fmapblock.h;h=b817be5961cb188dcfa562359251ad99e29585ae;hb=d82d18bfb1a51e0f2f0a89999474e98890addf7e;hp=693bc51905f499af37a938efe80926b34f9bed4d;hpb=1c90f9fc2eba43be71f9d49dad75c5d0514d4e50;p=minetest.git diff --git a/src/mapblock.h b/src/mapblock.h index 693bc5190..b817be596 100644 --- a/src/mapblock.h +++ b/src/mapblock.h @@ -1,269 +1,220 @@ /* -Minetest-c55 -Copyright (C) 2010 celeron55, Perttu Ahola +Minetest +Copyright (C) 2013 celeron55, Perttu Ahola This program is free software; you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation; either version 2 of the License, or +it under the terms of the GNU Lesser General Public License as published by +the Free Software Foundation; either version 2.1 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. +GNU Lesser General Public License for more details. -You should have received a copy of the GNU General Public License along +You should have received a copy of the GNU Lesser General Public License along 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 -#include -#include "debug.h" -#include "common_irrlicht.h" +#include +#include "irr_v3d.h" #include "mapnode.h" #include "exceptions.h" -#include "serialization.h" #include "constants.h" -#include "mapblockobject.h" -#include "voxel.h" -#include "nodemetadata.h" #include "staticobject.h" -#include "mapblock_nodemod.h" -#ifndef SERVER - #include "mapblock_mesh.h" -#endif - +#include "nodemetadata.h" +#include "nodetimer.h" +#include "modifiedstate.h" +#include "util/numeric.h" // getContainerPos +#include "settings.h" +#include "mapgen/mapgen.h" + +class Map; +class NodeMetadataList; +class IGameDef; +class MapBlockMesh; +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 -};*/ - -enum ModifiedState -{ - // Has not been modified. - MOD_STATE_CLEAN = 0, - MOD_RESERVED1 = 1, - // Has been modified, and will be saved when being unloaded. - MOD_STATE_WRITE_AT_UNLOAD = 2, - MOD_RESERVED3 = 3, - // Has been modified, and will be saved as soon as possible. - MOD_STATE_WRITE_NEEDED = 4, - MOD_RESERVED5 = 5, -}; - -// 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 -};*/ - -enum -{ - NODECONTAINER_ID_MAPBLOCK, - NODECONTAINER_ID_MAPSECTOR, - NODECONTAINER_ID_MAP, - NODECONTAINER_ID_MAPBLOCKCACHE, - NODECONTAINER_ID_VOXELMANIPULATOR, -}; - -class NodeContainer +//// +//// MapBlock modified reason flags +//// + +#define MOD_REASON_INITIAL (1 << 0) +#define MOD_REASON_REALLOCATE (1 << 1) +#define MOD_REASON_SET_IS_UNDERGROUND (1 << 2) +#define MOD_REASON_SET_LIGHTING_COMPLETE (1 << 3) +#define MOD_REASON_SET_GENERATED (1 << 4) +#define MOD_REASON_SET_NODE (1 << 5) +#define MOD_REASON_SET_NODE_NO_CHECK (1 << 6) +#define MOD_REASON_SET_TIMESTAMP (1 << 7) +#define MOD_REASON_REPORT_META_CHANGE (1 << 8) +#define MOD_REASON_CLEAR_ALL_OBJECTS (1 << 9) +#define MOD_REASON_BLOCK_EXPIRED (1 << 10) +#define MOD_REASON_ADD_ACTIVE_OBJECT_RAW (1 << 11) +#define MOD_REASON_REMOVE_OBJECTS_REMOVE (1 << 12) +#define MOD_REASON_REMOVE_OBJECTS_DEACTIVATE (1 << 13) +#define MOD_REASON_TOO_MANY_OBJECTS (1 << 14) +#define MOD_REASON_STATIC_DATA_ADDED (1 << 15) +#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_VMANIP (1 << 19) +#define MOD_REASON_UNKNOWN (1 << 20) + +//// +//// MapBlock itself +//// + +class MapBlock { 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); - } - } -}; - -/* - MapBlock itself -*/ - -class MapBlock : public NodeContainer -{ -public: - MapBlock(NodeContainer *parent, v3s16 pos, bool dummy=false); + MapBlock(Map *parent, v3s16 pos, IGameDef *gamedef); ~MapBlock(); - - virtual u16 nodeContainerId() const + + /*virtual u16 nodeContainerId() const { return NODECONTAINER_ID_MAPBLOCK; - } - - NodeContainer * getParent() + }*/ + + Map * getParent() { return m_parent; } void reallocate() { - if(data != NULL) - delete[] data; - u32 l = MAP_BLOCKSIZE * MAP_BLOCKSIZE * MAP_BLOCKSIZE; - data = new MapNode[l]; - for(u32 i=0; i m_modified) { + m_modified = mod; + m_modified_reason = reason; + if (m_modified >= MOD_STATE_WRITE_AT_UNLOAD) + m_disk_timestamp = m_timestamp; + } else if (mod == m_modified) { + m_modified_reason |= reason; + } + if (mod == MOD_STATE_WRITE_NEEDED) + contents_cached = false; } - - // m_modified methods - void raiseModified(u32 mod) + + inline u32 getModified() { - m_modified = MYMAX(m_modified, mod); + return m_modified; } - u32 getModified() + + inline u32 getModifiedReason() { - return m_modified; + return m_modified_reason; } - void resetModified() + + std::string getModifiedReasonString(); + + inline void resetModified() { m_modified = MOD_STATE_CLEAN; + m_modified_reason = 0; } - + + //// + //// Flags + //// + // is_underground getter/setter - bool getIsUnderground() + inline bool getIsUnderground() { return is_underground; } - void setIsUnderground(bool a_is_underground) + + inline void setIsUnderground(bool a_is_underground) { is_underground = a_is_underground; - raiseModified(MOD_STATE_WRITE_NEEDED); + raiseModified(MOD_STATE_WRITE_NEEDED, MOD_REASON_SET_IS_UNDERGROUND); } -#ifndef SERVER - void setMeshExpired(bool expired) + inline void setLightingComplete(u16 newflags) { - m_mesh_expired = expired; + if (newflags != m_lighting_complete) { + m_lighting_complete = newflags; + raiseModified(MOD_STATE_WRITE_NEEDED, MOD_REASON_SET_LIGHTING_COMPLETE); + } } - - bool getMeshExpired() + + inline u16 getLightingComplete() { - return m_mesh_expired; + return m_lighting_complete; } -#endif - void setLightingExpired(bool expired) + inline void setLightingComplete(LightBank bank, u8 direction, + bool is_complete) { - m_lighting_expired = expired; - raiseModified(MOD_STATE_WRITE_NEEDED); + assert(direction >= 0 && direction <= 5); + if (bank == LIGHTBANK_NIGHT) { + direction += 6; + } + u16 newflags = m_lighting_complete; + if (is_complete) { + newflags |= 1 << direction; + } else { + newflags &= ~(1 << direction); + } + setLightingComplete(newflags); } - bool getLightingExpired() + + inline bool isLightingComplete(LightBank bank, u8 direction) { - return m_lighting_expired; + assert(direction >= 0 && direction <= 5); + if (bank == LIGHTBANK_NIGHT) { + direction += 6; + } + return (m_lighting_complete & (1 << direction)) != 0; } - bool isGenerated() + inline bool isGenerated() { return m_generated; } - void setGenerated(bool b) - { - raiseModified(MOD_STATE_WRITE_NEEDED); - m_generated = b; - } - bool isValid() + inline void setGenerated(bool b) { - if(m_lighting_expired) - return false; - if(data == NULL) - return false; - return true; + if (b != m_generated) { + raiseModified(MOD_STATE_WRITE_NEEDED, MOD_REASON_SET_GENERATED); + m_generated = b; + } } - /* - Position stuff - */ + //// + //// Position stuff + //// - v3s16 getPos() + inline v3s16 getPos() { return m_pos; } - - v3s16 getPosRelative() + + inline v3s16 getPosRelative() { - return m_pos * MAP_BLOCKSIZE; + return m_pos_relative; } - - core::aabbox3d getBox() + + inline core::aabbox3d getBox() { return core::aabbox3d(getPosRelative(), getPosRelative() @@ -271,355 +222,228 @@ class MapBlock : public NodeContainer - v3s16(1,1,1)); } - /* - Regular MapNode get-setters - */ - - bool isValidPosition(v3s16 p) + //// + //// Regular MapNode get-setters + //// + + inline bool isValidPosition(s16 x, s16 y, s16 z) { - if(data == NULL) - return false; - return (p.X >= 0 && p.X < MAP_BLOCKSIZE - && p.Y >= 0 && p.Y < MAP_BLOCKSIZE - && p.Z >= 0 && p.Z < MAP_BLOCKSIZE); + return x >= 0 && x < MAP_BLOCKSIZE + && y >= 0 && y < MAP_BLOCKSIZE + && z >= 0 && z < MAP_BLOCKSIZE; } - MapNode getNode(s16 x, s16 y, s16 z) + inline bool isValidPosition(v3s16 p) { - if(data == NULL) - throw InvalidPositionException(); - if(x < 0 || x >= MAP_BLOCKSIZE) throw InvalidPositionException(); - if(y < 0 || y >= MAP_BLOCKSIZE) throw InvalidPositionException(); - if(z < 0 || z >= MAP_BLOCKSIZE) throw InvalidPositionException(); - return data[z*MAP_BLOCKSIZE*MAP_BLOCKSIZE + y*MAP_BLOCKSIZE + x]; + return isValidPosition(p.X, p.Y, p.Z); } - - MapNode getNode(v3s16 p) + + inline MapNode getNode(s16 x, s16 y, s16 z, bool *valid_position) { - return getNode(p.X, p.Y, p.Z); + *valid_position = isValidPosition(x, y, z); + + if (!*valid_position) + return {CONTENT_IGNORE}; + + return data[z * zstride + y * ystride + x]; } - - MapNode getNodeNoEx(v3s16 p) + + inline MapNode getNode(v3s16 p, bool *valid_position) { - try{ - return getNode(p.X, p.Y, p.Z); - }catch(InvalidPositionException &e){ - return MapNode(CONTENT_IGNORE); - } + return getNode(p.X, p.Y, p.Z, valid_position); } - - void setNode(s16 x, s16 y, s16 z, MapNode & n) + + inline MapNode getNodeNoEx(v3s16 p) + { + bool is_valid; + return getNode(p.X, p.Y, p.Z, &is_valid); + } + + inline void setNode(s16 x, s16 y, s16 z, MapNode n) { - if(data == NULL) + if (!isValidPosition(x, y, z)) throw InvalidPositionException(); - if(x < 0 || x >= MAP_BLOCKSIZE) throw InvalidPositionException(); - if(y < 0 || y >= MAP_BLOCKSIZE) throw InvalidPositionException(); - if(z < 0 || z >= MAP_BLOCKSIZE) throw InvalidPositionException(); - data[z*MAP_BLOCKSIZE*MAP_BLOCKSIZE + y*MAP_BLOCKSIZE + x] = n; - raiseModified(MOD_STATE_WRITE_NEEDED); + + data[z * zstride + y * ystride + x] = n; + raiseModified(MOD_STATE_WRITE_NEEDED, MOD_REASON_SET_NODE); } - - void setNode(v3s16 p, MapNode & n) + + inline void setNode(v3s16 p, MapNode n) { setNode(p.X, p.Y, p.Z, n); } - /* - Non-checking variants of the above - */ + //// + //// Non-checking variants of the above + //// - MapNode getNodeNoCheck(s16 x, s16 y, s16 z) + inline MapNode getNodeNoCheck(s16 x, s16 y, s16 z) { - if(data == NULL) - throw InvalidPositionException(); - return data[z*MAP_BLOCKSIZE*MAP_BLOCKSIZE + y*MAP_BLOCKSIZE + x]; + return data[z * zstride + y * ystride + x]; } - - MapNode getNodeNoCheck(v3s16 p) + + inline MapNode getNodeNoCheck(v3s16 p) { return getNodeNoCheck(p.X, p.Y, p.Z); } - - void setNodeNoCheck(s16 x, s16 y, s16 z, MapNode & n) + + inline void setNodeNoCheck(s16 x, s16 y, s16 z, MapNode n) { - if(data == NULL) - throw InvalidPositionException(); - data[z*MAP_BLOCKSIZE*MAP_BLOCKSIZE + y*MAP_BLOCKSIZE + x] = n; - raiseModified(MOD_STATE_WRITE_NEEDED); + data[z * zstride + y * ystride + x] = n; + raiseModified(MOD_STATE_WRITE_NEEDED, MOD_REASON_SET_NODE_NO_CHECK); } - - void setNodeNoCheck(v3s16 p, MapNode & n) + + inline void setNodeNoCheck(v3s16 p, MapNode n) { setNodeNoCheck(p.X, p.Y, p.Z, n); } - /* - These functions consult the parent container if the position - is not valid on this MapBlock. - */ + // These functions consult the parent container if the position + // is not valid on this MapBlock. bool isValidPositionParent(v3s16 p); - MapNode getNodeParent(v3s16 p); - void setNodeParent(v3s16 p, MapNode & n); - MapNode getNodeParentNoEx(v3s16 p); - - void drawbox(s16 x0, s16 y0, s16 z0, s16 w, s16 h, s16 d, MapNode node) - { - for(u16 z=0; z & light_sources, - bool remove_light=false, bool *black_air_left=NULL); - // Copies data to VoxelManipulator to getPosRelative() void copyTo(VoxelManipulator &dst); + // Copies data from VoxelManipulator getPosRelative() void copyFrom(VoxelManipulator &dst); - /* - MapBlockObject stuff - DEPRECATED - */ - - /*void serializeObjects(std::ostream &os, u8 version) - { - m_objects.serialize(os, version); - }*/ - // If smgr!=NULL, new objects are added to the scene - void updateObjects(std::istream &is, u8 version, - scene::ISceneManager *smgr, u32 daynight_ratio) - { - m_objects.update(is, version, smgr, daynight_ratio); + // Update day-night lighting difference flag. + // Sets m_day_night_differs to appropriate value. + // These methods don't care about neighboring blocks. + void actuallyUpdateDayNightDiff(); - raiseModified(MOD_STATE_WRITE_NEEDED); - } - void clearObjects() - { - m_objects.clear(); + // Call this to schedule what the previous function does to be done + // when the value is actually needed. + void expireDayNightDiff(); - raiseModified(MOD_STATE_WRITE_NEEDED); - } - void addObject(MapBlockObject *object) - throw(ContainerFullException, AlreadyExistsException) + inline bool getDayNightDiff() { - m_objects.add(object); - - raiseModified(MOD_STATE_WRITE_NEEDED); + if (m_day_night_differs_expired) + actuallyUpdateDayNightDiff(); + return m_day_night_differs; } - void removeObject(s16 id) - { - m_objects.remove(id); - raiseModified(MOD_STATE_WRITE_NEEDED); - } - MapBlockObject * getObject(s16 id) + bool onObjectsActivation(); + bool saveStaticObject(u16 id, const StaticObject &obj, u32 reason); + + void step(float dtime, const std::function &on_timer_cb); + + //// + //// Timestamp (see m_timestamp) + //// + + // NOTE: BLOCK_TIMESTAMP_UNDEFINED=0xffffffff means there is no timestamp. + + inline void setTimestamp(u32 time) { - return m_objects.get(id); + m_timestamp = time; + raiseModified(MOD_STATE_WRITE_AT_UNLOAD, MOD_REASON_SET_TIMESTAMP); } - JMutexAutoLock * getObjectLock() + + inline void setTimestampNoChangedFlag(u32 time) { - return m_objects.getLock(); + m_timestamp = time; } - /* - Moves objects, deletes objects and spawns new objects - */ - void stepObjects(float dtime, bool server, u32 daynight_ratio); - - // origin is relative to block - void getObjects(v3f origin, f32 max_d, - core::array &dest) + inline u32 getTimestamp() { - m_objects.getObjects(origin, max_d, dest); + return m_timestamp; } - s32 getObjectCount() + inline u32 getDiskTimestamp() { - return m_objects.getCount(); + return m_disk_timestamp; } -#ifndef SERVER // Only on client - /* - Methods for setting temporary modifications to nodes for - drawing - - returns true if the mod was different last time - */ - bool setTempMod(v3s16 p, const NodeMod &mod) - { - /*dstream<<"setTempMod called on block" - <<" ("<