From 2f2b15bbb2a30ee312d65c627d54a12445f4b987 Mon Sep 17 00:00:00 2001
From: Campbell Barton <ideasman42@gmail.com>
Date: Sat, 12 May 2012 15:02:10 +0000
Subject: style cleanup: whitespace, bli & makesdna

---
 source/blender/blenlib/intern/jitter.c | 104 ++++++++++++++++-----------------
 1 file changed, 52 insertions(+), 52 deletions(-)

(limited to 'source/blender/blenlib/intern/jitter.c')

diff --git a/source/blender/blenlib/intern/jitter.c b/source/blender/blenlib/intern/jitter.c
index afe31fb1377..6203a98828b 100644
--- a/source/blender/blenlib/intern/jitter.c
+++ b/source/blender/blenlib/intern/jitter.c
@@ -43,41 +43,41 @@ void BLI_jitterate1(float *jit1, float *jit2, 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 = 2 * num - 2; i >= 0; i -= 2) {
 		dvecx = dvecy = 0.0;
 		x = jit1[i];
-		y = jit1[i+1];
-		for (j = 2*num-2; j>=0 ; j-=2) {
+		y = jit1[i + 1];
+		for (j = 2 * num - 2; j >= 0; j -= 2) {
 			if (i != j) {
 				vecx = jit1[j] - 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);
-						if (len>0 && len<rad1) {
-							len= len/rad1;
-							dvecx += vecx/len;
-							dvecy += vecy/len;
+				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);
+						if (len > 0 && len < rad1) {
+							len = len / rad1;
+							dvecx += vecx / len;
+							dvecy += vecy / len;
 						}
 					}
 					vecx += 1.0f;
 
-					if ( fabsf(vecx)<rad1 && fabsf(vecy)<rad1) {
-						len=  sqrt(vecx*vecx + vecy*vecy);
-						if (len>0 && len<rad1) {
-							len= len/rad1;
-							dvecx += vecx/len;
-							dvecy += vecy/len;
+					if (fabsf(vecx) < rad1 && fabsf(vecy) < rad1) {
+						len =  sqrt(vecx * vecx + vecy * vecy);
+						if (len > 0 && len < rad1) {
+							len = len / rad1;
+							dvecx += vecx / len;
+							dvecy += vecy / len;
 						}
 					}
 					vecx += 1.0f;
 
-					if ( fabsf(vecx)<rad1 && fabsf(vecy)<rad1) {
-						len=  sqrt(vecx*vecx + vecy*vecy);
-						if (len>0 && len<rad1) {
-							len= len/rad1;
-							dvecx += vecx/len;
-							dvecy += vecy/len;
+					if (fabsf(vecx) < rad1 && fabsf(vecy) < rad1) {
+						len =  sqrt(vecx * vecx + vecy * vecy);
+						if (len > 0 && len < rad1) {
+							len = len / rad1;
+							dvecx += vecx / len;
+							dvecy += vecy / len;
 						}
 					}
 					vecx -= 2.0f;
@@ -86,12 +86,12 @@ void BLI_jitterate1(float *jit1, float *jit2, int num, float rad1)
 			}
 		}
 
-		x -= dvecx/18.0f;
-		y -= dvecy/18.0f;
+		x -= dvecx / 18.0f;
+		y -= dvecy / 18.0f;
 		x -= floorf(x);
 		y -= floorf(y);
 		jit2[i] = x;
-		jit2[i+1] = y;
+		jit2[i + 1] = y;
 	}
 	memcpy(jit1, jit2, 2 * num * sizeof(float));
 }
@@ -101,36 +101,36 @@ void BLI_jitterate2(float *jit1, float *jit2, 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 = 2 * num - 2; i >= 0; i -= 2) {
 		dvecx = dvecy = 0.0;
 		x = jit1[i];
-		y = jit1[i+1];
-		for (j =2*num -2; j>= 0 ; j-=2) {
+		y = jit1[i + 1];
+		for (j = 2 * num - 2; j >= 0; j -= 2) {
 			if (i != j) {
 				vecx = jit1[j] - x - 1.0f;
-				vecy = jit1[j+1] - y - 1.0f;
+				vecy = jit1[j + 1] - y - 1.0f;
 
-				if ( fabsf(vecx)<rad2) dvecx+= vecx*rad2;
+				if (fabsf(vecx) < rad2) dvecx += vecx * rad2;
 				vecx += 1.0f;
-				if ( fabsf(vecx)<rad2) dvecx+= vecx*rad2;
+				if (fabsf(vecx) < rad2) dvecx += vecx * rad2;
 				vecx += 1.0f;
-				if ( fabsf(vecx)<rad2) dvecx+= vecx*rad2;
+				if (fabsf(vecx) < rad2) dvecx += vecx * rad2;
 
-				if ( fabsf(vecy)<rad2) dvecy+= vecy*rad2;
+				if (fabsf(vecy) < rad2) dvecy += vecy * rad2;
 				vecy += 1.0f;
-				if ( fabsf(vecy)<rad2) dvecy+= vecy*rad2;
+				if (fabsf(vecy) < rad2) dvecy += vecy * rad2;
 				vecy += 1.0f;
-				if ( fabsf(vecy)<rad2) dvecy+= vecy*rad2;
+				if (fabsf(vecy) < rad2) dvecy += vecy * rad2;
 
 			}
 		}
 
-		x -= dvecx/2.0f;
-		y -= dvecy/2.0f;
+		x -= dvecx / 2.0f;
+		y -= dvecy / 2.0f;
 		x -= floorf(x);
 		y -= floorf(y);
 		jit2[i] = x;
-		jit2[i+1] = y;
+		jit2[i + 1] = y;
 	}
 	memcpy(jit1, jit2, 2 * num * sizeof(float));
 }
@@ -141,23 +141,23 @@ void BLI_jitter_init(float *jitarr, int num)
 	float *jit2, x, rad1, rad2, rad3;
 	int i;
 
-	if (num==0) return;
+	if (num == 0) return;
 
-	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 + 2 * sizeof(float) * num, "initjit");
+	rad1 = 1.0f / sqrtf((float)num);
+	rad2 = 1.0f / ((float)num);
+	rad3 = sqrtf((float)num) / ((float)num);
 
 	BLI_srand(31415926 + num);
-	x= 0;
-	for (i=0; i<2*num; i+=2) {
-		jitarr[i]= x+ rad1*(float)(0.5-BLI_drand());
-		jitarr[i+1]= ((float)i/2)/num +rad1*(float)(0.5-BLI_drand());
-		x+= rad3;
+	x = 0;
+	for (i = 0; i < 2 * num; i += 2) {
+		jitarr[i] = x + rad1 * (float)(0.5 - BLI_drand());
+		jitarr[i + 1] = ((float)i / 2) / num + rad1 * (float)(0.5 - BLI_drand());
+		x += rad3;
 		x -= floorf(x);
 	}
 
-	for (i=0 ; i<24 ; i++) {
+	for (i = 0; i < 24; i++) {
 		BLI_jitterate1(jitarr, jit2, num, rad1);
 		BLI_jitterate1(jitarr, jit2, num, rad1);
 		BLI_jitterate2(jitarr, jit2, num, rad2);
@@ -166,9 +166,9 @@ 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) {
+	for (i = 0; i < 2 * num; i += 2) {
 		jitarr[i] -= 0.5f;
-		jitarr[i+1] -= 0.5f;
+		jitarr[i + 1] -= 0.5f;
 	}
 	
 }
-- 
cgit v1.2.3