X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;f=src%2Fmapblock.h;h=3879c5b0e5db10cb8e68cf635730fb8085972b8a;hb=9a016a6294f289e1687b9a4655ea3f02f2208201;hp=74666eb486de7539e9eecdf1e18eff5fab57ddc5;hpb=9b565b6bc427673437c28518d1f61c13b58be42e;p=dragonfireclient.git diff --git a/src/mapblock.h b/src/mapblock.h index 74666eb48..3879c5b0e 100644 --- a/src/mapblock.h +++ b/src/mapblock.h @@ -1,18 +1,18 @@ /* -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. */ @@ -20,23 +20,27 @@ with this program; if not, write to the Free Software Foundation, Inc., #ifndef MAPBLOCK_HEADER #define MAPBLOCK_HEADER -#include -#include -#include +#include #include "debug.h" -#include "common_irrlicht.h" +#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 "nodemetadata.h" +#include "nodetimer.h" +#include "modifiedstate.h" +#include "util/numeric.h" // getContainerPos + +class Map; +class NodeMetadataList; +class IGameDef; +class MapBlockMesh; +class VoxelManipulator; #define BLOCK_TIMESTAMP_UNDEFINED 0xffffffff -// Named by looking towards z+ +/*// Named by looking towards z+ enum{ FACE_BACK=0, FACE_TOP, @@ -44,104 +48,26 @@ enum{ FACE_FRONT, FACE_BOTTOM, FACE_LEFT -}; - -struct FastFace -{ - TileSpec tile; - video::S3DVertex vertices[4]; // Precalculated vertices -}; +};*/ -enum NodeModType +// NOTE: If this is enabled, set MapBlock to be initialized with +// CONTENT_IGNORE. +/*enum BlockGenerationStatus { - NODEMOD_NONE, - NODEMOD_CHANGECONTENT, //param is content id - NODEMOD_CRACK // param is crack progression -}; - -struct NodeMod -{ - NodeMod(enum NodeModType a_type=NODEMOD_NONE, u16 a_param=0) - { - type = a_type; - param = a_param; - } - bool operator==(const NodeMod &other) - { - return (type == other.type && param == other.param); - } - enum NodeModType type; - u16 param; -}; - -class NodeModMap -{ -public: - /* - returns true if the mod was different last time - */ - bool set(v3s16 p, const NodeMod &mod) - { - // See if old is different, cancel if it is not different. - core::map::Node *n = m_mods.find(p); - if(n) - { - NodeMod old = n->getValue(); - if(old == mod) - return false; - - n->setValue(mod); - } - else - { - m_mods.insert(p, mod); - } - - return true; - } - // Returns true if there was one - bool get(v3s16 p, NodeMod *mod) - { - core::map::Node *n; - n = m_mods.find(p); - if(n == NULL) - return false; - if(mod) - *mod = n->getValue(); - return true; - } - bool clear(v3s16 p) - { - if(m_mods.find(p)) - { - m_mods.remove(p); - return true; - } - return false; - } - bool clear() - { - if(m_mods.size() == 0) - return false; - m_mods.clear(); - return true; - } - void copy(NodeModMap &dest) - { - dest.m_mods.clear(); - - for(core::map::Iterator - i = m_mods.getIterator(); - i.atEnd() == false; i++) - { - dest.m_mods.insert(i.getNode()->getKey(), i.getNode()->getValue()); - } - } - -private: - core::map m_mods; -}; - + // 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, @@ -169,52 +95,24 @@ class NodeContainer } } }; - -/* - Mesh making stuff -*/ - -class MapBlock; - -#ifndef SERVER - -struct MeshMakeData -{ - u32 m_daynight_ratio; - NodeModMap m_temp_mods; - VoxelManipulator m_vmanip; - v3s16 m_blockpos; - - /* - Copy central data directly from block, and other data from - parent of block. - */ - void fill(u32 daynight_ratio, MapBlock *block); -}; - -scene::SMesh* makeMapBlockMesh(MeshMakeData *data); - #endif -u8 getFaceLight(u32 daynight_ratio, MapNode n, MapNode n2, - v3s16 face_dir); - /* MapBlock itself */ -class MapBlock : public NodeContainer +class MapBlock /*: public NodeContainer*/ { public: - MapBlock(NodeContainer *parent, v3s16 pos, bool dummy=false); + MapBlock(Map *parent, v3s16 pos, IGameDef *gamedef, bool dummy=false); ~MapBlock(); - virtual u16 nodeContainerId() const + /*virtual u16 nodeContainerId() const { return NODECONTAINER_ID_MAPBLOCK; - } + }*/ - NodeContainer * getParent() + Map * getParent() { return m_parent; } @@ -226,9 +124,10 @@ class MapBlock : public NodeContainer 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; + m_modified_reason_too_long = false; + + if(m_modified >= MOD_STATE_WRITE_AT_UNLOAD){ + m_disk_timestamp = m_timestamp; + } + } else if(mod == m_modified){ + if(!m_modified_reason_too_long){ + if(m_modified_reason.size() < 40) + m_modified_reason += ", " + reason; + else{ + m_modified_reason += "..."; + m_modified_reason_too_long = true; + } + } + } + } + u32 getModified() { - changed = true; + return m_modified; } - void resetChangedFlag() + std::string getModifiedReason() { - changed = false; + return m_modified_reason; } - bool getChangedFlag() + void resetModified() { - return changed; + m_modified = MOD_STATE_CLEAN; + m_modified_reason = "none"; + m_modified_reason_too_long = false; } - + + // is_underground getter/setter bool getIsUnderground() { return is_underground; @@ -270,40 +189,32 @@ class MapBlock : public NodeContainer void setIsUnderground(bool a_is_underground) { is_underground = a_is_underground; - setChangedFlag(); + raiseModified(MOD_STATE_WRITE_NEEDED, "setIsUnderground"); } -#ifndef SERVER - void setMeshExpired(bool expired) - { - m_mesh_expired = expired; - } - - bool getMeshExpired() - { - return m_mesh_expired; - } -#endif - void setLightingExpired(bool expired) { - m_lighting_expired = expired; - setChangedFlag(); + if(expired != m_lighting_expired){ + m_lighting_expired = expired; + raiseModified(MOD_STATE_WRITE_NEEDED, "setLightingExpired"); + } } bool getLightingExpired() { return m_lighting_expired; } - /*bool isFullyGenerated() + bool isGenerated() { - return !m_not_fully_generated; + return m_generated; } - void setFullyGenerated(bool b) + void setGenerated(bool b) { - setChangedFlag(); - m_not_fully_generated = !b; - }*/ + if(b != m_generated){ + raiseModified(MOD_STATE_WRITE_NEEDED, "setGenerated"); + m_generated = b; + } + } bool isValid() { @@ -381,7 +292,7 @@ class MapBlock : public NodeContainer 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; - setChangedFlag(); + raiseModified(MOD_STATE_WRITE_NEEDED, "setNode"); } void setNode(v3s16 p, MapNode & n) @@ -410,7 +321,7 @@ class MapBlock : public NodeContainer if(data == NULL) throw InvalidPositionException(); data[z*MAP_BLOCKSIZE*MAP_BLOCKSIZE + y*MAP_BLOCKSIZE + x] = n; - setChangedFlag(); + raiseModified(MOD_STATE_WRITE_NEEDED, "setNodeNoCheck"); } void setNodeNoCheck(v3s16 p, MapNode & n) @@ -435,173 +346,31 @@ class MapBlock : public NodeContainer setNode(x0+x, y0+y, z0+z, node); } - /* - Graphics-related methods - */ - - /*// A quick version with nodes passed as parameters - u8 getFaceLight(u32 daynight_ratio, MapNode n, MapNode n2, - v3s16 face_dir);*/ - /*// A more convenient version - u8 getFaceLight(u32 daynight_ratio, v3s16 p, v3s16 face_dir) - { - return getFaceLight(daynight_ratio, - getNodeParentNoEx(p), - getNodeParentNoEx(p + face_dir), - face_dir); - }*/ - u8 getFaceLight2(u32 daynight_ratio, v3s16 p, v3s16 face_dir) - { - return getFaceLight(daynight_ratio, - getNodeParentNoEx(p), - getNodeParentNoEx(p + face_dir), - face_dir); - } - -#ifndef SERVER // Only on client - -#if 1 - /* - Thread-safely updates the whole mesh of the mapblock. - NOTE: Prefer generating the mesh separately and then using - replaceMesh(). - */ - void updateMesh(u32 daynight_ratio); -#endif - // Replace the mesh with a new one - void replaceMesh(scene::SMesh *mesh_new); -#endif - // See comments in mapblock.cpp - bool propagateSunlight(core::map & light_sources, - bool remove_light=false, bool *black_air_left=NULL, - bool grow_grass=false); + 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); // 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); - - setChangedFlag(); - } - void clearObjects() - { - m_objects.clear(); - - setChangedFlag(); - } - void addObject(MapBlockObject *object) - throw(ContainerFullException, AlreadyExistsException) - { - m_objects.add(object); - - setChangedFlag(); - } - void removeObject(s16 id) - { - m_objects.remove(id); - - setChangedFlag(); - } - MapBlockObject * getObject(s16 id) - { - return m_objects.get(id); - } - JMutexAutoLock * getObjectLock() - { - return m_objects.getLock(); - } - - /* - 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) - { - m_objects.getObjects(origin, max_d, dest); - } - - s32 getObjectCount() - { - return m_objects.getCount(); - } - -#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" - <<" ("<