From: sapier Date: Mon, 9 Jun 2014 11:29:22 +0000 (+0200) Subject: Remove emerge and speedup addArea by using memcopy instead of one by one assignment X-Git-Url: http://81.2.79.47:8989/gitweb/?a=commitdiff_plain;h=8ad83767cfccc2d1a42bdc4af087ec013d7554a0;p=zefram%2Fminetest%2Fminetest_engine.git Remove emerge and speedup addArea by using memcopy instead of one by one assignment --- diff --git a/src/map.cpp b/src/map.cpp index 994da275..814eea4c 100644 --- a/src/map.cpp +++ b/src/map.cpp @@ -3551,12 +3551,12 @@ void MapVoxelManipulator::emerge(VoxelArea a, s32 caller_id) flags |= VMANIP_BLOCK_DATA_INEXIST; VoxelArea a(p*MAP_BLOCKSIZE, (p+1)*MAP_BLOCKSIZE-v3s16(1,1,1)); - // Fill with VOXELFLAG_INEXISTENT + // Fill with VOXELFLAG_NO_DATA for(s32 z=a.MinEdge.Z; z<=a.MaxEdge.Z; z++) for(s32 y=a.MinEdge.Y; y<=a.MaxEdge.Y; y++) { s32 i = m_area.index(a.MinEdge.X,y,z); - memset(&m_flags[i], VOXELFLAG_INEXISTENT, MAP_BLOCKSIZE); + memset(&m_flags[i], VOXELFLAG_NO_DATA, MAP_BLOCKSIZE); } } /*else if (block->getNode(0, 0, 0).getContent() == CONTENT_IGNORE) @@ -3601,7 +3601,7 @@ void MapVoxelManipulator::blitBack v3s16 p(x,y,z); u8 f = m_flags[m_area.index(p)]; - if(f & (VOXELFLAG_NOT_LOADED|VOXELFLAG_INEXISTENT)) + if(f & (VOXELFLAG_NO_DATA)) continue; MapNode &n = m_data[m_area.index(p)]; @@ -3655,7 +3655,7 @@ ManualMapVoxelManipulator::~ManualMapVoxelManipulator() void ManualMapVoxelManipulator::emerge(VoxelArea a, s32 caller_id) { // Just create the area so that it can be pointed to - VoxelManipulator::emerge(a, caller_id); + VoxelManipulator::addArea(a); } void ManualMapVoxelManipulator::initialEmerge(v3s16 blockpos_min, @@ -3726,12 +3726,12 @@ void ManualMapVoxelManipulator::initialEmerge(v3s16 blockpos_min, Mark area inexistent */ VoxelArea a(p*MAP_BLOCKSIZE, (p+1)*MAP_BLOCKSIZE-v3s16(1,1,1)); - // Fill with VOXELFLAG_INEXISTENT + // Fill with VOXELFLAG_NO_DATA for(s32 z=a.MinEdge.Z; z<=a.MaxEdge.Z; z++) for(s32 y=a.MinEdge.Y; y<=a.MaxEdge.Y; y++) { s32 i = m_area.index(a.MinEdge.X,y,z); - memset(&m_flags[i], VOXELFLAG_INEXISTENT, MAP_BLOCKSIZE); + memset(&m_flags[i], VOXELFLAG_NO_DATA, MAP_BLOCKSIZE); } } } diff --git a/src/voxel.cpp b/src/voxel.cpp index 0d8b5516..19f2deb3 100644 --- a/src/voxel.cpp +++ b/src/voxel.cpp @@ -71,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) @@ -88,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'; @@ -149,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 @@ -186,28 +184,26 @@ void VoxelManipulator::addArea(VoxelArea area) assert(new_data); u8 *new_flags = new u8[new_size]; assert(new_flags); - memset(new_flags, VOXELFLAG_NOT_LOADED, new_size); - + memset(new_flags, VOXELFLAG_NO_DATA, new_size); + // Copy old data - + s32 old_x_width = m_area.MaxEdge.X - m_area.MinEdge.X + 1; for(s32 z=m_area.MinEdge.Z; z<=m_area.MaxEdge.Z; z++) for(s32 y=m_area.MinEdge.Y; y<=m_area.MaxEdge.Y; y++) - for(s32 x=m_area.MinEdge.X; x<=m_area.MaxEdge.X; x++) { - unsigned int old_index = m_area.index(x,y,z); - // If loaded, copy data and flags - if((m_flags[old_index] & VOXELFLAG_NOT_LOADED) == false) - { - unsigned int new_index = new_area.index(x,y,z); - new_data[new_index] = m_data[old_index]; - new_flags[new_index] = m_flags[old_index]; - } + unsigned int old_index = m_area.index(m_area.MinEdge.X,y,z); + unsigned int new_index = new_area.index(m_area.MinEdge.X,y,z); + + memcpy(&new_data[new_index], &m_data[old_index], + old_x_width * sizeof(MapNode)); + memcpy(&new_flags[new_index], &m_flags[old_index], + old_x_width * sizeof(u8)); } // Replace area, data and flags - + m_area = new_area; - + MapNode *old_data = m_data; u8 *old_flags = m_flags; @@ -216,7 +212,7 @@ void VoxelManipulator::addArea(VoxelArea area) m_data = new_data; m_flags = new_flags; - + if(old_data) delete[] old_data; if(old_flags) @@ -225,7 +221,7 @@ void VoxelManipulator::addArea(VoxelArea area) //dstream<<"addArea done"<::iterator j = from_nodes.begin(); j != from_nodes.end(); ++j) { @@ -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(); @@ -616,7 +611,7 @@ void VoxelManipulator::spreadLight(enum LightBank bank, if(from_nodes.size() == 0) return; - + std::set lighted_nodes; for(std::set::iterator j = from_nodes.begin(); @@ -624,11 +619,11 @@ void VoxelManipulator::spreadLight(enum LightBank bank, { 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]; @@ -641,18 +636,18 @@ 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) @@ -685,7 +680,7 @@ void VoxelManipulator::spreadLight(enum LightBank bank, < 0) spreadLight(bank, lighted_nodes, nodemgr); } diff --git a/src/voxel.h b/src/voxel.h index fa459444..033ad3e4 100644 --- a/src/voxel.h +++ b/src/voxel.h @@ -320,10 +320,10 @@ public: v3s16 MaxEdge; }; -// Hasn't been copied from source (emerged) -#define VOXELFLAG_NOT_LOADED (1<<0) -// Checked as being inexistent in source -#define VOXELFLAG_INEXISTENT (1<<1) +// unused +#define VOXELFLAG_UNUSED (1<<0) +// no data about that node +#define VOXELFLAG_NO_DATA (1<<1) // Algorithm-dependent #define VOXELFLAG_CHECKED1 (1<<2) // Algorithm-dependent @@ -356,8 +356,8 @@ public: } bool isValidPosition(v3s16 p) { - emerge(p); - return !(m_flags[m_area.index(p)] & VOXELFLAG_INEXISTENT); + addArea(p); + return !(m_flags[m_area.index(p)] & VOXELFLAG_NO_DATA); }*/ /* @@ -366,9 +366,9 @@ public: */ MapNode getNode(v3s16 p) { - emerge(p); + addArea(p); - if(m_flags[m_area.index(p)] & VOXELFLAG_INEXISTENT) + if(m_flags[m_area.index(p)] & VOXELFLAG_NO_DATA) { /*dstream<<"EXCEPT: VoxelManipulator::getNode(): " <<"p=("<