X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Fvoxel.cpp;h=e6d4bdcd22587d5bad6895f61e337f8df029f9bf;hb=00fc0babe0c6c5464fa9ffbc5a257b1e2aa93111;hp=c55f3f5392dd0716ba96096412932aa91e2bf273;hpb=22e186b4aa88b585e71500c4e9a03bf69b0b6191;p=oweals%2Fminetest.git diff --git a/src/voxel.cpp b/src/voxel.cpp index c55f3f539..e6d4bdcd2 100644 --- a/src/voxel.cpp +++ b/src/voxel.cpp @@ -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'; @@ -143,16 +142,16 @@ void VoxelManipulator::print(std::ostream &o, INodeDefManager *ndef, } } -void VoxelManipulator::addArea(VoxelArea area) +void VoxelManipulator::addArea(const 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|'''''' dest mod '''''''' + * dest <---------------------------------------------> + * + * dest_mod (it's essentially a modulus) is added to the destination index + * after every full iteration of the y span. + * + * This method falls under the category "linear array and incrementing + * index". + */ + + s32 src_step = src_area.getExtent().X; + s32 dest_step = m_area.getExtent().X; + s32 dest_mod = m_area.index(to_pos.X, to_pos.Y, to_pos.Z + 1) + - m_area.index(to_pos.X, to_pos.Y, to_pos.Z) + - dest_step * size.Y; + + s32 i_src = src_area.index(from_pos.X, from_pos.Y, from_pos.Z); + s32 i_local = m_area.index(to_pos.X, to_pos.Y, to_pos.Z); + + for (s16 z = 0; z < size.Z; z++) { + for (s16 y = 0; y < size.Y; y++) { + memcpy(&m_data[i_local], &src[i_src], size.X * sizeof(*m_data)); + memset(&m_flags[i_local], 0, size.X); + i_src += src_step; + i_local += dest_step; + } + i_local += dest_mod; } } -void VoxelManipulator::copyTo(MapNode *dst, VoxelArea dst_area, +void VoxelManipulator::copyTo(MapNode *dst, const VoxelArea& dst_area, v3s16 dst_pos, v3s16 from_pos, v3s16 size) { for(s16 z=0; z & light_sources, INodeDefManager *nodemgr) + std::set & light_sources, INodeDefManager *nodemgr) { v3s16 dirs[6] = { v3s16(0,0,1), // back @@ -312,22 +344,23 @@ 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))); + + VoxelArea voxel_area(p - v3s16(1,1,1), p + v3s16(1,1,1)); + addArea(voxel_area); // 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) @@ -345,9 +378,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 @@ -360,7 +393,7 @@ void VoxelManipulator::unspreadLight(enum LightBank bank, v3s16 p, u8 oldlight, } } else{ - light_sources.insert(n2pos, true); + light_sources.insert(n2pos); } } } @@ -384,24 +417,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 @@ -436,10 +461,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(); @@ -447,26 +472,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) @@ -486,7 +511,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 @@ -508,7 +533,7 @@ void VoxelManipulator::unspreadLight(enum LightBank bank, < 0) unspreadLight(bank, unlighted_nodes, light_sources); } @@ -526,11 +551,12 @@ 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))); + VoxelArea voxel_area(p - v3s16(1,1,1), p + v3s16(1,1,1)); + addArea(voxel_area); 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]; @@ -543,16 +569,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) @@ -589,7 +615,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(); @@ -609,7 +635,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 @@ -622,20 +648,20 @@ 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))); + VoxelArea voxel_area(pos - v3s16(1,1,1), pos + v3s16(1,1,1)); + addArea(voxel_area); 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]; @@ -648,25 +674,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 @@ -677,7 +703,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); } } } @@ -692,7 +718,7 @@ void VoxelManipulator::spreadLight(enum LightBank bank, < 0) spreadLight(bank, lighted_nodes, nodemgr); }