aboutsummaryrefslogtreecommitdiff
path: root/src/script/lua_api
diff options
context:
space:
mode:
authorkwolekr <kwolekr@minetest.net>2015-04-12 16:40:50 -0400
committerkwolekr <kwolekr@minetest.net>2015-04-13 03:10:52 -0400
commitb2a89c04b22d51a9ec541c75cf530897dbbce8d9 (patch)
treed10614fa15c71fbd4110b3e2430208a332a82b40 /src/script/lua_api
parent39fd4da7a00e59fabe9b328842033901c15eeb70 (diff)
downloadminetest-b2a89c04b22d51a9ec541c75cf530897dbbce8d9.tar.gz
minetest-b2a89c04b22d51a9ec541c75cf530897dbbce8d9.tar.bz2
minetest-b2a89c04b22d51a9ec541c75cf530897dbbce8d9.zip
Schematics: Reorganize (de)serialization and add Lua serialization API
Diffstat (limited to 'src/script/lua_api')
-rw-r--r--src/script/lua_api/l_mapgen.cpp64
-rw-r--r--src/script/lua_api/l_mapgen.h4
2 files changed, 62 insertions, 6 deletions
diff --git a/src/script/lua_api/l_mapgen.cpp b/src/script/lua_api/l_mapgen.cpp
index d08cfea8a..a34281fd2 100644
--- a/src/script/lua_api/l_mapgen.cpp
+++ b/src/script/lua_api/l_mapgen.cpp
@@ -36,7 +36,6 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#include "settings.h"
#include "log.h"
-
struct EnumString ModApiMapgen::es_BiomeTerrainType[] =
{
{BIOME_NORMAL, "normal"},
@@ -85,6 +84,13 @@ struct EnumString ModApiMapgen::es_Rotation[] =
{0, NULL},
};
+struct EnumString ModApiMapgen::es_SchematicFormatType[] =
+{
+ {SCHEM_FMT_HANDLE, "handle"},
+ {SCHEM_FMT_MTS, "mts"},
+ {SCHEM_FMT_LUA, "lua"},
+ {0, NULL},
+};
ObjDef *get_objdef(lua_State *L, int index, ObjDefManager *objmgr);
@@ -329,9 +335,11 @@ Schematic *read_schematic_def(lua_State *L, int index,
param2 = !lua_isnil(L, -1) ? lua_tonumber(L, -1) : 0;
lua_pop(L, 1);
- StringMap::iterator it = replace_names->find(name);
- if (it != replace_names->end())
- name = it->second;
+ if (replace_names) {
+ StringMap::iterator it = replace_names->find(name);
+ if (it != replace_names->end())
+ name = it->second;
+ }
schemdata[i] = MapNode(ndef, name, param1, param2);
@@ -1067,8 +1075,9 @@ int ModApiMapgen::l_place_schematic(lua_State *L)
//// Read rotation
int rot = ROTATE_0;
- if (lua_isstring(L, 3))
- string_to_enum(es_Rotation, rot, std::string(lua_tostring(L, 3)));
+ const char *enumstr = lua_tostring(L, 3);
+ if (enumstr)
+ string_to_enum(es_Rotation, rot, std::string(enumstr));
//// Read force placement
bool force_placement = true;
@@ -1094,6 +1103,48 @@ int ModApiMapgen::l_place_schematic(lua_State *L)
return 1;
}
+// serialize_schematic(schematic, format, use_comments)
+int ModApiMapgen::l_serialize_schematic(lua_State *L)
+{
+ SchematicManager *schemmgr = getServer(L)->getEmergeManager()->schemmgr;
+ INodeDefManager *ndef = getServer(L)->getNodeDefManager();
+
+ //// Read schematic
+ Schematic *schem = get_or_load_schematic(L, 1, schemmgr, NULL);
+ if (!schem) {
+ errorstream << "serialize_schematic: failed to get schematic" << std::endl;
+ return 0;
+ }
+
+ //// Read format of definition to save as
+ int schem_format = SCHEM_FMT_MTS;
+ const char *enumstr = lua_tostring(L, 2);
+ if (enumstr)
+ string_to_enum(es_SchematicFormatType, schem_format, std::string(enumstr));
+
+ //// Read use_comments
+ bool use_comments = false;
+ if (lua_isboolean(L, 3))
+ use_comments = lua_toboolean(L, 3);
+
+ //// Serialize to binary string
+ std::ostringstream os(std::ios_base::binary);
+ switch (schem_format) {
+ case SCHEM_FMT_MTS:
+ schem->serializeToMts(&os, ndef);
+ break;
+ case SCHEM_FMT_LUA:
+ schem->serializeToLua(&os, ndef, use_comments);
+ break;
+ default:
+ return 0;
+ }
+
+ std::string ser = os.str();
+ lua_pushlstring(L, ser.c_str(), ser.length());
+ return 1;
+}
+
void ModApiMapgen::Initialize(lua_State *L, int top)
{
@@ -1118,4 +1169,5 @@ void ModApiMapgen::Initialize(lua_State *L, int top)
API_FCT(generate_decorations);
API_FCT(create_schematic);
API_FCT(place_schematic);
+ API_FCT(serialize_schematic);
}
diff --git a/src/script/lua_api/l_mapgen.h b/src/script/lua_api/l_mapgen.h
index 2d796ac70..a54fcd7a8 100644
--- a/src/script/lua_api/l_mapgen.h
+++ b/src/script/lua_api/l_mapgen.h
@@ -84,6 +84,9 @@ private:
// place_schematic(p, schematic, rotation, replacement)
static int l_place_schematic(lua_State *L);
+ // serialize_schematic(schematic, format, use_comments)
+ static int l_serialize_schematic(lua_State *L);
+
public:
static void Initialize(lua_State *L, int top);
@@ -92,6 +95,7 @@ public:
static struct EnumString es_MapgenObject[];
static struct EnumString es_OreType[];
static struct EnumString es_Rotation[];
+ static struct EnumString es_SchematicFormatType[];
};
#endif /* L_MAPGEN_H_ */