[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [43877] trunk/blender/source/blender: Code Cleanup: avoid double promotion.
Campbell Barton
ideasman42 at gmail.com
Sat Feb 4 07:55:41 CET 2012
Revision: 43877
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=43877
Author: campbellbarton
Date: 2012-02-04 06:55:29 +0000 (Sat, 04 Feb 2012)
Log Message:
-----------
Code Cleanup: avoid double promotion.
Modified Paths:
--------------
trunk/blender/source/blender/blenfont/intern/blf_glyph.c
trunk/blender/source/blender/blenkernel/intern/cloth.c
trunk/blender/source/blender/blenkernel/intern/constraint.c
trunk/blender/source/blender/blenkernel/intern/fcurve.c
trunk/blender/source/blender/blenkernel/intern/seqeffects.c
trunk/blender/source/blender/blenlib/intern/math_color.c
trunk/blender/source/blender/editors/interface/interface_draw.c
trunk/blender/source/blender/editors/physics/physics_fluid.c
trunk/blender/source/blender/editors/sculpt_paint/sculpt.c
trunk/blender/source/blender/editors/space_clip/clip_graph_ops.c
trunk/blender/source/blender/editors/space_sequencer/sequencer_scopes.c
trunk/blender/source/blender/editors/transform/transform.c
trunk/blender/source/blender/modifiers/intern/MOD_meshdeform.c
trunk/blender/source/blender/render/intern/source/occlusion.c
trunk/blender/source/blender/render/intern/source/zbuf.c
Modified: trunk/blender/source/blender/blenfont/intern/blf_glyph.c
===================================================================
--- trunk/blender/source/blender/blenfont/intern/blf_glyph.c 2012-02-04 01:51:59 UTC (rev 43876)
+++ trunk/blender/source/blender/blenfont/intern/blf_glyph.c 2012-02-04 06:55:29 UTC (rev 43877)
@@ -305,7 +305,7 @@
/* When a string is being rendered as individual glyphs (as in the game
* engine), the leading edge needs to be raised a fraction to prevent
* z-fighting for kerned characters. - z0r */
- float twist = (dx1 - dx) * 0.0002;
+ const float twist = (dx1 - dx) * 0.0002f;
glBegin(GL_QUADS);
glTexCoord2f(uv[0][0], uv[0][1]);
Modified: trunk/blender/source/blender/blenkernel/intern/cloth.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/cloth.c 2012-02-04 01:51:59 UTC (rev 43876)
+++ trunk/blender/source/blender/blenkernel/intern/cloth.c 2012-02-04 06:55:29 UTC (rev 43877)
@@ -1151,7 +1151,7 @@
spring->kl = MAX2(mface[i].v4, mface[i].v2);
spring->restlen = len_v3v3(cloth->verts[spring->kl].xrest, cloth->verts[spring->ij].xrest);
spring->type = CLOTH_SPRING_TYPE_SHEAR;
- spring->stiffness = (cloth->verts[spring->kl].shear_stiff + cloth->verts[spring->ij].shear_stiff) / 2.0;
+ spring->stiffness = (cloth->verts[spring->kl].shear_stiff + cloth->verts[spring->ij].shear_stiff) / 2.0f;
BLI_linklist_append ( &edgelist[spring->ij], spring );
BLI_linklist_append ( &edgelist[spring->kl], spring );
Modified: trunk/blender/source/blender/blenkernel/intern/constraint.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/constraint.c 2012-02-04 01:51:59 UTC (rev 43876)
+++ trunk/blender/source/blender/blenkernel/intern/constraint.c 2012-02-04 06:55:29 UTC (rev 43877)
@@ -492,7 +492,7 @@
copy_v3_v3(plane, tmat[1]);
cross_v3_v3v3(mat[0], normal, plane);
- if(len_v3(mat[0]) < 1e-3) {
+ if(len_v3(mat[0]) < 1e-3f) {
copy_v3_v3(plane, tmat[0]);
cross_v3_v3v3(mat[0], normal, plane);
}
@@ -1263,7 +1263,7 @@
/* If the curve is cyclic, enable looping around if the time is
* outside the bounds 0..1 */
if ((curvetime < 0.0f) || (curvetime > 1.0f)) {
- curvetime -= floor(curvetime);
+ curvetime -= floorf(curvetime);
}
}
else {
Modified: trunk/blender/source/blender/blenkernel/intern/fcurve.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/fcurve.c 2012-02-04 01:51:59 UTC (rev 43876)
+++ trunk/blender/source/blender/blenkernel/intern/fcurve.c 2012-02-04 06:55:29 UTC (rev 43877)
@@ -1987,7 +1987,7 @@
for (a=0; prevbezt && bezt && (a < fcu->totvert-1); a++, prevbezt=bezt, bezt++)
{
/* use if the key is directly on the frame, rare cases this is needed else we get 0.0 instead. */
- if(fabs(bezt->vec[1][0] - evaltime) < SMALL_NUMBER) {
+ if(fabsf(bezt->vec[1][0] - evaltime) < SMALL_NUMBER) {
cvalue= bezt->vec[1][1];
}
/* evaltime occurs within the interval defined by these two keyframes */
Modified: trunk/blender/source/blender/blenkernel/intern/seqeffects.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/seqeffects.c 2012-02-04 01:51:59 UTC (rev 43876)
+++ trunk/blender/source/blender/blenkernel/intern/seqeffects.c 2012-02-04 06:55:29 UTC (rev 43877)
@@ -1583,7 +1583,7 @@
static void precalc_wipe_zone(WipeZone *wipezone, WipeVars *wipe, int xo, int yo)
{
wipezone->flip = (wipe->angle < 0);
- wipezone->angle = tan(DEG2RAD(fabsf(wipe->angle)));
+ wipezone->angle = tanf(DEG2RADF(fabsf(wipe->angle)));
wipezone->xo = xo;
wipezone->yo = yo;
wipezone->width = (int)(wipe->edgeWidth*((xo+yo)/2.0f));
@@ -1602,9 +1602,9 @@
return (float)side;
if(side == 1)
- alpha = (dist+0.5*width) / (width);
+ alpha = (dist+0.5f*width) / (width);
else
- alpha = (0.5*width-dist) / (width);
+ alpha = (0.5f*width-dist) / (width);
if(dir == 0)
alpha = 1-alpha;
Modified: trunk/blender/source/blender/blenlib/intern/math_color.c
===================================================================
--- trunk/blender/source/blender/blenlib/intern/math_color.c 2012-02-04 01:51:59 UTC (rev 43876)
+++ trunk/blender/source/blender/blenlib/intern/math_color.c 2012-02-04 06:55:29 UTC (rev 43877)
@@ -561,7 +561,7 @@
for (i = 0; i < 0x10000; i++) {
float f = linearrgb_to_srgb(index_to_float(i))*255.0f;
if (f <= 0) BLI_color_to_srgb_table[i] = 0;
- else if (f < 255) BLI_color_to_srgb_table[i] = (unsigned short)(f*0x100+.5);
+ else if (f < 255) BLI_color_to_srgb_table[i] = (unsigned short)(f*0x100+0.5f);
else BLI_color_to_srgb_table[i] = 0xff00;
}
Modified: trunk/blender/source/blender/editors/interface/interface_draw.c
===================================================================
--- trunk/blender/source/blender/editors/interface/interface_draw.c 2012-02-04 01:51:59 UTC (rev 43876)
+++ trunk/blender/source/blender/editors/interface/interface_draw.c 2012-02-04 06:55:29 UTC (rev 43877)
@@ -1533,8 +1533,8 @@
zoomx= (float)width / (scopes->track_preview->x-2*margin);
zoomy= (float)height / (scopes->track_preview->y-2*margin);
- off_x= ((int)track_pos[0]-track_pos[0]+0.5)*zoomx;
- off_y= ((int)track_pos[1]-track_pos[1]+0.5)*zoomy;
+ off_x= ((int)track_pos[0]-track_pos[0]+0.5f)*zoomx;
+ off_y= ((int)track_pos[1]-track_pos[1]+0.5f)*zoomy;
drawibuf= scale_trackpreview_ibuf(scopes->track_preview, track_pos, width, height, margin);
Modified: trunk/blender/source/blender/editors/physics/physics_fluid.c
===================================================================
--- trunk/blender/source/blender/editors/physics/physics_fluid.c 2012-02-04 01:51:59 UTC (rev 43876)
+++ trunk/blender/source/blender/editors/physics/physics_fluid.c 2012-02-04 06:55:29 UTC (rev 43877)
@@ -109,7 +109,7 @@
return 2.0e-3;
case 1: /* manual */
default:
- return (1.0/pow(10.0, settings->viscosityExponent)) * settings->viscosityValue;
+ return (1.0f/powf(10.0f, settings->viscosityExponent)) * settings->viscosityValue;
}
}
Modified: trunk/blender/source/blender/editors/sculpt_paint/sculpt.c
===================================================================
--- trunk/blender/source/blender/editors/sculpt_paint/sculpt.c 2012-02-04 01:51:59 UTC (rev 43876)
+++ trunk/blender/source/blender/editors/sculpt_paint/sculpt.c 2012-02-04 06:55:29 UTC (rev 43877)
@@ -3153,7 +3153,7 @@
dx = cache->mouse[0] - cache->initial_mouse[0];
dy = cache->mouse[1] - cache->initial_mouse[1];
- cache->vertex_rotation = -atan2(dx, dy) * cache->bstrength;
+ cache->vertex_rotation = -atan2f(dx, dy) * cache->bstrength;
sd->draw_anchored = 1;
copy_v2_v2(sd->anchored_initial_mouse, cache->initial_mouse);
Modified: trunk/blender/source/blender/editors/space_clip/clip_graph_ops.c
===================================================================
--- trunk/blender/source/blender/editors/space_clip/clip_graph_ops.c 2012-02-04 01:51:59 UTC (rev 43876)
+++ trunk/blender/source/blender/editors/space_clip/clip_graph_ops.c 2012-02-04 06:55:29 UTC (rev 43877)
@@ -450,7 +450,7 @@
void ED_clip_graph_center_current_frame(Scene *scene, ARegion *ar)
{
View2D *v2d = &ar->v2d;
- float extra = (v2d->cur.xmax - v2d->cur.xmin) / 2.0;
+ float extra = (v2d->cur.xmax - v2d->cur.xmin) / 2.0f;
/* set extents of view to start/end frames */
v2d->cur.xmin = (float)CFRA - extra;
Modified: trunk/blender/source/blender/editors/space_sequencer/sequencer_scopes.c
===================================================================
--- trunk/blender/source/blender/editors/space_sequencer/sequencer_scopes.c 2012-02-04 01:51:59 UTC (rev 43876)
+++ trunk/blender/source/blender/editors/space_sequencer/sequencer_scopes.c 2012-02-04 06:55:29 UTC (rev 43877)
@@ -170,7 +170,7 @@
for (x = 0; x < ibuf->x; x++) {
unsigned char * rgb = src + 4 * (ibuf->x * y + x);
- float v = (float)rgb_to_luma_byte(rgb) / 255.0;
+ float v = (float)rgb_to_luma_byte(rgb) / 255.0f;
unsigned char * p = tgt;
p += 4 * (w * ((int) (v * (h - 3)) + 1) + x + 1);
Modified: trunk/blender/source/blender/editors/transform/transform.c
===================================================================
--- trunk/blender/source/blender/editors/transform/transform.c 2012-02-04 01:51:59 UTC (rev 43876)
+++ trunk/blender/source/blender/editors/transform/transform.c 2012-02-04 06:55:29 UTC (rev 43877)
@@ -5566,9 +5566,9 @@
/* apply snapping + frame->seconds conversions */
if (autosnap == SACTSNAP_STEP) {
if (doTime)
- val= floor((double)val/secf + 0.5f);
+ val= floorf((double)val/secf + 0.5f);
else
- val= floor(val + 0.5f);
+ val= floorf(val + 0.5f);
}
else {
if (doTime)
Modified: trunk/blender/source/blender/modifiers/intern/MOD_meshdeform.c
===================================================================
--- trunk/blender/source/blender/modifiers/intern/MOD_meshdeform.c 2012-02-04 01:51:59 UTC (rev 43876)
+++ trunk/blender/source/blender/modifiers/intern/MOD_meshdeform.c 2012-02-04 06:55:29 UTC (rev 43877)
@@ -298,7 +298,7 @@
fac= 1.0f - fac;
}
- if (fac <= 0.0) {
+ if (fac <= 0.0f) {
continue;
}
}
Modified: trunk/blender/source/blender/render/intern/source/occlusion.c
===================================================================
--- trunk/blender/source/blender/render/intern/source/occlusion.c 2012-02-04 01:51:59 UTC (rev 43876)
+++ trunk/blender/source/blender/render/intern/source/occlusion.c 2012-02-04 06:55:29 UTC (rev 43877)
@@ -1408,7 +1408,7 @@
occlusion= (1.0f-correction)*(1.0f-occ);
CLAMP(occlusion, 0.0f, 1.0f);
if(correction != 0.0f)
- occlusion += correction*exp(-occ);
+ occlusion += correction*expf(-occ);
if(env) {
/* sky shading using bent normal */
Modified: trunk/blender/source/blender/render/intern/source/zbuf.c
===================================================================
--- trunk/blender/source/blender/render/intern/source/zbuf.c 2012-02-04 01:51:59 UTC (rev 43876)
+++ trunk/blender/source/blender/render/intern/source/zbuf.c 2012-02-04 06:55:29 UTC (rev 43877)
@@ -245,7 +245,7 @@
/* if we set clip flags, the clipping should be at least larger than epsilon.
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list