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

Noise: Don't assume Noise is used for 2D unless gradientMap2D is actually called

Browse Source
This commit is contained in:
kwolekr 2014-12-14 00:18:31 -05:00
parent 17dde5ddd0
commit dcbf1b3ce5
1 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/noise.cpp
View File

@ -382,12 +382,6 @@ Noise::Noise(NoiseParams *np_, int seed, int sx, int sy, int sz)
this->gradient_buf = NULL; this->gradient_buf = NULL;
this->result = NULL; this->result = NULL;
if (np.flags & NOISE_FLAG_DEFAULTS) {
// By default, only 2d noise is eased.
if (sz <= 1)
np.flags |= NOISE_FLAG_EASED;
}
allocBuffers(); allocBuffers();
} }
@ -493,7 +487,8 @@ void Noise::gradientMap2D(
int index, i, j, x0, y0, noisex, noisey; int index, i, j, x0, y0, noisex, noisey;
int nlx, nly; int nlx, nly;
Interp2dFxn interpolate = (np.flags & NOISE_FLAG_EASED) ? bool eased = np.flags & (NOISE_FLAG_DEFAULTS | NOISE_FLAG_EASED);
Interp2dFxn interpolate = eased ?
biLinearInterpolation : biLinearInterpolationNoEase; biLinearInterpolation : biLinearInterpolationNoEase;
x0 = floor(x); x0 = floor(x);