[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [25529] trunk/blender/source/blender/ blenlib/intern/math_vector.c: Missing angle_v3v3 definition ( it was declared)
Martin Poirier
theeth at yahoo.com
Tue Dec 22 20:56:19 CET 2009
Revision: 25529
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=25529
Author: theeth
Date: 2009-12-22 20:56:12 +0100 (Tue, 22 Dec 2009)
Log Message:
-----------
Missing angle_v3v3 definition (it was declared)
Wrong definition for angle_v2v2 (it read 2d vectors as 3d vectors)
Modified Paths:
--------------
trunk/blender/source/blender/blenlib/intern/math_vector.c
Modified: trunk/blender/source/blender/blenlib/intern/math_vector.c
===================================================================
--- trunk/blender/source/blender/blenlib/intern/math_vector.c 2009-12-22 19:53:44 UTC (rev 25528)
+++ trunk/blender/source/blender/blenlib/intern/math_vector.c 2009-12-22 19:56:12 UTC (rev 25529)
@@ -145,6 +145,19 @@
return angle_normalized_v3v3(vec1, vec2);
}
+/* Return the shortest angle in radians between the 2 vectors */
+float angle_v3v3(float *v1, float *v2)
+{
+ float vec1[3], vec2[3];
+
+ copy_v3_v3(vec1, v1);
+ copy_v3_v3(vec2, v2);
+ normalize_v3(vec1);
+ normalize_v3(vec2);
+
+ return angle_normalized_v3v3(vec1, vec2);
+}
+
float angle_v2v2v2(float *v1, float *v2, float *v3)
{
float vec1[2], vec2[2];
@@ -164,14 +177,18 @@
/* Return the shortest angle in radians between the 2 vectors */
float angle_v2v2(float *v1, float *v2)
{
- float vec1[3], vec2[3];
+ float vec1[2], vec2[2];
- copy_v3_v3(vec1, v1);
- copy_v3_v3(vec2, v2);
- normalize_v3(vec1);
- normalize_v3(vec2);
+ vec1[0] = v1[0];
+ vec1[1] = v1[1];
- return angle_normalized_v3v3(vec1, vec2);
+ vec2[0] = v2[0];
+ vec2[1] = v2[1];
+
+ normalize_v2(vec1);
+ normalize_v2(vec2);
+
+ return angle_normalized_v2v2(vec1, vec2);
}
float angle_normalized_v3v3(float *v1, float *v2)
More information about the Bf-blender-cvs
mailing list