/*
-Minetest-c55
-Copyright (C) 2010-2011 celeron55, Perttu Ahola <celeron55@gmail.com>
+Minetest
+Copyright (C) 2010-2013 celeron55, Perttu Ahola <celeron55@gmail.com>
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 "map.h"
#include "mapsector.h"
#include "mapblock.h"
-#include "main.h"
-#ifndef SERVER
-#include "client.h"
-#endif
#include "filesys.h"
-#include "utility.h"
#include "voxel.h"
+#include "voxelalgorithms.h"
#include "porting.h"
-#include "mapgen.h"
+#include "serialization.h"
#include "nodemetadata.h"
-#ifndef SERVER
-#include <IMaterialRenderer.h>
-#endif
#include "settings.h"
#include "log.h"
#include "profiler.h"
#include "nodedef.h"
#include "gamedef.h"
+#include "util/directiontables.h"
+#include "util/basic_macros.h"
+#include "rollback_interface.h"
+#include "environment.h"
+#include "reflowscan.h"
+#include "emerge.h"
+#include "mapgen_v6.h"
+#include "mg_biome.h"
+#include "config.h"
+#include "server.h"
+#include "database.h"
+#include "database-dummy.h"
+#include "database-sqlite3.h"
+#include "script/scripting_server.h"
+#include <deque>
+#include <queue>
+#if USE_LEVELDB
+#include "database-leveldb.h"
+#endif
+#if USE_REDIS
+#include "database-redis.h"
+#endif
+#if USE_POSTGRESQL
+#include "database-postgresql.h"
+#endif
-#define PP(x) "("<<(x).X<<","<<(x).Y<<","<<(x).Z<<")"
-
-/*
- SQLite format specification:
- - Initially only replaces sectors/ and sectors2/
-
- If map.sqlite does not exist in the save dir
- or the block was not found in the database
- the map will try to load from sectors folder.
- In either case, map.sqlite will be created
- and all future saves will save there.
-
- Structure of map.sqlite:
- Tables:
- blocks
- (PK) INT pos
- BLOB data
-*/
/*
Map
Map::Map(std::ostream &dout, IGameDef *gamedef):
m_dout(dout),
m_gamedef(gamedef),
- m_sector_cache(NULL)
+ m_nodedef(gamedef->ndef())
{
- /*m_sector_mutex.Init();
- assert(m_sector_mutex.IsInitialized());*/
}
Map::~Map()
/*
Free all MapSectors
*/
- core::map<v2s16, MapSector*>::Iterator i = m_sectors.getIterator();
- for(; i.atEnd() == false; i++)
- {
- MapSector *sector = i.getNode()->getValue();
- delete sector;
+ for (auto §or : m_sectors) {
+ delete sector.second;
}
}
void Map::addEventReceiver(MapEventReceiver *event_receiver)
{
- m_event_receivers.insert(event_receiver, false);
+ m_event_receivers.insert(event_receiver);
}
void Map::removeEventReceiver(MapEventReceiver *event_receiver)
{
- if(m_event_receivers.find(event_receiver) == NULL)
- return;
- m_event_receivers.remove(event_receiver);
+ m_event_receivers.erase(event_receiver);
}
void Map::dispatchEvent(MapEditEvent *event)
{
- for(core::map<MapEventReceiver*, bool>::Iterator
- i = m_event_receivers.getIterator();
- i.atEnd()==false; i++)
- {
- MapEventReceiver* event_receiver = i.getNode()->getKey();
+ for (MapEventReceiver *event_receiver : m_event_receivers) {
event_receiver->onMapEditEvent(event);
}
}
MapSector * sector = m_sector_cache;
return sector;
}
-
- core::map<v2s16, MapSector*>::Node *n = m_sectors.find(p);
-
- if(n == NULL)
+
+ std::map<v2s16, MapSector*>::iterator n = m_sectors.find(p);
+
+ if (n == m_sectors.end())
return NULL;
-
- MapSector *sector = n->getValue();
-
+
+ MapSector *sector = n->second;
+
// Cache the last result
m_sector_cache_p = p;
m_sector_cache = sector;
MapSector *sector = getSectorNoGenerateNoEx(p);
if(sector == NULL)
throw InvalidPositionException();
-
+
return sector;
}
}
MapBlock * Map::getBlockNoCreate(v3s16 p3d)
-{
+{
MapBlock *block = getBlockNoCreateNoEx(p3d);
if(block == NULL)
throw InvalidPositionException();
bool Map::isValidPosition(v3s16 p)
{
v3s16 blockpos = getNodeBlockPos(p);
- MapBlock *block = getBlockNoCreate(blockpos);
+ MapBlock *block = getBlockNoCreateNoEx(blockpos);
return (block != NULL);
}
// Returns a CONTENT_IGNORE node if not found
-MapNode Map::getNodeNoEx(v3s16 p)
+MapNode Map::getNodeNoEx(v3s16 p, bool *is_valid_position)
{
v3s16 blockpos = getNodeBlockPos(p);
MapBlock *block = getBlockNoCreateNoEx(blockpos);
- if(block == NULL)
- return MapNode(CONTENT_IGNORE);
+ if (block == NULL) {
+ if (is_valid_position != NULL)
+ *is_valid_position = false;
+ return {CONTENT_IGNORE};
+ }
+
v3s16 relpos = p - blockpos*MAP_BLOCKSIZE;
- return block->getNodeNoCheck(relpos);
+ bool is_valid_p;
+ MapNode node = block->getNodeNoCheck(relpos, &is_valid_p);
+ if (is_valid_position != NULL)
+ *is_valid_position = is_valid_p;
+ return node;
}
+#if 0
+// Deprecated
// throws InvalidPositionException if not found
+// TODO: Now this is deprecated, getNodeNoEx should be renamed
MapNode Map::getNode(v3s16 p)
{
v3s16 blockpos = getNodeBlockPos(p);
MapBlock *block = getBlockNoCreateNoEx(blockpos);
- if(block == NULL)
+ if (block == NULL)
throw InvalidPositionException();
v3s16 relpos = p - blockpos*MAP_BLOCKSIZE;
- return block->getNodeNoCheck(relpos);
+ bool is_valid_position;
+ MapNode node = block->getNodeNoCheck(relpos, &is_valid_position);
+ if (!is_valid_position)
+ throw InvalidPositionException();
+ return node;
}
+#endif
// throws InvalidPositionException if not found
void Map::setNode(v3s16 p, MapNode & n)
v3s16 relpos = p - blockpos*MAP_BLOCKSIZE;
// Never allow placing CONTENT_IGNORE, it fucks up stuff
if(n.getContent() == CONTENT_IGNORE){
+ bool temp_bool;
errorstream<<"Map::setNode(): Not allowing to place CONTENT_IGNORE"
<<" while trying to replace \""
- <<m_gamedef->ndef()->get(block->getNodeNoCheck(relpos)).name
+ <<m_nodedef->get(block->getNodeNoCheck(relpos, &temp_bool)).name
<<"\" at "<<PP(p)<<" (block "<<PP(blockpos)<<")"<<std::endl;
debug_stacks_print_to(infostream);
return;
block->setNodeNoCheck(relpos, n);
}
+void Map::addNodeAndUpdate(v3s16 p, MapNode n,
+ std::map<v3s16, MapBlock*> &modified_blocks,
+ bool remove_metadata)
+{
+ // Collect old node for rollback
+ RollbackNode rollback_oldnode(this, p, m_gamedef);
-/*
- Goes recursively through the neighbours of the node.
-
- Alters only transparent nodes.
+ // This is needed for updating the lighting
+ MapNode oldnode = getNodeNoEx(p);
- If the lighting of the neighbour is lower than the lighting of
- the node was (before changing it to 0 at the step before), the
- lighting of the neighbour is set to 0 and then the same stuff
- repeats for the neighbour.
+ // Remove node metadata
+ if (remove_metadata) {
+ removeNodeMetadata(p);
+ }
- The ending nodes of the routine are stored in light_sources.
- This is useful when a light is removed. In such case, this
- routine can be called for the light node and then again for
- light_sources to re-light the area without the removed light.
+ // Set the node on the map
+ // Ignore light (because calling voxalgo::update_lighting_nodes)
+ n.setLight(LIGHTBANK_DAY, 0, m_nodedef);
+ n.setLight(LIGHTBANK_NIGHT, 0, m_nodedef);
+ setNode(p, n);
- values of from_nodes are lighting values.
-*/
-void Map::unspreadLight(enum LightBank bank,
- core::map<v3s16, u8> & from_nodes,
- core::map<v3s16, bool> & light_sources,
- core::map<v3s16, MapBlock*> & modified_blocks)
-{
- INodeDefManager *nodemgr = m_gamedef->ndef();
-
- v3s16 dirs[6] = {
- 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
- };
-
- if(from_nodes.size() == 0)
- return;
-
- u32 blockchangecount = 0;
+ // Update lighting
+ std::vector<std::pair<v3s16, MapNode> > oldnodes;
+ oldnodes.emplace_back(p, oldnode);
+ voxalgo::update_lighting_nodes(this, oldnodes, modified_blocks);
- core::map<v3s16, u8> unlighted_nodes;
- core::map<v3s16, u8>::Iterator j;
- j = from_nodes.getIterator();
+ for (auto &modified_block : modified_blocks) {
+ modified_block.second->expireDayNightDiff();
+ }
- /*
- Initialize block cache
- */
- v3s16 blockpos_last;
- MapBlock *block = NULL;
- // Cache this a bit, too
- bool block_checked_in_modified = false;
-
- for(; j.atEnd() == false; j++)
+ // Report for rollback
+ if(m_gamedef->rollback())
{
- v3s16 pos = j.getNode()->getKey();
- v3s16 blockpos = getNodeBlockPos(pos);
-
- // Only fetch a new block if the block position has changed
- try{
- if(block == NULL || blockpos != blockpos_last){
- block = getBlockNoCreate(blockpos);
- blockpos_last = blockpos;
-
- block_checked_in_modified = false;
- blockchangecount++;
- }
- }
- catch(InvalidPositionException &e)
- {
- continue;
- }
-
- if(block->isDummy())
- continue;
+ RollbackNode rollback_newnode(this, p, m_gamedef);
+ RollbackAction action;
+ action.setSetNode(p, rollback_oldnode, rollback_newnode);
+ m_gamedef->rollback()->reportAction(action);
+ }
- // Calculate relative position in block
- v3s16 relpos = pos - blockpos_last * MAP_BLOCKSIZE;
+ /*
+ 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.)
+ */
- // Get node straight from the block
- MapNode n = block->getNode(relpos);
+ for (const v3s16 &dir : g_7dirs) {
+ v3s16 p2 = p + dir;
- u8 oldlight = j.getNode()->getValue();
+ bool is_valid_position;
+ MapNode n2 = getNodeNoEx(p2, &is_valid_position);
+ if(is_valid_position &&
+ (m_nodedef->get(n2).isLiquid() ||
+ n2.getContent() == CONTENT_AIR))
+ m_transforming_liquid.push_back(p2);
+ }
+}
- // Loop through 6 neighbors
- for(u16 i=0; i<6; i++)
- {
- // Get the position of the neighbor node
- v3s16 n2pos = pos + dirs[i];
+void Map::removeNodeAndUpdate(v3s16 p,
+ std::map<v3s16, MapBlock*> &modified_blocks)
+{
+ addNodeAndUpdate(p, MapNode(CONTENT_AIR), modified_blocks, true);
+}
- // Get the block where the node is located
- v3s16 blockpos = getNodeBlockPos(n2pos);
+bool Map::addNodeWithEvent(v3s16 p, MapNode n, bool remove_metadata)
+{
+ MapEditEvent event;
+ event.type = remove_metadata ? MEET_ADDNODE : MEET_SWAPNODE;
+ event.p = p;
+ event.n = n;
- try
- {
- // Only fetch a new block if the block position has changed
- try{
- if(block == NULL || blockpos != blockpos_last){
- block = getBlockNoCreate(blockpos);
- blockpos_last = blockpos;
-
- block_checked_in_modified = false;
- blockchangecount++;
- }
- }
- catch(InvalidPositionException &e)
- {
- continue;
- }
+ bool succeeded = true;
+ try{
+ std::map<v3s16, MapBlock*> modified_blocks;
+ addNodeAndUpdate(p, n, modified_blocks, remove_metadata);
- // Calculate relative position in block
- v3s16 relpos = n2pos - blockpos * MAP_BLOCKSIZE;
- // Get node straight from the block
- MapNode n2 = block->getNode(relpos);
+ // Copy modified_blocks to event
+ for (auto &modified_block : modified_blocks) {
+ event.modified_blocks.insert(modified_block.first);
+ }
+ }
+ catch(InvalidPositionException &e){
+ succeeded = false;
+ }
- bool changed = false;
+ dispatchEvent(&event);
- //TODO: Optimize output by optimizing light_sources?
+ return succeeded;
+}
- /*
- If the neighbor is dimmer than what was specified
- as oldlight (the light of the previous node)
- */
- if(n2.getLight(bank, nodemgr) < oldlight)
- {
- /*
- And the neighbor is transparent and it has some light
- */
- if(nodemgr->get(n2).light_propagates
- && n2.getLight(bank, nodemgr) != 0)
- {
- /*
- Set light to 0 and add to queue
- */
-
- u8 current_light = n2.getLight(bank, nodemgr);
- n2.setLight(bank, 0, nodemgr);
- block->setNode(relpos, n2);
-
- unlighted_nodes.insert(n2pos, current_light);
- changed = true;
-
- /*
- Remove from light_sources if it is there
- NOTE: This doesn't happen nearly at all
- */
- /*if(light_sources.find(n2pos))
- {
- infostream<<"Removed from light_sources"<<std::endl;
- light_sources.remove(n2pos);
- }*/
- }
+bool Map::removeNodeWithEvent(v3s16 p)
+{
+ MapEditEvent event;
+ event.type = MEET_REMOVENODE;
+ event.p = p;
- /*// DEBUG
- if(light_sources.find(n2pos) != NULL)
- light_sources.remove(n2pos);*/
- }
- else{
- light_sources.insert(n2pos, true);
- }
+ bool succeeded = true;
+ try{
+ std::map<v3s16, MapBlock*> modified_blocks;
+ removeNodeAndUpdate(p, modified_blocks);
- // Add to modified_blocks
- if(changed == true && block_checked_in_modified == false)
- {
- // If the block is not found in modified_blocks, add.
- if(modified_blocks.find(blockpos) == NULL)
- {
- modified_blocks.insert(blockpos, block);
- }
- block_checked_in_modified = true;
- }
- }
- catch(InvalidPositionException &e)
- {
- continue;
- }
+ // Copy modified_blocks to event
+ for (auto &modified_block : modified_blocks) {
+ event.modified_blocks.insert(modified_block.first);
}
}
+ catch(InvalidPositionException &e){
+ succeeded = false;
+ }
- /*infostream<<"unspreadLight(): Changed block "
- <<blockchangecount<<" times"
- <<" for "<<from_nodes.size()<<" nodes"
- <<std::endl;*/
+ dispatchEvent(&event);
- if(unlighted_nodes.size() > 0)
- unspreadLight(bank, unlighted_nodes, light_sources, modified_blocks);
+ return succeeded;
}
-/*
- A single-node wrapper of the above
-*/
-void Map::unLightNeighbors(enum LightBank bank,
- v3s16 pos, u8 lightwas,
- core::map<v3s16, bool> & light_sources,
- core::map<v3s16, MapBlock*> & modified_blocks)
-{
- core::map<v3s16, u8> from_nodes;
- from_nodes.insert(pos, lightwas);
+struct TimeOrderedMapBlock {
+ MapSector *sect;
+ MapBlock *block;
- unspreadLight(bank, from_nodes, light_sources, modified_blocks);
-}
+ TimeOrderedMapBlock(MapSector *sect, MapBlock *block) :
+ sect(sect),
+ block(block)
+ {}
+
+ bool operator<(const TimeOrderedMapBlock &b) const
+ {
+ return block->getUsageTimer() < b.block->getUsageTimer();
+ };
+};
/*
- Lights neighbors of from_nodes, collects all them and then
- goes on recursively.
+ Updates usage timers
*/
-void Map::spreadLight(enum LightBank bank,
- core::map<v3s16, bool> & from_nodes,
- core::map<v3s16, MapBlock*> & modified_blocks)
+void Map::timerUpdate(float dtime, float unload_timeout, u32 max_loaded_blocks,
+ std::vector<v3s16> *unloaded_blocks)
{
- INodeDefManager *nodemgr = m_gamedef->ndef();
-
- const v3s16 dirs[6] = {
- 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
- };
+ bool save_before_unloading = (mapType() == MAPTYPE_SERVER);
- if(from_nodes.size() == 0)
- return;
+ // Profile modified reasons
+ Profiler modprofiler;
- u32 blockchangecount = 0;
+ std::vector<v2s16> sector_deletion_queue;
+ u32 deleted_blocks_count = 0;
+ u32 saved_blocks_count = 0;
+ u32 block_count_all = 0;
- core::map<v3s16, bool> lighted_nodes;
- core::map<v3s16, bool>::Iterator j;
- j = from_nodes.getIterator();
+ beginSave();
- /*
- Initialize block cache
- */
- v3s16 blockpos_last;
- MapBlock *block = NULL;
- // Cache this a bit, too
- bool block_checked_in_modified = false;
+ // If there is no practical limit, we spare creation of mapblock_queue
+ if (max_loaded_blocks == U32_MAX) {
+ for (auto §or_it : m_sectors) {
+ MapSector *sector = sector_it.second;
- for(; j.atEnd() == false; j++)
- //for(; j != from_nodes.end(); j++)
- {
- v3s16 pos = j.getNode()->getKey();
- //v3s16 pos = *j;
- //infostream<<"pos=("<<pos.X<<","<<pos.Y<<","<<pos.Z<<")"<<std::endl;
- v3s16 blockpos = getNodeBlockPos(pos);
-
- // Only fetch a new block if the block position has changed
- try{
- if(block == NULL || blockpos != blockpos_last){
- block = getBlockNoCreate(blockpos);
- blockpos_last = blockpos;
-
- block_checked_in_modified = false;
- blockchangecount++;
- }
- }
- catch(InvalidPositionException &e)
- {
- continue;
- }
+ bool all_blocks_deleted = true;
- if(block->isDummy())
- continue;
+ MapBlockVect blocks;
+ sector->getBlocks(blocks);
- // Calculate relative position in block
- v3s16 relpos = pos - blockpos_last * MAP_BLOCKSIZE;
+ for (MapBlock *block : blocks) {
+ block->incrementUsageTimer(dtime);
- // Get node straight from the block
- MapNode n = block->getNode(relpos);
+ if (block->refGet() == 0
+ && block->getUsageTimer() > unload_timeout) {
+ v3s16 p = block->getPos();
- u8 oldlight = n.getLight(bank, nodemgr);
- u8 newlight = diminish_light(oldlight);
+ // Save if modified
+ if (block->getModified() != MOD_STATE_CLEAN
+ && save_before_unloading) {
+ modprofiler.add(block->getModifiedReasonString(), 1);
+ if (!saveBlock(block))
+ continue;
+ saved_blocks_count++;
+ }
- // Loop through 6 neighbors
- for(u16 i=0; i<6; i++){
- // Get the position of the neighbor node
- v3s16 n2pos = pos + dirs[i];
+ // Delete from memory
+ sector->deleteBlock(block);
- // Get the block where the node is located
- v3s16 blockpos = getNodeBlockPos(n2pos);
+ if (unloaded_blocks)
+ unloaded_blocks->push_back(p);
- try
- {
- // Only fetch a new block if the block position has changed
- try{
- if(block == NULL || blockpos != blockpos_last){
- block = getBlockNoCreate(blockpos);
- blockpos_last = blockpos;
-
- block_checked_in_modified = false;
- blockchangecount++;
- }
- }
- catch(InvalidPositionException &e)
- {
- continue;
+ deleted_blocks_count++;
+ } else {
+ all_blocks_deleted = false;
+ block_count_all++;
}
+ }
- // Calculate relative position in block
- v3s16 relpos = n2pos - blockpos * MAP_BLOCKSIZE;
- // Get node straight from the block
- MapNode n2 = block->getNode(relpos);
+ if (all_blocks_deleted) {
+ sector_deletion_queue.push_back(sector_it.first);
+ }
+ }
+ } else {
+ std::priority_queue<TimeOrderedMapBlock> mapblock_queue;
+ for (auto §or_it : m_sectors) {
+ MapSector *sector = sector_it.second;
- bool changed = false;
- /*
- If the neighbor is brighter than the current node,
- add to list (it will light up this node on its turn)
- */
- if(n2.getLight(bank, nodemgr) > undiminish_light(oldlight))
- {
- lighted_nodes.insert(n2pos, true);
- //lighted_nodes.push_back(n2pos);
- changed = true;
- }
- /*
- If the neighbor is dimmer than how much light this node
- would spread on it, add to list
- */
- if(n2.getLight(bank, nodemgr) < newlight)
- {
- if(nodemgr->get(n2).light_propagates)
- {
- n2.setLight(bank, newlight, nodemgr);
- block->setNode(relpos, n2);
- lighted_nodes.insert(n2pos, true);
- //lighted_nodes.push_back(n2pos);
- changed = true;
- }
- }
+ MapBlockVect blocks;
+ sector->getBlocks(blocks);
- // Add to modified_blocks
- if(changed == true && block_checked_in_modified == false)
- {
- // If the block is not found in modified_blocks, add.
- if(modified_blocks.find(blockpos) == NULL)
- {
- modified_blocks.insert(blockpos, block);
- }
- block_checked_in_modified = true;
- }
- }
- catch(InvalidPositionException &e)
- {
- continue;
+ for (MapBlock *block : blocks) {
+ 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();
- /*infostream<<"spreadLight(): Changed block "
- <<blockchangecount<<" times"
- <<" for "<<from_nodes.size()<<" nodes"
- <<std::endl;*/
+ MapBlock *block = b.block;
- if(lighted_nodes.size() > 0)
- spreadLight(bank, lighted_nodes, modified_blocks);
-}
+ if (block->refGet() != 0)
+ continue;
-/*
- A single-node source variation of the above.
-*/
-void Map::lightNeighbors(enum LightBank bank,
- v3s16 pos,
- core::map<v3s16, MapBlock*> & modified_blocks)
-{
- core::map<v3s16, bool> from_nodes;
- from_nodes.insert(pos, true);
- spreadLight(bank, from_nodes, modified_blocks);
-}
+ v3s16 p = block->getPos();
-v3s16 Map::getBrightestNeighbour(enum LightBank bank, v3s16 p)
-{
- INodeDefManager *nodemgr = m_gamedef->ndef();
-
- v3s16 dirs[6] = {
- 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
- };
+ // Save if modified
+ if (block->getModified() != MOD_STATE_CLEAN && save_before_unloading) {
+ modprofiler.add(block->getModifiedReasonString(), 1);
+ if (!saveBlock(block))
+ continue;
+ saved_blocks_count++;
+ }
- u8 brightest_light = 0;
- v3s16 brightest_pos(0,0,0);
- bool found_something = false;
-
- // Loop through 6 neighbors
- for(u16 i=0; i<6; i++){
- // Get the position of the neighbor node
- v3s16 n2pos = p + dirs[i];
- MapNode n2;
- try{
- n2 = getNode(n2pos);
- }
- catch(InvalidPositionException &e)
- {
- continue;
+ // Delete from memory
+ b.sect->deleteBlock(block);
+
+ if (unloaded_blocks)
+ unloaded_blocks->push_back(p);
+
+ deleted_blocks_count++;
+ block_count_all--;
}
- if(n2.getLight(bank, nodemgr) > brightest_light || found_something == false){
- brightest_light = n2.getLight(bank, nodemgr);
- brightest_pos = n2pos;
- found_something = true;
+ // Delete empty sectors
+ for (auto §or_it : m_sectors) {
+ if (sector_it.second->empty()) {
+ sector_deletion_queue.push_back(sector_it.first);
+ }
}
}
+ endSave();
- if(found_something == false)
- throw InvalidPositionException();
+ // Finally delete the empty sectors
+ deleteSectors(sector_deletion_queue);
- return brightest_pos;
+ if(deleted_blocks_count != 0)
+ {
+ PrintInfo(infostream); // ServerMap/ClientMap:
+ infostream<<"Unloaded "<<deleted_blocks_count
+ <<" blocks from memory";
+ if(save_before_unloading)
+ infostream<<", of which "<<saved_blocks_count<<" were written";
+ infostream<<", "<<block_count_all<<" blocks in memory";
+ infostream<<"."<<std::endl;
+ if(saved_blocks_count != 0){
+ PrintInfo(infostream); // ServerMap/ClientMap:
+ infostream<<"Blocks modified by: "<<std::endl;
+ modprofiler.print(infostream);
+ }
+ }
}
-/*
- Propagates sunlight down from a node.
- Starting point gets sunlight.
+void Map::unloadUnreferencedBlocks(std::vector<v3s16> *unloaded_blocks)
+{
+ timerUpdate(0.0, -1.0, 0, unloaded_blocks);
+}
- Returns the lowest y value of where the sunlight went.
+void Map::deleteSectors(std::vector<v2s16> §orList)
+{
+ 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);
+ delete sector;
+ }
+}
- Mud is turned into grass in where the sunlight stops.
-*/
-s16 Map::propagateSunlight(v3s16 start,
- core::map<v3s16, MapBlock*> & modified_blocks)
+void Map::PrintInfo(std::ostream &out)
{
- INodeDefManager *nodemgr = m_gamedef->ndef();
+ out<<"Map: ";
+}
- s16 y = start.Y;
- for(; ; y--)
- {
- v3s16 pos(start.X, y, start.Z);
+#define WATER_DROP_BOOST 4
- v3s16 blockpos = getNodeBlockPos(pos);
- MapBlock *block;
- try{
- block = getBlockNoCreate(blockpos);
- }
- catch(InvalidPositionException &e)
- {
- break;
- }
+enum NeighborType {
+ NEIGHBOR_UPPER,
+ NEIGHBOR_SAME_LEVEL,
+ NEIGHBOR_LOWER
+};
+struct NodeNeighbor {
+ MapNode n;
+ NeighborType t;
+ v3s16 p;
+ bool l; //can liquid
- v3s16 relpos = pos - blockpos*MAP_BLOCKSIZE;
- MapNode n = block->getNode(relpos);
+ NodeNeighbor()
+ : n(CONTENT_AIR)
+ { }
- if(nodemgr->get(n).sunlight_propagates)
- {
- n.setLight(LIGHTBANK_DAY, LIGHT_SUN, nodemgr);
- block->setNode(relpos, n);
+ NodeNeighbor(const MapNode &node, NeighborType n_type, v3s16 pos)
+ : n(node),
+ t(n_type),
+ p(pos)
+ { }
+};
- modified_blocks.insert(blockpos, block);
- }
- else
- {
- // Sunlight goes no further
- break;
- }
- }
- return y + 1;
+void Map::transforming_liquid_add(v3s16 p) {
+ m_transforming_liquid.push_back(p);
}
-void Map::updateLighting(enum LightBank bank,
- core::map<v3s16, MapBlock*> & a_blocks,
- core::map<v3s16, MapBlock*> & modified_blocks)
+s32 Map::transforming_liquid_size() {
+ return m_transforming_liquid.size();
+}
+
+void Map::transformLiquids(std::map<v3s16, MapBlock*> &modified_blocks,
+ ServerEnvironment *env)
{
- INodeDefManager *nodemgr = m_gamedef->ndef();
+ DSTACK(FUNCTION_NAME);
+ //TimeTaker timer("transformLiquids()");
- /*m_dout<<DTIME<<"Map::updateLighting(): "
- <<a_blocks.size()<<" blocks."<<std::endl;*/
+ u32 loopcount = 0;
+ u32 initial_size = m_transforming_liquid.size();
- //TimeTaker timer("updateLighting");
+ /*if(initial_size != 0)
+ infostream<<"transformLiquids(): initial_size="<<initial_size<<std::endl;*/
- // For debugging
- //bool debug=true;
- //u32 count_was = modified_blocks.size();
+ // list of nodes that due to viscosity have not reached their max level height
+ std::deque<v3s16> must_reflow;
- core::map<v3s16, MapBlock*> blocks_to_update;
+ std::vector<std::pair<v3s16, MapNode> > changed_nodes;
- core::map<v3s16, bool> light_sources;
+ u32 liquid_loop_max = g_settings->getS32("liquid_loop_max");
+ u32 loop_max = liquid_loop_max;
- core::map<v3s16, u8> unlight_from;
+#if 0
- core::map<v3s16, MapBlock*>::Iterator i;
- i = a_blocks.getIterator();
- for(; i.atEnd() == false; i++)
- {
- MapBlock *block = i.getNode()->getValue();
+ /* If liquid_loop_max is not keeping up with the queue size increase
+ * loop_max up to a maximum of liquid_loop_max * dedicated_server_step.
+ */
+ if (m_transforming_liquid.size() > loop_max * 2) {
+ // "Burst" mode
+ float server_step = g_settings->getFloat("dedicated_server_step");
+ if (m_transforming_liquid_loop_count_multiplier - 1.0 < server_step)
+ m_transforming_liquid_loop_count_multiplier *= 1.0 + server_step / 10;
+ } else {
+ m_transforming_liquid_loop_count_multiplier = 1.0;
+ }
- for(;;)
- {
- // Don't bother with dummy blocks.
- if(block->isDummy())
- break;
+ loop_max *= m_transforming_liquid_loop_count_multiplier;
+#endif
- v3s16 pos = block->getPos();
- modified_blocks.insert(pos, block);
-
- blocks_to_update.insert(pos, block);
+ 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)
+ break;
+ loopcount++;
- /*
- Clear all light from block
- */
- for(s16 z=0; z<MAP_BLOCKSIZE; z++)
- for(s16 x=0; x<MAP_BLOCKSIZE; x++)
- for(s16 y=0; y<MAP_BLOCKSIZE; y++)
- {
+ /*
+ Get a queued transforming liquid node
+ */
+ v3s16 p0 = m_transforming_liquid.front();
+ m_transforming_liquid.pop_front();
- try{
- v3s16 p(x,y,z);
- MapNode n = block->getNode(v3s16(x,y,z));
- u8 oldlight = n.getLight(bank, nodemgr);
- n.setLight(bank, 0, nodemgr);
- block->setNode(v3s16(x,y,z), n);
-
- // Collect borders for unlighting
- if(x==0 || x == MAP_BLOCKSIZE-1
- || y==0 || y == MAP_BLOCKSIZE-1
- || z==0 || z == MAP_BLOCKSIZE-1)
- {
- v3s16 p_map = p + v3s16(
- MAP_BLOCKSIZE*pos.X,
- MAP_BLOCKSIZE*pos.Y,
- MAP_BLOCKSIZE*pos.Z);
- unlight_from.insert(p_map, oldlight);
- }
- }
- catch(InvalidPositionException &e)
- {
- /*
- This would happen when dealing with a
- dummy block.
- */
- //assert(0);
- infostream<<"updateLighting(): InvalidPositionException"
- <<std::endl;
- }
- }
+ MapNode n0 = getNodeNoEx(p0);
- if(bank == LIGHTBANK_DAY)
- {
- bool bottom_valid = block->propagateSunlight(light_sources);
+ /*
+ Collect information about current node
+ */
+ s8 liquid_level = -1;
+ // The liquid node which will be placed there if
+ // the liquid flows into this node.
+ content_t liquid_kind = CONTENT_IGNORE;
+ // The node which will be placed there if liquid
+ // can't flow into this node.
+ content_t floodable_node = CONTENT_AIR;
+ const ContentFeatures &cf = m_nodedef->get(n0);
+ LiquidType liquid_type = cf.liquid_type;
+ switch (liquid_type) {
+ case LIQUID_SOURCE:
+ liquid_level = LIQUID_LEVEL_SOURCE;
+ liquid_kind = m_nodedef->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 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;
+ }
- // If bottom is valid, we're done.
- if(bottom_valid)
+ /*
+ Collect information about the environment
+ */
+ const v3s16 *dirs = g_6dirs;
+ NodeNeighbor sources[6]; // surrounding sources
+ int num_sources = 0;
+ NodeNeighbor flows[6]; // surrounding flowing liquid nodes
+ int num_flows = 0;
+ NodeNeighbor airs[6]; // surrounding air
+ int num_airs = 0;
+ NodeNeighbor neutrals[6]; // nodes that are solid or another kind of liquid
+ int num_neutrals = 0;
+ bool flowing_down = false;
+ bool ignored_sources = false;
+ for (u16 i = 0; i < 6; i++) {
+ NeighborType nt = NEIGHBOR_SAME_LEVEL;
+ switch (i) {
+ case 1:
+ nt = NEIGHBOR_UPPER;
+ break;
+ case 4:
+ nt = NEIGHBOR_LOWER;
break;
}
- else if(bank == LIGHTBANK_NIGHT)
- {
- // For night lighting, sunlight is not propagated
- break;
- }
- else
- {
- // Invalid lighting bank
- assert(0);
+ v3s16 npos = p0 + dirs[i];
+ NodeNeighbor nb(getNodeNoEx(npos), nt, npos);
+ const ContentFeatures &cfnb = m_nodedef->get(nb.n);
+ switch (m_nodedef->get(nb.n.getContent()).liquid_type) {
+ case LIQUID_NONE:
+ 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
+ // current node changes or not.
+ 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)
+ flowing_down = true;
+ } else {
+ neutrals[num_neutrals++] = nb;
+ if (nb.n.getContent() == CONTENT_IGNORE) {
+ // If node below is ignore prevent water from
+ // spreading outwards and otherwise prevent from
+ // flowing away as ignore node might be the source
+ if (nb.t == NEIGHBOR_LOWER)
+ flowing_down = true;
+ else
+ ignored_sources = 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 = m_nodedef->getId(cfnb.liquid_alternative_flowing);
+ if (m_nodedef->getId(cfnb.liquid_alternative_flowing) != liquid_kind) {
+ neutrals[num_neutrals++] = nb;
+ } else {
+ // Do not count bottom source, it will screw things up
+ if(dirs[i].Y != -1)
+ sources[num_sources++] = nb;
+ }
+ break;
+ 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 = m_nodedef->getId(cfnb.liquid_alternative_flowing);
+ if (m_nodedef->getId(cfnb.liquid_alternative_flowing) != liquid_kind) {
+ neutrals[num_neutrals++] = nb;
+ } else {
+ flows[num_flows++] = nb;
+ if (nb.t == NEIGHBOR_LOWER)
+ flowing_down = true;
+ }
+ break;
}
+ }
- /*infostream<<"Bottom for sunlight-propagated block ("
- <<pos.X<<","<<pos.Y<<","<<pos.Z<<") not valid"
- <<std::endl;*/
+ /*
+ decide on the type (and possibly level) of the current node
+ */
+ content_t new_node_content;
+ s8 new_node_level = -1;
+ s8 max_node_level = -1;
- // Bottom sunlight is not valid; get the block and loop to it
+ u8 range = m_nodedef->get(liquid_kind).liquid_range;
+ if (range > LIQUID_LEVEL_MAX + 1)
+ range = LIQUID_LEVEL_MAX + 1;
- pos.Y--;
- try{
- block = getBlockNoCreate(pos);
- }
- catch(InvalidPositionException &e)
- {
- assert(0);
+ if ((num_sources >= 2 && m_nodedef->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)
+ // or the flowing alternative of the first of the surrounding sources (if it's air), so
+ // it's perfectly safe to use liquid_kind here to determine the new node content.
+ new_node_content = m_nodedef->getId(m_nodedef->get(liquid_kind).liquid_alternative_source);
+ } else if (num_sources >= 1 && sources[0].t != NEIGHBOR_LOWER) {
+ // liquid_kind is set properly, see above
+ max_node_level = new_node_level = LIQUID_LEVEL_MAX;
+ if (new_node_level >= (LIQUID_LEVEL_MAX + 1 - range))
+ new_node_content = liquid_kind;
+ else
+ new_node_content = floodable_node;
+ } else if (ignored_sources && liquid_level >= 0) {
+ // Maybe there are neighbouring sources that aren't loaded yet
+ // so prevent flowing away.
+ new_node_level = liquid_level;
+ new_node_content = liquid_kind;
+ } else {
+ // no surrounding sources, so get the maximum level that can flow into this node
+ for (u16 i = 0; i < num_flows; i++) {
+ u8 nb_liquid_level = (flows[i].n.param2 & LIQUID_LEVEL_MASK);
+ switch (flows[i].t) {
+ case NEIGHBOR_UPPER:
+ if (nb_liquid_level + WATER_DROP_BOOST > max_node_level) {
+ 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) {
+ 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)
+ max_node_level = nb_liquid_level - 1;
+ break;
+ }
}
- }
- }
-
- /*
- Enable this to disable proper lighting for speeding up map
- generation for testing or whatever
- */
-#if 0
- //if(g_settings->get(""))
- {
- core::map<v3s16, MapBlock*>::Iterator i;
- i = blocks_to_update.getIterator();
- for(; i.atEnd() == false; i++)
- {
- MapBlock *block = i.getNode()->getValue();
- v3s16 p = block->getPos();
- block->setLightingExpired(false);
- }
- return;
- }
-#endif
+ u8 viscosity = m_nodedef->get(liquid_kind).liquid_viscosity;
+ if (viscosity > 1 && max_node_level != liquid_level) {
+ // amount to gain, limited by viscosity
+ // must be at least 1 in absolute value
+ s8 level_inc = max_node_level - liquid_level;
+ if (level_inc < -viscosity || level_inc > viscosity)
+ new_node_level = liquid_level + level_inc/viscosity;
+ else if (level_inc < 0)
+ new_node_level = liquid_level - 1;
+ else if (level_inc > 0)
+ new_node_level = liquid_level + 1;
+ if (new_node_level != max_node_level)
+ must_reflow.push_back(p0);
+ } else {
+ new_node_level = max_node_level;
+ }
-#if 0
- {
- TimeTaker timer("unspreadLight");
- unspreadLight(bank, unlight_from, light_sources, modified_blocks);
- }
+ if (max_node_level >= (LIQUID_LEVEL_MAX + 1 - range))
+ new_node_content = liquid_kind;
+ else
+ new_node_content = floodable_node;
- if(debug)
- {
- u32 diff = modified_blocks.size() - count_was;
- count_was = modified_blocks.size();
- infostream<<"unspreadLight modified "<<diff<<std::endl;
- }
+ }
- {
- TimeTaker timer("spreadLight");
- spreadLight(bank, light_sources, modified_blocks);
- }
+ /*
+ check if anything has changed. if not, just continue with the next node.
+ */
+ if (new_node_content == n0.getContent() &&
+ (m_nodedef->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;
- if(debug)
- {
- u32 diff = modified_blocks.size() - count_was;
- count_was = modified_blocks.size();
- infostream<<"spreadLight modified "<<diff<<std::endl;
- }
-#endif
- {
- //MapVoxelManipulator vmanip(this);
-
- // Make a manual voxel manipulator and load all the blocks
- // that touch the requested blocks
- ManualMapVoxelManipulator vmanip(this);
- core::map<v3s16, MapBlock*>::Iterator i;
- i = blocks_to_update.getIterator();
- for(; i.atEnd() == false; i++)
- {
- MapBlock *block = i.getNode()->getValue();
- v3s16 p = block->getPos();
+ /*
+ update the current node
+ */
+ MapNode n00 = n0;
+ //bool flow_down_enabled = (flowing_down && ((n0.param2 & LIQUID_FLOW_DOWN_MASK) != LIQUID_FLOW_DOWN_MASK));
+ if (m_nodedef->get(new_node_content).liquid_type == LIQUID_FLOWING) {
+ // set level to last 3 bits, flowing down bit to 4th bit
+ n0.param2 = (flowing_down ? LIQUID_FLOW_DOWN_MASK : 0x00) | (new_node_level & LIQUID_LEVEL_MASK);
+ } else {
+ // set the liquid level and flow bit to 0
+ n0.param2 = ~(LIQUID_LEVEL_MASK | LIQUID_FLOW_DOWN_MASK);
+ }
- // Add all surrounding blocks
- vmanip.initialEmerge(p - v3s16(1,1,1), p + v3s16(1,1,1));
-
- /*
- Add all surrounding blocks that have up-to-date lighting
- NOTE: This doesn't quite do the job (not everything
- appropriate is lighted)
- */
- /*for(s16 z=-1; z<=1; z++)
- for(s16 y=-1; y<=1; y++)
- for(s16 x=-1; x<=1; x++)
- {
- v3s16 p2 = p + v3s16(x,y,z);
- MapBlock *block = getBlockNoCreateNoEx(p2);
- if(block == NULL)
- continue;
- if(block->isDummy())
- continue;
- if(block->getLightingExpired())
- continue;
- vmanip.initialEmerge(p2, p2);
- }*/
+ // change the node.
+ n0.setContent(new_node_content);
- // Lighting of block will be updated completely
- block->setLightingExpired(false);
+ // on_flood() the node
+ if (floodable_node != CONTENT_AIR) {
+ if (env->getScriptIface()->node_on_flood(p0, n00, n0))
+ continue;
}
- {
- //TimeTaker timer("unSpreadLight");
- vmanip.unspreadLight(bank, unlight_from, light_sources, nodemgr);
+ // Ignore light (because calling voxalgo::update_lighting_nodes)
+ n0.setLight(LIGHTBANK_DAY, 0, m_nodedef);
+ n0.setLight(LIGHTBANK_NIGHT, 0, m_nodedef);
+
+ // Find out whether there is a suspect for this action
+ std::string suspect;
+ if (m_gamedef->rollback())
+ suspect = m_gamedef->rollback()->getSuspect(p0, 83, 1);
+
+ if (m_gamedef->rollback() && !suspect.empty()) {
+ // Blame suspect
+ RollbackScopeActor rollback_scope(m_gamedef->rollback(), suspect, true);
+ // Get old node for rollback
+ RollbackNode rollback_oldnode(this, p0, m_gamedef);
+ // Set node
+ setNode(p0, n0);
+ // Report
+ RollbackNode rollback_newnode(this, p0, m_gamedef);
+ RollbackAction action;
+ action.setSetNode(p0, rollback_oldnode, rollback_newnode);
+ m_gamedef->rollback()->reportAction(action);
+ } else {
+ // Set node
+ setNode(p0, n0);
}
- {
- //TimeTaker timer("spreadLight");
- vmanip.spreadLight(bank, light_sources, nodemgr);
+
+ v3s16 blockpos = getNodeBlockPos(p0);
+ MapBlock *block = getBlockNoCreateNoEx(blockpos);
+ if (block != NULL) {
+ modified_blocks[blockpos] = block;
+ changed_nodes.emplace_back(p0, n00);
}
- {
- //TimeTaker timer("blitBack");
- vmanip.blitBack(modified_blocks);
+
+ /*
+ enqueue neighbors for update if neccessary
+ */
+ switch (m_nodedef->get(n0.getContent()).liquid_type) {
+ case LIQUID_SOURCE:
+ case LIQUID_FLOWING:
+ // make sure source flows into all neighboring nodes
+ for (u16 i = 0; i < num_flows; i++)
+ if (flows[i].t != NEIGHBOR_UPPER)
+ m_transforming_liquid.push_back(flows[i].p);
+ for (u16 i = 0; i < num_airs; i++)
+ if (airs[i].t != NEIGHBOR_UPPER)
+ m_transforming_liquid.push_back(airs[i].p);
+ break;
+ case LIQUID_NONE:
+ // this flow has turned to air; neighboring flows might need to do the same
+ for (u16 i = 0; i < num_flows; i++)
+ m_transforming_liquid.push_back(flows[i].p);
+ break;
}
- /*infostream<<"emerge_time="<<emerge_time<<std::endl;
- emerge_time = 0;*/
}
+ //infostream<<"Map::transformLiquids(): loopcount="<<loopcount<<std::endl;
- //m_dout<<"Done ("<<getTimestamp()<<")"<<std::endl;
-}
+ for (auto &iter : must_reflow)
+ m_transforming_liquid.push_back(iter);
-void Map::updateLighting(core::map<v3s16, MapBlock*> & a_blocks,
- core::map<v3s16, MapBlock*> & modified_blocks)
-{
- updateLighting(LIGHTBANK_DAY, a_blocks, modified_blocks);
- updateLighting(LIGHTBANK_NIGHT, a_blocks, modified_blocks);
+ voxalgo::update_lighting_nodes(this, changed_nodes, modified_blocks);
- /*
- Update information about whether day and night light differ
- */
- for(core::map<v3s16, MapBlock*>::Iterator
- i = modified_blocks.getIterator();
- i.atEnd() == false; i++)
- {
- MapBlock *block = i.getNode()->getValue();
- block->updateDayNightDiff();
- }
-}
-/*
-*/
-void Map::addNodeAndUpdate(v3s16 p, MapNode n,
- core::map<v3s16, MapBlock*> &modified_blocks)
-{
- INodeDefManager *nodemgr = m_gamedef->ndef();
+ /* ----------------------------------------------------------------------
+ * Manage the queue so that it does not grow indefinately
+ */
+ u16 time_until_purge = g_settings->getU16("liquid_queue_purge_time");
- /*PrintInfo(m_dout);
- m_dout<<DTIME<<"Map::addNodeAndUpdate(): p=("
- <<p.X<<","<<p.Y<<","<<p.Z<<")"<<std::endl;*/
+ if (time_until_purge == 0)
+ return; // Feature disabled
- /*
- From this node to nodes underneath:
- If lighting is sunlight (1.0), unlight neighbours and
- set lighting to 0.
- Else discontinue.
- */
+ time_until_purge *= 1000; // seconds -> milliseconds
- v3s16 toppos = p + v3s16(0,1,0);
- v3s16 bottompos = p + v3s16(0,-1,0);
+ u64 curr_time = porting::getTimeMs();
+ u32 prev_unprocessed = m_unprocessed_count;
+ m_unprocessed_count = m_transforming_liquid.size();
- bool node_under_sunlight = true;
- core::map<v3s16, bool> light_sources;
+ // if unprocessed block count is decreasing or stable
+ if (m_unprocessed_count <= prev_unprocessed) {
+ m_queue_size_timer_started = false;
+ } else {
+ if (!m_queue_size_timer_started)
+ m_inc_trending_up_start_time = curr_time;
+ m_queue_size_timer_started = true;
+ }
- /*
- If there is a node at top and it doesn't have sunlight,
- there has not been any sunlight going down.
+ // Account for curr_time overflowing
+ if (m_queue_size_timer_started && m_inc_trending_up_start_time > curr_time)
+ m_queue_size_timer_started = false;
- Otherwise there probably is.
- */
- try{
- MapNode topnode = getNode(toppos);
+ /* If the queue has been growing for more than liquid_queue_purge_time seconds
+ * and the number of unprocessed blocks is still > liquid_loop_max then we
+ * cannot keep up; dump the oldest blocks from the queue so that the queue
+ * has liquid_loop_max items in it
+ */
+ if (m_queue_size_timer_started
+ && curr_time - m_inc_trending_up_start_time > time_until_purge
+ && m_unprocessed_count > liquid_loop_max) {
- if(topnode.getLight(LIGHTBANK_DAY, nodemgr) != LIGHT_SUN)
- node_under_sunlight = false;
- }
- catch(InvalidPositionException &e)
- {
- }
+ size_t dump_qty = m_unprocessed_count - liquid_loop_max;
- /*
- Remove all light that has come out of this node
- */
+ infostream << "transformLiquids(): DUMPING " << dump_qty
+ << " blocks from the queue" << std::endl;
- enum LightBank banks[] =
- {
- LIGHTBANK_DAY,
- LIGHTBANK_NIGHT
- };
- for(s32 i=0; i<2; i++)
- {
- enum LightBank bank = banks[i];
+ while (dump_qty--)
+ m_transforming_liquid.pop_front();
- u8 lightwas = getNode(p).getLight(bank, nodemgr);
+ m_queue_size_timer_started = false; // optimistically assume we can keep up now
+ m_unprocessed_count = m_transforming_liquid.size();
+ }
+}
- // Add the block of the added node to modified_blocks
- v3s16 blockpos = getNodeBlockPos(p);
- MapBlock * block = getBlockNoCreate(blockpos);
- assert(block != NULL);
- modified_blocks.insert(blockpos, block);
+std::vector<v3s16> Map::findNodesWithMetadata(v3s16 p1, v3s16 p2)
+{
+ std::vector<v3s16> positions_with_meta;
- assert(isValidPosition(p));
+ sortBoxVerticies(p1, p2);
+ v3s16 bpmin = getNodeBlockPos(p1);
+ v3s16 bpmax = getNodeBlockPos(p2);
- // Unlight neighbours of node.
- // This means setting light of all consequent dimmer nodes
- // to 0.
- // This also collects the nodes at the border which will spread
- // light again into this.
- unLightNeighbors(bank, p, lightwas, light_sources, modified_blocks);
+ VoxelArea area(p1, p2);
- n.setLight(bank, 0, nodemgr);
- }
+ for (s16 z = bpmin.Z; z <= bpmax.Z; z++)
+ for (s16 y = bpmin.Y; y <= bpmax.Y; y++)
+ for (s16 x = bpmin.X; x <= bpmax.X; x++) {
+ v3s16 blockpos(x, y, z);
- /*
- If node lets sunlight through and is under sunlight, it has
- sunlight too.
- */
- if(node_under_sunlight && nodemgr->get(n).sunlight_propagates)
- {
- n.setLight(LIGHTBANK_DAY, LIGHT_SUN, nodemgr);
- }
-
- /*
- Set the node on the map
- */
-
- setNode(p, n);
-
- /*
- Add intial metadata
- */
-
- std::string metadata_name = nodemgr->get(n).metadata_name;
- if(metadata_name != ""){
- NodeMetadata *meta = NodeMetadata::create(metadata_name, m_gamedef);
- if(!meta){
- errorstream<<"Failed to create node metadata \""
- <<metadata_name<<"\""<<std::endl;
- } else {
- setNodeMetadata(p, meta);
+ MapBlock *block = getBlockNoCreateNoEx(blockpos);
+ if (!block) {
+ verbosestream << "Map::getNodeMetadata(): Need to emerge "
+ << PP(blockpos) << std::endl;
+ block = emergeBlock(blockpos, false);
+ }
+ if (!block) {
+ infostream << "WARNING: Map::getNodeMetadata(): Block not found"
+ << std::endl;
+ continue;
}
- }
- /*
- If node is under sunlight and doesn't let sunlight through,
- take all sunlighted nodes under it and clear light from them
- and from where the light has been spread.
- TODO: This could be optimized by mass-unlighting instead
- of looping
- */
- if(node_under_sunlight && !nodemgr->get(n).sunlight_propagates)
- {
- s16 y = p.Y - 1;
- for(;; y--){
- //m_dout<<DTIME<<"y="<<y<<std::endl;
- v3s16 n2pos(p.X, y, p.Z);
-
- MapNode n2;
- try{
- n2 = getNode(n2pos);
- }
- catch(InvalidPositionException &e)
- {
- break;
- }
+ v3s16 p_base = blockpos * MAP_BLOCKSIZE;
+ std::vector<v3s16> keys = block->m_node_metadata.getAllKeys();
+ for (size_t i = 0; i != keys.size(); i++) {
+ v3s16 p(keys[i] + p_base);
+ if (!area.contains(p))
+ continue;
- if(n2.getLight(LIGHTBANK_DAY, nodemgr) == LIGHT_SUN)
- {
- unLightNeighbors(LIGHTBANK_DAY,
- n2pos, n2.getLight(LIGHTBANK_DAY, nodemgr),
- light_sources, modified_blocks);
- n2.setLight(LIGHTBANK_DAY, 0, nodemgr);
- setNode(n2pos, n2);
- }
- else
- break;
+ positions_with_meta.push_back(p);
}
}
- for(s32 i=0; i<2; i++)
- {
- enum LightBank bank = banks[i];
-
- /*
- Spread light from all nodes that might be capable of doing so
- */
- spreadLight(bank, light_sources, modified_blocks);
- }
-
- /*
- Update information about whether day and night light differ
- */
- for(core::map<v3s16, MapBlock*>::Iterator
- i = modified_blocks.getIterator();
- i.atEnd() == false; i++)
- {
- MapBlock *block = i.getNode()->getValue();
- block->updateDayNightDiff();
- }
-
- /*
- Add neighboring liquid nodes and the node itself if it is
- liquid (=water node was added) to transform queue.
- */
- v3s16 dirs[7] = {
- v3s16(0,0,0), // self
- 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
- };
- for(u16 i=0; i<7; i++)
- {
- try
- {
-
- v3s16 p2 = p + dirs[i];
-
- MapNode n2 = getNode(p2);
- if(nodemgr->get(n2).isLiquid() || n2.getContent() == CONTENT_AIR)
- {
- m_transforming_liquid.push_back(p2);
- }
-
- }catch(InvalidPositionException &e)
- {
- }
- }
+ return positions_with_meta;
}
-/*
-*/
-void Map::removeNodeAndUpdate(v3s16 p,
- core::map<v3s16, MapBlock*> &modified_blocks)
+NodeMetadata *Map::getNodeMetadata(v3s16 p)
{
- INodeDefManager *nodemgr = m_gamedef->ndef();
-
- /*PrintInfo(m_dout);
- m_dout<<DTIME<<"Map::removeNodeAndUpdate(): p=("
- <<p.X<<","<<p.Y<<","<<p.Z<<")"<<std::endl;*/
-
- bool node_under_sunlight = true;
-
- v3s16 toppos = p + v3s16(0,1,0);
-
- // Node will be replaced with this
- content_t replace_material = CONTENT_AIR;
-
- /*
- If there is a node at top and it doesn't have sunlight,
- there will be no sunlight going down.
- */
- try{
- MapNode topnode = getNode(toppos);
-
- if(topnode.getLight(LIGHTBANK_DAY, nodemgr) != LIGHT_SUN)
- node_under_sunlight = false;
- }
- catch(InvalidPositionException &e)
- {
- }
-
- core::map<v3s16, bool> light_sources;
-
- enum LightBank banks[] =
- {
- LIGHTBANK_DAY,
- LIGHTBANK_NIGHT
- };
- for(s32 i=0; i<2; i++)
- {
- enum LightBank bank = banks[i];
-
- /*
- Unlight neighbors (in case the node is a light source)
- */
- unLightNeighbors(bank, p,
- getNode(p).getLight(bank, nodemgr),
- light_sources, modified_blocks);
- }
-
- /*
- Remove node metadata
- */
-
- removeNodeMetadata(p);
-
- /*
- Remove the node.
- This also clears the lighting.
- */
-
- MapNode n;
- n.setContent(replace_material);
- setNode(p, n);
-
- for(s32 i=0; i<2; i++)
- {
- enum LightBank bank = banks[i];
-
- /*
- Recalculate lighting
- */
- spreadLight(bank, light_sources, modified_blocks);
- }
-
- // Add the block of the removed node to modified_blocks
v3s16 blockpos = getNodeBlockPos(p);
- MapBlock * block = getBlockNoCreate(blockpos);
- assert(block != NULL);
- modified_blocks.insert(blockpos, block);
-
- /*
- If the removed node was under sunlight, propagate the
- sunlight down from it and then light all neighbors
- of the propagated blocks.
- */
- if(node_under_sunlight)
- {
- s16 ybottom = propagateSunlight(p, modified_blocks);
- /*m_dout<<DTIME<<"Node was under sunlight. "
- "Propagating sunlight";
- m_dout<<DTIME<<" -> 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 ("
- <<p2.X<<","<<p2.Y<<","<<p2.Z<<")"
- <<std::endl;*/
- lightNeighbors(LIGHTBANK_DAY, p2, modified_blocks);
- }
- }
- else
- {
- // Set the lighting of this node to 0
- // TODO: Is this needed? Lighting is cleared up there already.
- try{
- MapNode n = getNode(p);
- n.setLight(LIGHTBANK_DAY, 0, nodemgr);
- setNode(p, n);
- }
- catch(InvalidPositionException &e)
- {
- assert(0);
- }
- }
-
- for(s32 i=0; i<2; i++)
- {
- enum LightBank bank = banks[i];
-
- // Get the brightest neighbour node and propagate light from it
- v3s16 n2p = getBrightestNeighbour(bank, p);
- try{
- MapNode n2 = getNode(n2p);
- lightNeighbors(bank, n2p, modified_blocks);
- }
- catch(InvalidPositionException &e)
- {
- }
- }
-
- /*
- Update information about whether day and night light differ
- */
- for(core::map<v3s16, MapBlock*>::Iterator
- i = modified_blocks.getIterator();
- i.atEnd() == false; i++)
- {
- MapBlock *block = i.getNode()->getValue();
- block->updateDayNightDiff();
- }
-
- /*
- Add neighboring liquid nodes and this node to transform queue.
- (it's vital for the node itself to get updated last.)
- */
- 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++)
- {
- try
- {
-
- v3s16 p2 = p + dirs[i];
-
- MapNode n2 = getNode(p2);
- if(nodemgr->get(n2).isLiquid() || n2.getContent() == CONTENT_AIR)
- {
- m_transforming_liquid.push_back(p2);
- }
-
- }catch(InvalidPositionException &e)
- {
- }
- }
-}
-
-bool Map::addNodeWithEvent(v3s16 p, MapNode n)
-{
- MapEditEvent event;
- event.type = MEET_ADDNODE;
- event.p = p;
- event.n = n;
-
- bool succeeded = true;
- try{
- core::map<v3s16, MapBlock*> modified_blocks;
- addNodeAndUpdate(p, n, modified_blocks);
-
- // Copy modified_blocks to event
- for(core::map<v3s16, MapBlock*>::Iterator
- i = modified_blocks.getIterator();
- i.atEnd()==false; i++)
- {
- event.modified_blocks.insert(i.getNode()->getKey(), false);
- }
- }
- catch(InvalidPositionException &e){
- succeeded = false;
- }
-
- dispatchEvent(&event);
-
- return succeeded;
-}
-
-bool Map::removeNodeWithEvent(v3s16 p)
-{
- MapEditEvent event;
- event.type = MEET_REMOVENODE;
- event.p = p;
-
- bool succeeded = true;
- try{
- core::map<v3s16, MapBlock*> modified_blocks;
- removeNodeAndUpdate(p, modified_blocks);
-
- // Copy modified_blocks to event
- for(core::map<v3s16, MapBlock*>::Iterator
- i = modified_blocks.getIterator();
- i.atEnd()==false; i++)
- {
- event.modified_blocks.insert(i.getNode()->getKey(), false);
- }
- }
- catch(InvalidPositionException &e){
- succeeded = false;
- }
-
- dispatchEvent(&event);
-
- return succeeded;
-}
-
-bool Map::dayNightDiffed(v3s16 blockpos)
-{
- try{
- v3s16 p = blockpos + v3s16(0,0,0);
- MapBlock *b = getBlockNoCreate(p);
- if(b->dayNightDiffed())
- return true;
- }
- catch(InvalidPositionException &e){}
- // Leading edges
- try{
- v3s16 p = blockpos + v3s16(-1,0,0);
- MapBlock *b = getBlockNoCreate(p);
- if(b->dayNightDiffed())
- return true;
- }
- catch(InvalidPositionException &e){}
- try{
- v3s16 p = blockpos + v3s16(0,-1,0);
- MapBlock *b = getBlockNoCreate(p);
- if(b->dayNightDiffed())
- return true;
- }
- catch(InvalidPositionException &e){}
- try{
- v3s16 p = blockpos + v3s16(0,0,-1);
- MapBlock *b = getBlockNoCreate(p);
- if(b->dayNightDiffed())
- return true;
- }
- catch(InvalidPositionException &e){}
- // Trailing edges
- try{
- v3s16 p = blockpos + v3s16(1,0,0);
- MapBlock *b = getBlockNoCreate(p);
- if(b->dayNightDiffed())
- return true;
- }
- catch(InvalidPositionException &e){}
- try{
- v3s16 p = blockpos + v3s16(0,1,0);
- MapBlock *b = getBlockNoCreate(p);
- if(b->dayNightDiffed())
- return true;
- }
- catch(InvalidPositionException &e){}
- try{
- v3s16 p = blockpos + v3s16(0,0,1);
- MapBlock *b = getBlockNoCreate(p);
- if(b->dayNightDiffed())
- return true;
- }
- catch(InvalidPositionException &e){}
-
- return false;
-}
-
-/*
- Updates usage timers
-*/
-void Map::timerUpdate(float dtime, float unload_timeout,
- core::list<v3s16> *unloaded_blocks)
-{
- bool save_before_unloading = (mapType() == MAPTYPE_SERVER);
-
- // Profile modified reasons
- Profiler modprofiler;
-
- core::list<v2s16> sector_deletion_queue;
- u32 deleted_blocks_count = 0;
- u32 saved_blocks_count = 0;
- u32 block_count_all = 0;
-
- core::map<v2s16, MapSector*>::Iterator si;
-
- beginSave();
- si = m_sectors.getIterator();
- for(; si.atEnd() == false; si++)
- {
- MapSector *sector = si.getNode()->getValue();
-
- bool all_blocks_deleted = true;
-
- core::list<MapBlock*> blocks;
- sector->getBlocks(blocks);
-
- for(core::list<MapBlock*>::Iterator i = blocks.begin();
- i != blocks.end(); i++)
- {
- MapBlock *block = (*i);
-
- block->incrementUsageTimer(dtime);
-
- if(block->getUsageTimer() > unload_timeout)
- {
- v3s16 p = block->getPos();
-
- // Save if modified
- if(block->getModified() != MOD_STATE_CLEAN
- && save_before_unloading)
- {
- modprofiler.add(block->getModifiedReason(), 1);
- saveBlock(block);
- saved_blocks_count++;
- }
-
- // Delete from memory
- sector->deleteBlock(block);
-
- if(unloaded_blocks)
- unloaded_blocks->push_back(p);
-
- deleted_blocks_count++;
- }
- else
- {
- all_blocks_deleted = false;
- block_count_all++;
- }
- }
-
- if(all_blocks_deleted)
- {
- sector_deletion_queue.push_back(si.getNode()->getKey());
- }
- }
- endSave();
-
- // Finally delete the empty sectors
- deleteSectors(sector_deletion_queue);
-
- if(deleted_blocks_count != 0)
- {
- PrintInfo(infostream); // ServerMap/ClientMap:
- infostream<<"Unloaded "<<deleted_blocks_count
- <<" blocks from memory";
- if(save_before_unloading)
- infostream<<", of which "<<saved_blocks_count<<" were written";
- infostream<<", "<<block_count_all<<" blocks in memory";
- infostream<<"."<<std::endl;
- if(saved_blocks_count != 0){
- PrintInfo(infostream); // ServerMap/ClientMap:
- infostream<<"Blocks modified by: "<<std::endl;
- modprofiler.print(infostream);
- }
- }
-}
-
-void Map::deleteSectors(core::list<v2s16> &list)
-{
- core::list<v2s16>::Iterator j;
- for(j=list.begin(); j!=list.end(); j++)
- {
- 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.remove(*j);
- delete sector;
- }
-}
-
-#if 0
-void Map::unloadUnusedData(float timeout,
- core::list<v3s16> *deleted_blocks)
-{
- core::list<v2s16> sector_deletion_queue;
- u32 deleted_blocks_count = 0;
- u32 saved_blocks_count = 0;
-
- core::map<v2s16, MapSector*>::Iterator si = m_sectors.getIterator();
- for(; si.atEnd() == false; si++)
- {
- MapSector *sector = si.getNode()->getValue();
-
- bool all_blocks_deleted = true;
-
- core::list<MapBlock*> blocks;
- sector->getBlocks(blocks);
- for(core::list<MapBlock*>::Iterator i = blocks.begin();
- i != blocks.end(); i++)
- {
- MapBlock *block = (*i);
-
- if(block->getUsageTimer() > timeout)
- {
- // Save if modified
- if(block->getModified() != MOD_STATE_CLEAN)
- {
- saveBlock(block);
- saved_blocks_count++;
- }
- // Delete from memory
- sector->deleteBlock(block);
- deleted_blocks_count++;
- }
- else
- {
- all_blocks_deleted = false;
- }
- }
-
- if(all_blocks_deleted)
- {
- sector_deletion_queue.push_back(si.getNode()->getKey());
- }
- }
-
- deleteSectors(sector_deletion_queue);
-
- infostream<<"Map: Unloaded "<<deleted_blocks_count<<" blocks from memory"
- <<", of which "<<saved_blocks_count<<" were wr."
- <<std::endl;
-
- //return sector_deletion_queue.getSize();
- //return deleted_blocks_count;
-}
-#endif
-
-void Map::PrintInfo(std::ostream &out)
-{
- out<<"Map: ";
-}
-
-#define WATER_DROP_BOOST 4
-
-enum NeighborType {
- NEIGHBOR_UPPER,
- NEIGHBOR_SAME_LEVEL,
- NEIGHBOR_LOWER
-};
-struct NodeNeighbor {
- MapNode n;
- NeighborType t;
- v3s16 p;
-};
-
-void Map::transformLiquids(core::map<v3s16, MapBlock*> & modified_blocks)
-{
- INodeDefManager *nodemgr = m_gamedef->ndef();
-
- DSTACK(__FUNCTION_NAME);
- //TimeTaker timer("transformLiquids()");
-
- u32 loopcount = 0;
- u32 initial_size = m_transforming_liquid.size();
-
- /*if(initial_size != 0)
- infostream<<"transformLiquids(): initial_size="<<initial_size<<std::endl;*/
-
- // list of nodes that due to viscosity have not reached their max level height
- UniqueQueue<v3s16> must_reflow;
-
- // List of MapBlocks that will require a lighting update (due to lava)
- core::map<v3s16, MapBlock*> lighting_modified_blocks;
-
- while(m_transforming_liquid.size() != 0)
- {
- // This should be done here so that it is done when continue is used
- if(loopcount >= initial_size * 3)
- break;
- loopcount++;
-
- /*
- Get a queued transforming liquid node
- */
- v3s16 p0 = m_transforming_liquid.pop_front();
-
- MapNode n0 = getNodeNoEx(p0);
-
- /*
- Collect information about current node
- */
- s8 liquid_level = -1;
- u8 liquid_kind = CONTENT_IGNORE;
- LiquidType liquid_type = nodemgr->get(n0).liquid_type;
- switch (liquid_type) {
- case LIQUID_SOURCE:
- liquid_level = LIQUID_LEVEL_SOURCE;
- liquid_kind = nodemgr->getId(nodemgr->get(n0).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)
- continue;
- liquid_kind = CONTENT_AIR;
- break;
- }
-
- /*
- Collect information about the environment
- */
- const v3s16 *dirs = g_6dirs;
- NodeNeighbor sources[6]; // surrounding sources
- int num_sources = 0;
- NodeNeighbor flows[6]; // surrounding flowing liquid nodes
- int num_flows = 0;
- NodeNeighbor airs[6]; // surrounding air
- int num_airs = 0;
- NodeNeighbor neutrals[6]; // nodes that are solid or another kind of liquid
- int num_neutrals = 0;
- bool flowing_down = false;
- for (u16 i = 0; i < 6; i++) {
- NeighborType nt = NEIGHBOR_SAME_LEVEL;
- switch (i) {
- case 1:
- nt = NEIGHBOR_UPPER;
- break;
- case 4:
- nt = NEIGHBOR_LOWER;
- break;
- }
- v3s16 npos = p0 + dirs[i];
- NodeNeighbor nb = {getNodeNoEx(npos), nt, npos};
- switch (nodemgr->get(nb.n.getContent()).liquid_type) {
- case LIQUID_NONE:
- if (nb.n.getContent() == CONTENT_AIR) {
- airs[num_airs++] = nb;
- // if the current node is a water source the neighbor
- // should be enqueded for transformation regardless of whether the
- // current node changes or not.
- 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) {
- flowing_down = true;
- }
- } else {
- neutrals[num_neutrals++] = nb;
- }
- 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) {
- neutrals[num_neutrals++] = nb;
- } else {
- // Do not count bottom source, it will screw things up
- if(dirs[i].Y != -1)
- sources[num_sources++] = nb;
- }
- break;
- 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) {
- neutrals[num_neutrals++] = nb;
- } else {
- flows[num_flows++] = nb;
- if (nb.t == NEIGHBOR_LOWER)
- flowing_down = true;
- }
- break;
- }
- }
-
- /*
- decide on the type (and possibly level) of the current node
- */
- content_t new_node_content;
- s8 new_node_level = -1;
- s8 max_node_level = -1;
- if (num_sources >= 2 || liquid_type == LIQUID_SOURCE) {
- // liquid_kind will be set to either the flowing alternative of the node (if it's a liquid)
- // or the flowing alternative of the first of the surrounding sources (if it's air), so
- // it's perfectly safe to use liquid_kind here to determine the new node content.
- 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;
- } else {
- // no surrounding sources, so get the maximum level that can flow into this node
- for (u16 i = 0; i < num_flows; i++) {
- u8 nb_liquid_level = (flows[i].n.param2 & LIQUID_LEVEL_MASK);
- switch (flows[i].t) {
- case NEIGHBOR_UPPER:
- if (nb_liquid_level + WATER_DROP_BOOST > max_node_level) {
- 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)
- 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) {
- max_node_level = nb_liquid_level - 1;
- }
- break;
- }
- }
-
- u8 viscosity = nodemgr->get(liquid_kind).liquid_viscosity;
- if (viscosity > 1 && max_node_level != liquid_level) {
- // amount to gain, limited by viscosity
- // must be at least 1 in absolute value
- s8 level_inc = max_node_level - liquid_level;
- if (level_inc < -viscosity || level_inc > viscosity)
- new_node_level = liquid_level + level_inc/viscosity;
- else if (level_inc < 0)
- new_node_level = liquid_level - 1;
- else if (level_inc > 0)
- new_node_level = liquid_level + 1;
- if (new_node_level != max_node_level)
- must_reflow.push_back(p0);
- } else
- new_node_level = max_node_level;
-
- if (new_node_level >= 0)
- new_node_content = liquid_kind;
- else
- new_node_content = CONTENT_AIR;
-
- }
-
- /*
- 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)))
- continue;
-
-
- /*
- update the current node
- */
- //bool flow_down_enabled = (flowing_down && ((n0.param2 & LIQUID_FLOW_DOWN_MASK) != LIQUID_FLOW_DOWN_MASK));
- if (nodemgr->get(new_node_content).liquid_type == LIQUID_FLOWING) {
- // set level to last 3 bits, flowing down bit to 4th bit
- n0.param2 = (flowing_down ? LIQUID_FLOW_DOWN_MASK : 0x00) | (new_node_level & LIQUID_LEVEL_MASK);
- } else {
- // set the liquid level and flow bit to 0
- n0.param2 = ~(LIQUID_LEVEL_MASK | LIQUID_FLOW_DOWN_MASK);
- }
- n0.setContent(new_node_content);
- setNode(p0, n0);
- v3s16 blockpos = getNodeBlockPos(p0);
- MapBlock *block = getBlockNoCreateNoEx(blockpos);
- if(block != NULL) {
- modified_blocks.insert(blockpos, block);
- // If node emits light, MapBlock requires lighting update
- if(nodemgr->get(n0).light_source != 0)
- lighting_modified_blocks[block->getPos()] = block;
- }
-
- /*
- enqueue neighbors for update if neccessary
- */
- switch (nodemgr->get(n0.getContent()).liquid_type) {
- case LIQUID_SOURCE:
- case LIQUID_FLOWING:
- // make sure source flows into all neighboring nodes
- for (u16 i = 0; i < num_flows; i++)
- if (flows[i].t != NEIGHBOR_UPPER)
- m_transforming_liquid.push_back(flows[i].p);
- for (u16 i = 0; i < num_airs; i++)
- if (airs[i].t != NEIGHBOR_UPPER)
- m_transforming_liquid.push_back(airs[i].p);
- break;
- case LIQUID_NONE:
- // this flow has turned to air; neighboring flows might need to do the same
- for (u16 i = 0; i < num_flows; i++)
- m_transforming_liquid.push_back(flows[i].p);
- break;
- }
- }
- //infostream<<"Map::transformLiquids(): loopcount="<<loopcount<<std::endl;
- while (must_reflow.size() > 0)
- m_transforming_liquid.push_back(must_reflow.pop_front());
- updateLighting(lighting_modified_blocks, modified_blocks);
-}
-
-NodeMetadata* Map::getNodeMetadata(v3s16 p)
-{
- v3s16 blockpos = getNodeBlockPos(p);
- v3s16 p_rel = p - blockpos*MAP_BLOCKSIZE;
- MapBlock *block = getBlockNoCreateNoEx(blockpos);
- if(!block){
- infostream<<"Map::getNodeMetadata(): Need to emerge "
- <<PP(blockpos)<<std::endl;
- block = emergeBlock(blockpos, false);
- }
- if(!block)
- {
- infostream<<"WARNING: Map::getNodeMetadata(): Block not found"
- <<std::endl;
- return NULL;
- }
- NodeMetadata *meta = block->m_node_metadata->get(p_rel);
- return meta;
-}
-
-void Map::setNodeMetadata(v3s16 p, NodeMetadata *meta)
-{
- v3s16 blockpos = getNodeBlockPos(p);
- v3s16 p_rel = p - blockpos*MAP_BLOCKSIZE;
- MapBlock *block = getBlockNoCreateNoEx(blockpos);
- if(!block){
- infostream<<"Map::setNodeMetadata(): Need to emerge "
- <<PP(blockpos)<<std::endl;
- block = emergeBlock(blockpos, false);
- }
- if(!block)
- {
- infostream<<"WARNING: Map::setNodeMetadata(): Block not found"
- <<std::endl;
- return;
- }
- block->m_node_metadata->set(p_rel, meta);
-}
-
-void Map::removeNodeMetadata(v3s16 p)
-{
- v3s16 blockpos = getNodeBlockPos(p);
- v3s16 p_rel = p - blockpos*MAP_BLOCKSIZE;
- MapBlock *block = getBlockNoCreateNoEx(blockpos);
- if(block == NULL)
- {
- infostream<<"WARNING: Map::removeNodeMetadata(): Block not found"
- <<std::endl;
- return;
- }
- block->m_node_metadata->remove(p_rel);
-}
-
-void Map::nodeMetadataStep(float dtime,
- core::map<v3s16, MapBlock*> &changed_blocks)
-{
- /*
- NOTE:
- Currently there is no way to ensure that all the necessary
- blocks are loaded when this is run. (They might get unloaded)
- NOTE: ^- Actually, that might not be so. In a quick test it
- reloaded a block with a furnace when I walked back to it from
- a distance.
- */
- core::map<v2s16, MapSector*>::Iterator si;
- si = m_sectors.getIterator();
- for(; si.atEnd() == false; si++)
- {
- MapSector *sector = si.getNode()->getValue();
- core::list< MapBlock * > sectorblocks;
- sector->getBlocks(sectorblocks);
- core::list< MapBlock * >::Iterator i;
- for(i=sectorblocks.begin(); i!=sectorblocks.end(); i++)
- {
- MapBlock *block = *i;
- bool changed = block->m_node_metadata->step(dtime);
- if(changed)
- changed_blocks[block->getPos()] = block;
- }
- }
-}
-
-/*
- ServerMap
-*/
-
-ServerMap::ServerMap(std::string savedir, IGameDef *gamedef):
- Map(dout_server, gamedef),
- m_seed(0),
- m_map_metadata_changed(true),
- m_database(NULL),
- m_database_read(NULL),
- m_database_write(NULL)
-{
- infostream<<__FUNCTION_NAME<<std::endl;
-
- //m_chunksize = 8; // Takes a few seconds
-
- if (g_settings->get("fixed_map_seed").empty())
- {
- m_seed = (((u64)(myrand()%0xffff)<<0)
- + ((u64)(myrand()%0xffff)<<16)
- + ((u64)(myrand()%0xffff)<<32)
- + ((u64)(myrand()%0xffff)<<48));
- }
- else
- {
- m_seed = g_settings->getU64("fixed_map_seed");
- }
-
- /*
- Experimental and debug stuff
- */
-
- {
- }
-
- /*
- Try to load map; if not found, create a new one.
- */
-
- m_savedir = savedir;
- m_map_saving_enabled = false;
-
- try
- {
- // If directory exists, check contents and load if possible
- if(fs::PathExists(m_savedir))
- {
- // If directory is empty, it is safe to save into it.
- if(fs::GetDirListing(m_savedir).size() == 0)
- {
- infostream<<"Server: Empty save directory is valid."
- <<std::endl;
- m_map_saving_enabled = true;
- }
- else
- {
- try{
- // Load map metadata (seed, chunksize)
- loadMapMeta();
- }
- catch(FileNotGoodException &e){
- infostream<<"WARNING: Could not load map metadata"
- //<<" Disabling chunk-based generator."
- <<std::endl;
- //m_chunksize = 0;
- }
-
- /*try{
- // Load chunk metadata
- loadChunkMeta();
- }
- catch(FileNotGoodException &e){
- infostream<<"WARNING: Could not load chunk metadata."
- <<" Disabling chunk-based generator."
- <<std::endl;
- m_chunksize = 0;
- }*/
-
- /*infostream<<"Server: Successfully loaded chunk "
- "metadata and sector (0,0) from "<<savedir<<
- ", assuming valid save directory."
- <<std::endl;*/
-
- infostream<<"Server: Successfully loaded map "
- <<"and chunk metadata from "<<savedir
- <<", assuming valid save directory."
- <<std::endl;
-
- m_map_saving_enabled = true;
- // Map loaded, not creating new one
- return;
- }
- }
- // If directory doesn't exist, it is safe to save to it
- else{
- m_map_saving_enabled = true;
- }
- }
- catch(std::exception &e)
- {
- infostream<<"WARNING: Server: 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;
- }
-
- infostream<<"Initializing new map."<<std::endl;
-
- // Create zero sector
- emergeSector(v2s16(0,0));
-
- // Initially write whole map
- save(MOD_STATE_CLEAN);
-}
-
-ServerMap::~ServerMap()
-{
- infostream<<__FUNCTION_NAME<<std::endl;
-
- try
- {
- if(m_map_saving_enabled)
- {
- // Save only changed parts
- save(MOD_STATE_WRITE_AT_UNLOAD);
- infostream<<"Server: saved map to "<<m_savedir<<std::endl;
- }
- else
- {
- infostream<<"Server: map not saved"<<std::endl;
- }
- }
- catch(std::exception &e)
- {
- infostream<<"Server: Failed to save map to "<<m_savedir
- <<", exception: "<<e.what()<<std::endl;
- }
-
- /*
- Close database if it was opened
- */
- if(m_database_read)
- sqlite3_finalize(m_database_read);
- if(m_database_write)
- sqlite3_finalize(m_database_write);
- if(m_database)
- sqlite3_close(m_database);
-
-#if 0
- /*
- Free all MapChunks
- */
- core::map<v2s16, MapChunk*>::Iterator i = m_chunks.getIterator();
- for(; i.atEnd() == false; i++)
- {
- MapChunk *chunk = i.getNode()->getValue();
- delete chunk;
- }
-#endif
-}
-
-void ServerMap::initBlockMake(mapgen::BlockMakeData *data, v3s16 blockpos)
-{
- bool enable_mapgen_debug_info = g_settings->getBool("enable_mapgen_debug_info");
- if(enable_mapgen_debug_info)
- infostream<<"initBlockMake(): ("<<blockpos.X<<","<<blockpos.Y<<","
- <<blockpos.Z<<")"<<std::endl;
-
- // Do nothing if not inside limits (+-1 because of neighbors)
- if(blockpos_over_limit(blockpos - v3s16(1,1,1)) ||
- blockpos_over_limit(blockpos + v3s16(1,1,1)))
- {
- data->no_op = true;
- return;
- }
-
- data->no_op = false;
- data->seed = m_seed;
- data->blockpos = blockpos;
- data->nodedef = m_gamedef->ndef();
-
- /*
- Create the whole area of this and the neighboring blocks
- */
- {
- //TimeTaker timer("initBlockMake() create area");
-
- for(s16 x=-1; x<=1; x++)
- for(s16 z=-1; z<=1; z++)
- {
- v2s16 sectorpos(blockpos.X+x, blockpos.Z+z);
- // Sector metadata is loaded from disk if not already loaded.
- ServerMapSector *sector = createSector(sectorpos);
- assert(sector);
-
- for(s16 y=-1; y<=1; y++)
- {
- v3s16 p(blockpos.X+x, blockpos.Y+y, blockpos.Z+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.
-
- Refer to the map generator heuristics.
- */
- bool ug = mapgen::block_is_underground(data->seed, p);
- block->setIsUnderground(ug);
- }
-
- // Lighting will not be valid after make_chunk is called
- block->setLightingExpired(true);
- // Lighting will be calculated
- //block->setLightingExpired(false);
- }
- }
- }
-
- /*
- Now we have a big empty area.
-
- Make a ManualMapVoxelManipulator that contains this and the
- neighboring blocks
- */
-
- // The area that contains this block and it's neighbors
- v3s16 bigarea_blocks_min = blockpos - v3s16(1,1,1);
- v3s16 bigarea_blocks_max = blockpos + v3s16(1,1,1);
-
- data->vmanip = new ManualMapVoxelManipulator(this);
- //data->vmanip->setMap(this);
-
- // Add the area
- {
- //TimeTaker timer("initBlockMake() initialEmerge");
- data->vmanip->initialEmerge(bigarea_blocks_min, bigarea_blocks_max);
- }
-
- // Data is ready now.
-}
-
-MapBlock* ServerMap::finishBlockMake(mapgen::BlockMakeData *data,
- core::map<v3s16, MapBlock*> &changed_blocks)
-{
- v3s16 blockpos = data->blockpos;
- /*infostream<<"finishBlockMake(): ("<<blockpos.X<<","<<blockpos.Y<<","
- <<blockpos.Z<<")"<<std::endl;*/
-
- if(data->no_op)
- {
- //infostream<<"finishBlockMake(): no-op"<<std::endl;
- return NULL;
- }
-
- bool enable_mapgen_debug_info = g_settings->getBool("enable_mapgen_debug_info");
-
- /*infostream<<"Resulting vmanip:"<<std::endl;
- data->vmanip.print(infostream);*/
-
- // Make sure affected blocks are loaded
- for(s16 x=-1; x<=1; x++)
- for(s16 z=-1; z<=1; z++)
- for(s16 y=-1; y<=1; y++)
- {
- v3s16 p(blockpos.X+x, blockpos.Y+y, blockpos.Z+z);
- // Load from disk if not already in memory
- emergeBlock(p, 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);
- }
-
- if(enable_mapgen_debug_info)
- infostream<<"finishBlockMake: changed_blocks.size()="
- <<changed_blocks.size()<<std::endl;
-
- /*
- Copy transforming liquid information
- */
- while(data->transforming_liquid.size() > 0)
- {
- v3s16 p = data->transforming_liquid.pop_front();
- m_transforming_liquid.push_back(p);
- }
-
- /*
- Get central block
- */
- MapBlock *block = getBlockNoCreateNoEx(data->blockpos);
- assert(block);
-
- /*
- Set is_underground flag for lighting with sunlight.
-
- Refer to map generator heuristics.
-
- NOTE: This is done in initChunkMake
- */
- //block->setIsUnderground(mapgen::block_is_underground(data->seed, blockpos));
-
-
- /*
- Add sunlight to central block.
- This makes in-dark-spawning monsters to not flood the whole thing.
- Do not spread the light, though.
- */
- /*core::map<v3s16, bool> light_sources;
- bool black_air_left = false;
- block->propagateSunlight(light_sources, true, &black_air_left);*/
-
- /*
- NOTE: Lighting and object adding shouldn't really be here, but
- lighting is a bit tricky to move properly to makeBlock.
- TODO: Do this the right way anyway, that is, move it to makeBlock.
- - There needs to be some way for makeBlock to report back if
- the lighting update is going further down because of the
- new block blocking light
- */
-
- /*
- Update lighting
- NOTE: This takes ~60ms, TODO: Investigate why
- */
- {
- TimeTaker t("finishBlockMake lighting update");
-
- core::map<v3s16, MapBlock*> lighting_update_blocks;
-#if 1
- // Center block
- lighting_update_blocks.insert(block->getPos(), block);
-
- /*{
- s16 x = 0;
- s16 z = 0;
- v3s16 p = block->getPos()+v3s16(x,1,z);
- lighting_update_blocks[p] = getBlockNoCreateNoEx(p);
- }*/
-#endif
-#if 0
- // All modified blocks
- // NOTE: Should this be done? If this is not done, then the lighting
- // of the others will be updated in a different place, one by one, i
- // think... or they might not? Well, at least they are left marked as
- // "lighting expired"; it seems that is not handled at all anywhere,
- // so enabling this will slow it down A LOT because otherwise it
- // would not do this at all. This causes the black trees.
- for(core::map<v3s16, MapBlock*>::Iterator
- i = changed_blocks.getIterator();
- i.atEnd() == false; i++)
- {
- lighting_update_blocks.insert(i.getNode()->getKey(),
- i.getNode()->getValue());
- }
- /*// Also force-add all the upmost blocks for proper sunlight
- for(s16 x=-1; x<=1; x++)
- for(s16 z=-1; z<=1; z++)
- {
- v3s16 p = block->getPos()+v3s16(x,1,z);
- lighting_update_blocks[p] = getBlockNoCreateNoEx(p);
- }*/
-#endif
- updateLighting(lighting_update_blocks, changed_blocks);
-
- /*
- 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=-1; x<=1; x++)
- for(s16 y=-1; y<=1; y++)
- for(s16 z=-1; z<=1; z++)
- {
- v3s16 p = block->getPos()+v3s16(x,y,z);
- getBlockNoCreateNoEx(p)->setLightingExpired(false);
- }
-
- if(enable_mapgen_debug_info == false)
- t.stop(true); // Hide output
- }
-
- /*
- Add random objects to block
- */
- mapgen::add_random_objects(block);
-
- /*
- Go through changed blocks
- */
- for(core::map<v3s16, MapBlock*>::Iterator i = changed_blocks.getIterator();
- i.atEnd() == false; i++)
- {
- MapBlock *block = i.getNode()->getValue();
- assert(block);
- /*
- Update day/night difference cache of the MapBlocks
- */
- block->updateDayNightDiff();
- /*
- Set block as modified
- */
- block->raiseModified(MOD_STATE_WRITE_NEEDED,
- "finishBlockMake updateDayNightDiff");
- }
-
- /*
- Set central block as generated
- */
- block->setGenerated(true);
-
- /*
- Save changed parts of map
- NOTE: Will be saved later.
- */
- //save(MOD_STATE_WRITE_AT_UNLOAD);
-
- /*infostream<<"finishBlockMake() done for ("<<blockpos.X<<","<<blockpos.Y<<","
- <<blockpos.Z<<")"<<std::endl;*/
-#if 0
- if(enable_mapgen_debug_info)
- {
- /*
- Analyze resulting blocks
- */
- for(s16 x=-1; x<=1; x++)
- for(s16 y=-1; y<=1; y++)
- for(s16 z=-1; z<=1; z++)
- {
- v3s16 p = block->getPos()+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
-
- return block;
-}
-
-ServerMapSector * ServerMap::createSector(v2s16 p2d)
-{
- DSTACKF("%s: p2d=(%d,%d)",
- __FUNCTION_NAME,
- p2d.X, p2d.Y);
-
- /*
- Check if it exists already in memory
- */
- ServerMapSector *sector = (ServerMapSector*)getSectorNoGenerateNoEx(p2d);
- if(sector != NULL)
- return sector;
-
- /*
- Try to load it from disk (with blocks)
- */
- //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
- */
- 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)
- throw InvalidPositionException("createSector(): pos. over limit");
-
- /*
- Generate blank sector
- */
-
- sector = new ServerMapSector(this, p2d, m_gamedef);
-
- // Sector position on map in nodes
- v2s16 nodepos2d = p2d * MAP_BLOCKSIZE;
-
- /*
- Insert to container
- */
- m_sectors.insert(p2d, sector);
-
- return sector;
-}
-
-/*
- This is a quick-hand function for calling makeBlock().
-*/
-MapBlock * ServerMap::generateBlock(
- v3s16 p,
- core::map<v3s16, MapBlock*> &modified_blocks
-)
-{
- DSTACKF("%s: p=(%d,%d,%d)", __FUNCTION_NAME, p.X, p.Y, p.Z);
-
- /*infostream<<"generateBlock(): "
- <<"("<<p.X<<","<<p.Y<<","<<p.Z<<")"
- <<std::endl;*/
-
- bool enable_mapgen_debug_info = g_settings->getBool("enable_mapgen_debug_info");
-
- TimeTaker timer("generateBlock");
-
- //MapBlock *block = original_dummy;
-
- v2s16 p2d(p.X, p.Z);
- v2s16 p2d_nodes = p2d * MAP_BLOCKSIZE;
-
- /*
- Do not generate over-limit
- */
- if(blockpos_over_limit(p))
- {
- infostream<<__FUNCTION_NAME<<": Block position over limit"<<std::endl;
- throw InvalidPositionException("generateBlock(): pos. over limit");
- }
-
- /*
- Create block make data
- */
- mapgen::BlockMakeData data;
- initBlockMake(&data, p);
-
- /*
- Generate block
- */
- {
- TimeTaker t("mapgen::make_block()");
- mapgen::make_block(&data);
-
- if(enable_mapgen_debug_info == false)
- t.stop(true); // Hide output
- }
-
- /*
- Blit data back on map, update lighting, add mobs and whatever this does
- */
- finishBlockMake(&data, modified_blocks);
-
- /*
- Get central block
- */
- MapBlock *block = getBlockNoCreateNoEx(p);
-
-#if 0
- /*
- Check result
- */
- if(block)
- {
- bool erroneus_content = false;
- for(s16 z0=0; z0<MAP_BLOCKSIZE; z0++)
- for(s16 y0=0; y0<MAP_BLOCKSIZE; y0++)
- for(s16 x0=0; x0<MAP_BLOCKSIZE; x0++)
- {
- v3s16 p(x0,y0,z0);
- MapNode n = block->getNode(p);
- if(n.getContent() == CONTENT_IGNORE)
- {
- infostream<<"CONTENT_IGNORE at "
- <<"("<<p.X<<","<<p.Y<<","<<p.Z<<")"
- <<std::endl;
- erroneus_content = true;
- assert(0);
- }
- }
- if(erroneus_content)
- {
- assert(0);
- }
- }
-#endif
-
-#if 0
- /*
- Generate a completely empty block
- */
- if(block)
- {
- for(s16 z0=0; z0<MAP_BLOCKSIZE; z0++)
- for(s16 x0=0; x0<MAP_BLOCKSIZE; x0++)
- {
- for(s16 y0=0; y0<MAP_BLOCKSIZE; y0++)
- {
- MapNode n;
- n.setContent(CONTENT_AIR);
- block->setNode(v3s16(x0,y0,z0), n);
- }
- }
- }
-#endif
-
- if(enable_mapgen_debug_info == false)
- timer.stop(true); // Hide output
-
- return block;
-}
-
-MapBlock * ServerMap::createBlock(v3s16 p)
-{
- DSTACKF("%s: p=(%d,%d,%d)",
- __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)
- throw InvalidPositionException("createBlock(): pos. over limit");
-
- v2s16 p2d(p.X, p.Z);
- s16 block_y = p.Y;
- /*
- This will create or load a sector if not found in memory.
- If block exists on disk, it will be loaded.
-
- NOTE: On old save formats, this will be slow, as it generates
- lighting on blocks for them.
- */
- ServerMapSector *sector;
- try{
- sector = (ServerMapSector*)createSector(p2d);
- assert(sector->getId() == MAPSECTOR_SERVER);
- }
- 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->isDummy())
- block->unDummify();
- return block;
- }
- // Create blank
- block = sector->createBlankBlock(block_y);
- return block;
-}
-
-MapBlock * ServerMap::emergeBlock(v3s16 p, bool allow_generate)
-{
- DSTACKF("%s: p=(%d,%d,%d), allow_generate=%d",
- __FUNCTION_NAME,
- p.X, p.Y, p.Z, allow_generate);
-
- {
- MapBlock *block = getBlockNoCreateNoEx(p);
- if(block && block->isDummy() == false)
- return block;
- }
-
- {
- MapBlock *block = loadBlock(p);
- if(block)
- return block;
- }
-
- if(allow_generate)
- {
- core::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(core::map<v3s16, MapBlock*>::Iterator
- i = modified_blocks.getIterator();
- i.atEnd()==false; i++)
- {
- event.modified_blocks.insert(i.getNode()->getKey(), false);
- }
-
- // Queue event
- dispatchEvent(&event);
-
- return block;
- }
- }
-
- return NULL;
-}
-
-s16 ServerMap::findGroundLevel(v2s16 p2d)
-{
-#if 0
- /*
- Uh, just do something random...
- */
- // Find existing map from top to down
- s16 max=63;
- s16 min=-64;
- v3s16 p(p2d.X, max, p2d.Y);
- for(; p.Y>min; p.Y--)
- {
- MapNode n = getNodeNoEx(p);
- if(n.getContent() != CONTENT_IGNORE)
- break;
- }
- if(p.Y == min)
- goto plan_b;
- // If this node is not air, go to plan b
- if(getNodeNoEx(p).getContent() != CONTENT_AIR)
- goto plan_b;
- // Search existing walkable and return it
- for(; p.Y>min; p.Y--)
- {
- MapNode n = getNodeNoEx(p);
- if(content_walkable(n.d) && n.getContent() != CONTENT_IGNORE)
- return p.Y;
- }
-
- // Move to plan b
-plan_b:
-#endif
-
- /*
- Determine from map generator noise functions
- */
-
- s16 level = mapgen::find_ground_level_from_noise(m_seed, p2d, 1);
- return level;
-
- //double level = base_rock_level_2d(m_seed, p2d) + AVERAGE_MUD_AMOUNT;
- //return (s16)level;
-}
-
-void ServerMap::createDatabase() {
- int e;
- assert(m_database);
- e = sqlite3_exec(m_database,
- "CREATE TABLE IF NOT EXISTS `blocks` ("
- "`pos` INT NOT NULL PRIMARY KEY,"
- "`data` BLOB"
- ");"
- , NULL, NULL, NULL);
- if(e == SQLITE_ABORT)
- throw FileNotGoodException("Could not create database structure");
- else
- infostream<<"Server: Database structure was created";
-}
-
-void ServerMap::verifyDatabase() {
- if(m_database)
- return;
-
- {
- std::string dbp = m_savedir + DIR_DELIM + "map.sqlite";
- bool needs_create = false;
- int d;
-
- /*
- Open the database connection
- */
-
- createDirs(m_savedir);
-
- if(!fs::PathExists(dbp))
- needs_create = true;
-
- d = sqlite3_open_v2(dbp.c_str(), &m_database, SQLITE_OPEN_READWRITE | SQLITE_OPEN_CREATE, NULL);
- if(d != SQLITE_OK) {
- infostream<<"WARNING: Database failed to open: "<<sqlite3_errmsg(m_database)<<std::endl;
- throw FileNotGoodException("Cannot open database file");
- }
-
- if(needs_create)
- createDatabase();
-
- d = sqlite3_prepare(m_database, "SELECT `data` FROM `blocks` WHERE `pos`=? LIMIT 1", -1, &m_database_read, NULL);
- if(d != SQLITE_OK) {
- infostream<<"WARNING: Database read statment failed to prepare: "<<sqlite3_errmsg(m_database)<<std::endl;
- throw FileNotGoodException("Cannot prepare read statement");
- }
-
- d = sqlite3_prepare(m_database, "REPLACE INTO `blocks` VALUES(?, ?)", -1, &m_database_write, NULL);
- if(d != SQLITE_OK) {
- infostream<<"WARNING: Database write statment failed to prepare: "<<sqlite3_errmsg(m_database)<<std::endl;
- throw FileNotGoodException("Cannot prepare write statement");
- }
-
- d = sqlite3_prepare(m_database, "SELECT `pos` FROM `blocks`", -1, &m_database_list, NULL);
- if(d != SQLITE_OK) {
- infostream<<"WARNING: Database list statment failed to prepare: "<<sqlite3_errmsg(m_database)<<std::endl;
- throw FileNotGoodException("Cannot prepare read statement");
- }
-
- infostream<<"Server: Database opened"<<std::endl;
- }
-}
-
-bool ServerMap::loadFromFolders() {
- if(!m_database && !fs::PathExists(m_savedir + DIR_DELIM + "map.sqlite"))
- return true;
- return false;
-}
-
-sqlite3_int64 ServerMap::getBlockAsInteger(const v3s16 pos) {
- return (sqlite3_int64)pos.Z*16777216 +
- (sqlite3_int64)pos.Y*4096 + (sqlite3_int64)pos.X;
-}
-
-void ServerMap::createDirs(std::string path)
-{
- if(fs::CreateAllDirs(path) == false)
- {
- m_dout<<DTIME<<"ServerMap: Failed to create directory "
- <<"\""<<path<<"\""<<std::endl;
- throw BaseException("ServerMap failed to create directory");
- }
-}
-
-std::string ServerMap::getSectorDir(v2s16 pos, int layout)
-{
- char cc[9];
- switch(layout)
- {
- case 1:
- snprintf(cc, 9, "%.4x%.4x",
- (unsigned int)pos.X&0xffff,
- (unsigned int)pos.Y&0xffff);
-
- return m_savedir + DIR_DELIM + "sectors" + DIR_DELIM + cc;
- case 2:
- snprintf(cc, 9, "%.3x" DIR_DELIM "%.3x",
- (unsigned int)pos.X&0xfff,
- (unsigned int)pos.Y&0xfff);
-
- return m_savedir + DIR_DELIM + "sectors2" + DIR_DELIM + cc;
- default:
- assert(false);
- }
-}
-
-v2s16 ServerMap::getSectorPos(std::string dirname)
-{
- unsigned int x, y;
- int r;
- size_t spos = dirname.rfind(DIR_DELIM_C) + 1;
- assert(spos != std::string::npos);
- if(dirname.size() - spos == 8)
- {
- // Old layout
- r = sscanf(dirname.substr(spos).c_str(), "%4x%4x", &x, &y);
- }
- else if(dirname.size() - spos == 3)
- {
- // New layout
- r = sscanf(dirname.substr(spos-4).c_str(), "%3x" DIR_DELIM "%3x", &x, &y);
- // Sign-extend the 12 bit values up to 16 bits...
- if(x&0x800) x|=0xF000;
- if(y&0x800) y|=0xF000;
- }
- else
- {
- assert(false);
- }
- assert(r == 2);
- v2s16 pos((s16)x, (s16)y);
- return pos;
-}
-
-v3s16 ServerMap::getBlockPos(std::string sectordir, std::string blockfile)
-{
- v2s16 p2d = getSectorPos(sectordir);
-
- if(blockfile.size() != 4){
- throw InvalidFilenameException("Invalid block filename");
- }
- unsigned int y;
- int r = sscanf(blockfile.c_str(), "%4x", &y);
- if(r != 1)
- throw InvalidFilenameException("Invalid block filename");
- return v3s16(p2d.X, y, p2d.Y);
-}
-
-std::string ServerMap::getBlockFilename(v3s16 p)
-{
- char cc[5];
- snprintf(cc, 5, "%.4x", (unsigned int)p.Y&0xffff);
- return cc;
-}
-
-void ServerMap::save(ModifiedState save_level)
-{
- DSTACK(__FUNCTION_NAME);
- if(m_map_saving_enabled == false)
- {
- infostream<<"WARNING: Not saving map, saving disabled."<<std::endl;
- return;
- }
-
- if(save_level == MOD_STATE_CLEAN)
- infostream<<"ServerMap: Saving whole map, this can take time."
- <<std::endl;
-
- if(m_map_metadata_changed || save_level == MOD_STATE_CLEAN)
- {
- saveMapMeta();
- }
-
- // 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;
-
- core::map<v2s16, MapSector*>::Iterator i = m_sectors.getIterator();
- for(; i.atEnd() == false; i++)
- {
- ServerMapSector *sector = (ServerMapSector*)i.getNode()->getValue();
- assert(sector->getId() == MAPSECTOR_SERVER);
-
- if(sector->differs_from_disk || save_level == MOD_STATE_CLEAN)
- {
- saveSectorMeta(sector);
- sector_meta_count++;
- }
- core::list<MapBlock*> blocks;
- sector->getBlocks(blocks);
- core::list<MapBlock*>::Iterator j;
-
- for(j=blocks.begin(); j!=blocks.end(); j++)
- {
- MapBlock *block = *j;
-
- block_count_all++;
-
- if(block->getModified() >= save_level)
- {
- // Lazy beginSave()
- if(!save_started){
- beginSave();
- save_started = true;
- }
-
- modprofiler.add(block->getModifiedReason(), 1);
-
- saveBlock(block);
- block_count++;
-
- /*infostream<<"ServerMap: Written block ("
- <<block->getPos().X<<","
- <<block->getPos().Y<<","
- <<block->getPos().Z<<")"
- <<std::endl;*/
- }
- }
+ v3s16 p_rel = p - blockpos*MAP_BLOCKSIZE;
+ MapBlock *block = getBlockNoCreateNoEx(blockpos);
+ if(!block){
+ infostream<<"Map::getNodeMetadata(): Need to emerge "
+ <<PP(blockpos)<<std::endl;
+ block = emergeBlock(blockpos, false);
}
- if(save_started)
- endSave();
-
- /*
- Only print if something happened or saved whole map
- */
- if(save_level == MOD_STATE_CLEAN || sector_meta_count != 0
- || block_count != 0)
- {
- infostream<<"ServerMap: Written: "
- <<sector_meta_count<<" sector metadata files, "
- <<block_count<<" block files"
- <<", "<<block_count_all<<" blocks in memory."
+ if(!block){
+ warningstream<<"Map::getNodeMetadata(): Block not found"
<<std::endl;
- PrintInfo(infostream); // ServerMap/ClientMap:
- infostream<<"Blocks modified by: "<<std::endl;
- modprofiler.print(infostream);
+ return NULL;
}
+ NodeMetadata *meta = block->m_node_metadata.get(p_rel);
+ return meta;
}
-static s32 unsignedToSigned(s32 i, s32 max_positive)
+bool Map::setNodeMetadata(v3s16 p, NodeMetadata *meta)
{
- if(i < max_positive)
- return i;
- else
- return i - 2*max_positive;
+ v3s16 blockpos = getNodeBlockPos(p);
+ v3s16 p_rel = p - blockpos*MAP_BLOCKSIZE;
+ MapBlock *block = getBlockNoCreateNoEx(blockpos);
+ if(!block){
+ infostream<<"Map::setNodeMetadata(): Need to emerge "
+ <<PP(blockpos)<<std::endl;
+ block = emergeBlock(blockpos, false);
+ }
+ if(!block){
+ warningstream<<"Map::setNodeMetadata(): Block not found"
+ <<std::endl;
+ return false;
+ }
+ block->m_node_metadata.set(p_rel, meta);
+ return true;
}
-// modulo of a negative number does not work consistently in C
-static sqlite3_int64 pythonmodulo(sqlite3_int64 i, sqlite3_int64 mod)
+void Map::removeNodeMetadata(v3s16 p)
{
- if(i >= 0)
- return i % mod;
- return mod - ((-i) % mod);
+ v3s16 blockpos = getNodeBlockPos(p);
+ v3s16 p_rel = p - blockpos*MAP_BLOCKSIZE;
+ MapBlock *block = getBlockNoCreateNoEx(blockpos);
+ if(block == NULL)
+ {
+ warningstream<<"Map::removeNodeMetadata(): Block not found"
+ <<std::endl;
+ return;
+ }
+ block->m_node_metadata.remove(p_rel);
}
-v3s16 ServerMap::getIntegerAsBlock(sqlite3_int64 i)
+NodeTimer Map::getNodeTimer(v3s16 p)
{
- s32 x = unsignedToSigned(pythonmodulo(i, 4096), 2048);
- i = (i - x) / 4096;
- s32 y = unsignedToSigned(pythonmodulo(i, 4096), 2048);
- i = (i - y) / 4096;
- s32 z = unsignedToSigned(pythonmodulo(i, 4096), 2048);
- return v3s16(x,y,z);
+ v3s16 blockpos = getNodeBlockPos(p);
+ v3s16 p_rel = p - blockpos*MAP_BLOCKSIZE;
+ MapBlock *block = getBlockNoCreateNoEx(blockpos);
+ if(!block){
+ infostream<<"Map::getNodeTimer(): Need to emerge "
+ <<PP(blockpos)<<std::endl;
+ block = emergeBlock(blockpos, false);
+ }
+ if(!block){
+ warningstream<<"Map::getNodeTimer(): Block not found"
+ <<std::endl;
+ return NodeTimer();
+ }
+ NodeTimer t = block->m_node_timers.get(p_rel);
+ NodeTimer nt(t.timeout, t.elapsed, p);
+ return nt;
}
-void ServerMap::listAllLoadableBlocks(core::list<v3s16> &dst)
+void Map::setNodeTimer(const NodeTimer &t)
{
- if(loadFromFolders()){
- errorstream<<"Map::listAllLoadableBlocks(): Result will be missing "
- <<"all blocks that are stored in flat files"<<std::endl;
+ v3s16 p = t.position;
+ v3s16 blockpos = getNodeBlockPos(p);
+ v3s16 p_rel = p - blockpos*MAP_BLOCKSIZE;
+ MapBlock *block = getBlockNoCreateNoEx(blockpos);
+ if(!block){
+ infostream<<"Map::setNodeTimer(): Need to emerge "
+ <<PP(blockpos)<<std::endl;
+ block = emergeBlock(blockpos, false);
}
-
- {
- verifyDatabase();
-
- while(sqlite3_step(m_database_list) == SQLITE_ROW)
- {
- sqlite3_int64 block_i = sqlite3_column_int64(m_database_list, 0);
- v3s16 p = getIntegerAsBlock(block_i);
- //dstream<<"block_i="<<block_i<<" p="<<PP(p)<<std::endl;
- dst.push_back(p);
- }
+ if(!block){
+ warningstream<<"Map::setNodeTimer(): Block not found"
+ <<std::endl;
+ return;
}
+ NodeTimer nt(t.timeout, t.elapsed, p_rel);
+ block->m_node_timers.set(nt);
}
-void ServerMap::saveMapMeta()
+void Map::removeNodeTimer(v3s16 p)
{
- DSTACK(__FUNCTION_NAME);
-
- infostream<<"ServerMap::saveMapMeta(): "
- <<"seed="<<m_seed
- <<std::endl;
-
- createDirs(m_savedir);
-
- std::string fullpath = m_savedir + DIR_DELIM + "map_meta.txt";
- std::ofstream os(fullpath.c_str(), std::ios_base::binary);
- if(os.good() == false)
+ v3s16 blockpos = getNodeBlockPos(p);
+ v3s16 p_rel = p - blockpos*MAP_BLOCKSIZE;
+ MapBlock *block = getBlockNoCreateNoEx(blockpos);
+ if(block == NULL)
{
- infostream<<"ERROR: ServerMap::saveMapMeta(): "
- <<"could not open"<<fullpath<<std::endl;
- throw FileNotGoodException("Cannot open chunk metadata");
+ warningstream<<"Map::removeNodeTimer(): Block not found"
+ <<std::endl;
+ return;
}
-
- Settings params;
- params.setU64("seed", m_seed);
+ block->m_node_timers.remove(p_rel);
+}
- params.writeLines(os);
+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;
+}
- os<<"[end_of_params]\n";
-
- m_map_metadata_changed = 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));
}
-void ServerMap::loadMapMeta()
+/*
+ ServerMap
+*/
+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)
{
- DSTACK(__FUNCTION_NAME);
-
- infostream<<"ServerMap::loadMapMeta(): Loading map metadata"
- <<std::endl;
-
- std::string fullpath = m_savedir + DIR_DELIM + "map_meta.txt";
- std::ifstream is(fullpath.c_str(), std::ios_base::binary);
- if(is.good() == false)
- {
- infostream<<"ERROR: ServerMap::loadMapMeta(): "
- <<"could not open"<<fullpath<<std::endl;
- throw FileNotGoodException("Cannot open map metadata");
- }
+ verbosestream<<FUNCTION_NAME<<std::endl;
- Settings params;
+ // Tell the EmergeManager about our MapSettingsManager
+ emerge->map_settings_mgr = &settings_mgr;
- for(;;)
- {
- if(is.eof())
- throw SerializationError
- ("ServerMap::loadMapMeta(): [end_of_params] not found");
- std::string line;
- std::getline(is, line);
- std::string trimmedline = trim(line);
- if(trimmedline == "[end_of_params]")
- break;
- params.parseConfigLine(line);
- }
+ /*
+ Try to load map; if not found, create a new one.
+ */
- m_seed = params.getU64("seed");
+ // Determine which database backend to use
+ std::string conf_path = savedir + DIR_DELIM + "world.mt";
+ Settings conf;
+ bool succeeded = conf.readConfigFile(conf_path.c_str());
+ if (!succeeded || !conf.exists("backend")) {
+ // fall back to sqlite3
+ conf.set("backend", "sqlite3");
+ }
+ std::string backend = conf.get("backend");
+ dbase = createDatabase(backend, savedir, conf);
- infostream<<"ServerMap::loadMapMeta(): "<<"seed="<<m_seed<<std::endl;
-}
+ if (!conf.updateConfigFile(conf_path.c_str()))
+ errorstream << "ServerMap::ServerMap(): Failed to update world.mt!" << std::endl;
-void ServerMap::saveSectorMeta(ServerMapSector *sector)
-{
- DSTACK(__FUNCTION_NAME);
- // Format used for writing
- u8 version = SER_FMT_VER_HIGHEST;
- // Get destination
- v2s16 pos = sector->getPos();
- std::string dir = getSectorDir(pos);
- createDirs(dir);
-
- std::string fullpath = dir + DIR_DELIM + "meta";
- std::ofstream o(fullpath.c_str(), std::ios_base::binary);
- if(o.good() == false)
- throw FileNotGoodException("Cannot open sector metafile");
-
- sector->serialize(o, version);
-
- sector->differs_from_disk = false;
-}
+ m_savedir = savedir;
+ m_map_saving_enabled = false;
-MapSector* ServerMap::loadSectorMeta(std::string sectordir, bool save_after_load)
-{
- DSTACK(__FUNCTION_NAME);
- // Get destination
- v2s16 p2d = getSectorPos(sectordir);
+ try {
+ // If directory exists, check contents and load if possible
+ if (fs::PathExists(m_savedir)) {
+ // If directory is empty, it is safe to save into it.
+ if (fs::GetDirListing(m_savedir).empty()) {
+ infostream<<"ServerMap: Empty save directory is valid."
+ <<std::endl;
+ m_map_saving_enabled = true;
+ }
+ else
+ {
- ServerMapSector *sector = NULL;
+ if (settings_mgr.loadMapMeta()) {
+ infostream << "ServerMap: Metadata loaded from "
+ << savedir << std::endl;
+ } else {
+ infostream << "ServerMap: Metadata could not be loaded "
+ "from " << savedir << ", assuming valid save "
+ "directory." << std::endl;
+ }
- 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.insert(p2d, sector);
+ m_map_saving_enabled = true;
+ // Map loaded, not creating new one
+ return;
+ }
}
- else
- {
- throw FileNotGoodException("Cannot open sector metafile");
+ // If directory doesn't exist, it is safe to save to it
+ else{
+ m_map_saving_enabled = true;
}
}
- else
+ catch(std::exception &e)
{
- sector = ServerMapSector::deSerialize
- (is, this, p2d, m_sectors, m_gamedef);
- if(save_after_load)
- saveSectorMeta(sector);
+ warningstream<<"ServerMap: Failed to load map from "<<savedir
+ <<", exception: "<<e.what()<<std::endl;
+ infostream<<"Please remove the map or fix it."<<std::endl;
+ warningstream<<"Map saving will be disabled."<<std::endl;
}
-
- sector->differs_from_disk = false;
-
- return sector;
}
-bool ServerMap::loadSectorMeta(v2s16 p2d)
+ServerMap::~ServerMap()
{
- 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);
- }
+ verbosestream<<FUNCTION_NAME<<std::endl;
- try{
- sector = loadSectorMeta(sectordir, loadlayout != 2);
- }
- catch(InvalidFilenameException &e)
- {
- return false;
- }
- catch(FileNotGoodException &e)
+ try
{
- return false;
+ 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;
+ }
}
catch(std::exception &e)
{
- return false;
+ infostream<<"ServerMap: Failed to save map to "<<m_savedir
+ <<", exception: "<<e.what()<<std::endl;
}
-
- 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);
- }
+ /*
+ Close database if it was opened
+ */
+ delete dbase;
- try{
- sector = loadSectorMeta(sectordir, loadlayout != 2);
- }
- catch(InvalidFilenameException &e)
- {
- return false;
- }
- catch(FileNotGoodException &e)
- {
- return false;
- }
- catch(std::exception &e)
- {
- return false;
- }
-
+#if 0
/*
- Load blocks
+ Free all MapChunks
*/
- std::vector<fs::DirListNode> list2 = fs::GetDirListing
- (sectordir);
- std::vector<fs::DirListNode>::iterator i2;
- for(i2=list2.begin(); i2!=list2.end(); i2++)
+ core::map<v2s16, MapChunk*>::Iterator i = m_chunks.getIterator();
+ for(; i.atEnd() == false; i++)
{
- // We want files
- if(i2->dir)
- continue;
- try{
- loadBlock(sectordir, i2->name, sector, loadlayout != 2);
- }
- catch(InvalidFilenameException &e)
- {
- // This catches unknown crap in directory
- }
+ MapChunk *chunk = i.getNode()->getValue();
+ delete chunk;
}
+#endif
+}
- if(loadlayout != 2)
- {
- infostream<<"Sector converted to new layout - deleting "<<
- sectordir1<<std::endl;
- fs::RecursiveDelete(sectordir1);
- }
+MapgenParams *ServerMap::getMapgenParams()
+{
+ // getMapgenParams() should only ever be called after Server is initialized
+ assert(settings_mgr.mapgen_params != NULL);
+ return settings_mgr.mapgen_params;
+}
- return true;
+u64 ServerMap::getSeed()
+{
+ return getMapgenParams()->seed;
+}
+
+s16 ServerMap::getWaterLevel()
+{
+ return getMapgenParams()->water_level;
}
-#endif
-void ServerMap::beginSave() {
- verifyDatabase();
- if(sqlite3_exec(m_database, "BEGIN;", NULL, NULL, NULL) != SQLITE_OK)
- infostream<<"WARNING: beginSave() failed, saving might be slow.";
+bool ServerMap::saoPositionOverLimit(const v3f &p)
+{
+ return getMapgenParams()->saoPosOverLimit(p);
}
-void ServerMap::endSave() {
- verifyDatabase();
- if(sqlite3_exec(m_database, "COMMIT;", NULL, NULL, NULL) != SQLITE_OK)
- infostream<<"WARNING: endSave() failed, map might not have saved.";
+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;
}
-void ServerMap::saveBlock(MapBlock *block)
+bool ServerMap::initBlockMake(v3s16 blockpos, BlockMakeData *data)
{
- DSTACK(__FUNCTION_NAME);
+ s16 csize = getMapgenParams()->chunksize;
+ v3s16 bpmin = EmergeManager::getContainingChunk(blockpos, csize);
+ v3s16 bpmax = bpmin + v3s16(1, 1, 1) * (csize - 1);
+
+ 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 full_bpmin = bpmin - extra_borders;
+ v3s16 full_bpmax = bpmax + extra_borders;
+
+ // 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();
+ data->blockpos_min = bpmin;
+ data->blockpos_max = bpmax;
+ data->blockpos_requested = blockpos;
+ data->nodedef = m_nodedef;
+
/*
- Dummy blocks are not written
+ Create the whole area of this and the neighboring blocks
*/
- if(block->isDummy())
- {
- /*v3s16 p = block->getPos();
- infostream<<"ServerMap::saveBlock(): WARNING: Not writing dummy block "
- <<"("<<p.X<<","<<p.Y<<","<<p.Z<<")"<<std::endl;*/
- return;
- }
+ 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.
+ MapSector *sector = createSector(sectorpos);
+ FATAL_ERROR_IF(sector == NULL, "createSector() failed");
- // Format used for writing
- u8 version = SER_FMT_VER_HIGHEST;
- // Get destination
- v3s16 p3d = block->getPos();
-
-
-#if 0
- v2s16 p2d(p3d.X, p3d.Z);
- std::string sectordir = getSectorDir(p2d);
+ for (s16 y = full_bpmin.Y; y <= full_bpmax.Y; y++) {
+ v3s16 p(x, y, z);
- createDirs(sectordir);
+ MapBlock *block = emergeBlock(p, false);
+ if (block == NULL) {
+ block = createBlock(p);
+
+ // Block gets sunlight if this is true.
+ // Refer to the map generator heuristics.
+ bool ug = m_emerge->isBlockUnderground(p);
+ block->setIsUnderground(ug);
+ }
+ }
+ }
- std::string fullpath = sectordir+DIR_DELIM+getBlockFilename(p3d);
- std::ofstream o(fullpath.c_str(), std::ios_base::binary);
- if(o.good() == false)
- throw FileNotGoodException("Cannot open block data");
-#endif
/*
- [0] u8 serialization version
- [1] data
+ Now we have a big empty area.
+
+ Make a ManualMapVoxelManipulator that contains this and the
+ neighboring blocks
*/
-
- verifyDatabase();
-
- std::ostringstream o(std::ios_base::binary);
-
- o.write((char*)&version, 1);
-
- // Write basic data
- block->serialize(o, version, true);
-
- // Write block to database
-
- std::string tmp = o.str();
- const char *bytes = tmp.c_str();
-
- if(sqlite3_bind_int64(m_database_write, 1, getBlockAsInteger(p3d)) != SQLITE_OK)
- infostream<<"WARNING: Block position failed to bind: "<<sqlite3_errmsg(m_database)<<std::endl;
- if(sqlite3_bind_blob(m_database_write, 2, (void *)bytes, o.tellp(), NULL) != SQLITE_OK) // TODO this mught not be the right length
- infostream<<"WARNING: Block data failed to bind: "<<sqlite3_errmsg(m_database)<<std::endl;
- int written = sqlite3_step(m_database_write);
- if(written != SQLITE_DONE)
- infostream<<"WARNING: Block failed to save ("<<p3d.X<<", "<<p3d.Y<<", "<<p3d.Z<<") "
- <<sqlite3_errmsg(m_database)<<std::endl;
- // Make ready for later reuse
- sqlite3_reset(m_database_write);
-
- // We just wrote it to the disk so clear modified flag
- block->resetModified();
-}
-void ServerMap::loadBlock(std::string sectordir, std::string blockfile, MapSector *sector, bool save_after_load)
-{
- DSTACK(__FUNCTION_NAME);
+ data->vmanip = new MMVManip(this);
+ data->vmanip->initialEmerge(full_bpmin, full_bpmax);
- std::string fullpath = sectordir+DIR_DELIM+blockfile;
- try{
+ // 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 = data->vmanip->m_loaded_blocks.find(v3s16(x, y, z));
+ if (n == NULL)
+ continue;
+ u8 flags = n->getValue();
+ flags &= ~VMANIP_BLOCK_CONTAINS_CIGNORE;
+ n->setValue(flags);
+ }
+ }
+ }
+#endif
- std::ifstream is(fullpath.c_str(), std::ios_base::binary);
- if(is.good() == false)
- throw FileNotGoodException("Cannot open block file");
-
- v3s16 p3d = getBlockPos(sectordir, blockfile);
- v2s16 p2d(p3d.X, p3d.Z);
-
- assert(sector->getPos() == p2d);
-
- u8 version = SER_FMT_VER_INVALID;
- is.read((char*)&version, 1);
+ // Data is ready now.
+ return true;
+}
- if(is.fail())
- throw SerializationError("ServerMap::loadBlock(): Failed"
- " to read MapBlock version");
+void ServerMap::finishBlockMake(BlockMakeData *data,
+ std::map<v3s16, MapBlock*> *changed_blocks)
+{
+ v3s16 bpmin = data->blockpos_min;
+ v3s16 bpmax = data->blockpos_max;
- /*u32 block_size = MapBlock::serializedLength(version);
- SharedBuffer<u8> data(block_size);
- is.read((char*)*data, block_size);*/
+ v3s16 extra_borders(1, 1, 1);
+
+ bool enable_mapgen_debug_info = m_emerge->enable_mapgen_debug_info;
+ EMERGE_DBG_OUT("finishBlockMake(): " PP(bpmin) " - " PP(bpmax));
- // This will always return a sector because we're the server
- //MapSector *sector = emergeSector(p2d);
+ /*
+ Blit generated stuff to map
+ NOTE: blitBackAll adds nearly everything to changed_blocks
+ */
+ data->vmanip->blitBackAll(changed_blocks);
- MapBlock *block = NULL;
- bool created_new = false;
- block = sector->getBlockNoCreateNoEx(p3d.Y);
- if(block == NULL)
- {
- block = sector->createBlankBlockNoInsert(p3d.Y);
- created_new = true;
- }
-
- // Read basic data
- block->deSerialize(is, version, true);
+ EMERGE_DBG_OUT("finishBlockMake: changed_blocks.size()="
+ << changed_blocks->size());
- // If it's a new block, insert it to the map
- if(created_new)
- sector->insertBlock(block);
-
+ /*
+ Copy transforming liquid information
+ */
+ while (data->transforming_liquid.size()) {
+ m_transforming_liquid.push_back(data->transforming_liquid.front());
+ data->transforming_liquid.pop_front();
+ }
+
+ for (auto &changed_block : *changed_blocks) {
+ MapBlock *block = changed_block.second;
+ if (!block)
+ continue;
/*
- Save blocks loaded in old format in new format
+ Update day/night difference cache of the MapBlocks
+ */
+ block->expireDayNightDiff();
+ /*
+ Set block as modified
*/
+ block->raiseModified(MOD_STATE_WRITE_NEEDED,
+ MOD_REASON_EXPIRE_DAYNIGHTDIFF);
+ }
- if(version < SER_FMT_VER_HIGHEST || save_after_load)
- {
- saveBlock(block);
-
- // Should be in database now, so delete the old file
- fs::RecursiveDelete(fullpath);
- }
-
- // We just loaded it from the disk, so it's up-to-date.
- block->resetModified();
+ /*
+ Set central blocks as generated
+ */
+ 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);
}
- catch(SerializationError &e)
- {
- infostream<<"WARNING: Invalid block data on disk "
- <<"fullpath="<<fullpath
- <<" (SerializationError). "
- <<"what()="<<e.what()
- <<std::endl;
- //" Ignoring. A new one will be generated.
- assert(0);
- // TODO: Backup file; name is in fullpath.
- }
+ /*
+ Save changed parts of map
+ NOTE: Will be saved later.
+ */
+ //save(MOD_STATE_WRITE_AT_UNLOAD);
}
-void ServerMap::loadBlock(std::string *blob, v3s16 p3d, MapSector *sector, bool save_after_load)
+MapSector *ServerMap::createSector(v2s16 p2d)
{
- DSTACK(__FUNCTION_NAME);
-
- try {
- std::istringstream is(*blob, std::ios_base::binary);
-
- u8 version = SER_FMT_VER_INVALID;
- is.read((char*)&version, 1);
+ DSTACKF("%s: p2d=(%d,%d)",
+ FUNCTION_NAME,
+ p2d.X, p2d.Y);
- if(is.fail())
- throw SerializationError("ServerMap::loadBlock(): Failed"
- " to read MapBlock version");
+ /*
+ Check if it exists already in memory
+ */
+ MapSector *sector = getSectorNoGenerateNoEx(p2d);
+ if (sector)
+ return sector;
- /*u32 block_size = MapBlock::serializedLength(version);
- SharedBuffer<u8> data(block_size);
- is.read((char*)*data, block_size);*/
+ /*
+ Do not create over max mapgen 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");
- // This will always return a sector because we're the server
- //MapSector *sector = emergeSector(p2d);
+ /*
+ Generate blank sector
+ */
- MapBlock *block = NULL;
- bool created_new = false;
- block = sector->getBlockNoCreateNoEx(p3d.Y);
- if(block == NULL)
- {
- block = sector->createBlankBlockNoInsert(p3d.Y);
- created_new = true;
- }
-
- // Read basic data
- block->deSerialize(is, version, true);
-
- // If it's a new block, insert it to the map
- if(created_new)
- sector->insertBlock(block);
-
- /*
- Save blocks loaded in old format in new format
- */
+ sector = new MapSector(this, p2d, m_gamedef);
- //if(version < SER_FMT_VER_HIGHEST || save_after_load)
- // Only save if asked to; no need to update version
- if(save_after_load)
- saveBlock(block);
-
- // We just loaded it from, so it's up-to-date.
- block->resetModified();
+ // Sector position on map in nodes
+ //v2s16 nodepos2d = p2d * MAP_BLOCKSIZE;
- }
- catch(SerializationError &e)
- {
- infostream<<"WARNING: Invalid block data in database "
- <<" (SerializationError). "
- <<"what()="<<e.what()
- <<std::endl;
- //" Ignoring. A new one will be generated.
- assert(0);
+ /*
+ Insert to container
+ */
+ m_sectors[p2d] = sector;
- // TODO: Copy to a backup database.
- }
+ return sector;
}
-MapBlock* ServerMap::loadBlock(v3s16 blockpos)
+#if 0
+/*
+ This is a quick-hand function for calling makeBlock().
+*/
+MapBlock * ServerMap::generateBlock(
+ v3s16 p,
+ std::map<v3s16, MapBlock*> &modified_blocks
+)
{
- DSTACK(__FUNCTION_NAME);
+ DSTACKF("%s: p=(%d,%d,%d)", FUNCTION_NAME, p.X, p.Y, p.Z);
- v2s16 p2d(blockpos.X, blockpos.Z);
+ /*infostream<<"generateBlock(): "
+ <<"("<<p.X<<","<<p.Y<<","<<p.Z<<")"
+ <<std::endl;*/
- if(!loadFromFolders()) {
- verifyDatabase();
-
- if(sqlite3_bind_int64(m_database_read, 1, getBlockAsInteger(blockpos)) != SQLITE_OK)
- infostream<<"WARNING: Could not bind block position for load: "
- <<sqlite3_errmsg(m_database)<<std::endl;
- if(sqlite3_step(m_database_read) == SQLITE_ROW) {
- /*
- Make sure sector is loaded
- */
- MapSector *sector = createSector(p2d);
-
- /*
- Load block
- */
- const char * data = (const char *)sqlite3_column_blob(m_database_read, 0);
- size_t len = sqlite3_column_bytes(m_database_read, 0);
-
- std::string datastr(data, len);
-
- loadBlock(&datastr, blockpos, sector, false);
-
- sqlite3_step(m_database_read);
- // We should never get more than 1 row, so ok to reset
- sqlite3_reset(m_database_read);
-
- return getBlockNoCreateNoEx(blockpos);
- }
- sqlite3_reset(m_database_read);
-
- // Not found in database, try the files
- }
+ bool enable_mapgen_debug_info = g_settings->getBool("enable_mapgen_debug_info");
- // 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))
+ TimeTaker timer("generateBlock");
+
+ //MapBlock *block = original_dummy;
+
+ v2s16 p2d(p.X, p.Z);
+ v2s16 p2d_nodes = p2d * MAP_BLOCKSIZE;
+
+ /*
+ Do not generate over-limit
+ */
+ if(blockpos_over_limit(p))
{
- sectordir = sectordir1;
+ infostream<<FUNCTION_NAME<<": Block position over limit"<<std::endl;
+ throw InvalidPositionException("generateBlock(): pos. over limit");
}
- else
+
+ /*
+ Create block make data
+ */
+ BlockMakeData data;
+ initBlockMake(&data, p);
+
+ /*
+ Generate block
+ */
{
- loadlayout = 2;
- sectordir = getSectorDir(p2d, 2);
+ TimeTaker t("mapgen::make_block()");
+ mapgen->makeChunk(&data);
+ //mapgen::make_block(&data);
+
+ if(enable_mapgen_debug_info == false)
+ t.stop(true); // Hide output
}
-
+
/*
- Make sure sector is loaded
+ Blit data back on map, update lighting, add mobs and whatever this does
*/
- MapSector *sector = getSectorNoGenerateNoEx(p2d);
- if(sector == NULL)
+ finishBlockMake(&data, modified_blocks);
+
+ /*
+ Get central block
+ */
+ MapBlock *block = getBlockNoCreateNoEx(p);
+
+#if 0
+ /*
+ Check result
+ */
+ if(block)
{
- try{
- sector = loadSectorMeta(sectordir, loadlayout != 2);
- }
- catch(InvalidFilenameException &e)
- {
- return false;
- }
- catch(FileNotGoodException &e)
+ bool erroneus_content = false;
+ for(s16 z0=0; z0<MAP_BLOCKSIZE; z0++)
+ for(s16 y0=0; y0<MAP_BLOCKSIZE; y0++)
+ for(s16 x0=0; x0<MAP_BLOCKSIZE; x0++)
{
- return false;
+ v3s16 p(x0,y0,z0);
+ MapNode n = block->getNode(p);
+ if(n.getContent() == CONTENT_IGNORE)
+ {
+ infostream<<"CONTENT_IGNORE at "
+ <<"("<<p.X<<","<<p.Y<<","<<p.Z<<")"
+ <<std::endl;
+ erroneus_content = true;
+ assert(0);
+ }
}
- catch(std::exception &e)
+ if(erroneus_content)
{
- return false;
+ assert(0);
}
}
-
+#endif
+
+#if 0
/*
- Make sure file exists
+ Generate a completely empty block
*/
+ if(block)
+ {
+ for(s16 z0=0; z0<MAP_BLOCKSIZE; z0++)
+ for(s16 x0=0; x0<MAP_BLOCKSIZE; x0++)
+ {
+ for(s16 y0=0; y0<MAP_BLOCKSIZE; y0++)
+ {
+ MapNode n;
+ n.setContent(CONTENT_AIR);
+ block->setNode(v3s16(x0,y0,z0), n);
+ }
+ }
+ }
+#endif
- std::string blockfilename = getBlockFilename(blockpos);
- if(fs::PathExists(sectordir+DIR_DELIM+blockfilename) == false)
- return NULL;
+ if(enable_mapgen_debug_info == false)
+ timer.stop(true); // Hide output
- /*
- Load block and save it to the database
- */
- loadBlock(sectordir, blockfilename, sector, true);
- return getBlockNoCreateNoEx(blockpos);
+ return block;
}
+#endif
-void ServerMap::PrintInfo(std::ostream &out)
+MapBlock * ServerMap::createBlock(v3s16 p)
{
- out<<"ServerMap: ";
-}
+ DSTACKF("%s: p=(%d,%d,%d)",
+ FUNCTION_NAME, p.X, p.Y, p.Z);
-#ifndef SERVER
+ /*
+ Do not create over max mapgen limit
+ */
+ if (blockpos_over_max_limit(p))
+ throw InvalidPositionException("createBlock(): pos. over max mapgen limit");
-/*
- ClientMap
-*/
+ v2s16 p2d(p.X, p.Z);
+ s16 block_y = p.Y;
+ /*
+ This will create or load a sector if not found in memory.
+ If block exists on disk, it will be loaded.
-ClientMap::ClientMap(
- Client *client,
- IGameDef *gamedef,
- MapDrawControl &control,
- scene::ISceneNode* parent,
- scene::ISceneManager* mgr,
- s32 id
-):
- Map(dout_client, gamedef),
- scene::ISceneNode(parent, mgr, id),
- m_client(client),
- m_control(control),
- m_camera_position(0,0,0),
- m_camera_direction(0,0,1),
- m_camera_fov(PI)
-{
- m_camera_mutex.Init();
- assert(m_camera_mutex.IsInitialized());
-
- m_box = core::aabbox3d<f32>(-BS*1000000,-BS*1000000,-BS*1000000,
- BS*1000000,BS*1000000,BS*1000000);
-}
+ NOTE: On old save formats, this will be slow, as it generates
+ lighting on blocks for them.
+ */
+ MapSector *sector;
+ try {
+ sector = createSector(p2d);
+ } catch (InvalidPositionException &e) {
+ infostream<<"createBlock: createSector() failed"<<std::endl;
+ throw e;
+ }
-ClientMap::~ClientMap()
-{
- /*JMutexAutoLock lock(mesh_mutex);
-
- if(mesh != NULL)
- {
- mesh->drop();
- mesh = NULL;
- }*/
-}
+ /*
+ Try to get a block from the sector
+ */
-MapSector * ClientMap::emergeSector(v2s16 p2d)
-{
- DSTACK(__FUNCTION_NAME);
- // Check that it doesn't exist already
- try{
- return getSectorNoGenerate(p2d);
- }
- catch(InvalidPositionException &e)
- {
- }
-
- // Create a sector
- ClientMapSector *sector = new ClientMapSector(this, p2d, m_gamedef);
-
- {
- //JMutexAutoLock lock(m_sector_mutex); // Bulk comment-out
- m_sectors.insert(p2d, sector);
+ MapBlock *block = sector->getBlockNoCreateNoEx(block_y);
+ if (block) {
+ if(block->isDummy())
+ block->unDummify();
+ return block;
}
-
- return sector;
+ // Create blank
+ block = sector->createBlankBlock(block_y);
+
+ return block;
}
-#if 0
-void ClientMap::deSerializeSector(v2s16 p2d, std::istream &is)
+MapBlock * ServerMap::emergeBlock(v3s16 p, bool create_blank)
{
- DSTACK(__FUNCTION_NAME);
- ClientMapSector *sector = NULL;
+ DSTACKF("%s: p=(%d,%d,%d), create_blank=%d",
+ FUNCTION_NAME,
+ p.X, p.Y, p.Z, create_blank);
- //JMutexAutoLock lock(m_sector_mutex); // Bulk comment-out
-
- core::map<v2s16, MapSector*>::Node *n = m_sectors.find(p2d);
-
- if(n != NULL)
{
- sector = (ClientMapSector*)n->getValue();
- assert(sector->getId() == MAPSECTOR_CLIENT);
+ MapBlock *block = getBlockNoCreateNoEx(p);
+ if (block && !block->isDummy())
+ return block;
}
- else
+
{
- sector = new ClientMapSector(this, p2d);
- {
- //JMutexAutoLock lock(m_sector_mutex); // Bulk comment-out
- m_sectors.insert(p2d, sector);
- }
+ MapBlock *block = loadBlock(p);
+ if(block)
+ return block;
}
- sector->deSerialize(is);
-}
-#endif
+ if (create_blank) {
+ MapSector *sector = createSector(v2s16(p.X, p.Z));
+ MapBlock *block = sector->createBlankBlock(p.Y);
-void ClientMap::OnRegisterSceneNode()
-{
- if(IsVisible)
- {
- SceneManager->registerNodeForRendering(this, scene::ESNRP_SOLID);
- SceneManager->registerNodeForRendering(this, scene::ESNRP_TRANSPARENT);
+ return block;
}
- ISceneNode::OnRegisterSceneNode();
+ return NULL;
}
-static bool isOccluded(Map *map, v3s16 p0, v3s16 p1, float step, float stepfac,
- float start_off, float end_off, u32 needed_count, INodeDefManager *nodemgr)
+MapBlock *ServerMap::getBlockOrEmerge(v3s16 p3d)
{
- 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 = map->getNodeNoEx(p);
- bool is_transparent = false;
- const ContentFeatures &f = nodemgr->get(n);
- if(f.solidness == 0)
- is_transparent = (f.visual_solidness != 2);
- else
- is_transparent = (f.solidness != 2);
- if(!is_transparent){
- count++;
- if(count >= needed_count)
- return true;
- }
- step *= stepfac;
- }
- return false;
+ MapBlock *block = getBlockNoCreateNoEx(p3d);
+ if (block == NULL)
+ m_emerge->enqueueBlockEmerge(PEER_ID_INEXISTENT, p3d, false);
+
+ return block;
}
-void ClientMap::renderMap(video::IVideoDriver* driver, s32 pass)
+// 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)
{
- INodeDefManager *nodemgr = m_gamedef->ndef();
+ Mapgen *mg = m_emerge->getCurrentMapgen();
+ if (!mg)
+ return;
- //m_dout<<DTIME<<"Rendering map..."<<std::endl;
- DSTACK(__FUNCTION_NAME);
+ MMVManip *vm = mg->vm;
+ if (!vm)
+ return;
- bool is_transparent_pass = pass == scene::ESNRP_TRANSPARENT;
-
- std::string prefix;
- if(pass == scene::ESNRP_SOLID)
- prefix = "CM: solid: ";
- else
- prefix = "CM: transparent: ";
+ if (!vm->m_area.contains(pos))
+ return;
+
+ s32 idx = vm->m_area.index(pos);
+ vm->m_data[idx] = getNodeNoEx(pos);
+ vm->m_flags[idx] &= ~VOXELFLAG_NO_DATA;
+
+ vm->m_is_dirty = true;
+}
+s16 ServerMap::findGroundLevel(v2s16 p2d)
+{
+#if 0
/*
- This is called two times per frame, reset on the non-transparent one
+ Uh, just do something random...
*/
- if(pass == scene::ESNRP_SOLID)
+ // Find existing map from top to down
+ s16 max=63;
+ s16 min=-64;
+ v3s16 p(p2d.X, max, p2d.Y);
+ for(; p.Y>min; p.Y--)
+ {
+ MapNode n = getNodeNoEx(p);
+ if(n.getContent() != CONTENT_IGNORE)
+ break;
+ }
+ if(p.Y == min)
+ goto plan_b;
+ // If this node is not air, go to plan b
+ if(getNodeNoEx(p).getContent() != CONTENT_AIR)
+ goto plan_b;
+ // Search existing walkable and return it
+ for(; p.Y>min; p.Y--)
{
- m_last_drawn_sectors.clear();
+ MapNode n = getNodeNoEx(p);
+ if(content_walkable(n.d) && n.getContent() != CONTENT_IGNORE)
+ return p.Y;
}
- /*
- Get time for measuring timeout.
-
- Measuring time is very useful for long delays when the
- machine is swapping a lot.
- */
- int time1 = time(0);
-
- //u32 daynight_ratio = m_client->getDayNightRatio();
-
- m_camera_mutex.Lock();
- v3f camera_position = m_camera_position;
- v3f camera_direction = m_camera_direction;
- f32 camera_fov = m_camera_fov;
- m_camera_mutex.Unlock();
+ // Move to plan b
+plan_b:
+#endif
/*
- Get all blocks and draw all visible ones
+ Determine from map generator noise functions
*/
- v3s16 cam_pos_nodes = floatToInt(camera_position, BS);
-
- v3s16 box_nodes_d = m_control.wanted_range * v3s16(1,1,1);
-
- v3s16 p_nodes_min = cam_pos_nodes - box_nodes_d;
- v3s16 p_nodes_max = cam_pos_nodes + box_nodes_d;
-
- // Take a fair amount as we will be dropping more out later
- // Umm... these additions are a bit strange but they are needed.
- v3s16 p_blocks_min(
- p_nodes_min.X / MAP_BLOCKSIZE - 3,
- p_nodes_min.Y / MAP_BLOCKSIZE - 3,
- p_nodes_min.Z / MAP_BLOCKSIZE - 3);
- v3s16 p_blocks_max(
- p_nodes_max.X / MAP_BLOCKSIZE + 1,
- p_nodes_max.Y / MAP_BLOCKSIZE + 1,
- p_nodes_max.Z / MAP_BLOCKSIZE + 1);
-
- u32 vertex_count = 0;
- u32 meshbuffer_count = 0;
-
- // For limiting number of mesh updates per frame
- u32 mesh_update_count = 0;
-
- // Number of blocks in rendering range
- u32 blocks_in_range = 0;
- // Number of blocks occlusion culled
- u32 blocks_occlusion_culled = 0;
- // Number of blocks in rendering range but don't have a mesh
- u32 blocks_in_range_without_mesh = 0;
- // Blocks that had mesh that would have been drawn according to
- // rendering range (if max blocks limit didn't kick in)
- u32 blocks_would_have_drawn = 0;
- // Blocks that were drawn and had a mesh
- u32 blocks_drawn = 0;
- // Blocks which had a corresponding meshbuffer for this pass
- u32 blocks_had_pass_meshbuf = 0;
- // Blocks from which stuff was actually drawn
- u32 blocks_without_stuff = 0;
+ s16 level = m_emerge->getGroundLevelAtPoint(p2d);
+ return level;
- /*
- Collect a set of blocks for drawing
- */
-
- core::map<v3s16, MapBlock*> drawset;
+ //double level = base_rock_level_2d(m_seed, p2d) + AVERAGE_MUD_AMOUNT;
+ //return (s16)level;
+}
- {
- ScopeProfiler sp(g_profiler, prefix+"collecting blocks for drawing", SPT_AVG);
+bool ServerMap::loadFromFolders() {
+ if (!dbase->initialized() &&
+ !fs::PathExists(m_savedir + DIR_DELIM + "map.sqlite"))
+ return true;
+ return false;
+}
- for(core::map<v2s16, MapSector*>::Iterator
- si = m_sectors.getIterator();
- si.atEnd() == false; si++)
- {
- MapSector *sector = si.getNode()->getValue();
- v2s16 sp = sector->getPos();
-
- if(m_control.range_all == false)
- {
- if(sp.X < p_blocks_min.X
- || sp.X > p_blocks_max.X
- || sp.Y < p_blocks_min.Z
- || sp.Y > p_blocks_max.Z)
- continue;
- }
+void ServerMap::createDirs(std::string path)
+{
+ if (!fs::CreateAllDirs(path)) {
+ m_dout<<"ServerMap: Failed to create directory "
+ <<"\""<<path<<"\""<<std::endl;
+ throw BaseException("ServerMap failed to create directory");
+ }
+}
- core::list< MapBlock * > sectorblocks;
- sector->getBlocks(sectorblocks);
-
- /*
- Loop through blocks in sector
- */
+std::string ServerMap::getSectorDir(v2s16 pos, int layout)
+{
+ char cc[9];
+ switch(layout)
+ {
+ case 1:
+ snprintf(cc, 9, "%.4x%.4x",
+ (unsigned int) pos.X & 0xffff,
+ (unsigned int) pos.Y & 0xffff);
- u32 sector_blocks_drawn = 0;
-
- core::list< MapBlock * >::Iterator i;
- for(i=sectorblocks.begin(); i!=sectorblocks.end(); i++)
- {
- MapBlock *block = *i;
-
- /*
- Compare block position to camera position, skip
- if not seen on display
- */
-
- float range = 100000 * BS;
- if(m_control.range_all == false)
- range = m_control.wanted_range * BS;
-
- float d = 0.0;
- if(isBlockInSight(block->getPos(), camera_position,
- camera_direction, camera_fov,
- range, &d) == false)
- {
- continue;
- }
+ return m_savedir + DIR_DELIM + "sectors" + DIR_DELIM + cc;
+ case 2:
+ snprintf(cc, 9, (std::string("%.3x") + DIR_DELIM + "%.3x").c_str(),
+ (unsigned int) pos.X & 0xfff,
+ (unsigned int) pos.Y & 0xfff);
- // This is ugly (spherical distance limit?)
- /*if(m_control.range_all == false &&
- d - 0.5*BS*MAP_BLOCKSIZE > range)
- continue;*/
+ return m_savedir + DIR_DELIM + "sectors2" + DIR_DELIM + cc;
+ default:
+ assert(false);
+ return "";
+ }
+}
- blocks_in_range++;
-
-#if 1
- /*
- Update expired mesh (used for day/night change)
+v2s16 ServerMap::getSectorPos(const std::string &dirname)
+{
+ unsigned int x = 0, y = 0;
+ int r;
+ std::string component;
+ fs::RemoveLastPathComponent(dirname, &component, 1);
+ if(component.size() == 8)
+ {
+ // Old layout
+ r = sscanf(component.c_str(), "%4x%4x", &x, &y);
+ }
+ else if(component.size() == 3)
+ {
+ // New layout
+ fs::RemoveLastPathComponent(dirname, &component, 2);
+ r = sscanf(component.c_str(), (std::string("%3x") + DIR_DELIM + "%3x").c_str(), &x, &y);
+ // Sign-extend the 12 bit values up to 16 bits...
+ if(x & 0x800) x |= 0xF000;
+ if(y & 0x800) y |= 0xF000;
+ }
+ else
+ {
+ r = -1;
+ }
- It doesn't work exactly like it should now with the
- tasked mesh update but whatever.
- */
+ FATAL_ERROR_IF(r != 2, "getSectorPos()");
+ v2s16 pos((s16)x, (s16)y);
+ return pos;
+}
- bool mesh_expired = false;
-
- {
- JMutexAutoLock lock(block->mesh_mutex);
+v3s16 ServerMap::getBlockPos(const std::string §ordir, const std::string &blockfile)
+{
+ v2s16 p2d = getSectorPos(sectordir);
- mesh_expired = block->getMeshExpired();
+ if(blockfile.size() != 4){
+ throw InvalidFilenameException("Invalid block filename");
+ }
+ unsigned int y;
+ int r = sscanf(blockfile.c_str(), "%4x", &y);
+ if(r != 1)
+ throw InvalidFilenameException("Invalid block filename");
+ return v3s16(p2d.X, y, p2d.Y);
+}
- // Mesh has not been expired and there is no mesh:
- // block has no content
- if(block->mesh == NULL && mesh_expired == false){
- blocks_in_range_without_mesh++;
- continue;
- }
- }
+std::string ServerMap::getBlockFilename(v3s16 p)
+{
+ char cc[5];
+ snprintf(cc, 5, "%.4x", (unsigned int)p.Y&0xffff);
+ return cc;
+}
- f32 faraway = BS*50;
- //f32 faraway = m_control.wanted_range * BS;
-
- /*
- This has to be done with the mesh_mutex unlocked
- */
- // Pretty random but this should work somewhat nicely
- if(mesh_expired && (
- (mesh_update_count < 3
- && (d < faraway || mesh_update_count < 2)
- )
- ||
- (m_control.range_all && mesh_update_count < 20)
- )
- )
- /*if(mesh_expired && mesh_update_count < 6
- && (d < faraway || mesh_update_count < 3))*/
- {
- mesh_update_count++;
+void ServerMap::save(ModifiedState save_level)
+{
+ DSTACK(FUNCTION_NAME);
+ if (!m_map_saving_enabled) {
+ warningstream<<"Not saving map, saving disabled."<<std::endl;
+ return;
+ }
- // Mesh has been expired: generate new mesh
- //block->updateMesh(daynight_ratio);
- m_client->addUpdateMeshTask(block->getPos());
+ if(save_level == MOD_STATE_CLEAN)
+ infostream<<"ServerMap: Saving whole map, this can take time."
+ <<std::endl;
- mesh_expired = false;
- }
-#endif
+ if (m_map_metadata_changed || save_level == MOD_STATE_CLEAN) {
+ if (settings_mgr.saveMapMeta())
+ m_map_metadata_changed = false;
+ }
- /*
- Occlusion culling
- */
-
- 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;
- float endoff = -BS*MAP_BLOCKSIZE*1.42*1.42;
- v3s16 spn = cam_pos_nodes + v3s16(0,0,0);
- s16 bs2 = MAP_BLOCKSIZE/2 + 1;
- u32 needed_count = 1;
- if(
- isOccluded(this, spn, cpn + v3s16(0,0,0),
- step, stepfac, startoff, endoff, needed_count, nodemgr) &&
- isOccluded(this, spn, cpn + v3s16(bs2,bs2,bs2),
- step, stepfac, startoff, endoff, needed_count, nodemgr) &&
- isOccluded(this, spn, cpn + v3s16(bs2,bs2,-bs2),
- step, stepfac, startoff, endoff, needed_count, nodemgr) &&
- isOccluded(this, spn, cpn + v3s16(bs2,-bs2,bs2),
- step, stepfac, startoff, endoff, needed_count, nodemgr) &&
- isOccluded(this, spn, cpn + v3s16(bs2,-bs2,-bs2),
- step, stepfac, startoff, endoff, needed_count, nodemgr) &&
- isOccluded(this, spn, cpn + v3s16(-bs2,bs2,bs2),
- step, stepfac, startoff, endoff, needed_count, nodemgr) &&
- isOccluded(this, spn, cpn + v3s16(-bs2,bs2,-bs2),
- step, stepfac, startoff, endoff, needed_count, nodemgr) &&
- isOccluded(this, spn, cpn + v3s16(-bs2,-bs2,bs2),
- step, stepfac, startoff, endoff, needed_count, nodemgr) &&
- isOccluded(this, spn, cpn + v3s16(-bs2,-bs2,-bs2),
- step, stepfac, startoff, endoff, needed_count, nodemgr)
- )
- {
- blocks_occlusion_culled++;
- continue;
- }
-
- // This block is in range. Reset usage timer.
- block->resetUsageTimer();
+ // Profile modified reasons
+ Profiler modprofiler;
- /*
- Ignore if mesh doesn't exist
- */
- {
- JMutexAutoLock lock(block->mesh_mutex);
+ u32 block_count = 0;
+ u32 block_count_all = 0; // Number of blocks in memory
- scene::SMesh *mesh = block->mesh;
-
- if(mesh == NULL){
- blocks_in_range_without_mesh++;
- continue;
- }
- }
-
- // Limit block count in case of a sudden increase
- blocks_would_have_drawn++;
- if(blocks_drawn >= m_control.wanted_max_blocks
- && m_control.range_all == false
- && d > m_control.wanted_min_range * BS)
- continue;
-
- // Add to set
- drawset[block->getPos()] = block;
-
- sector_blocks_drawn++;
- blocks_drawn++;
+ // Don't do anything with sqlite unless something is really saved
+ bool save_started = false;
- } // foreach sectorblocks
+ for (auto §or_it : m_sectors) {
+ MapSector *sector = sector_it.second;
- if(sector_blocks_drawn != 0)
- m_last_drawn_sectors[sp] = true;
- }
- } // ScopeProfiler
-
- /*
- Draw the selected MapBlocks
- */
+ MapBlockVect blocks;
+ sector->getBlocks(blocks);
- {
- ScopeProfiler sp(g_profiler, prefix+"drawing blocks", SPT_AVG);
+ for (MapBlock *block : blocks) {
+ block_count_all++;
- int timecheck_counter = 0;
- for(core::map<v3s16, MapBlock*>::Iterator
- i = drawset.getIterator();
- i.atEnd() == false; i++)
- {
- {
- timecheck_counter++;
- if(timecheck_counter > 50)
- {
- timecheck_counter = 0;
- int time2 = time(0);
- if(time2 > time1 + 4)
- {
- infostream<<"ClientMap::renderMap(): "
- "Rendering takes ages, returning."
- <<std::endl;
- return;
+ if(block->getModified() >= (u32)save_level) {
+ // Lazy beginSave()
+ if(!save_started) {
+ beginSave();
+ save_started = true;
}
- }
- }
-
- MapBlock *block = i.getNode()->getValue();
- /*
- Draw the faces of the block
- */
- {
- JMutexAutoLock lock(block->mesh_mutex);
-
- scene::SMesh *mesh = block->mesh;
- assert(mesh);
-
- u32 c = mesh->getMeshBufferCount();
- bool stuff_actually_drawn = false;
- for(u32 i=0; i<c; i++)
- {
- scene::IMeshBuffer *buf = mesh->getMeshBuffer(i);
- const video::SMaterial& material = buf->getMaterial();
- video::IMaterialRenderer* rnd =
- driver->getMaterialRenderer(material.MaterialType);
- bool transparent = (rnd && rnd->isTransparent());
- // Render transparent on transparent pass and likewise.
- if(transparent == is_transparent_pass)
- {
- if(buf->getVertexCount() == 0)
- errorstream<<"Block ["<<analyze_block(block)
- <<"] contains an empty meshbuf"<<std::endl;
- /*
- This *shouldn't* hurt too much because Irrlicht
- doesn't change opengl textures if the old
- material has the same texture.
- */
- driver->setMaterial(buf->getMaterial());
- driver->drawMeshBuffer(buf);
- vertex_count += buf->getVertexCount();
- meshbuffer_count++;
- stuff_actually_drawn = true;
- }
+ modprofiler.add(block->getModifiedReasonString(), 1);
+
+ saveBlock(block);
+ block_count++;
}
- if(stuff_actually_drawn)
- blocks_had_pass_meshbuf++;
- else
- blocks_without_stuff++;
}
}
- } // ScopeProfiler
-
- // Log only on solid pass because values are the same
- if(pass == scene::ESNRP_SOLID){
- g_profiler->avg("CM: blocks in range", blocks_in_range);
- g_profiler->avg("CM: blocks occlusion culled", blocks_occlusion_culled);
- if(blocks_in_range != 0)
- g_profiler->avg("CM: blocks in range without mesh (frac)",
- (float)blocks_in_range_without_mesh/blocks_in_range);
- g_profiler->avg("CM: blocks drawn", blocks_drawn);
- }
-
- g_profiler->avg(prefix+"vertices drawn", vertex_count);
- if(blocks_had_pass_meshbuf != 0)
- g_profiler->avg(prefix+"meshbuffers per block",
- (float)meshbuffer_count / (float)blocks_had_pass_meshbuf);
- if(blocks_drawn != 0)
- g_profiler->avg(prefix+"empty blocks (frac)",
- (float)blocks_without_stuff / blocks_drawn);
-
- m_control.blocks_drawn = blocks_drawn;
- m_control.blocks_would_have_drawn = blocks_would_have_drawn;
-
- /*infostream<<"renderMap(): is_transparent_pass="<<is_transparent_pass
- <<", rendered "<<vertex_count<<" vertices."<<std::endl;*/
-}
-
-void ClientMap::renderPostFx()
-{
- INodeDefManager *nodemgr = m_gamedef->ndef();
- // Sadly ISceneManager has no "post effects" render pass, in that case we
- // could just register for that and handle it in renderMap().
-
- m_camera_mutex.Lock();
- v3f camera_position = m_camera_position;
- m_camera_mutex.Unlock();
-
- MapNode n = getNodeNoEx(floatToInt(camera_position, BS));
-
- // - If the player is in a solid node, make everything black.
- // - If the player is in liquid, draw a semi-transparent overlay.
- const ContentFeatures& features = nodemgr->get(n);
- video::SColor post_effect_color = features.post_effect_color;
- if(features.solidness == 2 && g_settings->getBool("free_move") == false)
- {
- post_effect_color = video::SColor(255, 0, 0, 0);
- }
- if (post_effect_color.getAlpha() != 0)
- {
- // Draw a full-screen rectangle
- video::IVideoDriver* driver = SceneManager->getVideoDriver();
- v2u32 ss = driver->getScreenSize();
- core::rect<s32> rect(0,0, ss.X, ss.Y);
- driver->draw2DRectangle(post_effect_color, rect);
- }
-}
+ if(save_started)
+ endSave();
-bool ClientMap::setTempMod(v3s16 p, NodeMod mod,
- core::map<v3s16, MapBlock*> *affected_blocks)
-{
- bool changed = false;
/*
- Add it to all blocks touching it
+ Only print if something happened or saved whole map
*/
- v3s16 dirs[7] = {
- v3s16(0,0,0), // this
- 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
- };
- for(u16 i=0; i<7; i++)
- {
- v3s16 p2 = p + dirs[i];
- // Block position of neighbor (or requested) node
- v3s16 blockpos = getNodeBlockPos(p2);
- MapBlock * blockref = getBlockNoCreateNoEx(blockpos);
- if(blockref == NULL)
- continue;
- // Relative position of requested node
- v3s16 relpos = p - blockpos*MAP_BLOCKSIZE;
- if(blockref->setTempMod(relpos, mod))
- {
- changed = true;
- }
- }
- if(changed && affected_blocks!=NULL)
- {
- for(u16 i=0; i<7; i++)
- {
- v3s16 p2 = p + dirs[i];
- // Block position of neighbor (or requested) node
- v3s16 blockpos = getNodeBlockPos(p2);
- MapBlock * blockref = getBlockNoCreateNoEx(blockpos);
- if(blockref == NULL)
- continue;
- affected_blocks->insert(blockpos, blockref);
- }
+ if(save_level == MOD_STATE_CLEAN
+ || block_count != 0) {
+ infostream<<"ServerMap: Written: "
+ <<block_count<<" block files"
+ <<", "<<block_count_all<<" blocks in memory."
+ <<std::endl;
+ PrintInfo(infostream); // ServerMap/ClientMap:
+ infostream<<"Blocks modified by: "<<std::endl;
+ modprofiler.print(infostream);
}
- return changed;
}
-bool ClientMap::clearTempMod(v3s16 p,
- core::map<v3s16, MapBlock*> *affected_blocks)
-{
- bool changed = false;
- v3s16 dirs[7] = {
- v3s16(0,0,0), // this
- 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
- };
- for(u16 i=0; i<7; i++)
- {
- v3s16 p2 = p + dirs[i];
- // Block position of neighbor (or requested) node
- v3s16 blockpos = getNodeBlockPos(p2);
- MapBlock * blockref = getBlockNoCreateNoEx(blockpos);
- if(blockref == NULL)
- continue;
- // Relative position of requested node
- v3s16 relpos = p - blockpos*MAP_BLOCKSIZE;
- if(blockref->clearTempMod(relpos))
- {
- changed = true;
- }
- }
- if(changed && affected_blocks!=NULL)
- {
- for(u16 i=0; i<7; i++)
- {
- v3s16 p2 = p + dirs[i];
- // Block position of neighbor (or requested) node
- v3s16 blockpos = getNodeBlockPos(p2);
- MapBlock * blockref = getBlockNoCreateNoEx(blockpos);
- if(blockref == NULL)
- continue;
- affected_blocks->insert(blockpos, blockref);
- }
+void ServerMap::listAllLoadableBlocks(std::vector<v3s16> &dst)
+{
+ if (loadFromFolders()) {
+ errorstream << "Map::listAllLoadableBlocks(): Result will be missing "
+ << "all blocks that are stored in flat files." << std::endl;
}
- return changed;
+ dbase->listAllLoadableBlocks(dst);
}
-void ClientMap::expireMeshes(bool only_daynight_diffed)
+void ServerMap::listAllLoadedBlocks(std::vector<v3s16> &dst)
{
- TimeTaker timer("expireMeshes()");
-
- core::map<v2s16, MapSector*>::Iterator si;
- si = m_sectors.getIterator();
- for(; si.atEnd() == false; si++)
- {
- MapSector *sector = si.getNode()->getValue();
+ for (auto §or_it : m_sectors) {
+ MapSector *sector = sector_it.second;
- core::list< MapBlock * > sectorblocks;
- sector->getBlocks(sectorblocks);
-
- core::list< MapBlock * >::Iterator i;
- for(i=sectorblocks.begin(); i!=sectorblocks.end(); i++)
- {
- MapBlock *block = *i;
+ MapBlockVect blocks;
+ sector->getBlocks(blocks);
- if(only_daynight_diffed && dayNightDiffed(block->getPos()) == false)
- {
- continue;
- }
-
- {
- JMutexAutoLock lock(block->mesh_mutex);
- if(block->mesh != NULL)
- {
- /*block->mesh->drop();
- block->mesh = NULL;*/
- block->setMeshExpired(true);
- }
- }
+ for (MapBlock *block : blocks) {
+ v3s16 p = block->getPos();
+ dst.push_back(p);
}
}
}
-void ClientMap::updateMeshes(v3s16 blockpos, u32 daynight_ratio)
+MapDatabase *ServerMap::createDatabase(
+ const std::string &name,
+ const std::string &savedir,
+ Settings &conf)
{
- assert(mapType() == MAPTYPE_CLIENT);
-
- try{
- v3s16 p = blockpos + v3s16(0,0,0);
- MapBlock *b = getBlockNoCreate(p);
- b->updateMesh(daynight_ratio);
- //b->setMeshExpired(true);
+ if (name == "sqlite3")
+ return new MapDatabaseSQLite3(savedir);
+ if (name == "dummy")
+ return new Database_Dummy();
+ #if USE_LEVELDB
+ if (name == "leveldb")
+ return new Database_LevelDB(savedir);
+ #endif
+ #if USE_REDIS
+ if (name == "redis")
+ return new Database_Redis(conf);
+ #endif
+ #if USE_POSTGRESQL
+ if (name == "postgresql") {
+ std::string connect_string;
+ conf.getNoEx("pgsql_connection", connect_string);
+ return new MapDatabasePostgreSQL(connect_string);
}
- catch(InvalidPositionException &e){}
- // Leading edge
- try{
- v3s16 p = blockpos + v3s16(-1,0,0);
- MapBlock *b = getBlockNoCreate(p);
- b->updateMesh(daynight_ratio);
- //b->setMeshExpired(true);
- }
- catch(InvalidPositionException &e){}
- try{
- v3s16 p = blockpos + v3s16(0,-1,0);
- MapBlock *b = getBlockNoCreate(p);
- b->updateMesh(daynight_ratio);
- //b->setMeshExpired(true);
- }
- catch(InvalidPositionException &e){}
- try{
- v3s16 p = blockpos + v3s16(0,0,-1);
- MapBlock *b = getBlockNoCreate(p);
- b->updateMesh(daynight_ratio);
- //b->setMeshExpired(true);
- }
- catch(InvalidPositionException &e){}
+ #endif
+
+ throw BaseException(std::string("Database backend ") + name + " not supported.");
}
-#if 0
-/*
- Update mesh of block in which the node is, and if the node is at the
- leading edge, update the appropriate leading blocks too.
-*/
-void ClientMap::updateNodeMeshes(v3s16 nodepos, u32 daynight_ratio)
+void ServerMap::beginSave()
{
- v3s16 dirs[4] = {
- v3s16(0,0,0),
- v3s16(-1,0,0),
- v3s16(0,-1,0),
- v3s16(0,0,-1),
- };
- v3s16 blockposes[4];
- for(u32 i=0; i<4; i++)
- {
- v3s16 np = nodepos + dirs[i];
- blockposes[i] = getNodeBlockPos(np);
- // Don't update mesh of block if it has been done already
- bool already_updated = false;
- for(u32 j=0; j<i; j++)
- {
- if(blockposes[j] == blockposes[i])
- {
- already_updated = true;
- break;
- }
- }
- if(already_updated)
- continue;
- // Update mesh
- MapBlock *b = getBlockNoCreate(blockposes[i]);
- b->updateMesh(daynight_ratio);
- }
+ dbase->beginSave();
}
-#endif
-void ClientMap::PrintInfo(std::ostream &out)
+void ServerMap::endSave()
{
- out<<"ClientMap: ";
+ dbase->endSave();
}
-#endif // !SERVER
-
-/*
- MapVoxelManipulator
-*/
-
-MapVoxelManipulator::MapVoxelManipulator(Map *map)
+bool ServerMap::saveBlock(MapBlock *block)
{
- m_map = map;
+ return saveBlock(block, dbase);
}
-MapVoxelManipulator::~MapVoxelManipulator()
+bool ServerMap::saveBlock(MapBlock *block, MapDatabase *db)
{
- /*infostream<<"MapVoxelManipulator: blocks: "<<m_loaded_blocks.size()
- <<std::endl;*/
+ v3s16 p3d = block->getPos();
+
+ // Dummy blocks are not written
+ if (block->isDummy()) {
+ warningstream << "saveBlock: Not writing dummy block "
+ << PP(p3d) << std::endl;
+ return true;
+ }
+
+ // Format used for writing
+ u8 version = SER_FMT_VER_HIGHEST_WRITE;
+
+ /*
+ [0] u8 serialization version
+ [1] data
+ */
+ std::ostringstream o(std::ios_base::binary);
+ o.write((char*) &version, 1);
+ block->serialize(o, version, true);
+
+ 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 MapVoxelManipulator::emerge(VoxelArea a, s32 caller_id)
+void ServerMap::loadBlock(const std::string §ordir, const std::string &blockfile,
+ MapSector *sector, bool save_after_load)
{
- TimeTaker timer1("emerge", &emerge_time);
+ DSTACK(FUNCTION_NAME);
- // Units of these are MapBlocks
- v3s16 p_min = getNodeBlockPos(a.MinEdge);
- v3s16 p_max = getNodeBlockPos(a.MaxEdge);
+ std::string fullpath = sectordir + DIR_DELIM + blockfile;
+ try {
+ std::ifstream is(fullpath.c_str(), std::ios_base::binary);
+ if (!is.good())
+ throw FileNotGoodException("Cannot open block file");
- VoxelArea block_area_nodes
- (p_min*MAP_BLOCKSIZE, (p_max+1)*MAP_BLOCKSIZE-v3s16(1,1,1));
+ v3s16 p3d = getBlockPos(sectordir, blockfile);
+ v2s16 p2d(p3d.X, p3d.Z);
- addArea(block_area_nodes);
+ assert(sector->getPos() == p2d);
- for(s32 z=p_min.Z; z<=p_max.Z; z++)
- for(s32 y=p_min.Y; y<=p_max.Y; y++)
- for(s32 x=p_min.X; x<=p_max.X; x++)
- {
- v3s16 p(x,y,z);
- core::map<v3s16, bool>::Node *n;
- n = m_loaded_blocks.find(p);
- if(n != NULL)
- continue;
-
- bool block_data_inexistent = false;
- try
- {
- TimeTaker timer1("emerge load", &emerge_load_time);
+ u8 version = SER_FMT_VER_INVALID;
+ is.read((char*)&version, 1);
- /*infostream<<"Loading block (caller_id="<<caller_id<<")"
- <<" ("<<p.X<<","<<p.Y<<","<<p.Z<<")"
- <<" wanted area: ";
- a.print(infostream);
- infostream<<std::endl;*/
-
- MapBlock *block = m_map->getBlockNoCreate(p);
- if(block->isDummy())
- block_data_inexistent = true;
- else
- block->copyTo(*this);
- }
- catch(InvalidPositionException &e)
+ if(is.fail())
+ 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);
+ if(block == NULL)
{
- block_data_inexistent = true;
+ block = sector->createBlankBlockNoInsert(p3d.Y);
+ created_new = true;
}
- if(block_data_inexistent)
+ // Read basic data
+ block->deSerialize(is, version, true);
+
+ // If it's a new block, insert it to the map
+ if (created_new) {
+ sector->insertBlock(block);
+ ReflowScan scanner(this, m_emerge->ndef);
+ scanner.scan(block, &m_transforming_liquid);
+ }
+
+ /*
+ Save blocks loaded in old format in new format
+ */
+
+ if(version < SER_FMT_VER_HIGHEST_WRITE || save_after_load)
{
- VoxelArea a(p*MAP_BLOCKSIZE, (p+1)*MAP_BLOCKSIZE-v3s16(1,1,1));
- // Fill with VOXELFLAG_INEXISTENT
- for(s32 z=a.MinEdge.Z; z<=a.MaxEdge.Z; z++)
- for(s32 y=a.MinEdge.Y; y<=a.MaxEdge.Y; y++)
- {
- s32 i = m_area.index(a.MinEdge.X,y,z);
- memset(&m_flags[i], VOXELFLAG_INEXISTENT, MAP_BLOCKSIZE);
- }
+ saveBlock(block);
+
+ // Should be in database now, so delete the old file
+ fs::RecursiveDelete(fullpath);
}
- m_loaded_blocks.insert(p, !block_data_inexistent);
+ // We just loaded it from the disk, so it's up-to-date.
+ block->resetModified();
+
}
+ catch(SerializationError &e)
+ {
+ warningstream<<"Invalid block data on disk "
+ <<"fullpath="<<fullpath
+ <<" (SerializationError). "
+ <<"what()="<<e.what()
+ <<std::endl;
+ // Ignoring. A new one will be generated.
+ abort();
- //infostream<<"emerge done"<<std::endl;
+ // TODO: Backup file; name is in fullpath.
+ }
}
-/*
- SUGG: Add an option to only update eg. water and air nodes.
- This will make it interfere less with important stuff if
- run on background.
-*/
-void MapVoxelManipulator::blitBack
- (core::map<v3s16, MapBlock*> & modified_blocks)
+void ServerMap::loadBlock(std::string *blob, v3s16 p3d, MapSector *sector, bool save_after_load)
{
- if(m_area.getExtent() == v3s16(0,0,0))
- return;
-
- //TimeTaker timer1("blitBack");
+ DSTACK(FUNCTION_NAME);
- /*infostream<<"blitBack(): m_loaded_blocks.size()="
- <<m_loaded_blocks.size()<<std::endl;*/
-
- /*
- Initialize block cache
- */
- v3s16 blockpos_last;
- MapBlock *block = NULL;
- bool block_checked_in_modified = false;
+ try {
+ std::istringstream is(*blob, std::ios_base::binary);
- for(s32 z=m_area.MinEdge.Z; z<=m_area.MaxEdge.Z; z++)
- for(s32 y=m_area.MinEdge.Y; y<=m_area.MaxEdge.Y; y++)
- for(s32 x=m_area.MinEdge.X; x<=m_area.MaxEdge.X; x++)
- {
- v3s16 p(x,y,z);
+ u8 version = SER_FMT_VER_INVALID;
+ is.read((char*)&version, 1);
- u8 f = m_flags[m_area.index(p)];
- if(f & (VOXELFLAG_NOT_LOADED|VOXELFLAG_INEXISTENT))
- continue;
+ if(is.fail())
+ throw SerializationError("ServerMap::loadBlock(): Failed"
+ " to read MapBlock version");
- MapNode &n = m_data[m_area.index(p)];
-
- v3s16 blockpos = getNodeBlockPos(p);
-
- try
+ MapBlock *block = NULL;
+ bool created_new = false;
+ block = sector->getBlockNoCreateNoEx(p3d.Y);
+ if(block == NULL)
{
- // Get block
- if(block == NULL || blockpos != blockpos_last){
- block = m_map->getBlockNoCreate(blockpos);
- blockpos_last = blockpos;
- block_checked_in_modified = false;
- }
-
- // Calculate relative position in block
- v3s16 relpos = p - blockpos * MAP_BLOCKSIZE;
+ block = sector->createBlankBlockNoInsert(p3d.Y);
+ created_new = true;
+ }
- // Don't continue if nothing has changed here
- if(block->getNode(relpos) == n)
- continue;
+ // Read basic data
+ block->deSerialize(is, version, true);
- //m_map->setNode(m_area.MinEdge + p, n);
- block->setNode(relpos, n);
-
- /*
- Make sure block is in modified_blocks
- */
- if(block_checked_in_modified == false)
- {
- modified_blocks[blockpos] = block;
- block_checked_in_modified = true;
- }
+ // If it's a new block, insert it to the map
+ if (created_new) {
+ sector->insertBlock(block);
+ ReflowScan scanner(this, m_emerge->ndef);
+ scanner.scan(block, &m_transforming_liquid);
}
- catch(InvalidPositionException &e)
- {
+
+ /*
+ Save blocks loaded in old format in new format
+ */
+
+ //if(version < SER_FMT_VER_HIGHEST_READ || save_after_load)
+ // Only save if asked to; no need to update version
+ if(save_after_load)
+ saveBlock(block);
+
+ // We just loaded it from, so it's up-to-date.
+ block->resetModified();
+ }
+ catch(SerializationError &e)
+ {
+ errorstream<<"Invalid block data in database"
+ <<" ("<<p3d.X<<","<<p3d.Y<<","<<p3d.Z<<")"
+ <<" (SerializationError): "<<e.what()<<std::endl;
+
+ // TODO: Block should be marked as invalid in memory so that it is
+ // not touched but the game can run
+
+ if(g_settings->getBool("ignore_world_load_errors")){
+ errorstream<<"Ignoring block load error. Duck and cover! "
+ <<"(ignore_world_load_errors)"<<std::endl;
+ } else {
+ throw SerializationError("Invalid block data in database");
+ }
+ }
+}
+
+MapBlock* ServerMap::loadBlock(v3s16 blockpos)
+{
+ DSTACK(FUNCTION_NAME);
+
+ bool created_new = (getBlockNoCreateNoEx(blockpos) == NULL);
+
+ v2s16 p2d(blockpos.X, blockpos.Z);
+
+ std::string ret;
+ dbase->loadBlock(blockpos, &ret);
+ if (!ret.empty()) {
+ loadBlock(&ret, blockpos, createSector(p2d), false);
+ } else {
+ // Not found in database, try the files
+
+ // 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.
+ std::string sectordir1 = getSectorDir(p2d, 1);
+ std::string sectordir;
+ if (fs::PathExists(sectordir1)) {
+ sectordir = sectordir1;
+ } else {
+ sectordir = getSectorDir(p2d, 2);
+ }
+
+ /*
+ Make sure sector is loaded
+ */
+
+ MapSector *sector = getSectorNoGenerateNoEx(p2d);
+
+ /*
+ Make sure file exists
+ */
+
+ std::string blockfilename = getBlockFilename(blockpos);
+ if (!fs::PathExists(sectordir + DIR_DELIM + blockfilename))
+ return NULL;
+
+ /*
+ Load block and save it to the database
+ */
+ loadBlock(sectordir, blockfilename, sector, true);
+ }
+
+ MapBlock *block = getBlockNoCreateNoEx(blockpos);
+ if (created_new && (block != NULL)) {
+ std::map<v3s16, MapBlock*> modified_blocks;
+ // Fix lighting if necessary
+ voxalgo::update_block_border_lighting(this, block, modified_blocks);
+ if (!modified_blocks.empty()) {
+ //Modified lighting, send event
+ MapEditEvent event;
+ event.type = MEET_OTHER;
+ std::map<v3s16, MapBlock *>::iterator it;
+ for (it = modified_blocks.begin();
+ it != modified_blocks.end(); ++it)
+ event.modified_blocks.insert(it->first);
+ dispatchEvent(&event);
}
}
+ return block;
+}
+
+bool ServerMap::deleteBlock(v3s16 blockpos)
+{
+ if (!dbase->deleteBlock(blockpos))
+ return false;
+
+ MapBlock *block = getBlockNoCreateNoEx(blockpos);
+ if (block) {
+ v2s16 p2d(blockpos.X, blockpos.Z);
+ MapSector *sector = getSectorNoGenerateNoEx(p2d);
+ if (!sector)
+ return false;
+ sector->deleteBlock(block);
+ }
+
+ return true;
}
-ManualMapVoxelManipulator::ManualMapVoxelManipulator(Map *map):
- MapVoxelManipulator(map),
- m_create_area(false)
+void ServerMap::PrintInfo(std::ostream &out)
{
+ out<<"ServerMap: ";
}
-ManualMapVoxelManipulator::~ManualMapVoxelManipulator()
+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;
}
-void ManualMapVoxelManipulator::emerge(VoxelArea a, s32 caller_id)
+MMVManip::MMVManip(Map *map):
+ VoxelManipulator(),
+ m_map(map)
{
- // Just create the area so that it can be pointed to
- VoxelManipulator::emerge(a, caller_id);
}
-void ManualMapVoxelManipulator::initialEmerge(
- v3s16 blockpos_min, v3s16 blockpos_max)
+void MMVManip::initialEmerge(v3s16 blockpos_min, v3s16 blockpos_max,
+ bool load_if_inexistent)
{
TimeTaker timer1("initialEmerge", &emerge_time);
VoxelArea block_area_nodes
(p_min*MAP_BLOCKSIZE, (p_max+1)*MAP_BLOCKSIZE-v3s16(1,1,1));
-
+
u32 size_MB = block_area_nodes.getVolume()*4/1000000;
if(size_MB >= 1)
{
for(s32 y=p_min.Y; y<=p_max.Y; y++)
for(s32 x=p_min.X; x<=p_max.X; x++)
{
+ u8 flags = 0;
+ MapBlock *block;
v3s16 p(x,y,z);
- core::map<v3s16, bool>::Node *n;
+ std::map<v3s16, u8>::iterator n;
n = m_loaded_blocks.find(p);
- if(n != NULL)
+ if(n != m_loaded_blocks.end())
continue;
-
+
bool block_data_inexistent = false;
try
{
TimeTaker timer1("emerge load", &emerge_load_time);
- MapBlock *block = m_map->getBlockNoCreate(p);
+ block = m_map->getBlockNoCreate(p);
if(block->isDummy())
block_data_inexistent = true;
else
if(block_data_inexistent)
{
- /*
- Mark area inexistent
- */
- VoxelArea a(p*MAP_BLOCKSIZE, (p+1)*MAP_BLOCKSIZE-v3s16(1,1,1));
- // Fill with VOXELFLAG_INEXISTENT
- for(s32 z=a.MinEdge.Z; z<=a.MaxEdge.Z; z++)
- for(s32 y=a.MinEdge.Y; y<=a.MaxEdge.Y; y++)
- {
- s32 i = m_area.index(a.MinEdge.X,y,z);
- memset(&m_flags[i], VOXELFLAG_INEXISTENT, MAP_BLOCKSIZE);
+
+ if (load_if_inexistent && !blockpos_over_max_limit(p)) {
+ ServerMap *svrmap = (ServerMap *)m_map;
+ block = svrmap->emergeBlock(p, false);
+ if (block == NULL)
+ block = svrmap->createBlock(p);
+ block->copyTo(*this);
+ } else {
+ flags |= VMANIP_BLOCK_DATA_INEXIST;
+
+ /*
+ Mark area inexistent
+ */
+ VoxelArea a(p*MAP_BLOCKSIZE, (p+1)*MAP_BLOCKSIZE-v3s16(1,1,1));
+ // Fill with VOXELFLAG_NO_DATA
+ for(s32 z=a.MinEdge.Z; z<=a.MaxEdge.Z; z++)
+ for(s32 y=a.MinEdge.Y; y<=a.MaxEdge.Y; y++)
+ {
+ s32 i = m_area.index(a.MinEdge.X,y,z);
+ memset(&m_flags[i], VOXELFLAG_NO_DATA, MAP_BLOCKSIZE);
+ }
}
}
+ /*else if (block->getNode(0, 0, 0).getContent() == CONTENT_IGNORE)
+ {
+ // Mark that block was loaded as blank
+ flags |= VMANIP_BLOCK_CONTAINS_CIGNORE;
+ }*/
- m_loaded_blocks.insert(p, !block_data_inexistent);
+ m_loaded_blocks[p] = flags;
}
+
+ m_is_dirty = false;
}
-void ManualMapVoxelManipulator::blitBackAll(
- core::map<v3s16, MapBlock*> * modified_blocks)
+void MMVManip::blitBackAll(std::map<v3s16, MapBlock*> *modified_blocks,
+ bool overwrite_generated)
{
if(m_area.getExtent() == v3s16(0,0,0))
return;
-
+
/*
Copy data of all blocks
*/
- for(core::map<v3s16, bool>::Iterator
- i = m_loaded_blocks.getIterator();
- i.atEnd() == false; i++)
- {
- v3s16 p = i.getNode()->getKey();
- bool existed = i.getNode()->getValue();
- if(existed == false)
- {
- // The Great Bug was found using this
- /*infostream<<"ManualMapVoxelManipulator::blitBackAll: "
- <<"Inexistent ("<<p.X<<","<<p.Y<<","<<p.Z<<")"
- <<std::endl;*/
- continue;
- }
+ for (auto &loaded_block : m_loaded_blocks) {
+ v3s16 p = loaded_block.first;
MapBlock *block = m_map->getBlockNoCreateNoEx(p);
- if(block == NULL)
- {
- infostream<<"WARNING: "<<__FUNCTION_NAME
- <<": got NULL block "
- <<"("<<p.X<<","<<p.Y<<","<<p.Z<<")"
- <<std::endl;
+ bool existed = !(loaded_block.second & VMANIP_BLOCK_DATA_INEXIST);
+ if (!existed || (block == NULL) ||
+ (!overwrite_generated && block->isGenerated()))
continue;
- }
block->copyFrom(*this);
if(modified_blocks)
- modified_blocks->insert(p, block);
+ (*modified_blocks)[p] = block;
}
}
projects / dragonfireclient.git / blobdiff