X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Fmap.h;h=3097d15b9fcc52549919ac1008d97118f55f4c21;hb=d5029958b9017ad89775bc4f68c4de3db603e618;hp=411a7ae514d9f11c36fee3815a3c3b4744d63c61;hpb=d1a16f24cfb360a0a6e60fc76ea87d7c4cf24618;p=oweals%2Fminetest.git diff --git a/src/map.h b/src/map.h index 411a7ae51..3097d15b9 100644 --- a/src/map.h +++ b/src/map.h @@ -3,16 +3,16 @@ Minetest-c55 Copyright (C) 2010-2011 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. */ @@ -26,25 +26,27 @@ with this program; if not, write to the Free Software Foundation, Inc., #include #include -#include "common_irrlicht.h" +#include "irrlichttypes_bloated.h" #include "mapnode.h" -#include "mapblock_nodemod.h" #include "constants.h" #include "voxel.h" +#include "mapgen.h" //for BlockMakeData and EmergeManager +#include "modifiedstate.h" +#include "util/container.h" +#include "nodetimer.h" extern "C" { #include "sqlite3.h" } +class ClientMap; class MapSector; class ServerMapSector; -class ClientMapSector; class MapBlock; class NodeMetadata; +class IGameDef; +class IRollbackReportSink; -namespace mapgen{ - struct BlockMakeData; -}; /* MapEditEvent @@ -96,6 +98,38 @@ struct MapEditEvent } return event; } + + VoxelArea getArea() + { + switch(type){ + case MEET_ADDNODE: + return VoxelArea(p); + case MEET_REMOVENODE: + return VoxelArea(p); + case MEET_BLOCK_NODE_METADATA_CHANGED: + { + v3s16 np1 = p*MAP_BLOCKSIZE; + v3s16 np2 = np1 + v3s16(1,1,1)*MAP_BLOCKSIZE - v3s16(1,1,1); + return VoxelArea(np1, np2); + } + case MEET_OTHER: + { + VoxelArea a; + for(core::map::Iterator + i = modified_blocks.getIterator(); + i.atEnd()==false; i++) + { + v3s16 p = i.getNode()->getKey(); + v3s16 np1 = p*MAP_BLOCKSIZE; + v3s16 np2 = np1 + v3s16(1,1,1)*MAP_BLOCKSIZE - v3s16(1,1,1); + a.addPoint(np1); + a.addPoint(np2); + } + return a; + } + } + return VoxelArea(); + } }; class MapEventReceiver @@ -109,7 +143,7 @@ class Map /*: public NodeContainer*/ { public: - Map(std::ostream &dout); + Map(std::ostream &dout, IGameDef *gamedef); virtual ~Map(); /*virtual u16 nodeContainerId() const @@ -134,7 +168,7 @@ public: void removeEventReceiver(MapEventReceiver *event_receiver); // event shall be deleted by caller after the call. void dispatchEvent(MapEditEvent *event); - + // On failure returns NULL MapSector * getSectorNoGenerateNoExNoLock(v2s16 p2d); // Same as the above (there exists no lock anymore) @@ -157,6 +191,10 @@ public: // Returns NULL if not found MapBlock * getBlockNoCreateNoEx(v3s16 p); + /* Server overrides */ + virtual MapBlock * emergeBlock(v3s16 p, bool allow_generate=true) + { return getBlockNoCreateNoEx(p); } + // Returns InvalidPositionException if not found bool isNodeUnderground(v3s16 p); @@ -220,7 +258,7 @@ public: /* Takes the blocks at the edges into account */ - bool dayNightDiffed(v3s16 blockpos); + bool getDayNightDiff(v3s16 blockpos); //core::aabbox3d getDisplayedBlockArea(); @@ -230,7 +268,7 @@ public: virtual void beginSave() {return;}; virtual void endSave() {return;}; - virtual void save(bool only_changed){assert(0);}; + virtual void save(ModifiedState save_level){assert(0);}; // Server implements this. // Client leaves it as no-op. @@ -271,9 +309,16 @@ public: NodeMetadata* getNodeMetadata(v3s16 p); void setNodeMetadata(v3s16 p, NodeMetadata *meta); void removeNodeMetadata(v3s16 p); - void nodeMetadataStep(float dtime, - core::map &changed_blocks); + + /* + Node Timers + These are basically coordinate wrappers to MapBlock + */ + NodeTimer getNodeTimer(v3s16 p); + void setNodeTimer(v3s16 p, NodeTimer t); + void removeNodeTimer(v3s16 p); + /* Misc. */ @@ -285,10 +330,12 @@ public: protected: - std::ostream &m_dout; + std::ostream &m_dout; // A bit deprecated, could be removed + + IGameDef *m_gamedef; core::map m_event_receivers; - + core::map m_sectors; // Be sure to set this to NULL when the cached sector is deleted @@ -311,7 +358,7 @@ public: /* savedir: directory to which map data should be saved */ - ServerMap(std::string savedir); + ServerMap(std::string savedir, IGameDef *gamedef, EmergeManager *emerge); ~ServerMap(); s32 mapType() const @@ -330,15 +377,15 @@ public: /* Blocks are generated by using these and makeBlock(). */ - void initBlockMake(mapgen::BlockMakeData *data, v3s16 blockpos); - MapBlock* finishBlockMake(mapgen::BlockMakeData *data, + void initBlockMake(BlockMakeData *data, v3s16 blockpos); + MapBlock* finishBlockMake(BlockMakeData *data, core::map &changed_blocks); - // A non-threaded wrapper to the above - MapBlock * generateBlock( + // A non-threaded wrapper to the above - DEFUNCT +/* MapBlock * generateBlock( v3s16 p, core::map &modified_blocks - ); + );*/ /* Get a block from somewhere. @@ -351,9 +398,10 @@ public: Forcefully get a block from somewhere. - Memory - Load from disk - - Generate + - Create blank filled with CONTENT_IGNORE + */ - MapBlock * emergeBlock(v3s16 p, bool allow_generate=true); + MapBlock * emergeBlock(v3s16 p, bool create_blank=true); // Helper for placing objects on ground level s16 findGroundLevel(v2s16 p2d); @@ -378,7 +426,8 @@ public: // Verify we can read/write to the database void verifyDatabase(); // Get an integer suitable for a block - static int getBlockAsInteger(const v3s16 pos); + static sqlite3_int64 getBlockAsInteger(const v3s16 pos); + static v3s16 getIntegerAsBlock(sqlite3_int64 i); // Returns true if the database file does not exist bool loadFromFolders(); @@ -387,9 +436,11 @@ public: void beginSave(); void endSave(); - void save(bool only_changed); + void save(ModifiedState save_level); //void loadAll(); + void listAllLoadableBlocks(core::list &dst); + // Saves map seed and possibly other stuff void saveMapMeta(); void loadMapMeta(); @@ -427,10 +478,11 @@ public: u64 getSeed(){ return m_seed; } + EmergeManager *m_emerge; private: - // Seed used for all kinds of randomness + // Seed used for all kinds of randomness in generation u64 m_seed; - + std::string m_savedir; bool m_map_saving_enabled; @@ -454,160 +506,9 @@ private: sqlite3 *m_database; sqlite3_stmt *m_database_read; sqlite3_stmt *m_database_write; + sqlite3_stmt *m_database_list; }; -/* - ClientMap stuff -*/ - -#ifndef SERVER - -struct MapDrawControl -{ - MapDrawControl(): - range_all(false), - wanted_range(50), - wanted_max_blocks(0), - wanted_min_range(0), - blocks_drawn(0), - blocks_would_have_drawn(0) - { - } - // Overrides limits by drawing everything - bool range_all; - // Wanted drawing range - float wanted_range; - // Maximum number of blocks to draw - u32 wanted_max_blocks; - // Blocks in this range are drawn regardless of number of blocks drawn - float wanted_min_range; - // Number of blocks rendered is written here by the renderer - u32 blocks_drawn; - // Number of blocks that would have been drawn in wanted_range - u32 blocks_would_have_drawn; -}; - -class Client; - -/* - ClientMap - - This is the only map class that is able to render itself on screen. -*/ - -class ClientMap : public Map, public scene::ISceneNode -{ -public: - ClientMap( - Client *client, - MapDrawControl &control, - scene::ISceneNode* parent, - scene::ISceneManager* mgr, - s32 id - ); - - ~ClientMap(); - - s32 mapType() const - { - return MAPTYPE_CLIENT; - } - - void drop() - { - ISceneNode::drop(); - } - - void updateCamera(v3f pos, v3f dir) - { - JMutexAutoLock lock(m_camera_mutex); - m_camera_position = pos; - m_camera_direction = dir; - } - - /* - Forcefully get a sector from somewhere - */ - MapSector * emergeSector(v2s16 p); - - //void deSerializeSector(v2s16 p2d, std::istream &is); - - /* - ISceneNode methods - */ - - virtual void OnRegisterSceneNode(); - - virtual void render() - { - video::IVideoDriver* driver = SceneManager->getVideoDriver(); - driver->setTransform(video::ETS_WORLD, AbsoluteTransformation); - renderMap(driver, SceneManager->getSceneNodeRenderPass()); - } - - virtual const core::aabbox3d& getBoundingBox() const - { - return m_box; - } - - void renderMap(video::IVideoDriver* driver, s32 pass); - - /* - Methods for setting temporary modifications to nodes for - drawing. - - Returns true if something changed. - - All blocks whose mesh could have been changed are inserted - to affected_blocks. - */ - bool setTempMod(v3s16 p, NodeMod mod, - core::map *affected_blocks=NULL); - bool clearTempMod(v3s16 p, - core::map *affected_blocks=NULL); - // Efficient implementation needs a cache of TempMods - //void clearTempMods(); - - void expireMeshes(bool only_daynight_diffed); - - /* - Update the faces of the given block and blocks on the - leading edge. - */ - void updateMeshes(v3s16 blockpos, u32 daynight_ratio); - - // Update meshes that touch the node - //void updateNodeMeshes(v3s16 nodepos, u32 daynight_ratio); - - // For debug printing - virtual void PrintInfo(std::ostream &out); - - // Check if sector was drawn on last render() - bool sectorWasDrawn(v2s16 p) - { - return (m_last_drawn_sectors.find(p) != NULL); - } - -private: - Client *m_client; - - core::aabbox3d m_box; - - // This is the master heightmap mesh - //scene::SMesh *mesh; - //JMutex mesh_mutex; - - MapDrawControl &m_control; - - v3f m_camera_position; - v3f m_camera_direction; - JMutex m_camera_mutex; - - core::map m_last_drawn_sectors; -}; - -#endif - class MapVoxelManipulator : public VoxelManipulator { public: