asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

Merge pull request #75810 from yedpodtrzitko/yed/simplify-comparison

Browse source 
misc: simplify blend position comparison
This commit is contained in:
Yuri Sizov 2023-04-10 11:58:51 +02:00 • committed by GitHub
commit d54266899a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
scene/animation/animation_blend_space_1d.cpp
View file

@ -288,8 +288,6 @@ double AnimationNodeBlendSpace1D::process(double p_time, bool p_seek, bool p_is_
double max_time_remaining = 0.0; double max_time_remaining = 0.0;
if (blend_mode == BLEND_MODE_INTERPOLATED) { if (blend_mode == BLEND_MODE_INTERPOLATED) {
float weights[MAX_BLEND_POINTS] = {};
int point_lower = -1; int point_lower = -1;
float pos_lower = 0.0; float pos_lower = 0.0;
int point_higher = -1; int point_higher = -1;
@ -300,26 +298,18 @@ double AnimationNodeBlendSpace1D::process(double p_time, bool p_seek, bool p_is_
float pos = blend_points[i].position; float pos = blend_points[i].position;
if (pos <= blend_pos) { if (pos <= blend_pos) {
if (point_lower == -1) { if (point_lower == -1 || pos > pos_lower) {
point_lower = i;
pos_lower = pos;
} else if ((blend_pos - pos) < (blend_pos - pos_lower)) {
point_lower = i; point_lower = i;
pos_lower = pos; pos_lower = pos;
} }
} else { } else if (point_higher == -1 || pos < pos_higher) {
if (point_higher == -1) { point_higher = i;
point_higher = i; pos_higher = pos;
pos_higher = pos;
} else if ((pos - blend_pos) < (pos_higher - blend_pos)) {
point_higher = i;
pos_higher = pos;
}
} }
} }
// fill in weights // fill in weights
float weights[MAX_BLEND_POINTS] = {};
if (point_lower == -1 && point_higher != -1) { if (point_lower == -1 && point_higher != -1) {
// we are on the left side, no other point to the left // we are on the left side, no other point to the left
// we just play the next point. // we just play the next point.