diff options
author | Campbell Barton <ideasman42@gmail.com> | 2019-04-17 07:17:24 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2019-04-17 07:21:24 +0300 |
commit | e12c08e8d170b7ca40f204a5b0423c23a9fbc2c1 (patch) | |
tree | 8cf3453d12edb177a218ef8009357518ec6cab6a /source/blender/makesrna/intern/rna_armature_api.c | |
parent | b3dabc200a4b0399ec6b81f2ff2730d07b44fcaa (diff) |
ClangFormat: apply to source, most of intern
Apply clang format as proposed in T53211.
For details on usage and instructions for migrating branches
without conflicts, see:
https://wiki.blender.org/wiki/Tools/ClangFormat
Diffstat (limited to 'source/blender/makesrna/intern/rna_armature_api.c')
-rw-r--r-- | source/blender/makesrna/intern/rna_armature_api.c | 274 |
1 files changed, 151 insertions, 123 deletions
diff --git a/source/blender/makesrna/intern/rna_armature_api.c b/source/blender/makesrna/intern/rna_armature_api.c index 6174f58aa37..f3bdef75c9c 100644 --- a/source/blender/makesrna/intern/rna_armature_api.c +++ b/source/blender/makesrna/intern/rna_armature_api.c @@ -21,7 +21,6 @@ * \ingroup RNA */ - #include <stdlib.h> #include <stdio.h> #include <string.h> @@ -29,161 +28,190 @@ #include "RNA_define.h" -#include "rna_internal.h" /* own include */ +#include "rna_internal.h" /* own include */ #ifdef RNA_RUNTIME -#include <stddef.h> +# include <stddef.h> -#include "DNA_armature_types.h" +# include "DNA_armature_types.h" -#include "BLI_math_vector.h" -#include "BKE_armature.h" +# include "BLI_math_vector.h" +# include "BKE_armature.h" static void rna_EditBone_align_roll(EditBone *ebo, float no[3]) { - ebo->roll = ED_armature_ebone_roll_to_vector(ebo, no, false); + ebo->roll = ED_armature_ebone_roll_to_vector(ebo, no, false); } static float rna_Bone_do_envelope(Bone *bone, float *vec) { - float scale = (bone->flag & BONE_MULT_VG_ENV) == BONE_MULT_VG_ENV ? bone->weight : 1.0f; - return distfactor_to_bone(vec, bone->arm_head, bone->arm_tail, bone->rad_head * scale, - bone->rad_tail * scale, bone->dist * scale); + float scale = (bone->flag & BONE_MULT_VG_ENV) == BONE_MULT_VG_ENV ? bone->weight : 1.0f; + return distfactor_to_bone(vec, + bone->arm_head, + bone->arm_tail, + bone->rad_head * scale, + bone->rad_tail * scale, + bone->dist * scale); } -static void rna_Bone_convert_local_to_pose(Bone *bone, float *r_matrix, float *matrix, float *matrix_local, float *parent_matrix, float *parent_matrix_local, bool invert) +static void rna_Bone_convert_local_to_pose(Bone *bone, + float *r_matrix, + float *matrix, + float *matrix_local, + float *parent_matrix, + float *parent_matrix_local, + bool invert) { - BoneParentTransform bpt; - float offs_bone[4][4]; - float (*bone_arm_mat)[4] = (float (*)[4])matrix_local; - float (*parent_pose_mat)[4] = (float (*)[4])parent_matrix; - float (*parent_arm_mat)[4] = (float (*)[4])parent_matrix_local; - - if (is_zero_m4(parent_pose_mat) || is_zero_m4(parent_arm_mat)) { - /* No parent case. */ - 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_bone_parent_transform_calc_from_matrices(bone->flag, offs_bone, parent_arm_mat, parent_pose_mat, &bpt); - } - - if (invert) { - BKE_bone_parent_transform_invert(&bpt); - } - - BKE_bone_parent_transform_apply(&bpt, (float (*)[4])matrix, (float (*)[4])r_matrix); + BoneParentTransform bpt; + float offs_bone[4][4]; + float(*bone_arm_mat)[4] = (float(*)[4])matrix_local; + float(*parent_pose_mat)[4] = (float(*)[4])parent_matrix; + float(*parent_arm_mat)[4] = (float(*)[4])parent_matrix_local; + + if (is_zero_m4(parent_pose_mat) || is_zero_m4(parent_arm_mat)) { + /* No parent case. */ + 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_bone_parent_transform_calc_from_matrices( + bone->flag, offs_bone, parent_arm_mat, parent_pose_mat, &bpt); + } + + if (invert) { + BKE_bone_parent_transform_invert(&bpt); + } + + 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) { - vec_roll_to_mat3(axis, roll, (float (*)[3])r_matrix); + vec_roll_to_mat3(axis, roll, (float(*)[3])r_matrix); } -static void rna_Bone_AxisRollFromMatrix(float *matrix, float *axis_override, float *r_axis, float *r_roll) +static void rna_Bone_AxisRollFromMatrix(float *matrix, + float *axis_override, + float *r_axis, + float *r_roll) { - float mat[3][3]; + float mat[3][3]; - normalize_m3_m3(mat, (float (*)[3])matrix); + normalize_m3_m3(mat, (float(*)[3])matrix); - if (normalize_v3_v3(r_axis, axis_override) != 0.0f) { - mat3_vec_to_roll(mat, r_axis, r_roll); - } - else { - mat3_to_vec_roll(mat, r_axis, r_roll); - } + if (normalize_v3_v3(r_axis, axis_override) != 0.0f) { + mat3_vec_to_roll(mat, r_axis, r_roll); + } + else { + mat3_to_vec_roll(mat, r_axis, r_roll); + } } #else void RNA_api_armature_edit_bone(StructRNA *srna) { - FunctionRNA *func; - PropertyRNA *parm; - - func = RNA_def_function(srna, "align_roll", "rna_EditBone_align_roll"); - RNA_def_function_ui_description(func, "Align the bone to a localspace roll so the Z axis " - "points in the direction of the vector given"); - parm = RNA_def_float_vector(func, "vector", 3, NULL, -FLT_MAX, FLT_MAX, "Vector", "", -FLT_MAX, FLT_MAX); - RNA_def_parameter_flags(parm, 0, PARM_REQUIRED); + FunctionRNA *func; + PropertyRNA *parm; + + func = RNA_def_function(srna, "align_roll", "rna_EditBone_align_roll"); + RNA_def_function_ui_description(func, + "Align the bone to a localspace roll so the Z axis " + "points in the direction of the vector given"); + parm = RNA_def_float_vector( + func, "vector", 3, NULL, -FLT_MAX, FLT_MAX, "Vector", "", -FLT_MAX, FLT_MAX); + RNA_def_parameter_flags(parm, 0, PARM_REQUIRED); } void RNA_api_bone(StructRNA *srna) { - PropertyRNA *parm; - FunctionRNA *func; - - func = RNA_def_function(srna, "evaluate_envelope", "rna_Bone_do_envelope"); - RNA_def_function_ui_description(func, "Calculate bone envelope at given point"); - parm = RNA_def_float_vector_xyz(func, "point", 3, NULL, -FLT_MAX, FLT_MAX, "Point", - "Position in 3d space to evaluate", -FLT_MAX, FLT_MAX); - RNA_def_parameter_flags(parm, 0, PARM_REQUIRED); - /* return value */ - parm = RNA_def_float(func, "factor", 0, -FLT_MAX, FLT_MAX, "Factor", "Envelope factor", -FLT_MAX, FLT_MAX); - RNA_def_function_return(func, parm); - - func = RNA_def_function(srna, "convert_local_to_pose", "rna_Bone_convert_local_to_pose"); - RNA_def_function_ui_description(func, - "Transform a matrix from Local to Pose space (or back), taking " - "into account options like Inherit Scale and Local Location. " - "Unlike Object.convert_space, this uses custom rest and pose " - "matrices provided by the caller. If the parent matrices are " - "omitted, the bone is assumed to have no parent."); - parm = RNA_def_property(func, "matrix_return", PROP_FLOAT, PROP_MATRIX); - RNA_def_property_multi_array(parm, 2, rna_matrix_dimsize_4x4); - RNA_def_property_ui_text(parm, "", "The transformed matrix"); - RNA_def_function_output(func, parm); - parm = RNA_def_property(func, "matrix", PROP_FLOAT, PROP_MATRIX); - RNA_def_property_multi_array(parm, 2, rna_matrix_dimsize_4x4); - RNA_def_property_ui_text(parm, "", "The matrix to transform"); - RNA_def_parameter_flags(parm, 0, PARM_REQUIRED); - parm = RNA_def_property(func, "matrix_local", PROP_FLOAT, PROP_MATRIX); - RNA_def_property_multi_array(parm, 2, rna_matrix_dimsize_4x4); - RNA_def_property_ui_text(parm, "", "The custom rest matrix of this bone (Bone.matrix_local)"); - RNA_def_parameter_flags(parm, 0, PARM_REQUIRED); - parm = RNA_def_property(func, "parent_matrix", PROP_FLOAT, PROP_MATRIX); - RNA_def_property_multi_array(parm, 2, rna_matrix_dimsize_4x4); - RNA_def_property_ui_text(parm, "", "The custom pose matrix of the parent bone (PoseBone.matrix)"); - parm = RNA_def_property(func, "parent_matrix_local", PROP_FLOAT, PROP_MATRIX); - RNA_def_property_multi_array(parm, 2, rna_matrix_dimsize_4x4); - RNA_def_property_ui_text(parm, "", "The custom rest matrix of the parent bone (Bone.matrix_local)"); - parm = RNA_def_boolean(func, "invert", false, "", "Convert from Pose to Local space"); - - /* Conversions between Matrix and Axis + Roll representations. */ - func = RNA_def_function(srna, "MatrixFromAxisRoll", "rna_Bone_MatrixFromAxisRoll"); - RNA_def_function_ui_description(func, "Convert the axis + roll representation to a matrix"); - RNA_def_function_flag(func, FUNC_NO_SELF); - parm = RNA_def_property(func, "axis", PROP_FLOAT, PROP_XYZ); - RNA_def_property_array(parm, 3); - RNA_def_property_ui_text(parm, "", "The main axis of the bone (tail - head)"); - RNA_def_parameter_flags(parm, PROP_NEVER_NULL, PARM_REQUIRED); - parm = RNA_def_property(func, "roll", PROP_FLOAT, PROP_NONE); - RNA_def_property_ui_text(parm, "", "The roll of the bone"); - RNA_def_parameter_flags(parm, 0, PARM_REQUIRED); - parm = RNA_def_property(func, "result_matrix", PROP_FLOAT, PROP_MATRIX); - RNA_def_property_multi_array(parm, 2, rna_matrix_dimsize_3x3); - RNA_def_property_ui_text(parm, "", "The resulting orientation matrix"); - RNA_def_function_output(func, parm); - - func = RNA_def_function(srna, "AxisRollFromMatrix", "rna_Bone_AxisRollFromMatrix"); - RNA_def_function_ui_description(func, "Convert a rotational matrix to the axis + roll representation"); - RNA_def_function_flag(func, FUNC_NO_SELF); - parm = RNA_def_property(func, "matrix", PROP_FLOAT, PROP_MATRIX); - RNA_def_property_multi_array(parm, 2, rna_matrix_dimsize_3x3); - RNA_def_property_ui_text(parm, "", "The orientation matrix of the bone"); - RNA_def_parameter_flags(parm, PROP_NEVER_NULL, PARM_REQUIRED); - parm = RNA_def_property(func, "axis", PROP_FLOAT, PROP_MATRIX); - RNA_def_property_array(parm, 3); - RNA_def_property_ui_text(parm, "", "The optional override for the axis (finds closest approximation for the matrix)"); - parm = RNA_def_property(func, "result_axis", PROP_FLOAT, PROP_XYZ); - RNA_def_property_array(parm, 3); - RNA_def_property_ui_text(parm, "", "The main axis of the bone"); - RNA_def_function_output(func, parm); - parm = RNA_def_property(func, "result_roll", PROP_FLOAT, PROP_NONE); - RNA_def_property_ui_text(parm, "", "The roll of the bone"); - RNA_def_function_output(func, parm); + PropertyRNA *parm; + FunctionRNA *func; + + func = RNA_def_function(srna, "evaluate_envelope", "rna_Bone_do_envelope"); + RNA_def_function_ui_description(func, "Calculate bone envelope at given point"); + parm = RNA_def_float_vector_xyz(func, + "point", + 3, + NULL, + -FLT_MAX, + FLT_MAX, + "Point", + "Position in 3d space to evaluate", + -FLT_MAX, + FLT_MAX); + RNA_def_parameter_flags(parm, 0, PARM_REQUIRED); + /* return value */ + parm = RNA_def_float( + func, "factor", 0, -FLT_MAX, FLT_MAX, "Factor", "Envelope factor", -FLT_MAX, FLT_MAX); + RNA_def_function_return(func, parm); + + func = RNA_def_function(srna, "convert_local_to_pose", "rna_Bone_convert_local_to_pose"); + RNA_def_function_ui_description(func, + "Transform a matrix from Local to Pose space (or back), taking " + "into account options like Inherit Scale and Local Location. " + "Unlike Object.convert_space, this uses custom rest and pose " + "matrices provided by the caller. If the parent matrices are " + "omitted, the bone is assumed to have no parent."); + parm = RNA_def_property(func, "matrix_return", PROP_FLOAT, PROP_MATRIX); + RNA_def_property_multi_array(parm, 2, rna_matrix_dimsize_4x4); + RNA_def_property_ui_text(parm, "", "The transformed matrix"); + RNA_def_function_output(func, parm); + parm = RNA_def_property(func, "matrix", PROP_FLOAT, PROP_MATRIX); + RNA_def_property_multi_array(parm, 2, rna_matrix_dimsize_4x4); + RNA_def_property_ui_text(parm, "", "The matrix to transform"); + RNA_def_parameter_flags(parm, 0, PARM_REQUIRED); + parm = RNA_def_property(func, "matrix_local", PROP_FLOAT, PROP_MATRIX); + RNA_def_property_multi_array(parm, 2, rna_matrix_dimsize_4x4); + RNA_def_property_ui_text(parm, "", "The custom rest matrix of this bone (Bone.matrix_local)"); + RNA_def_parameter_flags(parm, 0, PARM_REQUIRED); + parm = RNA_def_property(func, "parent_matrix", PROP_FLOAT, PROP_MATRIX); + RNA_def_property_multi_array(parm, 2, rna_matrix_dimsize_4x4); + RNA_def_property_ui_text( + parm, "", "The custom pose matrix of the parent bone (PoseBone.matrix)"); + parm = RNA_def_property(func, "parent_matrix_local", PROP_FLOAT, PROP_MATRIX); + RNA_def_property_multi_array(parm, 2, rna_matrix_dimsize_4x4); + RNA_def_property_ui_text( + parm, "", "The custom rest matrix of the parent bone (Bone.matrix_local)"); + parm = RNA_def_boolean(func, "invert", false, "", "Convert from Pose to Local space"); + + /* Conversions between Matrix and Axis + Roll representations. */ + func = RNA_def_function(srna, "MatrixFromAxisRoll", "rna_Bone_MatrixFromAxisRoll"); + RNA_def_function_ui_description(func, "Convert the axis + roll representation to a matrix"); + RNA_def_function_flag(func, FUNC_NO_SELF); + parm = RNA_def_property(func, "axis", PROP_FLOAT, PROP_XYZ); + RNA_def_property_array(parm, 3); + RNA_def_property_ui_text(parm, "", "The main axis of the bone (tail - head)"); + RNA_def_parameter_flags(parm, PROP_NEVER_NULL, PARM_REQUIRED); + parm = RNA_def_property(func, "roll", PROP_FLOAT, PROP_NONE); + RNA_def_property_ui_text(parm, "", "The roll of the bone"); + RNA_def_parameter_flags(parm, 0, PARM_REQUIRED); + parm = RNA_def_property(func, "result_matrix", PROP_FLOAT, PROP_MATRIX); + RNA_def_property_multi_array(parm, 2, rna_matrix_dimsize_3x3); + RNA_def_property_ui_text(parm, "", "The resulting orientation matrix"); + RNA_def_function_output(func, parm); + + func = RNA_def_function(srna, "AxisRollFromMatrix", "rna_Bone_AxisRollFromMatrix"); + RNA_def_function_ui_description(func, + "Convert a rotational matrix to the axis + roll representation"); + RNA_def_function_flag(func, FUNC_NO_SELF); + parm = RNA_def_property(func, "matrix", PROP_FLOAT, PROP_MATRIX); + RNA_def_property_multi_array(parm, 2, rna_matrix_dimsize_3x3); + RNA_def_property_ui_text(parm, "", "The orientation matrix of the bone"); + RNA_def_parameter_flags(parm, PROP_NEVER_NULL, PARM_REQUIRED); + parm = RNA_def_property(func, "axis", PROP_FLOAT, PROP_MATRIX); + RNA_def_property_array(parm, 3); + RNA_def_property_ui_text( + parm, "", "The optional override for the axis (finds closest approximation for the matrix)"); + parm = RNA_def_property(func, "result_axis", PROP_FLOAT, PROP_XYZ); + RNA_def_property_array(parm, 3); + RNA_def_property_ui_text(parm, "", "The main axis of the bone"); + RNA_def_function_output(func, parm); + parm = RNA_def_property(func, "result_roll", PROP_FLOAT, PROP_NONE); + RNA_def_property_ui_text(parm, "", "The roll of the bone"); + RNA_def_function_output(func, parm); } #endif |