From c3fef001ee926fc183255b623f56da9fc5fcbb73 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Fri, 4 Sep 2015 04:18:49 +1000 Subject: View-Selected: use custom bones boundbox Support using custom pose-bone transform and object when calculating view bounds. --- source/blender/blenkernel/intern/armature.c | 39 +++++++++++++++++++++++++++ source/blender/blenkernel/intern/object.c | 41 +++++++++-------------------- 2 files changed, 52 insertions(+), 28 deletions(-) (limited to 'source/blender/blenkernel/intern') diff --git a/source/blender/blenkernel/intern/armature.c b/source/blender/blenkernel/intern/armature.c index 232d0e21490..9bb8726cdb3 100644 --- a/source/blender/blenkernel/intern/armature.c +++ b/source/blender/blenkernel/intern/armature.c @@ -2209,6 +2209,45 @@ BoundBox *BKE_armature_boundbox_get(Object *ob) return ob->bb; } +bool BKE_pose_minmax(Object *ob, float r_min[3], float r_max[3], bool use_hidden, bool use_select) +{ + bool changed = false; + + if (ob->pose) { + bArmature *arm = ob->data; + bPoseChannel *pchan; + + for (pchan = ob->pose->chanbase.first; pchan; pchan = pchan->next) { + /* XXX pchan->bone may be NULL for duplicated bones, see duplicateEditBoneObjects() comment + * (editarmature.c:2592)... Skip in this case too! */ + if (pchan->bone && + (!((use_hidden == false) && (PBONE_VISIBLE(arm, pchan->bone) == false)) && + !((use_select == true) && ((pchan->bone->flag & BONE_SELECTED) == 0)))) + { + bPoseChannel *pchan_tx = (pchan->custom && pchan->custom_tx) ? pchan->custom_tx : pchan; + BoundBox *bb_custom = pchan->custom ? BKE_object_boundbox_get(pchan->custom) : NULL; + + if (bb_custom) { + float mat[4][4]; + mul_m4_m4m4(mat, ob->obmat, pchan_tx->pose_mat); + BKE_boundbox_minmax(bb_custom, mat, r_min, r_max); + } + else { + float vec[3]; + mul_v3_m4v3(vec, ob->obmat, pchan_tx->pose_head); + minmax_v3v3_v3(r_min, r_max, vec); + mul_v3_m4v3(vec, ob->obmat, pchan_tx->pose_tail); + minmax_v3v3_v3(r_min, r_max, vec); + } + + changed = true; + } + } + } + + return changed; +} + /************** Graph evaluation ********************/ bPoseChannel *BKE_armature_ik_solver_find_root( diff --git a/source/blender/blenkernel/intern/object.c b/source/blender/blenkernel/intern/object.c index 63a66de28dd..fa20607ce30 100644 --- a/source/blender/blenkernel/intern/object.c +++ b/source/blender/blenkernel/intern/object.c @@ -2655,6 +2655,16 @@ void BKE_boundbox_calc_size_aabb(const BoundBox *bb, float r_size[3]) r_size[2] = 0.5f * fabsf(bb->vec[0][2] - bb->vec[1][2]); } +void BKE_boundbox_minmax(const BoundBox *bb, float obmat[4][4], float r_min[3], float r_max[3]) +{ + int i; + for (i = 0; i < 8; i++) { + float vec[3]; + mul_v3_m4v3(vec, obmat, bb->vec[i]); + minmax_v3v3_v3(r_min, r_max, vec); + } +} + BoundBox *BKE_object_boundbox_get(Object *ob) { BoundBox *bb = NULL; @@ -2730,7 +2740,6 @@ void BKE_object_minmax(Object *ob, float min_r[3], float max_r[3], const bool us { BoundBox bb; float vec[3]; - int a; bool changed = false; switch (ob->type) { @@ -2739,11 +2748,7 @@ void BKE_object_minmax(Object *ob, float min_r[3], float max_r[3], const bool us case OB_SURF: { bb = *BKE_curve_boundbox_get(ob); - - for (a = 0; a < 8; a++) { - mul_m4_v3(ob->obmat, bb.vec[a]); - minmax_v3v3_v3(min_r, max_r, bb.vec[a]); - } + BKE_boundbox_minmax(&bb, ob->obmat, min_r, max_r); changed = true; break; } @@ -2766,23 +2771,7 @@ void BKE_object_minmax(Object *ob, float min_r[3], float max_r[3], const bool us } case OB_ARMATURE: { - if (ob->pose) { - bArmature *arm = ob->data; - bPoseChannel *pchan; - - for (pchan = ob->pose->chanbase.first; pchan; pchan = pchan->next) { - /* XXX pchan->bone may be NULL for duplicated bones, see duplicateEditBoneObjects() comment - * (editarmature.c:2592)... Skip in this case too! */ - if (pchan->bone && !((use_hidden == false) && (PBONE_VISIBLE(arm, pchan->bone) == false))) { - mul_v3_m4v3(vec, ob->obmat, pchan->pose_head); - minmax_v3v3_v3(min_r, max_r, vec); - mul_v3_m4v3(vec, ob->obmat, pchan->pose_tail); - minmax_v3v3_v3(min_r, max_r, vec); - - changed = true; - } - } - } + changed = BKE_pose_minmax(ob, min_r, max_r, use_hidden, false); break; } case OB_MESH: @@ -2791,11 +2780,7 @@ void BKE_object_minmax(Object *ob, float min_r[3], float max_r[3], const bool us if (me) { bb = *BKE_mesh_boundbox_get(ob); - - for (a = 0; a < 8; a++) { - mul_m4_v3(ob->obmat, bb.vec[a]); - minmax_v3v3_v3(min_r, max_r, bb.vec[a]); - } + BKE_boundbox_minmax(&bb, ob->obmat, min_r, max_r); changed = true; } break; -- cgit v1.2.3