[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [35824] trunk/blender/source/blender: subsurf, derived mesh and other misc files: floats were being implicitly promoted to doubles, adjust to use floats.
Campbell Barton
ideasman42 at gmail.com
Sun Mar 27 19:22:04 CEST 2011
Revision: 35824
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=35824
Author: campbellbarton
Date: 2011-03-27 17:22:04 +0000 (Sun, 27 Mar 2011)
Log Message:
-----------
subsurf, derived mesh and other misc files: floats were being implicitly promoted to doubles, adjust to use floats.
Modified Paths:
--------------
trunk/blender/source/blender/blenkernel/intern/CCGSubSurf.c
trunk/blender/source/blender/blenkernel/intern/DerivedMesh.c
trunk/blender/source/blender/blenkernel/intern/anim.c
trunk/blender/source/blender/blenkernel/intern/anim_sys.c
trunk/blender/source/blender/blenkernel/intern/lattice.c
trunk/blender/source/blender/blenkernel/intern/object.c
trunk/blender/source/blender/editors/animation/anim_draw.c
trunk/blender/source/blender/editors/animation/fmodifier_ui.c
trunk/blender/source/blender/editors/animation/keyframes_draw.c
trunk/blender/source/blender/editors/animation/keyframes_edit.c
trunk/blender/source/blender/editors/armature/editarmature.c
trunk/blender/source/blender/editors/gpencil/drawgpencil.c
trunk/blender/source/blender/editors/screen/area.c
trunk/blender/source/blender/editors/screen/screen_edit.c
trunk/blender/source/blender/editors/sculpt_paint/sculpt.c
trunk/blender/source/blender/editors/space_file/file_draw.c
trunk/blender/source/blender/editors/space_file/filesel.c
trunk/blender/source/blender/editors/space_graph/graph_edit.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_image/space_image.c
trunk/blender/source/blender/editors/space_info/info_ops.c
trunk/blender/source/blender/editors/space_nla/nla_draw.c
trunk/blender/source/blender/editors/space_sequencer/sequencer_edit.c
trunk/blender/source/blender/editors/space_text/text_draw.c
trunk/blender/source/blender/editors/util/ed_util.c
trunk/blender/source/blender/makesrna/intern/rna_access.c
trunk/blender/source/blender/windowmanager/intern/wm_operators.c
trunk/blender/source/blender/windowmanager/intern/wm_subwindow.c
Modified: trunk/blender/source/blender/blenkernel/intern/CCGSubSurf.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/CCGSubSurf.c 2011-03-27 17:12:59 UTC (rev 35823)
+++ trunk/blender/source/blender/blenkernel/intern/CCGSubSurf.c 2011-03-27 17:22:04 UTC (rev 35824)
@@ -229,9 +229,9 @@
#define VertDataAvg4(tv, av, bv, cv, dv) \
{ \
float *_t = (float*) tv, *_a = (float*) av, *_b = (float*) bv, *_c = (float*) cv, *_d = (float*) dv; \
- _t[0] = (_a[0]+_b[0]+_c[0]+_d[0])*.25; \
- _t[1] = (_a[1]+_b[1]+_c[1]+_d[1])*.25; \
- _t[2] = (_a[2]+_b[2]+_c[2]+_d[2])*.25; \
+ _t[0] = (_a[0]+_b[0]+_c[0]+_d[0])*.25f; \
+ _t[1] = (_a[1]+_b[1]+_c[1]+_d[1])*.25f; \
+ _t[2] = (_a[2]+_b[2]+_c[2]+_d[2])*.25f; \
}
#define NormZero(av) { float *_a = (float*) av; _a[0] = _a[1] = _a[2] = 0.0f; }
#define NormCopy(av, bv) { float *_a = (float*) av, *_b = (float*) bv; _a[0] =_b[0]; _a[1] =_b[1]; _a[2] =_b[2]; }
@@ -507,9 +507,9 @@
if (!lvl)
return e->crease;
else if (!e->crease)
- return 0.0;
- else if (e->crease - lvl < 0.0)
- return 0.0;
+ return 0.0f;
+ else if (e->crease - lvl < 0.0f)
+ return 0.0f;
else
return e->crease - lvl;
}
@@ -1447,7 +1447,7 @@
float sharpness = EDGE_getSharpness(e, curLvl);
int x, j;
- if (_edge_isBoundary(e) || sharpness>1.0) {
+ if (_edge_isBoundary(e) || sharpness > 1.0f) {
for (x=0; x<edgeSize-1; x++) {
int fx = x*2 + 1;
void *co0 = EDGE_getCo(e, curLvl, x+0);
@@ -1456,7 +1456,7 @@
VertDataCopy(co, co0);
VertDataAdd(co, co1);
- VertDataMulN(co, 0.5);
+ VertDataMulN(co, 0.5f);
}
} else {
for (x=0; x<edgeSize-1; x++) {
@@ -1479,7 +1479,7 @@
VertDataCopy(r, co0);
VertDataAdd(r, co1);
- VertDataMulN(r, 0.5);
+ VertDataMulN(r, 0.5f);
VertDataCopy(co, q);
VertDataSub(r, q);
@@ -1519,8 +1519,8 @@
if(sharpCount) {
avgSharpness /= sharpCount;
- if (avgSharpness>1.0) {
- avgSharpness = 1.0;
+ if (avgSharpness > 1.0f) {
+ avgSharpness = 1.0f;
}
}
@@ -1542,7 +1542,7 @@
}
VertDataCopy(nCo, co);
- VertDataMulN(nCo, 0.75);
+ VertDataMulN(nCo, 0.75f);
VertDataMulN(r, 0.25f/numBoundary);
VertDataAdd(nCo, r);
} else {
@@ -1587,7 +1587,7 @@
if (seam) {
if (_edge_isBoundary(e))
VertDataAdd(q, _edge_getCoVert(e, v, curLvl, 1, vertDataSize));
- } else if (sharpness != 0.0) {
+ } else if (sharpness != 0.0f) {
VertDataAdd(q, _edge_getCoVert(e, v, curLvl, 1, vertDataSize));
}
}
@@ -1604,8 +1604,8 @@
// r = co*.75 + q*.25
VertDataCopy(r, co);
- VertDataMulN(r, .75);
- VertDataMulN(q, .25);
+ VertDataMulN(r, .75f);
+ VertDataMulN(q, .25f);
VertDataAdd(r, q);
// nCo = nCo + (r-nCo)*avgSharpness
@@ -1631,8 +1631,8 @@
sharpCount = 2;
avgSharpness += sharpness;
- if (avgSharpness>1.0) {
- avgSharpness = 1.0;
+ if (avgSharpness > 1.0f) {
+ avgSharpness = 1.0f;
}
} else {
sharpCount = 0;
@@ -1646,10 +1646,10 @@
void *nCo = EDGE_getCo(e, nextLvl, fx);
VertDataCopy(r, EDGE_getCo(e, curLvl, x-1));
VertDataAdd(r, EDGE_getCo(e, curLvl, x+1));
- VertDataMulN(r, 0.5);
+ VertDataMulN(r, 0.5f);
VertDataCopy(nCo, co);
- VertDataMulN(nCo, 0.75);
- VertDataMulN(r, 0.25);
+ VertDataMulN(nCo, 0.75f);
+ VertDataMulN(r, 0.25f);
VertDataAdd(nCo, r);
}
} else {
@@ -1671,8 +1671,8 @@
VertDataAdd(r, _face_getIFCoEdge(f, e, curLvl, x, 1, subdivLevels, vertDataSize));
numFaces++;
}
- VertDataMulN(q, 1.0/(numFaces*2.0f));
- VertDataMulN(r, 1.0/(2.0f + numFaces));
+ VertDataMulN(q, 1.0f/(numFaces*2.0f));
+ VertDataMulN(r, 1.0f/(2.0f + numFaces));
VertDataCopy(nCo, co);
VertDataMulN(nCo, (float) numFaces);
@@ -1895,7 +1895,7 @@
void *co = EDGE_getCo(e, nextLvl, 1);
float sharpness = EDGE_getSharpness(e, curLvl);
- if (_edge_isBoundary(e) || sharpness>=1.0) {
+ if (_edge_isBoundary(e) || sharpness >= 1.0f) {
VertDataCopy(co, VERT_getCo(e->v0, curLvl));
VertDataAdd(co, VERT_getCo(e->v1, curLvl));
VertDataMulN(co, 0.5f);
@@ -1947,8 +1947,8 @@
if(sharpCount) {
avgSharpness /= sharpCount;
- if (avgSharpness>1.0) {
- avgSharpness = 1.0;
+ if (avgSharpness > 1.0f) {
+ avgSharpness = 1.0f;
}
}
@@ -1969,7 +1969,7 @@
}
}
VertDataCopy(nCo, co);
- VertDataMulN(nCo, 0.75);
+ VertDataMulN(nCo, 0.75f);
VertDataMulN(r, 0.25f/numBoundary);
VertDataAdd(nCo, r);
} else {
@@ -2015,7 +2015,7 @@
CCGVert *oV = _edge_getOtherVert(e, v);
VertDataAdd(q, VERT_getCo(oV, curLvl));
}
- } else if (sharpness != 0.0) {
+ } else if (sharpness != 0.0f) {
CCGVert *oV = _edge_getOtherVert(e, v);
VertDataAdd(q, VERT_getCo(oV, curLvl));
}
@@ -2033,8 +2033,8 @@
// r = co*.75 + q*.25
VertDataCopy(r, co);
- VertDataMulN(r, .75);
- VertDataMulN(q, .25);
+ VertDataMulN(r, 0.75f);
+ VertDataMulN(q, 0.25f);
VertDataAdd(r, q);
// nCo = nCo + (r-nCo)*avgSharpness
Modified: trunk/blender/source/blender/blenkernel/intern/DerivedMesh.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/DerivedMesh.c 2011-03-27 17:12:59 UTC (rev 35823)
+++ trunk/blender/source/blender/blenkernel/intern/DerivedMesh.c 2011-03-27 17:22:04 UTC (rev 35824)
@@ -1123,9 +1123,7 @@
VECCOPY(vert_r->co, ev->co);
- vert_r->no[0] = ev->no[0] * 32767.0;
- vert_r->no[1] = ev->no[1] * 32767.0;
- vert_r->no[2] = ev->no[2] * 32767.0;
+ normal_float_to_short_v3(vert_r->no, ev->no);
/* TODO what to do with vert_r->flag? */
vert_r->bweight = (unsigned char) (ev->bweight*255.0f);
@@ -1220,9 +1218,7 @@
else
copy_v3_v3(vert_r->co, ev->co);
- vert_r->no[0] = ev->no[0] * 32767.0;
- vert_r->no[1] = ev->no[1] * 32767.0;
- vert_r->no[2] = ev->no[2] * 32767.0;
+ normal_float_to_short_v3(vert_r->no, ev->no);
/* TODO what to do with vert_r->flag? */
vert_r->flag = 0;
@@ -1425,7 +1421,7 @@
float *no = emdm->vertexNos[i];
/* following Mesh convention; we use vertex coordinate itself
* for normal in this case */
- if (normalize_v3(no)==0.0) {
+ if (normalize_v3(no) == 0.0f) {
normalize_v3_v3(no, vertexCos[i]);
}
}
@@ -1596,12 +1592,12 @@
*fg= blend;
*fb= blend*(1.0f-((input-0.25f)*4.0f));
}
- else if (input<=0.75){ // green->yellow
+ else if (input <= 0.75f){ // green->yellow
*fr= blend * ((input-0.50f)*4.0f);
*fg= blend;
*fb= 0.0f;
}
- else if (input<=1.0){ // yellow->red
+ else if (input <= 1.0f){ // yellow->red
*fr= blend;
*fg= blend * (1.0f-((input-0.75f)*4.0f));
*fb= 0.0f;
Modified: trunk/blender/source/blender/blenkernel/intern/anim.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/anim.c 2011-03-27 17:12:59 UTC (rev 35823)
+++ trunk/blender/source/blender/blenkernel/intern/anim.c 2011-03-27 17:22:04 UTC (rev 35824)
@@ -1125,7 +1125,7 @@
/* scale */
if(par->transflag & OB_DUPLIFACES_SCALE) {
float size= v4? area_quad_v3(v1, v2, v3, v4): area_tri_v3(v1, v2, v3);
- size= sqrt(size) * par->dupfacesca;
+ size= sqrtf(size) * par->dupfacesca;
mul_m3_fl(mat, size);
}
Modified: trunk/blender/source/blender/blenkernel/intern/anim_sys.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/anim_sys.c 2011-03-27 17:12:59 UTC (rev 35823)
+++ trunk/blender/source/blender/blenkernel/intern/anim_sys.c 2011-03-27 17:22:04 UTC (rev 35824)
@@ -1905,7 +1905,7 @@
/* action range is calculated taking F-Modifiers into account (which making new strips doesn't do due to the troublesome nature of that) */
calc_action_range(dummy_strip.act, &dummy_strip.actstart, &dummy_strip.actend, 1);
dummy_strip.start = dummy_strip.actstart;
- dummy_strip.end = (IS_EQ(dummy_strip.actstart, dummy_strip.actend)) ? (dummy_strip.actstart + 1.0f): (dummy_strip.actend);
+ dummy_strip.end = (IS_EQF(dummy_strip.actstart, dummy_strip.actend)) ? (dummy_strip.actstart + 1.0f): (dummy_strip.actend);
dummy_strip.blendmode= adt->act_blendmode;
dummy_strip.extendmode= adt->act_extendmode;
@@ -2072,7 +2072,7 @@
void BKE_animsys_evaluate_all_animation (Main *main, float ctime)
{
ID *id;
-
+
if (G.f & G_DEBUG)
printf("Evaluate all animation - %f \n", ctime);
Modified: trunk/blender/source/blender/blenkernel/intern/lattice.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/lattice.c 2011-03-27 17:12:59 UTC (rev 35823)
+++ trunk/blender/source/blender/blenkernel/intern/lattice.c 2011-03-27 17:22:04 UTC (rev 35824)
@@ -412,7 +412,7 @@
for(ww= wi-1; ww<=wi+2; ww++) {
w= tw[ww-wi+1];
- if(w!=0.0) {
+ if(w != 0.0f) {
if(ww>0) {
if(ww<lt->pntsw) idx_w= ww*lt->pntsu*lt->pntsv;
else idx_w= (lt->pntsw-1)*lt->pntsu*lt->pntsv;
@@ -422,7 +422,7 @@
for(vv= vi-1; vv<=vi+2; vv++) {
v= w*tv[vv-vi+1];
- if(v!=0.0) {
+ if(v != 0.0f) {
if(vv>0) {
if(vv<lt->pntsv) idx_v= idx_w + vv*lt->pntsu;
else idx_v= idx_w + (lt->pntsv-1)*lt->pntsu;
@@ -432,7 +432,7 @@
for(uu= ui-1; uu<=ui+2; uu++) {
u= weight*v*tu[uu-ui+1];
- if(u!=0.0) {
+ if(u != 0.0f) {
if(uu>0) {
if(uu<lt->pntsu) idx_u= idx_v + uu;
else idx_u= idx_v + (lt->pntsu-1);
@@ -508,7 +508,7 @@
if(bl && bl->poly> -1) cycl= 1;
if(cycl==0) {
- ctime1= CLAMPIS(ctime, 0.0, 1.0);
+ ctime1= CLAMPIS(ctime, 0.0f, 1.0f);
}
else ctime1= ctime;
@@ -519,16 +519,16 @@
Path *path= cu->path;
float dvec[3];
- if(ctime < 0.0) {
+ if(ctime < 0.0f) {
sub_v3_v3v3(dvec, path->data[1].vec, path->data[0].vec);
mul_v3_fl(dvec, ctime*(float)path->len);
add_v3_v3(vec, dvec);
if(quat) copy_qt_qt(quat, path->data[0].quat);
if(radius) *radius= path->data[0].radius;
}
- else if(ctime > 1.0) {
+ else if(ctime > 1.0f) {
sub_v3_v3v3(dvec, path->data[path->len-1].vec, path->data[path->len-2].vec);
- mul_v3_fl(dvec, (ctime-1.0)*(float)path->len);
+ mul_v3_fl(dvec, (ctime-1.0f)*(float)path->len);
add_v3_v3(vec, dvec);
if(quat) copy_qt_qt(quat, path->data[path->len-1].quat);
if(radius) *radius= path->data[path->len-1].radius;
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list