/*
-Minetest-c55
-Copyright (C) 2010 celeron55, Perttu Ahola <celeron55@gmail.com>
+Minetest
+Copyright (C) 2013 celeron55, Perttu Ahola <celeron55@gmail.com>
This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
+it under the terms of the GNU Lesser General Public License as published by
+the Free Software Foundation; either version 2.1 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
+GNU Lesser General Public License for more details.
-You should have received a copy of the GNU General Public License along
+You should have received a copy of the GNU Lesser General Public License along
with this program; if not, write to the Free Software Foundation, Inc.,
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#include "voxel.h"
#include "map.h"
+#include "gettime.h"
+#include "nodedef.h"
+#include "util/directiontables.h"
+#include "util/timetaker.h"
+#include <cstring> // memcpy, memset
-VoxelManipulator::VoxelManipulator():
- m_data(NULL)
+/*
+ Debug stuff
+*/
+u64 addarea_time = 0;
+u64 emerge_time = 0;
+u64 emerge_load_time = 0;
+u64 clearflag_time = 0;
+
+VoxelManipulator::~VoxelManipulator()
{
+ clear();
}
-VoxelManipulator::~VoxelManipulator()
+void VoxelManipulator::clear()
+{
+ // Reset area to volume=0
+ m_area = VoxelArea();
+ delete[] m_data;
+ m_data = nullptr;
+ delete[] m_flags;
+ m_flags = nullptr;
+}
+
+void VoxelManipulator::print(std::ostream &o, const NodeDefManager *ndef,
+ VoxelPrintMode mode)
{
- if(m_data)
- delete[] m_data;
+ const v3s16 &em = m_area.getExtent();
+ v3s16 of = m_area.MinEdge;
+ o<<"size: "<<em.X<<"x"<<em.Y<<"x"<<em.Z
+ <<" offset: ("<<of.X<<","<<of.Y<<","<<of.Z<<")"<<std::endl;
+
+ for(s32 y=m_area.MaxEdge.Y; y>=m_area.MinEdge.Y; y--)
+ {
+ if(em.X >= 3 && em.Y >= 3)
+ {
+ if (y==m_area.MinEdge.Y+2) o<<"^ ";
+ else if(y==m_area.MinEdge.Y+1) o<<"| ";
+ else if(y==m_area.MinEdge.Y+0) o<<"y x-> ";
+ else o<<" ";
+ }
+
+ for(s32 z=m_area.MinEdge.Z; z<=m_area.MaxEdge.Z; z++)
+ {
+ for(s32 x=m_area.MinEdge.X; x<=m_area.MaxEdge.X; x++)
+ {
+ u8 f = m_flags[m_area.index(x,y,z)];
+ char c;
+ if(f & VOXELFLAG_NO_DATA)
+ c = 'N';
+ else
+ {
+ c = 'X';
+ MapNode n = m_data[m_area.index(x,y,z)];
+ content_t m = n.getContent();
+ u8 pr = n.param2;
+ if(mode == VOXELPRINT_MATERIAL)
+ {
+ if(m <= 9)
+ c = m + '0';
+ }
+ else if(mode == VOXELPRINT_WATERPRESSURE)
+ {
+ if(ndef->get(m).isLiquid())
+ {
+ c = 'w';
+ if(pr <= 9)
+ c = pr + '0';
+ }
+ else if(m == CONTENT_AIR)
+ {
+ c = ' ';
+ }
+ else
+ {
+ c = '#';
+ }
+ }
+ else if(mode == VOXELPRINT_LIGHT_DAY)
+ {
+ if(ndef->get(m).light_source != 0)
+ c = 'S';
+ else if(!ndef->get(m).light_propagates)
+ c = 'X';
+ else
+ {
+ u8 light = n.getLight(LIGHTBANK_DAY, ndef);
+ if(light < 10)
+ c = '0' + light;
+ else
+ c = 'a' + (light-10);
+ }
+ }
+ }
+ o<<c;
+ }
+ o<<' ';
+ }
+ o<<std::endl;
+ }
}
-void VoxelManipulator::addArea(VoxelArea area)
+void VoxelManipulator::addArea(const VoxelArea &area)
{
- if(area.getExtent() == v3s16(0,0,0))
+ // Cancel if requested area has zero volume
+ if (area.hasEmptyExtent())
+ return;
+
+ // Cancel if m_area already contains the requested area
+ if(m_area.contains(area))
return;
-
+
+ TimeTaker timer("addArea", &addarea_time);
+
// Calculate new area
VoxelArea new_area;
- if(m_area.getExtent() == v3s16(0,0,0))
+ // New area is the requested area if m_area has zero volume
+ if(m_area.hasEmptyExtent())
{
new_area = area;
}
+ // Else add requested area to m_area
else
{
new_area = m_area;
new_area.addArea(area);
}
- if(new_area == m_area)
- return;
-
s32 new_size = new_area.getVolume();
/*dstream<<"adding area ";
dstream<<", new_size="<<new_size;
dstream<<std::endl;*/
- // Allocate and clear new data
- MapNode *new_data;
- new_data = new MapNode[new_size];
- for(s32 i=0; i<new_size; i++)
- {
- new_data[i].d = MATERIAL_IGNORE;
- }
-
+ // Allocate new data and clear flags
+ MapNode *new_data = new MapNode[new_size];
+ assert(new_data);
+ u8 *new_flags = new u8[new_size];
+ assert(new_flags);
+ 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++)
- {
- new_data[new_area.index(z,y,x)] = m_data[m_area.index(x,y,z)];
- }
-
- // Replace member
- m_area = new_area;
- MapNode *old_data = m_data;
- m_data = new_data;
- delete[] old_data;
-}
-
-void VoxelManipulator::print(std::ostream &o)
-{
- v3s16 em = m_area.getExtent();
- v3s16 of = m_area.MinEdge;
- o<<"size: "<<em.X<<"x"<<em.Y<<"x"<<em.Z
- <<" offset: ("<<of.X<<","<<of.Y<<","<<of.Z<<")"<<std::endl;
-
for(s32 y=m_area.MinEdge.Y; y<=m_area.MaxEdge.Y; y++)
{
- if(em.X >= 3 && em.Y >= 3)
- {
- if(y==m_area.MinEdge.Y+0) o<<"y x-> ";
- if(y==m_area.MinEdge.Y+1) o<<"| ";
- if(y==m_area.MinEdge.Y+2) o<<"V ";
- }
+ 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);
- for(s32 z=m_area.MinEdge.Z; z<=m_area.MaxEdge.Z; z++)
- {
- for(s32 x=m_area.MinEdge.X; x<=m_area.MaxEdge.X; x++)
- {
- u8 m = m_data[m_area.index(x,y,z)].d;
- char c = 'X';
- if(m == MATERIAL_IGNORE)
- c = 'I';
- else if(m <= 9)
- c = m + '0';
- o<<c;
- }
- o<<' ';
- }
- o<<std::endl;
+ 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));
}
-}
-
-void VoxelManipulator::interpolate(VoxelArea area)
-{
- VoxelArea emerge_area = area;
- emerge_area.MinEdge -= v3s16(1,1,1);
- emerge_area.MaxEdge += v3s16(1,1,1);
- emerge(emerge_area);
- SharedBuffer<u8> buf(area.getVolume());
+ // Replace area, data and flags
- for(s32 z=area.MinEdge.Z; z<=area.MaxEdge.Z; z++)
- for(s32 y=area.MinEdge.Y; y<=area.MaxEdge.Y; y++)
- for(s32 x=area.MinEdge.X; x<=area.MaxEdge.X; x++)
- {
- v3s16 p(x,y,z);
-
- v3s16 dirs[] = {
- v3s16(1,1,0),
- v3s16(1,0,1),
- v3s16(1,-1,0),
- v3s16(1,0,-1),
- v3s16(-1,1,0),
- v3s16(-1,0,1),
- v3s16(-1,-1,0),
- v3s16(-1,0,-1),
- };
- //const v3s16 *dirs = g_26dirs;
-
- s16 total = 0;
- s16 airness = 0;
- u8 m = MATERIAL_IGNORE;
-
- for(s16 i=0; i<8; i++)
- //for(s16 i=0; i<26; i++)
- {
- v3s16 p2 = p + dirs[i];
+ m_area = new_area;
- MapNode &n = m_data[m_area.index(p2)];
- if(n.d == MATERIAL_IGNORE)
- continue;
+ MapNode *old_data = m_data;
+ u8 *old_flags = m_flags;
- airness += (n.d == MATERIAL_AIR) ? 1 : -1;
- total++;
+ /*dstream<<"old_data="<<(int)old_data<<", new_data="<<(int)new_data
+ <<", old_flags="<<(int)m_flags<<", new_flags="<<(int)new_flags<<std::endl;*/
- if(m == MATERIAL_IGNORE && n.d != MATERIAL_AIR)
- m = n.d;
- }
+ m_data = new_data;
+ m_flags = new_flags;
- // 1 if air, 0 if not
- buf[area.index(p)] = airness > -total/2 ? MATERIAL_AIR : m;
- //buf[area.index(p)] = airness > -total ? MATERIAL_AIR : m;
- //buf[area.index(p)] = airness >= -7 ? MATERIAL_AIR : m;
- }
+ delete[] old_data;
+ delete[] old_flags;
- for(s32 z=area.MinEdge.Z; z<=area.MaxEdge.Z; z++)
- for(s32 y=area.MinEdge.Y; y<=area.MaxEdge.Y; y++)
- for(s32 x=area.MinEdge.X; x<=area.MaxEdge.X; x++)
- {
- v3s16 p(x,y,z);
- m_data[m_area.index(p)].d = buf[area.index(p)];
- }
+ //dstream<<"addArea done"<<std::endl;
}
-#if 0
-void VoxelManipulator::blitFromNodeContainer
- (v3s16 p_from, v3s16 p_to, v3s16 size, NodeContainer *c)
+void VoxelManipulator::copyFrom(MapNode *src, const VoxelArea& src_area,
+ v3s16 from_pos, v3s16 to_pos, const v3s16 &size)
{
- VoxelArea a_to(p_to, p_to+size-v3s16(1,1,1));
- addArea(a_to);
- for(s16 z=0; z<size.Z; z++)
- for(s16 y=0; y<size.Y; y++)
- for(s16 x=0; x<size.X; x++)
- {
- v3s16 p(x,y,z);
- try{
- MapNode n = c->getNode(p_from + p);
- m_data[m_area.index(p_to + p)] = n;
- }
- catch(InvalidPositionException &e)
- {
- }
-
- /*v3s16 p(x,y,z);
- MapNode n(MATERIAL_IGNORE);
- try{
- n = c->getNode(p_from + p);
- }
- catch(InvalidPositionException &e)
- {
+ /* The reason for this optimised code is that we're a member function
+ * and the data type/layout of m_data is know to us: it's stored as
+ * [z*h*w + y*h + x]. Therefore we can take the calls to m_area index
+ * (which performs the preceding mapping/indexing of m_data) out of the
+ * inner loop and calculate the next index as we're iterating to gain
+ * performance.
+ *
+ * src_step and dest_step is the amount required to be added to our index
+ * every time y increments. Because the destination area may be larger
+ * than the source area we need one additional variable (otherwise we could
+ * just continue adding dest_step as is done for the source data): dest_mod.
+ * dest_mod is the difference in size between a "row" in the source data
+ * and a "row" in the destination data (I am using the term row loosely
+ * and for illustrative purposes). E.g.
+ *
+ * src <-------------------->|'''''' 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;
}
- m_data[m_area.index(p_to + p)] = n;*/
+ i_local += dest_mod;
}
}
-void VoxelManipulator::blitToNodeContainer
- (v3s16 p_from, v3s16 p_to, v3s16 size, NodeContainer *c)
+void VoxelManipulator::copyTo(MapNode *dst, const VoxelArea& dst_area,
+ v3s16 dst_pos, v3s16 from_pos, const v3s16 &size)
{
for(s16 z=0; z<size.Z; z++)
for(s16 y=0; y<size.Y; y++)
- for(s16 x=0; x<size.X; x++)
{
- v3s16 p(x,y,z);
- try{
- MapNode &n = m_data[m_area.index(p_from + p)];
- if(n.d == MATERIAL_IGNORE)
- continue;
- c->setNode(p_to + p, n);
- }
- catch(InvalidPositionException &e)
- {
+ s32 i_dst = dst_area.index(dst_pos.X, dst_pos.Y+y, dst_pos.Z+z);
+ s32 i_local = m_area.index(from_pos.X, from_pos.Y+y, from_pos.Z+z);
+ for (s16 x = 0; x < size.X; x++) {
+ if (m_data[i_local].getContent() != CONTENT_IGNORE)
+ dst[i_dst] = m_data[i_local];
+ i_dst++;
+ i_local++;
}
}
}
-#endif
/*
- MapVoxelManipulator
+ Algorithms
+ -----------------------------------------------------
*/
-MapVoxelManipulator::MapVoxelManipulator(Map *map)
+void VoxelManipulator::clearFlag(u8 flags)
{
- m_map = map;
-}
+ // 0-1ms on moderate area
+ TimeTaker timer("clearFlag", &clearflag_time);
-void MapVoxelManipulator::emerge(VoxelArea a)
-{
- v3s16 size = a.getExtent();
+ //v3s16 s = m_area.getExtent();
- addArea(a);
-
- for(s16 z=0; z<size.Z; z++)
- for(s16 y=0; y<size.Y; y++)
- for(s16 x=0; x<size.X; x++)
- {
- v3s16 p(x,y,z);
- try{
- MapNode n = m_map->getNode(a.MinEdge + p);
- m_data[m_area.index(a.MinEdge + p)] = n;
- }
- catch(InvalidPositionException &e)
- {
- }
- }
-}
+ /*dstream<<"clearFlag clearing area of size "
+ <<""<<s.X<<"x"<<s.Y<<"x"<<s.Z<<""
+ <<std::endl;*/
-void MapVoxelManipulator::blitBack
- (core::map<v3s16, MapBlock*> & modified_blocks)
-{
- /*
- Initialize block cache
- */
- v3s16 blockpos_last;
- MapBlock *block = NULL;
- bool block_checked_in_modified = false;
+ //s32 count = 0;
- for(s32 z=m_area.MinEdge.Z; z<=m_area.MaxEdge.Z; z++)
+ /*for(s32 z=m_area.MinEdge.Z; z<=m_area.MaxEdge.Z; z++)
for(s32 y=m_area.MinEdge.Y; y<=m_area.MaxEdge.Y; y++)
for(s32 x=m_area.MinEdge.X; x<=m_area.MaxEdge.X; x++)
{
- v3s16 p(x,y,z);
-
- MapNode &n = m_data[m_area.index(p)];
- if(n.d == MATERIAL_IGNORE)
- continue;
-
- v3s16 blockpos = getNodeBlockPos(p);
-
- try
- {
- // Get block
- if(block == NULL || blockpos != blockpos_last){
- block = m_map->getBlockNoCreate(blockpos);
- blockpos_last = blockpos;
- block_checked_in_modified = false;
- }
-
- // Calculate relative position in block
- v3s16 relpos = p - blockpos * MAP_BLOCKSIZE;
-
- // Don't continue if nothing has changed here
- if(block->getNode(relpos) == n)
- continue;
-
- //m_map->setNode(m_area.MinEdge + p, n);
- block->setNode(relpos, n);
-
- /*
- Make sure block is in modified_blocks
- */
- if(block_checked_in_modified == false)
- {
- modified_blocks[blockpos] = block;
- block_checked_in_modified = true;
- }
- }
- catch(InvalidPositionException &e)
- {
- }
+ u8 f = m_flags[m_area.index(x,y,z)];
+ m_flags[m_area.index(x,y,z)] &= ~flags;
+ if(m_flags[m_area.index(x,y,z)] != f)
+ count++;
+ }*/
+
+ s32 volume = m_area.getVolume();
+ for(s32 i=0; i<volume; i++)
+ {
+ m_flags[i] &= ~flags;
}
+
+ /*s32 volume = m_area.getVolume();
+ for(s32 i=0; i<volume; i++)
+ {
+ u8 f = m_flags[i];
+ m_flags[i] &= ~flags;
+ if(m_flags[i] != f)
+ count++;
+ }
+
+ dstream<<"clearFlag changed "<<count<<" flags out of "
+ <<volume<<" nodes"<<std::endl;*/
}
+const MapNode VoxelManipulator::ContentIgnoreNode = MapNode(CONTENT_IGNORE);
+
//END
projects / oweals / minetest.git / blobdiff