[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [18734] branches/blender2.5/blender/source /blender: Silencing MSVC warnings in code that I maintain
Joshua Leung
aligorith at gmail.com
Thu Jan 29 11:19:49 CET 2009
Revision: 18734
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=18734
Author: aligorith
Date: 2009-01-29 11:19:43 +0100 (Thu, 29 Jan 2009)
Log Message:
-----------
Silencing MSVC warnings in code that I maintain
Modified Paths:
--------------
branches/blender2.5/blender/source/blender/blenkernel/intern/armature.c
branches/blender2.5/blender/source/blender/blenkernel/intern/fcurve.c
branches/blender2.5/blender/source/blender/blenkernel/intern/ipo.c
branches/blender2.5/blender/source/blender/blenkernel/intern/key.c
branches/blender2.5/blender/source/blender/editors/animation/keyframing.c
branches/blender2.5/blender/source/blender/editors/space_ipo/ipo_draw.c
branches/blender2.5/blender/source/blender/editors/space_ipo/ipo_header.c
Modified: branches/blender2.5/blender/source/blender/blenkernel/intern/armature.c
===================================================================
--- branches/blender2.5/blender/source/blender/blenkernel/intern/armature.c 2009-01-29 09:57:28 UTC (rev 18733)
+++ branches/blender2.5/blender/source/blender/blenkernel/intern/armature.c 2009-01-29 10:19:43 UTC (rev 18734)
@@ -363,7 +363,7 @@
*/
void bone_autoside_name (char *name, int strip_number, short axis, float head, float tail)
{
- int len;
+ unsigned int len;
char basename[32]={""};
char extension[5]={""};
@@ -606,7 +606,7 @@
Mat3Inv(imat3, mat3);
Mat3MulMat3(mat3, result, imat3); // the matrix transforming vec_roll to desired roll
- roll1= atan2(mat3[2][0], mat3[2][2]);
+ roll1= (float)atan2(mat3[2][0], mat3[2][2]);
}
}
else {
@@ -639,7 +639,7 @@
Mat3Inv(imat3, mat3);
Mat3MulMat3(mat3, imat3, result); // the matrix transforming vec_roll to desired roll
- roll2= atan2(mat3[2][0], mat3[2][2]);
+ roll2= (float)atan2(mat3[2][0], mat3[2][2]);
/* and only now negate handle */
VecMulf(h2, -hlength2);
@@ -784,7 +784,7 @@
if(l!=0.0f) {
rad= a/l;
- rad= rad*rad2 + (1.0-rad)*rad1;
+ rad= rad*rad2 + (1.0f-rad)*rad1;
}
else rad= rad1;
}
@@ -798,8 +798,8 @@
if(rdist==0.0f || dist >= l)
return 0.0f;
else {
- a= sqrt(dist)-rad;
- return 1.0-( a*a )/( rdist*rdist );
+ a= (float)sqrt(dist)-rad;
+ return 1.0f-( a*a )/( rdist*rdist );
}
}
}
@@ -1301,7 +1301,7 @@
Mat3Inv(vecmatinv, vecmat);
Mat3MulMat3(rollmat, vecmatinv, mat);
- *roll= atan2(rollmat[2][0], rollmat[2][2]);
+ *roll= (float)atan2(rollmat[2][0], rollmat[2][2]);
}
}
@@ -1333,7 +1333,7 @@
float updown;
/* point same direction, or opposite? */
- updown = ( Inpf (target,nor) > 0 ) ? 1.0 : -1.0;
+ updown = ( Inpf (target,nor) > 0 ) ? 1.0f : -1.0f;
/* I think this should work ... */
bMatrix[0][0]=updown; bMatrix[0][1]=0.0; bMatrix[0][2]=0.0;
@@ -1789,10 +1789,10 @@
IK_SetStiffness(seg, IK_Y, pchan->stiffness[1]);
IK_SetStiffness(seg, IK_Z, pchan->stiffness[2]);
- if(tree->stretch && (pchan->ikstretch > 0.0)) {
+ if(tree->stretch && (pchan->ikstretch > 0.0f)) {
float ikstretch = pchan->ikstretch*pchan->ikstretch;
- IK_SetStiffness(seg, IK_TRANS_Y, MIN2(1.0-ikstretch, 0.99));
- IK_SetLimit(seg, IK_TRANS_Y, 0.001, 1e10);
+ IK_SetStiffness(seg, IK_TRANS_Y, MIN2(1.0f-ikstretch, 0.99f));
+ IK_SetLimit(seg, IK_TRANS_Y, 0.001f, 1e10);
}
}
@@ -1858,10 +1858,10 @@
}
/* do we need blending? */
- if (!resultblend && target->con->enforce!=1.0) {
+ if (!resultblend && target->con->enforce!=1.0f) {
float q1[4], q2[4], q[4];
float fac= target->con->enforce;
- float mfac= 1.0-fac;
+ float mfac= 1.0f-fac;
pchan= tree->pchan[target->tip];
@@ -1884,13 +1884,13 @@
iktarget= iktree[target->tip];
- if(data->weight != 0.0) {
+ if(data->weight != 0.0f) {
if(poleconstrain)
IK_SolverSetPoleVectorConstraint(solver, iktarget, goalpos,
- polepos, data->poleangle*M_PI/180, (poleangledata == data));
+ polepos, data->poleangle*(float)M_PI/180.0f, (poleangledata == data));
IK_SolverAddGoal(solver, iktarget, goalpos, data->weight);
}
- if((data->flag & CONSTRAINT_IK_ROT) && (data->orientweight != 0.0))
+ if((data->flag & CONSTRAINT_IK_ROT) && (data->orientweight != 0.0f))
if((data->flag & CONSTRAINT_IK_AUTO)==0)
IK_SolverAddGoalOrientation(solver, iktarget, goalrot,
data->orientweight);
@@ -1900,7 +1900,7 @@
IK_Solve(solver, 0.0f, tree->iterations);
if(poleangledata)
- poleangledata->poleangle= IK_SolverGetPoleAngle(solver)*180/M_PI;
+ poleangledata->poleangle= IK_SolverGetPoleAngle(solver)*180.0f/(float)M_PI;
IK_FreeSolver(solver);
@@ -1917,20 +1917,20 @@
float parentstretch, stretch;
pchan= tree->pchan[a];
- parentstretch= (tree->parent[a] >= 0)? ikstretch[tree->parent[a]]: 1.0;
+ parentstretch= (tree->parent[a] >= 0)? ikstretch[tree->parent[a]]: 1.0f;
- if(tree->stretch && (pchan->ikstretch > 0.0)) {
+ if(tree->stretch && (pchan->ikstretch > 0.0f)) {
float trans[3], length;
IK_GetTranslationChange(iktree[a], trans);
length= pchan->bone->length*VecLength(pchan->pose_mat[1]);
- ikstretch[a]= (length == 0.0)? 1.0: (trans[1]+length)/length;
+ ikstretch[a]= (length == 0.0f)? 1.0f: (trans[1]+length)/length;
}
else
- ikstretch[a] = 1.0;
+ ikstretch[a] = 1.0f;
- stretch= (parentstretch == 0.0)? 1.0: ikstretch[a]/parentstretch;
+ stretch= (parentstretch == 0.0f)? 1.0f: ikstretch[a]/parentstretch;
VecMulf(tree->basis_change[a][0], stretch);
VecMulf(tree->basis_change[a][1], stretch);
@@ -2035,7 +2035,7 @@
{
bActionModifier *amod;
bActionStrip *strip, *strip2;
- float scene_cfra= scene->r.cfra;
+ float scene_cfra= (float)scene->r.cfra;
int do_modif;
for (strip=armob->nlastrips.first; strip; strip=strip->next) {
Modified: branches/blender2.5/blender/source/blender/blenkernel/intern/fcurve.c
===================================================================
--- branches/blender2.5/blender/source/blender/blenkernel/intern/fcurve.c 2009-01-29 09:57:28 UTC (rev 18733)
+++ branches/blender2.5/blender/source/blender/blenkernel/intern/fcurve.c 2009-01-29 10:19:43 UTC (rev 18734)
@@ -1042,7 +1042,7 @@
// TODO: could this be more efficient (i.e. without need to recalc pow() everytime)
cp= data->poly_coefficients;
for (i=0; (i <= data->poly_order) && (cp); i++, cp++)
- value += (*cp) * pow(evaltime, i);
+ value += (*cp) * (float)pow(evaltime, i);
/* only if something changed */
if (data->poly_order)
Modified: branches/blender2.5/blender/source/blender/blenkernel/intern/ipo.c
===================================================================
--- branches/blender2.5/blender/source/blender/blenkernel/intern/ipo.c 2009-01-29 09:57:28 UTC (rev 18733)
+++ branches/blender2.5/blender/source/blender/blenkernel/intern/ipo.c 2009-01-29 10:19:43 UTC (rev 18734)
@@ -1012,7 +1012,7 @@
/* correct values for object rotation curves - they were degrees/10 */
// XXX for now, just make them into radians as RNA sets/reads directly in that form
if ((icu->blocktype == ID_OB) && ELEM3(icu->adrcode, OB_ROT_X, OB_ROT_Y, OB_ROT_Z)) {
- const float fac= M_PI / 18.0f; //10.0f * M_PI/180.0f;
+ const float fac= (float)M_PI / 18.0f; //10.0f * M_PI/180.0f;
dst->vec[0][1] *= fac;
dst->vec[1][1] *= fac;
Modified: branches/blender2.5/blender/source/blender/blenkernel/intern/key.c
===================================================================
--- branches/blender2.5/blender/source/blender/blenkernel/intern/key.c 2009-01-29 09:57:28 UTC (rev 18733)
+++ branches/blender2.5/blender/source/blender/blenkernel/intern/key.c 2009-01-29 10:19:43 UTC (rev 18734)
@@ -1039,7 +1039,7 @@
/* in do_key and cp_key the case a>tot is handled */
}
- cfra= scene->r.cfra;
+ cfra= (float)scene->r.cfra;
for(a=0; a<me->totvert; a+=step, cfra+= delta) {
@@ -1086,7 +1086,7 @@
else {
printf("\tdo absolute \n");
- ctime= bsystem_time(scene, ob, scene->r.cfra, 0.0); // xxx old cruft
+ ctime= bsystem_time(scene, ob, (float)scene->r.cfra, 0.0f); // xxx old cruft
#if 0 // XXX old animation system
if(calc_ipo_spec(me->key->ipo, KEY_SPEED, &ctime)==0) {
@@ -1207,10 +1207,10 @@
/* in do_key and cp_key the case a>tot has been handled */
}
- cfra= scene->r.cfra;
+ cfra= (float)scene->r.cfra;
for(a=0; a<tot; a+=step, cfra+= delta) {
- ctime= bsystem_time(scene, 0, cfra, 0.0); // XXX old cruft
+ ctime= bsystem_time(scene, 0, cfra, 0.0f); // XXX old cruft
#if 0 // XXX old animation system
if(calc_ipo_spec(cu->key->ipo, KEY_SPEED, &ctime)==0) {
ctime /= 100.0;
@@ -1274,7 +1274,7 @@
delta= lt->key->slurph;
delta/= (float)tot;
- cfra= scene->r.cfra;
+ cfra= (float)scene->r.cfra;
for(a=0; a<tot; a++, cfra+= delta) {
Modified: branches/blender2.5/blender/source/blender/editors/animation/keyframing.c
===================================================================
--- branches/blender2.5/blender/source/blender/editors/animation/keyframing.c 2009-01-29 09:57:28 UTC (rev 18733)
+++ branches/blender2.5/blender/source/blender/editors/animation/keyframing.c 2009-01-29 10:19:43 UTC (rev 18734)
@@ -334,7 +334,7 @@
/* set handletype and interpolation */
if (fcu->totvert > 2) {
BezTriple *bezt= (fcu->bezt + a);
- short h1, h2;
+ char h1, h2;
/* set handles (autohandles by default) */
h1= h2= HD_AUTO;
Modified: branches/blender2.5/blender/source/blender/editors/space_ipo/ipo_draw.c
===================================================================
--- branches/blender2.5/blender/source/blender/editors/space_ipo/ipo_draw.c 2009-01-29 09:57:28 UTC (rev 18733)
+++ branches/blender2.5/blender/source/blender/editors/space_ipo/ipo_draw.c 2009-01-29 10:19:43 UTC (rev 18734)
@@ -152,7 +152,7 @@
/* adjust view transform before starting */
glTranslatef(x, y, 0.0f);
- glScalef(1.0/xscale*hsize, 1.0/yscale*hsize, 1.0);
+ glScalef(1.0f/xscale*hsize, 1.0f/yscale*hsize, 1.0f);
/* draw! */
glCallList(displist);
@@ -402,7 +402,7 @@
if (fcu->driver)
resol= 32;
else
- resol= 3.0f*sqrt(bezt->vec[1][0] - prevbezt->vec[1][0]);
+ resol= (int)(3.0*sqrt(bezt->vec[1][0] - prevbezt->vec[1][0]));
if (resol < 2) {
/* only draw one */
@@ -678,7 +678,7 @@
* - offset of ACHANNEL_HEIGHT*2 is added to the height of the channels, as first is for
* start of list offset, and the second is as a correction for the scrollers.
*/
- height= ((items*ACHANNEL_STEP) + (ACHANNEL_HEIGHT*2));
+ height= (float)((items*ACHANNEL_STEP) + (ACHANNEL_HEIGHT*2));
if (height > (v2d->mask.ymax - v2d->mask.ymin)) {
/* don't use totrect set, as the width stays the same
Modified: branches/blender2.5/blender/source/blender/editors/space_ipo/ipo_header.c
===================================================================
--- branches/blender2.5/blender/source/blender/editors/space_ipo/ipo_header.c 2009-01-29 09:57:28 UTC (rev 18733)
+++ branches/blender2.5/blender/source/blender/editors/space_ipo/ipo_header.c 2009-01-29 10:19:43 UTC (rev 18734)
@@ -222,7 +222,7 @@
}
/* always as last */
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list