[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [32275] trunk/blender: added len_squared_v2v2, use instead of len_v3v3 for font handle tests, also fixed some warnings.
Campbell Barton
ideasman42 at gmail.com
Sun Oct 3 16:16:27 CEST 2010
Revision: 32275
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=32275
Author: campbellbarton
Date: 2010-10-03 16:16:27 +0200 (Sun, 03 Oct 2010)
Log Message:
-----------
added len_squared_v2v2, use instead of len_v3v3 for font handle tests, also fixed some warnings.
Modified Paths:
--------------
trunk/blender/extern/bullet2/src/LinearMath/btQuickprof.cpp
trunk/blender/source/blender/blenlib/BLI_math_vector.h
trunk/blender/source/blender/blenlib/intern/freetypefont.c
trunk/blender/source/blender/blenlib/intern/math_vector_inline.c
trunk/blender/source/blender/editors/space_image/image_draw.c
Modified: trunk/blender/extern/bullet2/src/LinearMath/btQuickprof.cpp
===================================================================
--- trunk/blender/extern/bullet2/src/LinearMath/btQuickprof.cpp 2010-10-03 12:22:33 UTC (rev 32274)
+++ trunk/blender/extern/bullet2/src/LinearMath/btQuickprof.cpp 2010-10-03 14:16:27 UTC (rev 32275)
@@ -1,5 +1,5 @@
-/*
+
/***************************************************************************************************
**
** profile.cpp
Modified: trunk/blender/source/blender/blenlib/BLI_math_vector.h
===================================================================
--- trunk/blender/source/blender/blenlib/BLI_math_vector.h 2010-10-03 12:22:33 UTC (rev 32274)
+++ trunk/blender/source/blender/blenlib/BLI_math_vector.h 2010-10-03 14:16:27 UTC (rev 32275)
@@ -95,6 +95,7 @@
MINLINE float len_v2(const float a[2]);
MINLINE float len_v2v2(const float a[2], const float b[2]);
+MINLINE float len_squared_v2v2(const float a[3], const float b[3]);
MINLINE float len_v3(const float a[3]);
MINLINE float len_v3v3(const float a[3], const float b[3]);
MINLINE float len_squared_v3v3(const float a[3], const float b[3]);
Modified: trunk/blender/source/blender/blenlib/intern/freetypefont.c
===================================================================
--- trunk/blender/source/blender/blenlib/intern/freetypefont.c 2010-10-03 12:22:33 UTC (rev 32274)
+++ trunk/blender/source/blender/blenlib/intern/freetypefont.c 2010-10-03 14:16:27 UTC (rev 32275)
@@ -252,15 +252,15 @@
}
// get the handles that are aligned, tricky...
- // DistVL2Dfl, check if the three beztriple points are on one line
- // VecLenf, see if there's a distance between the three points
- // VecLenf again, to check the angle between the handles
+ // dist_to_line_v2, check if the three beztriple points are on one line
+ // len_squared_v2v2, see if there's a distance between the three points
+ // len_squared_v2v2 again, to check the angle between the handles
// finally, check if one of them is a vector handle
if((dist_to_line_v2(bezt->vec[0],bezt->vec[1],bezt->vec[2]) < 0.001) &&
- (len_v3v3(bezt->vec[0], bezt->vec[1]) > 0.0001) &&
- (len_v3v3(bezt->vec[1], bezt->vec[2]) > 0.0001) &&
- (len_v3v3(bezt->vec[0], bezt->vec[2]) > 0.0002) &&
- (len_v3v3(bezt->vec[0], bezt->vec[2]) > MAX2(len_v3v3(bezt->vec[0], bezt->vec[1]), len_v3v3(bezt->vec[1], bezt->vec[2]))) &&
+ (len_squared_v2v2(bezt->vec[0], bezt->vec[1]) > 0.0001*0.0001) &&
+ (len_squared_v2v2(bezt->vec[1], bezt->vec[2]) > 0.0001*0.0001) &&
+ (len_squared_v2v2(bezt->vec[0], bezt->vec[2]) > 0.0002*0.0001) &&
+ (len_squared_v2v2(bezt->vec[0], bezt->vec[2]) > MAX2(len_squared_v2v2(bezt->vec[0], bezt->vec[1]), len_squared_v2v2(bezt->vec[1], bezt->vec[2]))) &&
bezt->h1 != HD_VECT && bezt->h2 != HD_VECT)
{
bezt->h1= bezt->h2= HD_ALIGN;
Modified: trunk/blender/source/blender/blenlib/intern/math_vector_inline.c
===================================================================
--- trunk/blender/source/blender/blenlib/intern/math_vector_inline.c 2010-10-03 12:22:33 UTC (rev 32274)
+++ trunk/blender/source/blender/blenlib/intern/math_vector_inline.c 2010-10-03 14:16:27 UTC (rev 32275)
@@ -302,7 +302,7 @@
MINLINE float len_v2(const float v[2])
{
- return (float)sqrt(v[0]*v[0] + v[1]*v[1]);
+ return (float)sqrtf(v[0]*v[0] + v[1]*v[1]);
}
MINLINE float len_v2v2(const float v1[2], const float v2[2])
@@ -311,7 +311,7 @@
x = v1[0]-v2[0];
y = v1[1]-v2[1];
- return (float)sqrt(x*x+y*y);
+ return (float)sqrtf(x*x+y*y);
}
MINLINE float len_v3(const float a[3])
@@ -319,6 +319,14 @@
return sqrtf(dot_v3v3(a, a));
}
+MINLINE float len_squared_v2v2(const float a[3], const float b[3])
+{
+ float d[2];
+
+ sub_v2_v2v2(d, b, a);
+ return dot_v2v2(d, d);
+}
+
MINLINE float len_v3v3(const float a[3], const float b[3])
{
float d[3];
Modified: trunk/blender/source/blender/editors/space_image/image_draw.c
===================================================================
--- trunk/blender/source/blender/editors/space_image/image_draw.c 2010-10-03 12:22:33 UTC (rev 32274)
+++ trunk/blender/source/blender/editors/space_image/image_draw.c 2010-10-03 14:16:27 UTC (rev 32275)
@@ -49,6 +49,10 @@
#include "BKE_image.h"
#include "BKE_paint.h"
+#ifdef WITH_LCMS
+#include "BKE_colortools.h"
+#endif
+
#include "BIF_gl.h"
#include "BIF_glutil.h"
More information about the Bf-blender-cvs
mailing list