X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;f=src%2Fvoxel.cpp;h=19f2deb3279445e51d7e3b3ab95f77761c6c6f28;hb=43bf4324d5f639f338f88a599fe862630f85f787;hp=be504f9830956dbe954cacf1fd4de474a20e46c6;hpb=497ff1ecd64c8908f988e15ca879824f2781e3fd;p=dragonfireclient.git diff --git a/src/voxel.cpp b/src/voxel.cpp index be504f983..19f2deb32 100644 --- a/src/voxel.cpp +++ b/src/voxel.cpp @@ -1,6 +1,6 @@ /* Minetest -Copyright (C) 2010 celeron55, Perttu Ahola +Copyright (C) 2013 celeron55, Perttu Ahola This program is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by @@ -22,6 +22,7 @@ with this program; if not, write to the Free Software Foundation, Inc., #include "gettime.h" #include "nodedef.h" #include "util/timetaker.h" +#include // memcpy, memset /* Debug stuff @@ -70,7 +71,7 @@ void VoxelManipulator::print(std::ostream &o, INodeDefManager *ndef, v3s16 of = m_area.MinEdge; o<<"size: "<=m_area.MinEdge.Y; y--) { if(em.X >= 3 && em.Y >= 3) @@ -87,10 +88,8 @@ void VoxelManipulator::print(std::ostream &o, INodeDefManager *ndef, { u8 f = m_flags[m_area.index(x,y,z)]; char c; - if(f & VOXELFLAG_NOT_LOADED) + if(f & VOXELFLAG_NO_DATA) c = 'N'; - else if(f & VOXELFLAG_INEXISTENT) - c = 'I'; else { c = 'X'; @@ -148,11 +147,11 @@ void VoxelManipulator::addArea(VoxelArea area) // Cancel if requested area has zero volume if(area.getExtent() == v3s16(0,0,0)) return; - + // Cancel if m_area already contains the requested area if(m_area.contains(area)) return; - + TimeTaker timer("addArea", &addarea_time); // Calculate new area @@ -182,30 +181,29 @@ void VoxelManipulator::addArea(VoxelArea area) // Allocate and clear new data MapNode *new_data = new MapNode[new_size]; + assert(new_data); u8 *new_flags = new u8[new_size]; - for(s32 i=0; i & light_sources, INodeDefManager *nodemgr) + std::set & light_sources, INodeDefManager *nodemgr) { v3s16 dirs[6] = { v3s16(0,0,1), // back @@ -306,22 +309,22 @@ void VoxelManipulator::unspreadLight(enum LightBank bank, v3s16 p, u8 oldlight, v3s16(0,-1,0), // bottom v3s16(-1,0,0), // left }; - - emerge(VoxelArea(p - v3s16(1,1,1), p + v3s16(1,1,1))); + + addArea(VoxelArea(p - v3s16(1,1,1), p + v3s16(1,1,1))); // Loop through 6 neighbors for(u16 i=0; i<6; i++) { // Get the position of the neighbor node v3s16 n2pos = p + dirs[i]; - + u32 n2i = m_area.index(n2pos); - if(m_flags[n2i] & VOXELFLAG_INEXISTENT) + if(m_flags[n2i] & VOXELFLAG_NO_DATA) continue; MapNode &n2 = m_data[n2i]; - + /* If the neighbor is dimmer than what was specified as oldlight (the light of the previous node) @@ -339,9 +342,9 @@ void VoxelManipulator::unspreadLight(enum LightBank bank, v3s16 p, u8 oldlight, */ n2.setLight(bank, 0, nodemgr); - + unspreadLight(bank, n2pos, light2, light_sources, nodemgr); - + /* Remove from light_sources if it is there NOTE: This doesn't happen nearly at all @@ -354,7 +357,7 @@ void VoxelManipulator::unspreadLight(enum LightBank bank, v3s16 p, u8 oldlight, } } else{ - light_sources.insert(n2pos, true); + light_sources.insert(n2pos); } } } @@ -378,24 +381,16 @@ void VoxelManipulator::unspreadLight(enum LightBank bank, v3s16 p, u8 oldlight, values of from_nodes are lighting values. */ void VoxelManipulator::unspreadLight(enum LightBank bank, - core::map & from_nodes, - core::map & light_sources, INodeDefManager *nodemgr) + std::map & from_nodes, + std::set & light_sources, INodeDefManager *nodemgr) { if(from_nodes.size() == 0) return; - - core::map::Iterator j; - j = from_nodes.getIterator(); - for(; j.atEnd() == false; j++) + for(std::map::iterator j = from_nodes.begin(); + j != from_nodes.end(); ++j) { - v3s16 pos = j.getNode()->getKey(); - - //MapNode &n = m_data[m_area.index(pos)]; - - u8 oldlight = j.getNode()->getValue(); - - unspreadLight(bank, pos, oldlight, light_sources, nodemgr); + unspreadLight(bank, j->first, j->second, light_sources, nodemgr); } } #endif @@ -430,10 +425,10 @@ void VoxelManipulator::unspreadLight(enum LightBank bank, v3s16(0,-1,0), // bottom v3s16(-1,0,0), // left }; - + if(from_nodes.size() == 0) return; - + core::map unlighted_nodes; core::map::Iterator j; j = from_nodes.getIterator(); @@ -441,26 +436,26 @@ void VoxelManipulator::unspreadLight(enum LightBank bank, for(; j.atEnd() == false; j++) { v3s16 pos = j.getNode()->getKey(); - - emerge(VoxelArea(pos - v3s16(1,1,1), pos + v3s16(1,1,1))); + + addArea(VoxelArea(pos - v3s16(1,1,1), pos + v3s16(1,1,1))); //MapNode &n = m_data[m_area.index(pos)]; - + u8 oldlight = j.getNode()->getValue(); - + // Loop through 6 neighbors for(u16 i=0; i<6; i++) { // Get the position of the neighbor node v3s16 n2pos = pos + dirs[i]; - + u32 n2i = m_area.index(n2pos); - if(m_flags[n2i] & VOXELFLAG_INEXISTENT) + if(m_flags[n2i] & VOXELFLAG_NO_DATA) continue; MapNode &n2 = m_data[n2i]; - + /* If the neighbor is dimmer than what was specified as oldlight (the light of the previous node) @@ -480,7 +475,7 @@ void VoxelManipulator::unspreadLight(enum LightBank bank, n2.setLight(bank, 0); unlighted_nodes.insert(n2pos, current_light); - + /* Remove from light_sources if it is there NOTE: This doesn't happen nearly at all @@ -502,7 +497,7 @@ void VoxelManipulator::unspreadLight(enum LightBank bank, < 0) unspreadLight(bank, unlighted_nodes, light_sources); } @@ -520,11 +515,11 @@ void VoxelManipulator::spreadLight(enum LightBank bank, v3s16 p, v3s16(-1,0,0), // left }; - emerge(VoxelArea(p - v3s16(1,1,1), p + v3s16(1,1,1))); + addArea(VoxelArea(p - v3s16(1,1,1), p + v3s16(1,1,1))); u32 i = m_area.index(p); - - if(m_flags[i] & VOXELFLAG_INEXISTENT) + + if(m_flags[i] & VOXELFLAG_NO_DATA) return; MapNode &n = m_data[i]; @@ -537,16 +532,16 @@ void VoxelManipulator::spreadLight(enum LightBank bank, v3s16 p, { // Get the position of the neighbor node v3s16 n2pos = p + dirs[i]; - + u32 n2i = m_area.index(n2pos); - if(m_flags[n2i] & VOXELFLAG_INEXISTENT) + if(m_flags[n2i] & VOXELFLAG_NO_DATA) continue; MapNode &n2 = m_data[n2i]; u8 light2 = n2.getLight(bank, nodemgr); - + /* If the neighbor is brighter than the current node, add to list (it will light up this node on its turn) @@ -583,7 +578,7 @@ void VoxelManipulator::spreadLight(enum LightBank bank, { if(from_nodes.size() == 0) return; - + core::map lighted_nodes; core::map::Iterator j; j = from_nodes.getIterator(); @@ -603,7 +598,7 @@ void VoxelManipulator::spreadLight(enum LightBank bank, goes on recursively. */ void VoxelManipulator::spreadLight(enum LightBank bank, - core::map & from_nodes, INodeDefManager *nodemgr) + std::set & from_nodes, INodeDefManager *nodemgr) { const v3s16 dirs[6] = { v3s16(0,0,1), // back @@ -616,20 +611,19 @@ void VoxelManipulator::spreadLight(enum LightBank bank, if(from_nodes.size() == 0) return; - - core::map lighted_nodes; - core::map::Iterator j; - j = from_nodes.getIterator(); - for(; j.atEnd() == false; j++) + std::set lighted_nodes; + + for(std::set::iterator j = from_nodes.begin(); + j != from_nodes.end(); ++j) { - v3s16 pos = j.getNode()->getKey(); + v3s16 pos = *j; - emerge(VoxelArea(pos - v3s16(1,1,1), pos + v3s16(1,1,1))); + addArea(VoxelArea(pos - v3s16(1,1,1), pos + v3s16(1,1,1))); u32 i = m_area.index(pos); - - if(m_flags[i] & VOXELFLAG_INEXISTENT) + + if(m_flags[i] & VOXELFLAG_NO_DATA) continue; MapNode &n = m_data[i]; @@ -642,25 +636,25 @@ void VoxelManipulator::spreadLight(enum LightBank bank, { // Get the position of the neighbor node v3s16 n2pos = pos + dirs[i]; - + try { u32 n2i = m_area.index(n2pos); - if(m_flags[n2i] & VOXELFLAG_INEXISTENT) + if(m_flags[n2i] & VOXELFLAG_NO_DATA) continue; MapNode &n2 = m_data[n2i]; u8 light2 = n2.getLight(bank, nodemgr); - + /* If the neighbor is brighter than the current node, add to list (it will light up this node on its turn) */ if(light2 > undiminish_light(oldlight)) { - lighted_nodes.insert(n2pos, true); + lighted_nodes.insert(n2pos); } /* If the neighbor is dimmer than how much light this node @@ -671,7 +665,7 @@ void VoxelManipulator::spreadLight(enum LightBank bank, if(nodemgr->get(n2).light_propagates) { n2.setLight(bank, newlight, nodemgr); - lighted_nodes.insert(n2pos, true); + lighted_nodes.insert(n2pos); } } } @@ -686,7 +680,7 @@ void VoxelManipulator::spreadLight(enum LightBank bank, < 0) spreadLight(bank, lighted_nodes, nodemgr); }