#include "database.h"
#include "database-dummy.h"
#include "database-sqlite3.h"
+#include "script/scripting_server.h"
#include <deque>
#include <queue>
#if USE_LEVELDB
Map::Map(std::ostream &dout, IGameDef *gamedef):
m_dout(dout),
m_gamedef(gamedef),
- m_sector_cache(NULL),
- m_nodedef(gamedef->ndef()),
- m_transforming_liquid_loop_count_multiplier(1.0f),
- m_unprocessed_count(0),
- m_inc_trending_up_start_time(0),
- m_queue_size_timer_started(false)
+ m_nodedef(gamedef->ndef())
{
}
/*
Free all MapSectors
*/
- for(std::map<v2s16, MapSector*>::iterator i = m_sectors.begin();
- i != m_sectors.end(); ++i)
- {
- delete i->second;
+ for (auto §or : m_sectors) {
+ delete sector.second;
}
}
void Map::dispatchEvent(MapEditEvent *event)
{
- for(std::set<MapEventReceiver*>::iterator
- i = m_event_receivers.begin();
- i != m_event_receivers.end(); ++i)
- {
- (*i)->onMapEditEvent(event);
+ for (MapEventReceiver *event_receiver : m_event_receivers) {
+ event_receiver->onMapEditEvent(event);
}
}
std::map<v2s16, MapSector*>::iterator n = m_sectors.find(p);
- if(n == m_sectors.end())
+ if (n == m_sectors.end())
return NULL;
MapSector *sector = n->second;
if (block == NULL) {
if (is_valid_position != NULL)
*is_valid_position = false;
- return MapNode(CONTENT_IGNORE);
+ return {CONTENT_IGNORE};
}
v3s16 relpos = p - blockpos*MAP_BLOCKSIZE;
// Update lighting
std::vector<std::pair<v3s16, MapNode> > oldnodes;
- oldnodes.push_back(std::pair<v3s16, MapNode>(p, oldnode));
+ oldnodes.emplace_back(p, oldnode);
voxalgo::update_lighting_nodes(this, oldnodes, modified_blocks);
- for(std::map<v3s16, MapBlock*>::iterator
- i = modified_blocks.begin();
- i != modified_blocks.end(); ++i)
- {
- i->second->expireDayNightDiff();
+ for (auto &modified_block : modified_blocks) {
+ modified_block.second->expireDayNightDiff();
}
// Report for rollback
Add neighboring liquid nodes and this node to transform queue.
(it's vital for the node itself to get updated last, if it was removed.)
*/
- v3s16 dirs[7] = {
- v3s16(0,0,1), // back
- v3s16(0,1,0), // top
- v3s16(1,0,0), // right
- v3s16(0,0,-1), // front
- v3s16(0,-1,0), // bottom
- v3s16(-1,0,0), // left
- v3s16(0,0,0), // self
- };
- for(u16 i=0; i<7; i++)
- {
- v3s16 p2 = p + dirs[i];
+
+ for (const v3s16 &dir : g_7dirs) {
+ v3s16 p2 = p + dir;
bool is_valid_position;
MapNode n2 = getNodeNoEx(p2, &is_valid_position);
addNodeAndUpdate(p, n, modified_blocks, remove_metadata);
// Copy modified_blocks to event
- for(std::map<v3s16, MapBlock*>::iterator
- i = modified_blocks.begin();
- i != modified_blocks.end(); ++i)
- {
- event.modified_blocks.insert(i->first);
+ for (auto &modified_block : modified_blocks) {
+ event.modified_blocks.insert(modified_block.first);
}
}
catch(InvalidPositionException &e){
removeNodeAndUpdate(p, modified_blocks);
// Copy modified_blocks to event
- for(std::map<v3s16, MapBlock*>::iterator
- i = modified_blocks.begin();
- i != modified_blocks.end(); ++i)
- {
- event.modified_blocks.insert(i->first);
+ for (auto &modified_block : modified_blocks) {
+ event.modified_blocks.insert(modified_block.first);
}
}
catch(InvalidPositionException &e){
return succeeded;
}
-bool Map::getDayNightDiff(v3s16 blockpos)
-{
- try{
- v3s16 p = blockpos + v3s16(0,0,0);
- MapBlock *b = getBlockNoCreate(p);
- if(b->getDayNightDiff())
- return true;
- }
- catch(InvalidPositionException &e){}
- // Leading edges
- try{
- v3s16 p = blockpos + v3s16(-1,0,0);
- MapBlock *b = getBlockNoCreate(p);
- if(b->getDayNightDiff())
- return true;
- }
- catch(InvalidPositionException &e){}
- try{
- v3s16 p = blockpos + v3s16(0,-1,0);
- MapBlock *b = getBlockNoCreate(p);
- if(b->getDayNightDiff())
- return true;
- }
- catch(InvalidPositionException &e){}
- try{
- v3s16 p = blockpos + v3s16(0,0,-1);
- MapBlock *b = getBlockNoCreate(p);
- if(b->getDayNightDiff())
- return true;
- }
- catch(InvalidPositionException &e){}
- // Trailing edges
- try{
- v3s16 p = blockpos + v3s16(1,0,0);
- MapBlock *b = getBlockNoCreate(p);
- if(b->getDayNightDiff())
- return true;
- }
- catch(InvalidPositionException &e){}
- try{
- v3s16 p = blockpos + v3s16(0,1,0);
- MapBlock *b = getBlockNoCreate(p);
- if(b->getDayNightDiff())
- return true;
- }
- catch(InvalidPositionException &e){}
- try{
- v3s16 p = blockpos + v3s16(0,0,1);
- MapBlock *b = getBlockNoCreate(p);
- if(b->getDayNightDiff())
- return true;
- }
- catch(InvalidPositionException &e){}
-
- return false;
-}
-
struct TimeOrderedMapBlock {
MapSector *sect;
MapBlock *block;
// If there is no practical limit, we spare creation of mapblock_queue
if (max_loaded_blocks == U32_MAX) {
- for (std::map<v2s16, MapSector*>::iterator si = m_sectors.begin();
- si != m_sectors.end(); ++si) {
- MapSector *sector = si->second;
+ for (auto §or_it : m_sectors) {
+ MapSector *sector = sector_it.second;
bool all_blocks_deleted = true;
MapBlockVect blocks;
sector->getBlocks(blocks);
- for (MapBlockVect::iterator i = blocks.begin();
- i != blocks.end(); ++i) {
- MapBlock *block = (*i);
-
+ for (MapBlock *block : blocks) {
block->incrementUsageTimer(dtime);
if (block->refGet() == 0
}
if (all_blocks_deleted) {
- sector_deletion_queue.push_back(si->first);
+ sector_deletion_queue.push_back(sector_it.first);
}
}
} else {
std::priority_queue<TimeOrderedMapBlock> mapblock_queue;
- for (std::map<v2s16, MapSector*>::iterator si = m_sectors.begin();
- si != m_sectors.end(); ++si) {
- MapSector *sector = si->second;
+ for (auto §or_it : m_sectors) {
+ MapSector *sector = sector_it.second;
MapBlockVect blocks;
sector->getBlocks(blocks);
- for(MapBlockVect::iterator i = blocks.begin();
- i != blocks.end(); ++i) {
- MapBlock *block = (*i);
-
+ for (MapBlock *block : blocks) {
block->incrementUsageTimer(dtime);
mapblock_queue.push(TimeOrderedMapBlock(sector, block));
}
block_count_all--;
}
// Delete empty sectors
- for (std::map<v2s16, MapSector*>::iterator si = m_sectors.begin();
- si != m_sectors.end(); ++si) {
- if (si->second->empty()) {
- sector_deletion_queue.push_back(si->first);
+ for (auto §or_it : m_sectors) {
+ if (sector_it.second->empty()) {
+ sector_deletion_queue.push_back(sector_it.first);
}
}
}
void Map::deleteSectors(std::vector<v2s16> §orList)
{
- for(std::vector<v2s16>::iterator j = sectorList.begin();
- j != sectorList.end(); ++j) {
- MapSector *sector = m_sectors[*j];
+ for (v2s16 j : sectorList) {
+ MapSector *sector = m_sectors[j];
// If sector is in sector cache, remove it from there
if(m_sector_cache == sector)
m_sector_cache = NULL;
// Remove from map and delete
- m_sectors.erase(*j);
+ m_sectors.erase(j);
delete sector;
}
}
return m_transforming_liquid.size();
}
-void Map::transformLiquids(std::map<v3s16, MapBlock*> &modified_blocks)
+void Map::transformLiquids(std::map<v3s16, MapBlock*> &modified_blocks,
+ ServerEnvironment *env)
{
DSTACK(FUNCTION_NAME);
//TimeTaker timer("transformLiquids()");
// set the liquid level and flow bit to 0
n0.param2 = ~(LIQUID_LEVEL_MASK | LIQUID_FLOW_DOWN_MASK);
}
+
+ // change the node.
n0.setContent(new_node_content);
+ // on_flood() the node
+ if (floodable_node != CONTENT_AIR) {
+ if (env->getScriptIface()->node_on_flood(p0, n00, n0))
+ continue;
+ }
+
// Ignore light (because calling voxalgo::update_lighting_nodes)
n0.setLight(LIGHTBANK_DAY, 0, m_nodedef);
n0.setLight(LIGHTBANK_NIGHT, 0, m_nodedef);
MapBlock *block = getBlockNoCreateNoEx(blockpos);
if (block != NULL) {
modified_blocks[blockpos] = block;
- changed_nodes.push_back(std::pair<v3s16, MapNode>(p0, n00));
+ changed_nodes.emplace_back(p0, n00);
}
/*
}
//infostream<<"Map::transformLiquids(): loopcount="<<loopcount<<std::endl;
- for (std::deque<v3s16>::iterator iter = must_reflow.begin(); iter != must_reflow.end(); ++iter)
- m_transforming_liquid.push_back(*iter);
+ for (auto &iter : must_reflow)
+ m_transforming_liquid.push_back(iter);
voxalgo::update_lighting_nodes(this, changed_nodes, modified_blocks);
time_until_purge *= 1000; // seconds -> milliseconds
- u32 curr_time = getTime(PRECISION_MILLI);
+ u64 curr_time = porting::getTimeMs();
u32 prev_unprocessed = m_unprocessed_count;
m_unprocessed_count = m_transforming_liquid.size();
block->m_node_timers.remove(p_rel);
}
+bool Map::isOccluded(v3s16 p0, v3s16 p1, float step, float stepfac,
+ float start_off, float end_off, u32 needed_count)
+{
+ float d0 = (float)BS * p0.getDistanceFrom(p1);
+ v3s16 u0 = p1 - p0;
+ v3f uf = v3f(u0.X, u0.Y, u0.Z) * BS;
+ uf.normalize();
+ v3f p0f = v3f(p0.X, p0.Y, p0.Z) * BS;
+ u32 count = 0;
+ for(float s=start_off; s<d0+end_off; s+=step){
+ v3f pf = p0f + uf * s;
+ v3s16 p = floatToInt(pf, BS);
+ MapNode n = getNodeNoEx(p);
+ const ContentFeatures &f = m_nodedef->get(n);
+ if(f.drawtype == NDT_NORMAL){
+ // not transparent, see ContentFeature::updateTextures
+ count++;
+ if(count >= needed_count)
+ return true;
+ }
+ step *= stepfac;
+ }
+ return false;
+}
+
+bool Map::isBlockOccluded(MapBlock *block, v3s16 cam_pos_nodes) {
+ v3s16 cpn = block->getPos() * MAP_BLOCKSIZE;
+ cpn += v3s16(MAP_BLOCKSIZE / 2, MAP_BLOCKSIZE / 2, MAP_BLOCKSIZE / 2);
+ float step = BS * 1;
+ float stepfac = 1.1;
+ float startoff = BS * 1;
+ // The occlusion search of 'isOccluded()' must stop short of the target
+ // point by distance 'endoff' (end offset) to not enter the target mapblock.
+ // For the 8 mapblock corners 'endoff' must therefore be the maximum diagonal
+ // of a mapblock, because we must consider all view angles.
+ // sqrt(1^2 + 1^2 + 1^2) = 1.732
+ float endoff = -BS * MAP_BLOCKSIZE * 1.732050807569;
+ v3s16 spn = cam_pos_nodes;
+ s16 bs2 = MAP_BLOCKSIZE / 2 + 1;
+ // to reduce the likelihood of falsely occluded blocks
+ // require at least two solid blocks
+ // this is a HACK, we should think of a more precise algorithm
+ u32 needed_count = 2;
+
+ return (
+ // For the central point of the mapblock 'endoff' can be halved
+ isOccluded(spn, cpn,
+ step, stepfac, startoff, endoff / 2.0f, needed_count) &&
+ isOccluded(spn, cpn + v3s16(bs2,bs2,bs2),
+ step, stepfac, startoff, endoff, needed_count) &&
+ isOccluded(spn, cpn + v3s16(bs2,bs2,-bs2),
+ step, stepfac, startoff, endoff, needed_count) &&
+ isOccluded(spn, cpn + v3s16(bs2,-bs2,bs2),
+ step, stepfac, startoff, endoff, needed_count) &&
+ isOccluded(spn, cpn + v3s16(bs2,-bs2,-bs2),
+ step, stepfac, startoff, endoff, needed_count) &&
+ isOccluded(spn, cpn + v3s16(-bs2,bs2,bs2),
+ step, stepfac, startoff, endoff, needed_count) &&
+ isOccluded(spn, cpn + v3s16(-bs2,bs2,-bs2),
+ step, stepfac, startoff, endoff, needed_count) &&
+ isOccluded(spn, cpn + v3s16(-bs2,-bs2,bs2),
+ step, stepfac, startoff, endoff, needed_count) &&
+ isOccluded(spn, cpn + v3s16(-bs2,-bs2,-bs2),
+ step, stepfac, startoff, endoff, needed_count));
+}
+
/*
ServerMap
*/
-ServerMap::ServerMap(std::string savedir, IGameDef *gamedef, EmergeManager *emerge):
+ServerMap::ServerMap(const std::string &savedir, IGameDef *gamedef,
+ EmergeManager *emerge):
Map(dout_server, gamedef),
settings_mgr(g_settings, savedir + DIR_DELIM + "map_meta.txt"),
- m_emerge(emerge),
- m_map_metadata_changed(true)
+ m_emerge(emerge)
{
verbosestream<<FUNCTION_NAME<<std::endl;
m_savedir = savedir;
m_map_saving_enabled = false;
- try
- {
+ try {
// If directory exists, check contents and load if possible
- if(fs::PathExists(m_savedir))
- {
+ if (fs::PathExists(m_savedir)) {
// If directory is empty, it is safe to save into it.
- if(fs::GetDirListing(m_savedir).size() == 0)
- {
+ if (fs::GetDirListing(m_savedir).empty()) {
infostream<<"ServerMap: Empty save directory is valid."
<<std::endl;
m_map_saving_enabled = true;
infostream<<"Please remove the map or fix it."<<std::endl;
warningstream<<"Map saving will be disabled."<<std::endl;
}
-
- infostream<<"Initializing new map."<<std::endl;
-
- // Create zero sector
- emergeSector(v2s16(0,0));
-
- // Initially write whole map
- save(MOD_STATE_CLEAN);
}
ServerMap::~ServerMap()
try
{
- if(m_map_saving_enabled)
- {
+ if (m_map_saving_enabled) {
// Save only changed parts
save(MOD_STATE_WRITE_AT_UNLOAD);
- infostream<<"ServerMap: Saved map to "<<m_savedir<<std::endl;
- }
- else
- {
- infostream<<"ServerMap: Map not saved"<<std::endl;
+ infostream << "ServerMap: Saved map to " << m_savedir << std::endl;
+ } else {
+ infostream << "ServerMap: Map not saved" << std::endl;
}
}
catch(std::exception &e)
return getMapgenParams()->water_level;
}
+bool ServerMap::saoPositionOverLimit(const v3f &p)
+{
+ return getMapgenParams()->saoPosOverLimit(p);
+}
+
+bool ServerMap::blockpos_over_mapgen_limit(v3s16 p)
+{
+ const s16 mapgen_limit_bp = rangelim(
+ getMapgenParams()->mapgen_limit, 0, MAX_MAP_GENERATION_LIMIT) /
+ MAP_BLOCKSIZE;
+ return p.X < -mapgen_limit_bp ||
+ p.X > mapgen_limit_bp ||
+ p.Y < -mapgen_limit_bp ||
+ p.Y > mapgen_limit_bp ||
+ p.Z < -mapgen_limit_bp ||
+ p.Z > mapgen_limit_bp;
+}
+
bool ServerMap::initBlockMake(v3s16 blockpos, BlockMakeData *data)
{
s16 csize = getMapgenParams()->chunksize;
v3s16 full_bpmin = bpmin - extra_borders;
v3s16 full_bpmax = bpmax + extra_borders;
- // Do nothing if not inside limits (+-1 because of neighbors)
- if (blockpos_over_limit(full_bpmin) ||
- blockpos_over_limit(full_bpmax))
+ // Do nothing if not inside mapgen limits (+-1 because of neighbors)
+ if (blockpos_over_mapgen_limit(full_bpmin) ||
+ blockpos_over_mapgen_limit(full_bpmax))
return false;
data->seed = getSeed();
for (s16 z = full_bpmin.Z; z <= full_bpmax.Z; z++) {
v2s16 sectorpos(x, z);
// Sector metadata is loaded from disk if not already loaded.
- ServerMapSector *sector = createSector(sectorpos);
+ MapSector *sector = createSector(sectorpos);
FATAL_ERROR_IF(sector == NULL, "createSector() failed");
for (s16 y = full_bpmin.Y; y <= full_bpmax.Y; y++) {
data->transforming_liquid.pop_front();
}
- for (std::map<v3s16, MapBlock *>::iterator
- it = changed_blocks->begin();
- it != changed_blocks->end(); ++it) {
- MapBlock *block = it->second;
+ for (auto &changed_block : *changed_blocks) {
+ MapBlock *block = changed_block.second;
if (!block)
continue;
/*
//save(MOD_STATE_WRITE_AT_UNLOAD);
}
-ServerMapSector *ServerMap::createSector(v2s16 p2d)
+MapSector *ServerMap::createSector(v2s16 p2d)
{
DSTACKF("%s: p2d=(%d,%d)",
FUNCTION_NAME,
/*
Check if it exists already in memory
*/
- ServerMapSector *sector = (ServerMapSector*)getSectorNoGenerateNoEx(p2d);
- if(sector != NULL)
+ MapSector *sector = getSectorNoGenerateNoEx(p2d);
+ if (sector)
return sector;
/*
- Try to load it from disk (with blocks)
+ Do not create over max mapgen limit
*/
- //if(loadSectorFull(p2d) == true)
-
- /*
- Try to load metadata from disk
- */
-#if 0
- if(loadSectorMeta(p2d) == true)
- {
- ServerMapSector *sector = (ServerMapSector*)getSectorNoGenerateNoEx(p2d);
- if(sector == NULL)
- {
- infostream<<"ServerMap::createSector(): loadSectorFull didn't make a sector"<<std::endl;
- throw InvalidPositionException("");
- }
- return sector;
- }
-#endif
-
- /*
- Do not create over-limit.
- We are checking for any nodes of the mapblocks of the sector being beyond the limit.
- A sector is a vertical column of mapblocks, so sectorpos is like a 2D blockpos.
-
- At the negative limit we are checking for
- block minimum nodepos < -mapgenlimit.
- At the positive limit we are checking for
- block maximum nodepos > mapgenlimit.
-
- Block minimum nodepos = blockpos * mapblocksize.
- Block maximum nodepos = (blockpos + 1) * mapblocksize - 1.
- */
- const u16 map_gen_limit = MYMIN(MAX_MAP_GENERATION_LIMIT,
- g_settings->getU16("map_generation_limit"));
- if (p2d.X * MAP_BLOCKSIZE < -map_gen_limit
- || (p2d.X + 1) * MAP_BLOCKSIZE - 1 > map_gen_limit
- || p2d.Y * MAP_BLOCKSIZE < -map_gen_limit
- || (p2d.Y + 1) * MAP_BLOCKSIZE - 1 > map_gen_limit)
- throw InvalidPositionException("createSector(): pos. over limit");
+ const s16 max_limit_bp = MAX_MAP_GENERATION_LIMIT / MAP_BLOCKSIZE;
+ if (p2d.X < -max_limit_bp ||
+ p2d.X > max_limit_bp ||
+ p2d.Y < -max_limit_bp ||
+ p2d.Y > max_limit_bp)
+ throw InvalidPositionException("createSector(): pos. over max mapgen limit");
/*
Generate blank sector
*/
- sector = new ServerMapSector(this, p2d, m_gamedef);
+ sector = new MapSector(this, p2d, m_gamedef);
// Sector position on map in nodes
//v2s16 nodepos2d = p2d * MAP_BLOCKSIZE;
FUNCTION_NAME, p.X, p.Y, p.Z);
/*
- Do not create over-limit
+ Do not create over max mapgen limit
*/
- if (blockpos_over_limit(p))
- throw InvalidPositionException("createBlock(): pos. over limit");
+ if (blockpos_over_max_limit(p))
+ throw InvalidPositionException("createBlock(): pos. over max mapgen limit");
v2s16 p2d(p.X, p.Z);
s16 block_y = p.Y;
NOTE: On old save formats, this will be slow, as it generates
lighting on blocks for them.
*/
- ServerMapSector *sector;
+ MapSector *sector;
try {
- sector = (ServerMapSector*)createSector(p2d);
- assert(sector->getId() == MAPSECTOR_SERVER);
- }
- catch(InvalidPositionException &e)
- {
+ sector = createSector(p2d);
+ } catch (InvalidPositionException &e) {
infostream<<"createBlock: createSector() failed"<<std::endl;
throw e;
}
- /*
- NOTE: This should not be done, or at least the exception
- should not be passed on as std::exception, because it
- won't be catched at all.
- */
- /*catch(std::exception &e)
- {
- infostream<<"createBlock: createSector() failed: "
- <<e.what()<<std::endl;
- throw e;
- }*/
/*
Try to get a block from the sector
*/
MapBlock *block = sector->getBlockNoCreateNoEx(block_y);
- if(block)
- {
+ if (block) {
if(block->isDummy())
block->unDummify();
return block;
{
MapBlock *block = getBlockNoCreateNoEx(p);
- if(block && block->isDummy() == false)
+ if (block && !block->isDummy())
return block;
}
}
if (create_blank) {
- ServerMapSector *sector = createSector(v2s16(p.X, p.Z));
+ MapSector *sector = createSector(v2s16(p.X, p.Z));
MapBlock *block = sector->createBlankBlock(p.Y);
return block;
}
-#if 0
- if(allow_generate)
- {
- std::map<v3s16, MapBlock*> modified_blocks;
- MapBlock *block = generateBlock(p, modified_blocks);
- if(block)
- {
- MapEditEvent event;
- event.type = MEET_OTHER;
- event.p = p;
-
- // Copy modified_blocks to event
- for(std::map<v3s16, MapBlock*>::iterator
- i = modified_blocks.begin();
- i != modified_blocks.end(); ++i)
- {
- event.modified_blocks.insert(i->first);
- }
-
- // Queue event
- dispatchEvent(&event);
-
- return block;
- }
- }
-#endif
-
return NULL;
}
return block;
}
-void ServerMap::prepareBlock(MapBlock *block) {
-}
-
// N.B. This requires no synchronization, since data will not be modified unless
// the VoxelManipulator being updated belongs to the same thread.
void ServerMap::updateVManip(v3s16 pos)
void ServerMap::createDirs(std::string path)
{
- if(fs::CreateAllDirs(path) == false)
- {
+ if (!fs::CreateAllDirs(path)) {
m_dout<<"ServerMap: Failed to create directory "
<<"\""<<path<<"\""<<std::endl;
throw BaseException("ServerMap failed to create directory");
}
}
-v2s16 ServerMap::getSectorPos(std::string dirname)
+v2s16 ServerMap::getSectorPos(const std::string &dirname)
{
unsigned int x = 0, y = 0;
int r;
return pos;
}
-v3s16 ServerMap::getBlockPos(std::string sectordir, std::string blockfile)
+v3s16 ServerMap::getBlockPos(const std::string §ordir, const std::string &blockfile)
{
v2s16 p2d = getSectorPos(sectordir);
void ServerMap::save(ModifiedState save_level)
{
DSTACK(FUNCTION_NAME);
- if(m_map_saving_enabled == false) {
+ if (!m_map_saving_enabled) {
warningstream<<"Not saving map, saving disabled."<<std::endl;
return;
}
// Profile modified reasons
Profiler modprofiler;
- u32 sector_meta_count = 0;
u32 block_count = 0;
u32 block_count_all = 0; // Number of blocks in memory
// Don't do anything with sqlite unless something is really saved
bool save_started = false;
- for(std::map<v2s16, MapSector*>::iterator i = m_sectors.begin();
- i != m_sectors.end(); ++i) {
- ServerMapSector *sector = (ServerMapSector*)i->second;
- assert(sector->getId() == MAPSECTOR_SERVER);
-
- if(sector->differs_from_disk || save_level == MOD_STATE_CLEAN) {
- saveSectorMeta(sector);
- sector_meta_count++;
- }
+ for (auto §or_it : m_sectors) {
+ MapSector *sector = sector_it.second;
MapBlockVect blocks;
sector->getBlocks(blocks);
- for(MapBlockVect::iterator j = blocks.begin();
- j != blocks.end(); ++j) {
- MapBlock *block = *j;
-
+ for (MapBlock *block : blocks) {
block_count_all++;
if(block->getModified() >= (u32)save_level) {
saveBlock(block);
block_count++;
-
- /*infostream<<"ServerMap: Written block ("
- <<block->getPos().X<<","
- <<block->getPos().Y<<","
- <<block->getPos().Z<<")"
- <<std::endl;*/
}
}
}
/*
Only print if something happened or saved whole map
*/
- if(save_level == MOD_STATE_CLEAN || sector_meta_count != 0
+ if(save_level == MOD_STATE_CLEAN
|| block_count != 0) {
infostream<<"ServerMap: Written: "
- <<sector_meta_count<<" sector metadata files, "
<<block_count<<" block files"
<<", "<<block_count_all<<" blocks in memory."
<<std::endl;
void ServerMap::listAllLoadedBlocks(std::vector<v3s16> &dst)
{
- for(std::map<v2s16, MapSector*>::iterator si = m_sectors.begin();
- si != m_sectors.end(); ++si)
- {
- MapSector *sector = si->second;
+ for (auto §or_it : m_sectors) {
+ MapSector *sector = sector_it.second;
MapBlockVect blocks;
sector->getBlocks(blocks);
- for(MapBlockVect::iterator i = blocks.begin();
- i != blocks.end(); ++i) {
- v3s16 p = (*i)->getPos();
+ for (MapBlock *block : blocks) {
+ v3s16 p = block->getPos();
dst.push_back(p);
}
}
}
-void ServerMap::saveSectorMeta(ServerMapSector *sector)
-{
- DSTACK(FUNCTION_NAME);
- // Format used for writing
- u8 version = SER_FMT_VER_HIGHEST_WRITE;
- // Get destination
- v2s16 pos = sector->getPos();
- std::string dir = getSectorDir(pos);
- createDirs(dir);
-
- std::string fullpath = dir + DIR_DELIM + "meta";
- std::ostringstream ss(std::ios_base::binary);
-
- sector->serialize(ss, version);
-
- if(!fs::safeWriteToFile(fullpath, ss.str()))
- throw FileNotGoodException("Cannot write sector metafile");
-
- sector->differs_from_disk = false;
-}
-
-MapSector* ServerMap::loadSectorMeta(std::string sectordir, bool save_after_load)
-{
- DSTACK(FUNCTION_NAME);
- // Get destination
- v2s16 p2d = getSectorPos(sectordir);
-
- ServerMapSector *sector = NULL;
-
- std::string fullpath = sectordir + DIR_DELIM + "meta";
- std::ifstream is(fullpath.c_str(), std::ios_base::binary);
- if(is.good() == false)
- {
- // If the directory exists anyway, it probably is in some old
- // format. Just go ahead and create the sector.
- if(fs::PathExists(sectordir))
- {
- /*infostream<<"ServerMap::loadSectorMeta(): Sector metafile "
- <<fullpath<<" doesn't exist but directory does."
- <<" Continuing with a sector with no metadata."
- <<std::endl;*/
- sector = new ServerMapSector(this, p2d, m_gamedef);
- m_sectors[p2d] = sector;
- }
- else
- {
- throw FileNotGoodException("Cannot open sector metafile");
- }
- }
- else
- {
- sector = ServerMapSector::deSerialize
- (is, this, p2d, m_sectors, m_gamedef);
- if(save_after_load)
- saveSectorMeta(sector);
- }
-
- sector->differs_from_disk = false;
-
- return sector;
-}
-
-bool ServerMap::loadSectorMeta(v2s16 p2d)
-{
- DSTACK(FUNCTION_NAME);
-
- // The directory layout we're going to load from.
- // 1 - original sectors/xxxxzzzz/
- // 2 - new sectors2/xxx/zzz/
- // If we load from anything but the latest structure, we will
- // immediately save to the new one, and remove the old.
- int loadlayout = 1;
- std::string sectordir1 = getSectorDir(p2d, 1);
- std::string sectordir;
- if(fs::PathExists(sectordir1))
- {
- sectordir = sectordir1;
- }
- else
- {
- loadlayout = 2;
- sectordir = getSectorDir(p2d, 2);
- }
-
- try{
- loadSectorMeta(sectordir, loadlayout != 2);
- }
- catch(InvalidFilenameException &e)
- {
- return false;
- }
- catch(FileNotGoodException &e)
- {
- return false;
- }
- catch(std::exception &e)
- {
- return false;
- }
-
- return true;
-}
-
-#if 0
-bool ServerMap::loadSectorFull(v2s16 p2d)
-{
- DSTACK(FUNCTION_NAME);
-
- MapSector *sector = NULL;
-
- // The directory layout we're going to load from.
- // 1 - original sectors/xxxxzzzz/
- // 2 - new sectors2/xxx/zzz/
- // If we load from anything but the latest structure, we will
- // immediately save to the new one, and remove the old.
- int loadlayout = 1;
- std::string sectordir1 = getSectorDir(p2d, 1);
- std::string sectordir;
- if(fs::PathExists(sectordir1))
- {
- sectordir = sectordir1;
- }
- else
- {
- loadlayout = 2;
- sectordir = getSectorDir(p2d, 2);
- }
-
- try{
- sector = loadSectorMeta(sectordir, loadlayout != 2);
- }
- catch(InvalidFilenameException &e)
- {
- return false;
- }
- catch(FileNotGoodException &e)
- {
- return false;
- }
- catch(std::exception &e)
- {
- return false;
- }
-
- /*
- Load blocks
- */
- std::vector<fs::DirListNode> list2 = fs::GetDirListing
- (sectordir);
- std::vector<fs::DirListNode>::iterator i2;
- for(i2=list2.begin(); i2!=list2.end(); i2++)
- {
- // We want files
- if(i2->dir)
- continue;
- try{
- loadBlock(sectordir, i2->name, sector, loadlayout != 2);
- }
- catch(InvalidFilenameException &e)
- {
- // This catches unknown crap in directory
- }
- }
-
- if(loadlayout != 2)
- {
- infostream<<"Sector converted to new layout - deleting "<<
- sectordir1<<std::endl;
- fs::RecursiveDelete(sectordir1);
- }
-
- return true;
-}
-#endif
-
-Database *ServerMap::createDatabase(
+MapDatabase *ServerMap::createDatabase(
const std::string &name,
const std::string &savedir,
Settings &conf)
{
if (name == "sqlite3")
- return new Database_SQLite3(savedir);
+ return new MapDatabaseSQLite3(savedir);
if (name == "dummy")
return new Database_Dummy();
#if USE_LEVELDB
- else if (name == "leveldb")
+ if (name == "leveldb")
return new Database_LevelDB(savedir);
#endif
#if USE_REDIS
- else if (name == "redis")
+ if (name == "redis")
return new Database_Redis(conf);
#endif
#if USE_POSTGRESQL
- else if (name == "postgresql")
- return new Database_PostgreSQL(conf);
+ if (name == "postgresql") {
+ std::string connect_string;
+ conf.getNoEx("pgsql_connection", connect_string);
+ return new MapDatabasePostgreSQL(connect_string);
+ }
#endif
- else
- throw BaseException(std::string("Database backend ") + name + " not supported.");
+
+ throw BaseException(std::string("Database backend ") + name + " not supported.");
}
void ServerMap::beginSave()
return saveBlock(block, dbase);
}
-bool ServerMap::saveBlock(MapBlock *block, Database *db)
+bool ServerMap::saveBlock(MapBlock *block, MapDatabase *db)
{
v3s16 p3d = block->getPos();
o.write((char*) &version, 1);
block->serialize(o, version, true);
- std::string data = o.str();
- bool ret = db->saveBlock(p3d, data);
+ bool ret = db->saveBlock(p3d, o.str());
if (ret) {
// We just wrote it to the disk so clear modified flag
block->resetModified();
return ret;
}
-void ServerMap::loadBlock(std::string sectordir, std::string blockfile,
+void ServerMap::loadBlock(const std::string §ordir, const std::string &blockfile,
MapSector *sector, bool save_after_load)
{
DSTACK(FUNCTION_NAME);
std::string fullpath = sectordir + DIR_DELIM + blockfile;
try {
-
std::ifstream is(fullpath.c_str(), std::ios_base::binary);
- if(is.good() == false)
+ if (!is.good())
throw FileNotGoodException("Cannot open block file");
v3s16 p3d = getBlockPos(sectordir, blockfile);
throw SerializationError("ServerMap::loadBlock(): Failed"
" to read MapBlock version");
- /*u32 block_size = MapBlock::serializedLength(version);
- SharedBuffer<u8> data(block_size);
- is.read((char*)*data, block_size);*/
-
- // This will always return a sector because we're the server
- //MapSector *sector = emergeSector(p2d);
-
MapBlock *block = NULL;
bool created_new = false;
block = sector->getBlockNoCreateNoEx(p3d.Y);
std::string ret;
dbase->loadBlock(blockpos, &ret);
- if (ret != "") {
+ if (!ret.empty()) {
loadBlock(&ret, blockpos, createSector(p2d), false);
} else {
// Not found in database, try the files
// 2 - new sectors2/xxx/zzz/
// If we load from anything but the latest structure, we will
// immediately save to the new one, and remove the old.
- int loadlayout = 1;
std::string sectordir1 = getSectorDir(p2d, 1);
std::string sectordir;
if (fs::PathExists(sectordir1)) {
sectordir = sectordir1;
} else {
- loadlayout = 2;
sectordir = getSectorDir(p2d, 2);
}
*/
MapSector *sector = getSectorNoGenerateNoEx(p2d);
- if (sector == NULL) {
- try {
- sector = loadSectorMeta(sectordir, loadlayout != 2);
- } catch(InvalidFilenameException &e) {
- return NULL;
- } catch(FileNotGoodException &e) {
- return NULL;
- } catch(std::exception &e) {
- return NULL;
- }
- }
-
/*
Make sure file exists
*/
std::string blockfilename = getBlockFilename(blockpos);
- if (fs::PathExists(sectordir + DIR_DELIM + blockfilename) == false)
+ if (!fs::PathExists(sectordir + DIR_DELIM + blockfilename))
return NULL;
/*
*/
loadBlock(sectordir, blockfilename, sector, true);
}
+
MapBlock *block = getBlockNoCreateNoEx(blockpos);
if (created_new && (block != NULL)) {
std::map<v3s16, MapBlock*> modified_blocks;
out<<"ServerMap: ";
}
-MMVManip::MMVManip(Map *map):
- VoxelManipulator(),
- m_is_dirty(false),
- m_create_area(false),
- m_map(map)
+bool ServerMap::repairBlockLight(v3s16 blockpos,
+ std::map<v3s16, MapBlock *> *modified_blocks)
{
+ MapBlock *block = emergeBlock(blockpos, false);
+ if (!block || !block->isGenerated())
+ return false;
+ voxalgo::repair_block_light(this, block, modified_blocks);
+ return true;
}
-MMVManip::~MMVManip()
+MMVManip::MMVManip(Map *map):
+ VoxelManipulator(),
+ m_map(map)
{
}
if(block_data_inexistent)
{
- if (load_if_inexistent && !blockpos_over_limit(p)) {
+ if (load_if_inexistent && !blockpos_over_max_limit(p)) {
ServerMap *svrmap = (ServerMap *)m_map;
block = svrmap->emergeBlock(p, false);
if (block == NULL)
/*
Copy data of all blocks
*/
- for(std::map<v3s16, u8>::iterator
- i = m_loaded_blocks.begin();
- i != m_loaded_blocks.end(); ++i)
- {
- v3s16 p = i->first;
+ for (auto &loaded_block : m_loaded_blocks) {
+ v3s16 p = loaded_block.first;
MapBlock *block = m_map->getBlockNoCreateNoEx(p);
- bool existed = !(i->second & VMANIP_BLOCK_DATA_INEXIST);
- if ((existed == false) || (block == NULL) ||
- (overwrite_generated == false && block->isGenerated() == true))
+ bool existed = !(loaded_block.second & VMANIP_BLOCK_DATA_INEXIST);
+ if (!existed || (block == NULL) ||
+ (!overwrite_generated && block->isGenerated()))
continue;
block->copyFrom(*this);
projects / dragonfireclient.git / blobdiff