X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Fmapnode.cpp;h=54be5d1d6c64d64d7c63f4cba76605c84b49799a;hb=e53794868eaa33199a1f1011b2d5f517b6f68057;hp=1e9b64989767f440e45e87061076fa3131cf8c7d;hpb=2abe6ed75c22a0cb3154043446100baab01624fd;p=oweals%2Fminetest.git

diff --git a/src/mapnode.cpp b/src/mapnode.cpp
index 1e9b64989..54be5d1d6 100644
--- a/src/mapnode.cpp
+++ b/src/mapnode.cpp
@@ -19,230 +19,121 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 
 #include "common_irrlicht.h"
 #include "mapnode.h"
-#include "tile.h"
 #include "porting.h"
 #include <string>
-#include "mineral.h"
-// For g_settings
-#include "main.h"
-#include "content_mapnode.h"
-#include "nodemetadata.h"
+#include "main.h" // For g_settings
+#include "nodedef.h"
+#include "content_mapnode.h" // For mapnode_translate_*_internal
+#include "serialization.h" // For ser_ver_supported
 
-ContentFeatures::~ContentFeatures()
+/*
+	MapNode
+*/
+
+// Create directly from a nodename
+// If name is unknown, sets CONTENT_IGNORE
+MapNode::MapNode(INodeDefManager *ndef, const std::string &name,
+		u8 a_param1, u8 a_param2)
 {
-	/*if(translate_to)
-		delete translate_to;*/
-	if(initial_metadata)
-		delete initial_metadata;
+	content_t id = CONTENT_IGNORE;
+	ndef->getId(name, id);
+	param1 = a_param1;
+	param2 = a_param2;
+	// Set content (param0 and (param2&0xf0)) after other params
+	// because this needs to override part of param2
+	setContent(id);
 }
 
-void ContentFeatures::setTexture(u16 i, std::string name, u8 alpha)
+void MapNode::setLight(enum LightBank bank, u8 a_light, INodeDefManager *nodemgr)
 {
-	if(g_texturesource)
+	// If node doesn't contain light data, ignore this
+	if(nodemgr->get(*this).param_type != CPT_LIGHT)
+		return;
+	if(bank == LIGHTBANK_DAY)
 	{
-		tiles[i].texture = g_texturesource->getTexture(name);
+		param1 &= 0xf0;
+		param1 |= a_light & 0x0f;
 	}
-	
-	if(alpha != 255)
+	else if(bank == LIGHTBANK_NIGHT)
 	{
-		tiles[i].alpha = alpha;
-		tiles[i].material_type = MATERIAL_ALPHA_VERTEX;
+		param1 &= 0x0f;
+		param1 |= (a_light & 0x0f)<<4;
 	}
-
-	if(inventory_texture == NULL)
-		setInventoryTexture(name);
-}
-
-void ContentFeatures::setInventoryTexture(std::string imgname)
-{
-	if(g_texturesource == NULL)
-		return;
-	
-	imgname += "^[forcesingle";
-	
-	inventory_texture = g_texturesource->getTextureRaw(imgname);
-}
-
-void ContentFeatures::setInventoryTextureCube(std::string top,
-		std::string left, std::string right)
-{
-	if(g_texturesource == NULL)
-		return;
-	
-	str_replace_char(top, '^', '&');
-	str_replace_char(left, '^', '&');
-	str_replace_char(right, '^', '&');
-
-	std::string imgname_full;
-	imgname_full += "[inventorycube{";
-	imgname_full += top;
-	imgname_full += "{";
-	imgname_full += left;
-	imgname_full += "{";
-	imgname_full += right;
-	inventory_texture = g_texturesource->getTextureRaw(imgname_full);
+	else
+		assert(0);
 }
 
-struct ContentFeatures g_content_features[256];
-
-ContentFeatures & content_features(u8 i)
+u8 MapNode::getLight(enum LightBank bank, INodeDefManager *nodemgr) const
 {
-	return g_content_features[i];
+	// Select the brightest of [light source, propagated light]
+	const ContentFeatures &f = nodemgr->get(*this);
+	u8 light = 0;
+	if(f.param_type == CPT_LIGHT)
+	{
+		if(bank == LIGHTBANK_DAY)
+			light = param1 & 0x0f;
+		else if(bank == LIGHTBANK_NIGHT)
+			light = (param1>>4)&0x0f;
+		else
+			assert(0);
+	}
+	if(f.light_source > light)
+		light = f.light_source;
+	return light;
 }
 
-/*
-	See mapnode.h for description.
-*/
-void init_mapnode()
+bool MapNode::getLightBanks(u8 &lightday, u8 &lightnight, INodeDefManager *nodemgr) const
 {
-	if(g_texturesource == NULL)
-	{
-		dstream<<"INFO: Initial run of init_mapnode with "
-				"g_texturesource=NULL. If this segfaults, "
-				"there is a bug with something not checking for "
-				"the NULL value."<<std::endl;
-	}
-	else
+	// Select the brightest of [light source, propagated light]
+	const ContentFeatures &f = nodemgr->get(*this);
+	if(f.param_type == CPT_LIGHT)
 	{
-		dstream<<"INFO: Full run of init_mapnode with "
-				"g_texturesource!=NULL"<<std::endl;
+		lightday = param1 & 0x0f;
+		lightnight = (param1>>4)&0x0f;
 	}
-
-	/*// Read some settings
-	bool new_style_water = g_settings.getBool("new_style_water");
-	bool new_style_leaves = g_settings.getBool("new_style_leaves");*/
-
-	/*
-		Initialize content feature table
-	*/
-	
-	/*
-		Set initial material type to same in all tiles, so that the
-		same material can be used in more stuff.
-		This is set according to the leaves because they are the only
-		differing material to which all materials can be changed to
-		get this optimization.
-	*/
-	u8 initial_material_type = MATERIAL_ALPHA_SIMPLE;
-	/*if(new_style_leaves)
-		initial_material_type = MATERIAL_ALPHA_SIMPLE;
 	else
-		initial_material_type = MATERIAL_ALPHA_NONE;*/
-	for(u16 i=0; i<256; i++)
-	{
-		ContentFeatures *f = &g_content_features[i];
-		// Re-initialize
-		f->reset();
-
-		for(u16 j=0; j<6; j++)
-			f->tiles[j].material_type = initial_material_type;
-	}
-
-	/*
-		Initially set every block to be shown as an unknown block.
-		Don't touch CONTENT_IGNORE or CONTENT_AIR.
-	*/
-	for(u16 i=0; i<256; i++)
 	{
-		if(i == CONTENT_IGNORE || i == CONTENT_AIR)
-			continue;
-		ContentFeatures *f = &g_content_features[i];
-		f->setAllTextures("unknown_block.png");
-		f->dug_item = std::string("MaterialItem ")+itos(i)+" 1";
+		lightday = 0;
+		lightnight = 0;
 	}
-
-	/*
-		Initialize mapnode content
-	*/
-	content_mapnode_init();
-	
+	if(f.light_source > lightday)
+		lightday = f.light_source;
+	if(f.light_source > lightnight)
+		lightnight = f.light_source;
+	return f.param_type == CPT_LIGHT || f.light_source != 0;
 }
 
-v3s16 facedir_rotate(u8 facedir, v3s16 dir)
+u8 MapNode::getFaceDir(INodeDefManager *nodemgr) const
 {
-	/*
-		Face 2 (normally Z-) direction:
-		facedir=0: Z-
-		facedir=1: X-
-		facedir=2: Z+
-		facedir=3: X+
-	*/
-	v3s16 newdir;
-	if(facedir==0) // Same
-		newdir = v3s16(dir.X, dir.Y, dir.Z);
-	else if(facedir == 1) // Face is taken from rotXZccv(-90)
-		newdir = v3s16(-dir.Z, dir.Y, dir.X);
-	else if(facedir == 2) // Face is taken from rotXZccv(180)
-		newdir = v3s16(-dir.X, dir.Y, -dir.Z);
-	else if(facedir == 3) // Face is taken from rotXZccv(90)
-		newdir = v3s16(dir.Z, dir.Y, -dir.X);
-	else
-		newdir = dir;
-	return newdir;
+	const ContentFeatures &f = nodemgr->get(*this);
+	if(f.param_type_2 == CPT2_FACEDIR)
+		return getParam2() & 0x03;
+	return 0;
 }
 
-TileSpec MapNode::getTile(v3s16 dir)
+u8 MapNode::getWallMounted(INodeDefManager *nodemgr) const
 {
-	if(content_features(d).param_type == CPT_FACEDIR_SIMPLE)
-		dir = facedir_rotate(param1, dir);
-	
-	TileSpec spec;
-	
-	s32 dir_i = -1;
-	
-	if(dir == v3s16(0,0,0))
-		dir_i = -1;
-	else if(dir == v3s16(0,1,0))
-		dir_i = 0;
-	else if(dir == v3s16(0,-1,0))
-		dir_i = 1;
-	else if(dir == v3s16(1,0,0))
-		dir_i = 2;
-	else if(dir == v3s16(-1,0,0))
-		dir_i = 3;
-	else if(dir == v3s16(0,0,1))
-		dir_i = 4;
-	else if(dir == v3s16(0,0,-1))
-		dir_i = 5;
-	
-	if(dir_i == -1)
-		// Non-directional
-		spec = content_features(d).tiles[0];
-	else 
-		spec = content_features(d).tiles[dir_i];
-	
-	/*
-		If it contains some mineral, change texture id
-	*/
-	if(content_features(d).param_type == CPT_MINERAL && g_texturesource)
-	{
-		u8 mineral = param & 0x1f;
-		std::string mineral_texture_name = mineral_block_texture(mineral);
-		if(mineral_texture_name != "")
-		{
-			u32 orig_id = spec.texture.id;
-			std::string texture_name = g_texturesource->getTextureName(orig_id);
-			//texture_name += "^blit:";
-			texture_name += "^";
-			texture_name += mineral_texture_name;
-			u32 new_id = g_texturesource->getTextureId(texture_name);
-			spec.texture = g_texturesource->getTexture(new_id);
-		}
-	}
-
-	return spec;
+	const ContentFeatures &f = nodemgr->get(*this);
+	if(f.param_type_2 == CPT2_WALLMOUNTED)
+		return getParam2() & 0x07;
+	return 0;
 }
 
-u8 MapNode::getMineral()
+v3s16 MapNode::getWallMountedDir(INodeDefManager *nodemgr) const
 {
-	if(content_features(d).param_type == CPT_MINERAL)
+	switch(getWallMounted(nodemgr))
 	{
-		return param & 0x1f;
+	case 0: default: return v3s16(0,1,0);
+	case 1: return v3s16(0,-1,0);
+	case 2: return v3s16(1,0,0);
+	case 3: return v3s16(-1,0,0);
+	case 4: return v3s16(0,0,1);
+	case 5: return v3s16(0,0,-1);
 	}
-
-	return MINERAL_NONE;
 }
 
+
+
 u32 MapNode::serializedLength(u8 version)
 {
 	if(!ser_ver_supported(version))
@@ -259,134 +150,206 @@ void MapNode::serialize(u8 *dest, u8 version)
 {
 	if(!ser_ver_supported(version))
 		throw VersionMismatchException("ERROR: MapNode format not supported");
-		
-	u8 actual_d = d;
 
-	// Convert from new version to old
-	if(version <= 18)
+	if(version <= 21)
 	{
-		// In these versions, CONTENT_IGNORE and CONTENT_AIR
-		// are 255 and 254
-		if(actual_d == CONTENT_IGNORE)
-			actual_d = 255;
-		else if(actual_d == CONTENT_AIR)
-			actual_d = 254;
+		serialize_pre22(dest, version);
+		return;
 	}
 
-	if(version == 0)
-	{
-		dest[0] = actual_d;
-	}
-	else if(version <= 9)
-	{
-		dest[0] = actual_d;
-		dest[1] = param;
-	}
-	else
-	{
-		dest[0] = actual_d;
-		dest[1] = param;
-		dest[2] = param2;
-	}
+	writeU8(dest+0, param0);
+	writeU8(dest+1, param1);
+	writeU8(dest+2, param2);
 }
 void MapNode::deSerialize(u8 *source, u8 version)
 {
 	if(!ser_ver_supported(version))
 		throw VersionMismatchException("ERROR: MapNode format not supported");
 		
-	if(version == 0)
+	if(version <= 21)
 	{
-		d = source[0];
+		deSerialize_pre22(source, version);
+		return;
 	}
-	else if(version == 1)
+
+	param0 = readU8(source+0);
+	param1 = readU8(source+1);
+	param2 = readU8(source+2);
+}
+void MapNode::serializeBulk(std::ostream &os, int version,
+		const MapNode *nodes, u32 nodecount,
+		u8 content_width, u8 params_width, bool compressed)
+{
+	if(!ser_ver_supported(version))
+		throw VersionMismatchException("ERROR: MapNode format not supported");
+
+	assert(version >= 22);
+	assert(content_width == 1);
+	assert(params_width == 2);
+
+	SharedBuffer<u8> databuf(nodecount * (content_width + params_width));
+
+	// Serialize content
+	if(content_width == 1)
 	{
-		d = source[0];
-		// This version doesn't support saved lighting
-		if(light_propagates() || light_source() > 0)
-			param = 0;
-		else
-			param = source[1];
+		for(u32 i=0; i<nodecount; i++)
+			writeU8(&databuf[i], nodes[i].param0);
 	}
-	else if(version <= 9)
+	/* If param0 is extended to two bytes, use something like this: */
+	/*else if(content_width == 2)
+	{
+		for(u32 i=0; i<nodecount; i++)
+			writeU16(&databuf[i*2], nodes[i].param0);
+	}*/
+
+	// Serialize param1
+	u32 start1 = content_width * nodecount;
+	for(u32 i=0; i<nodecount; i++)
+		writeU8(&databuf[start1 + i], nodes[i].param1);
+
+	// Serialize param2
+	u32 start2 = (content_width + 1) * nodecount;
+	for(u32 i=0; i<nodecount; i++)
+		writeU8(&databuf[start2 + i], nodes[i].param2);
+
+	/*
+		Compress data to output stream
+	*/
+
+	if(compressed)
 	{
-		d = source[0];
-		param = source[1];
+		compressZlib(databuf, os);
 	}
 	else
 	{
-		d = source[0];
-		param = source[1];
-		param2 = source[2];
+		os.write((const char*) &databuf[0], databuf.getSize());
 	}
-	
-	// Convert from old version to new
-	if(version <= 18)
+}
+
+// Deserialize bulk node data
+void MapNode::deSerializeBulk(std::istream &is, int version,
+		MapNode *nodes, u32 nodecount,
+		u8 content_width, u8 params_width, bool compressed)
+{
+	if(!ser_ver_supported(version))
+		throw VersionMismatchException("ERROR: MapNode format not supported");
+
+	assert(version >= 22);
+	assert(content_width == 1);
+	assert(params_width == 2);
+
+	// Uncompress or read data
+	u32 len = nodecount * (content_width + params_width);
+	SharedBuffer<u8> databuf(len);
+	if(compressed)
 	{
-		// In these versions, CONTENT_IGNORE and CONTENT_AIR
-		// are 255 and 254
-		if(d == 255)
-			d = CONTENT_IGNORE;
-		else if(d == 254)
-			d = CONTENT_AIR;
+		std::ostringstream os(std::ios_base::binary);
+		decompressZlib(is, os);
+		std::string s = os.str();
+		if(s.size() != len)
+			throw SerializationError("deSerializeBulkNodes: "
+					"decompress resulted in invalid size");
+		memcpy(&databuf[0], s.c_str(), len);
+	}
+	else
+	{
+		is.read((char*) &databuf[0], len);
+		if(is.eof() || is.fail())
+			throw SerializationError("deSerializeBulkNodes: "
+					"failed to read bulk node data");
 	}
-	// version 19 is fucked up with sometimes the old values and sometimes not
-	if(version == 19)
+
+	// Deserialize content
+	if(content_width == 1)
 	{
-		if(d == 255)
-			d = CONTENT_IGNORE;
-		else if(d == 254)
-			d = CONTENT_AIR;
+		for(u32 i=0; i<nodecount; i++)
+			nodes[i].param0 = readU8(&databuf[i]);
 	}
+	/* If param0 is extended to two bytes, use something like this: */
+	/*else if(content_width == 2)
+	{
+		for(u32 i=0; i<nodecount; i++)
+			nodes[i].param0 = readU16(&databuf[i*2]);
+	}*/
+
+	// Deserialize param1
+	u32 start1 = content_width * nodecount;
+	for(u32 i=0; i<nodecount; i++)
+		nodes[i].param1 = readU8(&databuf[start1 + i]);
+
+	// Deserialize param2
+	u32 start2 = (content_width + 1) * nodecount;
+	for(u32 i=0; i<nodecount; i++)
+		nodes[i].param2 = readU8(&databuf[start2 + i]);
 }
 
 /*
-	Gets lighting value at face of node
-	
-	Parameters must consist of air and !air.
-	Order doesn't matter.
-
-	If either of the nodes doesn't exist, light is 0.
-	
-	parameters:
-		daynight_ratio: 0...1000
-		n: getNodeParent(p)
-		n2: getNodeParent(p + face_dir)
-		face_dir: axis oriented unit vector from p to p2
-	
-	returns encoded light value.
+	Legacy serialization
 */
-u8 getFaceLight(u32 daynight_ratio, MapNode n, MapNode n2,
-		v3s16 face_dir)
+void MapNode::serialize_pre22(u8 *dest, u8 version)
 {
-	try{
-		u8 light;
-		u8 l1 = n.getLightBlend(daynight_ratio);
-		u8 l2 = n2.getLightBlend(daynight_ratio);
-		if(l1 > l2)
-			light = l1;
-		else
-			light = l2;
+	// Translate to wanted version
+	MapNode n_foreign = mapnode_translate_from_internal(*this, version);
 
-		// Make some nice difference to different sides
+	u8 actual_param0 = n_foreign.param0;
 
-		// This makes light come from a corner
-		/*if(face_dir.X == 1 || face_dir.Z == 1 || face_dir.Y == -1)
-			light = diminish_light(diminish_light(light));
-		else if(face_dir.X == -1 || face_dir.Z == -1)
-			light = diminish_light(light);*/
-		
-		// All neighboring faces have different shade (like in minecraft)
-		if(face_dir.X == 1 || face_dir.X == -1 || face_dir.Y == -1)
-			light = diminish_light(diminish_light(light));
-		else if(face_dir.Z == 1 || face_dir.Z == -1)
-			light = diminish_light(light);
+	// Convert special values from new version to old
+	if(version <= 18)
+	{
+		// In these versions, CONTENT_IGNORE and CONTENT_AIR
+		// are 255 and 254
+		if(actual_param0 == CONTENT_IGNORE)
+			actual_param0 = 255;
+		else if(actual_param0 == CONTENT_AIR)
+			actual_param0 = 254;
+	}
 
-		return light;
+	if(version == 0)
+	{
+		dest[0] = actual_param0;
+	}
+	else if(version <= 9)
+	{
+		dest[0] = actual_param0;
+		dest[1] = n_foreign.param1;
 	}
-	catch(InvalidPositionException &e)
+	else
 	{
-		return 0;
+		dest[0] = actual_param0;
+		dest[1] = n_foreign.param1;
+		dest[2] = n_foreign.param2;
 	}
 }
+void MapNode::deSerialize_pre22(u8 *source, u8 version)
+{
+	if(version <= 1)
+	{
+		param0 = source[0];
+	}
+	else if(version <= 9)
+	{
+		param0 = source[0];
+		param1 = source[1];
+	}
+	else
+	{
+		param0 = source[0];
+		param1 = source[1];
+		param2 = source[2];
+	}
+	
+	// Convert special values from old version to new
+	if(version <= 19)
+	{
+		// In these versions, CONTENT_IGNORE and CONTENT_AIR
+		// are 255 and 254
+		// Version 19 is fucked up with sometimes the old values and sometimes not
+		if(param0 == 255)
+			param0 = CONTENT_IGNORE;
+		else if(param0 == 254)
+			param0 = CONTENT_AIR;
+	}
 
-
+	// Translate to our known version
+	*this = mapnode_translate_to_internal(*this, version);
+}