godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use a new approach to fix bone pose override not being reset when IK animation is stopped. 

This reverts PR #35460 & commit 551c37167b.

(cherry picked from commit bb0358dd8d)
This commit is contained in:
Eric Rybicki 2020-01-25 10:06:14 +01:00 committed by Rémi Verschelde
parent 56336b4e24
commit 63daa19538
4 changed files with 1 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
editor/plugins/skeleton_ik_editor_plugin.cpp
View File

@ -41,21 +41,12 @@ void SkeletonIKEditorPlugin::_play() {
return; return;
if (play_btn->is_pressed()) { if (play_btn->is_pressed()) {
initial_bone_poses.resize(skeleton_ik->get_parent_skeleton()->get_bone_count());
for (int i = 0; i < skeleton_ik->get_parent_skeleton()->get_bone_count(); ++i) {
initial_bone_poses.write[i] = skeleton_ik->get_parent_skeleton()->get_bone_pose(i);
}
skeleton_ik->start(); skeleton_ik->start();
} else { } else {
skeleton_ik->stop(); skeleton_ik->stop();
if (initial_bone_poses.size() != skeleton_ik->get_parent_skeleton()->get_bone_count())
return;
for (int i = 0; i < skeleton_ik->get_parent_skeleton()->get_bone_count(); ++i) { for (int i = 0; i < skeleton_ik->get_parent_skeleton()->get_bone_count(); ++i) {
skeleton_ik->get_parent_skeleton()->set_bone_pose(i, initial_bone_poses[i]); skeleton_ik->get_parent_skeleton()->set_bone_global_pose_override(i, Transform(), 0);
} }
} }
} }

1
editor/plugins/skeleton_ik_editor_plugin.h
View File

@ -44,7 +44,6 @@ class SkeletonIKEditorPlugin : public EditorPlugin {
Button *play_btn; Button *play_btn;
EditorNode *editor; EditorNode *editor;
Vector<Transform> initial_bone_poses;
void _play(); void _play();

13
scene/animation/skeleton_ik.cpp
View File

@ -329,17 +329,6 @@ void FabrikInverseKinematic::solve(Task *p_task, real_t blending_delta, bool ove
} }
} }
void FabrikInverseKinematic::reset(Task *p_task) {
ChainItem *ci(&p_task->chain.chain_root);
while (ci) {
p_task->skeleton->set_bone_global_pose_override(ci->bone, Transform(), 0);
if (!ci->children.empty())
ci = &ci->children.write[0];
else
ci = NULL;
}
}
void SkeletonIK::_validate_property(PropertyInfo &property) const { void SkeletonIK::_validate_property(PropertyInfo &property) const {
if (property.name == "root_bone" || property.name == "tip_bone") { if (property.name == "root_bone" || property.name == "tip_bone") {
@ -542,8 +531,6 @@ void SkeletonIK::start(bool p_one_time) {
void SkeletonIK::stop() { void SkeletonIK::stop() {
set_process_internal(false); set_process_internal(false);
if (task)
FabrikInverseKinematic::reset(task);
} }
Transform SkeletonIK::_get_target_transform() { Transform SkeletonIK::_get_target_transform() {

1
scene/animation/skeleton_ik.h
View File

@ -139,7 +139,6 @@ public:
static void set_goal(Task *p_task, const Transform &p_goal); static void set_goal(Task *p_task, const Transform &p_goal);
static void make_goal(Task *p_task, const Transform &p_inverse_transf, real_t blending_delta); static void make_goal(Task *p_task, const Transform &p_inverse_transf, real_t blending_delta);
static void solve(Task *p_task, real_t blending_delta, bool override_tip_basis, bool p_use_magnet, const Vector3 &p_magnet_position); static void solve(Task *p_task, real_t blending_delta, bool override_tip_basis, bool p_use_magnet, const Vector3 &p_magnet_position);
static void reset(Task *p_task);
}; };
class SkeletonIK : public Node { class SkeletonIK : public Node {