diff options
author | Campbell Barton <ideasman42@gmail.com> | 2014-03-28 07:53:37 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2014-03-28 07:53:37 +0400 |
commit | 7199e2288f3df27ee2d21593da64ef4597fb86fd (patch) | |
tree | 33e69c15bb612736079510dd9fbcc055c6f06e51 /source/blender/editors | |
parent | e6e74381819666141a5dd02d670ef06e64018dc3 (diff) |
Code cleanup: use sqrtf when input and output are float
Diffstat (limited to 'source/blender/editors')
9 files changed, 16 insertions, 16 deletions
diff --git a/source/blender/editors/armature/editarmature_generate.c b/source/blender/editors/armature/editarmature_generate.c index 41ec144bd98..179e0a97c9d 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 4eb138e07cb..b58c86fca5d 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 fa56dc1a275..be57987ee3c 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 f5e2bfb6c29..e9a4119ac7e 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 4a830e33027..5f970e4ef3a 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 8793dff4bac..4a2fd5f7004 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_ThemeColorShadeAlpha(TH_WIRE, 0, -128 - (int)(120.0f * sqrtf(colfac))); CFRA = (int)ak->cfra; @@ -2543,7 +2543,7 @@ static void draw_ghost_poses(Scene *scene, View3D *v3d, ARegion *ar, Base *base) for (cur = stepsize; cur < range; cur += stepsize) { ctime = cur - (float)fmod(cfrao, stepsize); /* ensures consistent stepping */ colfac = ctime / range; - UI_ThemeColorShadeAlpha(TH_WIRE, 0, -128 - (int)(120.0 * sqrt(colfac))); + UI_ThemeColorShadeAlpha(TH_WIRE, 0, -128 - (int)(120.0f * sqrtf(colfac))); /* only within action range */ if (actframe + ctime >= start && actframe + ctime <= end) { @@ -2558,7 +2558,7 @@ static void draw_ghost_poses(Scene *scene, View3D *v3d, ARegion *ar, Base *base) ctime = cur + (float)fmod((float)cfrao, stepsize) - stepsize + 1.0f; /* ensures consistent stepping */ colfac = ctime / range; - UI_ThemeColorShadeAlpha(TH_WIRE, 0, -128 - (int)(120.0 * sqrt(colfac))); + UI_ThemeColorShadeAlpha(TH_WIRE, 0, -128 - (int)(120.0f * sqrtf(colfac))); /* only within action range */ if ((actframe - ctime >= start) && (actframe - ctime <= end)) { diff --git a/source/blender/editors/space_view3d/view3d_edit.c b/source/blender/editors/space_view3d/view3d_edit.c index b60e2e42c7d..fe84e3e79a0 100644 --- a/source/blender/editors/space_view3d/view3d_edit.c +++ b/source/blender/editors/space_view3d/view3d_edit.c @@ -492,9 +492,9 @@ static void calctrackballvec(const rcti *rect, int mx, int my, float vec[3]) y = BLI_rcti_cent_y(rect) - my; y /= (float)(BLI_rcti_size_y(rect) / 2); - d = sqrt(x * x + y * y); + d = sqrtf(x * x + y * y); if (d < radius * (float)M_SQRT1_2) { /* Inside sphere */ - z = sqrt(radius * radius - d * d); + z = sqrtf(radius * radius - d * d); } else { /* On hyperbola */ t = radius / (float)M_SQRT2; diff --git a/source/blender/editors/transform/transform_generics.c b/source/blender/editors/transform/transform_generics.c index 79ae0efbcb3..4ee9f6bd6a6 100644 --- a/source/blender/editors/transform/transform_generics.c +++ b/source/blender/editors/transform/transform_generics.c @@ -1818,7 +1818,7 @@ void calculatePropRatio(TransInfo *t) td->factor = 3.0f * dist * dist - 2.0f * dist * dist * dist; break; case PROP_ROOT: - td->factor = (float)sqrt(dist); + td->factor = sqrtf(dist); break; case PROP_LIN: td->factor = dist; @@ -1827,7 +1827,7 @@ void calculatePropRatio(TransInfo *t) td->factor = 1.0f; break; case PROP_SPHERE: - td->factor = (float)sqrt(2 * dist - dist * dist); + td->factor = sqrtf(2 * dist - dist * dist); break; case PROP_RANDOM: td->factor = BLI_frand() * dist; diff --git a/source/blender/editors/transform/transform_input.c b/source/blender/editors/transform/transform_input.c index 39c7b4b5c1c..02f9c636ab4 100644 --- a/source/blender/editors/transform/transform_input.c +++ b/source/blender/editors/transform/transform_input.c @@ -68,7 +68,7 @@ static void InputSpring(TransInfo *UNUSED(t), MouseInput *mi, const int mval[2], dx = (float)(mi->center[0] - mval[0]); dy = (float)(mi->center[1] - mval[1]); - precise_ratio = (float)sqrt(dx * dx + dy * dy); + precise_ratio = sqrtf(dx * dx + dy * dy); ratio = (ratio + (precise_ratio - ratio) / 10.0f) / mi->factor; } |