archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Bendy Bones: Code Cleanup - Simplify float conversions here to be easier to follow

Browse Source
This commit is contained in:
Joshua Leung
2016-05-15 19:06:50 +12:00
parent e36402ecff
commit d7926e9893
2 changed files with 14 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
source/blender/blenkernel/intern/armature.c
View File

@@ -649,27 +649,26 @@ void b_bone_spline_setup(bPoseChannel *pchan, int rest, Mat4 result_array[MAX_BB
}
if (!rest) {
float scaleFactorIn = 1.0;
float scaleFactorIn = 1.0f;
if (a <= bone->segments - 1) {
const float scaleIn = bone->scaleIn * pchan->scaleIn;
scaleFactorIn = 1.0f + (scaleIn - 1.0f) * ((1.0f * (bone->segments - a - 1)) / (1.0f * (bone->segments - 1)));
scaleFactorIn = 1.0f + (scaleIn - 1.0f) * ((float)(bone->segments - a - 1) / (float)(bone->segments - 1));
}
float scaleFactorOut = 1.0f;
if (a >= 0) {
const float scaleOut = bone->scaleOut * pchan->scaleOut;
scaleFactorOut = 1.0 + (scaleOut - 1.0f) * ((1.0f * (a + 1)) / (1.0f * (bone->segments - 1)));
scaleFactorOut = 1.0 + (scaleOut - 1.0f) * ((float)(a + 1) / (float)(bone->segments - 1));
}
float bscalemat[4][4], ibscalemat[4][4];
float bscale[3];
float scalefac = scaleFactorIn * scaleFactorOut;
float bscalemat[4][4], bscale[3];
bscale[0] = 1.0f * scaleFactorIn * scaleFactorOut;
bscale[0] = scalefac;
bscale[1] = 1.0f;
bscale[2] = 1.0f * scaleFactorIn * scaleFactorOut;
bscale[2] = scalefac;
size_to_mat4(bscalemat, bscale);
invert_m4_m4(ibscalemat, bscalemat);
/* Note: don't multiply by inverse scale mat here, as it causes problems with scaling shearing and breaking segment chains */
/*mul_m4_series(result_array[a].mat, ibscalemat, result_array[a].mat, bscalemat);*/

16
source/blender/editors/space_view3d/drawarmature.c
View File

@@ -1152,28 +1152,26 @@ static void ebone_spline_preview(EditBone *ebone, Mat4 result_array[MAX_BBONE_SU
/* "extra" scale facs... */
{
float scaleFactorIn = 1.0;
float scaleFactorIn = 1.0f;
if (a <= ebone->segments - 1) {
scaleFactorIn = 1.0f + (ebone->scaleIn - 1.0f) * ((1.0f * (ebone->segments - a - 1)) / (1.0f * (ebone->segments - 1)));
scaleFactorIn = 1.0f + (ebone->scaleIn - 1.0f) * ((float)(ebone->segments - a - 1) / (float)(ebone->segments - 1));
}
float scaleFactorOut = 1.0f;
if (a >= 0) {
scaleFactorOut = 1.0 + (ebone->scaleOut - 1.0f) * ((1.0f * (a + 1)) / (1.0f * (ebone->segments - 1)));
scaleFactorOut = 1.0 + (ebone->scaleOut - 1.0f) * ((float)(a + 1) / (float)(ebone->segments - 1));
}
float bscalemat[4][4], ibscalemat[4][4];
float bscale[3];
float scalefac = scaleFactorIn * scaleFactorOut;
float bscalemat[4][4], bscale[3];
bscale[0] = 1.0f * scaleFactorIn * scaleFactorOut;
bscale[0] = scalefac;
bscale[1] = 1.0f;
bscale[2] = 1.0f * scaleFactorIn * scaleFactorOut;
bscale[2] = scalefac;
size_to_mat4(bscalemat, bscale);
invert_m4_m4(ibscalemat, bscalemat);
/* Note: don't multiply by inverse scale mat here, as it causes problems with scaling shearing and breaking segment chains */
/*mul_m4_series(result_array[a].mat, ibscalemat, result_array[a].mat, bscalemat);*/
mul_m4_series(result_array[a].mat, result_array[a].mat, bscalemat);
}
}