mirror of
https://github.com/minetest/minetest.git
synced 2024-11-10 09:43:45 +01:00
Schematic: Read slice probability table from schematic descriptors
This commit is contained in:
parent
66b24cc9ff
commit
21c96249fa
@ -789,6 +789,7 @@ bool DecoSchematic::loadSchematicFile() {
|
|||||||
Version changes:
|
Version changes:
|
||||||
1 - Initial version
|
1 - Initial version
|
||||||
2 - Fixed messy never/always place; 0 probability is now never, 0xFF is always
|
2 - Fixed messy never/always place; 0 probability is now never, 0xFF is always
|
||||||
|
3 - Added y-slice probabilities; this allows for variable height structures
|
||||||
*/
|
*/
|
||||||
void DecoSchematic::saveSchematicFile(INodeDefManager *ndef) {
|
void DecoSchematic::saveSchematicFile(INodeDefManager *ndef) {
|
||||||
std::ostringstream ss(std::ios_base::binary);
|
std::ostringstream ss(std::ios_base::binary);
|
||||||
|
@ -958,6 +958,7 @@ bool read_schematic(lua_State *L, int index, DecoSchematic *dschem, Server *serv
|
|||||||
MapNode *schemdata = new MapNode[numnodes];
|
MapNode *schemdata = new MapNode[numnodes];
|
||||||
int i = 0;
|
int i = 0;
|
||||||
|
|
||||||
|
// Get schematic data
|
||||||
lua_getfield(L, index, "data");
|
lua_getfield(L, index, "data");
|
||||||
luaL_checktype(L, -1, LUA_TTABLE);
|
luaL_checktype(L, -1, LUA_TTABLE);
|
||||||
|
|
||||||
@ -986,15 +987,34 @@ bool read_schematic(lua_State *L, int index, DecoSchematic *dschem, Server *serv
|
|||||||
lua_pop(L, 1);
|
lua_pop(L, 1);
|
||||||
}
|
}
|
||||||
|
|
||||||
dschem->size = size;
|
|
||||||
dschem->schematic = schemdata;
|
|
||||||
|
|
||||||
if (i != numnodes) {
|
if (i != numnodes) {
|
||||||
errorstream << "read_schematic: incorrect number of "
|
errorstream << "read_schematic: incorrect number of "
|
||||||
"nodes provided in raw schematic data (got " << i <<
|
"nodes provided in raw schematic data (got " << i <<
|
||||||
", expected " << numnodes << ")." << std::endl;
|
", expected " << numnodes << ")." << std::endl;
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
u8 *sliceprobs = new u8[size.Y];
|
||||||
|
for (i = 0; i != size.Y; i++)
|
||||||
|
sliceprobs[i] = MTSCHEM_PROB_ALWAYS;
|
||||||
|
|
||||||
|
// Get Y-slice probability values (if present)
|
||||||
|
lua_getfield(L, index, "yslice_prob");
|
||||||
|
if (lua_istable(L, -1)) {
|
||||||
|
lua_pushnil(L);
|
||||||
|
while (lua_next(L, -2)) {
|
||||||
|
if (getintfield(L, -1, "ypos", i) && i >= 0 && i < size.Y) {
|
||||||
|
sliceprobs[i] = getintfield_default(L, -1,
|
||||||
|
"prob", MTSCHEM_PROB_ALWAYS);
|
||||||
|
}
|
||||||
|
lua_pop(L, 1);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
dschem->size = size;
|
||||||
|
dschem->schematic = schemdata;
|
||||||
|
dschem->slice_probs = sliceprobs;
|
||||||
|
|
||||||
} else if (lua_isstring(L, index)) {
|
} else if (lua_isstring(L, index)) {
|
||||||
dschem->filename = std::string(lua_tostring(L, index));
|
dschem->filename = std::string(lua_tostring(L, index));
|
||||||
} else {
|
} else {
|
||||||
|
Loading…
Reference in New Issue
Block a user