From 62a73381a7ec63e75960d3c9545c638c85d3b06a Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Sat, 21 Jul 2012 15:27:40 +0000 Subject: use fabsf when using floats. --- source/blender/blenlib/intern/lasso.c | 2 +- source/blender/blenlib/intern/math_geom.c | 6 ++-- source/blender/blenlib/intern/math_rotation.c | 50 +++++++++++++-------------- 3 files changed, 29 insertions(+), 29 deletions(-) (limited to 'source/blender/blenlib') diff --git a/source/blender/blenlib/intern/lasso.c b/source/blender/blenlib/intern/lasso.c index 29b967fcd37..7df4da80e16 100644 --- a/source/blender/blenlib/intern/lasso.c +++ b/source/blender/blenlib/intern/lasso.c @@ -95,7 +95,7 @@ int BLI_lasso_is_point_inside(int mcords[][2], short moves, p2 = mcords[a + 1]; } - if (fabs(angletot) > 4.0) return 1; + if (fabsf(angletot) > 4.0f) return 1; return 0; } diff --git a/source/blender/blenlib/intern/math_geom.c b/source/blender/blenlib/intern/math_geom.c index f2ea93282c9..de665686ea6 100644 --- a/source/blender/blenlib/intern/math_geom.c +++ b/source/blender/blenlib/intern/math_geom.c @@ -583,17 +583,17 @@ static short IsectLLPt2Df(const float x0, const float y0, const float x1, const * compute slopes, note the cludge for infinity, however, this will * be close enough */ - if (fabs(x1 - x0) > 0.000001f) + if (fabsf(x1 - x0) > 0.000001f) m1 = (y1 - y0) / (x1 - x0); else return -1; /*m1 = (float)1e+10;*/ /* close enough to infinity */ - if (fabs(x3 - x2) > 0.000001f) + if (fabsf(x3 - x2) > 0.000001f) m2 = (y3 - y2) / (x3 - x2); else return -1; /*m2 = (float)1e+10;*/ /* close enough to infinity */ - if (fabs(m1 - m2) < 0.000001f) + if (fabsf(m1 - m2) < 0.000001f) return -1; /* parallel lines */ /* compute constants */ diff --git a/source/blender/blenlib/intern/math_rotation.c b/source/blender/blenlib/intern/math_rotation.c index ab5601fc2dc..6dca708a048 100644 --- a/source/blender/blenlib/intern/math_rotation.c +++ b/source/blender/blenlib/intern/math_rotation.c @@ -453,7 +453,7 @@ void vec_to_quat(float q[4], const float vec[3], short axis, const short upflag) nor[1] = -z2; nor[2] = y2; - if (fabs(y2) + fabs(z2) < 0.0001) + if (fabsf(y2) + fabsf(z2) < 0.0001f) nor[1] = 1.0; co = x2; @@ -463,7 +463,7 @@ void vec_to_quat(float q[4], const float vec[3], short axis, const short upflag) nor[1] = 0.0; nor[2] = -x2; - if (fabs(x2) + fabs(z2) < 0.0001) + if (fabsf(x2) + fabsf(z2) < 0.0001f) nor[2] = 1.0; co = y2; @@ -473,7 +473,7 @@ void vec_to_quat(float q[4], const float vec[3], short axis, const short upflag) nor[1] = x2; nor[2] = 0.0; - if (fabs(x2) + fabs(y2) < 0.0001) + if (fabsf(x2) + fabsf(y2) < 0.0001f) nor[0] = 1.0; co = z2; @@ -696,7 +696,7 @@ void quat_to_axis_angle(float axis[3], float *angle, const float q[4]) *angle = ha * 2; /* prevent division by zero for axis conversion */ - if (fabs(si) < 0.0005) + if (fabsf(si) < 0.0005f) si = 1.0f; axis[0] = q[1] / si; @@ -998,7 +998,7 @@ void mat3_to_eul(float *eul, float tmat[][3]) mat3_to_eul2(tmat, eul1, eul2); /* return best, which is just the one with lowest values it in */ - if (fabs(eul1[0]) + fabs(eul1[1]) + fabs(eul1[2]) > fabs(eul2[0]) + fabs(eul2[1]) + fabs(eul2[2])) { + if (fabsf(eul1[0]) + fabsf(eul1[1]) + fabsf(eul1[2]) > fabsf(eul2[0]) + fabsf(eul2[1]) + fabsf(eul2[2])) { copy_v3_v3(eul, eul2); } else { @@ -1083,32 +1083,32 @@ void compatible_eul(float eul[3], const float oldrot[3]) dy = eul[1] - oldrot[1]; dz = eul[2] - oldrot[2]; - while (fabs(dx) > 5.1) { + while (fabsf(dx) > 5.1f) { if (dx > 0.0f) eul[0] -= 2.0f * (float)M_PI; else eul[0] += 2.0f * (float)M_PI; dx = eul[0] - oldrot[0]; } - while (fabs(dy) > 5.1) { + while (fabsf(dy) > 5.1f) { if (dy > 0.0f) eul[1] -= 2.0f * (float)M_PI; else eul[1] += 2.0f * (float)M_PI; dy = eul[1] - oldrot[1]; } - while (fabs(dz) > 5.1) { + while (fabsf(dz) > 5.1f) { if (dz > 0.0f) eul[2] -= 2.0f * (float)M_PI; else eul[2] += 2.0f * (float)M_PI; dz = eul[2] - oldrot[2]; } /* is 1 of the axis rotations larger than 180 degrees and the other small? NO ELSE IF!! */ - if (fabs(dx) > 3.2 && fabs(dy) < 1.6 && fabs(dz) < 1.6) { + if (fabsf(dx) > 3.2f && fabsf(dy) < 1.6f && fabsf(dz) < 1.6f) { if (dx > 0.0f) eul[0] -= 2.0f * (float)M_PI; else eul[0] += 2.0f * (float)M_PI; } - if (fabs(dy) > 3.2 && fabs(dz) < 1.6 && fabs(dx) < 1.6) { + if (fabsf(dy) > 3.2f && fabsf(dz) < 1.6f && fabsf(dx) < 1.6f) { if (dy > 0.0f) eul[1] -= 2.0f * (float)M_PI; else eul[1] += 2.0f * (float)M_PI; } - if (fabs(dz) > 3.2 && fabs(dx) < 1.6 && fabs(dy) < 1.6) { + if (fabsf(dz) > 3.2f && fabsf(dx) < 1.6f && fabsf(dy) < 1.6f) { if (dz > 0.0f) eul[2] -= 2.0f * (float)M_PI; else eul[2] += 2.0f * (float)M_PI; } @@ -1123,29 +1123,29 @@ void compatible_eul(float eul[3], const float oldrot[3]) /* special case, tested for x-z */ - if ((fabs(dx) > 3.1 && fabs(dz) > 1.5) || (fabs(dx) > 1.5 && fabs(dz) > 3.1)) { - if (dx > 0.0) eul[0] -= M_PI; + if ((fabsf(dx) > 3.1f && fabsf(dz) > 1.5f) || (fabsf(dx) > 1.5f && fabsf(dz) > 3.1f)) { + if (dx > 0.0f) eul[0] -= M_PI; else eul[0] += M_PI; if (eul[1] > 0.0) eul[1] = M_PI - eul[1]; else eul[1] = -M_PI - eul[1]; - if (dz > 0.0) eul[2] -= M_PI; + if (dz > 0.0f) eul[2] -= M_PI; else eul[2] += M_PI; } - else if ((fabs(dx) > 3.1 && fabs(dy) > 1.5) || (fabs(dx) > 1.5 && fabs(dy) > 3.1)) { - if (dx > 0.0) eul[0] -= M_PI; + else if ((fabsf(dx) > 3.1f && fabsf(dy) > 1.5f) || (fabsf(dx) > 1.5f && fabsf(dy) > 3.1f)) { + if (dx > 0.0f) eul[0] -= M_PI; else eul[0] += M_PI; - if (dy > 0.0) eul[1] -= M_PI; + if (dy > 0.0f) eul[1] -= M_PI; else eul[1] += M_PI; - if (eul[2] > 0.0) eul[2] = M_PI - eul[2]; + if (eul[2] > 0.0f) eul[2] = M_PI - eul[2]; else eul[2] = -M_PI - eul[2]; } - else if ((fabs(dy) > 3.1 && fabs(dz) > 1.5) || (fabs(dy) > 1.5 && fabs(dz) > 3.1)) { - if (eul[0] > 0.0) eul[0] = M_PI - eul[0]; + else if ((fabsf(dy) > 3.1f && fabsf(dz) > 1.5f) || (fabsf(dy) > 1.5f && fabsf(dz) > 3.f1)) { + if (eul[0] > 0.0f) eul[0] = M_PI - eul[0]; else eul[0] = -M_PI - eul[0]; - if (dy > 0.0) eul[1] -= M_PI; + if (dy > 0.0f) eul[1] -= M_PI; else eul[1] += M_PI; - if (dz > 0.0) eul[2] -= M_PI; + if (dz > 0.0f) eul[2] -= M_PI; else eul[2] += M_PI; } #endif @@ -1164,8 +1164,8 @@ void mat3_to_compatible_eul(float eul[3], const float oldrot[3], float mat[][3]) compatible_eul(eul1, oldrot); compatible_eul(eul2, oldrot); - d1 = (float)fabs(eul1[0] - oldrot[0]) + (float)fabs(eul1[1] - oldrot[1]) + (float)fabs(eul1[2] - oldrot[2]); - d2 = (float)fabs(eul2[0] - oldrot[0]) + (float)fabs(eul2[1] - oldrot[1]) + (float)fabs(eul2[2] - oldrot[2]); + d1 = (float)fabsf(eul1[0] - oldrot[0]) + (float)fabsf(eul1[1] - oldrot[1]) + (float)fabsf(eul1[2] - oldrot[2]); + d2 = (float)fabsf(eul2[0] - oldrot[0]) + (float)fabsf(eul2[1] - oldrot[1]) + (float)fabsf(eul2[2] - oldrot[2]); /* return best, which is just the one with lowest difference */ if (d1 > d2) { @@ -1360,7 +1360,7 @@ void mat3_to_eulO(float eul[3], const short order, float M[3][3]) mat3_to_eulo2(M, eul1, eul2, order); /* return best, which is just the one with lowest values it in */ - if (fabs(eul1[0]) + fabs(eul1[1]) + fabs(eul1[2]) > fabs(eul2[0]) + fabs(eul2[1]) + fabs(eul2[2])) { + if (fabsf(eul1[0]) + fabsf(eul1[1]) + fabsf(eul1[2]) > fabsf(eul2[0]) + fabsf(eul2[1]) + fabsf(eul2[2])) { copy_v3_v3(eul, eul2); } else { -- cgit v1.2.3