X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;f=src%2Fmg_schematic.cpp;h=a5ffb20b8faa38e56e7873a4df11a4508be7e32d;hb=cf77e0333d1ba0aa81fdce80cd0fa32f137b0a47;hp=6215bce945fb0484c640963af0011c5a6f9ad579;hpb=406d9ba87b9f6e57b86c6282bf157e3341aa195c;p=minetest.git diff --git a/src/mg_schematic.cpp b/src/mg_schematic.cpp index 6215bce94..a5ffb20b8 100644 --- a/src/mg_schematic.cpp +++ b/src/mg_schematic.cpp @@ -18,6 +18,7 @@ with this program; if not, write to the Free Software Foundation, Inc., */ #include +#include #include "mg_schematic.h" #include "gamedef.h" #include "mapgen.h" @@ -53,7 +54,7 @@ void SchematicManager::clear() DecoSchematic *dschem = dynamic_cast(deco); if (dschem) dschem->schematic = NULL; - } catch(std::bad_cast) { + } catch (std::bad_cast) { } } @@ -93,9 +94,10 @@ void Schematic::resolveNodeNames() } -void Schematic::blitToVManip(v3s16 p, MMVManip *vm, Rotation rot, - bool force_placement, INodeDefManager *ndef) +void Schematic::blitToVManip(v3s16 p, MMVManip *vm, Rotation rot, bool force_place) { + sanity_check(m_ndef != NULL); + int xstride = 1; int ystride = size.X; int zstride = size.X * size.Y; @@ -131,8 +133,8 @@ void Schematic::blitToVManip(v3s16 p, MMVManip *vm, Rotation rot, s16 y_map = p.Y; for (s16 y = 0; y != sy; y++) { - if (slice_probs[y] != MTSCHEM_PROB_ALWAYS && - myrand_range(1, 255) > slice_probs[y]) + if ((slice_probs[y] != MTSCHEM_PROB_ALWAYS) && + (slice_probs[y] <= myrand_range(1, MTSCHEM_PROB_ALWAYS))) continue; for (s16 z = 0; z != sz; z++) { @@ -145,24 +147,27 @@ void Schematic::blitToVManip(v3s16 p, MMVManip *vm, Rotation rot, if (schemdata[i].getContent() == CONTENT_IGNORE) continue; - if (schemdata[i].param1 == MTSCHEM_PROB_NEVER) + u8 placement_prob = schemdata[i].param1 & MTSCHEM_PROB_MASK; + bool force_place_node = schemdata[i].param1 & MTSCHEM_FORCE_PLACE; + + if (placement_prob == MTSCHEM_PROB_NEVER) continue; - if (!force_placement) { + if (!force_place && !force_place_node) { content_t c = vm->m_data[vi].getContent(); if (c != CONTENT_AIR && c != CONTENT_IGNORE) continue; } - if (schemdata[i].param1 != MTSCHEM_PROB_ALWAYS && - myrand_range(1, 255) > schemdata[i].param1) + if ((placement_prob != MTSCHEM_PROB_ALWAYS) && + (placement_prob <= myrand_range(1, MTSCHEM_PROB_ALWAYS))) continue; vm->m_data[vi] = schemdata[i]; vm->m_data[vi].param1 = 0; if (rot) - vm->m_data[vi].rotateAlongYAxis(ndef, rot); + vm->m_data[vi].rotateAlongYAxis(m_ndef, rot); } } y_map++; @@ -170,10 +175,12 @@ void Schematic::blitToVManip(v3s16 p, MMVManip *vm, Rotation rot, } -void Schematic::placeStructure(Map *map, v3s16 p, u32 flags, Rotation rot, - bool force_placement, INodeDefManager *ndef) +void Schematic::placeStructure(Map *map, v3s16 p, u32 flags, + Rotation rot, bool force_place) { assert(schemdata != NULL); // Pre-condition + sanity_check(m_ndef != NULL); + MMVManip *vm = new MMVManip(map); if (rot == ROTATE_RAND) @@ -193,7 +200,7 @@ void Schematic::placeStructure(Map *map, v3s16 p, u32 flags, Rotation rot, v3s16 bp2 = getNodeBlockPos(p + s - v3s16(1,1,1)); vm->initialEmerge(bp1, bp2); - blitToVManip(p, vm, rot, force_placement, ndef); + blitToVManip(p, vm, rot, force_place); std::map lighting_modified_blocks; std::map modified_blocks; @@ -214,12 +221,14 @@ void Schematic::placeStructure(Map *map, v3s16 p, u32 flags, Rotation rot, } -bool Schematic::deserializeFromMts(std::istream *is, std::vector *names) +bool Schematic::deserializeFromMts(std::istream *is, + std::vector *names) { std::istream &ss = *is; content_t cignore = CONTENT_IGNORE; bool have_cignore = false; + //// Read signature u32 signature = readU32(ss); if (signature != MTSCHEM_FILE_SIGNATURE) { errorstream << "Schematic::deserializeFromMts: invalid schematic " @@ -227,6 +236,7 @@ bool Schematic::deserializeFromMts(std::istream *is, std::vector *n return false; } + //// Read version u16 version = readU16(ss); if (version > MTSCHEM_FILE_VER_HIGHEST_READ) { errorstream << "Schematic::deserializeFromMts: unsupported schematic " @@ -234,18 +244,21 @@ bool Schematic::deserializeFromMts(std::istream *is, std::vector *n return false; } + //// Read size size = readV3S16(ss); + //// Read Y-slice probability values delete []slice_probs; slice_probs = new u8[size.Y]; for (int y = 0; y != size.Y; y++) - slice_probs[y] = (version >= 3) ? readU8(ss) : MTSCHEM_PROB_ALWAYS; + slice_probs[y] = (version >= 3) ? readU8(ss) : MTSCHEM_PROB_ALWAYS_OLD; + //// Read node names u16 nidmapcount = readU16(ss); for (int i = 0; i != nidmapcount; i++) { std::string name = deSerializeString(ss); - // Instances of "ignore" from ver 1 are converted to air (and instances + // Instances of "ignore" from v1 are converted to air (and instances // are fixed to have MTSCHEM_PROB_NEVER later on). if (name == "ignore") { name = "air"; @@ -256,6 +269,7 @@ bool Schematic::deserializeFromMts(std::istream *is, std::vector *n names->push_back(name); } + //// Read node data size_t nodecount = size.X * size.Y * size.Z; delete []schemdata; @@ -264,21 +278,30 @@ bool Schematic::deserializeFromMts(std::istream *is, std::vector *n MapNode::deSerializeBulk(ss, SER_FMT_VER_HIGHEST_READ, schemdata, nodecount, 2, 2, true); - // fix any probability values for nodes that were ignore - if (version == 1) { + // Fix probability values for nodes that were ignore; removed in v2 + if (version < 2) { for (size_t i = 0; i != nodecount; i++) { if (schemdata[i].param1 == 0) - schemdata[i].param1 = MTSCHEM_PROB_ALWAYS; + schemdata[i].param1 = MTSCHEM_PROB_ALWAYS_OLD; if (have_cignore && schemdata[i].getContent() == cignore) schemdata[i].param1 = MTSCHEM_PROB_NEVER; } } + // Fix probability values for probability range truncation introduced in v4 + if (version < 4) { + for (s16 y = 0; y != size.Y; y++) + slice_probs[y] >>= 1; + for (size_t i = 0; i != nodecount; i++) + schemdata[i].param1 >>= 1; + } + return true; } -bool Schematic::serializeToMts(std::ostream *os) +bool Schematic::serializeToMts(std::ostream *os, + const std::vector &names) { std::ostream &ss = *os; @@ -289,31 +312,31 @@ bool Schematic::serializeToMts(std::ostream *os) for (int y = 0; y != size.Y; y++) // Y slice probabilities writeU8(ss, slice_probs[y]); - std::vector usednodes; - int nodecount = size.X * size.Y * size.Z; - build_nnlist_and_update_ids(schemdata, nodecount, &usednodes); - - u16 numids = usednodes.size(); - writeU16(ss, numids); // name count - for (int i = 0; i != numids; i++) - ss << serializeString(getNodeName(usednodes[i])); // node names + writeU16(ss, names.size()); // name count + for (size_t i = 0; i != names.size(); i++) + ss << serializeString(names[i]); // node names // compressed bulk node data MapNode::serializeBulk(ss, SER_FMT_VER_HIGHEST_WRITE, - schemdata, nodecount, 2, 2, true); + schemdata, size.X * size.Y * size.Z, 2, 2, true); return true; } -bool Schematic::serializeToLua(std::ostream *os, bool use_comments) +bool Schematic::serializeToLua(std::ostream *os, + const std::vector &names, bool use_comments, u32 indent_spaces) { std::ostream &ss = *os; + std::string indent("\t"); + if (indent_spaces > 0) + indent.assign(indent_spaces, ' '); + //// Write header { ss << "schematic = {" << std::endl; - ss << "\tsize = " + ss << indent << "size = " << "{x=" << size.X << ", y=" << size.Y << ", z=" << size.Z @@ -322,41 +345,51 @@ bool Schematic::serializeToLua(std::ostream *os, bool use_comments) //// Write y-slice probabilities { - ss << "\tyslice_prob = {" << std::endl; + ss << indent << "yslice_prob = {" << std::endl; for (u16 y = 0; y != size.Y; y++) { - ss << "\t\t{" + u8 probability = slice_probs[y] & MTSCHEM_PROB_MASK; + + ss << indent << indent << "{" << "ypos=" << y - << ", prob=" << (u16)slice_probs[y] + << ", prob=" << (u16)probability * 2 << "}," << std::endl; } - ss << "\t}," << std::endl; + ss << indent << "}," << std::endl; } //// Write node data { - ss << "\tdata = {" << std::endl; + ss << indent << "data = {" << std::endl; u32 i = 0; for (u16 z = 0; z != size.Z; z++) for (u16 y = 0; y != size.Y; y++) { if (use_comments) { ss << std::endl - << "\t\t-- z=" << z + << indent << indent + << "-- z=" << z << ", y=" << y << std::endl; } for (u16 x = 0; x != size.X; x++, i++) { - ss << "\t\t{" - << "name=\"" << getNodeName(schemdata[i].getContent()) - << "\", param1=" << (u16)schemdata[i].param1 - << ", param2=" << (u16)schemdata[i].param2 - << "}," << std::endl; + u8 probability = schemdata[i].param1 & MTSCHEM_PROB_MASK; + bool force_place = schemdata[i].param1 & MTSCHEM_FORCE_PLACE; + + ss << indent << indent << "{" + << "name=\"" << names[schemdata[i].getContent()] + << "\", prob=" << (u16)probability * 2 + << ", param2=" << (u16)schemdata[i].param2; + + if (force_place) + ss << ", force_place=true"; + + ss << "}," << std::endl; } } - ss << "\t}," << std::endl; + ss << indent << "}," << std::endl; } ss << "}" << std::endl; @@ -366,8 +399,7 @@ bool Schematic::serializeToLua(std::ostream *os, bool use_comments) bool Schematic::loadSchematicFromFile(const std::string &filename, - INodeDefManager *ndef, StringMap *replace_names, - NodeResolveMethod resolve_method) + INodeDefManager *ndef, StringMap *replace_names) { std::ifstream is(filename.c_str(), std::ios_base::binary); if (!is.good()) { @@ -391,16 +423,47 @@ bool Schematic::loadSchematicFromFile(const std::string &filename, m_nnlistsizes.push_back(m_nodenames.size() - origsize); - ndef->pendNodeResolve(this, resolve_method); + if (ndef) + ndef->pendNodeResolve(this); return true; } -bool Schematic::saveSchematicToFile(const std::string &filename) +bool Schematic::saveSchematicToFile(const std::string &filename, + INodeDefManager *ndef) { + MapNode *orig_schemdata = schemdata; + std::vector ndef_nodenames; + std::vector *names; + + if (m_resolve_done && ndef == NULL) + ndef = m_ndef; + + if (ndef) { + names = &ndef_nodenames; + + u32 volume = size.X * size.Y * size.Z; + schemdata = new MapNode[volume]; + for (u32 i = 0; i != volume; i++) + schemdata[i] = orig_schemdata[i]; + + generate_nodelist_and_update_ids(schemdata, volume, names, ndef); + } else { // otherwise, use the names we have on hand in the list + names = &m_nodenames; + } + std::ostringstream os(std::ios_base::binary); - serializeToMts(&os); + bool status = serializeToMts(&os, *names); + + if (ndef) { + delete []schemdata; + schemdata = orig_schemdata; + } + + if (!status) + return false; + return fs::safeWriteToFile(filename, os.str()); } @@ -460,13 +523,13 @@ void Schematic::applyProbabilities(v3s16 p0, } -void build_nnlist_and_update_ids(MapNode *nodes, u32 nodecount, - std::vector *usednodes) +void generate_nodelist_and_update_ids(MapNode *nodes, size_t nodecount, + std::vector *usednodes, INodeDefManager *ndef) { std::map nodeidmap; content_t numids = 0; - for (u32 i = 0; i != nodecount; i++) { + for (size_t i = 0; i != nodecount; i++) { content_t id; content_t c = nodes[i].getContent(); @@ -475,7 +538,7 @@ void build_nnlist_and_update_ids(MapNode *nodes, u32 nodecount, id = numids; numids++; - usednodes->push_back(c); + usednodes->push_back(ndef->get(c).name); nodeidmap.insert(std::make_pair(c, id)); } else { id = it->second;