X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;f=src%2Fmap.cpp;h=d644215be78911de0d56af9825eb684e98d94d3d;hb=7df125c249dc9b99b66f047a395106c2038eb00e;hp=c290f69e9a2c476b2ca2a6c5acd701183763bd04;hpb=7068bc90af1f452359a1fcfe20fa01fc88f3d70a;p=dragonfireclient.git diff --git a/src/map.cpp b/src/map.cpp index c290f69e9..d644215be 100644 --- a/src/map.cpp +++ b/src/map.cpp @@ -25,6 +25,8 @@ with this program; if not, write to the Free Software Foundation, Inc., #include "utility.h" #include "voxel.h" #include "porting.h" +#include "mineral.h" +#include "noise.h" /* Map @@ -32,32 +34,16 @@ with this program; if not, write to the Free Software Foundation, Inc., Map::Map(std::ostream &dout): m_dout(dout), - m_camera_position(0,0,0), - m_camera_direction(0,0,1), - m_sector_cache(NULL), - m_hwrapper(this), - drawoffset(0,0,0) + m_sector_cache(NULL) { m_sector_mutex.Init(); - m_camera_mutex.Init(); assert(m_sector_mutex.IsInitialized()); - assert(m_camera_mutex.IsInitialized()); - - // Get this so that the player can stay on it at first - //getSector(v2s16(0,0)); } Map::~Map() { /* - Stop updater thread - */ - /*updater.setRun(false); - while(updater.IsRunning()) - sleep_s(1);*/ - - /* - Free all MapSectors. + Free all MapSectors */ core::map::Iterator i = m_sectors.getIterator(); for(; i.atEnd() == false; i++) @@ -67,10 +53,31 @@ Map::~Map() } } -MapSector * Map::getSectorNoGenerate(v2s16 p) +void Map::addEventReceiver(MapEventReceiver *event_receiver) { - JMutexAutoLock lock(m_sector_mutex); + m_event_receivers.insert(event_receiver, false); +} + +void Map::removeEventReceiver(MapEventReceiver *event_receiver) +{ + if(m_event_receivers.find(event_receiver) == NULL) + return; + m_event_receivers.remove(event_receiver); +} + +void Map::dispatchEvent(MapEditEvent *event) +{ + for(core::map::Iterator + i = m_event_receivers.getIterator(); + i.atEnd()==false; i++) + { + MapEventReceiver* event_receiver = i.getNode()->getKey(); + event_receiver->onMapEditEvent(event); + } +} +MapSector * Map::getSectorNoGenerateNoExNoLock(v2s16 p) +{ if(m_sector_cache != NULL && p == m_sector_cache_p){ MapSector * sector = m_sector_cache; // Reset inactivity timer @@ -79,11 +86,9 @@ MapSector * Map::getSectorNoGenerate(v2s16 p) } core::map::Node *n = m_sectors.find(p); - // If sector doesn't exist, throw an exception + if(n == NULL) - { - throw InvalidPositionException(); - } + return NULL; MapSector *sector = n->getValue(); @@ -91,13 +96,27 @@ MapSector * Map::getSectorNoGenerate(v2s16 p) m_sector_cache_p = p; m_sector_cache = sector; - //MapSector * ref(sector); - // Reset inactivity timer sector->usage_timer = 0.0; return sector; } +MapSector * Map::getSectorNoGenerateNoEx(v2s16 p) +{ + JMutexAutoLock lock(m_sector_mutex); + + return getSectorNoGenerateNoExNoLock(p); +} + +MapSector * Map::getSectorNoGenerate(v2s16 p) +{ + MapSector *sector = getSectorNoGenerateNoEx(p); + if(sector == NULL) + throw InvalidPositionException(); + + return sector; +} + MapBlock * Map::getBlockNoCreate(v3s16 p3d) { v2s16 p2d(p3d.X, p3d.Z); @@ -123,33 +142,17 @@ MapBlock * Map::getBlockNoCreateNoEx(v3s16 p3d) } } -f32 Map::getGroundHeight(v2s16 p, bool generate) -{ - try{ - v2s16 sectorpos = getNodeSectorPos(p); - MapSector * sref = getSectorNoGenerate(sectorpos); - v2s16 relpos = p - sectorpos * MAP_BLOCKSIZE; - f32 y = sref->getGroundHeight(relpos); - return y; - } - catch(InvalidPositionException &e) - { - return GROUNDHEIGHT_NOTFOUND_SETVALUE; - } -} - -void Map::setGroundHeight(v2s16 p, f32 y, bool generate) +/*MapBlock * Map::getBlockCreate(v3s16 p3d) { - /*m_dout<mutex.Lock(); - sref->setGroundHeight(relpos, y); - //sref->mutex.Unlock(); -} + v2s16 p2d(p3d.X, p3d.Z); + MapSector * sector = getSectorCreate(p2d); + assert(sector); + MapBlock *block = sector->getBlockNoCreate(p3d.Y); + if(block) + return block; + block = sector->createBlankBlock(p3d.Y); + return block; +}*/ bool Map::isNodeUnderground(v3s16 p) { @@ -623,11 +626,15 @@ void Map::updateLighting(enum LightBank bank, core::map & modified_blocks) { /*m_dout< blocks_to_update; core::map light_sources; @@ -648,6 +655,8 @@ void Map::updateLighting(enum LightBank bank, v3s16 pos = block->getPos(); modified_blocks.insert(pos, block); + blocks_to_update.insert(pos, block); + /* Clear all light from block */ @@ -697,10 +706,12 @@ void Map::updateLighting(enum LightBank bank, } else if(bank == LIGHTBANK_NIGHT) { + // For night lighting, sunlight is not propagated break; } else { + // Invalid lighting bank assert(0); } @@ -708,7 +719,7 @@ void Map::updateLighting(enum LightBank bank, <::Iterator i; + i = blocks_to_update.getIterator(); + for(; i.atEnd() == false; i++) + { + MapBlock *block = i.getNode()->getValue(); + v3s16 p = block->getPos(); + + // 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 p(x,y,z); + MapBlock *block = getBlockNoCreateNoEx(p); + if(block == NULL) + continue; + if(block->isDummy()) + continue; + if(block->getLightingExpired()) + continue; + vmanip.initialEmerge(p, p); + }*/ + + // Lighting of block will be updated completely + block->setLightingExpired(false); + } + + { + //TimeTaker timer("unSpreadLight"); + vmanip.unspreadLight(bank, unlight_from, light_sources); + } + { + //TimeTaker timer("spreadLight"); + vmanip.spreadLight(bank, light_sources); + } + { + //TimeTaker timer("blitBack"); + vmanip.blitBack(modified_blocks); + } + /*dstream<<"emerge_time="< & a_blocks, The lighting value of the node should be left as-is after changing other values. This sets the lighting value to 0. */ -/*void Map::nodeAddedUpdate(v3s16 p, u8 lightwas, - core::map &modified_blocks)*/ void Map::addNodeAndUpdate(v3s16 p, MapNode n, core::map &modified_blocks) { /*PrintInfo(m_dout); - m_dout<clone(); + setNodeMetadata(p, meta); + } /* - If node is under sunlight, take all sunlighted nodes under - it and clear light from them and from where the light has - been spread. + 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) + if(node_under_sunlight && !content_features(n.d).sunlight_propagates) { s16 y = p.Y - 1; for(;; y--){ @@ -894,7 +991,6 @@ void Map::addNodeAndUpdate(v3s16 p, MapNode n, if(n2.getLight(LIGHTBANK_DAY) == LIGHT_SUN) { - //m_dout<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(content_liquid(n2.d)) + { + m_transforming_liquid.push_back(p2); + } + + }catch(InvalidPositionException &e) + { + } + } } /* @@ -978,6 +1104,12 @@ void Map::removeNodeAndUpdate(v3s16 p, light_sources, modified_blocks); } + /* + Remove node metadata + */ + + removeNodeMetadata(p); + /* Remove the node. This also clears the lighting. @@ -1035,7 +1167,7 @@ void Map::removeNodeAndUpdate(v3s16 p, } catch(InvalidPositionException &e) { - throw; + assert(0); } } @@ -1064,96 +1196,93 @@ void Map::removeNodeAndUpdate(v3s16 p, MapBlock *block = i.getNode()->getValue(); block->updateDayNightDiff(); } -} - -#ifndef SERVER -void Map::expireMeshes(bool only_daynight_diffed) -{ - TimeTaker timer("expireMeshes()"); - core::map::Iterator si; - si = m_sectors.getIterator(); - for(; si.atEnd() == false; si++) + /* + Add neighboring liquid nodes to transform queue. + */ + 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 + }; + for(u16 i=0; i<6; i++) { - MapSector *sector = si.getNode()->getValue(); + try + { - core::list< MapBlock * > sectorblocks; - sector->getBlocks(sectorblocks); + v3s16 p2 = p + dirs[i]; - core::list< MapBlock * >::Iterator i; - for(i=sectorblocks.begin(); i!=sectorblocks.end(); i++) + MapNode n2 = getNode(p2); + if(content_liquid(n2.d)) + { + m_transforming_liquid.push_back(p2); + } + + }catch(InvalidPositionException &e) { - MapBlock *block = *i; - - 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); - } - } } } } -void Map::updateMeshes(v3s16 blockpos, u32 daynight_ratio) +bool Map::addNodeWithEvent(v3s16 p, MapNode n) { - assert(mapType() == MAPTYPE_CLIENT); + MapEditEvent event; + event.type = MEET_ADDNODE; + event.p = p; + event.n = n; + bool succeeded = true; try{ - v3s16 p = blockpos + v3s16(0,0,0); - MapBlock *b = getBlockNoCreate(p); - b->updateMesh(daynight_ratio); - } - catch(InvalidPositionException &e){} - // Leading edge - try{ - v3s16 p = blockpos + v3s16(-1,0,0); - MapBlock *b = getBlockNoCreate(p); - b->updateMesh(daynight_ratio); - } - catch(InvalidPositionException &e){} - try{ - v3s16 p = blockpos + v3s16(0,-1,0); - MapBlock *b = getBlockNoCreate(p); - b->updateMesh(daynight_ratio); - } - catch(InvalidPositionException &e){} - try{ - v3s16 p = blockpos + v3s16(0,0,-1); - MapBlock *b = getBlockNoCreate(p); - b->updateMesh(daynight_ratio); + core::map modified_blocks; + addNodeAndUpdate(p, n, modified_blocks); + + // Copy modified_blocks to event + for(core::map::Iterator + i = modified_blocks.getIterator(); + i.atEnd()==false; i++) + { + event.modified_blocks.insert(i.getNode()->getKey(), false); + } } - catch(InvalidPositionException &e){} - /*// Trailing edge - try{ - v3s16 p = blockpos + v3s16(1,0,0); - MapBlock *b = getBlockNoCreate(p); - b->updateMesh(daynight_ratio); + catch(InvalidPositionException &e){ + succeeded = false; } - catch(InvalidPositionException &e){} + + dispatchEvent(&event); + + return succeeded; +} + +bool Map::removeNodeWithEvent(v3s16 p) +{ + MapEditEvent event; + event.type = MEET_REMOVENODE; + event.p = p; + + bool succeeded = true; try{ - v3s16 p = blockpos + v3s16(0,1,0); - MapBlock *b = getBlockNoCreate(p); - b->updateMesh(daynight_ratio); + core::map modified_blocks; + removeNodeAndUpdate(p, modified_blocks); + + // Copy modified_blocks to event + for(core::map::Iterator + i = modified_blocks.getIterator(); + i.atEnd()==false; i++) + { + event.modified_blocks.insert(i.getNode()->getKey(), false); + } } - catch(InvalidPositionException &e){} - try{ - v3s16 p = blockpos + v3s16(0,0,1); - MapBlock *b = getBlockNoCreate(p); - b->updateMesh(daynight_ratio); + catch(InvalidPositionException &e){ + succeeded = false; } - catch(InvalidPositionException &e){}*/ -} -#endif + dispatchEvent(&event); + + return succeeded; +} bool Map::dayNightDiffed(v3s16 blockpos) { @@ -1236,7 +1365,7 @@ void Map::deleteSectors(core::list &list, bool only_blocks) This disables the existence of caches while locked */ - SharedPtr cachelock(m_blockcachelock.waitCaches()); + //SharedPtr cachelock(m_blockcachelock.waitCaches()); core::list::Iterator j; for(j=list.begin(); j!=list.end(); j++) @@ -1304,201 +1433,357 @@ void Map::PrintInfo(std::ostream &out) out<<"Map: "; } -/* - ServerMap -*/ +#define WATER_DROP_BOOST 4 -ServerMap::ServerMap(std::string savedir, HMParams hmp, MapParams mp): - Map(dout_server), - m_heightmap(NULL) +void Map::transformLiquids(core::map & modified_blocks) { - /* - Experimental and debug stuff - */ + DSTACK(__FUNCTION_NAME); + //TimeTaker timer("transformLiquids()"); + + u32 loopcount = 0; + u32 initial_size = m_transforming_liquid.size(); - { - PointAttributeList *list_baseheight = m_padb.getList("hm_baseheight"); - PointAttributeList *list_randmax = m_padb.getList("hm_randmax"); - PointAttributeList *list_randfactor = m_padb.getList("hm_randfactor"); - PointAttributeList *list_plants_amount = m_padb.getList("plants_amount"); - PointAttributeList *list_caves_amount = m_padb.getList("caves_amount"); - - for(u32 i=0; i<3000; i++) - { - u32 lim = MAP_GENERATION_LIMIT; - if(i < 200) - lim = 1000; + /*if(initial_size != 0) + dstream<<"transformLiquids(): initial_size="<addPoint(p, Attribute(plants_amount));*/ - - float plants_amount = 0; - if(myrand()%5 == 0) - { - plants_amount = 1.5; - } - else if(myrand()%4 == 0) - { - plants_amount = 0.5; - } - else if(myrand()%2 == 0) + while(m_transforming_liquid.size() != 0) + { + /* + Get a queued transforming liquid node + */ + v3s16 p0 = m_transforming_liquid.pop_front(); + + MapNode n0 = getNode(p0); + + // Don't deal with non-liquids + if(content_liquid(n0.d) == false) + continue; + + bool is_source = !content_flowing_liquid(n0.d); + + u8 liquid_level = 8; + if(is_source == false) + liquid_level = n0.param2 & 0x0f; + + // Turn possible source into non-source + u8 nonsource_c = make_liquid_flowing(n0.d); + + /* + If not source, check that some node flows into this one + and what is the level of liquid in this one + */ + if(is_source == false) + { + s8 new_liquid_level_max = -1; + + v3s16 dirs_from[5] = { + v3s16(0,1,0), // top + v3s16(0,0,1), // back + v3s16(1,0,0), // right + v3s16(0,0,-1), // front + v3s16(-1,0,0), // left + }; + for(u16 i=0; i<5; i++) { - plants_amount = 0.03; - } - else + try + { + + bool from_top = (i==0); + + v3s16 p2 = p0 + dirs_from[i]; + MapNode n2 = getNode(p2); + + if(content_liquid(n2.d)) + { + u8 n2_nonsource_c = make_liquid_flowing(n2.d); + // Check that the liquids are the same type + if(n2_nonsource_c != nonsource_c) + { + dstream<<"WARNING: Not handling: different liquids" + " collide"<= 7 - WATER_DROP_BOOST) + new_liquid_level = 7; + else + new_liquid_level = n2_liquid_level + WATER_DROP_BOOST; + } + else if(n2_liquid_level > 0) + { + new_liquid_level = n2_liquid_level - 1; + } + + if(new_liquid_level > new_liquid_level_max) + new_liquid_level_max = new_liquid_level; + } + + }catch(InvalidPositionException &e) + { + } + } //for + + /* + If liquid level should be something else, update it and + add all the neighboring water nodes to the transform queue. + */ + if(new_liquid_level_max != liquid_level) { - plants_amount = 0.0; + if(new_liquid_level_max == -1) + { + // Remove water alltoghether + n0.d = CONTENT_AIR; + n0.param2 = 0; + setNode(p0, n0); + } + else + { + n0.param2 = new_liquid_level_max; + setNode(p0, n0); + } + + // Block has been modified + { + v3s16 blockpos = getNodeBlockPos(p0); + MapBlock *block = getBlockNoCreateNoEx(blockpos); + if(block != NULL) + modified_blocks.insert(blockpos, block); + } + + /* + Add neighboring non-source liquid nodes to transform queue. + */ + 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 + }; + for(u16 i=0; i<6; i++) + { + try + { + + v3s16 p2 = p0 + dirs[i]; + + MapNode n2 = getNode(p2); + if(content_flowing_liquid(n2.d)) + { + m_transforming_liquid.push_back(p2); + } + + }catch(InvalidPositionException &e) + { + } + } } + } + + // Get a new one from queue if the node has turned into non-water + if(content_liquid(n0.d) == false) + continue; - float caves_amount = 0; - if(myrand()%5 == 0) + /* + Flow water from this node + */ + v3s16 dirs_to[5] = { + v3s16(0,-1,0), // bottom + v3s16(0,0,1), // back + v3s16(1,0,0), // right + v3s16(0,0,-1), // front + v3s16(-1,0,0), // left + }; + for(u16 i=0; i<5; i++) + { + try { - caves_amount = 1.0; - } - else if(myrand()%3 == 0) + + bool to_bottom = (i == 0); + + // If liquid is at lowest possible height, it's not going + // anywhere except down + if(liquid_level == 0 && to_bottom == false) + continue; + + u8 liquid_next_level = 0; + // If going to bottom + if(to_bottom) { - caves_amount = 0.3; + //liquid_next_level = 7; + if(liquid_level >= 7 - WATER_DROP_BOOST) + liquid_next_level = 7; + else + liquid_next_level = liquid_level + WATER_DROP_BOOST; } else - { - caves_amount = 0.05; - } - - list_plants_amount->addPoint(p, Attribute(plants_amount)); - list_caves_amount->addPoint(p, Attribute(caves_amount)); - } -#if 1 - for(u32 i=0; i<3000; i++) - { - u32 lim = MAP_GENERATION_LIMIT; - if(i < 100) - lim = 1000; + liquid_next_level = liquid_level - 1; - v3s16 p( - -lim + myrand()%(lim*2), - 0, - -lim + myrand()%(lim*2) - ); + bool n2_changed = false; + bool flowed = false; - /*s32 bh_i = (myrand()%200) - 50; - float baseheight = (float)bh_i; - - float m = 100.; - float e = 3.; - float randmax = (float)(myrand()%(int)(10.*pow(m, 1./e)))/10.; - randmax = pow(randmax, e); - - //float randmax = (float)(myrand()%60); - float randfactor = (float)(myrand()%450) / 1000.0 + 0.4;*/ + v3s16 p2 = p0 + dirs_to[i]; - float baseheight = 0; - float randmax = 0; - float randfactor = 0; + MapNode n2 = getNode(p2); + //dstream<<"[1] n2.param="<<(int)n2.param< liquid_level) + { + n2.param2 = liquid_next_level; + setNode(p2, n2); + + n2_changed = true; + flowed = true; + } + } } - else if(myrand()%4 == 0) + else if(n2.d == CONTENT_AIR) { - baseheight = -3; - randmax = 30; - randfactor = 0.7; + n2.d = nonsource_c; + n2.param2 = liquid_next_level; + setNode(p2, n2); + + n2_changed = true; + flowed = true; } - else if(myrand()%3 == 0) + + //dstream<<"[2] n2.param="<<(int)n2.param<addPoint(p, Attribute(baseheight)); - list_randmax->addPoint(p, Attribute(randmax)); - list_randfactor->addPoint(p, Attribute(randfactor)); } -#endif - /*list_baseheight->addPoint(v3s16(0,0,0), Attribute(5)); - list_randmax->addPoint(v3s16(0,0,0), Attribute(20)); - list_randfactor->addPoint(v3s16(0,0,0), Attribute(0.6));*/ + loopcount++; + //if(loopcount >= 100000) + if(loopcount >= initial_size * 1) + break; } + //dstream<<"Map::transformLiquids(): loopcount="<addPoint(p, attr); - } + dstream<<"WARNING: Map::setNodeMetadata(): Block not found" + <m_node_metadata.get(p_rel); + return meta; +} - /*{ - v3s16 p(-50,-50,0); - Attribute attr; - attr.set("-10"); - palist->addPoint(p, attr); - } - - { - v3s16 p(50,0,50); - Attribute attr; - attr.set("200"); - palist->addPoint(p, attr); - }*/ +void Map::setNodeMetadata(v3s16 p, NodeMetadata *meta) +{ + v3s16 blockpos = getNodeBlockPos(p); + v3s16 p_rel = p - blockpos*MAP_BLOCKSIZE; + MapBlock *block = getBlockNoCreateNoEx(blockpos); + if(block == NULL) + { + dstream<<"WARNING: Map::setNodeMetadata(): Block not found" + <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) { - PointAttributeList *palist = m_padb.getList("plants_amount"); - - // Back - { - v3s16 p(0,0,-100); - Attribute attr; - attr.set("0"); - palist->addPoint(p, attr); - } - - // Front right - { - v3s16 p(100,0,100); - Attribute attr; - attr.set("2.0"); - palist->addPoint(p, attr); - } - - // Front left - { - v3s16 p(-100,0,100); - Attribute attr; - attr.set("0.2"); - palist->addPoint(p, attr); - } + dstream<<"WARNING: Map::removeNodeMetadata(): Block not found" + <m_node_metadata.remove(p_rel); +} + +/* + ServerMap +*/ +ServerMap::ServerMap(std::string savedir): + Map(dout_server), + m_seed(0) +{ + + //m_chunksize = 64; + //m_chunksize = 16; // Too slow + m_chunksize = 8; // Takes a few seconds + //m_chunksize = 4; + //m_chunksize = 2; + + // TODO: Save to and load from a file + m_seed = (((u64)(myrand()%0xffff)<<0) + + ((u64)(myrand()%0xffff)<<16) + + ((u64)(myrand()%0xffff)<<32) + + ((u64)(myrand()%0xffff)<<48)); + + /* + Experimental and debug stuff + */ + + { + } + /* Try to load map; if not found, create a new one. */ @@ -1520,16 +1805,24 @@ ServerMap::ServerMap(std::string savedir, HMParams hmp, MapParams mp): } else { - // Load master heightmap - loadMasterHeightmap(); + // Load map metadata (seed, chunksize) + loadMapMeta(); - // Load sector (0,0) and throw and exception on fail + // Load chunk metadata + loadChunkMeta(); + + /*// Load sector (0,0) and throw and exception on fail if(loadSectorFull(v2s16(0,0)) == false) - throw LoadError("Failed to load sector (0,0)"); + throw LoadError("Failed to load sector (0,0)");*/ - dstream<::Iterator i = m_chunks.getIterator(); + for(; i.atEnd() == false; i++) + { + MapChunk *chunk = i.getNode()->getValue(); + delete chunk; + } } -MapSector * ServerMap::emergeSector(v2s16 p2d) +/* + Some helper functions for the map generator +*/ + +s16 find_ground_level(VoxelManipulator &vmanip, v2s16 p2d) { - DSTACK("%s: p2d=(%d,%d)", - __FUNCTION_NAME, - p2d.X, p2d.Y); - // Check that it doesn't exist already - try{ - return getSectorNoGenerate(p2d); + v3s16 em = vmanip.m_area.getExtent(); + s16 y_nodes_max = vmanip.m_area.MaxEdge.Y; + s16 y_nodes_min = vmanip.m_area.MinEdge.Y; + u32 i = vmanip.m_area.index(v3s16(p2d.X, y_nodes_max, p2d.Y)); + s16 y; + for(y=y_nodes_max; y>=y_nodes_min; y--) + { + MapNode &n = vmanip.m_data[i]; + if(content_walkable(n.d)) + break; + + vmanip.m_area.add_y(em, i, -1); } - catch(InvalidPositionException &e) + if(y >= y_nodes_min) + return y; + else + return y_nodes_min; +} + +s16 find_ground_level_clever(VoxelManipulator &vmanip, v2s16 p2d) +{ + v3s16 em = vmanip.m_area.getExtent(); + s16 y_nodes_max = vmanip.m_area.MaxEdge.Y; + s16 y_nodes_min = vmanip.m_area.MinEdge.Y; + u32 i = vmanip.m_area.index(v3s16(p2d.X, y_nodes_max, p2d.Y)); + s16 y; + for(y=y_nodes_max; y>=y_nodes_min; y--) + { + MapNode &n = vmanip.m_data[i]; + if(content_walkable(n.d) + && n.d != CONTENT_TREE + && n.d != CONTENT_LEAVES) + break; + + vmanip.m_area.add_y(em, i, -1); + } + if(y >= y_nodes_min) + return y; + else + return y_nodes_min; +} + +void make_tree(VoxelManipulator &vmanip, v3s16 p0) +{ + MapNode treenode(CONTENT_TREE); + MapNode leavesnode(CONTENT_LEAVES); + + s16 trunk_h = myrand_range(3, 6); + v3s16 p1 = p0; + for(s16 ii=0; ii leaves_d(new u8[leaves_a.getVolume()]); + Buffer leaves_d(leaves_a.getVolume()); + for(s32 i=0; i MAP_GENERATION_LIMIT / MAP_BLOCKSIZE - || p2d.Y < -MAP_GENERATION_LIMIT / MAP_BLOCKSIZE - || p2d.Y > MAP_GENERATION_LIMIT / MAP_BLOCKSIZE) - throw InvalidPositionException("emergeSector(): pos. over limit"); - - /* - Generate sector and heightmaps - */ - - // Number of heightmaps in sector in each direction - u16 hm_split = SECTOR_HEIGHTMAP_SPLIT; +/* + Noise functions. Make sure seed is mangled differently in each one. +*/ - // Heightmap side width - s16 hm_d = MAP_BLOCKSIZE / hm_split; +// Amount of trees per area in nodes +double tree_amount_2d(u64 seed, v2s16 p) +{ + double noise = noise2d_perlin( + 0.5+(float)p.X/250, 0.5+(float)p.Y/250, + seed+2, 5, 0.66); + double zeroval = -0.3; + if(noise < zeroval) + return 0; + else + return 0.04 * (noise-zeroval) / (1.0-zeroval); +} - ServerMapSector *sector = new ServerMapSector(this, p2d, hm_split); - - // Sector position on map in nodes - v2s16 nodepos2d = p2d * MAP_BLOCKSIZE; +#define AVERAGE_MUD_AMOUNT 4 - /*dstream<<"Generating sector ("<>32)+654879876, 6, 0.6); - /* - Calculate some information about local properties - */ + /*// A bit hillier one + double base2 = WATER_LEVEL - 4.0 + 40. * noise2d_perlin( + 0.5+(float)p.X/250., 0.5+(float)p.Y/250., + (seed>>27)+90340, 6, 0.69); + if(base2 > base) + base = base2;*/ +#if 1 + // Higher ground level + double higher = (double)WATER_LEVEL + 25. + 45. * noise2d_perlin( + 0.5+(float)p.X/250., 0.5+(float)p.Y/250., + seed+85039, 5, 0.69); + //higher = 30; // For debugging + + // Limit higher to at least base + if(higher < base) + higher = base; + + // Steepness factor of cliffs + double b = 1.0 + 1.0 * noise2d_perlin( + 0.5+(float)p.X/250., 0.5+(float)p.Y/250., + seed-932, 7, 0.7); + b = rangelim(b, 0.0, 1000.0); + b = pow(b, 5); + b *= 7; + b = rangelim(b, 3.0, 1000.0); + //dstream<<"b="<setLightingExpired(true); + // Lighting will be calculated + block->setLightingExpired(false); + + /* + Block gets sunlight if this is true. + + This should be set to true when the top side of a block + is completely exposed to the sky. + + Actually this doesn't matter now because the + initial lighting is done here. + */ + block->setIsUnderground(y != y_blocks_max); + } + } + } - // Get plant amount from attributes - PointAttributeList *palist = m_padb.getList("plants_amount"); - assert(palist); - /*float local_plants_amount = - palist->getNearAttr(nodepos2d).getFloat();*/ - float local_plants_amount = - palist->getInterpolatedFloat(nodepos2d); + /* + Now we have a big empty area. + + Make a ManualMapVoxelManipulator that contains this and the + neighboring chunks + */ + + ManualMapVoxelManipulator vmanip(this); + // Add the area we just generated + { + TimeTaker timer("generateChunkRaw() initialEmerge"); + vmanip.initialEmerge(bigarea_blocks_min, bigarea_blocks_max); + } + + // Clear all flags + vmanip.clearFlag(0xff); + + TimeTaker timer_generate("generateChunkRaw() generate"); + + // Maximum height of the stone surface and obstacles. + // This is used to disable dungeon generation from going too high. + s16 stone_surface_max_y = 0; /* - Generate sector heightmap + Generate general ground level to full area */ + + { + // 22ms @cs=8 + //TimeTaker timer1("ground level"); - // Loop through sub-heightmaps - for(s16 y=0; ygetGroundHeight(mhm_p+v2s16(0,0)), - m_heightmap->getGroundHeight(mhm_p+v2s16(1,0)), - m_heightmap->getGroundHeight(mhm_p+v2s16(1,1)), - m_heightmap->getGroundHeight(mhm_p+v2s16(0,1)), - }; + // Node position + v2s16 p2d = sectorpos_bigbase*MAP_BLOCKSIZE + v2s16(x,z); + + /* + Skip of already generated + */ + { + v3s16 p(p2d.X, y_nodes_min, p2d.Y); + if(vmanip.m_data[vmanip.m_area.index(p)].d != CONTENT_AIR) + continue; + } - /*dstream<<"p_in_sector=("< surface_y_f) + surface_y_f = a; + }*/ - FixedHeightmap *hm = new FixedHeightmap(&m_hwrapper, - mhm_p, hm_d); - sector->setHeightmap(p_in_sector, hm); + // Convert to integer + s16 surface_y = (s16)surface_y_f; + + // Log it + if(surface_y > stone_surface_max_y) + stone_surface_max_y = surface_y; - //TODO: Make these values configurable - //hm->generateContinued(0.0, 0.0, corners); - //hm->generateContinued(0.25, 0.2, corners); - //hm->generateContinued(0.5, 0.2, corners); - //hm->generateContinued(1.0, 0.2, corners); - //hm->generateContinued(2.0, 0.2, corners); - hm->generateContinued(2.0 * avgslope, 0.5, corners); + /* + Fill ground with stone + */ + { + // Use fast index incrementing + v3s16 em = vmanip.m_area.getExtent(); + u32 i = vmanip.m_area.index(v3s16(p2d.X, y_nodes_min, p2d.Y)); + for(s16 y=y_nodes_min; yprint(); + vmanip.m_area.add_y(em, i, 1); + } + } } + + }//timer1 /* - Generate objects + Randomize some parameters */ - core::map *objects = new core::map; - sector->setObjects(objects); + s32 stone_obstacle_count = 0; + /*s32 stone_obstacle_count = + rangelim((1.0+noise2d(m_seed+897, + sectorpos_base.X, sectorpos_base.Y))/2.0 * 30, 0, 100000);*/ + + s16 stone_obstacle_max_height = 0; + /*s16 stone_obstacle_max_height = + rangelim((1.0+noise2d(m_seed+5902, + sectorpos_base.X, sectorpos_base.Y))/2.0 * 30, 0, 100000);*/ /* - Plant some trees if there is not much slope + Loop this part, it will make stuff look older and newer nicely */ + //for(u32 i_age=0; i_age<1; i_age++) + for(u32 i_age=0; i_age<2; i_age++) + { // Aging loop + { - // Avgslope is the derivative of a hill - //float t = avgslope * avgslope; - float t = avgslope; - float a = MAP_BLOCKSIZE * m_params.plants_amount * local_plants_amount; - u32 tree_max; - //float something = 0.17*0.17; - float something = 0.3; - if(t > something) - tree_max = a / (t/something); - else - tree_max = a; + // 8ms @cs=8 + //TimeTaker timer1("stone obstacles"); + + /* + Add some random stone obstacles + */ + + for(s32 ri=0; rigetGroundHeight(v2s16(x,z))+1; - if(y < WATER_LEVEL) - continue; - objects->insert(v3s16(x, y, z), - SECTOR_OBJECT_TREE_1); + // Node position in 2d + v2s16 p2d = sectorpos_base*MAP_BLOCKSIZE + ob_place + v2s16(x,z); + + // Find stone ground level + // (ignore everything else than mud in already generated chunks) + // and mud amount over the stone level + s16 surface_y = 0; + s16 mud_amount = 0; + { + v3s16 em = vmanip.m_area.getExtent(); + u32 i = vmanip.m_area.index(v3s16(p2d.X, y_nodes_max, p2d.Y)); + s16 y; + // Go to ground level + for(y=y_nodes_max; y>=y_nodes_min; y--) + { + MapNode *n = &vmanip.m_data[i]; + /*if(content_walkable(n.d) + && n.d != CONTENT_MUD + && n.d != CONTENT_GRASS) + break;*/ + if(n->d == CONTENT_STONE) + break; + + if(n->d == CONTENT_MUD || n->d == CONTENT_GRASS) + { + mud_amount++; + /* + Change to mud because otherwise we might + be throwing mud on grass at the next + step + */ + n->d = CONTENT_MUD; + } + + vmanip.m_area.add_y(em, i, -1); + } + if(y >= y_nodes_min) + surface_y = y; + else + surface_y = y_nodes_min; + } + + + /* + Add stone on ground + */ + { + v3s16 em = vmanip.m_area.getExtent(); + s16 y_start = surface_y+1; + u32 i = vmanip.m_area.index(v3s16(p2d.X, y_start, p2d.Y)); + s16 y; + // Add stone + s16 count = 0; + for(y=y_start; y<=y_nodes_max - min_head_space; y++) + { + MapNode &n = vmanip.m_data[i]; + n.d = CONTENT_STONE; + + if(y > stone_surface_max_y) + stone_surface_max_y = y; + + count++; + if(count >= ob_size.Y) + break; + + vmanip.m_area.add_y(em, i, 1); + } + // Add mud + count = 0; + for(; y<=y_nodes_max - min_head_space; y++) + { + MapNode &n = vmanip.m_data[i]; + n.d = CONTENT_MUD; + count++; + if(count >= mud_amount) + break; + + vmanip.m_area.add_y(em, i, 1); + } + } + } } + + }//timer1 + { + // 24ms @cs=8 + //TimeTaker timer1("dungeons"); + /* - Plant some bushes if sector is pit-like + Make dungeons */ + u32 dungeons_count = relative_volume / 600000; + u32 bruises_count = relative_volume * stone_surface_max_y / 40000000; + if(stone_surface_max_y < WATER_LEVEL) + bruises_count = 0; + /*u32 dungeons_count = 0; + u32 bruises_count = 0;*/ + for(u32 jj=0; jj 0) - bush_max = (pitness*a*4); - if(bush_max > a) - bush_max = a; - u32 count = (myrand()%(bush_max+1)); - for(u32 i=0; igetGroundHeight(v2s16(x,z))+1; - if(y < WATER_LEVEL) - continue; - objects->insert(v3s16(x, y, z), - SECTOR_OBJECT_BUSH_1); + min_tunnel_diameter = 5; + max_tunnel_diameter = myrand_range(10, 20); + /*min_tunnel_diameter = MYMAX(0, stone_surface_max_y/6); + max_tunnel_diameter = myrand_range(MYMAX(0, stone_surface_max_y/6), MYMAX(0, stone_surface_max_y/2));*/ + + /*s16 tunnel_rou = rangelim(25*(0.5+1.0*noise2d(m_seed+42, + sectorpos_base.X, sectorpos_base.Y)), 0, 15);*/ + + tunnel_routepoints = 5; + } + + // Allowed route area size in nodes + v3s16 ar( + sectorpos_base_size*MAP_BLOCKSIZE, + h_blocks*MAP_BLOCKSIZE, + sectorpos_base_size*MAP_BLOCKSIZE + ); + + // Area starting point in nodes + v3s16 of( + sectorpos_base.X*MAP_BLOCKSIZE, + y_blocks_min*MAP_BLOCKSIZE, + sectorpos_base.Y*MAP_BLOCKSIZE + ); + + // Allow a bit more + //(this should be more than the maximum radius of the tunnel) + //s16 insure = 5; // Didn't work with max_d = 20 + s16 insure = 10; + s16 more = max_spread_amount - max_tunnel_diameter/2 - insure; + ar += v3s16(1,0,1) * more * 2; + of -= v3s16(1,0,1) * more; + + s16 route_y_min = 0; + // Allow half a diameter + 7 over stone surface + s16 route_y_max = -of.Y + stone_surface_max_y + max_tunnel_diameter/2 + 7; + + /*// If dungeons, don't go through surface too often + if(bruise_surface == false) + route_y_max -= myrand_range(0, max_tunnel_diameter*2);*/ + + // Limit maximum to area + route_y_max = rangelim(route_y_max, 0, ar.Y-1); + + if(bruise_surface) + { + /*// Minimum is at y=0 + route_y_min = -of.Y - 0;*/ + // Minimum is at y=max_tunnel_diameter/4 + //route_y_min = -of.Y + max_tunnel_diameter/4; + //s16 min = -of.Y + max_tunnel_diameter/4; + s16 min = -of.Y + 0; + route_y_min = myrand_range(min, min + max_tunnel_diameter); + route_y_min = rangelim(route_y_min, 0, route_y_max); + } + + /*dstream<<"route_y_min = "<= ar.X) + rp.X = ar.X; + if(rp.Y < 0) + rp.Y = 0; + else if(rp.Y >= ar.Y) + rp.Y = ar.Y; + if(rp.Z < 0) + rp.Z = 0; + else if(rp.Z >= ar.Z) + rp.Z = ar.Z; + vec = rp - orp; + + // Randomize size + s16 min_d = 0; + s16 max_d = max_vein_diameter; + s16 rs = myrand_range(min_d, max_d); + + for(float f=0; f<1.0; f+=1.0/vec.getLength()) + { + v3f fp = orp + vec * f; + v3s16 cp(fp.X, fp.Y, fp.Z); + s16 d0 = -rs/2; + s16 d1 = d0 + rs - 1; + for(s16 z0=d0; z0<=d1; z0++) + { + s16 si = rs - abs(z0); + for(s16 x0=-si; x0<=si-1; x0++) + { + s16 si2 = rs - abs(x0); + for(s16 y0=-si2+1; y0<=si2-1; y0++) + { + // Don't put mineral to every place + if(myrand()%5 != 0) + continue; + + s16 z = cp.Z + z0; + s16 y = cp.Y + y0; + s16 x = cp.X + x0; + v3s16 p(x,y,z); + /*if(isInArea(p, ar) == false) + continue;*/ + // Check only height + if(y < 0 || y >= ar.Y) + continue; + p += of; + + assert(vmanip.m_area.contains(p)); + + // Just set it to air, it will be changed to + // water afterwards + u32 i = vmanip.m_area.index(p); + MapNode *n = &vmanip.m_data[i]; + if(n->d == CONTENT_STONE) + n->param = mineral; + } + } + } + } + + orp = rp; + } + + } + + }//timer1 + { + // 15ms @cs=8 + //TimeTaker timer1("add mud"); + + /* + Add mud to the central chunk + */ + + for(s16 x=0; xd == CONTENT_GRASS) + n->d = CONTENT_MUD; + } + + /* + Add mud on ground + */ + { + s16 mudcount = 0; + v3s16 em = vmanip.m_area.getExtent(); + s16 y_start = surface_y+1; + u32 i = vmanip.m_area.index(v3s16(p2d.X, y_start, p2d.Y)); + for(s16 y=y_start; y<=y_nodes_max; y++) + { + if(mudcount >= mud_add_amount) + break; + + MapNode &n = vmanip.m_data[i]; + n.d = CONTENT_MUD; + mudcount++; + + vmanip.m_area.add_y(em, i, 1); + } } + } + + }//timer1 + { + // 340ms @cs=8 + TimeTaker timer1("flow mud"); + + /* + Flow mud away from steep edges + */ + + // Limit area by 1 because mud is flown into neighbors. + s16 mudflow_minpos = 0-max_spread_amount+1; + s16 mudflow_maxpos = sectorpos_base_size*MAP_BLOCKSIZE+max_spread_amount-2; + + // Iterate a few times + for(s16 k=0; k<3; k++) + { + + for(s16 x=mudflow_minpos; + x<=mudflow_maxpos; + x++) + for(s16 z=mudflow_minpos; + z<=mudflow_maxpos; + z++) + { + // Invert coordinates every 2nd iteration + if(k%2 == 0) + { + x = mudflow_maxpos - (x-mudflow_minpos); + z = mudflow_maxpos - (z-mudflow_minpos); + } + + // Node position in 2d + v2s16 p2d = sectorpos_base*MAP_BLOCKSIZE + v2s16(x,z); + + v3s16 em = vmanip.m_area.getExtent(); + u32 i = vmanip.m_area.index(v3s16(p2d.X, y_nodes_max, p2d.Y)); + s16 y=y_nodes_max; + + for(;; y--) + { + MapNode *n = NULL; + // Find mud + for(; y>=y_nodes_min; y--) + { + n = &vmanip.m_data[i]; + //if(content_walkable(n->d)) + // break; + if(n->d == CONTENT_MUD || n->d == CONTENT_GRASS) + break; + + vmanip.m_area.add_y(em, i, -1); + } + + // Stop if out of area + //if(vmanip.m_area.contains(i) == false) + if(y < y_nodes_min) + break; + + /*// If not mud, do nothing to it + MapNode *n = &vmanip.m_data[i]; + if(n->d != CONTENT_MUD && n->d != CONTENT_GRASS) + continue;*/ + + /* + Don't flow it if the stuff under it is not mud + */ + { + u32 i2 = i; + vmanip.m_area.add_y(em, i2, -1); + // Cancel if out of area + if(vmanip.m_area.contains(i2) == false) + continue; + MapNode *n2 = &vmanip.m_data[i2]; + if(n2->d != CONTENT_MUD && n2->d != CONTENT_GRASS) + continue; + } + + // Make it exactly mud + n->d = CONTENT_MUD; + + /*s16 recurse_count = 0; + mudflow_recurse:*/ + + v3s16 dirs4[4] = { + v3s16(0,0,1), // back + v3s16(1,0,0), // right + v3s16(0,0,-1), // front + v3s16(-1,0,0), // left + }; + + // Theck that upper is air or doesn't exist. + // Cancel dropping if upper keeps it in place + u32 i3 = i; + vmanip.m_area.add_y(em, i3, 1); + if(vmanip.m_area.contains(i3) == true + && content_walkable(vmanip.m_data[i3].d) == true) + { + continue; + } + + // Drop mud on side + + for(u32 di=0; di<4; di++) + { + v3s16 dirp = dirs4[di]; + u32 i2 = i; + // Move to side + vmanip.m_area.add_p(em, i2, dirp); + // Fail if out of area + if(vmanip.m_area.contains(i2) == false) + continue; + // Check that side is air + MapNode *n2 = &vmanip.m_data[i2]; + if(content_walkable(n2->d)) + continue; + // Check that under side is air + vmanip.m_area.add_y(em, i2, -1); + if(vmanip.m_area.contains(i2) == false) + continue; + n2 = &vmanip.m_data[i2]; + if(content_walkable(n2->d)) + continue; + /*// Check that under that is air (need a drop of 2) + vmanip.m_area.add_y(em, i2, -1); + if(vmanip.m_area.contains(i2) == false) + continue; + n2 = &vmanip.m_data[i2]; + if(content_walkable(n2->d)) + continue;*/ + // Loop further down until not air + do{ + vmanip.m_area.add_y(em, i2, -1); + // Fail if out of area + if(vmanip.m_area.contains(i2) == false) + continue; + n2 = &vmanip.m_data[i2]; + }while(content_walkable(n2->d) == false); + // Loop one up so that we're in air + vmanip.m_area.add_y(em, i2, 1); + n2 = &vmanip.m_data[i2]; + + // Move mud to new place + *n2 = *n; + // Set old place to be air + *n = MapNode(CONTENT_AIR); + + // Done + break; + } + } + } + + } + + }//timer1 + { + // 50ms @cs=8 + //TimeTaker timer1("add water"); + + /* + Add water to the central chunk (and a bit more) + */ + + for(s16 x=0-max_spread_amount; + x WATER_LEVEL) + continue;*/ + + /* + Add water on ground + */ + { + v3s16 em = vmanip.m_area.getExtent(); + u8 light = LIGHT_MAX; + // Start at global water surface level + s16 y_start = WATER_LEVEL; + u32 i = vmanip.m_area.index(v3s16(p2d.X, y_start, p2d.Y)); + MapNode *n = &vmanip.m_data[i]; + + /*// Add first one to transforming liquid queue, if water + if(n->d == CONTENT_WATER || n->d == CONTENT_WATERSOURCE) + { + v3s16 p = v3s16(p2d.X, y_start, p2d.Y); + m_transforming_liquid.push_back(p); + }*/ + + for(s16 y=y_start; y>=y_nodes_min; y--) + { + n = &vmanip.m_data[i]; + + // Stop when there is no water and no air + if(n->d != CONTENT_AIR && n->d != CONTENT_WATERSOURCE + && n->d != CONTENT_WATER) + { + /*// Add bottom one to transforming liquid queue + vmanip.m_area.add_y(em, i, 1); + n = &vmanip.m_data[i]; + if(n->d == CONTENT_WATER || n->d == CONTENT_WATERSOURCE) + { + v3s16 p = v3s16(p2d.X, y, p2d.Y); + m_transforming_liquid.push_back(p); + }*/ + + break; + } + + // Make water only not in dungeons + if(!(vmanip.m_flags[i]&VMANIP_FLAG_DUNGEON)) + { + n->d = CONTENT_WATERSOURCE; + //n->setLight(LIGHTBANK_DAY, light); + + // Add to transforming liquid queue (in case it'd + // start flowing) + v3s16 p = v3s16(p2d.X, y, p2d.Y); + m_transforming_liquid.push_back(p); + } + + // Next one + vmanip.m_area.add_y(em, i, -1); + if(light > 0) + light--; + } + } + + } + + }//timer1 + + } // Aging loop + + { + //TimeTaker timer1("convert mud to sand"); + + /* + Convert mud to sand + */ + + //s16 mud_add_amount = myrand_range(2, 4); + //s16 mud_add_amount = 0; + + /*for(s16 x=0; x -0.15); + + if(have_sand == false) + continue; + + // Find ground level + s16 surface_y = find_ground_level_clever(vmanip, p2d); + + if(surface_y > WATER_LEVEL + 2) + continue; + + { + v3s16 em = vmanip.m_area.getExtent(); + s16 y_start = surface_y; + u32 i = vmanip.m_area.index(v3s16(p2d.X, y_start, p2d.Y)); + u32 not_sand_counter = 0; + for(s16 y=y_start; y>=y_nodes_min; y--) + { + MapNode *n = &vmanip.m_data[i]; + if(n->d == CONTENT_MUD || n->d == CONTENT_GRASS) + { + n->d = CONTENT_SAND; + } + else + { + not_sand_counter++; + if(not_sand_counter > 3) + break; + } + + vmanip.m_area.add_y(em, i, -1); + } + } + + } + + }//timer1 + { + // 1ms @cs=8 + //TimeTaker timer1("generate trees"); + + /* + Generate some trees + */ + { + // Divide area into parts + s16 div = 8; + s16 sidelen = sectorpos_base_size*MAP_BLOCKSIZE / div; + double area = sidelen * sidelen; + for(s16 x0=0; x0 y_nodes_max - 6) + continue; + v3s16 p(x,y,z); + /* + Trees grow only on mud and grass + */ + { + u32 i = vmanip.m_area.index(v3s16(p)); + MapNode *n = &vmanip.m_data[i]; + if(n->d != CONTENT_MUD && n->d != CONTENT_GRASS) + continue; + } + p.Y++; + // Make a tree + make_tree(vmanip, p); + } + } + /*u32 tree_max = relative_area / 60; + //u32 count = myrand_range(0, tree_max); + for(u32 i=0; i=y_nodes_min; y--) + { + MapNode &n = vmanip.m_data[i]; + if(n.d != CONTENT_AIR + && n.d != CONTENT_LEAVES) + break; + vmanip.m_area.add_y(em, i, -1); + } + if(y >= y_nodes_min) + surface_y = y; + else + surface_y = y_nodes_min; + } + + u32 i = vmanip.m_area.index(p2d.X, surface_y, p2d.Y); + MapNode *n = &vmanip.m_data[i]; + if(n->d == CONTENT_MUD) + n->d = CONTENT_GRASS; + } + + }//timer1 + + /* + Initial lighting (sunlight) + */ + + core::map light_sources; + + { + // 750ms @cs=8, can't optimize more + TimeTaker timer1("initial lighting"); + +#if 0 + /* + Go through the edges and add all nodes that have light to light_sources + */ + + // Four edges + for(s16 i=0; i<4; i++) + // Edge length + for(s16 j=lighting_min_d; + j<=lighting_max_d; + j++) + { + s16 x; + s16 z; + // +-X + if(i == 0 || i == 1) + { + x = (i==0) ? lighting_min_d : lighting_max_d; + if(i == 0) + z = lighting_min_d; + else + z = lighting_max_d; + } + // +-Z + else + { + z = (i==0) ? lighting_min_d : lighting_max_d; + if(i == 0) + x = lighting_min_d; + else + x = lighting_max_d; + } + + // Node position in 2d + v2s16 p2d = sectorpos_base*MAP_BLOCKSIZE + v2s16(x,z); + + { + v3s16 em = vmanip.m_area.getExtent(); + s16 y_start = y_nodes_max; + u32 i = vmanip.m_area.index(v3s16(p2d.X, y_start, p2d.Y)); + for(s16 y=y_start; y>=y_nodes_min; y--) + { + MapNode *n = &vmanip.m_data[i]; + if(n->getLight(LIGHTBANK_DAY) != 0) + { + light_sources.insert(v3s16(p2d.X, y, p2d.Y), true); + } + //NOTE: This is broken, at least the index has to + // be incremented + } + } + } +#endif + +#if 1 + /* + Go through the edges and apply sunlight to them, not caring + about neighbors + */ + + // Four edges + for(s16 i=0; i<4; i++) + // Edge length + for(s16 j=lighting_min_d; + j<=lighting_max_d; + j++) + { + s16 x; + s16 z; + // +-X + if(i == 0 || i == 1) + { + x = (i==0) ? lighting_min_d : lighting_max_d; + if(i == 0) + z = lighting_min_d; + else + z = lighting_max_d; + } + // +-Z + else + { + z = (i==0) ? lighting_min_d : lighting_max_d; + if(i == 0) + x = lighting_min_d; + else + x = lighting_max_d; + } + + // Node position in 2d + v2s16 p2d = sectorpos_base*MAP_BLOCKSIZE + v2s16(x,z); + + // Loop from top to down + { + u8 light = LIGHT_SUN; + v3s16 em = vmanip.m_area.getExtent(); + s16 y_start = y_nodes_max; + u32 i = vmanip.m_area.index(v3s16(p2d.X, y_start, p2d.Y)); + for(s16 y=y_start; y>=y_nodes_min; y--) + { + MapNode *n = &vmanip.m_data[i]; + if(light_propagates_content(n->d) == false) + { + light = 0; + } + else if(light != LIGHT_SUN + || sunlight_propagates_content(n->d) == false) + { + if(light > 0) + light--; + } + + n->setLight(LIGHTBANK_DAY, light); + n->setLight(LIGHTBANK_NIGHT, 0); + + if(light != 0) + { + // Insert light source + light_sources.insert(v3s16(p2d.X, y, p2d.Y), true); + } + + // Increment index by y + vmanip.m_area.add_y(em, i, -1); + } + } + } +#endif + + /*for(s16 x=0; x=y_nodes_min; y--) + { + MapNode *n = &vmanip.m_data[i]; + + if(light_propagates_content(n->d) == false) + { + light = 0; + } + else if(light != LIGHT_SUN + || sunlight_propagates_content(n->d) == false) + { + if(light > 0) + light--; + } + + // This doesn't take much time + if(add_to_sources == false) + { + /* + Check sides. If side is not air or water, start + adding to light_sources. + */ + v3s16 dirs4[4] = { + v3s16(0,0,1), // back + v3s16(1,0,0), // right + v3s16(0,0,-1), // front + v3s16(-1,0,0), // left + }; + for(u32 di=0; di<4; di++) + { + v3s16 dirp = dirs4[di]; + u32 i2 = i; + vmanip.m_area.add_p(em, i2, dirp); + MapNode *n2 = &vmanip.m_data[i2]; + if( + n2->d != CONTENT_AIR + && n2->d != CONTENT_WATERSOURCE + && n2->d != CONTENT_WATER + ){ + add_to_sources = true; + break; + } + } + } + + n->setLight(LIGHTBANK_DAY, light); + n->setLight(LIGHTBANK_NIGHT, 0); + + // This doesn't take much time + if(light != 0 && add_to_sources) + { + // Insert light source + light_sources.insert(v3s16(p2d.X, y, p2d.Y), true); + } + + // Increment index by y + vmanip.m_area.add_y(em, i, -1); + } + } + } +#endif + +#if 0 + for(s16 x=lighting_min_d+1; + x<=lighting_max_d-1; + x++) + for(s16 z=lighting_min_d+1; + z<=lighting_max_d-1; + z++) + { + // Node position in 2d + v2s16 p2d = sectorpos_base*MAP_BLOCKSIZE + v2s16(x,z); + + /* + Apply initial sunlight + */ + { + u8 light = LIGHT_SUN; + v3s16 em = vmanip.m_area.getExtent(); + s16 y_start = y_nodes_max; + u32 i = vmanip.m_area.index(v3s16(p2d.X, y_start, p2d.Y)); + for(s16 y=y_start; y>=y_nodes_min; y--) + { + MapNode *n = &vmanip.m_data[i]; + + if(light_propagates_content(n->d) == false) + { + light = 0; + } + else if(light != LIGHT_SUN + || sunlight_propagates_content(n->d) == false) + { + if(light > 0) + light--; + } + + n->setLight(LIGHTBANK_DAY, light); + n->setLight(LIGHTBANK_NIGHT, 0); + + // This doesn't take much time + if(light != 0) + { + // Insert light source + light_sources.insert(v3s16(p2d.X, y, p2d.Y), true); + } + + // Increment index by y + vmanip.m_area.add_y(em, i, -1); + } + } + } +#endif + + }//timer1 + + // Spread light around + { + TimeTaker timer("generateChunkRaw() spreadLight"); + vmanip.spreadLight(LIGHTBANK_DAY, light_sources); + } + + /* + Generation ended + */ + + timer_generate.stop(); + + /* + Blit generated stuff to map + */ + { + // 70ms @cs=8 + //TimeTaker timer("generateChunkRaw() blitBackAll"); + vmanip.blitBackAll(&changed_blocks); + } + + /* + Update day/night difference cache of the MapBlocks + */ + { + for(core::map::Iterator i = changed_blocks.getIterator(); + i.atEnd() == false; i++) + { + MapBlock *block = i.getNode()->getValue(); + block->updateDayNightDiff(); + } + } + + + /* + Create chunk metadata + */ + + for(s16 x=-1; x<=1; x++) + for(s16 y=-1; y<=1; y++) + { + v2s16 chunkpos0 = chunkpos + v2s16(x,y); + // Add chunk meta information + MapChunk *chunk = getChunk(chunkpos0); + if(chunk == NULL) + { + chunk = new MapChunk(); + m_chunks.insert(chunkpos0, chunk); + } + //chunk->setIsVolatile(true); + if(chunk->getGenLevel() > GENERATED_PARTLY) + chunk->setGenLevel(GENERATED_PARTLY); + } + + /* + Set central chunk non-volatile + */ + MapChunk *chunk = getChunk(chunkpos); + assert(chunk); + // Set non-volatile + //chunk->setIsVolatile(false); + chunk->setGenLevel(GENERATED_FULLY); + + /* + Save changed parts of map + */ + save(true); + + /* + Return central chunk (which was requested) + */ + return chunk; +} + +MapChunk* ServerMap::generateChunk(v2s16 chunkpos1, + core::map &changed_blocks) +{ + dstream<<"generateChunk(): Generating chunk " + <<"("<getGenLevel() == GENERATED_FULLY) + continue; + generateChunkRaw(chunkpos0, changed_blocks); + } + + assert(chunkNonVolatile(chunkpos1)); + + MapChunk *chunk = getChunk(chunkpos1); + return chunk; +} + +ServerMapSector * ServerMap::createSector(v2s16 p2d) +{ + DSTACK("%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) + { + ServerMapSector *sector = (ServerMapSector*)getSectorNoGenerateNoEx(p2d); + if(sector == NULL) + { + dstream<<"ServerMap::createSector(): loadSectorFull didn't make a sector"< 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); + + // Sector position on map in nodes + v2s16 nodepos2d = p2d * MAP_BLOCKSIZE; + + /* + Insert to container + */ + m_sectors.insert(p2d, sector); + + return sector; +} + +MapSector * ServerMap::emergeSector(v2s16 p2d, + core::map &changed_blocks) +{ + DSTACK("%s: p2d=(%d,%d)", + __FUNCTION_NAME, + p2d.X, p2d.Y); + + /* + Check chunk status + */ + v2s16 chunkpos = sector_to_chunk(p2d); + /*bool chunk_nonvolatile = false; + MapChunk *chunk = getChunk(chunkpos); + if(chunk && chunk->getIsVolatile() == false) + chunk_nonvolatile = true;*/ + bool chunk_nonvolatile = chunkNonVolatile(chunkpos); + + /* + If chunk is not fully generated, generate chunk + */ + if(chunk_nonvolatile == false) + { + // Generate chunk and neighbors + generateChunk(chunkpos, changed_blocks); + } + + /* + Return sector if it exists now + */ + MapSector *sector = getSectorNoGenerateNoEx(p2d); + if(sector != NULL) + return sector; + /* - Add ravine (randomly) + Try to load it from disk */ - if(m_params.ravines_amount != 0) + if(loadSectorFull(p2d) == true) { - if(myrand()%(s32)(200.0 / m_params.ravines_amount) == 0) + MapSector *sector = getSectorNoGenerateNoEx(p2d); + if(sector == NULL) { - s16 s = 6; - s16 x = myrand()%(MAP_BLOCKSIZE-s*2-1)+s; - s16 z = myrand()%(MAP_BLOCKSIZE-s*2-1)+s; - /*s16 x = 8; - s16 z = 8;*/ - s16 y = sector->getGroundHeight(v2s16(x,z))+1; - objects->insert(v3s16(x, y, z), - SECTOR_OBJECT_RAVINE); + dstream<<"ServerMap::emergeSector(): loadSectorFull didn't make a sector"< &changed_blocks, core::map &lighting_invalidated_blocks ) { - DSTACK("%s: p=(%d,%d,%d), only_from_disk=%d", + DSTACK("%s: p=(%d,%d,%d)", __FUNCTION_NAME, - p.X, p.Y, p.Z, only_from_disk); - - /*dstream<<"ServerMap::emergeBlock(): " + p.X, p.Y, p.Z); + + /*dstream<<"generateBlock(): " <<"("<unDummify(); } - u8 water_material = CONTENT_WATER; - if(g_settings.getBool("endless_water")) - water_material = CONTENT_OCEAN; + u8 water_material = CONTENT_WATERSOURCE; s32 lowest_ground_y = 32767; s32 highest_ground_y = -32768; - // DEBUG - //sector->printHeightmaps(); - for(s16 z0=0; z0 highest_ground_y) highest_ground_y = surface_y; - s32 surface_depth = 0; + s32 surface_depth = AVERAGE_MUD_AMOUNT; - float slope = sector->getSlope(v2s16(x0,z0)).getLength(); - - //float min_slope = 0.45; - //float max_slope = 0.85; - float min_slope = 0.60; - float max_slope = 1.20; - float min_slope_depth = 5.0; - float max_slope_depth = 0; - - if(slope < min_slope) - surface_depth = min_slope_depth; - else if(slope > max_slope) - surface_depth = max_slope_depth; - else - surface_depth = (1.-(slope-min_slope)/max_slope) * min_slope_depth; - for(s16 y0=0; y0getInterpolatedFloat(nodepos2d); + + //dstream<<"generateBlock(): Getting local attributes"<getInterpolatedFloat(nodepos2d); + } +#endif + + //dstream<<"generateBlock(): Done"<setIsUnderground(completely_underground); @@ -2316,7 +4266,7 @@ MapBlock * ServerMap::emergeBlock( Force lighting update if some part of block is partly underground and has caves. */ - /*if(some_part_underground && !completely_underground && has_caves) + /*if(some_part_underground && !completely_underground && has_dungeons) { //dstream<<"Half-ground caves"<getPos()] = block; @@ -2336,9 +4286,9 @@ MapBlock * ServerMap::emergeBlock( /* Add meseblocks */ - for(s16 i=0; i< underground_level/4 + 1; i++) + for(s16 i=0; igetNode(cp).d)) - if(block->getNode(cp).d == CONTENT_STONE) - if(myrand()%8 == 0) - block->setNode(cp, n); - - for(u16 i=0; i<26; i++) + for(u16 i=0; i<27; i++) { - //if(is_ground_content(block->getNode(cp+g_26dirs[i]).d)) - if(block->getNode(cp+g_26dirs[i]).d == CONTENT_STONE) + if(block->getNode(cp+g_27dirs[i]).d == CONTENT_STONE) if(myrand()%8 == 0) - block->setNode(cp+g_26dirs[i], n); + block->setNode(cp+g_27dirs[i], n); } } } @@ -2367,7 +4311,7 @@ MapBlock * ServerMap::emergeBlock( /* Add coal */ - u16 coal_amount = 30.0 * g_settings.getFloat("coal_amount"); + u16 coal_amount = 30; u16 coal_rareness = 60 / coal_amount; if(coal_rareness == 0) coal_rareness = 1; @@ -2384,21 +4328,47 @@ MapBlock * ServerMap::emergeBlock( ); MapNode n; - n.d = CONTENT_COALSTONE; + n.d = CONTENT_STONE; + n.param = MINERAL_COAL; - //dstream<<"Adding coalstone"<getNode(cp).d)) - if(block->getNode(cp).d == CONTENT_STONE) - if(myrand()%8 == 0) - block->setNode(cp, n); + for(u16 i=0; i<27; i++) + { + if(block->getNode(cp+g_27dirs[i]).d == CONTENT_STONE) + if(myrand()%8 == 0) + block->setNode(cp+g_27dirs[i], n); + } + } + } + + /* + Add iron + */ + //TODO: change to iron_amount or whatever + u16 iron_amount = 15; + u16 iron_rareness = 60 / iron_amount; + if(iron_rareness == 0) + iron_rareness = 1; + if(myrand()%iron_rareness == 0) + { + u16 a = myrand() % 16; + u16 amount = iron_amount * a*a*a / 1000; + for(s16 i=0; igetNode(cp+g_26dirs[i]).d)) - if(block->getNode(cp+g_26dirs[i]).d == CONTENT_STONE) + if(block->getNode(cp+g_27dirs[i]).d == CONTENT_STONE) if(myrand()%8 == 0) - block->setNode(cp+g_26dirs[i], n); + block->setNode(cp+g_27dirs[i], n); } } } @@ -2421,7 +4391,7 @@ MapBlock * ServerMap::emergeBlock( //if(!is_ground_content(block->getNode(cp).d)) if(1) { - RatObject *obj = new RatObject(NULL, -1, intToFloat(cp)); + RatObject *obj = new RatObject(NULL, -1, intToFloat(cp, BS)); block->addObject(obj); } } @@ -2432,239 +4402,218 @@ MapBlock * ServerMap::emergeBlock( */ sector->insertBlock(block); + // Lighting is invalid after generation. + block->setLightingExpired(true); + +#if 0 /* - Sector object stuff + Debug information */ - - // An y-wise container of changed blocks - core::map changed_blocks_sector; + dstream + <<"lighting_invalidated_blocks.size()" + <<", has_dungeons" + <<", completely_ug" + <<", some_part_ug" + <<" "< *objects = sector->getObjects(); - core::list objects_to_remove; - for(core::map::Iterator i = objects->getIterator(); - i.atEnd() == false; i++) - { - v3s16 p = i.getNode()->getKey(); - v2s16 p2d(p.X,p.Z); - u8 d = i.getNode()->getValue(); - - // Ground level point (user for stuff that is on ground) - v3s16 gp = p; - bool ground_found = true; - - // Search real ground level - try{ - for(;;) - { - MapNode n = sector->getNode(gp); - - // If not air, go one up and continue to placing the tree - if(n.d != CONTENT_AIR) - { - gp += v3s16(0,1,0); - break; - } + 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. - // If air, go one down - gp += v3s16(0,-1,0); - } - }catch(InvalidPositionException &e) - { - // Ground not found. - ground_found = false; - // This is most close to ground - gp += v3s16(0,1,0); - } + 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) + { + dstream<<"createBlock: createSector() failed"<isValidArea(p + v3s16(0,0,0), - p + v3s16(0,0,0), &changed_blocks_sector)) - { - MapNode n; - n.d = CONTENT_TORCH; - sector->setNode(p, n); - objects_to_remove.push_back(p); - } - } - else if(d == SECTOR_OBJECT_TREE_1) - { - if(ground_found == false) - continue; + MapBlock *block = sector->getBlockNoCreateNoEx(block_y); + if(block) + return block; + // Create blank + block = sector->createBlankBlock(block_y); + return block; +} - v3s16 p_min = gp + v3s16(-1,0,-1); - v3s16 p_max = gp + v3s16(1,5,1); - if(sector->isValidArea(p_min, p_max, - &changed_blocks_sector)) - { - MapNode n; - n.d = CONTENT_TREE; - sector->setNode(gp+v3s16(0,0,0), n); - sector->setNode(gp+v3s16(0,1,0), n); - sector->setNode(gp+v3s16(0,2,0), n); - sector->setNode(gp+v3s16(0,3,0), n); - - n.d = CONTENT_LEAVES; - - if(rand()%4!=0) sector->setNode(gp+v3s16(0,5,0), n); - - if(rand()%3!=0) sector->setNode(gp+v3s16(-1,5,0), n); - if(rand()%3!=0) sector->setNode(gp+v3s16(1,5,0), n); - if(rand()%3!=0) sector->setNode(gp+v3s16(0,5,-1), n); - if(rand()%3!=0) sector->setNode(gp+v3s16(0,5,1), n); - /*if(rand()%3!=0) sector->setNode(gp+v3s16(1,5,1), n); - if(rand()%3!=0) sector->setNode(gp+v3s16(-1,5,1), n); - if(rand()%3!=0) sector->setNode(gp+v3s16(-1,5,-1), n); - if(rand()%3!=0) sector->setNode(gp+v3s16(1,5,-1), n);*/ - - sector->setNode(gp+v3s16(0,4,0), n); - - sector->setNode(gp+v3s16(-1,4,0), n); - sector->setNode(gp+v3s16(1,4,0), n); - sector->setNode(gp+v3s16(0,4,-1), n); - sector->setNode(gp+v3s16(0,4,1), n); - sector->setNode(gp+v3s16(1,4,1), n); - sector->setNode(gp+v3s16(-1,4,1), n); - sector->setNode(gp+v3s16(-1,4,-1), n); - sector->setNode(gp+v3s16(1,4,-1), n); - - sector->setNode(gp+v3s16(-1,3,0), n); - sector->setNode(gp+v3s16(1,3,0), n); - sector->setNode(gp+v3s16(0,3,-1), n); - sector->setNode(gp+v3s16(0,3,1), n); - sector->setNode(gp+v3s16(1,3,1), n); - sector->setNode(gp+v3s16(-1,3,1), n); - sector->setNode(gp+v3s16(-1,3,-1), n); - sector->setNode(gp+v3s16(1,3,-1), n); - - if(rand()%3!=0) sector->setNode(gp+v3s16(-1,2,0), n); - if(rand()%3!=0) sector->setNode(gp+v3s16(1,2,0), n); - if(rand()%3!=0) sector->setNode(gp+v3s16(0,2,-1), n); - if(rand()%3!=0) sector->setNode(gp+v3s16(0,2,1), n); - /*if(rand()%3!=0) sector->setNode(gp+v3s16(1,2,1), n); - if(rand()%3!=0) sector->setNode(gp+v3s16(-1,2,1), n); - if(rand()%3!=0) sector->setNode(gp+v3s16(-1,2,-1), n); - if(rand()%3!=0) sector->setNode(gp+v3s16(1,2,-1), n);*/ - - // Objects are identified by wanted position - objects_to_remove.push_back(p); - - // Lighting has to be recalculated for this one. - sector->getBlocksInArea(p_min, p_max, - lighting_invalidated_blocks); - } - } - else if(d == SECTOR_OBJECT_BUSH_1) - { - if(ground_found == false) - continue; - - if(sector->isValidArea(gp + v3s16(0,0,0), - gp + v3s16(0,0,0), &changed_blocks_sector)) - { - MapNode n; - n.d = CONTENT_LEAVES; - sector->setNode(gp+v3s16(0,0,0), n); - - // Objects are identified by wanted position - objects_to_remove.push_back(p); - } - } - else if(d == SECTOR_OBJECT_RAVINE) - { - s16 maxdepth = -20; - v3s16 p_min = p + v3s16(-6,maxdepth,-6); - v3s16 p_max = p + v3s16(6,6,6); - if(sector->isValidArea(p_min, p_max, - &changed_blocks_sector)) - { - MapNode n; - n.d = CONTENT_STONE; - MapNode n2; - n2.d = CONTENT_AIR; - s16 depth = maxdepth + (myrand()%10); - s16 z = 0; - s16 minz = -6 - (-2); - s16 maxz = 6 -1; - for(s16 x=-6; x<=6; x++) - { - z += -1 + (myrand()%3); - if(z < minz) - z = minz; - if(z > maxz) - z = maxz; - for(s16 y=depth+(myrand()%2); y<=6; y++) - { - /*std::cout<<"("<getNode(p2).d) - && !is_mineral(sector->getNode(p2).d)) - sector->setNode(p2, n); - } - { - v3s16 p2 = p + v3s16(x,y,z-1); - if(is_ground_content(sector->getNode(p2).d) - && !is_mineral(sector->getNode(p2).d)) - sector->setNode(p2, n2); - } - { - v3s16 p2 = p + v3s16(x,y,z+0); - if(is_ground_content(sector->getNode(p2).d) - && !is_mineral(sector->getNode(p2).d)) - sector->setNode(p2, n2); - } - { - v3s16 p2 = p + v3s16(x,y,z+1); - if(is_ground_content(sector->getNode(p2).d) - && !is_mineral(sector->getNode(p2).d)) - sector->setNode(p2, n); - } +MapBlock * ServerMap::emergeBlock( + v3s16 p, + bool only_from_disk, + core::map &changed_blocks, + core::map &lighting_invalidated_blocks +) +{ + DSTACK("%s: p=(%d,%d,%d), only_from_disk=%d", + __FUNCTION_NAME, + p.X, p.Y, p.Z, only_from_disk); + + /* + Do not generate 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("emergeBlock(): 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. + */ + ServerMapSector *sector; + try{ + sector = (ServerMapSector*)emergeSector(p2d, changed_blocks); + assert(sector->getId() == MAPSECTOR_SERVER); + } + catch(InvalidPositionException &e) + { + dstream<<"emergeBlock: emergeSector() failed: " + <getNode(p+v3s16(x,y,z+1)).solidness()==2) - //if(p.Y+y <= sector->getGroundHeight(p2d+v2s16(x,z-2))+0.5) - } - } - - objects_to_remove.push_back(p); - - // Lighting has to be recalculated for this one. - sector->getBlocksInArea(p_min, p_max, - lighting_invalidated_blocks); - } - } - else - { - dstream<<"ServerMap::emergeBlock(): " - "Invalid heightmap object" - <getBlockNoCreateNoEx(block_y); + + if(block == NULL) + { + does_not_exist = true; + } + else if(block->isDummy() == true) + { + does_not_exist = true; + } + else if(block->getLightingExpired()) + { + lighting_expired = true; + } + else + { + // Valid block + //dstream<<"emergeBlock(): Returning already valid block"< making one"<::Iterator i = objects_to_remove.begin(); - i != objects_to_remove.end(); i++) + if(lighting_expired) { - objects->remove(*i); + lighting_invalidated_blocks.insert(p, block); } /* @@ -2675,36 +4624,60 @@ MapBlock * ServerMap::emergeBlock( core::map light_sources; bool black_air_left = false; bool bottom_invalid = - block->propagateSunlight(light_sources, true, &black_air_left); + block->propagateSunlight(light_sources, true, + &black_air_left, true); // If sunlight didn't reach everywhere and part of block is // above ground, lighting has to be properly updated - if(black_air_left && some_part_underground) + //if(black_air_left && some_part_underground) + if(black_air_left) + { + lighting_invalidated_blocks[block->getPos()] = block; + } + + if(bottom_invalid) { lighting_invalidated_blocks[block->getPos()] = block; } } + + return block; +} +s16 ServerMap::findGroundLevel(v2s16 p2d) +{ /* - Translate sector's changed blocks to global changed blocks + Uh, just do something random... */ - - for(core::map::Iterator - i = changed_blocks_sector.getIterator(); - i.atEnd() == false; i++) + // 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--) { - MapBlock *block = i.getNode()->getValue(); - - changed_blocks.insert(block->getPos(), block); + MapNode n = getNodeNoEx(p); + if(n.d != CONTENT_IGNORE) + break; } - - if(HAXMODE) + if(p.Y == min) + goto plan_b; + // If this node is not air, go to plan b + if(getNodeNoEx(p).d != CONTENT_AIR) + goto plan_b; + // Search existing walkable and return it + for(; p.Y>min; p.Y--) { - // Don't calculate lighting at all - lighting_invalidated_blocks.clear(); + MapNode n = getNodeNoEx(p); + if(content_walkable(n.d) && n.d != CONTENT_IGNORE) + return p.Y; } - - return block; + // Move to plan b +plan_b: + /* + Plan B: Get from map generator perlin noise function + */ + double level = base_rock_level_2d(m_seed, p2d); + return (s16)level; } void ServerMap::createDir(std::string path) @@ -2758,12 +4731,6 @@ v3s16 ServerMap::getBlockPos(std::string sectordir, std::string blockfile) return v3s16(p2d.X, y, p2d.Y); } -// Debug helpers -#define ENABLE_SECTOR_SAVING 1 -#define ENABLE_SECTOR_LOADING 1 -#define ENABLE_BLOCK_SAVING 1 -#define ENABLE_BLOCK_LOADING 1 - void ServerMap::save(bool only_changed) { DSTACK(__FUNCTION_NAME); @@ -2777,7 +4744,8 @@ void ServerMap::save(bool only_changed) dstream<getValue(); assert(sector->getId() == MAPSECTOR_SERVER); - - if(ENABLE_SECTOR_SAVING) + + if(sector->differs_from_disk || only_changed == false) { - if(sector->differs_from_disk || only_changed == false) - { - saveSectorMeta(sector); - sector_meta_count++; - } + saveSectorMeta(sector); + sector_meta_count++; } - if(ENABLE_BLOCK_SAVING) + core::list blocks; + sector->getBlocks(blocks); + core::list::Iterator j; + for(j=blocks.begin(); j!=blocks.end(); j++) { - core::list blocks; - sector->getBlocks(blocks); - core::list::Iterator j; - for(j=blocks.begin(); j!=blocks.end(); j++) + MapBlock *block = *j; + if(block->getChangedFlag() || only_changed == false) { - MapBlock *block = *j; - if(block->getChangedFlag() || only_changed == false) - { - saveBlock(block); - block_count++; - } + saveBlock(block); + block_count++; + + /*dstream<<"ServerMap: Written block (" + <getPos().X<<"," + <getPos().Y<<"," + <getPos().Z<<")" + < list = fs::GetDirListing(m_savedir+"/sectors/"); @@ -2871,72 +4840,211 @@ void ServerMap::loadAll() // This catches unknown crap in directory } - if(ENABLE_BLOCK_LOADING) + std::vector list2 = fs::GetDirListing + (m_savedir+"/sectors/"+i->name); + std::vector::iterator i2; + for(i2=list2.begin(); i2!=list2.end(); i2++) { - std::vector list2 = fs::GetDirListing - (m_savedir+"/sectors/"+i->name); - std::vector::iterator i2; - for(i2=list2.begin(); i2!=list2.end(); i2++) + // We want files + if(i2->dir) + continue; + try{ + loadBlock(i->name, i2->name, sector); + } + catch(InvalidFilenameException &e) { - // We want files - if(i2->dir) - continue; - try{ - loadBlock(i->name, i2->name, sector); - } - catch(InvalidFilenameException &e) - { - // This catches unknown crap in directory - } + // This catches unknown crap in directory } } } dstream< hmdata = m_heightmap->serialize(version); - /* - [0] u8 serialization version - [1] X master heightmap - */ - u32 fullsize = 1 + hmdata.getSize(); - SharedBuffer data(fullsize); + //u8 version = SER_FMT_VER_HIGHEST; +} - data[0] = version; - memcpy(&data[1], *hmdata, hmdata.getSize()); +void ServerMap::loadMasterHeightmap() +{ + DSTACK(__FUNCTION_NAME); + + dstream<<"DEPRECATED: "<<__FUNCTION_NAME<serialize(o, version); } -void ServerMap::loadMasterHeightmap() +void ServerMap::loadMapMeta() +{ + DSTACK(__FUNCTION_NAME); + + dstream<<"INFO: ServerMap::loadMapMeta(): Loading chunk metadata" + <::Iterator + i = m_chunks.getIterator(); + i.atEnd()==false; i++) + { + v2s16 p = i.getNode()->getKey(); + MapChunk *chunk = i.getNode()->getValue(); + // Write position + writeV2S16(buf, p); + os.write((char*)buf, 4); + // Write chunk data + chunk->serialize(os, version); + } +} + +void ServerMap::loadChunkMeta() { DSTACK(__FUNCTION_NAME); - std::string fullpath = m_savedir + "/master_heightmap"; + + dstream<<"INFO: ServerMap::loadChunkMeta(): Loading chunk metadata" + <deSerialize(is, version); + m_chunks.insert(p, chunk); + } } void ServerMap::saveSectorMeta(ServerMapSector *sector) @@ -2951,10 +5059,10 @@ void ServerMap::saveSectorMeta(ServerMapSector *sector) std::string dir = getSectorDir(pos); createDir(dir); - std::string fullpath = dir + "/heightmap"; + std::string fullpath = dir + "/meta"; std::ofstream o(fullpath.c_str(), std::ios_base::binary); if(o.good() == false) - throw FileNotGoodException("Cannot open master heightmap"); + throw FileNotGoodException("Cannot open sector metafile"); sector->serialize(o, version); @@ -2968,13 +5076,13 @@ MapSector* ServerMap::loadSectorMeta(std::string dirname) v2s16 p2d = getSectorPos(dirname); std::string dir = m_savedir + "/sectors/" + dirname; - std::string fullpath = dir + "/heightmap"; + std::string fullpath = dir + "/meta"; std::ifstream is(fullpath.c_str(), std::ios_base::binary); if(is.good() == false) - throw FileNotGoodException("Cannot open sector heightmap"); + throw FileNotGoodException("Cannot open sector metafile"); ServerMapSector *sector = ServerMapSector::deSerialize - (is, this, p2d, &m_hwrapper, m_sectors); + (is, this, p2d, m_sectors); sector->differs_from_disk = false; @@ -3005,51 +5113,28 @@ bool ServerMap::loadSectorFull(v2s16 p2d) { return false; } - - if(ENABLE_BLOCK_LOADING) + + /* + Load blocks + */ + std::vector list2 = fs::GetDirListing + (m_savedir+"/sectors/"+sectorsubdir); + std::vector::iterator i2; + for(i2=list2.begin(); i2!=list2.end(); i2++) { - std::vector list2 = fs::GetDirListing - (m_savedir+"/sectors/"+sectorsubdir); - std::vector::iterator i2; - for(i2=list2.begin(); i2!=list2.end(); i2++) - { - // We want files - if(i2->dir) - continue; - try{ - loadBlock(sectorsubdir, i2->name, sector); - } - catch(InvalidFilenameException &e) - { - // This catches unknown crap in directory - } + // We want files + if(i2->dir) + continue; + try{ + loadBlock(sectorsubdir, i2->name, sector); } - } - return true; -} - -#if 0 -bool ServerMap::deFlushSector(v2s16 p2d) -{ - DSTACK(__FUNCTION_NAME); - // See if it already exists in memory - try{ - MapSector *sector = getSectorNoGenerate(p2d); - return true; - } - catch(InvalidPositionException &e) - { - /* - Try to load the sector from disk. - */ - if(loadSectorFull(p2d) == true) + catch(InvalidFilenameException &e) { - return true; + // This catches unknown crap in directory } } - return false; + return true; } -#endif void ServerMap::saveBlock(MapBlock *block) { @@ -3109,95 +5194,79 @@ void ServerMap::loadBlock(std::string sectordir, std::string blockfile, MapSecto try{ - // Block file is map/sectors/xxxxxxxx/xxxx - std::string fullpath = m_savedir+"/sectors/"+sectordir+"/"+blockfile; - std::ifstream is(fullpath.c_str(), std::ios_base::binary); - if(is.good() == false) - throw FileNotGoodException("Cannot open block file"); + // Block file is map/sectors/xxxxxxxx/xxxx + std::string fullpath = m_savedir+"/sectors/"+sectordir+"/"+blockfile; + 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); + 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); - /*u32 block_size = MapBlock::serializedLength(version); - SharedBuffer data(block_size); - is.read((char*)*data, block_size);*/ + if(is.fail()) + throw SerializationError("ServerMap::loadBlock(): Failed" + " to read MapBlock version"); - // This will always return a sector because we're the server - //MapSector *sector = emergeSector(p2d); + /*u32 block_size = MapBlock::serializedLength(version); + SharedBuffer data(block_size); + is.read((char*)*data, block_size);*/ - MapBlock *block = NULL; - bool created_new = false; - try{ - block = sector->getBlockNoCreate(p3d.Y); - } - catch(InvalidPositionException &e) - { - block = sector->createBlankBlockNoInsert(p3d.Y); - created_new = true; - } - - // deserialize block data - block->deSerialize(is, version); - - /* - Versions up from 9 have block objects. - */ - if(version >= 9) - { - block->updateObjects(is, version, NULL, 0); - } + // This will always return a sector because we're the server + //MapSector *sector = emergeSector(p2d); - if(created_new) - sector->insertBlock(block); - - /* - Convert old formats to new and save - */ + MapBlock *block = NULL; + bool created_new = false; + try{ + block = sector->getBlockNoCreate(p3d.Y); + } + catch(InvalidPositionException &e) + { + block = sector->createBlankBlockNoInsert(p3d.Y); + created_new = true; + } + + // deserialize block data + block->deSerialize(is, version); + + /* + Versions up from 9 have block objects. + */ + if(version >= 9) + { + block->updateObjects(is, version, NULL, 0); + } + + if(created_new) + sector->insertBlock(block); + + /* + Convert old formats to new and save + */ - // Save old format blocks in new format - if(version < SER_FMT_VER_HIGHEST) - { - saveBlock(block); - } - - // We just loaded it from the disk, so it's up-to-date. - block->resetChangedFlag(); + // Save old format blocks in new format + if(version < SER_FMT_VER_HIGHEST) + { + saveBlock(block); + } + + // We just loaded it from the disk, so it's up-to-date. + block->resetChangedFlag(); } catch(SerializationError &e) { dstream<<"WARNING: Invalid block data on disk " - "(SerializationError). Ignoring." + "(SerializationError). Ignoring. " + "A new one will be generated." <getGroundHeight - ((p2d+v2s16(0,0))*SECTOR_HEIGHTMAP_SPLIT); - corners[1] = m_heightmap->getGroundHeight - ((p2d+v2s16(1,0))*SECTOR_HEIGHTMAP_SPLIT); - corners[2] = m_heightmap->getGroundHeight - ((p2d+v2s16(1,1))*SECTOR_HEIGHTMAP_SPLIT); - corners[3] = m_heightmap->getGroundHeight - ((p2d+v2s16(0,1))*SECTOR_HEIGHTMAP_SPLIT); -} - void ServerMap::PrintInfo(std::ostream &out) { out<<"ServerMap: "; @@ -3219,32 +5288,26 @@ ClientMap::ClientMap( Map(dout_client), scene::ISceneNode(parent, mgr, id), m_client(client), - mesh(NULL), - m_control(control) + m_control(control), + m_camera_position(0,0,0), + m_camera_direction(0,0,1) { - mesh_mutex.Init(); - - /*m_box = core::aabbox3d(0,0,0, - map->getW()*BS, map->getH()*BS, map->getD()*BS);*/ - /*m_box = core::aabbox3d(0,0,0, - map->getSizeNodes().X * BS, - map->getSizeNodes().Y * BS, - map->getSizeNodes().Z * BS);*/ + m_camera_mutex.Init(); + assert(m_camera_mutex.IsInitialized()); + m_box = core::aabbox3d(-BS*1000000,-BS*1000000,-BS*1000000, BS*1000000,BS*1000000,BS*1000000); - - //setPosition(v3f(BS,BS,BS)); } ClientMap::~ClientMap() { - JMutexAutoLock lock(mesh_mutex); + /*JMutexAutoLock lock(mesh_mutex); if(mesh != NULL) { mesh->drop(); mesh = NULL; - } + }*/ } MapSector * ClientMap::emergeSector(v2s16 p2d) @@ -3258,7 +5321,7 @@ MapSector * ClientMap::emergeSector(v2s16 p2d) { } - // Create a sector with no heightmaps + // Create a sector ClientMapSector *sector = new ClientMapSector(this, p2d); { @@ -3321,7 +5384,7 @@ void ClientMap::renderMap(video::IVideoDriver* driver, s32 pass) */ int time1 = time(0); - u32 daynight_ratio = m_client->getDayNightRatio(); + //u32 daynight_ratio = m_client->getDayNightRatio(); m_camera_mutex.Lock(); v3f camera_position = m_camera_position; @@ -3372,6 +5435,7 @@ void ClientMap::renderMap(video::IVideoDriver* driver, s32 pass) timecheck_counter++; if(timecheck_counter > 50) { + timecheck_counter = 0; int time2 = time(0); if(time2 > time1 + 4) { @@ -3412,59 +5476,30 @@ void ClientMap::renderMap(video::IVideoDriver* driver, s32 pass) if not seen on display */ - v3s16 blockpos_nodes = block->getPosRelative(); - - // Block center position - v3f blockpos( - ((float)blockpos_nodes.X + MAP_BLOCKSIZE/2) * BS, - ((float)blockpos_nodes.Y + MAP_BLOCKSIZE/2) * BS, - ((float)blockpos_nodes.Z + MAP_BLOCKSIZE/2) * BS - ); - - // Block position relative to camera - v3f blockpos_relative = blockpos - camera_position; - - // Distance in camera direction (+=front, -=back) - f32 dforward = blockpos_relative.dotProduct(camera_direction); - - // Total distance - f32 d = blockpos_relative.getLength(); - + float range = 100000 * BS; if(m_control.range_all == false) - { - // If block is far away, don't draw it - if(d > m_control.wanted_range * BS) - // This is nicer when fog is used - //if((dforward+d)/2 > m_control.wanted_range * BS) - continue; - } - - // Maximum radius of a block - f32 block_max_radius = 0.5*1.44*1.44*MAP_BLOCKSIZE*BS; + range = m_control.wanted_range * BS; - // If block is (nearly) touching the camera, don't - // bother validating further (that is, render it anyway) - if(d > block_max_radius * 1.5) + float d = 0.0; + if(isBlockInSight(block->getPos(), camera_position, + camera_direction, range, &d) == false) { - // Cosine of the angle between the camera direction - // and the block direction (camera_direction is an unit vector) - f32 cosangle = dforward / d; - - // Compensate for the size of the block - // (as the block has to be shown even if it's a bit off FOV) - // This is an estimate. - cosangle += block_max_radius / dforward; - - // If block is not in the field of view, skip it - //if(cosangle < cos(FOV_ANGLE/2)) - if(cosangle < cos(FOV_ANGLE/2. * 4./3.)) - continue; + continue; } + // This is ugly (spherical distance limit?) + /*if(m_control.range_all == false && + d - 0.5*BS*MAP_BLOCKSIZE > range) + continue;*/ + +#if 1 /* - Draw the faces of the block + Update expired mesh (used for day/night change) + + It doesn't work exactly like it should now with the + tasked mesh update but whatever. */ -#if 1 + bool mesh_expired = false; { @@ -3499,29 +5534,16 @@ void ClientMap::renderMap(video::IVideoDriver* driver, s32 pass) mesh_update_count++; // Mesh has been expired: generate new mesh - //block->updateMeshes(daynight_i); - block->updateMesh(daynight_ratio); + //block->updateMesh(daynight_ratio); + m_client->addUpdateMeshTask(block->getPos()); mesh_expired = false; } +#endif /* - Don't draw an expired mesh that is far away + Draw the faces of the block */ - /*if(mesh_expired && d >= faraway) - //if(mesh_expired) - { - // Instead, delete it - JMutexAutoLock lock(block->mesh_mutex); - if(block->mesh) - { - block->mesh->drop(); - block->mesh = NULL; - } - // And continue to next block - continue; - }*/ -#endif { JMutexAutoLock lock(block->mesh_mutex); @@ -3549,6 +5571,11 @@ void ClientMap::renderMap(video::IVideoDriver* driver, s32 pass) // Render transparent on transparent pass and likewise. if(transparent == is_transparent_pass) { + /* + This *shouldn't* hurt too much because Irrlicht + doesn't change opengl textures if the old + material is set again. + */ driver->setMaterial(buf->getMaterial()); driver->drawMeshBuffer(buf); vertex_count += buf->getVertexCount(); @@ -3565,8 +5592,10 @@ void ClientMap::renderMap(video::IVideoDriver* driver, s32 pass) <<", rendered "< *affected_blocks) { + bool changed = false; /* Add it to all blocks touching it */ @@ -3589,12 +5618,31 @@ v3s16 ClientMap::setTempMod(v3s16 p, NodeMod mod) continue; // Relative position of requested node v3s16 relpos = p - blockpos*MAP_BLOCKSIZE; - blockref->setTempMod(relpos, mod); + 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); + } } - return getNodeBlockPos(p); + return changed; } -v3s16 ClientMap::clearTempMod(v3s16 p) + +bool ClientMap::clearTempMod(v3s16 p, + core::map *affected_blocks) { + bool changed = false; v3s16 dirs[7] = { v3s16(0,0,0), // this v3s16(0,0,1), // back @@ -3614,10 +5662,134 @@ v3s16 ClientMap::clearTempMod(v3s16 p) continue; // Relative position of requested node v3s16 relpos = p - blockpos*MAP_BLOCKSIZE; - blockref->clearTempMod(relpos); + 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); + } + } + return changed; +} + +void ClientMap::expireMeshes(bool only_daynight_diffed) +{ + TimeTaker timer("expireMeshes()"); + + core::map::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; + + 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); + } + } + } + } +} + +void ClientMap::updateMeshes(v3s16 blockpos, u32 daynight_ratio) +{ + assert(mapType() == MAPTYPE_CLIENT); + + try{ + v3s16 p = blockpos + v3s16(0,0,0); + MapBlock *b = getBlockNoCreate(p); + b->updateMesh(daynight_ratio); + //b->setMeshExpired(true); + } + 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){} +} + +#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) +{ + 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; jupdateMesh(daynight_ratio); } - return getNodeBlockPos(p); } +#endif void ClientMap::PrintInfo(std::ostream &out) { @@ -3641,7 +5813,6 @@ MapVoxelManipulator::~MapVoxelManipulator() <getNode(a.MinEdge + p); - m_data[i] = n; - m_flags[i] = 0; - } - catch(InvalidPositionException &e) - { - m_flags[i] = VOXELFLAG_INEXISTENT; - } - } -} -#endif - /* - TODO: Add an option to only update eg. water and air nodes. + 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. */ @@ -3754,6 +5888,9 @@ void MapVoxelManipulator::blitBack return; //TimeTaker timer1("blitBack"); + + /*dstream<<"blitBack(): m_loaded_blocks.size()=" + <= 1) + { + dstream<<"initialEmerge: area: "; + block_area_nodes.print(dstream); + dstream<<" ("<::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); + + MapBlock *block = m_map->getBlockNoCreate(p); + if(block->isDummy()) + block_data_inexistent = true; + else + block->copyTo(*this); + } + catch(InvalidPositionException &e) + { + block_data_inexistent = true; + } + + 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); + } + } + + m_loaded_blocks.insert(p, !block_data_inexistent); + } +} + +void ManualMapVoxelManipulator::blitBackAll( + core::map * modified_blocks) +{ + if(m_area.getExtent() == v3s16(0,0,0)) + return; + + /* + Copy data of all blocks + */ + for(core::map::Iterator + i = m_loaded_blocks.getIterator(); + i.atEnd() == false; i++) + { + bool existed = i.getNode()->getValue(); + if(existed == false) + continue; + v3s16 p = i.getNode()->getKey(); + MapBlock *block = m_map->getBlockNoCreateNoEx(p); + if(block == NULL) + { + dstream<<"WARNING: "<<__FUNCTION_NAME + <<": got NULL block " + <<"("<copyFrom(*this); + + if(modified_blocks) + modified_blocks->insert(p, block); + } +} + //END