archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Cleanup: Reduce variable scope

Browse Source 
Differential Revision: https://developer.blender.org/D9475
This commit is contained in:
Aaron Carlisle
2020-11-05 14:10:48 -05:00
parent 6a2a6fa514
commit 74188e6502
1 changed files with 50 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

131
source/blender/blenlib/intern/noise.c
View File

@@ -786,14 +786,13 @@ static float noise3_perlin(const float vec[3])
int bx0, bx1, by0, by1, bz0, bz1, b00, b10, b01, b11; int bx0, bx1, by0, by1, bz0, bz1, b00, b10, b01, b11;
float rx0, rx1, ry0, ry1, rz0, rz1, sx, sy, sz, a, b, c, d, t, u, v; float rx0, rx1, ry0, ry1, rz0, rz1, sx, sy, sz, a, b, c, d, t, u, v;
const float *q; const float *q;
int i, j;
SETUP(vec[0], bx0, bx1, rx0, rx1); SETUP(vec[0], bx0, bx1, rx0, rx1);
SETUP(vec[1], by0, by1, ry0, ry1); SETUP(vec[1], by0, by1, ry0, ry1);
SETUP(vec[2], bz0, bz1, rz0, rz1); SETUP(vec[2], bz0, bz1, rz0, rz1);
i = p[bx0]; int i = p[bx0];
j = p[bx1]; int j = p[bx1];
b00 = p[i + by0]; b00 = p[i + by0];
b10 = p[j + by0]; b10 = p[j + by0];
@@ -846,22 +845,14 @@ static float noise3_perlin(const float vec[3])
/* for use with BLI_gNoise/gTurbulence, returns signed noise */ /* for use with BLI_gNoise/gTurbulence, returns signed noise */
static float orgPerlinNoise(float x, float y, float z) static float orgPerlinNoise(float x, float y, float z)
{ {
float v[3]; float v[3] = {x, y, z};
v[0] = x;
v[1] = y;
v[2] = z;
return noise3_perlin(v); return noise3_perlin(v);
} }
/* for use with BLI_gNoise/gTurbulence, returns unsigned noise */ /* for use with BLI_gNoise/gTurbulence, returns unsigned noise */
static float orgPerlinNoiseU(float x, float y, float z) static float orgPerlinNoiseU(float x, float y, float z)
{ {
float v[3]; float v[3] = {x, y, z};
v[0] = x;
v[1] = y;
v[2] = z;
return (0.5f + 0.5f * noise3_perlin(v)); return (0.5f + 0.5f * noise3_perlin(v));
} }
@@ -906,13 +897,12 @@ static float dist_Manhattan(float x, float y, float z, float e)
/* Chebychev */ /* Chebychev */
static float dist_Chebychev(float x, float y, float z, float e) static float dist_Chebychev(float x, float y, float z, float e)
{ {
float t;
(void)e; (void)e;
x = fabsf(x); x = fabsf(x);
y = fabsf(y); y = fabsf(y);
z = fabsf(z); z = fabsf(z);
t = (x > y) ? x : y; float t = (x > y) ? x : y;
return ((z > t) ? z : t); return ((z > t) ? z : t);
} }
@@ -944,9 +934,6 @@ static float dist_Minkovsky(float x, float y, float z, float e)
* Returns distances in da and point coords in pa */ * Returns distances in da and point coords in pa */
void BLI_voronoi(float x, float y, float z, float *da, float *pa, float me, int dtype) void BLI_voronoi(float x, float y, float z, float *da, float *pa, float me, int dtype)
{ {
int xx, yy, zz, xi, yi, zi;
float xd, yd, zd, d;
float (*distfunc)(float, float, float, float); float (*distfunc)(float, float, float, float);
switch (dtype) { switch (dtype) {
case 1: case 1:
@@ -973,18 +960,18 @@ void BLI_voronoi(float x, float y, float z, float *da, float *pa, float me, int
break; break;
} }
xi = (int)(floor(x)); int xi = (int)(floor(x));
yi = (int)(floor(y)); int yi = (int)(floor(y));
zi = (int)(floor(z)); int zi = (int)(floor(z));
da[0] = da[1] = da[2] = da[3] = 1e10f; da[0] = da[1] = da[2] = da[3] = 1e10f;
for (xx = xi - 1; xx <= xi + 1; xx++) { for (int xx = xi - 1; xx <= xi + 1; xx++) {
for (yy = yi - 1; yy <= yi + 1; yy++) { for (int yy = yi - 1; yy <= yi + 1; yy++) {
for (zz = zi - 1; zz <= zi + 1; zz++) { for (int zz = zi - 1; zz <= zi + 1; zz++) {
const float *p = HASHPNT(xx, yy, zz); const float *p = HASHPNT(xx, yy, zz);
xd = x - (p[0] + xx); float xd = x - (p[0] + xx);
yd = y - (p[1] + yy); float yd = y - (p[1] + yy);
zd = z - (p[2] + zz); float zd = z - (p[2] + zz);
d = distfunc(xd, yd, zd, me); float d = distfunc(xd, yd, zd, me);
if (d < da[0]) { if (d < da[0]) {
da[3] = da[2]; da[3] = da[2];
da[2] = da[1]; da[2] = da[1];
@@ -1245,9 +1232,6 @@ float BLI_gTurbulence(
float noisesize, float x, float y, float z, int oct, int hard, int noisebasis) float noisesize, float x, float y, float z, int oct, int hard, int noisebasis)
{ {
float (*noisefunc)(float, float, float); float (*noisefunc)(float, float, float);
float sum, t, amp = 1, fscale = 1;
int i;
switch (noisebasis) { switch (noisebasis) {
case 1: case 1:
noisefunc = orgPerlinNoiseU; noisefunc = orgPerlinNoiseU;
@@ -1292,9 +1276,9 @@ float BLI_gTurbulence(
z *= noisesize; z *= noisesize;
} }
sum = 0; float sum = 0, amp, fscale = 1;
for (i = 0; i <= oct; i++, amp *= 0.5f, fscale *= 2.0f) { for (int i = 0; i <= oct; i++, amp *= 0.5f, fscale *= 2.0f) {
t = noisefunc(fscale * x, fscale * y, fscale * z); float t = noisefunc(fscale * x, fscale * y, fscale * z);
if (hard) { if (hard) {
t = fabsf(2.0f * t - 1.0f); t = fabsf(2.0f * t - 1.0f);
} }
@@ -1322,9 +1306,6 @@ float BLI_gTurbulence(
float BLI_mg_fBm( float BLI_mg_fBm(
float x, float y, float z, float H, float lacunarity, float octaves, int noisebasis) float x, float y, float z, float H, float lacunarity, float octaves, int noisebasis)
{ {
float rmd, value = 0.0, pwr = 1.0, pwHL = powf(lacunarity, -H);
int i;
float (*noisefunc)(float, float, float); float (*noisefunc)(float, float, float);
switch (noisebasis) { switch (noisebasis) {
case 1: case 1:
@@ -1361,7 +1342,8 @@ float BLI_mg_fBm(
} }
} }
for (i = 0; i < (int)octaves; i++) { float value = 0.0, pwr = 1.0, pwHL = powf(lacunarity, -H);
for (int i = 0; i < (int)octaves; i++) {
value += noisefunc(x, y, z) * pwr; value += noisefunc(x, y, z) * pwr;
pwr *= pwHL; pwr *= pwHL;
x *= lacunarity; x *= lacunarity;
@@ -1369,7 +1351,7 @@ float BLI_mg_fBm(
z *= lacunarity; z *= lacunarity;
} }
rmd = octaves - floorf(octaves); float rmd = octaves - floorf(octaves);
if (rmd != 0.0f) { if (rmd != 0.0f) {
value += rmd * noisefunc(x, y, z) * pwr; value += rmd * noisefunc(x, y, z) * pwr;
} }
@@ -1395,9 +1377,6 @@ float BLI_mg_fBm(
float BLI_mg_MultiFractal( float BLI_mg_MultiFractal(
float x, float y, float z, float H, float lacunarity, float octaves, int noisebasis) float x, float y, float z, float H, float lacunarity, float octaves, int noisebasis)
{ {
float rmd, value = 1.0, pwr = 1.0, pwHL = powf(lacunarity, -H);
int i;
float (*noisefunc)(float, float, float); float (*noisefunc)(float, float, float);
switch (noisebasis) { switch (noisebasis) {
case 1: case 1:
@@ -1434,14 +1413,15 @@ float BLI_mg_MultiFractal(
} }
} }
for (i = 0; i < (int)octaves; i++) { float value = 1.0, pwr = 1.0, pwHL = powf(lacunarity, -H);
for (int i = 0; i < (int)octaves; i++) {
value *= (pwr * noisefunc(x, y, z) + 1.0f); value *= (pwr * noisefunc(x, y, z) + 1.0f);
pwr *= pwHL; pwr *= pwHL;
x *= lacunarity; x *= lacunarity;
y *= lacunarity; y *= lacunarity;
z *= lacunarity; z *= lacunarity;
} }
rmd = octaves - floorf(octaves); float rmd = octaves - floorf(octaves);
if (rmd != 0.0f) { if (rmd != 0.0f) {
value *= (rmd * noisefunc(x, y, z) * pwr + 1.0f); value *= (rmd * noisefunc(x, y, z) * pwr + 1.0f);
} }
@@ -1469,11 +1449,6 @@ float BLI_mg_HeteroTerrain(float x,
float offset, float offset,
int noisebasis) int noisebasis)
{ {
float value, increment, rmd;
int i;
float pwHL = powf(lacunarity, -H);
float pwr = pwHL; /* starts with i=1 instead of 0 */
float (*noisefunc)(float, float, float); float (*noisefunc)(float, float, float);
switch (noisebasis) { switch (noisebasis) {
case 1: case 1:
@@ -1511,13 +1486,15 @@ float BLI_mg_HeteroTerrain(float x,
} }
/* first unscaled octave of function; later octaves are scaled */ /* first unscaled octave of function; later octaves are scaled */
value = offset + noisefunc(x, y, z); float value = offset + noisefunc(x, y, z);
x *= lacunarity; x *= lacunarity;
y *= lacunarity; y *= lacunarity;
z *= lacunarity; z *= lacunarity;
for (i = 1; i < (int)octaves; i++) { float pwHL = powf(lacunarity, -H);
increment = (noisefunc(x, y, z) + offset) * pwr * value; float pwr = pwHL; /* starts with i=1 instead of 0 */
for (int i = 1; i < (int)octaves; i++) {
float increment = (noisefunc(x, y, z) + offset) * pwr * value;
value += increment; value += increment;
pwr *= pwHL; pwr *= pwHL;
x *= lacunarity; x *= lacunarity;
@@ -1525,9 +1502,9 @@ float BLI_mg_HeteroTerrain(float x,
z *= lacunarity; z *= lacunarity;
} }
rmd = octaves - floorf(octaves); float rmd = octaves - floorf(octaves);
if (rmd != 0.0f) { if (rmd != 0.0f) {
increment = (noisefunc(x, y, z) + offset) * pwr * value; float increment = (noisefunc(x, y, z) + offset) * pwr * value;
value += rmd * increment; value += rmd * increment;
} }
return value; return value;
@@ -1550,12 +1527,7 @@ float BLI_mg_HybridMultiFractal(float x,
float gain, float gain,
int noisebasis) int noisebasis)
{ {
float result, signal, weight, rmd;
int i;
float pwHL = powf(lacunarity, -H);
float pwr = pwHL; /* starts with i=1 instead of 0 */
float (*noisefunc)(float, float, float); float (*noisefunc)(float, float, float);
switch (noisebasis) { switch (noisebasis) {
case 1: case 1:
noisefunc = orgPerlinNoise; noisefunc = orgPerlinNoise;
@@ -1591,17 +1563,19 @@ float BLI_mg_HybridMultiFractal(float x,
} }
} }
result = noisefunc(x, y, z) + offset; float result = noisefunc(x, y, z) + offset;
weight = gain * result; float weight = gain * result;
x *= lacunarity; x *= lacunarity;
y *= lacunarity; y *= lacunarity;
z *= lacunarity; z *= lacunarity;
for (i = 1; (weight > 0.001f) && (i < (int)octaves); i++) { float pwHL = powf(lacunarity, -H);
float pwr = pwHL; /* starts with i=1 instead of 0 */
for (int i = 1; (weight > 0.001f) && (i < (int)octaves); i++) {
if (weight > 1.0f) { if (weight > 1.0f) {
weight = 1.0f; weight = 1.0f;
} }
signal = (noisefunc(x, y, z) + offset) * pwr; float signal = (noisefunc(x, y, z) + offset) * pwr;
pwr *= pwHL; pwr *= pwHL;
result += weight * signal; result += weight * signal;
weight *= gain * signal; weight *= gain * signal;
@@ -1610,7 +1584,7 @@ float BLI_mg_HybridMultiFractal(float x,
z *= lacunarity; z *= lacunarity;
} }
rmd = octaves - floorf(octaves); float rmd = octaves - floorf(octaves);
if (rmd != 0.f) { if (rmd != 0.f) {
result += rmd * ((noisefunc(x, y, z) + offset) * pwr); result += rmd * ((noisefunc(x, y, z) + offset) * pwr);
} }
@@ -1637,11 +1611,6 @@ float BLI_mg_RidgedMultiFractal(float x,
float gain, float gain,
int noisebasis) int noisebasis)
{ {
float result, signal, weight;
int i;
float pwHL = powf(lacunarity, -H);
float pwr = pwHL; /* starts with i=1 instead of 0 */
float (*noisefunc)(float, float, float); float (*noisefunc)(float, float, float);
switch (noisebasis) { switch (noisebasis) {
case 1: case 1:
@@ -1678,15 +1647,14 @@ float BLI_mg_RidgedMultiFractal(float x,
} }
} }
signal = offset - fabsf(noisefunc(x, y, z)); float result, signal = powf(offset - fabsf(noisefunc(x, y, z)), 2);
signal *= signal; for (int i = 1; i < (int)octaves; i++) {
result = signal; float pwHL = powf(lacunarity, -H);
float pwr = pwHL; /* starts with i=1 instead of 0 */
for (i = 1; i < (int)octaves; i++) {
x *= lacunarity; x *= lacunarity;
y *= lacunarity; y *= lacunarity;
z *= lacunarity; z *= lacunarity;
weight = signal * gain; float weight = signal * gain;
if (weight > 1.0f) { if (weight > 1.0f) {
weight = 1.0f; weight = 1.0f;
} }
@@ -1708,10 +1676,7 @@ float BLI_mg_RidgedMultiFractal(float x,
*/ */
float BLI_mg_VLNoise(float x, float y, float z, float distortion, int nbas1, int nbas2) float BLI_mg_VLNoise(float x, float y, float z, float distortion, int nbas1, int nbas2)
{ {
float rv[3];
float (*noisefunc1)(float, float, float); float (*noisefunc1)(float, float, float);
float (*noisefunc2)(float, float, float);
switch (nbas1) { switch (nbas1) {
case 1: case 1:
noisefunc1 = orgPerlinNoise; noisefunc1 = orgPerlinNoise;
@@ -1747,6 +1712,7 @@ float BLI_mg_VLNoise(float x, float y, float z, float distortion, int nbas1, int
} }
} }
float (*noisefunc2)(float, float, float);
switch (nbas2) { switch (nbas2) {
case 1: case 1:
noisefunc2 = orgPerlinNoise; noisefunc2 = orgPerlinNoise;
@@ -1783,9 +1749,12 @@ float BLI_mg_VLNoise(float x, float y, float z, float distortion, int nbas1, int
} }
/* get a random vector and scale the randomization */ /* get a random vector and scale the randomization */
rv[0] = noisefunc1(x + 13.5f, y + 13.5f, z + 13.5f) * distortion; float rv[3] = {
rv[1] = noisefunc1(x, y, z) * distortion; rv[0] = noisefunc1(x + 13.5f, y + 13.5f, z + 13.5f) * distortion,
rv[2] = noisefunc1(x - 13.5f, y - 13.5f, z - 13.5f) * distortion; rv[1] = noisefunc1(x, y, z) * distortion,
rv[2] = noisefunc1(x - 13.5f, y - 13.5f, z - 13.5f) * distortion,
};
return noisefunc2(x + rv[0], y + rv[1], z + rv[2]); /* distorted-domain noise */ return noisefunc2(x + rv[0], y + rv[1], z + rv[2]); /* distorted-domain noise */
} }