diff options
Diffstat (limited to 'source/blender/blenlib/intern/noise.c')
-rw-r--r-- | source/blender/blenlib/intern/noise.c | 28 |
1 files changed, 18 insertions, 10 deletions
diff --git a/source/blender/blenlib/intern/noise.c b/source/blender/blenlib/intern/noise.c index f37e1e03f39..6e52145c653 100644 --- a/source/blender/blenlib/intern/noise.c +++ b/source/blender/blenlib/intern/noise.c @@ -281,9 +281,9 @@ static float npfade(float t) return (t * t * t * (t * (t * 6.0f - 15.0f) + 10.0f)); } -static float grad(int hash, float x, float y, float z) +static float grad(int hash_val, float x, float y, float z) { - int h = hash & 15; /* CONVERT LO 4 BITS OF HASH CODE */ + int h = hash_val & 15; /* CONVERT LO 4 BITS OF HASH CODE */ float u = h < 8 ? x : y, /* INTO 12 GRADIENT DIRECTIONS. */ v = h < 4 ? y : h == 12 || h == 14 ? x : z; return ((h & 1) == 0 ? u : -u) + ((h & 2) == 0 ? v : -v); @@ -1460,7 +1460,8 @@ float BLI_gNoise(float noisesize, float x, float y, float z, int hard, int noise noisefunc = cellNoiseU; break; case 0: - default: { + default: + { noisefunc = orgBlenderNoise; /* add one to make return value same as BLI_hnoise */ x += 1; @@ -1592,7 +1593,8 @@ float mg_fBm(float x, float y, float z, float H, float lacunarity, float octaves noisefunc = cellNoise; break; case 0: - default: { + default: + { noisefunc = orgBlenderNoiseS; } } @@ -1662,7 +1664,8 @@ float mg_MultiFractal(float x, float y, float z, float H, float lacunarity, floa noisefunc = cellNoise; break; case 0: - default: { + default: + { noisefunc = orgBlenderNoiseS; } } @@ -1728,7 +1731,8 @@ float mg_HeteroTerrain(float x, float y, float z, float H, float lacunarity, flo noisefunc = cellNoise; break; case 0: - default: { + default: + { noisefunc = orgBlenderNoiseS; } } @@ -1801,7 +1805,8 @@ float mg_HybridMultiFractal(float x, float y, float z, float H, float lacunarity noisefunc = cellNoise; break; case 0: - default: { + default: + { noisefunc = orgBlenderNoiseS; } } @@ -1876,7 +1881,8 @@ float mg_RidgedMultiFractal(float x, float y, float z, float H, float lacunarity noisefunc = cellNoise; break; case 0: - default: { + default: + { noisefunc = orgBlenderNoiseS; } } @@ -1941,7 +1947,8 @@ float mg_VLNoise(float x, float y, float z, float distortion, int nbas1, int nba noisefunc1 = cellNoise; break; case 0: - default: { + default: + { noisefunc1 = orgBlenderNoiseS; } } @@ -1975,7 +1982,8 @@ float mg_VLNoise(float x, float y, float z, float distortion, int nbas1, int nba noisefunc2 = cellNoise; break; case 0: - default: { + default: + { noisefunc2 = orgBlenderNoiseS; } } |