Copyright (C) 2010 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 "common_irrlicht.h"
+#include "irrlichttypes_extrabloated.h"
#include "mapnode.h"
-#include "tile.h"
#include "porting.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
+#include "util/serialize.h"
#include <string>
-#include "mineral.h"
-// For g_settings
-#include "main.h"
-#include "nodemetadata.h"
+#include <sstream>
-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);
+ param0 = id;
+ param1 = a_param1;
+ param2 = a_param2;
}
-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);
+ else
+ assert(0);
}
-void ContentFeatures::setInventoryTexture(std::string imgname)
+u8 MapNode::getLight(enum LightBank bank, INodeDefManager *nodemgr) const
{
- if(g_texturesource == NULL)
- return;
-
- imgname += "^[forcesingle";
-
- inventory_texture = g_texturesource->getTextureRaw(imgname);
+ // 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;
}
-void ContentFeatures::setInventoryTextureCube(std::string top,
- std::string left, std::string right)
+bool MapNode::getLightBanks(u8 &lightday, u8 &lightnight, INodeDefManager *nodemgr) const
{
- 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);
+ // Select the brightest of [light source, propagated light]
+ const ContentFeatures &f = nodemgr->get(*this);
+ if(f.param_type == CPT_LIGHT)
+ {
+ lightday = param1 & 0x0f;
+ lightnight = (param1>>4)&0x0f;
+ }
+ else
+ {
+ lightday = 0;
+ lightnight = 0;
+ }
+ 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;
}
-struct ContentFeatures g_content_features[256];
+u8 MapNode::getFaceDir(INodeDefManager *nodemgr) const
+{
+ const ContentFeatures &f = nodemgr->get(*this);
+ if(f.param_type_2 == CPT2_FACEDIR)
+ return getParam2() & 0x03;
+ return 0;
+}
-ContentFeatures & content_features(u8 i)
+u8 MapNode::getWallMounted(INodeDefManager *nodemgr) const
{
- return g_content_features[i];
+ const ContentFeatures &f = nodemgr->get(*this);
+ if(f.param_type_2 == CPT2_WALLMOUNTED)
+ return getParam2() & 0x07;
+ return 0;
}
-/*
- See mapnode.h for description.
-*/
-void init_mapnode()
+v3s16 MapNode::getWallMountedDir(INodeDefManager *nodemgr) const
{
- if(g_texturesource == NULL)
+ switch(getWallMounted(nodemgr))
{
- 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;
+ 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);
}
- else
+}
+
+static std::vector<aabb3f> transformNodeBox(const MapNode &n,
+ const NodeBox &nodebox, INodeDefManager *nodemgr)
+{
+ std::vector<aabb3f> boxes;
+ if(nodebox.type == NODEBOX_FIXED)
{
- dstream<<"INFO: Full run of init_mapnode with "
- "g_texturesource!=NULL"<<std::endl;
+ const std::vector<aabb3f> &fixed = nodebox.fixed;
+ int facedir = n.getFaceDir(nodemgr);
+ for(std::vector<aabb3f>::const_iterator
+ i = fixed.begin();
+ i != fixed.end(); i++)
+ {
+ aabb3f box = *i;
+ if(facedir == 1)
+ {
+ box.MinEdge.rotateXZBy(-90);
+ box.MaxEdge.rotateXZBy(-90);
+ box.repair();
+ }
+ else if(facedir == 2)
+ {
+ box.MinEdge.rotateXZBy(180);
+ box.MaxEdge.rotateXZBy(180);
+ box.repair();
+ }
+ else if(facedir == 3)
+ {
+ box.MinEdge.rotateXZBy(90);
+ box.MaxEdge.rotateXZBy(90);
+ box.repair();
+ }
+ boxes.push_back(box);
+ }
}
+ else if(nodebox.type == NODEBOX_WALLMOUNTED)
+ {
+ v3s16 dir = n.getWallMountedDir(nodemgr);
- // Read some settings
- bool new_style_water = g_settings.getBool("new_style_water");
- bool new_style_leaves = g_settings.getBool("new_style_leaves");
+ // top
+ if(dir == v3s16(0,1,0))
+ {
+ boxes.push_back(nodebox.wall_top);
+ }
+ // bottom
+ else if(dir == v3s16(0,-1,0))
+ {
+ boxes.push_back(nodebox.wall_bottom);
+ }
+ // side
+ else
+ {
+ v3f vertices[2] =
+ {
+ nodebox.wall_side.MinEdge,
+ nodebox.wall_side.MaxEdge
+ };
- /*
- 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 = ContentFeatures();
+ for(s32 i=0; i<2; i++)
+ {
+ if(dir == v3s16(-1,0,0))
+ vertices[i].rotateXZBy(0);
+ if(dir == v3s16(1,0,0))
+ vertices[i].rotateXZBy(180);
+ if(dir == v3s16(0,0,-1))
+ vertices[i].rotateXZBy(90);
+ if(dir == v3s16(0,0,1))
+ vertices[i].rotateXZBy(-90);
+ }
- for(u16 j=0; j<6; j++)
- f->tiles[j].material_type = initial_material_type;
+ aabb3f box = aabb3f(vertices[0]);
+ box.addInternalPoint(vertices[1]);
+ boxes.push_back(box);
+ }
}
-
- u8 i;
- ContentFeatures *f = NULL;
-
- i = CONTENT_STONE;
- f = &g_content_features[i];
- f->setAllTextures("stone.png");
- f->setInventoryTextureCube("stone.png", "stone.png", "stone.png");
- f->param_type = CPT_MINERAL;
- f->is_ground_content = true;
- f->dug_item = std::string("MaterialItem ")+itos(CONTENT_COBBLE)+" 1";
-
- i = CONTENT_GRASS;
- f = &g_content_features[i];
- f->setAllTextures("mud.png^grass_side.png");
- f->setTexture(0, "grass.png");
- f->setTexture(1, "mud.png");
- f->param_type = CPT_MINERAL;
- f->is_ground_content = true;
- f->dug_item = std::string("MaterialItem ")+itos(CONTENT_MUD)+" 1";
-
- i = CONTENT_GRASS_FOOTSTEPS;
- f = &g_content_features[i];
- f->setAllTextures("mud.png^grass_side.png");
- f->setTexture(0, "grass_footsteps.png");
- f->setTexture(1, "mud.png");
- f->param_type = CPT_MINERAL;
- f->is_ground_content = true;
- f->dug_item = std::string("MaterialItem ")+itos(CONTENT_MUD)+" 1";
-
- i = CONTENT_MUD;
- f = &g_content_features[i];
- f->setAllTextures("mud.png");
- f->setInventoryTextureCube("mud.png", "mud.png", "mud.png");
- f->param_type = CPT_MINERAL;
- f->is_ground_content = true;
- f->dug_item = std::string("MaterialItem ")+itos(i)+" 1";
-
- i = CONTENT_SAND;
- f = &g_content_features[i];
- f->setAllTextures("sand.png");
- f->param_type = CPT_MINERAL;
- f->is_ground_content = true;
- f->dug_item = std::string("MaterialItem ")+itos(i)+" 1";
-
- i = CONTENT_SANDSTONE;
- f = &g_content_features[i];
- f->setAllTextures("sandstone.png");
- f->setInventoryTextureCube("sandstone.png", "sandstone.png", "sandstone.png");
- f->param_type = CPT_MINERAL;
- f->is_ground_content = true;
- f->dug_item = std::string("MaterialItem ")+itos(CONTENT_SAND)+" 1";
-
- i = CONTENT_TREE;
- f = &g_content_features[i];
- f->setAllTextures("tree.png");
- f->setTexture(0, "tree_top.png");
- f->setTexture(1, "tree_top.png");
- f->param_type = CPT_MINERAL;
- f->is_ground_content = true;
- f->dug_item = std::string("MaterialItem ")+itos(i)+" 1";
-
- i = CONTENT_LEAVES;
- f = &g_content_features[i];
- f->light_propagates = true;
- //f->param_type = CPT_MINERAL;
- f->param_type = CPT_LIGHT;
- f->is_ground_content = true;
- if(new_style_leaves)
+ else // NODEBOX_REGULAR
{
- f->solidness = 0; // drawn separately, makes no faces
- f->setInventoryTextureCube("leaves.png", "leaves.png", "leaves.png");
+ boxes.push_back(aabb3f(-BS/2,-BS/2,-BS/2,BS/2,BS/2,BS/2));
}
+ return boxes;
+}
+
+std::vector<aabb3f> MapNode::getNodeBoxes(INodeDefManager *nodemgr) const
+{
+ const ContentFeatures &f = nodemgr->get(*this);
+ return transformNodeBox(*this, f.node_box, nodemgr);
+}
+
+std::vector<aabb3f> MapNode::getSelectionBoxes(INodeDefManager *nodemgr) const
+{
+ const ContentFeatures &f = nodemgr->get(*this);
+ return transformNodeBox(*this, f.selection_box, nodemgr);
+}
+
+u32 MapNode::serializedLength(u8 version)
+{
+ if(!ser_ver_supported(version))
+ throw VersionMismatchException("ERROR: MapNode format not supported");
+
+ if(version == 0)
+ return 1;
+ else if(version <= 9)
+ return 2;
else
- {
- f->setAllTextures("[noalpha:leaves.png");
- }
- f->dug_item = std::string("MaterialItem ")+itos(i)+" 1";
-
- i = CONTENT_CACTUS;
- f = &g_content_features[i];
- f->setAllTextures("cactus_side.png");
- f->setTexture(0, "cactus_top.png");
- f->setTexture(1, "cactus_top.png");
- f->setInventoryTextureCube("cactus_top.png", "cactus_side.png", "cactus_side.png");
- f->param_type = CPT_MINERAL;
- f->is_ground_content = true;
- f->dug_item = std::string("MaterialItem ")+itos(i)+" 1";
-
- i = CONTENT_GLASS;
- f = &g_content_features[i];
- f->light_propagates = true;
- f->param_type = CPT_LIGHT;
- f->is_ground_content = true;
- f->dug_item = std::string("MaterialItem ")+itos(i)+" 1";
- f->solidness = 0; // drawn separately, makes no faces
- f->setInventoryTextureCube("glass.png", "glass.png", "glass.png");
-
- i = CONTENT_FENCE;
- f = &g_content_features[i];
- f->setInventoryTexture("fence.png");
- f->light_propagates = true;
- f->param_type = CPT_LIGHT;
- f->is_ground_content = true;
- f->dug_item = std::string("MaterialItem ")+itos(i)+" 1";
- f->solidness = 0; // drawn separately, makes no faces
- f->air_equivalent = true; // grass grows underneath
-
- // Deprecated
- i = CONTENT_COALSTONE;
- f = &g_content_features[i];
- //f->translate_to = new MapNode(CONTENT_STONE, MINERAL_COAL);
- f->setAllTextures("stone.png^mineral_coal.png");
- f->is_ground_content = true;
-
- i = CONTENT_WOOD;
- f = &g_content_features[i];
- f->setAllTextures("wood.png");
- f->is_ground_content = true;
- f->dug_item = std::string("MaterialItem ")+itos(i)+" 1";
-
- i = CONTENT_MESE;
- f = &g_content_features[i];
- f->setAllTextures("mese.png");
- f->is_ground_content = true;
- f->dug_item = std::string("MaterialItem ")+itos(i)+" 1";
-
- i = CONTENT_CLOUD;
- f = &g_content_features[i];
- f->setAllTextures("cloud.png");
- f->is_ground_content = true;
- f->dug_item = std::string("MaterialItem ")+itos(i)+" 1";
-
- i = CONTENT_AIR;
- f = &g_content_features[i];
- f->param_type = CPT_LIGHT;
- f->light_propagates = true;
- f->sunlight_propagates = true;
- f->solidness = 0;
- f->walkable = false;
- f->pointable = false;
- f->diggable = false;
- f->buildable_to = true;
- f->air_equivalent = true;
-
- i = CONTENT_WATER;
- f = &g_content_features[i];
- f->setInventoryTextureCube("water.png", "water.png", "water.png");
- f->param_type = CPT_LIGHT;
- f->light_propagates = true;
- f->solidness = 0; // Drawn separately, makes no faces
- f->walkable = false;
- f->pointable = false;
- f->diggable = false;
- f->buildable_to = true;
- f->liquid_type = LIQUID_FLOWING;
+ return 3;
+}
+void MapNode::serialize(u8 *dest, u8 version)
+{
+ if(!ser_ver_supported(version))
+ throw VersionMismatchException("ERROR: MapNode format not supported");
- i = CONTENT_WATERSOURCE;
- f = &g_content_features[i];
- f->setInventoryTexture("water.png");
- if(new_style_water)
+ // Can't do this anymore; we have 16-bit dynamically allocated node IDs
+ // in memory; conversion just won't work in this direction.
+ if(version < 24)
+ throw SerializationError("MapNode::serialize: serialization to "
+ "version < 24 not possible");
+
+ writeU16(dest+0, param0);
+ writeU8(dest+2, param1);
+ writeU8(dest+3, param2);
+}
+void MapNode::deSerialize(u8 *source, u8 version)
+{
+ if(!ser_ver_supported(version))
+ throw VersionMismatchException("ERROR: MapNode format not supported");
+
+ if(version <= 21)
{
- f->solidness = 0; // drawn separately, makes no faces
+ deSerialize_pre22(source, version);
+ return;
}
- else // old style
- {
- f->solidness = 1;
- TileSpec t;
- if(g_texturesource)
- t.texture = g_texturesource->getTexture("water.png");
-
- t.alpha = WATER_ALPHA;
- t.material_type = MATERIAL_ALPHA_VERTEX;
- t.material_flags &= ~MATERIAL_FLAG_BACKFACE_CULLING;
- f->setAllTiles(t);
+ if(version >= 24){
+ param0 = readU16(source+0);
+ param1 = readU8(source+2);
+ param2 = readU8(source+3);
+ }
+ else{
+ param0 = readU8(source+0);
+ param1 = readU8(source+1);
+ param2 = readU8(source+2);
+ if(param0 > 0x7F){
+ param0 |= ((param2&0xF0)<<4);
+ param2 &= 0x0F;
+ }
}
- f->param_type = CPT_LIGHT;
- f->light_propagates = true;
- f->walkable = false;
- f->pointable = false;
- f->diggable = false;
- f->buildable_to = true;
- f->liquid_type = LIQUID_SOURCE;
- f->dug_item = std::string("MaterialItem ")+itos(i)+" 1";
-
- i = CONTENT_TORCH;
- f = &g_content_features[i];
- f->setInventoryTexture("torch_on_floor.png");
- f->param_type = CPT_LIGHT;
- f->light_propagates = true;
- f->sunlight_propagates = true;
- f->solidness = 0; // drawn separately, makes no faces
- f->walkable = false;
- f->wall_mounted = true;
- f->air_equivalent = true;
- f->dug_item = std::string("MaterialItem ")+itos(i)+" 1";
-
- i = CONTENT_SIGN_WALL;
- f = &g_content_features[i];
- f->setInventoryTexture("sign_wall.png");
- f->param_type = CPT_LIGHT;
- f->light_propagates = true;
- f->sunlight_propagates = true;
- f->solidness = 0; // drawn separately, makes no faces
- f->walkable = false;
- f->wall_mounted = true;
- f->air_equivalent = true;
- f->dug_item = std::string("MaterialItem ")+itos(i)+" 1";
- if(f->initial_metadata == NULL)
- f->initial_metadata = new SignNodeMetadata("Some sign");
-
- i = CONTENT_CHEST;
- f = &g_content_features[i];
- f->param_type = CPT_FACEDIR_SIMPLE;
- f->setAllTextures("chest_side.png");
- f->setTexture(0, "chest_top.png");
- f->setTexture(1, "chest_top.png");
- f->setTexture(5, "chest_front.png"); // Z-
- f->setInventoryTexture("chest_top.png");
- //f->setInventoryTextureCube("chest_top.png", "chest_side.png", "chest_side.png");
- f->dug_item = std::string("MaterialItem ")+itos(i)+" 1";
- if(f->initial_metadata == NULL)
- f->initial_metadata = new ChestNodeMetadata();
-
- i = CONTENT_FURNACE;
- f = &g_content_features[i];
- f->param_type = CPT_FACEDIR_SIMPLE;
- f->setAllTextures("furnace_side.png");
- f->setTexture(5, "furnace_front.png"); // Z-
- f->setInventoryTexture("furnace_front.png");
- //f->dug_item = std::string("MaterialItem ")+itos(i)+" 1";
- f->dug_item = std::string("MaterialItem ")+itos(CONTENT_COBBLE)+" 6";
- if(f->initial_metadata == NULL)
- f->initial_metadata = new FurnaceNodeMetadata();
-
- i = CONTENT_COBBLE;
- f = &g_content_features[i];
- f->setAllTextures("cobble.png");
- f->setInventoryTextureCube("cobble.png", "cobble.png", "cobble.png");
- f->param_type = CPT_NONE;
- f->is_ground_content = true;
- f->dug_item = std::string("MaterialItem ")+itos(i)+" 1";
-
- i = CONTENT_STEEL;
- f = &g_content_features[i];
- f->setAllTextures("steel_block.png");
- f->setInventoryTextureCube("steel_block.png", "steel_block.png",
- "steel_block.png");
- f->param_type = CPT_NONE;
- f->is_ground_content = true;
- f->dug_item = std::string("MaterialItem ")+itos(i)+" 1";
-
- // NOTE: Remember to add frequently used stuff to the texture atlas in tile.cpp
}
-
-v3s16 facedir_rotate(u8 facedir, v3s16 dir)
+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(content_width == 2);
+ assert(params_width == 2);
+
+ // Can't do this anymore; we have 16-bit dynamically allocated node IDs
+ // in memory; conversion just won't work in this direction.
+ if(version < 24)
+ throw SerializationError("MapNode::serializeBulk: serialization to "
+ "version < 24 not possible");
+
+ SharedBuffer<u8> databuf(nodecount * (content_width + params_width));
+
+ // Serialize content
+ 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);
+
/*
- Face 2 (normally Z-) direction:
- facedir=0: Z-
- facedir=1: X-
- facedir=2: Z+
- facedir=3: X+
+ Compress data to output stream
*/
- 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);
+
+ if(compressed)
+ {
+ compressZlib(databuf, os);
+ }
else
- newdir = dir;
- return newdir;
+ {
+ os.write((const char*) &databuf[0], databuf.getSize());
+ }
}
-TileSpec MapNode::getTile(v3s16 dir)
+// 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(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)
+ if(!ser_ver_supported(version))
+ throw VersionMismatchException("ERROR: MapNode format not supported");
+
+ assert(version >= 22);
+ assert(content_width == 1 || content_width == 2);
+ assert(params_width == 2);
+
+ // Uncompress or read data
+ u32 len = nodecount * (content_width + params_width);
+ SharedBuffer<u8> databuf(len);
+ if(compressed)
{
- 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);
- }
+ 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");
}
- return spec;
-}
-
-u8 MapNode::getMineral()
-{
- if(content_features(d).param_type == CPT_MINERAL)
+ // Deserialize content
+ if(content_width == 1)
+ {
+ for(u32 i=0; i<nodecount; i++)
+ nodes[i].param0 = readU8(&databuf[i]);
+ }
+ else if(content_width == 2)
{
- return param & 0x1f;
+ for(u32 i=0; i<nodecount; i++)
+ nodes[i].param0 = readU16(&databuf[i*2]);
}
- return MINERAL_NONE;
-}
+ // Deserialize param1
+ u32 start1 = content_width * nodecount;
+ for(u32 i=0; i<nodecount; i++)
+ nodes[i].param1 = readU8(&databuf[start1 + i]);
-// Pointers to c_str()s g_content_features[i].inventory_image_path
-//const char * g_content_inventory_texture_paths[USEFUL_CONTENT_COUNT] = {0};
+ // Deserialize param2
+ u32 start2 = (content_width + 1) * nodecount;
+ if(content_width == 1)
+ {
+ for(u32 i=0; i<nodecount; i++) {
+ nodes[i].param2 = readU8(&databuf[start2 + i]);
+ if(nodes[i].param0 > 0x7F){
+ nodes[i].param0 <<= 4;
+ nodes[i].param0 |= (nodes[i].param2&0xF0)>>4;
+ nodes[i].param2 &= 0x0F;
+ }
+ }
+ }
+ else if(content_width == 2)
+ {
+ for(u32 i=0; i<nodecount; i++)
+ nodes[i].param2 = readU8(&databuf[start2 + i]);
+ }
+}
-void init_content_inventory_texture_paths()
+/*
+ Legacy serialization
+*/
+void MapNode::deSerialize_pre22(u8 *source, u8 version)
{
- dstream<<"DEPRECATED "<<__FUNCTION_NAME<<std::endl;
- /*for(u16 i=0; i<USEFUL_CONTENT_COUNT; i++)
+ if(version <= 1)
{
- g_content_inventory_texture_paths[i] =
- g_content_features[i].inventory_image_path.c_str();
- }*/
-}
+ param0 = source[0];
+ }
+ else if(version <= 9)
+ {
+ param0 = source[0];
+ param1 = source[1];
+ }
+ else
+ {
+ param0 = source[0];
+ param1 = source[1];
+ param2 = source[2];
+ if(param0 > 0x7f){
+ param0 <<= 4;
+ param0 |= (param2&0xf0)>>4;
+ param2 &= 0x0f;
+ }
+ }
+
+ // 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);
+}
projects / oweals / minetest.git / blobdiff