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.

Sign up for GitHub

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

Add the "invert condition" property to AnimationNodeStateMachineTransition #36434

Closed
wants to merge 1 commit into from
Closed

Add the "invert condition" property to AnimationNodeStateMachineTransition #36434

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 3 additions & 0 deletions doc/classes/AnimationNodeStateMachineTransition.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,9 @@
<member name="disabled" type="bool" setter="set_disabled" getter="is_disabled" default="false">
Don't use this transition during [method AnimationNodeStateMachinePlayback.travel] or [member auto_advance].
</member>
<member name="invert_condition" type="bool" setter="set_invert_condition" getter="get_invert_condition" default="false">
If [code]true[/code], instead of turning on auto advance when the [member advance_condition] is met (i.e. evaluates to [code]true[/code]), auto advance will be turned on when the [member advance_condition] is [i]not[/i] met (i.e. evaluates to [code]false[/code]).
</member>
<member name="priority" type="int" setter="set_priority" getter="get_priority" default="1">
Lower priority transitions are preferred when travelling through the tree via [method AnimationNodeStateMachinePlayback.travel] or [member auto_advance].
</member>
Expand Down
14 changes: 11 additions & 3 deletions editor/plugins/animation_state_machine_editor.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -684,6 +684,7 @@ void AnimationNodeStateMachineEditor::_state_machine_draw() {
Ref<AnimationNodeStateMachineTransition> tr = state_machine->get_transition(i);
tl.disabled = tr->is_disabled();
tl.auto_advance = tr->has_auto_advance();
tl.invert_condition = tr->get_invert_condition();
tl.advance_condition_name = tr->get_advance_condition_name();
tl.advance_condition_state = false;
tl.mode = tr->get_switch_mode();
Expand Down Expand Up @@ -727,9 +728,16 @@ void AnimationNodeStateMachineEditor::_state_machine_draw() {

bool auto_advance = tl.auto_advance;
StringName fullpath = AnimationTreeEditor::get_singleton()->get_base_path() + String(tl.advance_condition_name);
if (tl.advance_condition_name != StringName() && bool(AnimationTreeEditor::get_singleton()->get_tree()->get(fullpath))) {
tl.advance_condition_state = true;
auto_advance = true;
if (tl.advance_condition_name != StringName()) {
if (bool(AnimationTreeEditor::get_singleton()->get_tree()->get(fullpath))) {
tl.advance_condition_state = true;
auto_advance = true;
}

if (tl.invert_condition) {
tl.advance_condition_state = !tl.advance_condition_state;
auto_advance = !auto_advance;
}
}
_connection_draw(tl.from, tl.to, tl.mode, !tl.disabled, selected, travel, auto_advance);

Expand Down
1 change: 1 addition & 0 deletions editor/plugins/animation_state_machine_editor.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,6 +126,7 @@ class AnimationNodeStateMachineEditor : public AnimationTreeNodeEditorPlugin {
Vector2 to;
AnimationNodeStateMachineTransition::SwitchMode mode;
StringName advance_condition_name;
bool invert_condition;
bool advance_condition_state = false;
bool disabled = false;
bool auto_advance = false;
Expand Down
23 changes: 21 additions & 2 deletions scene/animation/animation_node_state_machine.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,14 @@ StringName AnimationNodeStateMachineTransition::get_advance_condition_name() con
return advance_condition_name;
}

void AnimationNodeStateMachineTransition::set_invert_condition(bool p_enable) {
invert_condition = p_enable;
}

bool AnimationNodeStateMachineTransition::get_invert_condition() const {
return invert_condition;
}

void AnimationNodeStateMachineTransition::set_xfade_time(float p_xfade) {
ERR_FAIL_COND(p_xfade < 0);
xfade = p_xfade;
Expand Down Expand Up @@ -106,6 +114,9 @@ void AnimationNodeStateMachineTransition::_bind_methods() {
ClassDB::bind_method(D_METHOD("set_advance_condition", "name"), &AnimationNodeStateMachineTransition::set_advance_condition);
ClassDB::bind_method(D_METHOD("get_advance_condition"), &AnimationNodeStateMachineTransition::get_advance_condition);

ClassDB::bind_method(D_METHOD("set_invert_condition", "invert"), &AnimationNodeStateMachineTransition::set_invert_condition);
ClassDB::bind_method(D_METHOD("get_invert_condition"), &AnimationNodeStateMachineTransition::get_invert_condition);

ClassDB::bind_method(D_METHOD("set_xfade_time", "secs"), &AnimationNodeStateMachineTransition::set_xfade_time);
ClassDB::bind_method(D_METHOD("get_xfade_time"), &AnimationNodeStateMachineTransition::get_xfade_time);

Expand All @@ -118,6 +129,7 @@ void AnimationNodeStateMachineTransition::_bind_methods() {
ADD_PROPERTY(PropertyInfo(Variant::INT, "switch_mode", PROPERTY_HINT_ENUM, "Immediate,Sync,AtEnd"), "set_switch_mode", "get_switch_mode");
ADD_PROPERTY(PropertyInfo(Variant::BOOL, "auto_advance"), "set_auto_advance", "has_auto_advance");
ADD_PROPERTY(PropertyInfo(Variant::STRING_NAME, "advance_condition"), "set_advance_condition", "get_advance_condition");
ADD_PROPERTY(PropertyInfo(Variant::BOOL, "invert_condition"), "set_invert_condition", "get_invert_condition");
ADD_PROPERTY(PropertyInfo(Variant::FLOAT, "xfade_time", PROPERTY_HINT_RANGE, "0,240,0.01"), "set_xfade_time", "get_xfade_time");
ADD_PROPERTY(PropertyInfo(Variant::INT, "priority", PROPERTY_HINT_RANGE, "0,32,1"), "set_priority", "get_priority");
ADD_PROPERTY(PropertyInfo(Variant::BOOL, "disabled"), "set_disabled", "is_disabled");
Expand All @@ -132,6 +144,7 @@ void AnimationNodeStateMachineTransition::_bind_methods() {
AnimationNodeStateMachineTransition::AnimationNodeStateMachineTransition() {
switch_mode = SWITCH_MODE_IMMEDIATE;
auto_advance = false;
invert_condition = false;
xfade = 0;
disabled = false;
priority = 1;
Expand Down Expand Up @@ -418,8 +431,14 @@ float AnimationNodeStateMachinePlayback::process(AnimationNodeStateMachine *p_st
auto_advance = true;
}
StringName advance_condition_name = p_state_machine->transitions[i].transition->get_advance_condition_name();
if (advance_condition_name != StringName() && bool(p_state_machine->get_parameter(advance_condition_name))) {
auto_advance = true;
if (advance_condition_name != StringName()) {
if (bool(p_state_machine->get_parameter(advance_condition_name))) {
auto_advance = true;
}

if (p_state_machine->transitions[i].transition->get_invert_condition()) {
auto_advance = !auto_advance;
}
}

if (p_state_machine->transitions[i].from == current && auto_advance) {
Expand Down
4 changes: 4 additions & 0 deletions scene/animation/animation_node_state_machine.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ class AnimationNodeStateMachineTransition : public Resource {
bool auto_advance;
StringName advance_condition;
StringName advance_condition_name;
bool invert_condition;
float xfade;
bool disabled;
int priority;
Expand All @@ -67,6 +68,9 @@ class AnimationNodeStateMachineTransition : public Resource {

StringName get_advance_condition_name() const;

void set_invert_condition(bool p_enable);
bool get_invert_condition() const;

void set_xfade_time(float p_xfade);
float get_xfade_time() const;

Expand Down