oss/luanti
oss/luanti
1
0
Fork 0
mirror of https://github.com/luanti-org/luanti.git synced 2025-08-01 17:38:41 +00:00
Code Wiki Activity

Simple decorations: Make 'place_offset_y' usable with simple decorations

Browse source 
Necessary for placing the base cube of 'plantlike_rooted' drawtype in the
seabed instead of on it.
Useful for placing decorations sunk into, or buried in, the ground.
This commit is contained in:
paramat 2017-10-09 20:13:10 +01:00 • committed by paramat
parent 2cf9014160
commit 9a41a3d0f1
4 changed files with 33 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/mg_decoration.cpp
View file

@ -219,6 +219,10 @@ size_t DecoSimple::generate(MMVManip *vm, PcgRandom *pr, v3s16 p)
if (c_decos.empty())
return 0;
// Check for a negative place_offset_y causing placement below the voxelmanip
if (p.Y + 1 + place_offset_y < vm->m_area.MinEdge.Y)
return 0;
if (!canPlaceDecoration(vm, p))
return 0;
@ -234,9 +238,10 @@ size_t DecoSimple::generate(MMVManip *vm, PcgRandom *pr, v3s16 p)
const v3s16 &em = vm->m_area.getExtent();
u32 vi = vm->m_area.index(p);
vm->m_area.add_y(em, vi, place_offset_y);
for (int i = 0; i < height; i++) {
vm->m_area.add_y(em, vi, 1);
content_t c = vm->m_data[vi].getContent();
if (c != CONTENT_AIR && c != CONTENT_IGNORE &&
!force_placement)
@ -251,7 +256,8 @@ size_t DecoSimple::generate(MMVManip *vm, PcgRandom *pr, v3s16 p)
int DecoSimple::getHeight()
{
return (deco_height_max > 0) ? deco_height_max : deco_height;
return ((deco_height_max > 0) ? deco_height_max : deco_height)
+ place_offset_y;
}

2
src/mg_decoration.h
View file

@ -69,6 +69,7 @@ public:
NoiseParams np;
std::vector<content_t> c_spawnby;
s16 nspawnby;
s16 place_offset_y = 0;
std::unordered_set<u8> biomes;
};
@ -96,7 +97,6 @@ public:
virtual int getHeight();
Rotation rotation;
s16 place_offset_y = 0;
Schematic *schematic = nullptr;
};

15
src/script/lua_api/l_mapgen.cpp
View file

@ -906,12 +906,13 @@ int ModApiMapgen::l_register_decoration(lua_State *L)
return 0;
}
deco->name = getstringfield_default(L, index, "name", "");
deco->fill_ratio = getfloatfield_default(L, index, "fill_ratio", 0.02);
deco->y_min = getintfield_default(L, index, "y_min", -31000);
deco->y_max = getintfield_default(L, index, "y_max", 31000);
deco->nspawnby = getintfield_default(L, index, "num_spawn_by", -1);
deco->sidelen = getintfield_default(L, index, "sidelen", 8);
deco->name = getstringfield_default(L, index, "name", "");
deco->fill_ratio = getfloatfield_default(L, index, "fill_ratio", 0.02);
deco->y_min = getintfield_default(L, index, "y_min", -31000);
deco->y_max = getintfield_default(L, index, "y_max", 31000);
deco->nspawnby = getintfield_default(L, index, "num_spawn_by", -1);
deco->place_offset_y = getintfield_default(L, index, "place_offset_y", 0);
deco->sidelen = getintfield_default(L, index, "sidelen", 8);
if (deco->sidelen <= 0) {
errorstream << "register_decoration: sidelen must be "
"greater than 0" << std::endl;
@ -1024,8 +1025,6 @@ bool read_deco_schematic(lua_State *L, SchematicManager *schemmgr, DecoSchematic
deco->rotation = (Rotation)getenumfield(L, index, "rotation",
ModApiMapgen::es_Rotation, ROTATE_0);
deco->place_offset_y = getintfield_default(L, index, "place_offset_y", 0);
StringMap replace_names;
lua_getfield(L, index, "replacements");
if (lua_istable(L, -1))