maxmustermann/godot
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Animation Blend Spaces

Browse source
This commit is contained in:
Juan Linietsky 2018-06-21 15:45:44 -03:00
parent 0254616c37
commit a0719533bd
12 changed files with 1807 additions and 45 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
editor/editor_node.cpp
View file

@ -66,6 +66,7 @@
#include "editor/import/resource_importer_scene.h"
#include "editor/import/resource_importer_texture.h"
#include "editor/import/resource_importer_wav.h"
#include "editor/plugins/animation_blend_space_editor.h"
#include "editor/plugins/animation_blend_tree_editor_plugin.h"
#include "editor/plugins/animation_player_editor_plugin.h"
#include "editor/plugins/animation_tree_editor_plugin.h"
@ -5371,8 +5372,6 @@ EditorNode::EditorNode() {
add_editor_plugin(memnew(SpatialEditorPlugin(this)));
add_editor_plugin(memnew(ScriptEditorPlugin(this)));
add_editor_plugin(memnew(AnimationNodeBlendTreeEditorPlugin(this)));
EditorAudioBuses *audio_bus_editor = EditorAudioBuses::register_editor();
ScriptTextEditor::register_editor(); //register one for text scripts
@ -5394,6 +5393,8 @@ EditorNode::EditorNode() {
add_editor_plugin(memnew(ShaderEditorPlugin(this)));
// FIXME: Disabled for Godot 3.0 as made incompatible, it needs to be ported to the new API.
//add_editor_plugin(memnew(ShaderGraphEditorPlugin(this)));
add_editor_plugin(memnew(AnimationNodeBlendTreeEditorPlugin(this)));
add_editor_plugin(memnew(AnimationNodeBlendSpaceEditorPlugin(this)));
add_editor_plugin(memnew(CameraEditorPlugin(this)));
add_editor_plugin(memnew(ThemeEditorPlugin(this)));

82
editor/icons/icon_tool_triangle.svg Normal file
View file

@ -0,0 +1,82 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
width="16"
height="16"
version="1.1"
viewBox="0 0 16 16"
id="svg8"
sodipodi:docname="icon_tool_triangle.svg"
inkscape:version="0.92.3 (2405546, 2018-03-11)">
<metadata
id="metadata14">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
<dc:title />
</cc:Work>
</rdf:RDF>
</metadata>
<defs
id="defs12" />
<sodipodi:namedview
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1"
objecttolerance="10"
gridtolerance="10"
guidetolerance="10"
inkscape:pageopacity="0"
inkscape:pageshadow="2"
inkscape:window-width="1204"
inkscape:window-height="703"
id="namedview10"
showgrid="false"
inkscape:zoom="29.5"
inkscape:cx="8.0650451"
inkscape:cy="7.0341257"
inkscape:window-x="542"
inkscape:window-y="205"
inkscape:window-maximized="0"
inkscape:current-layer="g4" />
<g
transform="translate(0 -1036.4)"
id="g6">
<g
transform="translate(-26.001 -9.8683)"
id="g4">
<path
style="fill:#e0e0e0;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
d="m 27.695915,1056.3022 c 0,0 7.457627,-8.0678 7.118644,-7.8644 -0.338983,0.2034 5.830509,11.7288 5.830509,11.7288 z"
id="path821"
inkscape:connector-curvature="0" />
<circle
style="fill:#4b4b4b;fill-opacity:1;stroke:#e0e0e0;stroke-width:0.51200002;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="path825"
cx="34.662014"
cy="1048.5903"
r="1.607564" />
<circle
style="fill:#4b4b4b;fill-opacity:1;stroke:#e0e0e0;stroke-width:0.51200002;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="path825-3"
cx="39.933205"
cy="1059.6581"
r="1.607564" />
<circle
style="fill:#4b4b4b;fill-opacity:1;stroke:#e0e0e0;stroke-width:0.51200002;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="path825-3-6"
cx="28.17049"
cy="1056.2683"
r="1.607564" />
</g>
</g>
</svg>
Side by side

After

Width:  |  Height:  |  Size: 2.7 KiB

946
editor/plugins/animation_blend_space_editor.cpp Normal file
View file

@ -0,0 +1,946 @@
#include "animation_blend_space_editor.h"
#include "core/io/resource_loader.h"
#include "core/project_settings.h"
#include "os/input.h"
#include "os/keyboard.h"
#include "scene/animation/animation_blend_tree.h"
#include "scene/animation/animation_player.h"
#include "scene/gui/menu_button.h"
#include "scene/gui/panel.h"
#include "scene/main/viewport.h"
void AnimationNodeBlendSpaceEditor::edit(AnimationNodeBlendSpace *p_blend_space) {
blend_space = p_blend_space;
if (!blend_space) {
hide();
} else {
_update_space();
}
}
void AnimationNodeBlendSpaceEditor::_blend_space_gui_input(const Ref<InputEvent> &p_event) {
Ref<InputEventMouseButton> mb = p_event;
if (mb.is_valid() && mb->is_pressed() && ((tool_select->is_pressed() && mb->get_button_index() == BUTTON_RIGHT) || (mb->get_button_index() == BUTTON_LEFT && tool_create->is_pressed()))) {
menu->clear();
animations_menu->clear();
animations_to_add.clear();
List<StringName> classes;
classes.sort_custom<StringName::AlphCompare>();
ClassDB::get_inheriters_from_class("AnimationRootNode", &classes);
menu->add_submenu_item(TTR("Add Animation"), "animations");
AnimationGraphPlayer *gp = blend_space->get_graph_player();
ERR_FAIL_COND(!gp);
if (gp && gp->has_node(gp->get_animation_player())) {
AnimationPlayer *ap = Object::cast_to<AnimationPlayer>(gp->get_node(gp->get_animation_player()));
if (ap) {
List<StringName> names;
ap->get_animation_list(&names);
for (List<StringName>::Element *E = names.front(); E; E = E->next()) {
animations_menu->add_icon_item(get_icon("Animation", "EditorIcons"), E->get());
animations_to_add.push_back(E->get());
}
}
}
for (List<StringName>::Element *E = classes.front(); E; E = E->next()) {
String name = String(E->get()).replace_first("AnimationNode", "");
if (name == "Animation")
continue; // nope
int idx = menu->get_item_count();
menu->add_item(vformat("Add %s", name));
menu->set_item_metadata(idx, E->get());
}
menu->set_global_position(blend_space_draw->get_global_transform().xform(mb->get_position()));
menu->popup();
add_point_pos = (mb->get_position() / blend_space_draw->get_size());
add_point_pos.y = 1.0 - add_point_pos.y;
add_point_pos *= (blend_space->get_max_space() - blend_space->get_min_space());
add_point_pos += blend_space->get_min_space();
if (snap->is_pressed()) {
add_point_pos.x = Math::stepify(add_point_pos.x, blend_space->get_snap().x);
add_point_pos.y = Math::stepify(add_point_pos.y, blend_space->get_snap().y);
}
}
if (mb.is_valid() && mb->is_pressed() && tool_select->is_pressed() && mb->get_button_index() == BUTTON_LEFT) {
blend_space_draw->update(); //update anyway
//try to see if a point can be selected
selected_point = -1;
selected_triangle = -1;
_update_tool_erase();
for (int i = 0; i < points.size(); i++) {
if (points[i].distance_to(mb->get_position()) < 10 * EDSCALE) {
selected_point = i;
Ref<AnimationNode> node = blend_space->get_blend_point_node(i);
EditorNode::get_singleton()->push_item(node.ptr(), "", true);
dragging_selected_attempt = true;
drag_from = mb->get_position();
_update_tool_erase();
_update_edited_point_pos();
return;
}
}
//then try to see if a triangle can be selected
for (int i = 0; i < blend_space->get_triangle_count(); i++) {
Vector<Vector2> triangle;
for (int j = 0; j < 3; j++) {
int idx = blend_space->get_triangle_point(i, j);
ERR_FAIL_INDEX(idx, points.size());
triangle.push_back(points[idx]);
}
if (Geometry::is_point_in_triangle(mb->get_position(), triangle[0], triangle[1], triangle[2])) {
selected_triangle = i;
_update_tool_erase();
return;
}
}
}
if (mb.is_valid() && mb->is_pressed() && tool_triangle->is_pressed() && mb->get_button_index() == BUTTON_LEFT) {
blend_space_draw->update(); //update anyway
//try to see if a point can be selected
selected_point = -1;
for (int i = 0; i < points.size(); i++) {
if (making_triangle.find(i) != -1)
continue;
if (points[i].distance_to(mb->get_position()) < 10 * EDSCALE) {
making_triangle.push_back(i);
if (making_triangle.size() == 3) {
//add triangle!
if (blend_space->has_triangle(making_triangle[0], making_triangle[1], making_triangle[2])) {
making_triangle.clear();
EditorNode::get_singleton()->show_warning(TTR("Triangle already exists"));
return;
}
updating = true;
undo_redo->create_action("Add Triangle");
undo_redo->add_do_method(blend_space, "add_triangle", making_triangle[0], making_triangle[1], making_triangle[2]);
undo_redo->add_undo_method(blend_space, "remove_triangle", blend_space->get_triangle_count());
undo_redo->add_do_method(this, "_update_space");
undo_redo->add_undo_method(this, "_update_space");
undo_redo->commit_action();
updating = false;
making_triangle.clear();
}
return;
}
}
}
if (mb.is_valid() && !mb->is_pressed() && dragging_selected_attempt && mb->get_button_index() == BUTTON_LEFT) {
if (dragging_selected) {
//move
Vector2 point = blend_space->get_blend_point_position(selected_point);
point += drag_ofs;
if (snap->is_pressed()) {
point.x = Math::stepify(point.x, blend_space->get_snap().x);
point.y = Math::stepify(point.y, blend_space->get_snap().y);
}
updating = true;
undo_redo->create_action("Move Node Point");
undo_redo->add_do_method(blend_space, "set_blend_point_position", selected_point, point);
undo_redo->add_undo_method(blend_space, "set_blend_point_position", selected_point, blend_space->get_blend_point_position(selected_point));
undo_redo->add_do_method(this, "_update_space");
undo_redo->add_undo_method(this, "_update_space");
undo_redo->add_do_method(this, "_update_edited_point_pos");
undo_redo->add_undo_method(this, "_update_edited_point_pos");
undo_redo->commit_action();
updating = false;
_update_edited_point_pos();
}
dragging_selected_attempt = false;
dragging_selected = false;
blend_space_draw->update();
}
if (mb.is_valid() && mb->is_pressed() && tool_blend->is_pressed() && mb->get_button_index() == BUTTON_LEFT) {
Vector2 blend_pos = (mb->get_position() / blend_space_draw->get_size());
blend_pos.y = 1.0 - blend_pos.y;
blend_pos *= (blend_space->get_max_space() - blend_space->get_min_space());
blend_pos += blend_space->get_min_space();
blend_space->set_blend_pos(blend_pos);
blend_space_draw->update();
}
Ref<InputEventMouseMotion> mm = p_event;
if (mm.is_valid() && dragging_selected_attempt) {
dragging_selected = true;
drag_ofs = ((mm->get_position() - drag_from) / blend_space_draw->get_size()) * (blend_space->get_max_space() - blend_space->get_min_space()) * Vector2(1, -1);
blend_space_draw->update();
_update_edited_point_pos();
}
if (mm.is_valid() && tool_triangle->is_pressed() && making_triangle.size()) {
blend_space_draw->update();
}
if (mm.is_valid() && !tool_triangle->is_pressed() && making_triangle.size()) {
making_triangle.clear();
blend_space_draw->update();
}
if (mm.is_valid() && tool_blend->is_pressed() && mm->get_button_mask() & BUTTON_MASK_LEFT) {
Vector2 blend_pos = (mm->get_position() / blend_space_draw->get_size());
blend_pos.y = 1.0 - blend_pos.y;
blend_pos *= (blend_space->get_max_space() - blend_space->get_min_space());
blend_pos += blend_space->get_min_space();
blend_space->set_blend_pos(blend_pos);
blend_space_draw->update();
}
}
void AnimationNodeBlendSpaceEditor::_add_menu_type(int p_index) {
String type = menu->get_item_metadata(p_index);
print_line("type: " + type);
Object *obj = ClassDB::instance(type);
ERR_FAIL_COND(!obj);
AnimationNode *an = Object::cast_to<AnimationNode>(obj);
ERR_FAIL_COND(!an);
Ref<AnimationNode> node(an);
updating = true;
undo_redo->create_action("Add Node Point");
undo_redo->add_do_method(blend_space, "add_blend_point", node, add_point_pos);
undo_redo->add_undo_method(blend_space, "remove_blend_point", blend_space->get_blend_point_count());
undo_redo->add_do_method(this, "_update_space");
undo_redo->add_undo_method(this, "_update_space");
undo_redo->commit_action();
updating = false;
blend_space_draw->update();
}
void AnimationNodeBlendSpaceEditor::_add_animation_type(int p_index) {
Ref<AnimationNodeAnimation> anim;
anim.instance();
anim->set_animation(animations_to_add[p_index]);
updating = true;
undo_redo->create_action("Add Animation Point");
undo_redo->add_do_method(blend_space, "add_blend_point", anim, add_point_pos);
undo_redo->add_undo_method(blend_space, "remove_blend_point", blend_space->get_blend_point_count());
undo_redo->add_do_method(this, "_update_space");
undo_redo->add_undo_method(this, "_update_space");
undo_redo->commit_action();
updating = false;
blend_space_draw->update();
}
void AnimationNodeBlendSpaceEditor::_update_tool_erase() {
tool_erase->set_disabled(!(selected_point >= 0 && selected_point < blend_space->get_blend_point_count()) && !(selected_triangle >= 0 && selected_triangle < blend_space->get_triangle_count()));
if (selected_point >= 0 && selected_point < blend_space->get_blend_point_count()) {
Ref<AnimationNode> an = blend_space->get_blend_point_node(selected_point);
if (EditorNode::get_singleton()->item_has_editor(an.ptr())) {
open_editor->show();
} else {
open_editor->hide();
}
edit_hb->show();
} else {
edit_hb->hide();
}
}
void AnimationNodeBlendSpaceEditor::_tool_switch(int p_tool) {
making_triangle.clear();
if (p_tool == 0) {
tool_erase->show();
tool_erase_sep->show();
} else {
tool_erase->hide();
tool_erase_sep->hide();
}
_update_tool_erase();
blend_space_draw->update();
}
void AnimationNodeBlendSpaceEditor::_blend_space_draw() {
Color linecolor = get_color("font_color", "Label");
Color linecolor_soft = linecolor;
linecolor_soft.a *= 0.5;
Ref<Font> font = get_font("font", "Label");
Ref<Texture> icon = get_icon("KeyValue", "EditorIcons");
Ref<Texture> icon_selected = get_icon("KeySelected", "EditorIcons");
Size2 s = blend_space_draw->get_size();
blend_space_draw->draw_line(Point2(0, 0), Point2(0, s.height), linecolor);
blend_space_draw->draw_line(Point2(0, s.height - 1), Point2(s.width, s.height - 1), linecolor);
blend_space_draw->draw_line(Point2(0, 0), Point2(5 * EDSCALE, 0), linecolor);
if (blend_space->get_min_space().y < 0) {
int y = (blend_space->get_max_space().y / (blend_space->get_max_space().y - blend_space->get_min_space().y)) * s.height;
blend_space_draw->draw_line(Point2(0, y), Point2(5 * EDSCALE, y), linecolor);
blend_space_draw->draw_string(font, Point2(2 * EDSCALE, y - font->get_height() + font->get_ascent()), "0", linecolor);
blend_space_draw->draw_line(Point2(5 * EDSCALE, y), Point2(s.width, y), linecolor_soft);
}
if (blend_space->get_min_space().x < 0) {
int x = (blend_space->get_max_space().x / (blend_space->get_max_space().x - blend_space->get_min_space().x)) * s.width;
blend_space_draw->draw_line(Point2(x, s.height - 1), Point2(x, s.height - 5 * EDSCALE), linecolor);
blend_space_draw->draw_string(font, Point2(x + 2 * EDSCALE, s.height - 2 * EDSCALE - font->get_height() + font->get_ascent()), "0", linecolor);
blend_space_draw->draw_line(Point2(x, s.height - 5 * EDSCALE), Point2(x, 0), linecolor_soft);
}
if (snap->is_pressed()) {
linecolor_soft.a = linecolor.a * 0.1;
if (blend_space->get_snap().x > 0) {
int prev_idx;
for (int i = 0; i < s.x; i++) {
float v = blend_space->get_min_space().x + i * (blend_space->get_max_space().x - blend_space->get_min_space().x) / s.x;
int idx = int(v / blend_space->get_snap().x);
if (i > 0 && prev_idx != idx) {
blend_space_draw->draw_line(Point2(i, 0), Point2(i, s.height), linecolor_soft);
}
prev_idx = idx;
}
}
if (blend_space->get_snap().y > 0) {
int prev_idx;
for (int i = 0; i < s.y; i++) {
float v = blend_space->get_max_space().y - i * (blend_space->get_max_space().y - blend_space->get_min_space().y) / s.y;
int idx = int(v / blend_space->get_snap().y);
if (i > 0 && prev_idx != idx) {
blend_space_draw->draw_line(Point2(0, i), Point2(s.width, i), linecolor_soft);
}
prev_idx = idx;
}
}
}
//triangles first
for (int i = 0; i < blend_space->get_triangle_count(); i++) {
Vector<Vector2> points;
points.resize(3);
for (int j = 0; j < 3; j++) {
int point_idx = blend_space->get_triangle_point(i, j);
Vector2 point = blend_space->get_blend_point_position(point_idx);
if (dragging_selected && selected_point == point_idx) {
point += drag_ofs;
if (snap->is_pressed()) {
point.x = Math::stepify(point.x, blend_space->get_snap().x);
point.y = Math::stepify(point.y, blend_space->get_snap().y);
}
}
point = (point - blend_space->get_min_space()) / (blend_space->get_max_space() - blend_space->get_min_space());
point *= s;
point.y = s.height - point.y;
points[j] = point;
}
for (int j = 0; j < 3; j++) {
blend_space_draw->draw_line(points[j], points[(j + 1) % 3], linecolor, 1, true);
}
Color color;
if (i == selected_triangle) {
color = get_color("accent_color", "Editor");
color.a *= 0.5;
} else {
color = linecolor;
color.a *= 0.2;
}
Vector<Color> colors;
colors.push_back(color);
colors.push_back(color);
colors.push_back(color);
blend_space_draw->draw_primitive(points, colors, Vector<Vector2>());
}
points.clear();
for (int i = 0; i < blend_space->get_blend_point_count(); i++) {
Vector2 point = blend_space->get_blend_point_position(i);
if (dragging_selected && selected_point == i) {
point += drag_ofs;
if (snap->is_pressed()) {
point.x = Math::stepify(point.x, blend_space->get_snap().x);
point.y = Math::stepify(point.y, blend_space->get_snap().y);
}
}
point = (point - blend_space->get_min_space()) / (blend_space->get_max_space() - blend_space->get_min_space());
point *= s;
point.y = s.height - point.y;
points.push_back(point);
point -= (icon->get_size() / 2);
point = point.floor();
if (i == selected_point) {
blend_space_draw->draw_texture(icon_selected, point);
} else {
blend_space_draw->draw_texture(icon, point);
}
}
if (making_triangle.size()) {
Vector<Vector2> points;
for (int i = 0; i < making_triangle.size(); i++) {
Vector2 point = blend_space->get_blend_point_position(making_triangle[i]);
point = (point - blend_space->get_min_space()) / (blend_space->get_max_space() - blend_space->get_min_space());
point *= s;
point.y = s.height - point.y;
points.push_back(point);
}
for (int i = 0; i < points.size() - 1; i++) {
blend_space_draw->draw_line(points[i], points[i + 1], linecolor, 2, true);
}
blend_space_draw->draw_line(points[points.size() - 1], blend_space_draw->get_local_mouse_position(), linecolor, 2, true);
}
///draw cursor position
{
Color color;
if (tool_blend->is_pressed()) {
color = get_color("accent_color", "Editor");
} else {
color = linecolor;
color.a *= 0.5;
}
Vector2 point = blend_space->get_blend_pos();
point = (point - blend_space->get_min_space()) / (blend_space->get_max_space() - blend_space->get_min_space());
point *= s;
point.y = s.height - point.y;
if (blend_space->get_triangle_count()) {
Vector2 closest = blend_space->get_closest_point(blend_space->get_blend_pos());
closest = (closest - blend_space->get_min_space()) / (blend_space->get_max_space() - blend_space->get_min_space());
closest *= s;
closest.y = s.height - closest.y;
Color lcol = color;
lcol.a *= 0.4;
blend_space_draw->draw_line(point, closest, lcol, 2);
}
float mind = 5 * EDSCALE;
float maxd = 15 * EDSCALE;
blend_space_draw->draw_line(point + Vector2(mind, 0), point + Vector2(maxd, 0), color, 2);
blend_space_draw->draw_line(point + Vector2(-mind, 0), point + Vector2(-maxd, 0), color, 2);
blend_space_draw->draw_line(point + Vector2(0, mind), point + Vector2(0, maxd), color, 2);
blend_space_draw->draw_line(point + Vector2(0, -mind), point + Vector2(0, -maxd), color, 2);
}
}
void AnimationNodeBlendSpaceEditor::_snap_toggled() {
blend_space_draw->update();
}
void AnimationNodeBlendSpaceEditor::_update_space() {
if (updating)
return;
updating = true;
if (blend_space->get_parent().is_valid()) {
goto_parent_hb->show();
} else {
goto_parent_hb->hide();
}
max_x_value->set_value(blend_space->get_max_space().x);
max_y_value->set_value(blend_space->get_max_space().y);
min_x_value->set_value(blend_space->get_min_space().x);
min_y_value->set_value(blend_space->get_min_space().y);
label_x->set_text(blend_space->get_x_label());
label_y->set_text(blend_space->get_y_label());
snap_x->set_value(blend_space->get_snap().x);
snap_y->set_value(blend_space->get_snap().y);
blend_space_draw->update();
updating = false;
}
void AnimationNodeBlendSpaceEditor::_config_changed(double) {
if (updating)
return;
updating = true;
undo_redo->create_action("Change BlendSpace Limits");
undo_redo->add_do_method(blend_space, "set_max_space", Vector2(max_x_value->get_value(), max_y_value->get_value()));
undo_redo->add_undo_method(blend_space, "set_max_space", blend_space->get_max_space());
undo_redo->add_do_method(blend_space, "set_min_space", Vector2(min_x_value->get_value(), min_y_value->get_value()));
undo_redo->add_undo_method(blend_space, "set_min_space", blend_space->get_min_space());
undo_redo->add_do_method(blend_space, "set_snap", Vector2(snap_x->get_value(), snap_y->get_value()));
undo_redo->add_undo_method(blend_space, "set_snap", blend_space->get_snap());
undo_redo->add_do_method(this, "_update_space");
undo_redo->add_undo_method(this, "_update_space");
undo_redo->commit_action();
updating = false;
blend_space_draw->update();
}
void AnimationNodeBlendSpaceEditor::_labels_changed(String) {
if (updating)
return;
updating = true;
undo_redo->create_action("Change BlendSpace Labels", UndoRedo::MERGE_ENDS);
undo_redo->add_do_method(blend_space, "set_x_label", label_x->get_text());
undo_redo->add_undo_method(blend_space, "set_x_label", blend_space->get_x_label());
undo_redo->add_do_method(blend_space, "set_y_label", label_y->get_text());
undo_redo->add_undo_method(blend_space, "set_y_label", blend_space->get_y_label());
undo_redo->add_do_method(this, "_update_space");
undo_redo->add_undo_method(this, "_update_space");
undo_redo->commit_action();
updating = false;
}
void AnimationNodeBlendSpaceEditor::_erase_selected() {
if (selected_point != -1) {
updating = true;
undo_redo->create_action("Remove BlendSpace Point");
undo_redo->add_do_method(blend_space, "remove_blend_point", selected_point);
undo_redo->add_undo_method(blend_space, "add_blend_point", blend_space->get_blend_point_node(selected_point), blend_space->get_blend_point_position(selected_point), selected_point);
//restore triangles using this point
for (int i = 0; i < blend_space->get_triangle_count(); i++) {
for (int j = 0; j < 3; j++) {
if (blend_space->get_triangle_point(i, j) == selected_point) {
undo_redo->add_undo_method(blend_space, "add_triangle", blend_space->get_triangle_point(i, 0), blend_space->get_triangle_point(i, 1), blend_space->get_triangle_point(i, 2), i);
break;
}
}
}
undo_redo->add_do_method(this, "_update_space");
undo_redo->add_undo_method(this, "_update_space");
undo_redo->commit_action();
updating = false;
blend_space_draw->update();
} else if (selected_triangle != -1) {
updating = true;
undo_redo->create_action("Remove BlendSpace Triangle");
undo_redo->add_do_method(blend_space, "remove_triangle", selected_triangle);
undo_redo->add_undo_method(blend_space, "add_triangle", blend_space->get_triangle_point(selected_triangle, 0), blend_space->get_triangle_point(selected_triangle, 1), blend_space->get_triangle_point(selected_triangle, 2), selected_triangle);
undo_redo->add_do_method(this, "_update_space");
undo_redo->add_undo_method(this, "_update_space");
undo_redo->commit_action();
updating = false;
blend_space_draw->update();
}
}
void AnimationNodeBlendSpaceEditor::_update_edited_point_pos() {
if (updating)
return;
if (selected_point >= 0 && selected_point < blend_space->get_blend_point_count()) {
Vector2 pos = blend_space->get_blend_point_position(selected_point);
if (dragging_selected) {
pos += drag_ofs;
if (snap->is_pressed()) {
pos.x = Math::stepify(pos.x, blend_space->get_snap().x);
pos.y = Math::stepify(pos.y, blend_space->get_snap().y);
}
}
updating = true;
edit_x->set_value(pos.x);
edit_y->set_value(pos.y);
updating = false;
}
}
void AnimationNodeBlendSpaceEditor::_edit_point_pos(double) {
if (updating)
return;
updating = true;
undo_redo->create_action("Move Node Point");
undo_redo->add_do_method(blend_space, "set_blend_point_position", selected_point, Vector2(edit_x->get_value(), edit_y->get_value()));
undo_redo->add_undo_method(blend_space, "set_blend_point_position", selected_point, blend_space->get_blend_point_position(selected_point));
undo_redo->add_do_method(this, "_update_space");
undo_redo->add_undo_method(this, "_update_space");
undo_redo->add_do_method(this, "_update_edited_point_pos");
undo_redo->add_undo_method(this, "_update_edited_point_pos");
undo_redo->commit_action();
updating = false;
blend_space_draw->update();
}
void AnimationNodeBlendSpaceEditor::_notification(int p_what) {
if (p_what == NOTIFICATION_ENTER_TREE || p_what == NOTIFICATION_THEME_CHANGED) {
error_panel->add_style_override("panel", get_stylebox("bg", "Tree"));
error_label->add_color_override("font_color", get_color("error_color", "Editor"));
panel->add_style_override("panel", get_stylebox("bg", "Tree"));
tool_blend->set_icon(get_icon("EditPivot", "EditorIcons"));
tool_select->set_icon(get_icon("ToolSelect", "EditorIcons"));
tool_create->set_icon(get_icon("EditKey", "EditorIcons"));
tool_triangle->set_icon(get_icon("ToolTriangle", "EditorIcons"));
tool_erase->set_icon(get_icon("Remove", "EditorIcons"));
snap->set_icon(get_icon("SnapGrid", "EditorIcons"));
open_editor->set_icon(get_icon("Edit", "EditorIcons"));
goto_parent->set_icon(get_icon("MoveUp", "EditorIcons"));
}
if (p_what == NOTIFICATION_PROCESS) {
String error;
if (!blend_space->get_graph_player()) {
error = TTR("BlendSpace does not belong to an AnimationGraphPlayer node.");
} else if (!blend_space->get_graph_player()->is_active()) {
error = TTR("AnimationGraphPlayer is inactive.\nActivate to enable playback, check node warnings if activation fails.");
} else if (blend_space->get_graph_player()->is_state_invalid()) {
error = blend_space->get_graph_player()->get_invalid_state_reason();
} else if (blend_space->get_triangle_count() == 0) {
error = TTR("No triangles exist, so no blending can take place.");
}
if (error != error_label->get_text()) {
error_label->set_text(error);
if (error != String()) {
error_panel->show();
} else {
error_panel->hide();
}
}
}
}
void AnimationNodeBlendSpaceEditor::_open_editor() {
if (selected_point >= 0 && selected_point < blend_space->get_blend_point_count()) {
Ref<AnimationNode> an = blend_space->get_blend_point_node(selected_point);
ERR_FAIL_COND(!an.is_valid());
EditorNode::get_singleton()->edit_item(an.ptr());
}
}
void AnimationNodeBlendSpaceEditor::_goto_parent() {
EditorNode::get_singleton()->edit_item(blend_space->get_parent().ptr());
}
void AnimationNodeBlendSpaceEditor::_bind_methods() {
ClassDB::bind_method("_blend_space_gui_input", &AnimationNodeBlendSpaceEditor::_blend_space_gui_input);
ClassDB::bind_method("_blend_space_draw", &AnimationNodeBlendSpaceEditor::_blend_space_draw);
ClassDB::bind_method("_config_changed", &AnimationNodeBlendSpaceEditor::_config_changed);
ClassDB::bind_method("_labels_changed", &AnimationNodeBlendSpaceEditor::_labels_changed);
ClassDB::bind_method("_update_space", &AnimationNodeBlendSpaceEditor::_update_space);
ClassDB::bind_method("_snap_toggled", &AnimationNodeBlendSpaceEditor::_snap_toggled);
ClassDB::bind_method("_tool_switch", &AnimationNodeBlendSpaceEditor::_tool_switch);
ClassDB::bind_method("_erase_selected", &AnimationNodeBlendSpaceEditor::_erase_selected);
ClassDB::bind_method("_update_tool_erase", &AnimationNodeBlendSpaceEditor::_update_tool_erase);
ClassDB::bind_method("_edit_point_pos", &AnimationNodeBlendSpaceEditor::_edit_point_pos);
ClassDB::bind_method("_add_menu_type", &AnimationNodeBlendSpaceEditor::_add_menu_type);
ClassDB::bind_method("_add_animation_type", &AnimationNodeBlendSpaceEditor::_add_animation_type);
ClassDB::bind_method("_update_edited_point_pos", &AnimationNodeBlendSpaceEditor::_update_edited_point_pos);
ClassDB::bind_method("_open_editor", &AnimationNodeBlendSpaceEditor::_open_editor);
ClassDB::bind_method("_goto_parent", &AnimationNodeBlendSpaceEditor::_goto_parent);
}
AnimationNodeBlendSpaceEditor *AnimationNodeBlendSpaceEditor::singleton = NULL;
AnimationNodeBlendSpaceEditor::AnimationNodeBlendSpaceEditor() {
singleton = this;
updating = false;
blend_space = NULL;
HBoxContainer *top_hb = memnew(HBoxContainer);
add_child(top_hb);
Ref<ButtonGroup> bg;
bg.instance();
goto_parent_hb = memnew(HBoxContainer);
top_hb->add_child(goto_parent_hb);
goto_parent = memnew(ToolButton);
goto_parent->connect("pressed", this, "_goto_parent", varray(), CONNECT_DEFERRED);
goto_parent_hb->add_child(goto_parent);
goto_parent_hb->add_child(memnew(VSeparator));
goto_parent_hb->hide();
tool_blend = memnew(ToolButton);
tool_blend->set_toggle_mode(true);
tool_blend->set_button_group(bg);
top_hb->add_child(tool_blend);
tool_blend->set_pressed(true);
tool_blend->set_tooltip(TTR("Set the blending position within the space"));
tool_blend->connect("pressed", this, "_tool_switch", varray(3));
tool_select = memnew(ToolButton);
tool_select->set_toggle_mode(true);
tool_select->set_button_group(bg);
top_hb->add_child(tool_select);
tool_select->set_tooltip(TTR("Select and move points, create points with RMB."));
tool_select->connect("pressed", this, "_tool_switch", varray(0));
tool_create = memnew(ToolButton);
tool_create->set_toggle_mode(true);
tool_create->set_button_group(bg);
top_hb->add_child(tool_create);
tool_create->set_tooltip(TTR("Create points."));
tool_create->connect("pressed", this, "_tool_switch", varray(1));
tool_triangle = memnew(ToolButton);
tool_triangle->set_toggle_mode(true);
tool_triangle->set_button_group(bg);
top_hb->add_child(tool_triangle);
tool_triangle->set_tooltip(TTR("Create triangles by connecting points."));
tool_triangle->connect("pressed", this, "_tool_switch", varray(2));
tool_erase_sep = memnew(VSeparator);
top_hb->add_child(tool_erase_sep);
tool_erase = memnew(ToolButton);
top_hb->add_child(tool_erase);
tool_erase->set_tooltip(TTR("Erase points and triangles."));
tool_erase->connect("pressed", this, "_erase_selected");
tool_erase->set_disabled(true);
top_hb->add_child(memnew(VSeparator));
snap = memnew(ToolButton);
snap->set_toggle_mode(true);
top_hb->add_child(snap);
//snap->set_text(TTR("Snap"));
snap->set_pressed(true);
snap->connect("pressed", this, "_snap_toggled");
snap_x = memnew(SpinBox);
top_hb->add_child(snap_x);
snap_x->set_prefix("x:");
snap_x->set_min(0.01);
snap_x->set_step(0.01);
snap_x->set_max(1000);
snap_y = memnew(SpinBox);
top_hb->add_child(snap_y);
snap_y->set_prefix("y:");
snap_y->set_min(0.01);
snap_y->set_step(0.01);
snap_y->set_max(1000);
edit_hb = memnew(HBoxContainer);
top_hb->add_child(edit_hb);
edit_hb->add_child(memnew(VSeparator));
edit_hb->add_child(memnew(Label(TTR("Point"))));
edit_x = memnew(SpinBox);
edit_hb->add_child(edit_x);
edit_x->set_min(-1000);
edit_x->set_step(0.01);
edit_x->set_max(1000);
edit_x->connect("value_changed", this, "_edit_point_pos");
edit_y = memnew(SpinBox);
edit_hb->add_child(edit_y);
edit_y->set_min(-1000);
edit_y->set_step(0.01);
edit_y->set_max(1000);
edit_y->connect("value_changed", this, "_edit_point_pos");
open_editor = memnew(Button);
edit_hb->add_child(open_editor);
open_editor->set_text(TTR("Open Editor"));
open_editor->connect("pressed", this, "_open_editor", varray(), CONNECT_DEFERRED);
edit_hb->hide();
open_editor->hide();
HBoxContainer *main_hb = memnew(HBoxContainer);
add_child(main_hb);
main_hb->set_v_size_flags(SIZE_EXPAND_FILL);
GridContainer *main_grid = memnew(GridContainer);
main_grid->set_columns(2);
main_hb->add_child(main_grid);
main_grid->set_h_size_flags(SIZE_EXPAND_FILL);
{
VBoxContainer *left_vbox = memnew(VBoxContainer);
main_grid->add_child(left_vbox);
left_vbox->set_v_size_flags(SIZE_EXPAND_FILL);
max_y_value = memnew(SpinBox);
left_vbox->add_child(max_y_value);
left_vbox->add_spacer();
label_y = memnew(LineEdit);
left_vbox->add_child(label_y);
label_y->set_expand_to_text_length(true);
left_vbox->add_spacer();
min_y_value = memnew(SpinBox);
left_vbox->add_child(min_y_value);
max_y_value->set_max(10000);
max_y_value->set_min(0.01);
max_y_value->set_step(0.01);
min_y_value->set_min(-10000);
min_y_value->set_max(0);
min_y_value->set_step(0.01);
}
panel = memnew(PanelContainer);
panel->set_clip_contents(true);
main_grid->add_child(panel);
panel->set_h_size_flags(SIZE_EXPAND_FILL);
blend_space_draw = memnew(Control);
blend_space_draw->connect("gui_input", this, "_blend_space_gui_input");
blend_space_draw->connect("draw", this, "_blend_space_draw");
panel->add_child(blend_space_draw);
main_grid->add_child(memnew(Control)); //empty bottom left
{
HBoxContainer *bottom_vbox = memnew(HBoxContainer);
main_grid->add_child(bottom_vbox);
bottom_vbox->set_h_size_flags(SIZE_EXPAND_FILL);
min_x_value = memnew(SpinBox);
bottom_vbox->add_child(min_x_value);
bottom_vbox->add_spacer();
label_x = memnew(LineEdit);
bottom_vbox->add_child(label_x);
label_x->set_expand_to_text_length(true);
bottom_vbox->add_spacer();
max_x_value = memnew(SpinBox);
bottom_vbox->add_child(max_x_value);
max_x_value->set_max(10000);
max_x_value->set_min(0.01);
max_x_value->set_step(0.01);
min_x_value->set_min(-10000);
min_x_value->set_max(0);
min_x_value->set_step(0.01);
}
snap_x->connect("value_changed", this, "_config_changed");
snap_y->connect("value_changed", this, "_config_changed");
max_x_value->connect("value_changed", this, "_config_changed");
min_x_value->connect("value_changed", this, "_config_changed");
max_y_value->connect("value_changed", this, "_config_changed");
min_y_value->connect("value_changed", this, "_config_changed");
label_x->connect("text_changed", this, "_labels_changed");
label_y->connect("text_changed", this, "_labels_changed");
error_panel = memnew(PanelContainer);
add_child(error_panel);
error_label = memnew(Label);
error_panel->add_child(error_label);
error_label->set_text("eh");
undo_redo = EditorNode::get_singleton()->get_undo_redo();
set_custom_minimum_size(Size2(0, 300 * EDSCALE));
menu = memnew(PopupMenu);
add_child(menu);
menu->connect("index_pressed", this, "_add_menu_type");
animations_menu = memnew(PopupMenu);
menu->add_child(animations_menu);
animations_menu->set_name("animations");
animations_menu->connect("index_pressed", this, "_add_animation_type");
selected_point = -1;
selected_triangle = -1;
dragging_selected = false;
dragging_selected_attempt = false;
}
void AnimationNodeBlendSpaceEditorPlugin::edit(Object *p_object) {
anim_tree_editor->edit(Object::cast_to<AnimationNodeBlendSpace>(p_object));
}
bool AnimationNodeBlendSpaceEditorPlugin::handles(Object *p_object) const {
return p_object->is_class("AnimationNodeBlendSpace");
}
void AnimationNodeBlendSpaceEditorPlugin::make_visible(bool p_visible) {
if (p_visible) {
//editor->hide_animation_player_editors();
//editor->animation_panel_make_visible(true);
button->show();
editor->make_bottom_panel_item_visible(anim_tree_editor);
anim_tree_editor->set_process(true);
} else {
if (anim_tree_editor->is_visible_in_tree())
editor->hide_bottom_panel();
button->hide();
anim_tree_editor->set_process(false);
}
}
AnimationNodeBlendSpaceEditorPlugin::AnimationNodeBlendSpaceEditorPlugin(EditorNode *p_node) {
editor = p_node;
anim_tree_editor = memnew(AnimationNodeBlendSpaceEditor);
anim_tree_editor->set_custom_minimum_size(Size2(0, 300));
button = editor->add_bottom_panel_item(TTR("BlendSpace"), anim_tree_editor);
button->hide();
}
AnimationNodeBlendSpaceEditorPlugin::~AnimationNodeBlendSpaceEditorPlugin() {
}

124
editor/plugins/animation_blend_space_editor.h Normal file
View file

@ -0,0 +1,124 @@
#ifndef ANIMATION_BLEND_SPACE_EDITOR_H
#define ANIMATION_BLEND_SPACE_EDITOR_H
#include "editor/editor_node.h"
#include "editor/editor_plugin.h"
#include "editor/property_editor.h"
#include "scene/animation/animation_blend_space.h"
#include "scene/gui/button.h"
#include "scene/gui/graph_edit.h"
#include "scene/gui/popup.h"
#include "scene/gui/tree.h"
/**
@author Juan Linietsky <reduzio@gmail.com>
*/
class AnimationNodeBlendSpaceEditor : public VBoxContainer {
GDCLASS(AnimationNodeBlendSpaceEditor, VBoxContainer);
AnimationNodeBlendSpace *blend_space;
HBoxContainer *goto_parent_hb;
ToolButton *goto_parent;
PanelContainer *panel;
ToolButton *tool_blend;
ToolButton *tool_select;
ToolButton *tool_create;
ToolButton *tool_triangle;
VSeparator *tool_erase_sep;
ToolButton *tool_erase;
ToolButton *snap;
SpinBox *snap_x;
SpinBox *snap_y;
LineEdit *label_x;
LineEdit *label_y;
SpinBox *max_x_value;
SpinBox *min_x_value;
SpinBox *max_y_value;
SpinBox *min_y_value;
HBoxContainer *edit_hb;
SpinBox *edit_x;
SpinBox *edit_y;
Button *open_editor;
int selected_point;
int selected_triangle;
Control *blend_space_draw;
PanelContainer *error_panel;
Label *error_label;
bool updating;
UndoRedo *undo_redo;
static AnimationNodeBlendSpaceEditor *singleton;
void _blend_space_gui_input(const Ref<InputEvent> &p_event);
void _blend_space_draw();
void _update_space();
void _config_changed(double);
void _labels_changed(String);
void _snap_toggled();
PopupMenu *menu;
PopupMenu *animations_menu;
Vector<String> animations_to_add;
Vector2 add_point_pos;
Vector<Vector2> points;
bool dragging_selected_attempt;
bool dragging_selected;
Vector2 drag_from;
Vector2 drag_ofs;
Vector<int> making_triangle;
void _add_menu_type(int p_index);
void _add_animation_type(int p_index);
void _tool_switch(int p_tool);
void _update_edited_point_pos();
void _update_tool_erase();
void _erase_selected();
void _edit_point_pos(double);
void _open_editor();
void _goto_parent();
protected:
void _notification(int p_what);
static void _bind_methods();
public:
static AnimationNodeBlendSpaceEditor *get_singleton() { return singleton; }
void edit(AnimationNodeBlendSpace *p_blend_space);
AnimationNodeBlendSpaceEditor();
};
class AnimationNodeBlendSpaceEditorPlugin : public EditorPlugin {
GDCLASS(AnimationNodeBlendSpaceEditorPlugin, EditorPlugin);
AnimationNodeBlendSpaceEditor *anim_tree_editor;
EditorNode *editor;
Button *button;
public:
virtual String get_name() const { return "BlendSpace"; }
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);
AnimationNodeBlendSpaceEditorPlugin(EditorNode *p_node);
~AnimationNodeBlendSpaceEditorPlugin();
};
#endif // ANIMATION_BLEND_SPACE_EDITOR_H

21
editor/plugins/animation_blend_tree_editor_plugin.cpp
View file

@ -66,7 +66,7 @@ void AnimationNodeBlendTreeEditor::_update_graph() {
graph->set_scroll_ofs(blend_tree->get_graph_offset() * EDSCALE);
if (blend_tree->get_tree().is_valid()) {
if (blend_tree->get_parent().is_valid()) {
goto_parent->show();
} else {
goto_parent->hide();
@ -367,8 +367,8 @@ void AnimationNodeBlendTreeEditor::_open_in_editor(const String &p_which) {
}
void AnimationNodeBlendTreeEditor::_open_parent() {
if (blend_tree->get_tree().is_valid()) {
EditorNode::get_singleton()->edit_item(blend_tree->get_tree().ptr());
if (blend_tree->get_parent().is_valid()) {
EditorNode::get_singleton()->edit_item(blend_tree->get_parent().ptr());
}
}
@ -648,7 +648,7 @@ void AnimationNodeBlendTreeEditor::_scroll_changed(const Vector2 &p_scroll) {
void AnimationNodeBlendTreeEditor::_node_changed(ObjectID p_node) {
AnimationNode *an = Object::cast_to<AnimationNode>(ObjectDB::get_instance(p_node));
if (an && an->get_tree() == blend_tree) {
if (an && an->get_parent() == blend_tree) {
_update_graph();
}
}
@ -737,19 +737,18 @@ AnimationNodeBlendTreeEditor::AnimationNodeBlendTreeEditor() {
graph->get_zoom_hbox()->add_child(vs);
graph->get_zoom_hbox()->move_child(vs, 0);
goto_parent = memnew(Button);
goto_parent->set_text(TTR("Goto Parent"));
graph->get_zoom_hbox()->add_child(goto_parent);
graph->get_zoom_hbox()->move_child(goto_parent, 0);
goto_parent->hide();
goto_parent->connect("pressed", this, "_open_parent");
add_node = memnew(MenuButton);
graph->get_zoom_hbox()->add_child(add_node);
add_node->set_text(TTR("Add Node.."));
graph->get_zoom_hbox()->move_child(add_node, 0);
add_node->get_popup()->connect("index_pressed", this, "_add_node");
goto_parent = memnew(Button);
graph->get_zoom_hbox()->add_child(goto_parent);
graph->get_zoom_hbox()->move_child(goto_parent, 0);
goto_parent->hide();
goto_parent->connect("pressed", this, "_open_parent");
add_options.push_back(AddOption("Animation", "AnimationNodeAnimation"));
add_options.push_back(AddOption("OneShot", "AnimationNodeOneShot"));
add_options.push_back(AddOption("Add", "AnimationNodeAdd"));

495
scene/animation/animation_blend_space.cpp Normal file
View file

@ -0,0 +1,495 @@
#include "animation_blend_space.h"
void AnimationNodeBlendSpace::add_blend_point(const Ref<AnimationRootNode> &p_node, const Vector2 &p_position, int p_at_index) {
ERR_FAIL_COND(blend_points_used >= MAX_BLEND_POINTS);
ERR_FAIL_COND(p_node.is_null());
ERR_FAIL_COND(p_node->get_parent().is_valid());
ERR_FAIL_COND(p_at_index < -1 || p_at_index > blend_points_used);
if (p_at_index == -1 || p_at_index == blend_points_used) {
p_at_index = blend_points_used;
} else {
for (int i = blend_points_used; i > p_at_index; i--) {
blend_points[i] = blend_points[i - 1];
}
for (int i = 0; i < triangles.size(); i++) {
for (int j = 0; j < 3; j++) {
if (triangles[i].points[j] >= p_at_index) {
triangles[i].points[j]++;
}
}
}
}
blend_points[p_at_index].node = p_node;
blend_points[p_at_index].position = p_position;
blend_points[p_at_index].node->set_parent(this);
blend_points[p_at_index].node->set_graph_player(get_graph_player());
blend_points_used++;
}
void AnimationNodeBlendSpace::set_blend_point_position(int p_point, const Vector2 &p_position) {
ERR_FAIL_INDEX(p_point, blend_points_used);
blend_points[p_point].position = p_position;
}
void AnimationNodeBlendSpace::set_blend_point_node(int p_point, const Ref<AnimationRootNode> &p_node) {
ERR_FAIL_INDEX(p_point, blend_points_used);
ERR_FAIL_COND(p_node.is_null());
if (blend_points[p_point].node.is_valid()) {
blend_points[p_point].node->set_parent(NULL);
blend_points[p_point].node->set_graph_player(NULL);
}
blend_points[p_point].node = p_node;
blend_points[p_point].node->set_parent(this);
blend_points[p_point].node->set_graph_player(get_graph_player());
}
Vector2 AnimationNodeBlendSpace::get_blend_point_position(int p_point) const {
ERR_FAIL_INDEX_V(p_point, blend_points_used, Vector2());
return blend_points[p_point].position;
}
Ref<AnimationRootNode> AnimationNodeBlendSpace::get_blend_point_node(int p_point) const {
ERR_FAIL_INDEX_V(p_point, blend_points_used, Ref<AnimationRootNode>());
return blend_points[p_point].node;
}
void AnimationNodeBlendSpace::remove_blend_point(int p_point) {
ERR_FAIL_INDEX(p_point, blend_points_used);
blend_points[p_point].node->set_parent(NULL);
blend_points[p_point].node->set_graph_player(NULL);
for (int i = 0; i < triangles.size(); i++) {
bool erase = false;
for (int j = 0; j < 3; j++) {
if (triangles[i].points[j] == p_point) {
erase = true;
break;
} else if (triangles[i].points[j] > p_point) {
triangles[i].points[j]--;
}
}
if (erase) {
triangles.remove(i);
i--;
}
}
for (int i = p_point; i < blend_points_used - 1; i++) {
blend_points[i] = blend_points[i + 1];
}
blend_points_used--;
}
int AnimationNodeBlendSpace::get_blend_point_count() const {
return blend_points_used;
}
bool AnimationNodeBlendSpace::has_triangle(int p_x, int p_y, int p_z) const {
ERR_FAIL_INDEX_V(p_x, blend_points_used, false);
ERR_FAIL_INDEX_V(p_y, blend_points_used, false);
ERR_FAIL_INDEX_V(p_z, blend_points_used, false);
BlendTriangle t;
t.points[0] = p_x;
t.points[1] = p_y;
t.points[2] = p_z;
SortArray<int> sort;
sort.sort(t.points, 3);
for (int i = 0; i < triangles.size(); i++) {
bool all_equal = true;
for (int j = 0; j < 3; j++) {
if (triangles[i].points[j] != t.points[j]) {
all_equal = false;
break;
}
}
if (all_equal)
return true;
}
return false;
}
void AnimationNodeBlendSpace::add_triangle(int p_x, int p_y, int p_z, int p_at_index) {
ERR_FAIL_INDEX(p_x, blend_points_used);
ERR_FAIL_INDEX(p_y, blend_points_used);
ERR_FAIL_INDEX(p_z, blend_points_used);
BlendTriangle t;
t.points[0] = p_x;
t.points[1] = p_y;
t.points[2] = p_z;
SortArray<int> sort;
sort.sort(t.points, 3);
for (int i = 0; i < triangles.size(); i++) {
bool all_equal = true;
for (int j = 0; j < 3; j++) {
if (triangles[i].points[j] != t.points[j]) {
all_equal = false;
break;
}
}
ERR_FAIL_COND(all_equal);
}
if (p_at_index == -1 || p_at_index == triangles.size()) {
triangles.push_back(t);
} else {
triangles.insert(p_at_index, t);
}
}
int AnimationNodeBlendSpace::get_triangle_point(int p_triangle, int p_point) {
ERR_FAIL_INDEX_V(p_point, 3, -1);
ERR_FAIL_INDEX_V(p_triangle, triangles.size(), -1);
return triangles[p_triangle].points[p_point];
}
void AnimationNodeBlendSpace::remove_triangle(int p_triangle) {
ERR_FAIL_INDEX(p_triangle, triangles.size());
triangles.remove(p_triangle);
}
int AnimationNodeBlendSpace::get_triangle_count() const {
return triangles.size();
}
void AnimationNodeBlendSpace::set_min_space(const Vector2 &p_min) {
min_space = p_min;
if (min_space.x >= max_space.x) {
min_space.x = max_space.x - 1;
}
if (min_space.y >= max_space.y) {
min_space.y = max_space.y - 1;
}
}
Vector2 AnimationNodeBlendSpace::get_min_space() const {
return min_space;
}
void AnimationNodeBlendSpace::set_max_space(const Vector2 &p_max) {
max_space = p_max;
if (max_space.x <= min_space.x) {
max_space.x = min_space.x + 1;
}
if (max_space.y <= min_space.y) {
max_space.y = min_space.y + 1;
}
}
Vector2 AnimationNodeBlendSpace::get_max_space() const {
return max_space;
}
void AnimationNodeBlendSpace::set_snap(const Vector2 &p_snap) {
snap = p_snap;
}
Vector2 AnimationNodeBlendSpace::get_snap() const {
return snap;
}
void AnimationNodeBlendSpace::set_blend_pos(const Vector2 &p_pos) {
blend_pos = p_pos;
}
Vector2 AnimationNodeBlendSpace::get_blend_pos() const {
return blend_pos;
}
void AnimationNodeBlendSpace::set_x_label(const String &p_label) {
x_label = p_label;
}
String AnimationNodeBlendSpace::get_x_label() const {
return x_label;
}
void AnimationNodeBlendSpace::set_y_label(const String &p_label) {
y_label = p_label;
}
String AnimationNodeBlendSpace::get_y_label() const {
return y_label;
}
void AnimationNodeBlendSpace::_add_blend_point(int p_index, const Ref<AnimationRootNode> &p_node) {
if (p_index == blend_points_used) {
add_blend_point(p_node, Vector2());
} else {
set_blend_point_node(p_index, p_node);
}
}
void AnimationNodeBlendSpace::_set_triangles(const Vector<int> &p_triangles) {
ERR_FAIL_COND(p_triangles.size() % 3 != 0);
for (int i = 0; i < p_triangles.size(); i += 3) {
add_triangle(p_triangles[i + 0], p_triangles[i + 1], p_triangles[i + 2]);
}
}
Vector<int> AnimationNodeBlendSpace::_get_triangles() const {
Vector<int> t;
t.resize(triangles.size() * 3);
for (int i = 0; i < triangles.size(); i++) {
t[i * 3 + 0] = triangles[i].points[0];
t[i * 3 + 1] = triangles[i].points[1];
t[i * 3 + 2] = triangles[i].points[2];
}
return t;
}
Vector2 AnimationNodeBlendSpace::get_closest_point(const Vector2 &p_point) {
if (triangles.size() == 0)
return Vector2();
Vector2 best_point;
bool first = true;
for (int i = 0; i < triangles.size(); i++) {
Vector2 points[3];
for (int j = 0; j < 3; j++) {
points[j] = get_blend_point_position(get_triangle_point(i, j));
}
if (Geometry::is_point_in_triangle(p_point, points[0], points[1], points[2])) {
return p_point;
}
for (int j = 0; j < 3; j++) {
Vector2 s[2] = {
points[j],
points[(j + 1) % 3]
};
Vector2 closest = Geometry::get_closest_point_to_segment_2d(p_point, s);
if (first || closest.distance_to(p_point) < best_point.distance_to(p_point)) {
best_point = closest;
first = false;
}
}
}
return best_point;
}
void AnimationNodeBlendSpace::_blend_triangle(const Vector2 &p_pos, const Vector2 *p_points, float *r_weights) {
if (p_pos.distance_squared_to(p_points[0]) < CMP_EPSILON2) {
r_weights[0] = 1;
r_weights[1] = 0;
r_weights[2] = 0;
return;
}
if (p_pos.distance_squared_to(p_points[1]) < CMP_EPSILON2) {
r_weights[0] = 0;
r_weights[1] = 1;
r_weights[2] = 0;
return;
}
if (p_pos.distance_squared_to(p_points[2]) < CMP_EPSILON2) {
r_weights[0] = 0;
r_weights[1] = 0;
r_weights[2] = 1;
return;
}
Vector2 v0 = p_points[1] - p_points[0];
Vector2 v1 = p_points[2] - p_points[0];
Vector2 v2 = p_pos - p_points[0];
float d00 = v0.dot(v0);
float d01 = v0.dot(v1);
float d11 = v1.dot(v1);
float d20 = v2.dot(v0);
float d21 = v2.dot(v1);
float denom = (d00 * d11 - d01 * d01);
if (denom == 0) {
r_weights[0] = 1;
r_weights[1] = 0;
r_weights[2] = 0;
return;
}
float v = (d11 * d20 - d01 * d21) / denom;
float w = (d00 * d21 - d01 * d20) / denom;
float u = 1.0f - v - w;
r_weights[0] = u;
r_weights[1] = v;
r_weights[2] = w;
}
float AnimationNodeBlendSpace::process(float p_time, bool p_seek) {
if (triangles.size() == 0)
return 0;
Vector2 best_point;
bool first = true;
int blend_triangle = -1;
float blend_weights[3] = { 0, 0, 0 };
for (int i = 0; i < triangles.size(); i++) {
Vector2 points[3];
for (int j = 0; j < 3; j++) {
points[j] = get_blend_point_position(get_triangle_point(i, j));
}
if (Geometry::is_point_in_triangle(blend_pos, points[0], points[1], points[2])) {
blend_triangle = i;
_blend_triangle(blend_pos, points, blend_weights);
break;
}
for (int j = 0; j < 3; j++) {
Vector2 s[2] = {
points[j],
points[(j + 1) % 3]
};
Vector2 closest = Geometry::get_closest_point_to_segment_2d(blend_pos, s);
if (first || closest.distance_to(blend_pos) < best_point.distance_to(blend_pos)) {
best_point = closest;
blend_triangle = i;
first = false;
float d = s[0].distance_to(s[1]);
if (d == 0.0) {
blend_weights[j] = 1.0;
blend_weights[(j + 1) % 3] = 0.0;
blend_weights[(j + 2) % 3] = 0.0;
} else {
float c = s[0].distance_to(closest) / d;
blend_weights[j] = 1.0 - c;
blend_weights[(j + 1) % 3] = c;
blend_weights[(j + 2) % 3] = 0.0;
}
}
}
}
ERR_FAIL_COND_V(blend_triangle == -1, 0); //should never reach here
int triangle_points[3];
for (int j = 0; j < 3; j++) {
triangle_points[j] = get_triangle_point(blend_triangle, j);
}
first = true;
float mind;
for (int i = 0; i < blend_points_used; i++) {
bool found = false;
for (int j = 0; j < 3; j++) {
if (i == triangle_points[j]) {
//blend with the given weight
float t = blend_node(blend_points[i].node, p_time, p_seek, blend_weights[j], FILTER_IGNORE, false);
if (first || t < mind) {
mind = t;
first = false;
}
found = true;
break;
}
}
if (!found) {
//ignore
blend_node(blend_points[i].node, p_time, p_seek, 0, FILTER_IGNORE, false);
}
}
return mind;
}
String AnimationNodeBlendSpace::get_caption() const {
return "BlendSpace";
}
void AnimationNodeBlendSpace::_validate_property(PropertyInfo &property) const {
if (property.name.begins_with("blend_point_")) {
String left = property.name.get_slicec('/', 0);
int idx = left.get_slicec('_', 2).to_int();
if (idx >= blend_points_used) {
property.usage = 0;
}
}
AnimationRootNode::_validate_property(property);
}
void AnimationNodeBlendSpace::_bind_methods() {
ClassDB::bind_method(D_METHOD("add_blend_point", "node", "pos", "at_index"), &AnimationNodeBlendSpace::add_blend_point, DEFVAL(-1));
ClassDB::bind_method(D_METHOD("set_blend_point_position", "point", "pos"), &AnimationNodeBlendSpace::set_blend_point_position);
ClassDB::bind_method(D_METHOD("get_blend_point_position", "point"), &AnimationNodeBlendSpace::get_blend_point_position);
ClassDB::bind_method(D_METHOD("set_blend_point_node", "point", "node"), &AnimationNodeBlendSpace::set_blend_point_node);
ClassDB::bind_method(D_METHOD("get_blend_point_node", "point"), &AnimationNodeBlendSpace::get_blend_point_node);
ClassDB::bind_method(D_METHOD("remove_blend_point", "point"), &AnimationNodeBlendSpace::remove_blend_point);
ClassDB::bind_method(D_METHOD("get_blend_point_count"), &AnimationNodeBlendSpace::get_blend_point_count);
ClassDB::bind_method(D_METHOD("add_triangle", "x", "y", "z", "at_index"), &AnimationNodeBlendSpace::add_triangle, DEFVAL(-1));
ClassDB::bind_method(D_METHOD("get_triangle_point", "triangle", "point"), &AnimationNodeBlendSpace::get_triangle_point);
ClassDB::bind_method(D_METHOD("remove_triangle", "triangle"), &AnimationNodeBlendSpace::remove_triangle);
ClassDB::bind_method(D_METHOD("get_triangle_count"), &AnimationNodeBlendSpace::get_triangle_count);
ClassDB::bind_method(D_METHOD("set_min_space", "min_space"), &AnimationNodeBlendSpace::set_min_space);
ClassDB::bind_method(D_METHOD("get_min_space"), &AnimationNodeBlendSpace::get_min_space);
ClassDB::bind_method(D_METHOD("set_max_space", "max_space"), &AnimationNodeBlendSpace::set_max_space);
ClassDB::bind_method(D_METHOD("get_max_space"), &AnimationNodeBlendSpace::get_max_space);
ClassDB::bind_method(D_METHOD("set_snap", "snap"), &AnimationNodeBlendSpace::set_snap);
ClassDB::bind_method(D_METHOD("get_snap"), &AnimationNodeBlendSpace::get_snap);
ClassDB::bind_method(D_METHOD("set_blend_pos", "pos"), &AnimationNodeBlendSpace::set_blend_pos);
ClassDB::bind_method(D_METHOD("get_blend_pos"), &AnimationNodeBlendSpace::get_blend_pos);
ClassDB::bind_method(D_METHOD("set_x_label", "text"), &AnimationNodeBlendSpace::set_x_label);
ClassDB::bind_method(D_METHOD("get_x_label"), &AnimationNodeBlendSpace::get_x_label);
ClassDB::bind_method(D_METHOD("set_y_label", "text"), &AnimationNodeBlendSpace::set_y_label);
ClassDB::bind_method(D_METHOD("get_y_label"), &AnimationNodeBlendSpace::get_y_label);
ClassDB::bind_method(D_METHOD("_add_blend_point", "index", "node"), &AnimationNodeBlendSpace::_add_blend_point);
ClassDB::bind_method(D_METHOD("_set_triangles", "triangles"), &AnimationNodeBlendSpace::_set_triangles);
ClassDB::bind_method(D_METHOD("_get_triangles"), &AnimationNodeBlendSpace::_get_triangles);
for (int i = 0; i < MAX_BLEND_POINTS; i++) {
ADD_PROPERTYI(PropertyInfo(Variant::OBJECT, "blend_point_" + itos(i) + "/node", PROPERTY_HINT_RESOURCE_TYPE, "AnimationRootNode", PROPERTY_USAGE_NOEDITOR | PROPERTY_USAGE_INTERNAL | PROPERTY_USAGE_DO_NOT_SHARE_ON_DUPLICATE), "_add_blend_point", "get_blend_point_node", i);
ADD_PROPERTYI(PropertyInfo(Variant::VECTOR2, "blend_point_" + itos(i) + "/pos", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_NOEDITOR | PROPERTY_USAGE_INTERNAL), "set_blend_point_position", "get_blend_point_position", i);
}
ADD_PROPERTY(PropertyInfo(Variant::POOL_INT_ARRAY, "triangles", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_NOEDITOR | PROPERTY_USAGE_INTERNAL), "_set_triangles", "_get_triangles");
ADD_PROPERTY(PropertyInfo(Variant::VECTOR2, "min_space", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_NOEDITOR), "set_min_space", "get_min_space");
ADD_PROPERTY(PropertyInfo(Variant::VECTOR2, "max_space", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_NOEDITOR), "set_max_space", "get_max_space");
ADD_PROPERTY(PropertyInfo(Variant::VECTOR2, "snap", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_NOEDITOR), "set_snap", "get_snap");
ADD_PROPERTY(PropertyInfo(Variant::VECTOR2, "blend_pos", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_NOEDITOR), "set_blend_pos", "get_blend_pos");
ADD_PROPERTY(PropertyInfo(Variant::STRING, "x_label", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_NOEDITOR), "set_x_label", "get_x_label");
ADD_PROPERTY(PropertyInfo(Variant::STRING, "y_label", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_NOEDITOR), "set_y_label", "get_y_label");
}
AnimationNodeBlendSpace::AnimationNodeBlendSpace() {
blend_points_used = 0;
max_space = Vector2(1, 1);
min_space = Vector2(-1, -1);
snap = Vector2(0.1, 0.1);
x_label = "x";
y_label = "y";
}
AnimationNodeBlendSpace::~AnimationNodeBlendSpace() {
for (int i = 0; i < blend_points_used; i++) {
blend_points[i].node->set_parent(this);
blend_points[i].node->set_graph_player(get_graph_player());
}
}

86
scene/animation/animation_blend_space.h Normal file
View file

@ -0,0 +1,86 @@
#ifndef ANIMATION_BLEND_SPACE_H
#define ANIMATION_BLEND_SPACE_H
#include "scene/animation/animation_graph_player.h"
class AnimationNodeBlendSpace : public AnimationRootNode {
GDCLASS(AnimationNodeBlendSpace, AnimationRootNode)
enum {
MAX_BLEND_POINTS = 64
};
struct BlendPoint {
Ref<AnimationRootNode> node;
Vector2 position;
};
BlendPoint blend_points[MAX_BLEND_POINTS];
int blend_points_used;
struct BlendTriangle {
int points[3];
};
Vector<BlendTriangle> triangles;
Vector2 blend_pos;
Vector2 max_space;
Vector2 min_space;
Vector2 snap;
String x_label;
String y_label;
void _add_blend_point(int p_index, const Ref<AnimationRootNode> &p_node);
void _set_triangles(const Vector<int> &p_triangles);
Vector<int> _get_triangles() const;
void _blend_triangle(const Vector2 &p_pos, const Vector2 *p_points, float *r_weights);
protected:
virtual void _validate_property(PropertyInfo &property) const;
static void _bind_methods();
public:
void add_blend_point(const Ref<AnimationRootNode> &p_node, const Vector2 &p_position, int p_at_index = -1);
void set_blend_point_position(int p_point, const Vector2 &p_position);
void set_blend_point_node(int p_point, const Ref<AnimationRootNode> &p_node);
Vector2 get_blend_point_position(int p_point) const;
Ref<AnimationRootNode> get_blend_point_node(int p_point) const;
void remove_blend_point(int p_point);
int get_blend_point_count() const;
bool has_triangle(int p_x, int p_y, int p_z) const;
void add_triangle(int p_x, int p_y, int p_z, int p_at_index = -1);
int get_triangle_point(int p_triangle, int p_point);
void remove_triangle(int p_triangle);
int get_triangle_count() const;
void set_min_space(const Vector2 &p_min);
Vector2 get_min_space() const;
void set_max_space(const Vector2 &p_max);
Vector2 get_max_space() const;
void set_snap(const Vector2 &p_snap);
Vector2 get_snap() const;
void set_blend_pos(const Vector2 &p_pos);
Vector2 get_blend_pos() const;
void set_x_label(const String &p_label);
String get_x_label() const;
void set_y_label(const String &p_label);
String get_y_label() const;
float process(float p_time, bool p_seek);
String get_caption() const;
Vector2 get_closest_point(const Vector2 &p_point);
AnimationNodeBlendSpace();
~AnimationNodeBlendSpace();
};
#endif // ANIMATION_BLEND_SPACE_H

31
scene/animation/animation_blend_tree.cpp
View file

@ -36,6 +36,8 @@ void AnimationNodeAnimation::_validate_property(PropertyInfo &property) const {
}
}
}
AnimationRootNode::_validate_property(property);
}
float AnimationNodeAnimation::process(float p_time, bool p_seek) {
@ -46,8 +48,9 @@ float AnimationNodeAnimation::process(float p_time, bool p_seek) {
Ref<Animation> anim = ap->get_animation(animation);
if (!anim.is_valid()) {
if (get_tree().is_valid()) {
String name = get_tree()->get_node_name(Ref<AnimationNodeAnimation>(this));
Ref<AnimationNodeBlendTree> tree = get_parent();
if (tree.is_valid()) {
String name = tree->get_node_name(Ref<AnimationNodeAnimation>(this));
make_invalid(vformat(RTR("On BlendTree node '%s', animation not found: '%s'"), name, animation));
} else {
@ -596,7 +599,9 @@ void AnimationNodeTransition::set_current(int p_current) {
return;
ERR_FAIL_INDEX(p_current, enabled_inputs);
if (get_tree().is_valid() && current >= 0) {
Ref<AnimationNodeBlendTree> tree = get_parent();
if (tree.is_valid() && current >= 0) {
prev = current;
prev_xfading = xfade;
prev_time = time;
@ -692,6 +697,8 @@ void AnimationNodeTransition::_validate_property(PropertyInfo &property) const {
}
}
}
AnimationNode::_validate_property(property);
}
void AnimationNodeTransition::_bind_methods() {
@ -754,14 +761,14 @@ void AnimationNodeBlendTree::add_node(const StringName &p_name, Ref<AnimationNod
ERR_FAIL_COND(nodes.has(p_name));
ERR_FAIL_COND(p_node.is_null());
ERR_FAIL_COND(p_node->tree != NULL);
ERR_FAIL_COND(p_node->player != NULL);
ERR_FAIL_COND(p_node->get_parent().is_valid());
ERR_FAIL_COND(p_node->get_graph_player() != NULL);
ERR_FAIL_COND(p_name == SceneStringNames::get_singleton()->output);
ERR_FAIL_COND(String(p_name).find("/") != -1);
nodes[p_name] = p_node;
p_node->tree = this;
p_node->player = player;
p_node->set_parent(this);
p_node->set_graph_player(get_graph_player());
emit_changed();
}
@ -796,8 +803,8 @@ void AnimationNodeBlendTree::remove_node(const StringName &p_name) {
for (int i = 0; i < node->get_input_count(); i++) {
node->set_input_connection(i, StringName());
}
node->tree = NULL;
node->player = NULL;
node->set_parent(NULL);
node->set_graph_player(NULL);
}
nodes.erase(p_name);
@ -1092,14 +1099,14 @@ AnimationNodeBlendTree::AnimationNodeBlendTree() {
Ref<AnimationNodeOutput> output;
output.instance();
output->set_position(Vector2(300, 150));
output->tree = this;
output->set_parent(this);
nodes["output"] = output;
}
AnimationNodeBlendTree::~AnimationNodeBlendTree() {
for (Map<StringName, Ref<AnimationNode> >::Element *E = nodes.front(); E; E = E->next()) {
E->get()->tree = NULL;
E->get()->player = NULL;
E->get()->set_parent(NULL);
E->get()->set_graph_player(NULL);
}
}

8
scene/animation/animation_blend_tree.h
View file

@ -3,9 +3,9 @@
#include "scene/animation/animation_graph_player.h"
class AnimationNodeAnimation : public AnimationNode {
class AnimationNodeAnimation : public AnimationRootNode {
GDCLASS(AnimationNodeAnimation, AnimationNode);
GDCLASS(AnimationNodeAnimation, AnimationRootNode);
StringName animation;
@ -266,8 +266,8 @@ public:
/////
class AnimationNodeBlendTree : public AnimationNode {
GDCLASS(AnimationNodeBlendTree, AnimationNode)
class AnimationNodeBlendTree : public AnimationRootNode {
GDCLASS(AnimationNodeBlendTree, AnimationRootNode)
Map<StringName, Ref<AnimationNode> > nodes;

35
scene/animation/animation_graph_player.cpp
View file

@ -14,8 +14,13 @@ void AnimationNode::blend_animation(const StringName &p_animation, float p_time,
if (animation.is_null()) {
String name = get_tree()->get_node_name(Ref<AnimationNodeAnimation>(this));
make_invalid(vformat(RTR("In node '%s', invalid animation: '%s'."), name, p_animation));
Ref<AnimationNodeBlendTree> btree = get_parent();
if (btree.is_valid()) {
String name = btree->get_node_name(Ref<AnimationNodeAnimation>(this));
make_invalid(vformat(RTR("In node '%s', invalid animation: '%s'."), name, p_animation));
} else {
make_invalid(vformat(RTR("Invalid animation: '%s'."), p_animation));
}
return;
}
@ -53,12 +58,14 @@ float AnimationNode::blend_input(int p_input, float p_time, bool p_seek, float p
ERR_FAIL_COND_V(!state, 0);
ERR_FAIL_COND_V(!get_graph_player(), 0); //should not happen, but used to catch bugs
if (!tree && get_graph_player()->get_graph_root().ptr() != this) {
Ref<AnimationNodeBlendTree> tree = get_parent();
if (!tree.is_valid() && get_graph_player()->get_graph_root().ptr() != this) {
make_invalid(RTR("Can't blend input because node is not in a tree"));
return 0;
}
ERR_FAIL_COND_V(!tree, 0); //should not happen
ERR_FAIL_COND_V(!tree.is_valid(), 0); //should not happen
StringName anim_name = inputs[p_input].connected_to;
@ -66,7 +73,7 @@ float AnimationNode::blend_input(int p_input, float p_time, bool p_seek, float p
if (node.is_null()) {
String name = get_tree()->get_node_name(Ref<AnimationNodeAnimation>(this));
String name = tree->get_node_name(Ref<AnimationNodeAnimation>(this));
make_invalid(vformat(RTR("Nothing connected to input '%s' of node '%s'."), get_input_name(p_input), name));
return 0;
}
@ -222,6 +229,8 @@ String AnimationNode::get_caption() const {
}
void AnimationNode::add_input(const String &p_name) {
//root nodes cant add inputs
ERR_FAIL_COND(Object::cast_to<AnimationRootNode>(this) != NULL)
Input input;
ERR_FAIL_COND(p_name.find(".") != -1 || p_name.find("/") != -1);
input.name = p_name;
@ -244,12 +253,16 @@ void AnimationNode::remove_input(int p_index) {
emit_changed();
}
Ref<AnimationNodeBlendTree> AnimationNode::get_tree() const {
if (tree) {
return Ref<AnimationNodeBlendTree>(tree);
void AnimationNode::set_parent(AnimationNode *p_parent) {
parent = p_parent; //do not use ref because parent contains children
}
Ref<AnimationNode> AnimationNode::get_parent() const {
if (parent) {
return Ref<AnimationNode>(parent);
}
return Ref<AnimationNodeBlendTree>();
return Ref<AnimationNode>();
}
AnimationGraphPlayer *AnimationNode::get_graph_player() const {
@ -373,7 +386,7 @@ void AnimationNode::_bind_methods() {
AnimationNode::AnimationNode() {
state = NULL;
tree = NULL;
parent = NULL;
player = NULL;
set_local_to_scene(true);
filter_enabled = false;
@ -1172,7 +1185,7 @@ void AnimationGraphPlayer::_bind_methods() {
ClassDB::bind_method(D_METHOD("_node_removed"), &AnimationGraphPlayer::_node_removed);
ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "graph_root", PROPERTY_HINT_RESOURCE_TYPE, "AnimationNodeBlendTree", PROPERTY_USAGE_DEFAULT | PROPERTY_USAGE_DO_NOT_SHARE_ON_DUPLICATE), "set_graph_root", "get_graph_root");
ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "graph_root", PROPERTY_HINT_RESOURCE_TYPE, "AnimationRootNode", PROPERTY_USAGE_DEFAULT | PROPERTY_USAGE_DO_NOT_SHARE_ON_DUPLICATE), "set_graph_root", "get_graph_root");
ADD_PROPERTY(PropertyInfo(Variant::NODE_PATH, "anim_player"), "set_animation_player", "get_animation_player");
ADD_PROPERTY(PropertyInfo(Variant::BOOL, "active"), "set_active", "is_active");
ADD_PROPERTY(PropertyInfo(Variant::INT, "process_mode", PROPERTY_HINT_ENUM, "Physics,Idle"), "set_process_mode", "get_process_mode");

16
scene/animation/animation_graph_player.h
View file

@ -61,8 +61,7 @@ public:
void _pre_update_animations(HashMap<NodePath, int> *track_map);
Vector2 position;
friend class AnimationNodeBlendTree;
AnimationNodeBlendTree *tree;
AnimationNode *parent;
AnimationGraphPlayer *player;
float _blend_node(Ref<AnimationNode> p_node, float p_time, bool p_seek, float p_blend, FilterAction p_filter = FILTER_IGNORE, bool p_optimize = true, float *r_max = NULL);
@ -84,12 +83,14 @@ protected:
void _validate_property(PropertyInfo &property) const;
public:
Ref<AnimationNodeBlendTree> get_tree() const;
void set_parent(AnimationNode *p_parent);
Ref<AnimationNode> get_parent() const;
virtual void set_graph_player(AnimationGraphPlayer *p_player);
AnimationGraphPlayer *get_graph_player() const;
AnimationPlayer *get_player() const;
virtual float process(float p_time, bool p_seek);
virtual String get_caption() const;
int get_input_count() const;
String get_input_name(int p_input);
@ -101,8 +102,6 @@ public:
void set_input_name(int p_input, const String &p_name);
void remove_input(int p_index);
virtual String get_caption() const;
void set_filter_path(const NodePath &p_path, bool p_enable);
bool is_path_filtered(const NodePath &p_path) const;
@ -119,6 +118,13 @@ public:
VARIANT_ENUM_CAST(AnimationNode::FilterAction)
//root node does not allow inputs
class AnimationRootNode : public AnimationNode {
GDCLASS(AnimationRootNode, AnimationNode)
public:
AnimationRootNode() {}
};
class AnimationGraphPlayer : public Node {
GDCLASS(AnimationGraphPlayer, Node)
public:

3
scene/register_scene_types.cpp
View file

@ -63,6 +63,7 @@
#include "scene/2d/tile_map.h"
#include "scene/2d/visibility_notifier_2d.h"
#include "scene/2d/y_sort.h"
#include "scene/animation/animation_blend_space.h"
#include "scene/animation/animation_blend_tree.h"
#include "scene/animation/animation_graph_player.h"
#include "scene/animation/animation_player.h"
@ -386,7 +387,9 @@ void register_scene_types() {
ClassDB::register_class<AnimationGraphPlayer>();
ClassDB::register_class<AnimationNode>();
ClassDB::register_class<AnimationRootNode>();
ClassDB::register_class<AnimationNodeBlendTree>();
ClassDB::register_class<AnimationNodeBlendSpace>();
ClassDB::register_class<AnimationNodeOutput>();
ClassDB::register_class<AnimationNodeOneShot>();
ClassDB::register_class<AnimationNodeAnimation>();