Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Inverse kinematic #18699

Merged
merged 2 commits into from
Aug 4, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions editor/editor_node.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,7 @@
#include "editor/plugins/shader_graph_editor_plugin.h"
#include "editor/plugins/skeleton_2d_editor_plugin.h"
#include "editor/plugins/skeleton_editor_plugin.h"
#include "editor/plugins/skeleton_ik_editor_plugin.h"
#include "editor/plugins/spatial_editor_plugin.h"
#include "editor/plugins/sprite_editor_plugin.h"
#include "editor/plugins/sprite_frames_editor_plugin.h"
Expand Down Expand Up @@ -5596,6 +5597,7 @@ EditorNode::EditorNode() {
add_editor_plugin(memnew(AudioBusesEditorPlugin(audio_bus_editor)));
add_editor_plugin(memnew(AudioBusesEditorPlugin(audio_bus_editor)));
add_editor_plugin(memnew(SkeletonEditorPlugin(this)));
add_editor_plugin(memnew(SkeletonIKEditorPlugin(this)));
add_editor_plugin(memnew(PhysicalBonePlugin(this)));

// FIXME: Disabled as (according to reduz) users were complaining that it gets in the way
Expand Down
110 changes: 110 additions & 0 deletions editor/plugins/skeleton_ik_editor_plugin.cpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,110 @@
/*************************************************************************/
/* skeleton_ik_editor_plugin.cpp */
/*************************************************************************/
/* This file is part of: */
/* GODOT ENGINE */
/* https://godotengine.org */
/*************************************************************************/
/* Copyright (c) 2007-2017 Juan Linietsky, Ariel Manzur. */
/* Copyright (c) 2014-2017 Godot Engine contributors (cf. AUTHORS.md) */
/* */
/* Permission is hereby granted, free of charge, to any person obtaining */
/* a copy of this software and associated documentation files (the */
/* "Software"), to deal in the Software without restriction, including */
/* without limitation the rights to use, copy, modify, merge, publish, */
/* distribute, sublicense, and/or sell copies of the Software, and to */
/* permit persons to whom the Software is furnished to do so, subject to */
/* the following conditions: */
/* */
/* The above copyright notice and this permission notice shall be */
/* included in all copies or substantial portions of the Software. */
/* */
/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, */
/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF */
/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.*/
/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY */
/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, */
/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
/*************************************************************************/

#include "skeleton_ik_editor_plugin.h"

#include "scene/animation/skeleton_ik.h"

void SkeletonIKEditorPlugin::_play() {

if (!skeleton_ik)
return;

if (!skeleton_ik->get_parent_skeleton())
return;

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();
} else {
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) {
skeleton_ik->get_parent_skeleton()->set_bone_pose(i, initial_bone_poses[i]);
}
}
}

void SkeletonIKEditorPlugin::edit(Object *p_object) {

if (p_object != skeleton_ik) {
if (skeleton_ik) {
play_btn->set_pressed(false);
_play();
}
}

SkeletonIK *s = Object::cast_to<SkeletonIK>(p_object);
if (!s)
return;

skeleton_ik = s;
}

bool SkeletonIKEditorPlugin::handles(Object *p_object) const {

return p_object->is_class("SkeletonIK");
}

void SkeletonIKEditorPlugin::make_visible(bool p_visible) {

if (p_visible)
play_btn->show();
else
play_btn->hide();
}

void SkeletonIKEditorPlugin::_bind_methods() {

ClassDB::bind_method("_play", &SkeletonIKEditorPlugin::_play);
}

SkeletonIKEditorPlugin::SkeletonIKEditorPlugin(EditorNode *p_node) {

editor = p_node;
play_btn = memnew(Button);
play_btn->set_icon(editor->get_gui_base()->get_icon("Play", "EditorIcons"));
play_btn->set_text(TTR("Play IK"));
play_btn->set_toggle_mode(true);
play_btn->hide();
play_btn->connect("pressed", this, "_play");
add_control_to_container(CONTAINER_SPATIAL_EDITOR_MENU, play_btn);
skeleton_ik = NULL;
}

SkeletonIKEditorPlugin::~SkeletonIKEditorPlugin() {}
65 changes: 65 additions & 0 deletions editor/plugins/skeleton_ik_editor_plugin.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,65 @@
/*************************************************************************/
/* skeleton_ik_editor_plugin.h */
/*************************************************************************/
/* This file is part of: */
/* GODOT ENGINE */
/* https://godotengine.org */
/*************************************************************************/
/* Copyright (c) 2007-2017 Juan Linietsky, Ariel Manzur. */
/* Copyright (c) 2014-2017 Godot Engine contributors (cf. AUTHORS.md) */
/* */
/* Permission is hereby granted, free of charge, to any person obtaining */
/* a copy of this software and associated documentation files (the */
/* "Software"), to deal in the Software without restriction, including */
/* without limitation the rights to use, copy, modify, merge, publish, */
/* distribute, sublicense, and/or sell copies of the Software, and to */
/* permit persons to whom the Software is furnished to do so, subject to */
/* the following conditions: */
/* */
/* The above copyright notice and this permission notice shall be */
/* included in all copies or substantial portions of the Software. */
/* */
/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, */
/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF */
/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.*/
/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY */
/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, */
/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
/*************************************************************************/

#ifndef SKELETON_IK_EDITOR_PLUGIN_H
#define SKELETON_IK_EDITOR_PLUGIN_H

#include "editor/editor_node.h"
#include "editor/editor_plugin.h"

class SkeletonIK;

class SkeletonIKEditorPlugin : public EditorPlugin {

GDCLASS(SkeletonIKEditorPlugin, EditorPlugin);

SkeletonIK *skeleton_ik;

Button *play_btn;
EditorNode *editor;
Vector<Transform> initial_bone_poses;

void _play();

protected:
static void _bind_methods();

public:
virtual String get_name() const { return "SkeletonIK"; }
bool has_main_screen() const { return false; }
virtual void edit(Object *p_object);
virtual bool handles(Object *p_object) const;
virtual void make_visible(bool p_visible);

SkeletonIKEditorPlugin(EditorNode *p_node);
~SkeletonIKEditorPlugin();
};

#endif // SKELETON_IK_EDITOR_PLUGIN_H
1 change: 1 addition & 0 deletions scene/3d/physics_body.h
Original file line number Diff line number Diff line change
Expand Up @@ -557,6 +557,7 @@ class PhysicalBone : public PhysicsBody {

private:
static Skeleton *find_skeleton_parent(Node *p_parent);

void _fix_joint_offset();
void _reload_joint();

Expand Down
11 changes: 8 additions & 3 deletions scene/3d/skeleton.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -600,9 +600,12 @@ PhysicalBone *Skeleton::_get_physical_bone_parent(int p_bone) {
void Skeleton::_rebuild_physical_bones_cache() {
const int b_size = bones.size();
for (int i = 0; i < b_size; ++i) {
bones.write[i].cache_parent_physical_bone = _get_physical_bone_parent(i);
if (bones[i].physical_bone)
bones[i].physical_bone->_on_bone_parent_changed();
PhysicalBone *parent_pb = _get_physical_bone_parent(i);
if (parent_pb != bones[i].physical_bone) {
bones.write[i].cache_parent_physical_bone = parent_pb;
if (bones[i].physical_bone)
bones[i].physical_bone->_on_bone_parent_changed();
}
}
}

Expand Down Expand Up @@ -740,6 +743,8 @@ void Skeleton::_bind_methods() {

#endif // _3D_DISABLED

ClassDB::bind_method(D_METHOD("set_bone_ignore_animation", "bone", "ignore"), &Skeleton::set_bone_ignore_animation);

BIND_CONSTANT(NOTIFICATION_UPDATE_SKELETON);
}

Expand Down
4 changes: 3 additions & 1 deletion scene/3d/skeleton.h
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,8 @@
*/

#ifndef _3D_DISABLED
typedef int BoneId;

class PhysicalBone;
#endif // _3D_DISABLED

Expand Down Expand Up @@ -96,7 +98,7 @@ class Skeleton : public Spatial {
void _make_dirty();
bool dirty;

//bind helpers
// bind helpers
Array _get_bound_child_nodes_to_bone(int p_bone) const {

Array bound;
Expand Down
Loading