From 320e7f5322a56ffcb3174d200701bb7a8c43ccef Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Thu, 20 Dec 2018 17:30:04 +1100 Subject: Cleanup: naming --- source/blender/blenkernel/BKE_armature.h | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) (limited to 'source/blender/blenkernel/BKE_armature.h') diff --git a/source/blender/blenkernel/BKE_armature.h b/source/blender/blenkernel/BKE_armature.h index 3a29dd0c3cb..e7129fc3e7b 100644 --- a/source/blender/blenkernel/BKE_armature.h +++ b/source/blender/blenkernel/BKE_armature.h @@ -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); -- cgit v1.2.3