diff options
Diffstat (limited to 'source/blender/ikplugin')
-rw-r--r-- | source/blender/ikplugin/intern/iksolver_plugin.c | 31 | ||||
-rw-r--r-- | source/blender/ikplugin/intern/iksolver_plugin.h | 2 | ||||
-rw-r--r-- | source/blender/ikplugin/intern/itasc_plugin.cpp | 4 | ||||
-rw-r--r-- | source/blender/ikplugin/intern/itasc_plugin.h | 2 |
4 files changed, 31 insertions, 8 deletions
diff --git a/source/blender/ikplugin/intern/iksolver_plugin.c b/source/blender/ikplugin/intern/iksolver_plugin.c index b3c83bffb3f..6ea311b2c7b 100644 --- a/source/blender/ikplugin/intern/iksolver_plugin.c +++ b/source/blender/ikplugin/intern/iksolver_plugin.c @@ -50,6 +50,8 @@ #include <string.h> /* memcpy */ +#define USE_NONUNIFORM_SCALE + /* ********************** THE IK SOLVER ******************* */ /* allocates PoseTree, and links that to root bone/channel */ @@ -525,10 +527,10 @@ void iksolver_initialize_tree(struct Scene *UNUSED(scene), struct Object *ob, fl ob->pose->flag &= ~POSE_WAS_REBUILT; } -void iksolver_execute_tree(struct Scene *scene, struct Object *ob, struct bPoseChannel *pchan, float ctime) +void iksolver_execute_tree(struct Scene *scene, Object *ob, bPoseChannel *pchan_root, float ctime) { - while (pchan->iktree.first) { - PoseTree *tree = pchan->iktree.first; + while (pchan_root->iktree.first) { + PoseTree *tree = pchan_root->iktree.first; int a; /* stop on the first tree that isn't a standard IK chain */ @@ -542,6 +544,19 @@ void iksolver_execute_tree(struct Scene *scene, struct Object *ob, struct bPose /* tell blender that this channel was controlled by IK, it's cleared on each BKE_pose_where_is() */ tree->pchan[a]->flag |= POSE_CHAIN; } + +#ifdef USE_NONUNIFORM_SCALE + float (*pchan_scale_data)[3] = MEM_mallocN(sizeof(float[3]) * tree->totchannel, __func__); + + for (a = 0; a < tree->totchannel; a++) { + mat4_to_size(pchan_scale_data[a], tree->pchan[a]->pose_mat); + + /* make uniform at y scale since this controls the length */ + normalize_v3_length(tree->pchan[a]->pose_mat[0], pchan_scale_data[a][1]); + normalize_v3_length(tree->pchan[a]->pose_mat[2], pchan_scale_data[a][1]); + } +#endif + /* 5. execute the IK solver */ execute_posetree(scene, ob, tree); @@ -556,8 +571,16 @@ void iksolver_execute_tree(struct Scene *scene, struct Object *ob, struct bPose where_is_ik_bone(tree->pchan[a], tree->basis_change[a]); } +#ifdef USE_NONUNIFORM_SCALE + for (a = 0; a < tree->totchannel; a++) { + normalize_v3_length(tree->pchan[a]->pose_mat[0], pchan_scale_data[a][0]); + normalize_v3_length(tree->pchan[a]->pose_mat[2], pchan_scale_data[a][2]); + } + MEM_freeN(pchan_scale_data); +#endif + /* 7. and free */ - BLI_remlink(&pchan->iktree, tree); + BLI_remlink(&pchan_root->iktree, tree); free_posetree(tree); } } diff --git a/source/blender/ikplugin/intern/iksolver_plugin.h b/source/blender/ikplugin/intern/iksolver_plugin.h index c2ae4f937e7..07264280a25 100644 --- a/source/blender/ikplugin/intern/iksolver_plugin.h +++ b/source/blender/ikplugin/intern/iksolver_plugin.h @@ -41,7 +41,7 @@ extern "C" { #endif void iksolver_initialize_tree(struct Scene *scene, struct Object *ob, float ctime); -void iksolver_execute_tree(struct Scene *scene, struct Object *ob, struct bPoseChannel *pchan, float ctime); +void iksolver_execute_tree(struct Scene *scene, struct Object *ob, struct bPoseChannel *pchan_root, float ctime); #ifdef __cplusplus } diff --git a/source/blender/ikplugin/intern/itasc_plugin.cpp b/source/blender/ikplugin/intern/itasc_plugin.cpp index d4814a4e3a2..b8ed780397f 100644 --- a/source/blender/ikplugin/intern/itasc_plugin.cpp +++ b/source/blender/ikplugin/intern/itasc_plugin.cpp @@ -1770,7 +1770,7 @@ void itasc_initialize_tree(struct Scene *scene, Object *ob, float ctime) ob->pose->flag &= ~POSE_WAS_REBUILT; } -void itasc_execute_tree(struct Scene *scene, struct Object *ob, struct bPoseChannel *pchan, float ctime) +void itasc_execute_tree(struct Scene *scene, Object *ob, bPoseChannel *pchan_root, float ctime) { if (!ob->pose->ikdata) { // IK tree not yet created, no it now @@ -1784,7 +1784,7 @@ void itasc_execute_tree(struct Scene *scene, struct Object *ob, struct bPoseCha if (!ikparam) ikparam = &DefIKParam; for (IK_Scene *ikscene = ikdata->first; ikscene; ikscene = ikscene->next) { - if (ikscene->channels[0].pchan == pchan) { + if (ikscene->channels[0].pchan == pchan_root) { float timestep = scene->r.frs_sec_base / scene->r.frs_sec; if (ob->pose->flag & POSE_GAME_ENGINE) { timestep = ob->pose->ctime; diff --git a/source/blender/ikplugin/intern/itasc_plugin.h b/source/blender/ikplugin/intern/itasc_plugin.h index 0500125b4c7..bcd95bc31ca 100644 --- a/source/blender/ikplugin/intern/itasc_plugin.h +++ b/source/blender/ikplugin/intern/itasc_plugin.h @@ -41,7 +41,7 @@ extern "C" { #endif void itasc_initialize_tree(struct Scene *scene, struct Object *ob, float ctime); -void itasc_execute_tree(struct Scene *scene, struct Object *ob, struct bPoseChannel *pchan, float ctime); +void itasc_execute_tree(struct Scene *scene, struct Object *ob, struct bPoseChannel *pchan_root, float ctime); void itasc_release_tree(struct Scene *scene, struct Object *ob, float ctime); void itasc_clear_data(struct bPose *pose); void itasc_clear_cache(struct bPose *pose); |