diff options
Diffstat (limited to 'source/blender/blenlib/intern/jitter.c')
-rw-r--r-- | source/blender/blenlib/intern/jitter.c | 87 |
1 files changed, 46 insertions, 41 deletions
diff --git a/source/blender/blenlib/intern/jitter.c b/source/blender/blenlib/intern/jitter.c index 7141bedcf05..bc2b5677fa5 100644 --- a/source/blender/blenlib/intern/jitter.c +++ b/source/blender/blenlib/intern/jitter.c @@ -37,23 +37,25 @@ #include "BLI_rand.h" #include "BLI_jitter.h" +#include "BLI_strict_flags.h" -void BLI_jitterate1(float *jit1, float *jit2, int num, float rad1) + +void BLI_jitterate1(float (*jit1)[2], float (*jit2)[2], int num, float rad1) { int i, j, k; float vecx, vecy, dvecx, dvecy, x, y, len; - for (i = 2 * num - 2; i >= 0; i -= 2) { + for (i = num - 1; i >= 0; i--) { dvecx = dvecy = 0.0; - x = jit1[i]; - y = jit1[i + 1]; - for (j = 2 * num - 2; j >= 0; j -= 2) { + x = jit1[i][0]; + y = jit1[i][1]; + for (j = num - 1; j >= 0; j--) { if (i != j) { - vecx = jit1[j] - x - 1.0f; - vecy = jit1[j + 1] - y - 1.0f; + vecx = jit1[j][0] - x - 1.0f; + vecy = jit1[j][1] - y - 1.0f; for (k = 3; k > 0; k--) { if (fabsf(vecx) < rad1 && fabsf(vecy) < rad1) { - len = sqrt(vecx * vecx + vecy * vecy); + len = sqrtf(vecx * vecx + vecy * vecy); if (len > 0 && len < rad1) { len = len / rad1; dvecx += vecx / len; @@ -63,7 +65,7 @@ void BLI_jitterate1(float *jit1, float *jit2, int num, float rad1) vecx += 1.0f; if (fabsf(vecx) < rad1 && fabsf(vecy) < rad1) { - len = sqrt(vecx * vecx + vecy * vecy); + len = sqrtf(vecx * vecx + vecy * vecy); if (len > 0 && len < rad1) { len = len / rad1; dvecx += vecx / len; @@ -73,7 +75,7 @@ void BLI_jitterate1(float *jit1, float *jit2, int num, float rad1) vecx += 1.0f; if (fabsf(vecx) < rad1 && fabsf(vecy) < rad1) { - len = sqrt(vecx * vecx + vecy * vecy); + len = sqrtf(vecx * vecx + vecy * vecy); if (len > 0 && len < rad1) { len = len / rad1; dvecx += vecx / len; @@ -90,25 +92,25 @@ void BLI_jitterate1(float *jit1, float *jit2, int num, float rad1) y -= dvecy / 18.0f; x -= floorf(x); y -= floorf(y); - jit2[i] = x; - jit2[i + 1] = y; + jit2[i][0] = x; + jit2[i][1] = y; } - memcpy(jit1, jit2, 2 * num * sizeof(float)); + memcpy(jit1, jit2, 2 * (unsigned int)num * sizeof(float)); } -void BLI_jitterate2(float *jit1, float *jit2, int num, float rad2) +void BLI_jitterate2(float (*jit1)[2], float (*jit2)[2], int num, float rad2) { int i, j; float vecx, vecy, dvecx, dvecy, x, y; - for (i = 2 * num - 2; i >= 0; i -= 2) { + for (i = num - 1; i >= 0; i--) { dvecx = dvecy = 0.0; - x = jit1[i]; - y = jit1[i + 1]; - for (j = 2 * num - 2; j >= 0; j -= 2) { + x = jit1[i][0]; + y = jit1[i][1]; + for (j = num - 1; j >= 0; j--) { if (i != j) { - vecx = jit1[j] - x - 1.0f; - vecy = jit1[j + 1] - y - 1.0f; + vecx = jit1[j][0] - x - 1.0f; + vecy = jit1[j][1] - y - 1.0f; if (fabsf(vecx) < rad2) dvecx += vecx * rad2; vecx += 1.0f; @@ -129,32 +131,39 @@ void BLI_jitterate2(float *jit1, float *jit2, int num, float rad2) y -= dvecy / 2.0f; x -= floorf(x); y -= floorf(y); - jit2[i] = x; - jit2[i + 1] = y; + jit2[i][0] = x; + jit2[i][1] = y; } - memcpy(jit1, jit2, 2 * num * sizeof(float)); + memcpy(jit1, jit2, (unsigned int)num * sizeof(float[2])); } -void BLI_jitter_init(float *jitarr, int num) +void BLI_jitter_init(float (*jitarr)[2], int num) { - float *jit2, x, rad1, rad2, rad3; + float (*jit2)[2]; + float num_fl, num_fl_sqrt; + float x, rad1, rad2, rad3; RNG *rng; int i; - if (num == 0) return; + if (num == 0) { + return; + } + + num_fl = (float)num; + num_fl_sqrt = sqrtf(num_fl); - jit2 = MEM_mallocN(12 + 2 * sizeof(float) * num, "initjit"); - rad1 = 1.0f / sqrtf((float)num); - rad2 = 1.0f / ((float)num); - rad3 = sqrtf((float)num) / ((float)num); + jit2 = MEM_mallocN(12 + (unsigned int)num * sizeof(float[2]), "initjit"); + rad1 = 1.0f / num_fl_sqrt; + rad2 = 1.0f / num_fl; + rad3 = num_fl_sqrt / num_fl; - rng = BLI_rng_new(31415926 + num); + rng = BLI_rng_new(31415926 + (unsigned int)num); x = 0; - for (i = 0; i < 2 * num; i += 2) { - jitarr[i] = x + rad1 * (float)(0.5 - BLI_rng_get_double(rng)); - jitarr[i + 1] = ((float)i / 2) / num + rad1 * (float)(0.5 - BLI_rng_get_double(rng)); + for (i = 0; i < num; i++) { + jitarr[i][0] = x + rad1 * (float)(0.5 - BLI_rng_get_double(rng)); + jitarr[i][1] = (float)i / num_fl + rad1 * (float)(0.5 - BLI_rng_get_double(rng)); x += rad3; x -= floorf(x); } @@ -170,12 +179,8 @@ void BLI_jitter_init(float *jitarr, int num) MEM_freeN(jit2); /* finally, move jittertab to be centered around (0, 0) */ - for (i = 0; i < 2 * num; i += 2) { - jitarr[i] -= 0.5f; - jitarr[i + 1] -= 0.5f; + for (i = 0; i < num; i++) { + jitarr[i][0] -= 0.5f; + jitarr[i][1] -= 0.5f; } - } - - -/* eof */ |