[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [35836] trunk/blender/source/blender/ blenkernel/intern: blenkernel: floats were being implicitly promoted to doubles, adjust to use floats.
Campbell Barton
ideasman42 at gmail.com
Mon Mar 28 06:22:51 CEST 2011
Revision: 35836
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=35836
Author: campbellbarton
Date: 2011-03-28 04:22:50 +0000 (Mon, 28 Mar 2011)
Log Message:
-----------
blenkernel: floats were being implicitly promoted to doubles, adjust to use floats.
Modified Paths:
--------------
trunk/blender/source/blender/blenkernel/intern/armature.c
trunk/blender/source/blender/blenkernel/intern/brush.c
trunk/blender/source/blender/blenkernel/intern/bvhutils.c
trunk/blender/source/blender/blenkernel/intern/colortools.c
trunk/blender/source/blender/blenkernel/intern/curve.c
trunk/blender/source/blender/blenkernel/intern/displist.c
trunk/blender/source/blender/blenkernel/intern/fcurve.c
trunk/blender/source/blender/blenkernel/intern/image_gen.c
trunk/blender/source/blender/blenkernel/intern/key.c
trunk/blender/source/blender/blenkernel/intern/material.c
trunk/blender/source/blender/blenkernel/intern/mball.c
trunk/blender/source/blender/blenkernel/intern/mesh.c
trunk/blender/source/blender/blenkernel/intern/nla.c
trunk/blender/source/blender/blenkernel/intern/texture.c
Modified: trunk/blender/source/blender/blenkernel/intern/armature.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/armature.c 2011-03-28 02:34:55 UTC (rev 35835)
+++ trunk/blender/source/blender/blenkernel/intern/armature.c 2011-03-28 04:22:50 UTC (rev 35836)
@@ -438,7 +438,7 @@
scale[1]= len_v3(pchan->pose_mat[1]);
scale[2]= len_v3(pchan->pose_mat[2]);
- if(fabs(scale[0] - scale[1]) > 1e-6f || fabs(scale[1] - scale[2]) > 1e-6f) {
+ if(fabsf(scale[0] - scale[1]) > 1e-6f || fabsf(scale[1] - scale[2]) > 1e-6f) {
unit_m4(scalemat);
scalemat[0][0]= scale[0];
scalemat[1][1]= scale[1];
@@ -734,11 +734,11 @@
fac= distfactor_to_bone(cop, bone->arm_head, bone->arm_tail, bone->rad_head, bone->rad_tail, bone->dist);
- if (fac>0.0) {
+ if (fac > 0.0f) {
fac*=bone->weight;
contrib= fac;
- if(contrib>0.0) {
+ if(contrib > 0.0f) {
if(vec) {
if(bone->segments>1)
// applies on cop and bbonemat
@@ -1277,7 +1277,7 @@
}
/* when converting to axis-angle, we need a special exception for the case when there is no axis */
- if (IS_EQ(axis[0], axis[1]) && IS_EQ(axis[1], axis[2])) {
+ if (IS_EQF(axis[0], axis[1]) && IS_EQF(axis[1], axis[2])) {
/* for now, rotate around y-axis then (so that it simply becomes the roll) */
axis[1]= 1.0f;
}
@@ -1336,7 +1336,7 @@
/* was 0.0000000000001, caused bug [#23954], smaller values give unstable
* roll when toggling editmode */
- if (dot_v3v3(axis,axis) > 0.00001) {
+ if (dot_v3v3(axis,axis) > 0.00001f) {
/* if nor is *not* a multiple of target ... */
normalize_v3(axis);
@@ -1379,7 +1379,7 @@
bone->length= len_v3v3(bone->head, bone->tail);
/* this is called on old file reading too... */
- if(bone->xwidth==0.0) {
+ if(bone->xwidth==0.0f) {
bone->xwidth= 0.1f;
bone->zwidth= 0.1f;
bone->segments= 1;
@@ -1970,12 +1970,12 @@
/* calculate volume preservation factor which is
* basically the inverse of the y-scaling factor
*/
- if (fabs(scaleFac) != 0.0f) {
- scale= 1.0 / fabs(scaleFac);
+ if (fabsf(scaleFac) != 0.0f) {
+ scale= 1.0f / fabsf(scaleFac);
/* we need to clamp this within sensible values */
// NOTE: these should be fine for now, but should get sanitised in future
- scale= MIN2(MAX2(scale, 0.0001) , 100000);
+ CLAMP(scale, 0.0001f, 100000.0f);
}
else
scale= 1.0f;
Modified: trunk/blender/source/blender/blenkernel/intern/brush.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/brush.c 2011-03-28 02:34:55 UTC (rev 35835)
+++ trunk/blender/source/blender/blenkernel/intern/brush.c 2011-03-28 04:22:50 UTC (rev 35836)
@@ -912,13 +912,13 @@
static void brush_apply_pressure(BrushPainter *painter, Brush *brush, float pressure)
{
if (brush_use_alpha_pressure(brush))
- brush_set_alpha(brush, MAX2(0.0, painter->startalpha*pressure));
+ brush_set_alpha(brush, MAX2(0.0f, painter->startalpha*pressure));
if (brush_use_size_pressure(brush))
- brush_set_size(brush, MAX2(1.0, painter->startsize*pressure));
+ brush_set_size(brush, MAX2(1.0f, painter->startsize*pressure));
if (brush->flag & BRUSH_JITTER_PRESSURE)
- brush->jitter = MAX2(0.0, painter->startjitter*pressure);
+ brush->jitter = MAX2(0.0f, painter->startjitter*pressure);
if (brush->flag & BRUSH_SPACING_PRESSURE)
- brush->spacing = MAX2(1.0, painter->startspacing*(1.5f-pressure));
+ brush->spacing = MAX2(1.0f, painter->startspacing*(1.5f-pressure));
}
void brush_jitter_pos(Brush *brush, float *pos, float *jitterpos)
@@ -1075,7 +1075,7 @@
else
painter->accumtime -= painttime;
- while (painter->accumtime >= brush->rate) {
+ while (painter->accumtime >= (double)brush->rate) {
brush_apply_pressure(painter, brush, pressure);
brush_jitter_pos(brush, pos, finalpos);
@@ -1085,7 +1085,7 @@
totpaintops +=
func(user, painter->cache.ibuf, painter->lastmousepos, finalpos);
- painter->accumtime -= brush->rate;
+ painter->accumtime -= (double)brush->rate;
}
painter->lasttime= curtime;
@@ -1111,7 +1111,7 @@
else p= p/len;
p= curvemapping_evaluateF(br->curve, 0, p);
- if(p < 0.0) p= 0.0f;
+ if(p < 0.0f) p= 0.0f;
else if(p > 1.0f) p= 1.0f;
return p;
}
@@ -1158,10 +1158,10 @@
* if the texture didn't give an RGB value, copy the intensity across
*/
if(hasrgb & TEX_RGB)
- texres.tin = (0.35 * texres.tr + 0.45 *
- texres.tg + 0.2 * texres.tb);
+ texres.tin = (0.35f * texres.tr + 0.45f *
+ texres.tg + 0.2f * texres.tb);
- texres.tin = texres.tin * 255.0;
+ texres.tin = texres.tin * 255.0f;
((char*)texcache)[(iy*side+ix)*4] = (char)texres.tin;
((char*)texcache)[(iy*side+ix)*4+1] = (char)texres.tin;
((char*)texcache)[(iy*side+ix)*4+2] = (char)texres.tin;
Modified: trunk/blender/source/blender/blenkernel/intern/bvhutils.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/bvhutils.c 2011-03-28 02:34:55 UTC (rev 35835)
+++ trunk/blender/source/blender/blenkernel/intern/bvhutils.c 2011-03-28 04:22:50 UTC (rev 35836)
@@ -131,7 +131,7 @@
}
else
{
- if(fabs(A00) > FLT_EPSILON)
+ if(fabsf(A00) > FLT_EPSILON)
S = -B0/A00;
else
S = 0.0f;
@@ -156,7 +156,7 @@
}
else
{
- if(fabs(A11) > FLT_EPSILON)
+ if(fabsf(A11) > FLT_EPSILON)
T = -B1 / A11;
else
T = 0.0f;
@@ -182,7 +182,7 @@
}
else
{
- if(fabs(A11) > FLT_EPSILON)
+ if(fabsf(A11) > FLT_EPSILON)
T = -B1 / A11;
else
T = 0.0;
@@ -208,7 +208,7 @@
}
else
{
- if(fabs(A00) > FLT_EPSILON)
+ if(fabsf(A00) > FLT_EPSILON)
S = -B0 / A00;
else
S = 0.0f;
@@ -220,7 +220,7 @@
{
// Minimum at interior lv
float invDet;
- if(fabs(Det) > FLT_EPSILON)
+ if(fabsf(Det) > FLT_EPSILON)
invDet = 1.0f / Det;
else
invDet = 0.0f;
@@ -251,7 +251,7 @@
}
else
{
- if(fabs(denom) > FLT_EPSILON)
+ if(fabsf(denom) > FLT_EPSILON)
S = numer / denom;
else
S = 0.0f;
@@ -278,7 +278,7 @@
}
else
{
- if(fabs(A11) > FLT_EPSILON)
+ if(fabsf(A11) > FLT_EPSILON)
T = -B1 / A11;
else
T = 0.0f;
@@ -304,7 +304,7 @@
}
else
{
- if(fabs(denom) > FLT_EPSILON)
+ if(fabsf(denom) > FLT_EPSILON)
T = numer / denom;
else
T = 0.0f;
@@ -331,7 +331,7 @@
}
else
{
- if(fabs(A00) > FLT_EPSILON)
+ if(fabsf(A00) > FLT_EPSILON)
S = -B0 / A00;
else
S = 0.0f;
@@ -362,7 +362,7 @@
}
else
{
- if(fabs(denom) > FLT_EPSILON)
+ if(fabsf(denom) > FLT_EPSILON)
S = numer / denom;
else
S = 0.0f;
Modified: trunk/blender/source/blender/blenkernel/intern/colortools.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/colortools.c 2011-03-28 02:34:55 UTC (rev 35835)
+++ trunk/blender/source/blender/blenkernel/intern/colortools.c 2011-03-28 04:22:50 UTC (rev 35836)
@@ -421,14 +421,14 @@
}
if(bezt->h1==HD_VECT) { /* vector */
- dx/=3.0;
- dy/=3.0;
+ dx/=3.0f;
+ dy/=3.0f;
*(p2-3)= *p2-dx;
*(p2-2)= *(p2+1)-dy;
}
if(bezt->h2==HD_VECT) {
- dx1/=3.0;
- dy1/=3.0;
+ dx1/=3.0f;
+ dy1/=3.0f;
*(p2+3)= *p2+dx1;
*(p2+4)= *(p2+1)+dy1;
}
@@ -700,7 +700,7 @@
for(a=0; a<cuma->totpoint-1; a++) {
dx= cmp[a].x - cmp[a+1].x;
dy= cmp[a].y - cmp[a+1].y;
- if( sqrt(dx*dx + dy*dy) < thresh ) {
+ if( sqrtf(dx*dx + dy*dy) < thresh ) {
if(a==0) {
cmp[a+1].flag|= 2;
if(cmp[a+1].flag & CUMA_SELECT)
@@ -962,7 +962,7 @@
DO_INLINE int get_bin_float(float f)
{
- int bin= (int)((f*255) + 0.5); /* 0.5 to prevent quantisation differences */
+ int bin= (int)((f*255.0f) + 0.5f); /* 0.5 to prevent quantisation differences */
/* note: clamp integer instead of float to avoid problems with NaN */
CLAMP(bin, 0, 255);
@@ -1054,7 +1054,7 @@
bin_lum = MEM_callocN(256 * sizeof(unsigned int), "temp historgram bins");
/* convert to number of lines with logarithmic scale */
- scopes->sample_lines = (scopes->accuracy*0.01) * (scopes->accuracy*0.01) * ibuf->y;
+ scopes->sample_lines = (scopes->accuracy*0.01f) * (scopes->accuracy*0.01f) * ibuf->y;
if (scopes->sample_full)
scopes->sample_lines = ibuf->y;
@@ -1105,7 +1105,7 @@
}
/* we still need luma for histogram */
- luma = 0.299*rgb[0] + 0.587*rgb[1] + 0.114 * rgb[2];
+ luma = 0.299f * rgb[0] + 0.587f * rgb[1] + 0.114f * rgb[2];
/* check for min max */
if(ycc_mode == -1 ) {
@@ -1155,8 +1155,8 @@
if (bin_lum[x] > nl)
nl = bin_lum[x];
}
- div = 1.f/(double)n;
- divl = 1.f/(double)nl;
+ div = 1.0/(double)n;
+ divl = 1.0/(double)nl;
for (x=0; x<256; x++) {
scopes->hist.data_r[x] = bin_r[x] * div;
scopes->hist.data_g[x] = bin_g[x] * div;
Modified: trunk/blender/source/blender/blenkernel/intern/curve.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/curve.c 2011-03-28 02:34:55 UTC (rev 35835)
+++ trunk/blender/source/blender/blenkernel/intern/curve.c 2011-03-28 04:22:50 UTC (rev 35836)
@@ -333,19 +333,19 @@
cu->size[1]= (max[1]-min[1])/2.0f;
cu->size[2]= (max[2]-min[2])/2.0f;
- cu->rot[0]= cu->rot[1]= cu->rot[2]= 0.0;
+ cu->rot[0]= cu->rot[1]= cu->rot[2]= 0.0f;
- if(cu->size[0]==0.0) cu->size[0]= 1.0;
- else if(cu->size[0]>0.0 && cu->size[0]<0.00001) cu->size[0]= 0.00001;
- else if(cu->size[0]<0.0 && cu->size[0]> -0.00001) cu->size[0]= -0.00001;
+ if(cu->size[0]==0.0f) cu->size[0]= 1.0f;
+ else if(cu->size[0]>0.0f && cu->size[0]<0.00001f) cu->size[0]= 0.00001f;
+ else if(cu->size[0]<0.0f && cu->size[0]> -0.00001f) cu->size[0]= -0.00001f;
- if(cu->size[1]==0.0) cu->size[1]= 1.0;
- else if(cu->size[1]>0.0 && cu->size[1]<0.00001) cu->size[1]= 0.00001;
- else if(cu->size[1]<0.0 && cu->size[1]> -0.00001) cu->size[1]= -0.00001;
+ if(cu->size[1]==0.0f) cu->size[1]= 1.0f;
+ else if(cu->size[1]>0.0f && cu->size[1]<0.00001f) cu->size[1]= 0.00001f;
+ else if(cu->size[1]<0.0f && cu->size[1]> -0.00001f) cu->size[1]= -0.00001f;
- if(cu->size[2]==0.0) cu->size[2]= 1.0;
- else if(cu->size[2]>0.0 && cu->size[2]<0.00001) cu->size[2]= 0.00001;
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list