X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Fmapsector.cpp;h=410689f5efe6c626c2e6ae67bee8daf5191923b9;hb=ba52a34f94504e966ee3842e724561eec037cbc0;hp=97101dd36a4c1525de7237a5ac31e81f696df21b;hpb=f37a3a84fafb91bcfc109fed95aa6d42726f1bf7;p=oweals%2Fminetest.git diff --git a/src/mapsector.cpp b/src/mapsector.cpp index 97101dd36..410689f5e 100644 --- a/src/mapsector.cpp +++ b/src/mapsector.cpp @@ -1,35 +1,34 @@ /* -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. */ #include "mapsector.h" -#include "jmutexautolock.h" -#include "client.h" #include "exceptions.h" +#include "mapblock.h" +#include "serialization.h" -MapSector::MapSector(NodeContainer *parent, v2s16 pos): - differs_from_disk(true), +MapSector::MapSector(Map *parent, v2s16 pos, IGameDef *gamedef): + differs_from_disk(false), m_parent(parent), m_pos(pos), + m_gamedef(gamedef), m_block_cache(NULL) { - m_mutex.Init(); - assert(m_mutex.IsInitialized()); } MapSector::~MapSector() @@ -39,16 +38,13 @@ MapSector::~MapSector() void MapSector::deleteBlocks() { - JMutexAutoLock lock(m_mutex); - // Clear cache m_block_cache = NULL; // Delete all - core::map::Iterator i = m_blocks.getIterator(); - for(; i.atEnd() == false; i++) - { - delete i.getNode()->getValue(); + for (UNORDERED_MAP::iterator i = m_blocks.begin(); + i != m_blocks.end(); ++i) { + delete i->second; } // Clear container @@ -59,65 +55,42 @@ MapBlock * MapSector::getBlockBuffered(s16 y) { MapBlock *block; - if(m_block_cache != NULL && y == m_block_cache_y){ + if (m_block_cache != NULL && y == m_block_cache_y) { return m_block_cache; } - + // If block doesn't exist, return NULL - core::map::Node *n = m_blocks.find(y); - if(n == NULL) - { - block = NULL; - } - // If block exists, return it - else{ - block = n->getValue(); - } - + UNORDERED_MAP::iterator n = m_blocks.find(y); + block = (n != m_blocks.end() ? n->second : NULL); + // Cache the last result m_block_cache_y = y; m_block_cache = block; - + return block; } MapBlock * MapSector::getBlockNoCreateNoEx(s16 y) { - JMutexAutoLock lock(m_mutex); - return getBlockBuffered(y); } -MapBlock * MapSector::getBlockNoCreate(s16 y) -{ - MapBlock *block = getBlockNoCreateNoEx(y); - - if(block == NULL) - throw InvalidPositionException(); - - return block; -} - MapBlock * MapSector::createBlankBlockNoInsert(s16 y) { - // There should not be a block at this position - if(getBlockBuffered(y) != NULL) - throw AlreadyExistsException("Block already exists"); + assert(getBlockBuffered(y) == NULL); // Pre-condition v3s16 blockpos_map(m_pos.X, y, m_pos.Y); - - MapBlock *block = new MapBlock(m_parent, blockpos_map); - + + MapBlock *block = new MapBlock(m_parent, blockpos_map, m_gamedef); + return block; } MapBlock * MapSector::createBlankBlock(s16 y) { - JMutexAutoLock lock(m_mutex); - MapBlock *block = createBlankBlockNoInsert(y); - - m_blocks.insert(y, block); + + m_blocks[y] = block; return block; } @@ -126,48 +99,37 @@ void MapSector::insertBlock(MapBlock *block) { s16 block_y = block->getPos().Y; - { - JMutexAutoLock lock(m_mutex); - - MapBlock *block2 = getBlockBuffered(block_y); - if(block2 != NULL){ - throw AlreadyExistsException("Block already exists"); - } - - v2s16 p2d(block->getPos().X, block->getPos().Z); - assert(p2d == m_pos); - - // Insert into container - m_blocks.insert(block_y, block); + MapBlock *block2 = getBlockBuffered(block_y); + if(block2 != NULL){ + throw AlreadyExistsException("Block already exists"); } + + v2s16 p2d(block->getPos().X, block->getPos().Z); + assert(p2d == m_pos); + + // Insert into container + m_blocks[block_y] = block; } -void MapSector::removeBlock(MapBlock *block) +void MapSector::deleteBlock(MapBlock *block) { s16 block_y = block->getPos().Y; - JMutexAutoLock lock(m_mutex); - // Clear from cache m_block_cache = NULL; - + // Remove from container - m_blocks.remove(block_y); + m_blocks.erase(block_y); + + // Delete + delete block; } -void MapSector::getBlocks(core::list &dest) +void MapSector::getBlocks(MapBlockVect &dest) { - JMutexAutoLock lock(m_mutex); - - core::list ref_list; - - core::map::Iterator bi; - - bi = m_blocks.getIterator(); - for(; bi.atEnd() == false; bi++) - { - MapBlock *b = bi.getNode()->getValue(); - dest.push_back(b); + for (UNORDERED_MAP::iterator bi = m_blocks.begin(); + bi != m_blocks.end(); ++bi) { + dest.push_back(bi->second); } } @@ -175,8 +137,8 @@ void MapSector::getBlocks(core::list &dest) ServerMapSector */ -ServerMapSector::ServerMapSector(NodeContainer *parent, v2s16 pos): - MapSector(parent, pos) +ServerMapSector::ServerMapSector(Map *parent, v2s16 pos, IGameDef *gamedef): + MapSector(parent, pos, gamedef) { } @@ -184,31 +146,22 @@ ServerMapSector::~ServerMapSector() { } -f32 ServerMapSector::getGroundHeight(v2s16 p, bool generate) -{ - return GROUNDHEIGHT_NOTFOUND_SETVALUE; -} - -void ServerMapSector::setGroundHeight(v2s16 p, f32 y, bool generate) -{ -} - void ServerMapSector::serialize(std::ostream &os, u8 version) { if(!ser_ver_supported(version)) throw VersionMismatchException("ERROR: MapSector format not supported"); - + /* [0] u8 serialization version + heightmap data */ - + // Server has both of these, no need to support not having them. //assert(m_objects != NULL); // Write version os.write((char*)&version, 1); - + /* Add stuff here, if needed */ @@ -217,9 +170,10 @@ void ServerMapSector::serialize(std::ostream &os, u8 version) ServerMapSector* ServerMapSector::deSerialize( std::istream &is, - NodeContainer *parent, + Map *parent, v2s16 p2d, - core::map & sectors + std::map & sectors, + IGameDef *gamedef ) { /* @@ -230,40 +184,40 @@ ServerMapSector* ServerMapSector::deSerialize( /* Read stuff */ - + // Read version u8 version = SER_FMT_VER_INVALID; is.read((char*)&version, 1); - + if(!ser_ver_supported(version)) throw VersionMismatchException("ERROR: MapSector format not supported"); - + /* Add necessary reading stuff here */ - + /* Get or create sector */ ServerMapSector *sector = NULL; - core::map::Node *n = sectors.find(p2d); + std::map::iterator n = sectors.find(p2d); - if(n != NULL) + if(n != sectors.end()) { - dstream<<"WARNING: deSerializing existent sectors not supported " + warningstream<<"deSerializing existent sectors not supported " "at the moment, because code hasn't been tested." <getValue(); + MapSector *sector = n->second; assert(sector->getId() == MAPSECTOR_SERVER); return (ServerMapSector*)sector; } else { - sector = new ServerMapSector(parent, p2d); - sectors.insert(p2d, sector); + sector = new ServerMapSector(parent, p2d, gamedef); + sectors[p2d] = sector; } /* @@ -280,8 +234,8 @@ ServerMapSector* ServerMapSector::deSerialize( ClientMapSector */ -ClientMapSector::ClientMapSector(NodeContainer *parent, v2s16 pos): - MapSector(parent, pos) +ClientMapSector::ClientMapSector(Map *parent, v2s16 pos, IGameDef *gamedef): + MapSector(parent, pos, gamedef) { } @@ -289,45 +243,6 @@ ClientMapSector::~ClientMapSector() { } -void ClientMapSector::deSerialize(std::istream &is) -{ - /* - [0] u8 serialization version - [1] s16 corners[0] - [3] s16 corners[1] - [5] s16 corners[2] - [7] s16 corners[3] - size = 9 - - In which corners are in these positions - v2s16(0,0), - v2s16(1,0), - v2s16(1,1), - v2s16(0,1), - */ - - // Read version - u8 version = SER_FMT_VER_INVALID; - is.read((char*)&version, 1); - - if(!ser_ver_supported(version)) - throw VersionMismatchException("ERROR: MapSector format not supported"); - - u8 buf[2]; - - // Dummy read corners - is.read((char*)buf, 2); - is.read((char*)buf, 2); - is.read((char*)buf, 2); - is.read((char*)buf, 2); - - /* - Set stuff in sector - */ - - // Nothing here - -} #endif // !SERVER //END