X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Fvoxel.cpp;h=981bc58233cb73a2c7686e824e89d12d6e9beda3;hb=b5f7249a7edc25077d84b27b38552228b92ff763;hp=55cd73893c3a6cae96f2ab27bf8785902dd3ed1b;hpb=b94a00786454968a1cc309b01180292b114da4bd;p=oweals%2Fminetest.git

diff --git a/src/voxel.cpp b/src/voxel.cpp
index 55cd73893..981bc5823 100644
--- a/src/voxel.cpp
+++ b/src/voxel.cpp
@@ -1,77 +1,65 @@
 /*
-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"
-
-// For TimeTaker
-#include "utility.h"
 #include "gettime.h"
+#include "nodedef.h"
+#include "util/timetaker.h"
+#include <string.h>  // memcpy, memset
 
 /*
 	Debug stuff
 */
-u32 addarea_time = 0;
-u32 emerge_time = 0;
-u32 emerge_load_time = 0;
-u32 clearflag_time = 0;
-//u32 getwaterpressure_time = 0;
-//u32 spreadwaterpressure_time = 0;
-u32 updateareawaterpressure_time = 0;
-u32 flowwater_pre_time = 0;
-
-
-VoxelManipulator::VoxelManipulator():
-	m_data(NULL),
-	m_flags(NULL)
+u64 addarea_time = 0;
+u64 emerge_time = 0;
+u64 emerge_load_time = 0;
+u64 clearflag_time = 0;
+
+
+VoxelManipulator::VoxelManipulator()
 {
-	m_disable_water_climb = false;
 }
 
 VoxelManipulator::~VoxelManipulator()
 {
 	clear();
-	if(m_data)
-		delete[] m_data;
-	if(m_flags)
-		delete[] m_flags;
 }
 
 void VoxelManipulator::clear()
 {
 	// Reset area to volume=0
 	m_area = VoxelArea();
-	if(m_data)
-		delete[] m_data;
-	m_data = NULL;
-	if(m_flags)
-		delete[] m_flags;
-	m_flags = NULL;
+	delete[] m_data;
+	m_data = nullptr;
+	delete[] m_flags;
+	m_flags = nullptr;
 }
 
-void VoxelManipulator::print(std::ostream &o, VoxelPrintMode mode)
+void VoxelManipulator::print(std::ostream &o, INodeDefManager *ndef,
+		VoxelPrintMode mode)
 {
-	v3s16 em = m_area.getExtent();
+	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)
@@ -88,15 +76,14 @@ void VoxelManipulator::print(std::ostream &o, VoxelPrintMode mode)
 			{
 				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';
-					u8 m = m_data[m_area.index(x,y,z)].d;
-					u8 pr = m_data[m_area.index(x,y,z)].pressure;
+					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)
@@ -104,13 +91,13 @@ void VoxelManipulator::print(std::ostream &o, VoxelPrintMode mode)
 					}
 					else if(mode == VOXELPRINT_WATERPRESSURE)
 					{
-						if(m == CONTENT_WATER)
+						if(ndef->get(m).isLiquid())
 						{
 							c = 'w';
 							if(pr <= 9)
 								c = pr + '0';
 						}
-						else if(liquid_replaces_content(m))
+						else if(m == CONTENT_AIR)
 						{
 							c = ' ';
 						}
@@ -119,6 +106,21 @@ void VoxelManipulator::print(std::ostream &o, VoxelPrintMode mode)
 							c = '#';
 						}
 					}
+					else if(mode == VOXELPRINT_LIGHT_DAY)
+					{
+						if(ndef->get(m).light_source != 0)
+							c = 'S';
+						else if(ndef->get(m).light_propagates == false)
+							c = 'X';
+						else
+						{
+							u8 light = n.getLight(LIGHTBANK_DAY, ndef);
+							if(light < 10)
+								c = '0' + light;
+							else
+								c = 'a' + (light-10);
+						}
+					}
 				}
 				o<<c;
 			}
@@ -128,22 +130,22 @@ void VoxelManipulator::print(std::ostream &o, VoxelPrintMode mode)
 	}
 }
 
-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))
+	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;
 	// New area is the requested area if m_area has zero volume
-	if(m_area.getExtent() == v3s16(0,0,0))
+	if(m_area.hasEmptyExtent())
 	{
 		new_area = area;
 	}
@@ -165,32 +167,31 @@ void VoxelManipulator::addArea(VoxelArea area)
 	dstream<<", new_size="<<new_size;
 	dstream<<std::endl;*/
 
-	// Allocate and clear new data
+	// Allocate new data and clear flags
 	MapNode *new_data = new MapNode[new_size];
+	assert(new_data);
 	u8 *new_flags = new u8[new_size];
-	for(s32 i=0; i<new_size; i++)
-	{
-		new_flags[i] = VOXELFLAG_NOT_LOADED;
-	}
-	
+	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++)
 	{
-		// If loaded, copy data and flags
-		if((m_flags[m_area.index(x,y,z)] & VOXELFLAG_NOT_LOADED) == false)
-		{
-			new_data[new_area.index(x,y,z)] = m_data[m_area.index(x,y,z)];
-			new_flags[new_area.index(x,y,z)] = m_flags[m_area.index(x,y,z)];
-		}
+		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;
 
@@ -199,100 +200,89 @@ void VoxelManipulator::addArea(VoxelArea area)
 
 	m_data = new_data;
 	m_flags = new_flags;
-	
-	if(old_data)
-		delete[] old_data;
-	if(old_flags)
-		delete[] old_flags;
+
+	delete[] old_data;
+	delete[] old_flags;
 
 	//dstream<<"addArea done"<<std::endl;
 }
 
-void VoxelManipulator::copyFrom(MapNode *src, VoxelArea src_area,
-		v3s16 from_pos, v3s16 to_pos, v3s16 size)
+void VoxelManipulator::copyFrom(MapNode *src, const VoxelArea& src_area,
+		v3s16 from_pos, v3s16 to_pos, const v3s16 &size)
 {
-	for(s16 z=0; z<size.Z; z++)
-	for(s16 y=0; y<size.Y; y++)
-	{
-		s32 i_src = src_area.index(from_pos.X, from_pos.Y+y, from_pos.Z+z);
-		s32 i_local = m_area.index(to_pos.X, to_pos.Y+y, to_pos.Z+z);
-		memcpy(&m_data[i_local], &src[i_src], size.X*sizeof(MapNode));
-		memset(&m_flags[i_local], 0, size.X);
+	/* 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;
+		}
+		i_local += dest_mod;
 	}
 }
 
-void VoxelManipulator::interpolate(VoxelArea area)
+void VoxelManipulator::copyTo(MapNode *dst, const VoxelArea& dst_area,
+		v3s16 dst_pos, v3s16 from_pos, const v3s16 &size)
 {
-	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());
-
-	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++)
+	for(s16 z=0; z<size.Z; z++)
+	for(s16 y=0; y<size.Y; y++)
 	{
-		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 = CONTENT_IGNORE;
-
-		for(s16 i=0; i<8; i++)
-		//for(s16 i=0; i<26; i++)
-		{
-			v3s16 p2 = p + dirs[i];
-
-			u8 f = m_flags[m_area.index(p2)];
-			assert(!(f & VOXELFLAG_NOT_LOADED));
-			if(f & VOXELFLAG_INEXISTENT)
-				continue;
-
-			MapNode &n = m_data[m_area.index(p2)];
-
-			airness += (n.d == CONTENT_AIR) ? 1 : -1;
-			total++;
-
-			if(m == CONTENT_IGNORE && n.d != CONTENT_AIR)
-				m = n.d;
+		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++;
 		}
-
-		// 1 if air, 0 if not
-		buf[area.index(p)] = airness > -total/2 ? CONTENT_AIR : m;
-		//buf[area.index(p)] = airness > -total ? CONTENT_AIR : m;
-		//buf[area.index(p)] = airness >= -7 ? CONTENT_AIR : m;
-	}
-
-	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)];
 	}
 }
 
+/*
+	Algorithms
+	-----------------------------------------------------
+*/
 
 void VoxelManipulator::clearFlag(u8 flags)
 {
 	// 0-1ms on moderate area
 	TimeTaker timer("clearFlag", &clearflag_time);
 
-	v3s16 s = m_area.getExtent();
+	//v3s16 s = m_area.getExtent();
 
 	/*dstream<<"clearFlag clearing area of size "
 			<<""<<s.X<<"x"<<s.Y<<"x"<<s.Z<<""
@@ -329,636 +319,228 @@ void VoxelManipulator::clearFlag(u8 flags)
 			<<volume<<" nodes"<<std::endl;*/
 }
 
-int VoxelManipulator::getWaterPressure(v3s16 p, s16 &highest_y, int recur_count)
+void VoxelManipulator::unspreadLight(enum LightBank bank, v3s16 p, u8 oldlight,
+		std::set<v3s16> & light_sources, INodeDefManager *nodemgr)
 {
-	m_flags[m_area.index(p)] |= VOXELFLAG_CHECKED2;
-
-	if(p.Y > highest_y)
-		highest_y = p.Y;
-	
-	/*if(recur_count > 1000)
-		throw ProcessingLimitException
-				("getWaterPressure recur_count limit reached");*/
-	
-	if(recur_count > 10000)
-		return -1;
-	
-	recur_count++;
-
 	v3s16 dirs[6] = {
-		v3s16(0,1,0), // top
 		v3s16(0,0,1), // back
-		v3s16(0,0,-1), // front
+		v3s16(0,1,0), // top
 		v3s16(1,0,0), // right
-		v3s16(-1,0,0), // left
+		v3s16(0,0,-1), // front
 		v3s16(0,-1,0), // bottom
+		v3s16(-1,0,0), // left
 	};
 
-	// Load neighboring nodes
-	emerge(VoxelArea(p - v3s16(1,1,1), p + v3s16(1,1,1)), 1);
+	VoxelArea voxel_area(p - v3s16(1,1,1), p + v3s16(1,1,1));
+	addArea(voxel_area);
 
-	s32 i;
-	for(i=0; i<6; i++)
+	// Loop through 6 neighbors
+	for(u16 i=0; i<6; i++)
 	{
-		v3s16 p2 = p + dirs[i];
-		u8 f = m_flags[m_area.index(p2)];
-		// Ignore inexistent or checked nodes
-		if(f & (VOXELFLAG_INEXISTENT | VOXELFLAG_CHECKED2))
-			continue;
-		MapNode &n = m_data[m_area.index(p2)];
-		// Ignore non-liquid nodes
-		if(content_liquid(n.d) == false)
+		// Get the position of the neighbor node
+		v3s16 n2pos = p + dirs[i];
+
+		u32 n2i = m_area.index(n2pos);
+
+		if(m_flags[n2i] & VOXELFLAG_NO_DATA)
 			continue;
 
-		int pr;
+		MapNode &n2 = m_data[n2i];
 
-		// If at ocean surface
-		if(n.pressure == 1 && n.d == CONTENT_OCEAN)
-		//if(n.pressure == 1) // Causes glitches but is fast
-		{
-			pr = 1;
-		}
-		// Otherwise recurse more
-		else
+		/*
+			If the neighbor is dimmer than what was specified
+			as oldlight (the light of the previous node)
+		*/
+		u8 light2 = n2.getLight(bank, nodemgr);
+		if(light2 < oldlight)
 		{
-			pr = getWaterPressure(p2, highest_y, recur_count);
-			if(pr == -1)
-				continue;
-		}
+			/*
+				And the neighbor is transparent and it has some light
+			*/
+			if(nodemgr->get(n2).light_propagates && light2 != 0)
+			{
+				/*
+					Set light to 0 and add to queue
+				*/
 
-		// If block is at top, pressure here is one higher
-		if(i == 0)
-		{
-			if(pr < 255)
-				pr++;
+				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
+				*/
+				/*if(light_sources.find(n2pos))
+				{
+					std::cout<<"Removed from light_sources"<<std::endl;
+					light_sources.remove(n2pos);
+				}*/
+			}
 		}
-		// If block is at bottom, pressure here is one lower
-		else if(i == 5)
-		{
-			if(pr > 1)
-				pr--;
+		else{
+			light_sources.insert(n2pos);
 		}
-		
-		// Node is on the pressure route
-		m_flags[m_area.index(p)] |= VOXELFLAG_CHECKED4;
-
-		// Got pressure
-		return pr;
 	}
-	
-	// Nothing useful found
-	return -1;
 }
 
-void VoxelManipulator::spreadWaterPressure(v3s16 p, int pr,
-		VoxelArea request_area,
-		core::map<v3s16, u8> &active_nodes,
-		int recur_count)
+void VoxelManipulator::spreadLight(enum LightBank bank, v3s16 p,
+		INodeDefManager *nodemgr)
 {
-	//if(recur_count > 10000)
-		/*throw ProcessingLimitException
-				("spreadWaterPressure recur_count limit reached");*/
-	if(recur_count > 10)
-		return;
-	recur_count++;
-	
-	/*dstream<<"spreadWaterPressure: p=("
-			<<p.X<<","<<p.Y<<","<<p.Z<<")"
-			<<", oldpr="<<(int)m_data[m_area.index(p)].pressure
-			<<", pr="<<pr
-			<<", recur_count="<<recur_count
-			<<", request_area=";
-	request_area.print(dstream);
-	dstream<<std::endl;*/
-
-	m_flags[m_area.index(p)] |= VOXELFLAG_CHECKED3;
-	m_data[m_area.index(p)].pressure = pr;
-
-	v3s16 dirs[6] = {
+	const v3s16 dirs[6] = {
+		v3s16(0,0,1), // back
 		v3s16(0,1,0), // top
-		v3s16(-1,0,0), // left
 		v3s16(1,0,0), // right
 		v3s16(0,0,-1), // front
-		v3s16(0,0,1), // back
 		v3s16(0,-1,0), // bottom
+		v3s16(-1,0,0), // left
 	};
 
-	// Load neighboring nodes
-	emerge(VoxelArea(p - v3s16(1,1,1), p + v3s16(1,1,1)), 2);
-
-	s32 i;
-	for(i=0; i<6; i++)
-	{
-		v3s16 p2 = p + dirs[i];
-		
-		u8 f = m_flags[m_area.index(p2)];
-
-		// Ignore inexistent and checked nodes
-		if(f & (VOXELFLAG_INEXISTENT | VOXELFLAG_CHECKED3))
-			continue;
-
-		MapNode &n = m_data[m_area.index(p2)];
-		
-		/*
-			If material is air:
-				add to active_nodes if there is flow-causing pressure.
-			NOTE: Do not remove anything from there. We cannot know
-			      here if some other neighbor of it causes flow.
-		*/
-		if(liquid_replaces_content(n.d))
-		{
-			bool pressure_causes_flow = false;
-			// If empty block is at top
-			if(i == 0)
-			{
-				if(m_disable_water_climb)
-					continue;
-				
-				//if(pr >= PRESERVE_WATER_VOLUME ? 3 : 2)
-				if(pr >= 3)
-					pressure_causes_flow = true;
-			}
-			// If block is at bottom
-			else if(i == 5)
-			{
-				pressure_causes_flow = true;
-			}
-			// If block is at side
-			else
-			{
-				//if(pr >= PRESERVE_WATER_VOLUME ? 2 : 1)
-				if(pr >= 2)
-					pressure_causes_flow = true;
-			}
-			
-			if(pressure_causes_flow)
-			{
-				active_nodes[p2] = 1;
-			}
-
-			continue;
-		}
+	VoxelArea voxel_area(p - v3s16(1,1,1), p + v3s16(1,1,1));
+	addArea(voxel_area);
 
-		// Ignore non-liquid nodes
-		if(content_liquid(n.d) == false)
-			continue;
+	u32 i = m_area.index(p);
 
-		int pr2 = pr;
-		// If block is at top, pressure there is lower
-		if(i == 0)
-		{
-			if(pr2 > 0)
-				pr2--;
-		}
-		// If block is at bottom, pressure there is higher
-		else if(i == 5)
-		{
-			if(pr2 < 255)
-				pr2++;
-		}
-
-		/*if(m_disable_water_climb)
-		{
-			if(pr2 > 3)
-				pr2 = 3;
-		}*/
-		
-		// Ignore if correct pressure is already set and is not on
-		// request_area.
-		// Thus, request_area can be used for updating as much
-		// pressure info in some area as possible to possibly
-		// make some calls to getWaterPressure unnecessary.
-		if(n.pressure == pr2 && request_area.contains(p2) == false)
-			continue;
+	if(m_flags[i] & VOXELFLAG_NO_DATA)
+		return;
 
-		spreadWaterPressure(p2, pr2, request_area, active_nodes, recur_count);
-	}
-}
+	MapNode &n = m_data[i];
 
-void VoxelManipulator::updateAreaWaterPressure(VoxelArea a,
-		core::map<v3s16, u8> &active_nodes,
-		bool checked3_is_clear)
-{
-	TimeTaker timer("updateAreaWaterPressure", &updateareawaterpressure_time);
+	u8 oldlight = n.getLight(bank, nodemgr);
+	u8 newlight = diminish_light(oldlight);
 
-	emerge(a, 3);
-	
-	bool checked2_clear = false;
-	
-	if(checked3_is_clear == false)
+	// Loop through 6 neighbors
+	for(u16 i=0; i<6; i++)
 	{
-		//clearFlag(VOXELFLAG_CHECKED3);
+		// Get the position of the neighbor node
+		v3s16 n2pos = p + dirs[i];
 
-		clearFlag(VOXELFLAG_CHECKED3 | VOXELFLAG_CHECKED2);
-		checked2_clear = true;
-	}
-	
+		u32 n2i = m_area.index(n2pos);
 
-	for(s32 z=a.MinEdge.Z; z<=a.MaxEdge.Z; z++)
-	for(s32 y=a.MinEdge.Y; y<=a.MaxEdge.Y; y++)
-	for(s32 x=a.MinEdge.X; x<=a.MaxEdge.X; x++)
-	{
-		v3s16 p(x,y,z);
-
-		u8 f = m_flags[m_area.index(p)];
-		// Ignore inexistent or checked nodes
-		if(f & (VOXELFLAG_INEXISTENT | VOXELFLAG_CHECKED3))
-			continue;
-		MapNode &n = m_data[m_area.index(p)];
-		// Ignore non-liquid nodes
-		if(content_liquid(n.d) == false)
+		if(m_flags[n2i] & VOXELFLAG_NO_DATA)
 			continue;
-		
-		if(checked2_clear == false)
-		{
-			clearFlag(VOXELFLAG_CHECKED2);
-			checked2_clear = true;
-		}
 
-		checked2_clear = false;
+		MapNode &n2 = m_data[n2i];
 
-		s16 highest_y = -32768;
-		int recur_count = 0;
-		int pr = -1;
-
-		try
-		{
-			// 0-1ms @ recur_count <= 100
-			//TimeTaker timer("getWaterPressure", g_irrlicht);
-			pr = getWaterPressure(p, highest_y, recur_count);
-		}
-		catch(ProcessingLimitException &e)
-		{
-			//dstream<<"getWaterPressure ProcessingLimitException"<<std::endl;
-		}
+		u8 light2 = n2.getLight(bank, nodemgr);
 
-		if(pr == -1)
-		{
-			assert(highest_y != -32768);
-
-			pr = highest_y - p.Y + 1;
-			if(pr > 255)
-				pr = 255;
-
-			/*dstream<<"WARNING: Pressure at ("
-					<<p.X<<","<<p.Y<<","<<p.Z<<")"
-					<<" = "<<pr
-					//<<" and highest_y == -32768"
-					<<std::endl;
-			assert(highest_y != -32768);
-			continue;*/
-		}
-		
-		try
+		/*
+			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))
 		{
-			// 0ms
-			//TimeTaker timer("spreadWaterPressure", g_irrlicht);
-			spreadWaterPressure(p, pr, a, active_nodes, 0);
+			spreadLight(bank, n2pos, nodemgr);
 		}
-		catch(ProcessingLimitException &e)
+		/*
+			If the neighbor is dimmer than how much light this node
+			would spread on it, add to list
+		*/
+		if(light2 < newlight)
 		{
-			//dstream<<"getWaterPressure ProcessingLimitException"<<std::endl;
+			if(nodemgr->get(n2).light_propagates)
+			{
+				n2.setLight(bank, newlight, nodemgr);
+				spreadLight(bank, n2pos, nodemgr);
+			}
 		}
 	}
 }
 
-bool VoxelManipulator::flowWater(v3s16 removed_pos,
-		core::map<v3s16, u8> &active_nodes,
-		int recursion_depth, bool debugprint,
-		u32 stoptime)
+
+const MapNode VoxelManipulator::ContentIgnoreNode = MapNode(CONTENT_IGNORE);
+
+/*
+	Lights neighbors of from_nodes, collects all them and then
+	goes on recursively.
+*/
+void VoxelManipulator::spreadLight(enum LightBank bank,
+		std::set<v3s16> & from_nodes, INodeDefManager *nodemgr)
 {
-	v3s16 dirs[6] = {
-		v3s16(0,1,0), // top
-		v3s16(0,0,-1), // front
+	const v3s16 dirs[6] = {
 		v3s16(0,0,1), // back
-		v3s16(-1,0,0), // left
+		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
 	};
 
-	recursion_depth++;
+	if(from_nodes.empty())
+		return;
 
-	v3s16 p;
-	bool from_ocean = false;
-	
-	// Randomize horizontal order
-	static s32 cs = 0;
-	if(cs < 3)
-		cs++;
-	else
-		cs = 0;
-	s16 s1 = (cs & 1) ? 1 : -1;
-	s16 s2 = (cs & 2) ? 1 : -1;
-	//dstream<<"s1="<<s1<<", s2="<<s2<<std::endl;
+	std::set<v3s16> lighted_nodes;
 
+	for(std::set<v3s16>::iterator j = from_nodes.begin();
+		j != from_nodes.end(); ++j)
 	{
-	TimeTaker timer1("flowWater pre", &flowwater_pre_time);
-	
-	// Load neighboring nodes
-	emerge(VoxelArea(removed_pos - v3s16(1,1,1), removed_pos + v3s16(1,1,1)), 4);
-	
-	// Ignore incorrect removed_pos
-	{
-		u8 f = m_flags[m_area.index(removed_pos)];
-		// Ignore inexistent or checked node
-		if(f & (VOXELFLAG_INEXISTENT | VOXELFLAG_CHECKED))
-			return false;
-		MapNode &n = m_data[m_area.index(removed_pos)];
-		// Ignore nodes to which the water can't go
-		if(liquid_replaces_content(n.d) == false)
-			return false;
-	}
-	
-	s32 i;
-	for(i=0; i<6; i++)
-	{
-		// Don't raise water from bottom
-		if(m_disable_water_climb && i == 5)
-			continue;
+		v3s16 pos = *j;
 
-		p = removed_pos + v3s16(s1*dirs[i].X, dirs[i].Y, s2*dirs[i].Z);
+		VoxelArea voxel_area(pos - v3s16(1,1,1), pos + v3s16(1,1,1));
+		addArea(voxel_area);
 
-		u8 f = m_flags[m_area.index(p)];
-		// Inexistent or checked nodes can't move
-		if(f & (VOXELFLAG_INEXISTENT | VOXELFLAG_CHECKED))
-			continue;
-		MapNode &n = m_data[m_area.index(p)];
-		// Only liquid nodes can move
-		if(content_liquid(n.d) == false)
-			continue;
-		// If block is at top, select it always
-		if(i == 0)
-		{
-			break;
-		}
-		// If block is at bottom, select it if it has enough pressure
-		if(i == 5)
-		{
-			//if(n.pressure >= PRESERVE_WATER_VOLUME ? 3 : 2)
-			if(n.pressure >= 3)
-				break;
-			continue;
-		}
-		// Else block is at some side. Select it if it has enough pressure
-		//if(n.pressure >= PRESERVE_WATER_VOLUME ? 2 : 1)
-		if(n.pressure >= 2)
-		{
-			break;
-		}
-	}
-
-	// If there is nothing to move, return
-	if(i==6)
-		return false;
-
-	/*
-		Move water and bubble
-	*/
-
-	u8 m = m_data[m_area.index(p)].d;
-	u8 f = m_flags[m_area.index(p)];
-
-	if(m == CONTENT_OCEAN)
-		from_ocean = true;
+		u32 i = m_area.index(pos);
 
-	// Move air bubble if not taking water from ocean
-	if(from_ocean == false)
-	{
-		m_data[m_area.index(p)].d = m_data[m_area.index(removed_pos)].d;
-		m_flags[m_area.index(p)] = m_flags[m_area.index(removed_pos)];
-	}
-	
-	/*
-		This has to be done to copy the brightness of a light source
-		correctly. Otherwise unspreadLight will fuck up when water
-		has replaced a light source.
-	*/
-	u8 light = m_data[m_area.index(removed_pos)].getLightBanksWithSource();
-
-	m_data[m_area.index(removed_pos)].d = m;
-	m_flags[m_area.index(removed_pos)] = f;
-
-	m_data[m_area.index(removed_pos)].setLightBanks(light);
-	
-	// Mark removed_pos checked
-	m_flags[m_area.index(removed_pos)] |= VOXELFLAG_CHECKED;
-
-	// If block was dropped from surface, increase pressure
-	if(i == 0 && m_data[m_area.index(removed_pos)].pressure == 1)
-	{
-		m_data[m_area.index(removed_pos)].pressure = 2;
-	}
-	
-	/*
-	NOTE: This does not work as-is
-	if(m == CONTENT_OCEAN)
-	{
-		// If block was raised to surface, increase pressure of
-		// source node
-		if(i == 5 && m_data[m_area.index(p)].pressure == 1)
-		{
-			m_data[m_area.index(p)].pressure = 2;
-		}
-	}*/
-	
-	/*if(debugprint)
-	{
-		dstream<<"VoxelManipulator::flowWater(): Moved bubble:"<<std::endl;
-		print(dstream, VOXELPRINT_WATERPRESSURE);
-	}*/
-
-	// Update pressure
-	VoxelArea a;
-	a.addPoint(p - v3s16(1,1,1));
-	a.addPoint(p + v3s16(1,1,1));
-	a.addPoint(removed_pos - v3s16(1,1,1));
-	a.addPoint(removed_pos + v3s16(1,1,1));
-	updateAreaWaterPressure(a, active_nodes);
-	
-	/*if(debugprint)
-	{
-		dstream<<"VoxelManipulator::flowWater(): Pressure updated:"<<std::endl;
-		print(dstream, VOXELPRINT_WATERPRESSURE);
-		//std::cin.get();
-	}*/
-
-	if(debugprint)
-	{
-		dstream<<"VoxelManipulator::flowWater(): step done:"<<std::endl;
-		print(dstream, VOXELPRINT_WATERPRESSURE);
-		//std::cin.get();
-	}
-	
-	}//timer1
-	
-	//if(PRESERVE_WATER_VOLUME)
-	if(from_ocean == false)
-	{
-		// Flow water to the newly created empty position
-		/*flowWater(p, active_nodes, recursion_depth,
-				debugprint, counter, counterlimit);*/
-		flowWater(p, active_nodes, recursion_depth,
-				debugprint, stoptime);
-	}
-	
-	if(stoptime != 0)
-	{
-		u32 timenow = getTimeMs();
-		// Well, it is a bit hard to guess because we don't know the
-		// start time...
-		bool overflow = timenow < stoptime - 100000;
-		if(timenow >= stoptime || overflow)
-		{
-			dstream<<"flowWater: stoptime reached"<<std::endl;
-			throw ProcessingLimitException("flowWater stoptime reached");
-		}
-	}
-	
-find_again:
-	
-	// Try flowing water to empty positions around removed_pos.
-	// They are checked in reverse order compared to the previous loop.
-	for(s32 i=5; i>=0; i--)
-	{
-		// Don't try to flow to top
-		if(m_disable_water_climb && i == 0)
+		if(m_flags[i] & VOXELFLAG_NO_DATA)
 			continue;
 
-		//v3s16 p = removed_pos + dirs[i];
-		p = removed_pos + v3s16(s1*dirs[i].X, dirs[i].Y, s2*dirs[i].Z);
+		MapNode &n = m_data[i];
 
-		u8 f = m_flags[m_area.index(p)];
-		// Water can't move to inexistent nodes
-		if(f & VOXELFLAG_INEXISTENT)
-			continue;
-		MapNode &n = m_data[m_area.index(p)];
-		// Water can only move to air
-		if(liquid_replaces_content(n.d) == false)
-			continue;
-			
-		// Flow water to node
-		bool moved =
-		flowWater(p, active_nodes, recursion_depth,
-				debugprint, stoptime);
-		/*flowWater(p, active_nodes, recursion_depth,
-				debugprint, counter, counterlimit);*/
-		
-		if(moved)
-		{
-			// Search again from all neighbors
-			goto find_again;
-		}
-	}
-
-	return true;
-}
+		u8 oldlight = n.getLight(bank, nodemgr);
+		u8 newlight = diminish_light(oldlight);
 
-void VoxelManipulator::flowWater(
-		core::map<v3s16, u8> &active_nodes,
-		int recursion_depth, bool debugprint,
-		u32 timelimit)
-{
-	addarea_time = 0;
-	emerge_time = 0;
-	emerge_load_time = 0;
-	clearflag_time = 0;
-	updateareawaterpressure_time = 0;
-	flowwater_pre_time = 0;
-
-	if(active_nodes.size() == 0)
-	{
-		dstream<<"flowWater: no active nodes"<<std::endl;
-		return;
-	}
-
-	//TimeTaker timer1("flowWater (active_nodes)", g_irrlicht);
-
-	//dstream<<"active_nodes.size() = "<<active_nodes.size()<<std::endl;
-
-
-	u32 stoptime = 0;
-	stoptime = getTimeMs() + timelimit;
+		// Loop through 6 neighbors
+		for(u16 i=0; i<6; i++)
+		{
+			// Get the position of the neighbor node
+			v3s16 n2pos = pos + dirs[i];
 
-	// Count of handled active nodes
-	u32 handled_count = 0;
+			try
+			{
+				u32 n2i = m_area.index(n2pos);
 
-	try
-	{
+				if(m_flags[n2i] & VOXELFLAG_NO_DATA)
+					continue;
 
-	/*
-		Take random one at first
+				MapNode &n2 = m_data[n2i];
 
-		This is randomized only at the first time so that all
-		subsequent nodes will be taken at roughly the same position
-	*/
-	s32 k = 0;
-	if(active_nodes.size() != 0)
-		k = (s32)rand() % (s32)active_nodes.size();
+				u8 light2 = n2.getLight(bank, nodemgr);
 
-	// Flow water to active nodes
-	for(;;)
-	//for(s32 h=0; h<1; h++)
-	{
-		if(active_nodes.size() == 0)
-			break;
-
-		handled_count++;
-		
-		// Clear check flags
-		clearFlag(VOXELFLAG_CHECKED);
-		
-		//dstream<<"Selecting a new active_node"<<std::endl;
-
-#if 0
-		// Take first one
-		core::map<v3s16, u8>::Node
-				*n = active_nodes.getIterator().getNode();
-#endif
-
-#if 1
-		
-		core::map<v3s16, u8>::Iterator
-				i = active_nodes.getIterator().getNode();
-		for(s32 j=0; j<k; j++)
-		{
-			i++;
+				/*
+					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);
+				}
+				/*
+					If the neighbor is dimmer than how much light this node
+					would spread on it, add to list
+				*/
+				if(light2 < newlight)
+				{
+					if(nodemgr->get(n2).light_propagates)
+					{
+						n2.setLight(bank, newlight, nodemgr);
+						lighted_nodes.insert(n2pos);
+					}
+				}
+			}
+			catch(InvalidPositionException &e)
+			{
+				continue;
+			}
 		}
-		core::map<v3s16, u8>::Node *n = i.getNode();
-
-		// Decrement index if less than 0.
-		// This keeps us in existing indices always.
-		if(k > 0)
-			k--;
-#endif
-
-		v3s16 p = n->getKey();
-		active_nodes.remove(p);
-		flowWater(p, active_nodes, recursion_depth,
-				debugprint, stoptime);
 	}
 
-	}
-	catch(ProcessingLimitException &e)
-	{
-		//dstream<<"getWaterPressure ProcessingLimitException"<<std::endl;
-	}
-	
-	/*v3s16 e = m_area.getExtent();
-	s32 v = m_area.getVolume();
-	dstream<<"flowWater (active): "
-			<<"area ended up as "
-			<<e.X<<"x"<<e.Y<<"x"<<e.Z<<" = "<<v
-			<<", handled a_node count: "<<handled_count
-			<<", active_nodes.size() = "<<active_nodes.size()
-			<<std::endl;
-	dstream<<"addarea_time: "<<addarea_time
-			<<", emerge_time: "<<emerge_time
-			<<", emerge_load_time: "<<emerge_load_time
-			<<", clearflag_time: "<<clearflag_time
-			<<", flowwater_pre_time: "<<flowwater_pre_time
-			<<", updateareawaterpressure_time: "<<updateareawaterpressure_time
+	/*dstream<<"spreadLight(): Changed block "
+			<<blockchangecount<<" times"
+			<<" for "<<from_nodes.size()<<" nodes"
 			<<std::endl;*/
-}
 
+	if(!lighted_nodes.empty())
+		spreadLight(bank, lighted_nodes, nodemgr);
+}
 
 //END