aboutsummaryrefslogtreecommitdiff
path: root/src/mapnode.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/mapnode.cpp')
-rw-r--r--src/mapnode.cpp436
1 files changed, 258 insertions, 178 deletions
diff --git a/src/mapnode.cpp b/src/mapnode.cpp
index fb56f3ef4..dcf1f6d6e 100644
--- a/src/mapnode.cpp
+++ b/src/mapnode.cpp
@@ -23,7 +23,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#include "nodedef.h"
#include "map.h"
#include "content_mapnode.h" // For mapnode_translate_*_internal
-#include "serialization.h" // For ser_ver_supported
+#include "serialization.h" // For ser_ver_supported
#include "util/serialize.h"
#include "log.h"
#include "util/directiontables.h"
@@ -32,9 +32,13 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#include <sstream>
static const Rotation wallmounted_to_rot[] = {
- ROTATE_0, ROTATE_180, ROTATE_90, ROTATE_270};
+ ROTATE_0, ROTATE_180, ROTATE_90, ROTATE_270
+};
+
+static const u8 rot_to_wallmounted[] = {
+ 2, 4, 3, 5
+};
-static const u8 rot_to_wallmounted[] = {2, 4, 3, 5};
/*
MapNode
@@ -52,15 +56,19 @@ void MapNode::getColor(const ContentFeatures &f, video::SColor *color) const
void MapNode::setLight(LightBank bank, u8 a_light, const ContentFeatures &f) noexcept
{
// If node doesn't contain light data, ignore this
- if (f.param_type != CPT_LIGHT)
+ if(f.param_type != CPT_LIGHT)
return;
- if (bank == LIGHTBANK_DAY) {
+ if(bank == LIGHTBANK_DAY)
+ {
param1 &= 0xf0;
param1 |= a_light & 0x0f;
- } else if (bank == LIGHTBANK_NIGHT) {
+ }
+ else if(bank == LIGHTBANK_NIGHT)
+ {
param1 &= 0x0f;
- param1 |= (a_light & 0x0f) << 4;
- } else
+ param1 |= (a_light & 0x0f)<<4;
+ }
+ else
assert("Invalid light bank" == NULL);
}
@@ -75,7 +83,7 @@ bool MapNode::isLightDayNightEq(const NodeDefManager *nodemgr) const
bool isEqual;
if (f.param_type == CPT_LIGHT) {
- u8 day = MYMAX(f.light_source, param1 & 0x0f);
+ u8 day = MYMAX(f.light_source, param1 & 0x0f);
u8 night = MYMAX(f.light_source, (param1 >> 4) & 0x0f);
isEqual = day == night;
} else {
@@ -91,7 +99,7 @@ u8 MapNode::getLight(LightBank bank, const NodeDefManager *nodemgr) const
const ContentFeatures &f = nodemgr->get(*this);
u8 light;
- if (f.param_type == CPT_LIGHT)
+ if(f.param_type == CPT_LIGHT)
light = bank == LIGHTBANK_DAY ? param1 & 0x0f : (param1 >> 4) & 0x0f;
else
light = 0;
@@ -101,7 +109,7 @@ u8 MapNode::getLight(LightBank bank, const NodeDefManager *nodemgr) const
u8 MapNode::getLightRaw(LightBank bank, const ContentFeatures &f) const noexcept
{
- if (f.param_type == CPT_LIGHT)
+ if(f.param_type == CPT_LIGHT)
return bank == LIGHTBANK_DAY ? param1 & 0x0f : (param1 >> 4) & 0x0f;
return 0;
}
@@ -109,36 +117,40 @@ u8 MapNode::getLightRaw(LightBank bank, const ContentFeatures &f) const noexcept
u8 MapNode::getLightNoChecks(LightBank bank, const ContentFeatures *f) const noexcept
{
return MYMAX(f->light_source,
- bank == LIGHTBANK_DAY ? param1 & 0x0f : (param1 >> 4) & 0x0f);
+ bank == LIGHTBANK_DAY ? param1 & 0x0f : (param1 >> 4) & 0x0f);
}
-bool MapNode::getLightBanks(
- u8 &lightday, u8 &lightnight, const NodeDefManager *nodemgr) const
+bool MapNode::getLightBanks(u8 &lightday, u8 &lightnight,
+ const NodeDefManager *nodemgr) const
{
// Select the brightest of [light source, propagated light]
const ContentFeatures &f = nodemgr->get(*this);
- if (f.param_type == CPT_LIGHT) {
+ if(f.param_type == CPT_LIGHT)
+ {
lightday = param1 & 0x0f;
- lightnight = (param1 >> 4) & 0x0f;
- } else {
+ lightnight = (param1>>4)&0x0f;
+ }
+ else
+ {
lightday = 0;
lightnight = 0;
}
- if (f.light_source > lightday)
+ if(f.light_source > lightday)
lightday = f.light_source;
- if (f.light_source > lightnight)
+ if(f.light_source > lightnight)
lightnight = f.light_source;
return f.param_type == CPT_LIGHT || f.light_source != 0;
}
-u8 MapNode::getFaceDir(const NodeDefManager *nodemgr, bool allow_wallmounted) const
+u8 MapNode::getFaceDir(const NodeDefManager *nodemgr,
+ bool allow_wallmounted) const
{
const ContentFeatures &f = nodemgr->get(*this);
- if (f.param_type_2 == CPT2_FACEDIR || f.param_type_2 == CPT2_COLORED_FACEDIR)
+ if (f.param_type_2 == CPT2_FACEDIR ||
+ f.param_type_2 == CPT2_COLORED_FACEDIR)
return (getParam2() & 0x1F) % 24;
- if (allow_wallmounted &&
- (f.param_type_2 == CPT2_WALLMOUNTED ||
- f.param_type_2 == CPT2_COLORED_WALLMOUNTED))
+ if (allow_wallmounted && (f.param_type_2 == CPT2_WALLMOUNTED ||
+ f.param_type_2 == CPT2_COLORED_WALLMOUNTED))
return wallmounted_to_facedir[getParam2() & 0x07];
return 0;
}
@@ -154,20 +166,14 @@ u8 MapNode::getWallMounted(const NodeDefManager *nodemgr) const
v3s16 MapNode::getWallMountedDir(const NodeDefManager *nodemgr) const
{
- switch (getWallMounted(nodemgr)) {
- 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);
+ switch(getWallMounted(nodemgr))
+ {
+ 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);
}
}
@@ -176,33 +182,47 @@ void MapNode::rotateAlongYAxis(const NodeDefManager *nodemgr, Rotation rot)
ContentParamType2 cpt2 = nodemgr->get(*this).param_type_2;
if (cpt2 == CPT2_FACEDIR || cpt2 == CPT2_COLORED_FACEDIR) {
- static const u8 rotate_facedir[24 * 4] = {// Table value = rotated facedir
- // Columns: 0, 90, 180, 270 degrees rotation around
- // vertical axis
- // Rotation is anticlockwise as seen from above (+Y)
-
- 0, 1, 2, 3, // Initial facedir 0 to 3
- 1, 2, 3, 0, 2, 3, 0, 1, 3, 0, 1, 2,
-
- 4, 13, 10, 19, // 4 to 7
- 5, 14, 11, 16, 6, 15, 8, 17, 7, 12, 9, 18,
-
- 8, 17, 6, 15, // 8 to 11
- 9, 18, 7, 12, 10, 19, 4, 13, 11, 16, 5, 14,
-
- 12, 9, 18, 7, // 12 to 15
- 13, 10, 19, 4, 14, 11, 16, 5, 15, 8, 17, 6,
-
- 16, 5, 14, 11, // 16 to 19
- 17, 6, 15, 8, 18, 7, 12, 9, 19, 4, 13, 10,
-
- 20, 23, 22, 21, // 20 to 23
- 21, 20, 23, 22, 22, 21, 20, 23, 23, 22, 21, 20};
+ static const u8 rotate_facedir[24 * 4] = {
+ // Table value = rotated facedir
+ // Columns: 0, 90, 180, 270 degrees rotation around vertical axis
+ // Rotation is anticlockwise as seen from above (+Y)
+
+ 0, 1, 2, 3, // Initial facedir 0 to 3
+ 1, 2, 3, 0,
+ 2, 3, 0, 1,
+ 3, 0, 1, 2,
+
+ 4, 13, 10, 19, // 4 to 7
+ 5, 14, 11, 16,
+ 6, 15, 8, 17,
+ 7, 12, 9, 18,
+
+ 8, 17, 6, 15, // 8 to 11
+ 9, 18, 7, 12,
+ 10, 19, 4, 13,
+ 11, 16, 5, 14,
+
+ 12, 9, 18, 7, // 12 to 15
+ 13, 10, 19, 4,
+ 14, 11, 16, 5,
+ 15, 8, 17, 6,
+
+ 16, 5, 14, 11, // 16 to 19
+ 17, 6, 15, 8,
+ 18, 7, 12, 9,
+ 19, 4, 13, 10,
+
+ 20, 23, 22, 21, // 20 to 23
+ 21, 20, 23, 22,
+ 22, 21, 20, 23,
+ 23, 22, 21, 20
+ };
u8 facedir = (param2 & 31) % 24;
u8 index = facedir * 4 + rot;
param2 &= ~31;
param2 |= rotate_facedir[index];
- } else if (cpt2 == CPT2_WALLMOUNTED || cpt2 == CPT2_COLORED_WALLMOUNTED) {
+ } else if (cpt2 == CPT2_WALLMOUNTED ||
+ cpt2 == CPT2_COLORED_WALLMOUNTED) {
u8 wmountface = (param2 & 7);
if (wmountface <= 1)
return;
@@ -214,30 +234,34 @@ void MapNode::rotateAlongYAxis(const NodeDefManager *nodemgr, Rotation rot)
}
void transformNodeBox(const MapNode &n, const NodeBox &nodebox,
- const NodeDefManager *nodemgr, std::vector<aabb3f> *p_boxes,
- u8 neighbors = 0)
+ const NodeDefManager *nodemgr, std::vector<aabb3f> *p_boxes,
+ u8 neighbors = 0)
{
std::vector<aabb3f> &boxes = *p_boxes;
if (nodebox.type == NODEBOX_FIXED || nodebox.type == NODEBOX_LEVELED) {
const std::vector<aabb3f> &fixed = nodebox.fixed;
int facedir = n.getFaceDir(nodemgr, true);
- u8 axisdir = facedir >> 2;
- facedir &= 0x03;
+ u8 axisdir = facedir>>2;
+ facedir&=0x03;
for (aabb3f box : fixed) {
if (nodebox.type == NODEBOX_LEVELED)
- box.MaxEdge.Y = (-0.5f + n.getLevel(nodemgr) / 64.0f) *
- BS;
+ box.MaxEdge.Y = (-0.5f + n.getLevel(nodemgr) / 64.0f) * BS;
switch (axisdir) {
case 0:
- if (facedir == 1) {
+ if(facedir == 1)
+ {
box.MinEdge.rotateXZBy(-90);
box.MaxEdge.rotateXZBy(-90);
- } else if (facedir == 2) {
+ }
+ else if(facedir == 2)
+ {
box.MinEdge.rotateXZBy(180);
box.MaxEdge.rotateXZBy(180);
- } else if (facedir == 3) {
+ }
+ else if(facedir == 3)
+ {
box.MinEdge.rotateXZBy(90);
box.MaxEdge.rotateXZBy(90);
}
@@ -245,55 +269,75 @@ void transformNodeBox(const MapNode &n, const NodeBox &nodebox,
case 1: // z+
box.MinEdge.rotateYZBy(90);
box.MaxEdge.rotateYZBy(90);
- if (facedir == 1) {
+ if(facedir == 1)
+ {
box.MinEdge.rotateXYBy(90);
box.MaxEdge.rotateXYBy(90);
- } else if (facedir == 2) {
+ }
+ else if(facedir == 2)
+ {
box.MinEdge.rotateXYBy(180);
box.MaxEdge.rotateXYBy(180);
- } else if (facedir == 3) {
+ }
+ else if(facedir == 3)
+ {
box.MinEdge.rotateXYBy(-90);
box.MaxEdge.rotateXYBy(-90);
}
break;
- case 2: // z-
+ case 2: //z-
box.MinEdge.rotateYZBy(-90);
box.MaxEdge.rotateYZBy(-90);
- if (facedir == 1) {
+ if(facedir == 1)
+ {
box.MinEdge.rotateXYBy(-90);
box.MaxEdge.rotateXYBy(-90);
- } else if (facedir == 2) {
+ }
+ else if(facedir == 2)
+ {
box.MinEdge.rotateXYBy(180);
box.MaxEdge.rotateXYBy(180);
- } else if (facedir == 3) {
+ }
+ else if(facedir == 3)
+ {
box.MinEdge.rotateXYBy(90);
box.MaxEdge.rotateXYBy(90);
}
break;
- case 3: // x+
+ case 3: //x+
box.MinEdge.rotateXYBy(-90);
box.MaxEdge.rotateXYBy(-90);
- if (facedir == 1) {
+ if(facedir == 1)
+ {
box.MinEdge.rotateYZBy(90);
box.MaxEdge.rotateYZBy(90);
- } else if (facedir == 2) {
+ }
+ else if(facedir == 2)
+ {
box.MinEdge.rotateYZBy(180);
box.MaxEdge.rotateYZBy(180);
- } else if (facedir == 3) {
+ }
+ else if(facedir == 3)
+ {
box.MinEdge.rotateYZBy(-90);
box.MaxEdge.rotateYZBy(-90);
}
break;
- case 4: // x-
+ case 4: //x-
box.MinEdge.rotateXYBy(90);
box.MaxEdge.rotateXYBy(90);
- if (facedir == 1) {
+ if(facedir == 1)
+ {
box.MinEdge.rotateYZBy(-90);
box.MaxEdge.rotateYZBy(-90);
- } else if (facedir == 2) {
+ }
+ else if(facedir == 2)
+ {
box.MinEdge.rotateYZBy(180);
box.MaxEdge.rotateYZBy(180);
- } else if (facedir == 3) {
+ }
+ else if(facedir == 3)
+ {
box.MinEdge.rotateYZBy(90);
box.MaxEdge.rotateYZBy(90);
}
@@ -301,13 +345,18 @@ void transformNodeBox(const MapNode &n, const NodeBox &nodebox,
case 5:
box.MinEdge.rotateXYBy(-180);
box.MaxEdge.rotateXYBy(-180);
- if (facedir == 1) {
+ if(facedir == 1)
+ {
box.MinEdge.rotateXZBy(90);
box.MaxEdge.rotateXZBy(90);
- } else if (facedir == 2) {
+ }
+ else if(facedir == 2)
+ {
box.MinEdge.rotateXZBy(180);
box.MaxEdge.rotateXZBy(180);
- } else if (facedir == 3) {
+ }
+ else if(facedir == 3)
+ {
box.MinEdge.rotateXZBy(-90);
box.MaxEdge.rotateXZBy(-90);
}
@@ -318,30 +367,38 @@ void transformNodeBox(const MapNode &n, const NodeBox &nodebox,
box.repair();
boxes.push_back(box);
}
- } else if (nodebox.type == NODEBOX_WALLMOUNTED) {
+ }
+ else if(nodebox.type == NODEBOX_WALLMOUNTED)
+ {
v3s16 dir = n.getWallMountedDir(nodemgr);
// top
- if (dir == v3s16(0, 1, 0)) {
+ if(dir == v3s16(0,1,0))
+ {
boxes.push_back(nodebox.wall_top);
}
// bottom
- else if (dir == v3s16(0, -1, 0)) {
+ 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};
+ else
+ {
+ v3f vertices[2] =
+ {
+ nodebox.wall_side.MinEdge,
+ nodebox.wall_side.MaxEdge
+ };
for (v3f &vertex : vertices) {
- if (dir == v3s16(-1, 0, 0))
+ if(dir == v3s16(-1,0,0))
vertex.rotateXZBy(0);
- if (dir == v3s16(1, 0, 0))
+ if(dir == v3s16(1,0,0))
vertex.rotateXZBy(180);
- if (dir == v3s16(0, 0, -1))
+ if(dir == v3s16(0,0,-1))
vertex.rotateXZBy(90);
- if (dir == v3s16(0, 0, 1))
+ if(dir == v3s16(0,0,1))
vertex.rotateXZBy(-90);
}
@@ -349,7 +406,9 @@ void transformNodeBox(const MapNode &n, const NodeBox &nodebox,
box.addInternalPoint(vertices[1]);
boxes.push_back(box);
}
- } else if (nodebox.type == NODEBOX_CONNECTED) {
+ }
+ else if (nodebox.type == NODEBOX_CONNECTED)
+ {
size_t boxes_size = boxes.size();
boxes_size += nodebox.fixed.size();
if (neighbors & 1)
@@ -390,10 +449,11 @@ void transformNodeBox(const MapNode &n, const NodeBox &nodebox,
boxes.reserve(boxes_size);
-#define BOXESPUSHBACK(c) \
- for (std::vector<aabb3f>::const_iterator it = (c).begin(); it != (c).end(); \
- ++it) \
- (boxes).push_back(*it);
+#define BOXESPUSHBACK(c) \
+ for (std::vector<aabb3f>::const_iterator \
+ it = (c).begin(); \
+ it != (c).end(); ++it) \
+ (boxes).push_back(*it);
BOXESPUSHBACK(nodebox.fixed);
@@ -441,15 +501,16 @@ void transformNodeBox(const MapNode &n, const NodeBox &nodebox,
BOXESPUSHBACK(nodebox.disconnected_sides);
}
- } else // NODEBOX_REGULAR
+ }
+ else // NODEBOX_REGULAR
{
- boxes.emplace_back(-BS / 2, -BS / 2, -BS / 2, BS / 2, BS / 2, BS / 2);
+ boxes.emplace_back(-BS/2,-BS/2,-BS/2,BS/2,BS/2,BS/2);
}
}
-static inline void getNeighborConnectingFace(const v3s16 &p,
- const NodeDefManager *nodedef, Map *map, MapNode n, u8 bitmask,
- u8 *neighbors)
+static inline void getNeighborConnectingFace(
+ const v3s16 &p, const NodeDefManager *nodedef,
+ Map *map, MapNode n, u8 bitmask, u8 *neighbors)
{
MapNode n2 = map->getNode(p);
if (nodedef->nodeboxConnects(n, n2, bitmask))
@@ -492,15 +553,15 @@ u8 MapNode::getNeighbors(v3s16 p, Map *map) const
return neighbors;
}
-void MapNode::getNodeBoxes(const NodeDefManager *nodemgr, std::vector<aabb3f> *boxes,
- u8 neighbors) const
+void MapNode::getNodeBoxes(const NodeDefManager *nodemgr,
+ std::vector<aabb3f> *boxes, u8 neighbors) const
{
const ContentFeatures &f = nodemgr->get(*this);
transformNodeBox(*this, f.node_box, nodemgr, boxes, neighbors);
}
-void MapNode::getCollisionBoxes(const NodeDefManager *nodemgr, std::vector<aabb3f> *boxes,
- u8 neighbors) const
+void MapNode::getCollisionBoxes(const NodeDefManager *nodemgr,
+ std::vector<aabb3f> *boxes, u8 neighbors) const
{
const ContentFeatures &f = nodemgr->get(*this);
if (f.collision_box.fixed.empty())
@@ -509,8 +570,8 @@ void MapNode::getCollisionBoxes(const NodeDefManager *nodemgr, std::vector<aabb3
transformNodeBox(*this, f.collision_box, nodemgr, boxes, neighbors);
}
-void MapNode::getSelectionBoxes(const NodeDefManager *nodemgr, std::vector<aabb3f> *boxes,
- u8 neighbors) const
+void MapNode::getSelectionBoxes(const NodeDefManager *nodemgr,
+ std::vector<aabb3f> *boxes, u8 neighbors) const
{
const ContentFeatures &f = nodemgr->get(*this);
transformNodeBox(*this, f.selection_box, nodemgr, boxes, neighbors);
@@ -520,9 +581,9 @@ u8 MapNode::getMaxLevel(const NodeDefManager *nodemgr) const
{
const ContentFeatures &f = nodemgr->get(*this);
// todo: after update in all games leave only if (f.param_type_2 ==
- if (f.liquid_type == LIQUID_FLOWING || f.param_type_2 == CPT2_FLOWINGLIQUID)
+ if( f.liquid_type == LIQUID_FLOWING || f.param_type_2 == CPT2_FLOWINGLIQUID)
return LIQUID_LEVEL_MAX;
- if (f.leveled || f.param_type_2 == CPT2_LEVELED)
+ if(f.leveled || f.param_type_2 == CPT2_LEVELED)
return f.leveled_max;
return 0;
}
@@ -531,11 +592,11 @@ u8 MapNode::getLevel(const NodeDefManager *nodemgr) const
{
const ContentFeatures &f = nodemgr->get(*this);
// todo: after update in all games leave only if (f.param_type_2 ==
- if (f.liquid_type == LIQUID_SOURCE)
+ if(f.liquid_type == LIQUID_SOURCE)
return LIQUID_LEVEL_SOURCE;
if (f.param_type_2 == CPT2_FLOWINGLIQUID)
return getParam2() & LIQUID_LEVEL_MASK;
- if (f.liquid_type == LIQUID_FLOWING) // can remove if all param_type_2 setted
+ if(f.liquid_type == LIQUID_FLOWING) // can remove if all param_type_2 setted
return getParam2() & LIQUID_LEVEL_MASK;
if (f.param_type_2 == CPT2_LEVELED) {
u8 level = getParam2() & LEVELED_MASK;
@@ -552,8 +613,9 @@ s8 MapNode::setLevel(const NodeDefManager *nodemgr, s16 level)
{
s8 rest = 0;
const ContentFeatures &f = nodemgr->get(*this);
- if (f.param_type_2 == CPT2_FLOWINGLIQUID || f.liquid_type == LIQUID_FLOWING ||
- f.liquid_type == LIQUID_SOURCE) {
+ if (f.param_type_2 == CPT2_FLOWINGLIQUID
+ || f.liquid_type == LIQUID_FLOWING
+ || f.liquid_type == LIQUID_SOURCE) {
if (level <= 0) { // liquid can’t exist with zero level
setContent(CONTENT_AIR);
return 0;
@@ -564,8 +626,7 @@ s8 MapNode::setLevel(const NodeDefManager *nodemgr, s16 level)
setParam2(0);
} else {
setContent(f.liquid_alternative_flowing_id);
- setParam2((level & LIQUID_LEVEL_MASK) |
- (getParam2() & ~LIQUID_LEVEL_MASK));
+ setParam2((level & LIQUID_LEVEL_MASK) | (getParam2() & ~LIQUID_LEVEL_MASK));
}
} else if (f.param_type_2 == CPT2_LEVELED) {
if (level < 0) { // zero means default for a leveled nodebox
@@ -589,7 +650,7 @@ s8 MapNode::addLevel(const NodeDefManager *nodemgr, s16 add)
u32 MapNode::serializedLength(u8 version)
{
- if (!ser_ver_supported(version))
+ if(!ser_ver_supported(version))
throw VersionMismatchException("ERROR: MapNode format not supported");
if (version == 0)
@@ -605,45 +666,47 @@ u32 MapNode::serializedLength(u8 version)
}
void MapNode::serialize(u8 *dest, u8 version) const
{
- if (!ser_ver_supported(version))
+ if(!ser_ver_supported(version))
throw VersionMismatchException("ERROR: MapNode format not supported");
// 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)
+ if(version < 24)
throw SerializationError("MapNode::serialize: serialization to "
- "version < 24 not possible");
+ "version < 24 not possible");
- writeU16(dest + 0, param0);
- writeU8(dest + 2, param1);
- writeU8(dest + 3, param2);
+ writeU16(dest+0, param0);
+ writeU8(dest+2, param1);
+ writeU8(dest+3, param2);
}
void MapNode::deSerialize(u8 *source, u8 version)
{
- if (!ser_ver_supported(version))
+ if(!ser_ver_supported(version))
throw VersionMismatchException("ERROR: MapNode format not supported");
- if (version <= 21) {
+ if(version <= 21)
+ {
deSerialize_pre22(source, version);
return;
}
- 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);
+ 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;
}
}
}
-void MapNode::serializeBulk(std::ostream &os, int version, const MapNode *nodes,
- u32 nodecount, u8 content_width, u8 params_width, bool compressed)
+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");
@@ -655,7 +718,7 @@ void MapNode::serializeBulk(std::ostream &os, int version, const MapNode *nodes,
// in memory; conversion just won't work in this direction.
if (version < 24)
throw SerializationError("MapNode::serializeBulk: serialization to "
- "version < 24 not possible");
+ "version < 24 not possible");
size_t databuf_size = nodecount * (content_width + params_width);
u8 *databuf = new u8[databuf_size];
@@ -677,67 +740,78 @@ void MapNode::serializeBulk(std::ostream &os, int version, const MapNode *nodes,
if (compressed)
compressZlib(databuf, databuf_size, os);
else
- os.write((const char *)&databuf[0], databuf_size);
+ os.write((const char*) &databuf[0], databuf_size);
- delete[] databuf;
+ delete [] databuf;
}
// Deserialize bulk node data
-void MapNode::deSerializeBulk(std::istream &is, int version, MapNode *nodes,
- u32 nodecount, u8 content_width, u8 params_width, bool compressed)
+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))
+ if(!ser_ver_supported(version))
throw VersionMismatchException("ERROR: MapNode format not supported");
- if (version < 22 || (content_width != 1 && content_width != 2) ||
- params_width != 2)
+ if (version < 22
+ || (content_width != 1 && content_width != 2)
+ || params_width != 2)
FATAL_ERROR("Deserialize bulk node data error");
// Uncompress or read data
u32 len = nodecount * (content_width + params_width);
SharedBuffer<u8> databuf(len);
- if (compressed) {
+ if(compressed)
+ {
std::ostringstream os(std::ios_base::binary);
decompressZlib(is, os);
std::string s = os.str();
- if (s.size() != len)
+ if(s.size() != len)
throw SerializationError("deSerializeBulkNodes: "
- "decompress resulted in invalid size");
+ "decompress resulted in invalid size");
memcpy(&databuf[0], s.c_str(), len);
- } else {
- is.read((char *)&databuf[0], len);
- if (is.eof() || is.fail())
+ }
+ else
+ {
+ is.read((char*) &databuf[0], len);
+ if(is.eof() || is.fail())
throw SerializationError("deSerializeBulkNodes: "
- "failed to read bulk node data");
+ "failed to read bulk node data");
}
// Deserialize content
- if (content_width == 1) {
- for (u32 i = 0; i < nodecount; i++)
+ if(content_width == 1)
+ {
+ for(u32 i=0; i<nodecount; i++)
nodes[i].param0 = readU8(&databuf[i]);
- } else if (content_width == 2) {
- for (u32 i = 0; i < nodecount; i++)
- nodes[i].param0 = readU16(&databuf[i * 2]);
+ }
+ 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++)
+ for(u32 i=0; i<nodecount; i++)
nodes[i].param1 = readU8(&databuf[start1 + i]);
// Deserialize param2
u32 start2 = (content_width + 1) * nodecount;
- if (content_width == 1) {
- for (u32 i = 0; i < nodecount; i++) {
+ if(content_width == 1)
+ {
+ for(u32 i=0; i<nodecount; i++) {
nodes[i].param2 = readU8(&databuf[start2 + i]);
- if (nodes[i].param0 > 0x7F) {
+ if(nodes[i].param0 > 0x7F){
nodes[i].param0 <<= 4;
- nodes[i].param0 |= (nodes[i].param2 & 0xF0) >> 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++)
+ }
+ else if(content_width == 2)
+ {
+ for(u32 i=0; i<nodecount; i++)
nodes[i].param2 = readU8(&databuf[start2 + i]);
}
}
@@ -747,30 +821,36 @@ void MapNode::deSerializeBulk(std::istream &is, int version, MapNode *nodes,
*/
void MapNode::deSerialize_pre22(const u8 *source, u8 version)
{
- if (version <= 1) {
+ if(version <= 1)
+ {
param0 = source[0];
- } else if (version <= 9) {
+ }
+ else if(version <= 9)
+ {
param0 = source[0];
param1 = source[1];
- } else {
+ }
+ else
+ {
param0 = source[0];
param1 = source[1];
param2 = source[2];
- if (param0 > 0x7f) {
+ if(param0 > 0x7f){
param0 <<= 4;
- param0 |= (param2 & 0xf0) >> 4;
+ param0 |= (param2&0xf0)>>4;
param2 &= 0x0f;
}
}
// Convert special values from old version to new
- if (version <= 19) {
+ if(version <= 19)
+ {
// In these versions, CONTENT_IGNORE and CONTENT_AIR
// are 255 and 254
// Version 19 is messed up with sometimes the old values and sometimes not
- if (param0 == 255)
+ if(param0 == 255)
param0 = CONTENT_IGNORE;
- else if (param0 == 254)
+ else if(param0 == 254)
param0 = CONTENT_AIR;
}
generated by cgit v1.2.3 (git 2.39.1) at 2025-07-21 02:40:35 +0000