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

Merge pull request #92636 from TokageItLab/blend-point-check 

Add blend point check to `AnimationNodeBlendSpace2D::_process()`
This commit is contained in:
Rémi Verschelde 2024-06-17 16:01:52 +02:00
parent 0ca0b462e5 8a90c5317b
commit 0a543a6085
No known key found for this signature in database
GPG Key ID: C3336907360768E1
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
scene/animation/animation_blend_space_1d.cpp
View File

@ -278,7 +278,7 @@ void AnimationNodeBlendSpace1D::_add_blend_point(int p_index, const Ref<Animatio
} }
AnimationNode::NodeTimeInfo AnimationNodeBlendSpace1D::_process(const AnimationMixer::PlaybackInfo p_playback_info, bool p_test_only) { AnimationNode::NodeTimeInfo AnimationNodeBlendSpace1D::_process(const AnimationMixer::PlaybackInfo p_playback_info, bool p_test_only) {
if (blend_points_used == 0) { if (!blend_points_used) {
return NodeTimeInfo(); return NodeTimeInfo();
} }

6
scene/animation/animation_blend_space_2d.cpp
View File

@ -448,6 +448,10 @@ void AnimationNodeBlendSpace2D::_blend_triangle(const Vector2 &p_pos, const Vect
AnimationNode::NodeTimeInfo AnimationNodeBlendSpace2D::_process(const AnimationMixer::PlaybackInfo p_playback_info, bool p_test_only) { AnimationNode::NodeTimeInfo AnimationNodeBlendSpace2D::_process(const AnimationMixer::PlaybackInfo p_playback_info, bool p_test_only) {
_update_triangles(); _update_triangles();
if (!blend_points_used) {
return NodeTimeInfo();
}
Vector2 blend_pos = get_parameter(blend_position); Vector2 blend_pos = get_parameter(blend_position);
int cur_closest = get_parameter(closest); int cur_closest = get_parameter(closest);
NodeTimeInfo mind; //time of min distance point NodeTimeInfo mind; //time of min distance point
@ -455,7 +459,7 @@ AnimationNode::NodeTimeInfo AnimationNodeBlendSpace2D::_process(const AnimationM
AnimationMixer::PlaybackInfo pi = p_playback_info; AnimationMixer::PlaybackInfo pi = p_playback_info;
if (blend_mode == BLEND_MODE_INTERPOLATED) { if (blend_mode == BLEND_MODE_INTERPOLATED) {
if (triangles.size() == 0) { if (triangles.is_empty()) {
return NodeTimeInfo(); return NodeTimeInfo();
} }