BRNSystems/minetest
1
0
Fork 0
forked from Mirrorlandia_minetest/minetest
Code Pull Requests 1 Activity

mg_decoration: Raise highest allowed deco top to max edge of voxelmanip

Browse Source 
Remove max_y from functions, simplify code
This commit is contained in:
paramat 2015-03-14 04:26:04 +00:00
parent 155116852a
commit 89217faec5
2 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/mg_decoration.cpp
View File

@ -147,9 +147,7 @@ size_t Decoration::placeDeco(Mapgen *mg, u32 blockseed, v3s16 nmin, v3s16 nmax)
y < y_min || y > y_max) y < y_min || y > y_max)
continue; continue;
int height = getHeight(); if (y + getHeight() >= mg->vm->m_area.MaxEdge.Y) {
int max_y = nmax.Y;// + MAP_BLOCKSIZE - 1;
if (y + 1 + height > max_y) {
continue; continue;
#if 0 #if 0
printf("Decoration at (%d %d %d) cut off\n", x, y, z); printf("Decoration at (%d %d %d) cut off\n", x, y, z);
@ -170,7 +168,7 @@ size_t Decoration::placeDeco(Mapgen *mg, u32 blockseed, v3s16 nmin, v3s16 nmax)
} }
v3s16 pos(x, y, z); v3s16 pos(x, y, z);
if (generate(mg->vm, &ps, max_y, pos)) if (generate(mg->vm, &ps, pos))
mg->gennotify.addEvent(GENNOTIFY_DECORATION, pos, id); mg->gennotify.addEvent(GENNOTIFY_DECORATION, pos, id);
} }
} }
@ -289,7 +287,7 @@ bool DecoSimple::canPlaceDecoration(MMVManip *vm, v3s16 p)
} }
size_t DecoSimple::generate(MMVManip *vm, PseudoRandom *pr, s16 max_y, v3s16 p) size_t DecoSimple::generate(MMVManip *vm, PseudoRandom *pr, v3s16 p)
{ {
if (!canPlaceDecoration(vm, p)) if (!canPlaceDecoration(vm, p))
return 0; return 0;
@ -299,8 +297,6 @@ size_t DecoSimple::generate(MMVManip *vm, PseudoRandom *pr, s16 max_y, v3s16 p)
s16 height = (deco_height_max > 0) ? s16 height = (deco_height_max > 0) ?
pr->range(deco_height, deco_height_max) : deco_height; pr->range(deco_height, deco_height_max) : deco_height;
height = MYMIN(height, max_y - p.Y);
v3s16 em = vm->m_area.getExtent(); v3s16 em = vm->m_area.getExtent();
u32 vi = vm->m_area.index(p); u32 vi = vm->m_area.index(p);
for (int i = 0; i < height; i++) { for (int i = 0; i < height; i++) {
@ -326,7 +322,7 @@ int DecoSimple::getHeight()
/////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////
size_t DecoSchematic::generate(MMVManip *vm, PseudoRandom *pr, s16 max_y, v3s16 p) size_t DecoSchematic::generate(MMVManip *vm, PseudoRandom *pr, v3s16 p)
{ {
if (flags & DECO_PLACE_CENTER_X) if (flags & DECO_PLACE_CENTER_X)
p.X -= (schematic->size.X + 1) / 2; p.X -= (schematic->size.X + 1) / 2;

6
src/mg_decoration.h
View File

@ -84,7 +84,7 @@ public:
size_t placeDeco(Mapgen *mg, u32 blockseed, v3s16 nmin, v3s16 nmax); size_t placeDeco(Mapgen *mg, u32 blockseed, v3s16 nmin, v3s16 nmax);
//size_t placeCutoffs(Mapgen *mg, u32 blockseed, v3s16 nmin, v3s16 nmax); //size_t placeCutoffs(Mapgen *mg, u32 blockseed, v3s16 nmin, v3s16 nmax);
virtual size_t generate(MMVManip *vm, PseudoRandom *pr, s16 max_y, v3s16 p) = 0; virtual size_t generate(MMVManip *vm, PseudoRandom *pr, v3s16 p) = 0;
virtual int getHeight() = 0; virtual int getHeight() = 0;
}; };
@ -99,7 +99,7 @@ public:
virtual void resolveNodeNames(NodeResolveInfo *nri); virtual void resolveNodeNames(NodeResolveInfo *nri);
bool canPlaceDecoration(MMVManip *vm, v3s16 p); bool canPlaceDecoration(MMVManip *vm, v3s16 p);
virtual size_t generate(MMVManip *vm, PseudoRandom *pr, s16 max_y, v3s16 p); virtual size_t generate(MMVManip *vm, PseudoRandom *pr, v3s16 p);
virtual int getHeight(); virtual int getHeight();
}; };
@ -109,7 +109,7 @@ public:
Schematic *schematic; Schematic *schematic;
std::string filename; std::string filename;
virtual size_t generate(MMVManip *vm, PseudoRandom *pr, s16 max_y, v3s16 p); virtual size_t generate(MMVManip *vm, PseudoRandom *pr, v3s16 p);
virtual int getHeight(); virtual int getHeight();
}; };