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

Added new method to replace an already added node to the animation state machine

This commit is contained in:
Andrea Catania 2020-03-16 17:42:29 +01:00
parent a24aafcb92
commit 422926cfc6
3 changed files with 34 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
doc/classes/AnimationNodeStateMachine.xml
View File

@ -28,6 +28,17 @@
Adds a new node to the graph. The [code]position[/code] is used for display in the editor. Adds a new node to the graph. The [code]position[/code] is used for display in the editor.
</description> </description>
</method> </method>
<method name="replace_node">
<return type="void">
</return>
<argument index="0" name="name" type="String">
</argument>
<argument index="1" name="node" type="AnimationNode">
</argument>
<description>
Replaces the node and keeps its transitions unchanged.
</description>
</method>
<method name="add_transition"> <method name="add_transition">
<return type="void"> <return type="void">
</return> </return>

22
scene/animation/animation_node_state_machine.cpp
View File

@ -565,6 +565,27 @@ void AnimationNodeStateMachine::add_node(const StringName &p_name, Ref<Animation
p_node->connect_compat("tree_changed", this, "_tree_changed", varray(), CONNECT_REFERENCE_COUNTED); p_node->connect_compat("tree_changed", this, "_tree_changed", varray(), CONNECT_REFERENCE_COUNTED);
} }
void AnimationNodeStateMachine::replace_node(const StringName &p_name, Ref<AnimationNode> p_node) {
ERR_FAIL_COND(states.has(p_name) == false);
ERR_FAIL_COND(p_node.is_null());
ERR_FAIL_COND(String(p_name).find("/") != -1);
{
Ref<AnimationNode> node = states[p_name].node;
if (node.is_valid()) {
node->disconnect_compat("tree_changed", this, "_tree_changed");
}
}
states[p_name].node = p_node;
emit_changed();
emit_signal("tree_changed");
p_node->connect_compat("tree_changed", this, "_tree_changed", varray(), CONNECT_REFERENCE_COUNTED);
}
Ref<AnimationNode> AnimationNodeStateMachine::get_node(const StringName &p_name) const { Ref<AnimationNode> AnimationNodeStateMachine::get_node(const StringName &p_name) const {
ERR_FAIL_COND_V(!states.has(p_name), Ref<AnimationNode>()); ERR_FAIL_COND_V(!states.has(p_name), Ref<AnimationNode>());
@ -949,6 +970,7 @@ void AnimationNodeStateMachine::_tree_changed() {
void AnimationNodeStateMachine::_bind_methods() { void AnimationNodeStateMachine::_bind_methods() {
ClassDB::bind_method(D_METHOD("add_node", "name", "node", "position"), &AnimationNodeStateMachine::add_node, DEFVAL(Vector2())); ClassDB::bind_method(D_METHOD("add_node", "name", "node", "position"), &AnimationNodeStateMachine::add_node, DEFVAL(Vector2()));
ClassDB::bind_method(D_METHOD("replace_node", "name", "node"), &AnimationNodeStateMachine::replace_node);
ClassDB::bind_method(D_METHOD("get_node", "name"), &AnimationNodeStateMachine::get_node); ClassDB::bind_method(D_METHOD("get_node", "name"), &AnimationNodeStateMachine::get_node);
ClassDB::bind_method(D_METHOD("remove_node", "name"), &AnimationNodeStateMachine::remove_node); ClassDB::bind_method(D_METHOD("remove_node", "name"), &AnimationNodeStateMachine::remove_node);
ClassDB::bind_method(D_METHOD("rename_node", "name", "new_name"), &AnimationNodeStateMachine::rename_node); ClassDB::bind_method(D_METHOD("rename_node", "name", "new_name"), &AnimationNodeStateMachine::rename_node);

1
scene/animation/animation_node_state_machine.h
View File

@ -178,6 +178,7 @@ public:
virtual Variant get_parameter_default_value(const StringName &p_parameter) const; virtual Variant get_parameter_default_value(const StringName &p_parameter) const;
void add_node(const StringName &p_name, Ref<AnimationNode> p_node, const Vector2 &p_position = Vector2()); void add_node(const StringName &p_name, Ref<AnimationNode> p_node, const Vector2 &p_position = Vector2());
void replace_node(const StringName &p_name, Ref<AnimationNode> p_node);
Ref<AnimationNode> get_node(const StringName &p_name) const; Ref<AnimationNode> get_node(const StringName &p_name) const;
void remove_node(const StringName &p_name); void remove_node(const StringName &p_name);
void rename_node(const StringName &p_name, const StringName &p_new_name); void rename_node(const StringName &p_name, const StringName &p_new_name);