#include "database-dummy.h"
#include "database-sqlite3.h"
#include <deque>
+#include <queue>
#if USE_LEVELDB
#include "database-leveldb.h"
#endif
{
INodeDefManager *nodemgr = m_gamedef->ndef();
- /*m_dout<<DTIME<<"Map::updateLighting(): "
+ /*m_dout<<"Map::updateLighting(): "
<<a_blocks.size()<<" blocks."<<std::endl;*/
//TimeTaker timer("updateLighting");
INodeDefManager *ndef = m_gamedef->ndef();
/*PrintInfo(m_dout);
- m_dout<<DTIME<<"Map::addNodeAndUpdate(): p=("
+ m_dout<<"Map::addNodeAndUpdate(): p=("
<<p.X<<","<<p.Y<<","<<p.Z<<")"<<std::endl;*/
/*
{
s16 y = p.Y - 1;
for(;; y--){
- //m_dout<<DTIME<<"y="<<y<<std::endl;
+ //m_dout<<"y="<<y<<std::endl;
v3s16 n2pos(p.X, y, p.Z);
MapNode n2;
INodeDefManager *ndef = m_gamedef->ndef();
/*PrintInfo(m_dout);
- m_dout<<DTIME<<"Map::removeNodeAndUpdate(): p=("
+ m_dout<<"Map::removeNodeAndUpdate(): p=("
<<p.X<<","<<p.Y<<","<<p.Z<<")"<<std::endl;*/
bool node_under_sunlight = true;
if(node_under_sunlight)
{
s16 ybottom = propagateSunlight(p, modified_blocks);
- /*m_dout<<DTIME<<"Node was under sunlight. "
+ /*m_dout<<"Node was under sunlight. "
"Propagating sunlight";
- m_dout<<DTIME<<" -> ybottom="<<ybottom<<std::endl;*/
+ m_dout<<" -> ybottom="<<ybottom<<std::endl;*/
s16 y = p.Y;
for(; y >= ybottom; y--)
{
v3s16 p2(p.X, y, p.Z);
- /*m_dout<<DTIME<<"lighting neighbors of node ("
+ /*m_dout<<"lighting neighbors of node ("
<<p2.X<<","<<p2.Y<<","<<p2.Z<<")"
<<std::endl;*/
lightNeighbors(LIGHTBANK_DAY, p2, modified_blocks);
return false;
}
+struct TimeOrderedMapBlock {
+ MapSector *sect;
+ MapBlock *block;
+
+ TimeOrderedMapBlock(MapSector *sect, MapBlock *block) :
+ sect(sect),
+ block(block)
+ {}
+
+ bool operator<(const TimeOrderedMapBlock &b) const
+ {
+ return block->getUsageTimer() < b.block->getUsageTimer();
+ };
+};
+
/*
Updates usage timers
*/
-void Map::timerUpdate(float dtime, float unload_timeout,
+void Map::timerUpdate(float dtime, float unload_timeout, u32 max_loaded_blocks,
std::vector<v3s16> *unloaded_blocks)
{
bool save_before_unloading = (mapType() == MAPTYPE_SERVER);
u32 block_count_all = 0;
beginSave();
- for(std::map<v2s16, MapSector*>::iterator si = m_sectors.begin();
- si != m_sectors.end(); ++si) {
- MapSector *sector = si->second;
- bool all_blocks_deleted = true;
+ // 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;
- MapBlockVect blocks;
- sector->getBlocks(blocks);
+ bool all_blocks_deleted = true;
- for(MapBlockVect::iterator i = blocks.begin();
- i != blocks.end(); ++i) {
- MapBlock *block = (*i);
+ MapBlockVect blocks;
+ sector->getBlocks(blocks);
- block->incrementUsageTimer(dtime);
+ for (MapBlockVect::iterator i = blocks.begin();
+ i != blocks.end(); ++i) {
+ MapBlock *block = (*i);
- if(block->refGet() == 0 && block->getUsageTimer() > unload_timeout) {
- v3s16 p = block->getPos();
+ block->incrementUsageTimer(dtime);
- // Save if modified
- if (block->getModified() != MOD_STATE_CLEAN && save_before_unloading) {
- modprofiler.add(block->getModifiedReasonString(), 1);
- if (!saveBlock(block))
- continue;
- saved_blocks_count++;
- }
+ if (block->refGet() == 0
+ && block->getUsageTimer() > unload_timeout) {
+ v3s16 p = block->getPos();
+
+ // Save if modified
+ if (block->getModified() != MOD_STATE_CLEAN
+ && save_before_unloading) {
+ modprofiler.add(block->getModifiedReasonString(), 1);
+ if (!saveBlock(block))
+ continue;
+ saved_blocks_count++;
+ }
- // Delete from memory
- sector->deleteBlock(block);
+ // Delete from memory
+ sector->deleteBlock(block);
- if(unloaded_blocks)
- unloaded_blocks->push_back(p);
+ if (unloaded_blocks)
+ unloaded_blocks->push_back(p);
- deleted_blocks_count++;
+ deleted_blocks_count++;
+ } else {
+ all_blocks_deleted = false;
+ block_count_all++;
+ }
}
- else {
- all_blocks_deleted = false;
- block_count_all++;
+
+ if (all_blocks_deleted) {
+ sector_deletion_queue.push_back(si->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;
+
+ MapBlockVect blocks;
+ sector->getBlocks(blocks);
+
+ for(MapBlockVect::iterator i = blocks.begin();
+ i != blocks.end(); ++i) {
+ MapBlock *block = (*i);
- if(all_blocks_deleted) {
- sector_deletion_queue.push_back(si->first);
+ block->incrementUsageTimer(dtime);
+ mapblock_queue.push(TimeOrderedMapBlock(sector, block));
+ }
+ }
+ block_count_all = mapblock_queue.size();
+ // Delete old blocks, and blocks over the limit from the memory
+ while (!mapblock_queue.empty() && (mapblock_queue.size() > max_loaded_blocks
+ || mapblock_queue.top().block->getUsageTimer() > unload_timeout)) {
+ TimeOrderedMapBlock b = mapblock_queue.top();
+ mapblock_queue.pop();
+
+ MapBlock *block = b.block;
+
+ if (block->refGet() != 0)
+ continue;
+
+ v3s16 p = block->getPos();
+
+ // Save if modified
+ if (block->getModified() != MOD_STATE_CLEAN && save_before_unloading) {
+ modprofiler.add(block->getModifiedReasonString(), 1);
+ if (!saveBlock(block))
+ continue;
+ saved_blocks_count++;
+ }
+
+ // Delete from memory
+ b.sect->deleteBlock(block);
+
+ if (unloaded_blocks)
+ unloaded_blocks->push_back(p);
+
+ deleted_blocks_count++;
+ 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);
+ }
}
}
endSave();
void Map::unloadUnreferencedBlocks(std::vector<v3s16> *unloaded_blocks)
{
- timerUpdate(0.0, -1.0, unloaded_blocks);
+ timerUpdate(0.0, -1.0, 0, unloaded_blocks);
}
void Map::deleteSectors(std::vector<v2s16> §orList)
INodeDefManager *nodemgr = m_gamedef->ndef();
- DSTACK(__FUNCTION_NAME);
+ DSTACK(FUNCTION_NAME);
//TimeTaker timer("transformLiquids()");
u32 loopcount = 0;
loop_max *= m_transforming_liquid_loop_count_multiplier;
#endif
- while(m_transforming_liquid.size() != 0)
+ while (m_transforming_liquid.size() != 0)
{
// This should be done here so that it is done when continue is used
- if(loopcount >= initial_size || loopcount >= loop_max)
+ if (loopcount >= initial_size || loopcount >= loop_max)
break;
loopcount++;
*/
s8 liquid_level = -1;
content_t liquid_kind = CONTENT_IGNORE;
- LiquidType liquid_type = nodemgr->get(n0).liquid_type;
+ content_t floodable_node = CONTENT_AIR;
+ ContentFeatures cf = nodemgr->get(n0);
+ LiquidType liquid_type = cf.liquid_type;
switch (liquid_type) {
case LIQUID_SOURCE:
liquid_level = LIQUID_LEVEL_SOURCE;
- liquid_kind = nodemgr->getId(nodemgr->get(n0).liquid_alternative_flowing);
+ liquid_kind = nodemgr->getId(cf.liquid_alternative_flowing);
break;
case LIQUID_FLOWING:
liquid_level = (n0.param2 & LIQUID_LEVEL_MASK);
liquid_kind = n0.getContent();
break;
case LIQUID_NONE:
- // if this is an air node, it *could* be transformed into a liquid. otherwise,
- // continue with the next node.
- if (n0.getContent() != CONTENT_AIR)
+ // if this node is 'floodable', it *could* be transformed
+ // into a liquid, otherwise, continue with the next node.
+ if (!cf.floodable)
continue;
+ floodable_node = n0.getContent();
liquid_kind = CONTENT_AIR;
break;
}
}
v3s16 npos = p0 + dirs[i];
NodeNeighbor nb(getNodeNoEx(npos), nt, npos);
+ ContentFeatures cfnb = nodemgr->get(nb.n);
switch (nodemgr->get(nb.n.getContent()).liquid_type) {
case LIQUID_NONE:
- if (nb.n.getContent() == CONTENT_AIR) {
+ if (cfnb.floodable) {
airs[num_airs++] = nb;
// if the current node is a water source the neighbor
// should be enqueded for transformation regardless of whether the
if (nb.t != NEIGHBOR_UPPER && liquid_type != LIQUID_NONE)
m_transforming_liquid.push_back(npos);
// if the current node happens to be a flowing node, it will start to flow down here.
- if (nb.t == NEIGHBOR_LOWER) {
+ if (nb.t == NEIGHBOR_LOWER)
flowing_down = true;
- }
} else {
neutrals[num_neutrals++] = nb;
+ // If neutral below is ignore prevent water spreading outwards
+ if (nb.t == NEIGHBOR_LOWER &&
+ nb.n.getContent() == CONTENT_IGNORE)
+ flowing_down = true;
}
break;
case LIQUID_SOURCE:
// if this node is not (yet) of a liquid type, choose the first liquid type we encounter
if (liquid_kind == CONTENT_AIR)
- liquid_kind = nodemgr->getId(nodemgr->get(nb.n).liquid_alternative_flowing);
- if (nodemgr->getId(nodemgr->get(nb.n).liquid_alternative_flowing) != liquid_kind) {
+ liquid_kind = nodemgr->getId(cfnb.liquid_alternative_flowing);
+ if (nodemgr->getId(cfnb.liquid_alternative_flowing) != liquid_kind) {
neutrals[num_neutrals++] = nb;
} else {
// Do not count bottom source, it will screw things up
case LIQUID_FLOWING:
// if this node is not (yet) of a liquid type, choose the first liquid type we encounter
if (liquid_kind == CONTENT_AIR)
- liquid_kind = nodemgr->getId(nodemgr->get(nb.n).liquid_alternative_flowing);
- if (nodemgr->getId(nodemgr->get(nb.n).liquid_alternative_flowing) != liquid_kind) {
+ liquid_kind = nodemgr->getId(cfnb.liquid_alternative_flowing);
+ if (nodemgr->getId(cfnb.liquid_alternative_flowing) != liquid_kind) {
neutrals[num_neutrals++] = nb;
} else {
flows[num_flows++] = nb;
s8 max_node_level = -1;
u8 range = nodemgr->get(liquid_kind).liquid_range;
- if (range > LIQUID_LEVEL_MAX+1)
- range = LIQUID_LEVEL_MAX+1;
+ if (range > LIQUID_LEVEL_MAX + 1)
+ range = LIQUID_LEVEL_MAX + 1;
if ((num_sources >= 2 && nodemgr->get(liquid_kind).liquid_renewable) || liquid_type == LIQUID_SOURCE) {
// liquid_kind will be set to either the flowing alternative of the node (if it's a liquid)
new_node_content = nodemgr->getId(nodemgr->get(liquid_kind).liquid_alternative_source);
} else if (num_sources >= 1 && sources[0].t != NEIGHBOR_LOWER) {
// liquid_kind is set properly, see above
- new_node_content = liquid_kind;
max_node_level = new_node_level = LIQUID_LEVEL_MAX;
- if (new_node_level < (LIQUID_LEVEL_MAX+1-range))
- new_node_content = CONTENT_AIR;
+ if (new_node_level >= (LIQUID_LEVEL_MAX + 1 - range))
+ new_node_content = liquid_kind;
+ else
+ new_node_content = floodable_node;
} else {
// no surrounding sources, so get the maximum level that can flow into this node
for (u16 i = 0; i < num_flows; i++) {
max_node_level = LIQUID_LEVEL_MAX;
if (nb_liquid_level + WATER_DROP_BOOST < LIQUID_LEVEL_MAX)
max_node_level = nb_liquid_level + WATER_DROP_BOOST;
- } else if (nb_liquid_level > max_node_level)
+ } else if (nb_liquid_level > max_node_level) {
max_node_level = nb_liquid_level;
+ }
break;
case NEIGHBOR_LOWER:
break;
case NEIGHBOR_SAME_LEVEL:
if ((flows[i].n.param2 & LIQUID_FLOW_DOWN_MASK) != LIQUID_FLOW_DOWN_MASK &&
- nb_liquid_level > 0 && nb_liquid_level - 1 > max_node_level) {
+ nb_liquid_level > 0 && nb_liquid_level - 1 > max_node_level)
max_node_level = nb_liquid_level - 1;
- }
break;
}
}
new_node_level = liquid_level + 1;
if (new_node_level != max_node_level)
must_reflow.push_back(p0);
- } else
+ } else {
new_node_level = max_node_level;
+ }
- if (max_node_level >= (LIQUID_LEVEL_MAX+1-range))
+ if (max_node_level >= (LIQUID_LEVEL_MAX + 1 - range))
new_node_content = liquid_kind;
else
- new_node_content = CONTENT_AIR;
+ new_node_content = floodable_node;
}
/*
check if anything has changed. if not, just continue with the next node.
*/
- if (new_node_content == n0.getContent() && (nodemgr->get(n0.getContent()).liquid_type != LIQUID_FLOWING ||
- ((n0.param2 & LIQUID_LEVEL_MASK) == (u8)new_node_level &&
- ((n0.param2 & LIQUID_FLOW_DOWN_MASK) == LIQUID_FLOW_DOWN_MASK)
- == flowing_down)))
+ if (new_node_content == n0.getContent() &&
+ (nodemgr->get(n0.getContent()).liquid_type != LIQUID_FLOWING ||
+ ((n0.param2 & LIQUID_LEVEL_MASK) == (u8)new_node_level &&
+ ((n0.param2 & LIQUID_FLOW_DOWN_MASK) == LIQUID_FLOW_DOWN_MASK)
+ == flowing_down)))
continue;
// Find out whether there is a suspect for this action
std::string suspect;
- if(m_gamedef->rollback()) {
+ if (m_gamedef->rollback())
suspect = m_gamedef->rollback()->getSuspect(p0, 83, 1);
- }
- if(m_gamedef->rollback() && !suspect.empty()){
+ if (m_gamedef->rollback() && !suspect.empty()) {
// Blame suspect
RollbackScopeActor rollback_scope(m_gamedef->rollback(), suspect, true);
// Get old node for rollback
v3s16 blockpos = getNodeBlockPos(p0);
MapBlock *block = getBlockNoCreateNoEx(blockpos);
- if(block != NULL) {
+ if (block != NULL) {
modified_blocks[blockpos] = block;
// If new or old node emits light, MapBlock requires lighting update
- if(nodemgr->get(n0).light_source != 0 ||
+ if (nodemgr->get(n0).light_source != 0 ||
nodemgr->get(n00).light_source != 0)
lighting_modified_blocks[block->getPos()] = block;
}
block = emergeBlock(blockpos, false);
}
if(!block){
- infostream<<"WARNING: Map::getNodeMetadata(): Block not found"
+ warningstream<<"Map::getNodeMetadata(): Block not found"
<<std::endl;
return NULL;
}
block = emergeBlock(blockpos, false);
}
if(!block){
- infostream<<"WARNING: Map::setNodeMetadata(): Block not found"
+ warningstream<<"Map::setNodeMetadata(): Block not found"
<<std::endl;
return false;
}
MapBlock *block = getBlockNoCreateNoEx(blockpos);
if(block == NULL)
{
- infostream<<"WARNING: Map::removeNodeMetadata(): Block not found"
+ warningstream<<"Map::removeNodeMetadata(): Block not found"
<<std::endl;
return;
}
block = emergeBlock(blockpos, false);
}
if(!block){
- infostream<<"WARNING: Map::getNodeTimer(): Block not found"
+ warningstream<<"Map::getNodeTimer(): Block not found"
<<std::endl;
return NodeTimer();
}
block = emergeBlock(blockpos, false);
}
if(!block){
- infostream<<"WARNING: Map::setNodeTimer(): Block not found"
+ warningstream<<"Map::setNodeTimer(): Block not found"
<<std::endl;
return;
}
MapBlock *block = getBlockNoCreateNoEx(blockpos);
if(block == NULL)
{
- infostream<<"WARNING: Map::removeNodeTimer(): Block not found"
+ warningstream<<"Map::removeNodeTimer(): Block not found"
<<std::endl;
return;
}
m_emerge(emerge),
m_map_metadata_changed(true)
{
- verbosestream<<__FUNCTION_NAME<<std::endl;
+ verbosestream<<FUNCTION_NAME<<std::endl;
/*
Try to load map; if not found, create a new one.
<<" Using default settings."<<std::endl;
}
catch(FileNotGoodException &e){
- infostream<<"WARNING: Could not load map metadata"
+ warningstream<<"Could not load map metadata"
//<<" Disabling chunk-based generator."
<<std::endl;
//m_chunksize = 0;
}
catch(std::exception &e)
{
- infostream<<"WARNING: ServerMap: Failed to load map from "<<savedir
+ warningstream<<"ServerMap: Failed to load map from "<<savedir
<<", exception: "<<e.what()<<std::endl;
infostream<<"Please remove the map or fix it."<<std::endl;
- infostream<<"WARNING: Map saving will be disabled."<<std::endl;
+ warningstream<<"Map saving will be disabled."<<std::endl;
}
infostream<<"Initializing new map."<<std::endl;
ServerMap::~ServerMap()
{
- verbosestream<<__FUNCTION_NAME<<std::endl;
+ verbosestream<<FUNCTION_NAME<<std::endl;
try
{
return m_emerge->params.water_level;
}
-bool ServerMap::initBlockMake(BlockMakeData *data, v3s16 blockpos)
+bool ServerMap::initBlockMake(v3s16 blockpos, BlockMakeData *data)
{
- bool enable_mapgen_debug_info = m_emerge->mapgen_debug_info;
- EMERGE_DBG_OUT("initBlockMake(): " PP(blockpos) " - " PP(blockpos));
+ s16 csize = m_emerge->params.chunksize;
+ v3s16 bpmin = EmergeManager::getContainingChunk(blockpos, csize);
+ v3s16 bpmax = bpmin + v3s16(1, 1, 1) * (csize - 1);
- s16 chunksize = m_emerge->params.chunksize;
- s16 coffset = -chunksize / 2;
- v3s16 chunk_offset(coffset, coffset, coffset);
- v3s16 blockpos_div = getContainerPos(blockpos - chunk_offset, chunksize);
- v3s16 blockpos_min = blockpos_div * chunksize;
- v3s16 blockpos_max = blockpos_div * chunksize + v3s16(1,1,1)*(chunksize-1);
- blockpos_min += chunk_offset;
- blockpos_max += chunk_offset;
+ bool enable_mapgen_debug_info = m_emerge->enable_mapgen_debug_info;
+ EMERGE_DBG_OUT("initBlockMake(): " PP(bpmin) " - " PP(bpmax));
- v3s16 extra_borders(1,1,1);
+ v3s16 extra_borders(1, 1, 1);
+ 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(blockpos_min - extra_borders) ||
- blockpos_over_limit(blockpos_max + extra_borders))
+ if (blockpos_over_limit(full_bpmin) ||
+ blockpos_over_limit(full_bpmax))
return false;
data->seed = m_emerge->params.seed;
- data->blockpos_min = blockpos_min;
- data->blockpos_max = blockpos_max;
+ data->blockpos_min = bpmin;
+ data->blockpos_max = bpmax;
data->blockpos_requested = blockpos;
data->nodedef = m_gamedef->ndef();
/*
Create the whole area of this and the neighboring blocks
*/
- {
- //TimeTaker timer("initBlockMake() create area");
-
- for(s16 x=blockpos_min.X-extra_borders.X;
- x<=blockpos_max.X+extra_borders.X; x++)
- for(s16 z=blockpos_min.Z-extra_borders.Z;
- z<=blockpos_max.Z+extra_borders.Z; z++)
- {
- v2s16 sectorpos(x, z);
- // Sector metadata is loaded from disk if not already loaded.
- ServerMapSector *sector = createSector(sectorpos);
- FATAL_ERROR_IF(sector == NULL, "createSector() failed");
- (void) sector;
-
- for(s16 y=blockpos_min.Y-extra_borders.Y;
- y<=blockpos_max.Y+extra_borders.Y; y++)
- {
- v3s16 p(x,y,z);
- //MapBlock *block = createBlock(p);
- // 1) get from memory, 2) load from disk
- MapBlock *block = emergeBlock(p, false);
- // 3) create a blank one
- if(block == NULL)
- {
- block = createBlock(p);
-
- /*
- Block gets sunlight if this is true.
+ for (s16 x = full_bpmin.X; x <= full_bpmax.X; x++)
+ 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);
+ FATAL_ERROR_IF(sector == NULL, "createSector() failed");
+
+ for (s16 y = full_bpmin.Y; y <= full_bpmax.Y; y++) {
+ v3s16 p(x, y, z);
- Refer to the map generator heuristics.
- */
- bool ug = m_emerge->isBlockUnderground(p);
- block->setIsUnderground(ug);
- }
+ MapBlock *block = emergeBlock(p, false);
+ if (block == NULL) {
+ block = createBlock(p);
- // Lighting will not be valid after make_chunk is called
- block->setLightingExpired(true);
- // Lighting will be calculated
- //block->setLightingExpired(false);
+ // Block gets sunlight if this is true.
+ // Refer to the map generator heuristics.
+ bool ug = m_emerge->isBlockUnderground(p);
+ block->setIsUnderground(ug);
}
}
}
neighboring blocks
*/
- // The area that contains this block and it's neighbors
- v3s16 bigarea_blocks_min = blockpos_min - extra_borders;
- v3s16 bigarea_blocks_max = blockpos_max + extra_borders;
-
data->vmanip = new MMVManip(this);
- //data->vmanip->setMap(this);
-
- // Add the area
- {
- //TimeTaker timer("initBlockMake() initialEmerge");
- data->vmanip->initialEmerge(bigarea_blocks_min, bigarea_blocks_max);
- }
+ data->vmanip->initialEmerge(full_bpmin, full_bpmax);
- // Ensure none of the blocks to be generated were marked as containing CONTENT_IGNORE
-/* for (s16 z = blockpos_min.Z; z <= blockpos_max.Z; z++) {
+ // Note: we may need this again at some point.
+#if 0
+ // Ensure none of the blocks to be generated were marked as
+ // containing CONTENT_IGNORE
+ for (s16 z = blockpos_min.Z; z <= blockpos_max.Z; z++) {
for (s16 y = blockpos_min.Y; y <= blockpos_max.Y; y++) {
for (s16 x = blockpos_min.X; x <= blockpos_max.X; x++) {
core::map<v3s16, u8>::Node *n;
n->setValue(flags);
}
}
- }*/
+ }
+#endif
// Data is ready now.
return true;
}
void ServerMap::finishBlockMake(BlockMakeData *data,
- std::map<v3s16, MapBlock*> &changed_blocks)
+ std::map<v3s16, MapBlock*> *changed_blocks)
{
- v3s16 blockpos_min = data->blockpos_min;
- v3s16 blockpos_max = data->blockpos_max;
- v3s16 blockpos_requested = data->blockpos_requested;
- /*infostream<<"finishBlockMake(): ("<<blockpos_requested.X<<","
- <<blockpos_requested.Y<<","
- <<blockpos_requested.Z<<")"<<std::endl;*/
+ v3s16 bpmin = data->blockpos_min;
+ v3s16 bpmax = data->blockpos_max;
- v3s16 extra_borders(1,1,1);
+ v3s16 extra_borders(1, 1, 1);
+ v3s16 full_bpmin = bpmin - extra_borders;
+ v3s16 full_bpmax = bpmax + extra_borders;
- bool enable_mapgen_debug_info = m_emerge->mapgen_debug_info;
+ bool enable_mapgen_debug_info = m_emerge->enable_mapgen_debug_info;
+ EMERGE_DBG_OUT("finishBlockMake(): " PP(bpmin) " - " PP(bpmax));
- /*infostream<<"Resulting vmanip:"<<std::endl;
- data->vmanip.print(infostream);*/
+ /*
+ Set lighting to non-expired state in all of them.
+ This is cheating, but it is not fast enough if all of them
+ would actually be updated.
+ */
+ for (s16 x = full_bpmin.X; x <= full_bpmax.X; x++)
+ for (s16 z = full_bpmin.Z; z <= full_bpmax.Z; z++)
+ for (s16 y = full_bpmin.Y; y <= full_bpmax.Y; y++) {
+ MapBlock *block = emergeBlock(v3s16(x, y, z), false);
+ if (!block)
+ continue;
- // Make sure affected blocks are loaded
- for(s16 x=blockpos_min.X-extra_borders.X;
- x<=blockpos_max.X+extra_borders.X; x++)
- for(s16 z=blockpos_min.Z-extra_borders.Z;
- z<=blockpos_max.Z+extra_borders.Z; z++)
- for(s16 y=blockpos_min.Y-extra_borders.Y;
- y<=blockpos_max.Y+extra_borders.Y; y++)
- {
- v3s16 p(x, y, z);
- // Load from disk if not already in memory
- emergeBlock(p, false);
+ block->setLightingExpired(false);
}
/*
Blit generated stuff to map
NOTE: blitBackAll adds nearly everything to changed_blocks
*/
- {
- // 70ms @cs=8
- //TimeTaker timer("finishBlockMake() blitBackAll");
- data->vmanip->blitBackAll(&changed_blocks);
- }
+ data->vmanip->blitBackAll(changed_blocks);
- EMERGE_DBG_OUT("finishBlockMake: changed_blocks.size()=" << changed_blocks.size());
+ EMERGE_DBG_OUT("finishBlockMake: changed_blocks.size()="
+ << changed_blocks->size());
/*
Copy transforming liquid information
*/
- while(data->transforming_liquid.size() > 0)
- {
+ while (data->transforming_liquid.size()) {
m_transforming_liquid.push_back(data->transforming_liquid.front());
data->transforming_liquid.pop_front();
}
- /*
- Do stuff in central blocks
- */
-
- /*
- Update lighting
- */
- {
-#if 0
- TimeTaker t("finishBlockMake lighting update");
-
- core::map<v3s16, MapBlock*> lighting_update_blocks;
-
- // Center blocks
- for(s16 x=blockpos_min.X-extra_borders.X;
- x<=blockpos_max.X+extra_borders.X; x++)
- for(s16 z=blockpos_min.Z-extra_borders.Z;
- z<=blockpos_max.Z+extra_borders.Z; z++)
- for(s16 y=blockpos_min.Y-extra_borders.Y;
- y<=blockpos_max.Y+extra_borders.Y; y++)
- {
- v3s16 p(x, y, z);
- MapBlock *block = getBlockNoCreateNoEx(p);
- assert(block);
- lighting_update_blocks.insert(block->getPos(), block);
- }
-
- updateLighting(lighting_update_blocks, changed_blocks);
-#endif
-
- /*
- Set lighting to non-expired state in all of them.
- This is cheating, but it is not fast enough if all of them
- would actually be updated.
- */
- for(s16 x=blockpos_min.X-extra_borders.X;
- x<=blockpos_max.X+extra_borders.X; x++)
- for(s16 z=blockpos_min.Z-extra_borders.Z;
- z<=blockpos_max.Z+extra_borders.Z; z++)
- for(s16 y=blockpos_min.Y-extra_borders.Y;
- y<=blockpos_max.Y+extra_borders.Y; y++)
- {
- v3s16 p(x, y, z);
- MapBlock * block = getBlockNoCreateNoEx(p);
- if (block != NULL)
- block->setLightingExpired(false);
- }
-
-#if 0
- if(enable_mapgen_debug_info == false)
- t.stop(true); // Hide output
-#endif
- }
-
- /*
- Go through changed blocks
- */
- for(std::map<v3s16, MapBlock*>::iterator i = changed_blocks.begin();
- i != changed_blocks.end(); ++i)
- {
- MapBlock *block = i->second;
+ for (std::map<v3s16, MapBlock *>::iterator
+ it = changed_blocks->begin();
+ it != changed_blocks->end(); ++it) {
+ MapBlock *block = it->second;
if (!block)
continue;
/*
/*
Set central blocks as generated
*/
- for(s16 x=blockpos_min.X; x<=blockpos_max.X; x++)
- for(s16 z=blockpos_min.Z; z<=blockpos_max.Z; z++)
- for(s16 y=blockpos_min.Y; y<=blockpos_max.Y; y++)
- {
- v3s16 p(x, y, z);
- MapBlock *block = getBlockNoCreateNoEx(p);
+ for (s16 x = bpmin.X; x <= bpmax.X; x++)
+ for (s16 z = bpmin.Z; z <= bpmax.Z; z++)
+ for (s16 y = bpmin.Y; y <= bpmax.Y; y++) {
+ MapBlock *block = getBlockNoCreateNoEx(v3s16(x, y, z));
if (!block)
continue;
+
block->setGenerated(true);
}
NOTE: Will be saved later.
*/
//save(MOD_STATE_WRITE_AT_UNLOAD);
-
- /*infostream<<"finishBlockMake() done for ("<<blockpos_requested.X
- <<","<<blockpos_requested.Y<<","
- <<blockpos_requested.Z<<")"<<std::endl;*/
-
-
-#if 0
- if(enable_mapgen_debug_info)
- {
- /*
- Analyze resulting blocks
- */
- /*for(s16 x=blockpos_min.X-1; x<=blockpos_max.X+1; x++)
- for(s16 z=blockpos_min.Z-1; z<=blockpos_max.Z+1; z++)
- for(s16 y=blockpos_min.Y-1; y<=blockpos_max.Y+1; y++)*/
- for(s16 x=blockpos_min.X-0; x<=blockpos_max.X+0; x++)
- for(s16 z=blockpos_min.Z-0; z<=blockpos_max.Z+0; z++)
- for(s16 y=blockpos_min.Y-0; y<=blockpos_max.Y+0; y++)
- {
- v3s16 p = v3s16(x,y,z);
- MapBlock *block = getBlockNoCreateNoEx(p);
- char spos[20];
- snprintf(spos, 20, "(%2d,%2d,%2d)", x, y, z);
- infostream<<"Generated "<<spos<<": "
- <<analyze_block(block)<<std::endl;
- }
- }
-#endif
-
- getBlockNoCreateNoEx(blockpos_requested);
}
-ServerMapSector * ServerMap::createSector(v2s16 p2d)
+ServerMapSector *ServerMap::createSector(v2s16 p2d)
{
DSTACKF("%s: p2d=(%d,%d)",
- __FUNCTION_NAME,
+ FUNCTION_NAME,
p2d.X, p2d.Y);
/*
/*
Do not create over-limit
*/
- if(p2d.X < -MAP_GENERATION_LIMIT / MAP_BLOCKSIZE
- || p2d.X > MAP_GENERATION_LIMIT / MAP_BLOCKSIZE
- || p2d.Y < -MAP_GENERATION_LIMIT / MAP_BLOCKSIZE
- || p2d.Y > MAP_GENERATION_LIMIT / MAP_BLOCKSIZE)
+ const static u16 map_gen_limit = MYMIN(MAX_MAP_GENERATION_LIMIT,
+ g_settings->getU16("map_generation_limit"));
+ if(p2d.X < -map_gen_limit / MAP_BLOCKSIZE
+ || p2d.X > map_gen_limit / MAP_BLOCKSIZE
+ || p2d.Y < -map_gen_limit / MAP_BLOCKSIZE
+ || p2d.Y > map_gen_limit / MAP_BLOCKSIZE)
throw InvalidPositionException("createSector(): pos. over limit");
/*
std::map<v3s16, MapBlock*> &modified_blocks
)
{
- DSTACKF("%s: p=(%d,%d,%d)", __FUNCTION_NAME, p.X, p.Y, p.Z);
+ DSTACKF("%s: p=(%d,%d,%d)", FUNCTION_NAME, p.X, p.Y, p.Z);
/*infostream<<"generateBlock(): "
<<"("<<p.X<<","<<p.Y<<","<<p.Z<<")"
*/
if(blockpos_over_limit(p))
{
- infostream<<__FUNCTION_NAME<<": Block position over limit"<<std::endl;
+ infostream<<FUNCTION_NAME<<": Block position over limit"<<std::endl;
throw InvalidPositionException("generateBlock(): pos. over limit");
}
MapBlock * ServerMap::createBlock(v3s16 p)
{
DSTACKF("%s: p=(%d,%d,%d)",
- __FUNCTION_NAME, p.X, p.Y, p.Z);
+ FUNCTION_NAME, p.X, p.Y, p.Z);
/*
Do not create over-limit
*/
- if(p.X < -MAP_GENERATION_LIMIT / MAP_BLOCKSIZE
- || p.X > MAP_GENERATION_LIMIT / MAP_BLOCKSIZE
- || p.Y < -MAP_GENERATION_LIMIT / MAP_BLOCKSIZE
- || p.Y > MAP_GENERATION_LIMIT / MAP_BLOCKSIZE
- || p.Z < -MAP_GENERATION_LIMIT / MAP_BLOCKSIZE
- || p.Z > MAP_GENERATION_LIMIT / MAP_BLOCKSIZE)
+ if (blockpos_over_limit(p))
throw InvalidPositionException("createBlock(): pos. over limit");
v2s16 p2d(p.X, p.Z);
MapBlock * ServerMap::emergeBlock(v3s16 p, bool create_blank)
{
DSTACKF("%s: p=(%d,%d,%d), create_blank=%d",
- __FUNCTION_NAME,
+ FUNCTION_NAME,
p.X, p.Y, p.Z, create_blank);
{
{
if(fs::CreateAllDirs(path) == false)
{
- m_dout<<DTIME<<"ServerMap: Failed to create directory "
+ m_dout<<"ServerMap: Failed to create directory "
<<"\""<<path<<"\""<<std::endl;
throw BaseException("ServerMap failed to create directory");
}
void ServerMap::save(ModifiedState save_level)
{
- DSTACK(__FUNCTION_NAME);
+ DSTACK(FUNCTION_NAME);
if(m_map_saving_enabled == false) {
- infostream<<"WARNING: Not saving map, saving disabled."<<std::endl;
+ warningstream<<"Not saving map, saving disabled."<<std::endl;
return;
}
void ServerMap::saveMapMeta()
{
- DSTACK(__FUNCTION_NAME);
+ DSTACK(FUNCTION_NAME);
createDirs(m_savedir);
void ServerMap::loadMapMeta()
{
- DSTACK(__FUNCTION_NAME);
+ DSTACK(FUNCTION_NAME);
Settings conf;
std::string fullpath = m_savedir + DIR_DELIM + "map_meta.txt";
void ServerMap::saveSectorMeta(ServerMapSector *sector)
{
- DSTACK(__FUNCTION_NAME);
+ DSTACK(FUNCTION_NAME);
// Format used for writing
u8 version = SER_FMT_VER_HIGHEST_WRITE;
// Get destination
MapSector* ServerMap::loadSectorMeta(std::string sectordir, bool save_after_load)
{
- DSTACK(__FUNCTION_NAME);
+ DSTACK(FUNCTION_NAME);
// Get destination
v2s16 p2d = getSectorPos(sectordir);
bool ServerMap::loadSectorMeta(v2s16 p2d)
{
- DSTACK(__FUNCTION_NAME);
+ DSTACK(FUNCTION_NAME);
// The directory layout we're going to load from.
// 1 - original sectors/xxxxzzzz/
#if 0
bool ServerMap::loadSectorFull(v2s16 p2d)
{
- DSTACK(__FUNCTION_NAME);
+ DSTACK(FUNCTION_NAME);
MapSector *sector = NULL;
}
#endif
-Database *ServerMap::createDatabase(const std::string &name, const std::string &savedir, Settings &conf)
+Database *ServerMap::createDatabase(
+ const std::string &name,
+ const std::string &savedir,
+ Settings &conf)
{
if (name == "sqlite3")
return new Database_SQLite3(savedir);
// Dummy blocks are not written
if (block->isDummy()) {
- errorstream << "WARNING: saveBlock: Not writing dummy block "
+ warningstream << "saveBlock: Not writing dummy block "
<< PP(p3d) << std::endl;
return true;
}
void ServerMap::loadBlock(std::string sectordir, std::string blockfile,
MapSector *sector, bool save_after_load)
{
- DSTACK(__FUNCTION_NAME);
+ DSTACK(FUNCTION_NAME);
std::string fullpath = sectordir + DIR_DELIM + blockfile;
try {
}
catch(SerializationError &e)
{
- infostream<<"WARNING: Invalid block data on disk "
+ warningstream<<"Invalid block data on disk "
<<"fullpath="<<fullpath
<<" (SerializationError). "
<<"what()="<<e.what()
void ServerMap::loadBlock(std::string *blob, v3s16 p3d, MapSector *sector, bool save_after_load)
{
- DSTACK(__FUNCTION_NAME);
+ DSTACK(FUNCTION_NAME);
try {
std::istringstream is(*blob, std::ios_base::binary);
MapBlock* ServerMap::loadBlock(v3s16 blockpos)
{
- DSTACK(__FUNCTION_NAME);
+ DSTACK(FUNCTION_NAME);
v2s16 p2d(blockpos.X, blockpos.Z);
/*
Make sure sector is loaded
*/
+
MapSector *sector = getSectorNoGenerateNoEx(p2d);
if(sector == NULL)
{
projects / minetest.git / blobdiff