[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [25938] trunk/blender/source/blender/ blenlib: Math lib: added normalize_v3_v3 in addition to normalize_v3.

[Brecht Van Lommel]

Revision: 25938
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=25938
Author:   blendix
Date:     2010-01-12 20:47:54 +0100 (Tue, 12 Jan 2010)

Log Message:
-----------
Math lib: added normalize_v3_v3 in addition to normalize_v3.

Modified Paths:
--------------
    trunk/blender/source/blender/blenlib/BLI_math_vector.h
    trunk/blender/source/blender/blenlib/intern/math_vector_inline.c

Modified: trunk/blender/source/blender/blenlib/BLI_math_vector.h
===================================================================
--- trunk/blender/source/blender/blenlib/BLI_math_vector.h	2010-01-12 19:47:31 UTC (rev 25937)
+++ trunk/blender/source/blender/blenlib/BLI_math_vector.h	2010-01-12 19:47:54 UTC (rev 25938)
@@ -70,8 +70,9 @@
 MINLINE void sub_v3_v3v3(float r[3], const float a[3], const float b[3]);
 
 MINLINE void mul_v2_fl(float r[2], float f);
+MINLINE void mul_v2_v2fl(float r[2], const float a[2], float f);
 MINLINE void mul_v3_fl(float r[3], float f);
-MINLINE void mul_v3_v3fl(float r[3], float a[3], float f);
+MINLINE void mul_v3_v3fl(float r[3], const float a[3], float f);
 MINLINE void mul_v2_v2(float r[2], const float a[2]);
 MINLINE void mul_v3_v3(float r[3], float a[3]);
 MINLINE void mul_v3_v3v3(float r[3], float a[3], float b[3]);
@@ -101,7 +102,9 @@
 MINLINE float len_v3v3(const float a[3], const float b[3]);
 
 MINLINE float normalize_v2(float r[2]);
+MINLINE float normalize_v2_v2(float r[2], const float a[2]);
 MINLINE float normalize_v3(float r[3]);
+MINLINE float normalize_v3_v3(float r[3], const float a[3]);
 
 /******************************* Interpolation *******************************/
 

Modified: trunk/blender/source/blender/blenlib/intern/math_vector_inline.c
===================================================================
--- trunk/blender/source/blender/blenlib/intern/math_vector_inline.c	2010-01-12 19:47:31 UTC (rev 25937)
+++ trunk/blender/source/blender/blenlib/intern/math_vector_inline.c	2010-01-12 19:47:54 UTC (rev 25938)
@@ -131,6 +131,12 @@
 	v1[1]*= f;
 }
 
+MINLINE void mul_v2_v2fl(float r[2], const float a[2], float f)
+{
+	r[0]= a[0]*f;
+	r[1]= a[1]*f;
+}
+
 MINLINE void mul_v3_fl(float r[3], float f)
 {
 	r[0] *= f;
@@ -138,7 +144,7 @@
 	r[2] *= f;
 }
 
-MINLINE void mul_v3_v3fl(float r[3], float a[3], float f)
+MINLINE void mul_v3_v3fl(float r[3], const float a[3], float f)
 {
 	r[0]= a[0]*f;
 	r[1]= a[1]*f;
@@ -275,38 +281,49 @@
 	return len_v3(d);
 }
 
-MINLINE float normalize_v2(float n[2])
+MINLINE float normalize_v2_v2(float r[2], const float a[2])
 {
-	float d= dot_v2v2(n, n);
+	float d= dot_v2v2(a, a);
 
 	if(d > 1.0e-35f) {
 		d= sqrtf(d);
-		mul_v2_fl(n, 1.0f/d);
+		mul_v2_v2fl(r, a, 1.0f/d);
 	} else {
-		zero_v2(n);
+		zero_v2(r);
 		d= 0.0f;
 	}
+
 	return d;
 }
 
-MINLINE float normalize_v3(float n[3])
+MINLINE float normalize_v2(float n[2])
 {
-	float d= dot_v3v3(n, n);
+	return normalize_v2_v2(n, n);
+}
 
+MINLINE float normalize_v3_v3(float r[3], const float a[3])
+{
+	float d= dot_v3v3(a, a);
+
 	/* a larger value causes normalize errors in a
 	   scaled down models with camera xtreme close */
 	if(d > 1.0e-35f) {
 		d= sqrtf(d);
-		mul_v3_fl(n, 1.0f/d);
+		mul_v3_v3fl(r, a, 1.0f/d);
 	}
 	else {
-		zero_v3(n);
+		zero_v3(r);
 		d= 0.0f;
 	}
 
 	return d;
 }
 
+MINLINE float normalize_v3(float n[3])
+{
+	return normalize_v3_v3(n, n);
+}
+
 MINLINE void normal_short_to_float_v3(float *out, short *in)
 {
 	out[0] = in[0]*(1.0f/32767.0f);