Mirrorlandia_minetest/minetest
1
0
Fork 1
mirror of https://github.com/minetest/minetest.git synced 2024-11-24 00:23:46 +01:00
Code Issues Packages Projects Releases Wiki Activity

Schematic decorations: Fix placement bug when centred and rotated (#7365)

Browse Source 
Previously, the centering caused by the 'place center x/z' flags did
not take rotation into account. So schematics with unequal X and Z
dimensions were incorrectly placed. The bug was hidden for schematics
equal in X and Z dimensions.
This commit is contained in:
Paramat 2018-05-24 02:52:35 +01:00 committed by GitHub
parent 53d5b3ea40
commit d6a6d3176e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/mapgen/mg_decoration.cpp
View File

@ -360,13 +360,22 @@ size_t DecoSchematic::generate(MMVManip *vm, PcgRandom *pr, v3s16 p, bool ceilin
if (p.Y < vm->m_area.MinEdge.Y) if (p.Y < vm->m_area.MinEdge.Y)
return 0; return 0;
if (flags & DECO_PLACE_CENTER_X)
p.X -= (schematic->size.X - 1) / 2;
if (flags & DECO_PLACE_CENTER_Z)
p.Z -= (schematic->size.Z - 1) / 2;
Rotation rot = (rotation == ROTATE_RAND) ? Rotation rot = (rotation == ROTATE_RAND) ?
(Rotation)pr->range(ROTATE_0, ROTATE_270) : rotation; (Rotation)pr->range(ROTATE_0, ROTATE_270) : rotation;
if (flags & DECO_PLACE_CENTER_X) {
if (rot == ROTATE_0 || rot == ROTATE_180)
p.X -= (schematic->size.X - 1) / 2;
else
p.Z -= (schematic->size.X - 1) / 2;
}
if (flags & DECO_PLACE_CENTER_Z) {
if (rot == ROTATE_0 || rot == ROTATE_180)
p.Z -= (schematic->size.Z - 1) / 2;
else
p.X -= (schematic->size.Z - 1) / 2;
}
bool force_placement = (flags & DECO_FORCE_PLACEMENT); bool force_placement = (flags & DECO_FORCE_PLACEMENT);
schematic->blitToVManip(vm, p, rot, force_placement); schematic->blitToVManip(vm, p, rot, force_placement);