X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Fmapnode.cpp;h=d52677be07540def4fc0a15b8b3e0022c6887b4f;hb=a020d1b653f94fbcaac06c15f9dbab4521fda355;hp=4de84dd1d9190a9dc32d6e447915d8704703032c;hpb=9f031a67594162a53b07acbfbc65faf8c4938e99;p=oweals%2Fminetest.git diff --git a/src/mapnode.cpp b/src/mapnode.cpp index 4de84dd1d..d52677be0 100644 --- a/src/mapnode.cpp +++ b/src/mapnode.cpp @@ -1,6 +1,6 @@ /* -Minetest-c55 -Copyright (C) 2010 celeron55, Perttu Ahola +Minetest +Copyright (C) 2013 celeron55, Perttu Ahola This program is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by @@ -25,9 +25,19 @@ with this program; if not, write to the Free Software Foundation, Inc., #include "content_mapnode.h" // For mapnode_translate_*_internal #include "serialization.h" // For ser_ver_supported #include "util/serialize.h" +#include "log.h" #include #include +static const Rotation wallmounted_to_rot[] = { + ROTATE_0, ROTATE_180, ROTATE_90, ROTATE_270 +}; + +static const u8 rot_to_wallmounted[] = { + 2, 4, 3, 5 +}; + + /* MapNode */ @@ -39,11 +49,9 @@ MapNode::MapNode(INodeDefManager *ndef, const std::string &name, { content_t id = CONTENT_IGNORE; ndef->getId(name, id); + param0 = 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 MapNode::setLight(enum LightBank bank, u8 a_light, INodeDefManager *nodemgr) @@ -109,7 +117,7 @@ u8 MapNode::getFaceDir(INodeDefManager *nodemgr) const { const ContentFeatures &f = nodemgr->get(*this); if(f.param_type_2 == CPT2_FACEDIR) - return getParam2() & 0x03; + return getParam2() & 0x1F; return 0; } @@ -134,7 +142,308 @@ v3s16 MapNode::getWallMountedDir(INodeDefManager *nodemgr) const } } +void MapNode::rotateAlongYAxis(INodeDefManager *nodemgr, Rotation rot) { + ContentParamType2 cpt2 = nodemgr->get(*this).param_type_2; + + if (cpt2 == CPT2_FACEDIR) { + u8 newrot = param2 & 3; + param2 &= ~3; + param2 |= (newrot + rot) & 3; + } else if (cpt2 == CPT2_WALLMOUNTED) { + u8 wmountface = (param2 & 7); + if (wmountface <= 1) + return; + + Rotation oldrot = wallmounted_to_rot[wmountface - 2]; + param2 &= ~7; + param2 |= rot_to_wallmounted[(oldrot - rot) & 3]; + } +} + +static std::vector transformNodeBox(const MapNode &n, + const NodeBox &nodebox, INodeDefManager *nodemgr) +{ + std::vector boxes; + if(nodebox.type == NODEBOX_FIXED || nodebox.type == NODEBOX_LEVELED) + { + const std::vector &fixed = nodebox.fixed; + int facedir = n.getFaceDir(nodemgr); + u8 axisdir = facedir>>2; + facedir&=0x03; + for(std::vector::const_iterator + i = fixed.begin(); + i != fixed.end(); i++) + { + aabb3f box = *i; + + if (nodebox.type == NODEBOX_LEVELED) { + box.MaxEdge.Y = -BS/2 + BS*((float)1/LEVELED_MAX) * n.getLevel(nodemgr); + } + + switch (axisdir) + { + case 0: + if(facedir == 1) + { + box.MinEdge.rotateXZBy(-90); + box.MaxEdge.rotateXZBy(-90); + } + else if(facedir == 2) + { + box.MinEdge.rotateXZBy(180); + box.MaxEdge.rotateXZBy(180); + } + else if(facedir == 3) + { + box.MinEdge.rotateXZBy(90); + box.MaxEdge.rotateXZBy(90); + } + break; + case 1: // z+ + box.MinEdge.rotateYZBy(90); + box.MaxEdge.rotateYZBy(90); + if(facedir == 1) + { + box.MinEdge.rotateXYBy(90); + box.MaxEdge.rotateXYBy(90); + } + else if(facedir == 2) + { + box.MinEdge.rotateXYBy(180); + box.MaxEdge.rotateXYBy(180); + } + else if(facedir == 3) + { + box.MinEdge.rotateXYBy(-90); + box.MaxEdge.rotateXYBy(-90); + } + break; + case 2: //z- + box.MinEdge.rotateYZBy(-90); + box.MaxEdge.rotateYZBy(-90); + if(facedir == 1) + { + box.MinEdge.rotateXYBy(-90); + box.MaxEdge.rotateXYBy(-90); + } + else if(facedir == 2) + { + box.MinEdge.rotateXYBy(180); + box.MaxEdge.rotateXYBy(180); + } + else if(facedir == 3) + { + box.MinEdge.rotateXYBy(90); + box.MaxEdge.rotateXYBy(90); + } + break; + case 3: //x+ + box.MinEdge.rotateXYBy(-90); + box.MaxEdge.rotateXYBy(-90); + if(facedir == 1) + { + box.MinEdge.rotateYZBy(90); + box.MaxEdge.rotateYZBy(90); + } + else if(facedir == 2) + { + box.MinEdge.rotateYZBy(180); + box.MaxEdge.rotateYZBy(180); + } + else if(facedir == 3) + { + box.MinEdge.rotateYZBy(-90); + box.MaxEdge.rotateYZBy(-90); + } + break; + case 4: //x- + box.MinEdge.rotateXYBy(90); + box.MaxEdge.rotateXYBy(90); + if(facedir == 1) + { + box.MinEdge.rotateYZBy(-90); + box.MaxEdge.rotateYZBy(-90); + } + else if(facedir == 2) + { + box.MinEdge.rotateYZBy(180); + box.MaxEdge.rotateYZBy(180); + } + else if(facedir == 3) + { + box.MinEdge.rotateYZBy(90); + box.MaxEdge.rotateYZBy(90); + } + break; + case 5: + box.MinEdge.rotateXYBy(-180); + box.MaxEdge.rotateXYBy(-180); + if(facedir == 1) + { + box.MinEdge.rotateXZBy(90); + box.MaxEdge.rotateXZBy(90); + } + else if(facedir == 2) + { + box.MinEdge.rotateXZBy(180); + box.MaxEdge.rotateXZBy(180); + } + else if(facedir == 3) + { + box.MinEdge.rotateXZBy(-90); + box.MaxEdge.rotateXZBy(-90); + } + break; + default: + break; + } + box.repair(); + boxes.push_back(box); + } + } + else if(nodebox.type == NODEBOX_WALLMOUNTED) + { + v3s16 dir = n.getWallMountedDir(nodemgr); + + // 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 + }; + + 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); + } + + aabb3f box = aabb3f(vertices[0]); + box.addInternalPoint(vertices[1]); + boxes.push_back(box); + } + } + else // NODEBOX_REGULAR + { + boxes.push_back(aabb3f(-BS/2,-BS/2,-BS/2,BS/2,BS/2,BS/2)); + } + return boxes; +} + +std::vector MapNode::getNodeBoxes(INodeDefManager *nodemgr) const +{ + const ContentFeatures &f = nodemgr->get(*this); + return transformNodeBox(*this, f.node_box, nodemgr); +} + +std::vector MapNode::getSelectionBoxes(INodeDefManager *nodemgr) const +{ + const ContentFeatures &f = nodemgr->get(*this); + return transformNodeBox(*this, f.selection_box, nodemgr); +} + +u8 MapNode::getMaxLevel(INodeDefManager *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) + return LIQUID_LEVEL_MAX; + if(f.leveled || f.param_type_2 == CPT2_LEVELED) + return LEVELED_MAX; + return 0; +} + +u8 MapNode::getLevel(INodeDefManager *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) + 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 + return getParam2() & LIQUID_LEVEL_MASK; + if(f.leveled || f.param_type_2 == CPT2_LEVELED) { + u8 level = getParam2() & LEVELED_MASK; + if(level) + return level; + if(f.leveled > LEVELED_MAX) + return LEVELED_MAX; + return f.leveled; //default + } + return 0; +} + +u8 MapNode::setLevel(INodeDefManager *nodemgr, s8 level) +{ + u8 rest = 0; + if (level < 1) { + setContent(CONTENT_AIR); + return 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 (level >= LIQUID_LEVEL_SOURCE) { + rest = level - LIQUID_LEVEL_SOURCE; + setContent(nodemgr->getId(f.liquid_alternative_source)); + } else { + setContent(nodemgr->getId(f.liquid_alternative_flowing)); + setParam2(level & LIQUID_LEVEL_MASK); + } + } else if (f.leveled || f.param_type_2 == CPT2_LEVELED) { + if (level > LEVELED_MAX) { + rest = level - LEVELED_MAX; + level = LEVELED_MAX; + } + setParam2(level & LEVELED_MASK); + } + return rest; +} +u8 MapNode::addLevel(INodeDefManager *nodemgr, s8 add) +{ + s8 level = getLevel(nodemgr); + if (add == 0) level = 1; + level += add; + return setLevel(nodemgr, level); +} + +void MapNode::freezeMelt(INodeDefManager *ndef) { + u8 level_was_max = this->getMaxLevel(ndef); + u8 level_was = this->getLevel(ndef); + this->setContent(ndef->getId(ndef->get(*this).freezemelt)); + u8 level_now_max = this->getMaxLevel(ndef); + if (level_was_max && level_was_max != level_now_max) { + u8 want = (float)level_now_max / level_was_max * level_was; + if (!want) + want = 1; + if (want != level_was) + this->setLevel(ndef, want); + //errorstream<<"was="<<(int)level_was<<"/"<<(int)level_was_max<<" nowm="<<(int)want<<"/"<<(int)level_now_max<< " => "<<(int)this->getLevel(ndef)<< std::endl; + } + if (this->getMaxLevel(ndef) && !this->getLevel(ndef)) + this->addLevel(ndef); +} u32 MapNode::serializedLength(u8 version) { @@ -145,23 +454,25 @@ u32 MapNode::serializedLength(u8 version) return 1; else if(version <= 9) return 2; - else + else if(version <= 23) return 3; + else + return 4; } void MapNode::serialize(u8 *dest, u8 version) { if(!ser_ver_supported(version)) throw VersionMismatchException("ERROR: MapNode format not supported"); - - if(version <= 21) - { - serialize_pre22(dest, version); - return; - } - - writeU8(dest+0, param0); - writeU8(dest+1, param1); - writeU8(dest+2, param2); + + // 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) { @@ -174,9 +485,19 @@ void MapNode::deSerialize(u8 *source, u8 version) return; } - param0 = readU8(source+0); - param1 = readU8(source+1); - param2 = readU8(source+2); + 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, @@ -185,24 +506,20 @@ void MapNode::serializeBulk(std::ostream &os, int version, if(!ser_ver_supported(version)) throw VersionMismatchException("ERROR: MapNode format not supported"); - assert(version >= 22); - assert(content_width == 1); + 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 databuf(nodecount * (content_width + params_width)); // Serialize content - if(content_width == 1) - { - for(u32 i=0; i= 22); - assert(content_width == 1); + assert(content_width == 1 || content_width == 2); assert(params_width == 2); // Uncompress or read data @@ -267,12 +584,11 @@ void MapNode::deSerializeBulk(std::istream &is, int version, for(u32 i=0; i 0x7F){ + nodes[i].param0 <<= 4; + nodes[i].param0 |= (nodes[i].param2&0xF0)>>4; + nodes[i].param2 &= 0x0F; + } + } } - else + else if(content_width == 2) { - dest[0] = actual_param0; - dest[1] = n_foreign.param1; - dest[2] = n_foreign.param2; + for(u32 i=0; i 0x7f){ + param0 <<= 4; + param0 |= (param2&0xf0)>>4; + param2 &= 0x0f; + } } // Convert special values from old version to new