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

Cleanup: naming

Browse Source
This commit is contained in:
Campbell Barton
2018-12-20 17:30:04 +11:00
parent b2b53ee9db
commit 320e7f5322
4 changed files with 42 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
source/blender/blenkernel/BKE_armature.h
View File

@@ -129,7 +129,7 @@ void BKE_pchan_to_mat4(struct bPoseChannel *pchan, float chan_mat[4][4]);
void BKE_pchan_calc_mat(struct bPoseChannel *pchan);
/* Simple helper, computes the offset bone matrix. */
void BKE_get_offset_bone_mat(struct Bone *bone, float offs_bone[4][4]);
void BKE_bone_offset_matrix_get(const struct Bone *bone, float offs_bone[4][4]);
/* Transformation inherited from the parent bone. These matrices apply the effects of
* HINGE/NO_SCALE/NO_LOCAL_LOCATION options over the pchan loc/rot/scale transformations. */
@@ -139,15 +139,22 @@ typedef struct BoneParentTransform {
} BoneParentTransform;
/* Matrix-like algebra operations on the transform */
void BKE_clear_bone_parent_transform(struct BoneParentTransform *bpt);
void BKE_invert_bone_parent_transform(struct BoneParentTransform *bpt);
void BKE_combine_bone_parent_transform(const struct BoneParentTransform *in1, const struct BoneParentTransform *in2, struct BoneParentTransform *result);
void BKE_bone_parent_transform_clear(struct BoneParentTransform *bpt);
void BKE_bone_parent_transform_invert(struct BoneParentTransform *bpt);
void BKE_bone_parent_transform_combine(
const struct BoneParentTransform *in1, const struct BoneParentTransform *in2,
struct BoneParentTransform *result);
void BKE_apply_bone_parent_transform(const struct BoneParentTransform *bpt, const float inmat[4][4], float outmat[4][4]);
void BKE_bone_parent_transform_apply(
const struct BoneParentTransform *bpt, const float inmat[4][4], float outmat[4][4]);
/* Get the current parent transformation for the given pose bone. */
void BKE_pchan_to_parent_transform(struct bPoseChannel *pchan, struct BoneParentTransform *r_bpt);
void BKE_calc_bone_parent_transform(int bone_flag, const float offs_bone[4][4], const float parent_arm_mat[4][4], const float parent_pose_mat[4][4], struct BoneParentTransform *r_bpt);
void BKE_bone_parent_transform_calc_from_pchan(
const struct bPoseChannel *pchan,
struct BoneParentTransform *r_bpt);
void BKE_bone_parent_transform_calc_from_matrices(
int bone_flag, const float offs_bone[4][4], const float parent_arm_mat[4][4], const float parent_pose_mat[4][4],
struct BoneParentTransform *r_bpt);
/* Rotation Mode Conversions - Used for PoseChannels + Objects... */
void BKE_rotMode_change_values(float quat[4], float eul[3], float axis[3], float *angle, short oldMode, short newMode);

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

@@ -1460,7 +1460,7 @@ void BKE_armature_loc_world_to_pose(Object *ob, const float inloc[3], float outl
/* Simple helper, computes the offset bone matrix.
* offs_bone = yoffs(b-1) + root(b) + bonemat(b). */
void BKE_get_offset_bone_mat(Bone *bone, float offs_bone[4][4])
void BKE_bone_offset_matrix_get(const Bone *bone, float offs_bone[4][4])
{
BLI_assert(bone->parent != NULL);
@@ -1491,10 +1491,10 @@ void BKE_get_offset_bone_mat(Bone *bone, float offs_bone[4][4])
* pose-channel into its local space (i.e. 'visual'-keyframing).
* (note: I don't understand that, so I keep it :p --mont29).
*/
void BKE_pchan_to_parent_transform(bPoseChannel *pchan, BoneParentTransform *r_bpt)
void BKE_bone_parent_transform_calc_from_pchan(const bPoseChannel *pchan, BoneParentTransform *r_bpt)
{
Bone *bone, *parbone;
bPoseChannel *parchan;
const Bone *bone, *parbone;
const bPoseChannel *parchan;
/* set up variables for quicker access below */
bone = pchan->bone;
@@ -1504,12 +1504,12 @@ void BKE_pchan_to_parent_transform(bPoseChannel *pchan, BoneParentTransform *r_b
if (parchan) {
float offs_bone[4][4];
/* yoffs(b-1) + root(b) + bonemat(b). */
BKE_get_offset_bone_mat(bone, offs_bone);
BKE_bone_offset_matrix_get(bone, offs_bone);
BKE_calc_bone_parent_transform(bone->flag, offs_bone, parbone->arm_mat, parchan->pose_mat, r_bpt);
BKE_bone_parent_transform_calc_from_matrices(bone->flag, offs_bone, parbone->arm_mat, parchan->pose_mat, r_bpt);
}
else {
BKE_calc_bone_parent_transform(bone->flag, bone->arm_mat, NULL, NULL, r_bpt);
BKE_bone_parent_transform_calc_from_matrices(bone->flag, bone->arm_mat, NULL, NULL, r_bpt);
}
}
@@ -1519,7 +1519,9 @@ void BKE_pchan_to_parent_transform(bPoseChannel *pchan, BoneParentTransform *r_b
* offs_bone: delta from parent to current arm_mat (or just arm_mat if no parent)
* parent_arm_mat, parent_pose_mat: arm_mat and pose_mat of parent, or NULL
* r_bpt: OUTPUT parent transform */
void BKE_calc_bone_parent_transform(int bone_flag, const float offs_bone[4][4], const float parent_arm_mat[4][4], const float parent_pose_mat[4][4], BoneParentTransform *r_bpt)
void BKE_bone_parent_transform_calc_from_matrices(
int bone_flag, const float offs_bone[4][4], const float parent_arm_mat[4][4], const float parent_pose_mat[4][4],
BoneParentTransform *r_bpt)
{
if (parent_pose_mat) {
/* Compose the rotscale matrix for this bone. */
@@ -1593,25 +1595,27 @@ void BKE_calc_bone_parent_transform(int bone_flag, const float offs_bone[4][4],
}
}
void BKE_clear_bone_parent_transform(struct BoneParentTransform *bpt)
void BKE_bone_parent_transform_clear(struct BoneParentTransform *bpt)
{
unit_m4(bpt->rotscale_mat);
unit_m4(bpt->loc_mat);
}
void BKE_invert_bone_parent_transform(struct BoneParentTransform *bpt)
void BKE_bone_parent_transform_invert(struct BoneParentTransform *bpt)
{
invert_m4(bpt->rotscale_mat);
invert_m4(bpt->loc_mat);
}
void BKE_combine_bone_parent_transform(const struct BoneParentTransform *in1, const struct BoneParentTransform *in2, struct BoneParentTransform *result)
void BKE_bone_parent_transform_combine(
const struct BoneParentTransform *in1, const struct BoneParentTransform *in2,
struct BoneParentTransform *result)
{
mul_m4_m4m4(result->rotscale_mat, in1->rotscale_mat, in2->rotscale_mat);
mul_m4_m4m4(result->loc_mat, in1->loc_mat, in2->loc_mat);
}
void BKE_apply_bone_parent_transform(const struct BoneParentTransform *bpt, const float inmat[4][4], float outmat[4][4])
void BKE_bone_parent_transform_apply(const struct BoneParentTransform *bpt, const float inmat[4][4], float outmat[4][4])
{
/* in case inmat == outmat */
float tmploc[3];
@@ -1628,9 +1632,9 @@ void BKE_armature_mat_pose_to_bone(bPoseChannel *pchan, float inmat[4][4], float
{
BoneParentTransform bpt;
BKE_pchan_to_parent_transform(pchan, &bpt);
BKE_invert_bone_parent_transform(&bpt);
BKE_apply_bone_parent_transform(&bpt, inmat, outmat);
BKE_bone_parent_transform_calc_from_pchan(pchan, &bpt);
BKE_bone_parent_transform_invert(&bpt);
BKE_bone_parent_transform_apply(&bpt, inmat, outmat);
}
/* Convert Bone-Space Matrix to Pose-Space Matrix. */
@@ -1638,8 +1642,8 @@ void BKE_armature_mat_bone_to_pose(bPoseChannel *pchan, float inmat[4][4], float
{
BoneParentTransform bpt;
BKE_pchan_to_parent_transform(pchan, &bpt);
BKE_apply_bone_parent_transform(&bpt, inmat, outmat);
BKE_bone_parent_transform_calc_from_pchan(pchan, &bpt);
BKE_bone_parent_transform_apply(&bpt, inmat, outmat);
}
/* Convert Pose-Space Location to Bone-Space Location
@@ -1949,7 +1953,7 @@ void BKE_armature_where_is_bone(Bone *bone, Bone *prevbone, const bool use_recur
if (prevbone) {
float offs_bone[4][4];
/* yoffs(b-1) + root(b) + bonemat(b) */
BKE_get_offset_bone_mat(bone, offs_bone);
BKE_bone_offset_matrix_get(bone, offs_bone);
/* Compose the matrix for this bone */
mul_m4_m4m4(bone->arm_mat, prevbone->arm_mat, offs_bone);

4
source/blender/editors/transform/transform_conversions.c
View File

@@ -678,12 +678,12 @@ static void add_pose_transdata(TransInfo *t, bPoseChannel *pchan, Object *ob, Tr
/* proper way to get parent transform + own transform + constraints transform */
copy_m3_m4(omat, ob->obmat);
/* New code, using "generic" BKE_pchan_to_parent_transform(). */
/* New code, using "generic" BKE_bone_parent_transform_calc_from_pchan(). */
{
BoneParentTransform bpt;
float rpmat[3][3];
BKE_pchan_to_parent_transform(pchan, &bpt);
BKE_bone_parent_transform_calc_from_pchan(pchan, &bpt);
if (t->mode == TFM_TRANSLATION)
copy_m3_m4(pmat, bpt.loc_mat);
else

8
source/blender/makesrna/intern/rna_armature_api.c
View File

@@ -69,20 +69,20 @@ static void rna_Bone_convert_local_to_pose(Bone *bone, float *r_matrix, float *m
if (is_zero_m4(parent_pose_mat) || is_zero_m4(parent_arm_mat)) {
/* No parent case. */
BKE_calc_bone_parent_transform(bone->flag, bone_arm_mat, NULL, NULL, &bpt);
BKE_bone_parent_transform_calc_from_matrices(bone->flag, bone_arm_mat, NULL, NULL, &bpt);
}
else {
invert_m4_m4(offs_bone, parent_arm_mat);
mul_m4_m4m4(offs_bone, offs_bone, bone_arm_mat);
BKE_calc_bone_parent_transform(bone->flag, offs_bone, parent_arm_mat, parent_pose_mat, &bpt);
BKE_bone_parent_transform_calc_from_matrices(bone->flag, offs_bone, parent_arm_mat, parent_pose_mat, &bpt);
}
if (invert) {
BKE_invert_bone_parent_transform(&bpt);
BKE_bone_parent_transform_invert(&bpt);
}
BKE_apply_bone_parent_transform(&bpt, (float (*)[4])matrix, (float (*)[4])r_matrix);
BKE_bone_parent_transform_apply(&bpt, (float (*)[4])matrix, (float (*)[4])r_matrix);
}
static void rna_Bone_MatrixFromAxisRoll(float *axis, float roll, float *r_matrix)