[Bf-blender-cvs] [7199e22] master: Code cleanup: use sqrtf when input and output are float
Campbell Barton
noreply at git.blender.org
Fri Mar 28 05:26:03 CET 2014
Commit: 7199e2288f3df27ee2d21593da64ef4597fb86fd
Author: Campbell Barton
Date: Fri Mar 28 14:53:37 2014 +1100
https://developer.blender.org/rB7199e2288f3df27ee2d21593da64ef4597fb86fd
Code cleanup: use sqrtf when input and output are float
===================================================================
M source/blender/blenkernel/intern/constraint.c
M source/blender/blenkernel/intern/curve.c
M source/blender/blenkernel/intern/seqeffects.c
M source/blender/blenlib/intern/math_geom.c
M source/blender/blenlib/intern/math_rotation.c
M source/blender/blenlib/intern/math_vector.c
M source/blender/editors/armature/editarmature_generate.c
M source/blender/editors/interface/interface_handlers.c
M source/blender/editors/interface/interface_layout.c
M source/blender/editors/interface/interface_panel.c
M source/blender/editors/interface/interface_widgets.c
M source/blender/editors/space_view3d/drawarmature.c
M source/blender/editors/space_view3d/view3d_edit.c
M source/blender/editors/transform/transform_generics.c
M source/blender/editors/transform/transform_input.c
M source/blender/modifiers/intern/MOD_warp.c
M source/blender/modifiers/intern/MOD_weightvg_util.c
M source/blender/python/mathutils/mathutils_Matrix.c
M source/blender/render/intern/source/shadbuf.c
M source/blender/windowmanager/intern/wm_operators.c
===================================================================
diff --git a/source/blender/blenkernel/intern/constraint.c b/source/blender/blenkernel/intern/constraint.c
index 580a8a7..243b99a 100644
--- a/source/blender/blenkernel/intern/constraint.c
+++ b/source/blender/blenkernel/intern/constraint.c
@@ -2689,7 +2689,7 @@ static void stretchto_evaluate(bConstraint *con, bConstraintOb *cob, ListBase *t
switch (data->volmode) {
/* volume preserving scaling */
case VOLUME_XZ:
- scale[0] = 1.0f - (float)sqrt(data->bulge) + (float)sqrt(data->bulge * (data->orglength / dist));
+ scale[0] = 1.0f - sqrtf(data->bulge) + sqrtf(data->bulge * (data->orglength / dist));
scale[2] = scale[0];
break;
case VOLUME_X:
diff --git a/source/blender/blenkernel/intern/curve.c b/source/blender/blenkernel/intern/curve.c
index bc65e5b..864682c 100644
--- a/source/blender/blenkernel/intern/curve.c
+++ b/source/blender/blenkernel/intern/curve.c
@@ -1931,8 +1931,8 @@ static void calc_bevel_sin_cos(float x1, float y1, float x2, float y2, float *si
{
float t01, t02, x3, y3;
- t01 = (float)sqrt(x1 * x1 + y1 * y1);
- t02 = (float)sqrt(x2 * x2 + y2 * y2);
+ t01 = sqrtf(x1 * x1 + y1 * y1);
+ t02 = sqrtf(x2 * x2 + y2 * y2);
if (t01 == 0.0f)
t01 = 1.0f;
if (t02 == 0.0f)
@@ -1960,7 +1960,7 @@ static void calc_bevel_sin_cos(float x1, float y1, float x2, float y2, float *si
y3 = -x1;
}
else {
- t01 = (float)sqrt(x3 * x3 + y3 * y3);
+ t01 = sqrtf(x3 * x3 + y3 * y3);
x3 /= t01;
y3 /= t01;
}
diff --git a/source/blender/blenkernel/intern/seqeffects.c b/source/blender/blenkernel/intern/seqeffects.c
index ab44cf7..9e59ec8 100644
--- a/source/blender/blenkernel/intern/seqeffects.c
+++ b/source/blender/blenkernel/intern/seqeffects.c
@@ -678,8 +678,10 @@ static void gamtabs(float gamma)
val = a;
val /= 65535.0f;
- if (gamma == 2.0f) val = sqrt(val);
- else if (gamma != 1.0f) val = pow(val, igamma);
+ if (gamma == 2.0f)
+ val = sqrtf(val);
+ else if (gamma != 1.0f)
+ val = powf(val, igamma);
gamtab[a] = (65535.99f * val);
}
@@ -1443,7 +1445,7 @@ static float check_zone(WipeZone *wipezone, int x, int y, Sequence *seq, float f
temp1 = xo * (1 - facf0 / 2) - xo * facf0 / 2;
temp2 = yo * (1 - facf0 / 2) - yo * facf0 / 2;
- pointdist = sqrt(temp1 * temp1 + temp2 * temp2);
+ pointdist = sqrtf(temp1 * temp1 + temp2 * temp2);
if (b2 < b1 && b2 < b3) {
if (hwidth < pointdist)
@@ -1500,9 +1502,9 @@ static float check_zone(WipeZone *wipezone, int x, int y, Sequence *seq, float f
hwidth = width * 0.5f;
temp1 = (halfx - (halfx) * facf0);
- pointdist = sqrt(temp1 * temp1 + temp1 * temp1);
+ pointdist = sqrtf(temp1 * temp1 + temp1 * temp1);
- temp2 = sqrt((halfx - x) * (halfx - x) + (halfy - y) * (halfy - y));
+ temp2 = sqrtf((halfx - x) * (halfx - x) + (halfy - y) * (halfy - y));
if (temp2 > pointdist) output = in_band(hwidth, fabsf(temp2 - pointdist), 0, 1);
else output = in_band(hwidth, fabsf(temp2 - pointdist), 1, 1);
diff --git a/source/blender/blenlib/intern/math_geom.c b/source/blender/blenlib/intern/math_geom.c
index ca9d3bb..3daa741 100644
--- a/source/blender/blenlib/intern/math_geom.c
+++ b/source/blender/blenlib/intern/math_geom.c
@@ -1244,7 +1244,7 @@ static bool getLowestRoot(const float a, const float b, const float c, const flo
if (determinant >= 0.0f) {
/* calculate the two roots: (if determinant == 0 then
* x1==x2 but lets disregard that slight optimization) */
- float sqrtD = (float)sqrt(determinant);
+ float sqrtD = sqrtf(determinant);
float r1 = (-b - sqrtD) / (2.0f * a);
float r2 = (-b + sqrtD) / (2.0f * a);
@@ -2974,8 +2974,8 @@ void lookat_m4(float mat[4][4], float vx, float vy, float vz, float px, float py
dy = py - vy;
dz = pz - vz;
hyp = dx * dx + dz * dz; /* hyp squared */
- hyp1 = (float)sqrt(dy * dy + hyp);
- hyp = (float)sqrt(hyp); /* the real hyp */
+ hyp1 = sqrtf(dy * dy + hyp);
+ hyp = sqrtf(hyp); /* the real hyp */
if (hyp1 != 0.0f) { /* rotate X */
sine = -dy / hyp1;
@@ -3097,7 +3097,7 @@ void map_to_sphere(float *r_u, float *r_v, const float x, const float y, const f
if (x == 0.0f && y == 0.0f) *r_u = 0.0f; /* othwise domain error */
else *r_u = (1.0f - atan2f(x, y) / (float)M_PI) / 2.0f;
- *r_v = 1.0f - (float)saacos(z / len) / (float)M_PI;
+ *r_v = 1.0f - saacos(z / len) / (float)M_PI;
}
else {
*r_v = *r_u = 0.0f; /* to avoid un-initialized variables */
diff --git a/source/blender/blenlib/intern/math_rotation.c b/source/blender/blenlib/intern/math_rotation.c
index d7daa23..1136020 100644
--- a/source/blender/blenlib/intern/math_rotation.c
+++ b/source/blender/blenlib/intern/math_rotation.c
@@ -1011,7 +1011,7 @@ static void mat3_to_eul2(float tmat[3][3], float eul1[3], float eul2[3])
copy_m3_m3(mat, tmat);
normalize_m3(mat);
- cy = (float)sqrt(mat[0][0] * mat[0][0] + mat[0][1] * mat[0][1]);
+ cy = sqrtf(mat[0][0] * mat[0][0] + mat[0][1] * mat[0][1]);
if (cy > 16.0f * FLT_EPSILON) {
diff --git a/source/blender/blenlib/intern/math_vector.c b/source/blender/blenlib/intern/math_vector.c
index b189fc3..d3869f3 100644
--- a/source/blender/blenlib/intern/math_vector.c
+++ b/source/blender/blenlib/intern/math_vector.c
@@ -494,7 +494,7 @@ void reflect_v3_v3v3(float out[3], const float v1[3], const float v2[3])
void ortho_basis_v3v3_v3(float v1[3], float v2[3], const float v[3])
{
- const float f = (float)sqrt(v[0] * v[0] + v[1] * v[1]);
+ const float f = sqrtf(v[0] * v[0] + v[1] * v[1]);
if (f < 1e-35f) {
// degenerate case
diff --git a/source/blender/editors/armature/editarmature_generate.c b/source/blender/editors/armature/editarmature_generate.c
index 41ec144..179e0a9 100644
--- a/source/blender/editors/armature/editarmature_generate.c
+++ b/source/blender/editors/armature/editarmature_generate.c
@@ -203,7 +203,7 @@ int nextLengthSubdivision(ToolSettings *toolsettings, BArcIterator *iter, int st
c = dot_v3v3(off, off) - (lengthLimit * lengthLimit);
- f = (-b + (float)sqrt(b * b - 4 * a * c)) / (2 * a);
+ f = (-b + sqrtf(b * b - 4 * a * c)) / (2 * a);
//printf("a %f, b %f, c %f, f %f\n", a, b, c, f);
diff --git a/source/blender/editors/interface/interface_handlers.c b/source/blender/editors/interface/interface_handlers.c
index 4eb138e..b58c86f 100644
--- a/source/blender/editors/interface/interface_handlers.c
+++ b/source/blender/editors/interface/interface_handlers.c
@@ -4142,7 +4142,7 @@ static bool ui_numedit_but_NORMAL(uiBut *but, uiHandleButtonData *data,
if (mrad < radsq) { /* inner circle */
fp[0] = dx;
fp[1] = dy;
- fp[2] = sqrt(radsq - dx * dx - dy * dy);
+ fp[2] = sqrtf(radsq - dx * dx - dy * dy);
}
else { /* outer circle */
@@ -4155,7 +4155,7 @@ static bool ui_numedit_but_NORMAL(uiBut *but, uiHandleButtonData *data,
if (mrad < radsq) {
fp[0] = dx;
fp[1] = dy;
- fp[2] = -sqrt(radsq - dx * dx - dy * dy);
+ fp[2] = -sqrtf(radsq - dx * dx - dy * dy);
}
}
normalize_v3(fp);
diff --git a/source/blender/editors/interface/interface_layout.c b/source/blender/editors/interface/interface_layout.c
index fa56dc1..be57987 100644
--- a/source/blender/editors/interface/interface_layout.c
+++ b/source/blender/editors/interface/interface_layout.c
@@ -1132,7 +1132,7 @@ static void ui_item_rna_size(uiLayout *layout, const char *name, int icon, Point
if (ELEM(subtype, PROP_LAYER, PROP_LAYER_MEMBER))
h += 2 * UI_UNIT_Y;
else if (subtype == PROP_MATRIX)
- h += ceil(sqrt(len)) * UI_UNIT_Y;
+ h += ceilf(sqrtf(len)) * UI_UNIT_Y;
else
h += len * UI_UNIT_Y;
}
diff --git a/source/blender/editors/interface/interface_panel.c b/source/blender/editors/interface/interface_panel.c
index f5e2bfb..e9a4119 100644
--- a/source/blender/editors/interface/interface_panel.c
+++ b/source/blender/editors/interface/interface_panel.c
@@ -892,7 +892,7 @@ static void ui_do_animate(const bContext *C, Panel *panel)
float fac;
fac = (PIL_check_seconds_timer() - data->starttime) / ANIMATION_TIME;
- fac = min_ff(sqrt(fac), 1.0f);
+ fac = min_ff(sqrtf(fac), 1.0f);
/* for max 1 second, interpolate positions */
if (uiAlignPanelStep(sa, ar, fac, false)) {
diff --git a/source/blender/editors/interface/interface_widgets.c b/source/blender/editors/interface/interface_widgets.c
index 4a830e3..5f970e4 100644
--- a/source/blender/editors/interface/interface_widgets.c
+++ b/source/blender/editors/interface/interface_widgets.c
@@ -1944,7 +1944,7 @@ static void widget_softshadow(const rcti *rect, int roundboxalign, const float r
glEnableClientState(GL_VERTEX_ARRAY);
for (step = 1; step <= (int)radout; step++) {
- float expfac = sqrt(step / radout);
+ float expfac = sqrtf(step / radout);
round_box_shadow_edges(wtb.outer_v, &rect1, radin, UI_CNR_ALL, (float)step);
diff --git a/source/blender/editors/space_view3d/drawarmature.c b/source/blender/editors/space_view3d/drawarmature.c
index 8793dff..4a2fd5f 100644
--- a/source/blender/editors/space_view3d/drawarmature.c
+++ b/source/blender/editors/space_view3d/drawarmature.c
@@ -1456,7 +1456,7 @@ static void bgl_sphere_project(float ax, float az)
float dir[3], sine, q3;
sine = 1.0f - ax * ax - az * az;
- q3 = (sine < 0.0f) ? 0.0f : (float)(2.0 * sqrt(sine));
+ q3 = (sine < 0.0f) ? 0.0f : (2.0f * sqrtf(sine));
dir[0] = -az * q3;
dir[1] = 1.0f - 2.0f * sine;
@@ -2393,7 +2393,7 @@ static void draw_ghost_poses_range(Scene *scene, View3D *v3d, ARegion *ar, Base
/* draw from first frame of range to last */
for (CFRA = (int)start; CFRA < end; CFRA += (int)stepsize) {
colfac = (end - (float)CFRA) / range;
- UI_ThemeColorShadeAlpha(TH_WIRE, 0, -128 - (int)(120.0 * sqrt(colfac)));
+ UI_ThemeColorShadeAlpha(TH_WIRE, 0, -128 - (int)(120.0f * sqrtf(colfac)));
BKE_animsys_evaluate_animdata(scene, &ob->id, adt, (float)CFRA, ADT_RECALC_ALL);
BKE_pose_where_is(scene, ob);
@@ -2473,7 +2473,7 @@ static void draw_ghost_poses_keys(Scene *scene, View3D *v3d, ARegion *ar, Base *
/* draw from first frame of range to last */
for (ak = keys.first, i = 0; ak; ak = ak->next, i++) {
colfac = i / range;
- UI_ThemeColorShadeAlpha(TH_WIRE, 0, -128 - (int)(120.0 * sqrt(colfac)));
+ UI_ThemeColorShadeA
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list