[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [35820] trunk/blender/source/blender: object/paint/misc-files: floats were being implicitly promoted to doubles, adjust to use floats.
Campbell Barton
ideasman42 at gmail.com
Sun Mar 27 16:59:55 CEST 2011
Revision: 35820
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=35820
Author: campbellbarton
Date: 2011-03-27 14:59:55 +0000 (Sun, 27 Mar 2011)
Log Message:
-----------
object/paint/misc-files: floats were being implicitly promoted to doubles, adjust to use floats.
- also UV angle stretching was using radians->deg which wasn't needed.
Modified Paths:
--------------
trunk/blender/source/blender/blenkernel/intern/constraint.c
trunk/blender/source/blender/blenlib/intern/math_base_inline.c
trunk/blender/source/blender/blenlib/intern/math_vector_inline.c
trunk/blender/source/blender/editors/animation/keyframing.c
trunk/blender/source/blender/editors/armature/poselib.c
trunk/blender/source/blender/editors/curve/editcurve.c
trunk/blender/source/blender/editors/gpencil/drawgpencil.c
trunk/blender/source/blender/editors/metaball/mball_edit.c
trunk/blender/source/blender/editors/object/object_edit.c
trunk/blender/source/blender/editors/object/object_transform.c
trunk/blender/source/blender/editors/object/object_vgroup.c
trunk/blender/source/blender/editors/screen/glutil.c
trunk/blender/source/blender/editors/screen/screen_ops.c
trunk/blender/source/blender/editors/sculpt_paint/paint_image.c
trunk/blender/source/blender/editors/sculpt_paint/paint_ops.c
trunk/blender/source/blender/editors/sculpt_paint/paint_stroke.c
trunk/blender/source/blender/editors/sculpt_paint/paint_utils.c
trunk/blender/source/blender/editors/sculpt_paint/paint_vertex.c
trunk/blender/source/blender/editors/sculpt_paint/sculpt.c
trunk/blender/source/blender/editors/space_image/image_draw.c
trunk/blender/source/blender/editors/space_image/image_ops.c
trunk/blender/source/blender/editors/space_sequencer/sequencer_edit.c
trunk/blender/source/blender/editors/space_time/space_time.c
trunk/blender/source/blender/editors/space_view3d/drawarmature.c
trunk/blender/source/blender/editors/uvedit/uvedit_draw.c
Modified: trunk/blender/source/blender/blenkernel/intern/constraint.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/constraint.c 2011-03-27 14:52:16 UTC (rev 35819)
+++ trunk/blender/source/blender/blenkernel/intern/constraint.c 2011-03-27 14:59:55 UTC (rev 35820)
@@ -621,7 +621,7 @@
* PoseChannel by the Armature Object's Matrix to get a worldspace
* matrix.
*/
- if (headtail < 0.000001) {
+ if (headtail < 0.000001f) {
/* skip length interpolation if set to head */
mul_m4_m4m4(mat, pchan->pose_mat, ob->obmat);
}
@@ -994,10 +994,10 @@
float neg = -1;
int right_index;
- if (normalize_v3_v3(n, vec) == 0.0) {
- n[0] = 0.0;
- n[1] = 0.0;
- n[2] = 1.0;
+ if (normalize_v3_v3(n, vec) == 0.0f) {
+ n[0] = 0.0f;
+ n[1] = 0.0f;
+ n[2] = 1.0f;
}
if (axis > 2) axis -= 3;
else negate_v3(n);
@@ -1019,10 +1019,10 @@
sub_v3_v3v3(proj, u, proj); /* then onto the plane */
/* proj specifies the transformation of the up axis */
- if (normalize_v3(proj) == 0.0) { /* degenerate projection */
- proj[0] = 0.0;
- proj[1] = 1.0;
- proj[2] = 0.0;
+ if (normalize_v3(proj) == 0.0f) { /* degenerate projection */
+ proj[0] = 0.0f;
+ proj[1] = 1.0f;
+ proj[2] = 0.0f;
}
/* Normalized cross product of n and proj specifies transformation of the right axis */
@@ -1278,7 +1278,7 @@
* factor, which then gets clamped to lie within 0.0 - 1.0 range
*/
curvetime /= cu->pathlen;
- CLAMP(curvetime, 0.0, 1.0);
+ CLAMP(curvetime, 0.0f, 1.0f);
}
else {
/* fixed position along curve */
@@ -1925,7 +1925,7 @@
/* calculate normalising scale factor for non-essential values */
if (obsize[data->flag] != 0)
- fac = sqrt(volume / obsize[data->flag]) / obsize[data->flag];
+ fac = sqrtf(volume / obsize[data->flag]) / obsize[data->flag];
/* apply scaling factor to the channels not being kept */
switch (data->flag) {
@@ -2176,9 +2176,7 @@
if (data->type < 10) {
/* extract rotation (is in whatever space target should be in) */
mat4_to_eul(vec, tempmat);
- vec[0] *= (float)(180.0/M_PI);
- vec[1] *= (float)(180.0/M_PI);
- vec[2] *= (float)(180.0/M_PI);
+ mul_v3_fl(vec, (float)(180.0/M_PI)); /* rad -> deg */
axis= data->type;
}
else if (data->type < 20) {
@@ -2669,7 +2667,7 @@
else if (data->flag & LIMITDIST_USESOFT) {
// FIXME: there's a problem with "jumping" when this kicks in
if (dist >= (data->dist - data->soft)) {
- sfac = (float)( data->soft*(1.0 - exp(-(dist - data->dist)/data->soft)) + data->dist );
+ sfac = (float)( data->soft*(1.0f - expf(-(dist - data->dist)/data->soft)) + data->dist );
sfac /= dist;
clamp_surf= 1;
@@ -2677,7 +2675,7 @@
}
}
else {
- if (IS_EQ(dist, data->dist)==0) {
+ if (IS_EQF(dist, data->dist)==0) {
clamp_surf= 1;
sfac= data->dist / dist;
}
@@ -3336,8 +3334,7 @@
break;
case 1: /* rotation (convert to degrees first) */
mat4_to_eulO(dvec, cob->rotOrder, ct->matrix);
- for (i=0; i<3; i++)
- dvec[i] = (float)(dvec[i] / M_PI * 180);
+ mul_v3_fl(dvec, (float)(180.0/M_PI)); /* rad -> deg */
break;
default: /* location */
copy_v3_v3(dvec, ct->matrix[3]);
@@ -3387,7 +3384,7 @@
eul[i]= tmin + (sval[(int)data->map[i]] * (tmax - tmin));
/* now convert final value back to radians */
- eul[i] = (float)(eul[i] / 180 * M_PI);
+ eul[i] = DEG2RADF(eul[i]);
}
break;
default: /* location */
@@ -4515,7 +4512,7 @@
* but all are guaranteed to end up in good "worldspace" result
*/
/* Note: all kind of stuff here before (caused trouble), much easier to just interpolate, or did I miss something? -jahka */
- if (enf < 1.0) {
+ if (enf < 1.0f) {
float solution[4][4];
copy_m4_m4(solution, cob->matrix);
blend_m4_m4m4(cob->matrix, oldmat, solution, enf);
Modified: trunk/blender/source/blender/blenlib/intern/math_base_inline.c
===================================================================
--- trunk/blender/source/blender/blenlib/intern/math_base_inline.c 2011-03-27 14:52:16 UTC (rev 35819)
+++ trunk/blender/source/blender/blenlib/intern/math_base_inline.c 2011-03-27 14:59:55 UTC (rev 35820)
@@ -45,7 +45,7 @@
MINLINE float sqrt3f(float f)
{
- if(f==0.0) return 0;
+ if(f==0.0f) return 0.0f;
if(f<0) return (float)(-exp(log(-f)/3));
else return (float)(exp(log(f)/3));
}
@@ -73,7 +73,7 @@
MINLINE float sasqrt(float fac)
{
- if(fac<=0.0) return 0.0;
+ if(fac<=0.0f) return 0.0f;
return (float)sqrt(fac);
}
@@ -93,7 +93,7 @@
MINLINE float sasqrtf(float fac)
{
- if(fac<=0.0) return 0.0;
+ if(fac<=0.0f) return 0.0f;
return (float)sqrtf(fac);
}
@@ -108,7 +108,7 @@
* the distance gets very high, 180d would be inf, but this case isn't valid */
MINLINE float shell_angle_to_dist(const float angle)
{
- return (angle < SMALL_NUMBER) ? 1.0f : fabsf(1.0f / cosf(angle));
+ return (angle < (float)SMALL_NUMBER) ? 1.0f : fabsf(1.0f / cosf(angle));
}
/* used for zoom values*/
Modified: trunk/blender/source/blender/blenlib/intern/math_vector_inline.c
===================================================================
--- trunk/blender/source/blender/blenlib/intern/math_vector_inline.c 2011-03-27 14:52:16 UTC (rev 35819)
+++ trunk/blender/source/blender/blenlib/intern/math_vector_inline.c 2011-03-27 14:59:55 UTC (rev 35820)
@@ -472,9 +472,9 @@
MINLINE int compare_v3v3(const float *v1, const float *v2, const float limit)
{
- if(fabs(v1[0]-v2[0])<limit)
- if(fabs(v1[1]-v2[1])<limit)
- if(fabs(v1[2]-v2[2])<limit)
+ if(fabsf(v1[0]-v2[0])<limit)
+ if(fabsf(v1[1]-v2[1])<limit)
+ if(fabsf(v1[2]-v2[2])<limit)
return 1;
return 0;
@@ -493,10 +493,10 @@
MINLINE int compare_v4v4(const float *v1, const float *v2, const float limit)
{
- if(fabs(v1[0]-v2[0])<limit)
- if(fabs(v1[1]-v2[1])<limit)
- if(fabs(v1[2]-v2[2])<limit)
- if(fabs(v1[3]-v2[3])<limit)
+ if(fabsf(v1[0]-v2[0])<limit)
+ if(fabsf(v1[1]-v2[1])<limit)
+ if(fabsf(v1[2]-v2[2])<limit)
+ if(fabsf(v1[3]-v2[3])<limit)
return 1;
return 0;
Modified: trunk/blender/source/blender/editors/animation/keyframing.c
===================================================================
--- trunk/blender/source/blender/editors/animation/keyframing.c 2011-03-27 14:52:16 UTC (rev 35819)
+++ trunk/blender/source/blender/editors/animation/keyframing.c 2011-03-27 14:59:55 UTC (rev 35820)
@@ -403,14 +403,14 @@
prevVal= prev->vec[1][1];
/* keyframe to be added at point where there are already two similar points? */
- if (IS_EQ(prevPosi, cFrame) && IS_EQ(beztPosi, cFrame) && IS_EQ(beztPosi, prevPosi)) {
+ if (IS_EQF(prevPosi, cFrame) && IS_EQF(beztPosi, cFrame) && IS_EQF(beztPosi, prevPosi)) {
return KEYNEEDED_DONTADD;
}
/* keyframe between prev+current points ? */
if ((prevPosi <= cFrame) && (cFrame <= beztPosi)) {
/* is the value of keyframe to be added the same as keyframes on either side ? */
- if (IS_EQ(prevVal, nValue) && IS_EQ(beztVal, nValue) && IS_EQ(prevVal, beztVal)) {
+ if (IS_EQF(prevVal, nValue) && IS_EQF(beztVal, nValue) && IS_EQF(prevVal, beztVal)) {
return KEYNEEDED_DONTADD;
}
else {
@@ -420,7 +420,7 @@
realVal= evaluate_fcurve(fcu, cFrame);
/* compare whether it's the same as proposed */
- if (IS_EQ(realVal, nValue))
+ if (IS_EQF(realVal, nValue))
return KEYNEEDED_DONTADD;
else
return KEYNEEDED_JUSTADD;
@@ -433,7 +433,7 @@
* stays around or not depends on whether the values of previous/current
* beztriples and new keyframe are the same.
*/
- if (IS_EQ(prevVal, nValue) && IS_EQ(beztVal, nValue) && IS_EQ(prevVal, beztVal))
+ if (IS_EQF(prevVal, nValue) && IS_EQF(beztVal, nValue) && IS_EQF(prevVal, beztVal))
return KEYNEEDED_DELNEXT;
else
return KEYNEEDED_JUSTADD;
@@ -471,7 +471,7 @@
else
valB= bezt->vec[1][1] + 1.0f;
- if (IS_EQ(valA, nValue) && IS_EQ(valA, valB))
+ if (IS_EQF(valA, nValue) && IS_EQF(valA, valB))
return KEYNEEDED_DELPREV;
else
return KEYNEEDED_JUSTADD;
Modified: trunk/blender/source/blender/editors/armature/poselib.c
===================================================================
--- trunk/blender/source/blender/editors/armature/poselib.c 2011-03-27 14:52:16 UTC (rev 35819)
+++ trunk/blender/source/blender/editors/armature/poselib.c 2011-03-27 14:59:55 UTC (rev 35820)
@@ -298,7 +298,7 @@
/* check if any pose matches this */
// TODO: don't go looking through the list like this every time...
for (marker= act->markers.first; marker; marker= marker->next) {
- if (IS_EQ(marker->frame, ak->cfra)) {
+ if (IS_EQ(marker->frame, (double)ak->cfra)) {
marker->flag = -1;
break;
}
Modified: trunk/blender/source/blender/editors/curve/editcurve.c
===================================================================
--- trunk/blender/source/blender/editors/curve/editcurve.c 2011-03-27 14:52:16 UTC (rev 35819)
+++ trunk/blender/source/blender/editors/curve/editcurve.c 2011-03-27 14:59:55 UTC (rev 35820)
@@ -2167,8 +2167,8 @@
if(bezt->f2 & SELECT) {
for(i=0; i<3; i++) {
val = bezt->vec[1][i];
- newval = ((beztOrig+(a-1))->vec[1][i] * 0.5) + ((beztOrig+(a+1))->vec[1][i] * 0.5);
- offset = (val*((1.0/6.0)*5)) + (newval*(1.0/6.0)) - val;
+ newval = ((beztOrig+(a-1))->vec[1][i] * 0.5f) + ((beztOrig+(a+1))->vec[1][i] * 0.5f);
+ offset = (val*((1.0f/6.0f)*5.0f)) + (newval*(1.0f/6.0f)) - val;
/* offset handles */
bezt->vec[1][i] += offset;
bezt->vec[0][i] += offset;
@@ -2187,8 +2187,8 @@
if(bp->f1 & SELECT) {
for(i=0; i<3; i++) {
val = bp->vec[i];
- newval = ((bpOrig+(a-1))->vec[i] * 0.5) + ((bpOrig+(a+1))->vec[i] * 0.5);
- offset = (val*((1.0/6.0)*5)) + (newval*(1.0/6.0)) - val;
+ newval = ((bpOrig+(a-1))->vec[i] * 0.5f) + ((bpOrig+(a+1))->vec[i] * 0.5f);
+ offset = (val*((1.0f/6.0f)*5.0f)) + (newval*(1.0f/6.0f)) - val;
bp->vec[i] += offset;
}
@@ -2272,9 +2272,9 @@
if (start_sel>0) start_rad = (nu->bezt+start_sel-1)->radius;
if (end_sel!=-1 && end_sel < nu->pntsu) end_rad = (nu->bezt+start_sel+1)->radius;
- if (start_rad >= 0.0 && end_rad >= 0.0) (nu->bezt+start_sel)->radius = (start_rad + end_rad)/2;
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list