noahbackus/godot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

Fix ambiguous AnimationNode's parameter type in default value

Browse Source 
Co-authored-by: Tomasz Chabora <kobewi4e@gmail.com>
This commit is contained in:
Silc Lizard (Tokage) Renew
2025-06-01 06:50:42 +09:00
parent be3ecaeb3c
commit 678fb63451
8 changed files with 41 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
scene/animation/animation_blend_tree.cpp
+10 -10
View File
@@ -55,7 +55,7 @@ Variant AnimationNodeAnimation::get_parameter_default_value(const StringName &p_
if (p_parameter == backward) {
return false;
}
return 0;
return 0.0;
}
AnimationNode::NodeTimeInfo AnimationNodeAnimation::get_node_time_info() const {
@@ -438,10 +438,10 @@ Variant AnimationNodeOneShot::get_parameter_default_value(const StringName &p_pa
} else if (p_parameter == active || p_parameter == internal_active) {
return false;
} else if (p_parameter == time_to_restart) {
return -1;
} else {
return 0.0;
return -1.0;
}
return 0.0;
}
bool AnimationNodeOneShot::is_parameter_read_only(const StringName &p_parameter) const {
@@ -774,7 +774,7 @@ Variant AnimationNodeAdd2::get_parameter_default_value(const StringName &p_param
return ret;
}
return 0;
return 0.0;
}
String AnimationNodeAdd2::get_caption() const {
@@ -815,7 +815,7 @@ Variant AnimationNodeAdd3::get_parameter_default_value(const StringName &p_param
return ret;
}
return 0;
return 0.0;
}
String AnimationNodeAdd3::get_caption() const {
@@ -859,7 +859,7 @@ Variant AnimationNodeBlend2::get_parameter_default_value(const StringName &p_par
return ret;
}
return 0; // For blend amount.
return 0.0; // For blend amount.
}
String AnimationNodeBlend2::get_caption() const {
@@ -900,7 +900,7 @@ Variant AnimationNodeBlend3::get_parameter_default_value(const StringName &p_par
return ret;
}
return 0; // For blend amount.
return 0.0; // For blend amount.
}
String AnimationNodeBlend3::get_caption() const {
@@ -940,7 +940,7 @@ Variant AnimationNodeSub2::get_parameter_default_value(const StringName &p_param
return ret;
}
return 0;
return 0.0;
}
String AnimationNodeSub2::get_caption() const {
@@ -1146,7 +1146,7 @@ Variant AnimationNodeTransition::get_parameter_default_value(const StringName &p
if (p_parameter == prev_xfading) {
return 0.0;
} else if (p_parameter == prev_index || p_parameter == current_index) {
return -1;
return (int)-1;
} else {
return String();
}