X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;f=src%2Fmapblock.h;h=ca36499acaa87930cd93230226ce9db1f8016078;hb=30c34cc23e9a060ef964854038a314a94ad5cbae;hp=ce56825683b3255ee2e5b5f73e7c0e34562fe46a;hpb=fd7a0735c9aeaa7978190049319e3cdfe48920a4;p=dragonfireclient.git diff --git a/src/mapblock.h b/src/mapblock.h index ce5682568..ca36499ac 100644 --- a/src/mapblock.h +++ b/src/mapblock.h @@ -33,9 +33,15 @@ with this program; if not, write to the Free Software Foundation, Inc., #include "voxel.h" #include "nodemetadata.h" #include "staticobject.h" +#include "mapblock_nodemod.h" +#ifndef SERVER + #include "mapblock_mesh.h" +#endif -// Named by looking towards z+ +#define BLOCK_TIMESTAMP_UNDEFINED 0xffffffff + +/*// Named by looking towards z+ enum{ FACE_BACK=0, FACE_TOP, @@ -43,103 +49,7 @@ enum{ FACE_FRONT, FACE_BOTTOM, FACE_LEFT -}; - -struct FastFace -{ - TileSpec tile; - video::S3DVertex vertices[4]; // Precalculated vertices -}; - -enum NodeModType -{ - 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; -}; +};*/ enum { @@ -169,35 +79,6 @@ 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 */ @@ -244,24 +125,28 @@ class MapBlock : public NodeContainer reallocate(); } - bool getChangedFlag() + /* + This is called internally or externally after the block is + modified, so that the block is saved and possibly not deleted from + memory. + */ + void setChangedFlag() { - return changed; + changed = true; } void resetChangedFlag() { changed = false; } - void setChangedFlag() + bool getChangedFlag() { - changed = true; + return changed; } bool getIsUnderground() { return is_underground; } - void setIsUnderground(bool a_is_underground) { is_underground = a_is_underground; @@ -359,6 +244,15 @@ class MapBlock : public NodeContainer return getNode(p.X, p.Y, p.Z); } + MapNode getNodeNoEx(v3s16 p) + { + try{ + return getNode(p.X, p.Y, p.Z); + }catch(InvalidPositionException &e){ + return MapNode(CONTENT_IGNORE); + } + } + void setNode(s16 x, s16 y, s16 z, MapNode & n) { if(data == NULL) @@ -444,52 +338,23 @@ class MapBlock : public NodeContainer face_dir); } -#ifndef SERVER - // light = 0...255 - /*static void makeFastFace(TileSpec tile, u8 light, v3f p, - v3s16 dir, v3f scale, v3f posRelative_f, - core::array &dest);*/ - - /*TileSpec getNodeTile(MapNode mn, v3s16 p, v3s16 face_dir, - NodeModMap &temp_mods);*/ - /*u8 getNodeContent(v3s16 p, MapNode mn, - NodeModMap &temp_mods);*/ - - /* - Generates the FastFaces of a node row. This has a - ridiculous amount of parameters because that way they - can be precalculated by the caller. +#ifndef SERVER // Only on client - translate_dir: unit vector with only one of x, y or z - face_dir: unit vector with only one of x, y or z - */ - /*void updateFastFaceRow( - u32 daynight_ratio, - v3f posRelative_f, - v3s16 startpos, - u16 length, - v3s16 translate_dir, - v3f translate_dir_f, - v3s16 face_dir, - v3f face_dir_f, - core::array &dest, - NodeModMap &temp_mods);*/ - +#if 1 /* Thread-safely updates the whole mesh of the mapblock. + NOTE: Prefer generating the mesh separately and then using + replaceMesh(). */ -#if 1 void updateMesh(u32 daynight_ratio); #endif - + // Replace the mesh with a new one void replaceMesh(scene::SMesh *mesh_new); - -#endif // !SERVER +#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 remove_light=false, bool *black_air_left=NULL); // Copies data to VoxelManipulator to getPosRelative() void copyTo(VoxelManipulator &dst); @@ -498,12 +363,13 @@ class MapBlock : public NodeContainer /* MapBlockObject stuff + DEPRECATED */ - void serializeObjects(std::ostream &os, u8 version) + /*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) @@ -545,13 +411,6 @@ class MapBlock : public NodeContainer */ void stepObjects(float dtime, bool server, u32 daynight_ratio); - /*void wrapObject(MapBlockObject *object) - { - m_objects.wrapObject(object); - - setChangedFlag(); - }*/ - // origin is relative to block void getObjects(v3f origin, f32 max_d, core::array &dest) @@ -564,7 +423,7 @@ class MapBlock : public NodeContainer return m_objects.getCount(); } -#ifndef SERVER +#ifndef SERVER // Only on client /* Methods for setting temporary modifications to nodes for drawing @@ -639,14 +498,34 @@ class MapBlock : public NodeContainer */ s16 getGroundLevel(v2s16 p2d); + /* + Timestamp (see m_timestamp) + NOTE: BLOCK_TIMESTAMP_UNDEFINED=0xffffffff means there is no timestamp. + */ + void setTimestamp(u32 time) + { + m_timestamp = time; + setChangedFlag(); + } + void setTimestampNoChangedFlag(u32 time) + { + m_timestamp = time; + } + u32 getTimestamp() + { + return m_timestamp; + } + /* Serialization */ - // Doesn't write version by itself + // These don't write or read version by itself void serialize(std::ostream &os, u8 version); - void deSerialize(std::istream &is, u8 version); + // Used after the basic ones when writing on disk (serverside) + void serializeDiskExtra(std::ostream &os, u8 version); + void deSerializeDiskExtra(std::istream &is, u8 version); private: /* @@ -676,7 +555,7 @@ class MapBlock : public NodeContainer Public member variables */ -#ifndef SERVER +#ifndef SERVER // Only on client scene::SMesh *mesh; JMutex mesh_mutex; #endif @@ -729,11 +608,9 @@ class MapBlock : public NodeContainer // Whether day and night lighting differs bool m_day_night_differs; + // DEPRECATED MapBlockObjectList m_objects; - // Object spawning stuff - float m_spawn_timer; - #ifndef SERVER // Only on client /* Set to true if the mesh has been ordered to be updated @@ -747,6 +624,12 @@ class MapBlock : public NodeContainer NodeModMap m_temp_mods; JMutex m_temp_mods_mutex; #endif + + /* + 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; }; inline bool blockpos_over_limit(v3s16 p)