diff options
author | Campbell Barton <ideasman42@gmail.com> | 2012-03-31 07:36:15 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2012-03-31 07:36:15 +0400 |
commit | f3792b0f2b37be665e70f94bcf2bbbe152bdf0ff (patch) | |
tree | a4cbdb9a29e86ab116697ce6efecbf928ff2ae69 /source | |
parent | 5b88712ff932fcbcd0bb0fb257e8e9c2e247a82a (diff) |
code cleanup: use uppercase for defines and dont end macro's with ;
Diffstat (limited to 'source')
-rw-r--r-- | source/blender/blenkernel/intern/fmodifier.c | 2 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/mesh.c | 10 | ||||
-rw-r--r-- | source/blender/blenlib/intern/noise.c | 50 |
3 files changed, 34 insertions, 28 deletions
diff --git a/source/blender/blenkernel/intern/fmodifier.c b/source/blender/blenkernel/intern/fmodifier.c index bbd07693cea..ed5cf5e7924 100644 --- a/source/blender/blenkernel/intern/fmodifier.c +++ b/source/blender/blenkernel/intern/fmodifier.c @@ -335,7 +335,7 @@ static void fcm_fn_generator_evaluate (FCurve *UNUSED(fcu), FModifier *fcm, floa case FCM_GENERATOR_FN_TAN: /* tangent wave */ { /* check that argument is not on one of the discontinuities (i.e. 90deg, 270 deg, etc) */ - if IS_EQ(fmod((arg - M_PI_2), M_PI), 0.0) { + if (IS_EQ(fmod((arg - M_PI_2), M_PI), 0.0)) { if ((data->flag & FCM_GENERATOR_ADDITIVE) == 0) *cvalue = 0.0f; /* no value possible here */ } diff --git a/source/blender/blenkernel/intern/mesh.c b/source/blender/blenkernel/intern/mesh.c index ed2b71cdb52..ea061c99156 100644 --- a/source/blender/blenkernel/intern/mesh.c +++ b/source/blender/blenkernel/intern/mesh.c @@ -2406,6 +2406,7 @@ int mesh_recalcTessellation(CustomData *fdata, BLI_array_append(mface_orig_index, \ poly_orig_index[poly_index]); \ } \ + (void)0 /* ALMOST IDENTICAL TO DEFINE ABOVE (see EXCEPTION) */ #define ML_TO_MF_QUAD() \ @@ -2425,20 +2426,21 @@ int mesh_recalcTessellation(CustomData *fdata, poly_orig_index[poly_index]); \ } \ mf->edcode |= TESSFACE_IS_QUAD; /* EXCEPTION */ \ + (void)0 else if (mp->totloop == 3) { - ML_TO_MF(0, 1, 2) + ML_TO_MF(0, 1, 2); mface_index++; } else if (mp->totloop == 4) { #ifdef USE_TESSFACE_QUADS - ML_TO_MF_QUAD() + ML_TO_MF_QUAD(); mface_index++; #else - ML_TO_MF(0, 1, 2) + ML_TO_MF(0, 1, 2); mface_index++; - ML_TO_MF(0, 2, 3) + ML_TO_MF(0, 2, 3); mface_index++; #endif } diff --git a/source/blender/blenlib/intern/noise.c b/source/blender/blenlib/intern/noise.c index 93c1a696f03..f1749d0b7cd 100644 --- a/source/blender/blenlib/intern/noise.c +++ b/source/blender/blenlib/intern/noise.c @@ -919,12 +919,14 @@ static float g[512+2][3]= { {-0.944031, -0.326599, -0.045624}, }; -#define setup(i,b0,b1,r0,r1) \ - t = vec[i] + 10000.0f; \ - b0 = ((int)t) & 255; \ - b1 = (b0+1) & 255; \ - r0 = t - floorf(t); \ - r1 = r0 - 1.0f; +#define SETUP(val, b0, b1, r0, r1) \ + { \ + t = val + 10000.0f; \ + b0 = ((int)t) & 255; \ + b1 = (b0 + 1) & 255; \ + r0 = t - floorf(t); \ + r1 = r0 - 1.0f; \ + } static float noise3_perlin(float vec[3]) @@ -934,9 +936,9 @@ static float noise3_perlin(float vec[3]) register int i, j; - setup(0, bx0,bx1, rx0,rx1); - setup(1, by0,by1, ry0,ry1); - setup(2, bz0,bz1, rz0,rz1); + SETUP(vec[0], bx0, bx1, rx0, rx1); + SETUP(vec[1], by0, by1, ry0, ry1); + SETUP(vec[2], bz0, bz1, rz0, rz1); i = p[ bx0 ]; j = p[ bx1 ]; @@ -946,46 +948,48 @@ static float noise3_perlin(float vec[3]) b01 = p[ i + by1 ]; b11 = p[ j + by1 ]; -#define at(rx,ry,rz) ( rx * q[0] + ry * q[1] + rz * q[2] ) - -#define surve(t) ( t * t * (3.0f - 2.0f * t) ) +#define VALUE_AT(rx,ry,rz) (rx * q[0] + ry * q[1] + rz * q[2]) +#define SURVE(t) (t * t * (3.0f - 2.0f * t)) /* lerp moved to improved perlin above */ - sx = surve(rx0); - sy = surve(ry0); - sz = surve(rz0); + sx = SURVE(rx0); + sy = SURVE(ry0); + sz = SURVE(rz0); q = g[ b00 + bz0 ]; - u = at(rx0,ry0,rz0); + u = VALUE_AT(rx0,ry0,rz0); q = g[ b10 + bz0 ]; - v = at(rx1,ry0,rz0); + v = VALUE_AT(rx1,ry0,rz0); a = lerp(sx, u, v); q = g[ b01 + bz0 ]; - u = at(rx0,ry1,rz0); + u = VALUE_AT(rx0,ry1,rz0); q = g[ b11 + bz0 ]; - v = at(rx1,ry1,rz0); + v = VALUE_AT(rx1,ry1,rz0); b = lerp(sx, u, v); c = lerp(sy, a, b); /* interpolate in y at lo x */ q = g[ b00 + bz1 ]; - u = at(rx0,ry0,rz1); + u = VALUE_AT(rx0,ry0,rz1); q = g[ b10 + bz1 ]; - v = at(rx1,ry0,rz1); + v = VALUE_AT(rx1,ry0,rz1); a = lerp(sx, u, v); q = g[ b01 + bz1 ]; - u = at(rx0,ry1,rz1); + u = VALUE_AT(rx0,ry1,rz1); q = g[ b11 + bz1 ]; - v = at(rx1,ry1,rz1); + v = VALUE_AT(rx1,ry1,rz1); b = lerp(sx, u, v); d = lerp(sy, a, b); /* interpolate in y at hi x */ return 1.5f * lerp(sz, c, d); /* interpolate in z */ + +#undef VALUE_AT +#undef SURVE } #if 0 |