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

Merge pull request #69039 from maiself/fix-negative-blend-weights

Browse source 
Fix blending with negative blend weights
This commit is contained in:
Rémi Verschelde 2022-11-23 08:32:47 +01:00
commit 759e91ae00
No known key found for this signature in database
GPG key ID: C3336907360768E1
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
scene/animation/animation_tree.cpp
View file

@ -221,7 +221,7 @@ double AnimationNode::_blend_node(const StringName &p_subpath, const Vector<Stri
} }
blendw[i] = blendr[i] * p_blend; blendw[i] = blendr[i] * p_blend;
if (blendw[i] > CMP_EPSILON) { if (!Math::is_zero_approx(blendw[i])) {
any_valid = true; any_valid = true;
} }
} }
@ -236,7 +236,7 @@ double AnimationNode::_blend_node(const StringName &p_subpath, const Vector<Stri
} }
blendw[i] = blendr[i] * p_blend; blendw[i] = blendr[i] * p_blend;
if (blendw[i] > CMP_EPSILON) { if (!Math::is_zero_approx(blendw[i])) {
any_valid = true; any_valid = true;
} }
} }
@ -252,7 +252,7 @@ double AnimationNode::_blend_node(const StringName &p_subpath, const Vector<Stri
blendw[i] = blendr[i]; //not filtered, do not blend blendw[i] = blendr[i]; //not filtered, do not blend
} }
if (blendw[i] > CMP_EPSILON) { if (!Math::is_zero_approx(blendw[i])) {
any_valid = true; any_valid = true;
} }
} }
@ -263,7 +263,7 @@ double AnimationNode::_blend_node(const StringName &p_subpath, const Vector<Stri
for (int i = 0; i < blend_count; i++) { for (int i = 0; i < blend_count; i++) {
//regular blend //regular blend
blendw[i] = blendr[i] * p_blend; blendw[i] = blendr[i] * p_blend;
if (blendw[i] > CMP_EPSILON) { if (!Math::is_zero_approx(blendw[i])) {
any_valid = true; any_valid = true;
} }
} }
@ -1025,7 +1025,7 @@ void AnimationTree::_process_graph(double p_delta) {
int blend_idx = state.track_map[path]; int blend_idx = state.track_map[path];
ERR_CONTINUE(blend_idx < 0 || blend_idx >= state.track_count); ERR_CONTINUE(blend_idx < 0 || blend_idx >= state.track_count);
real_t blend = (*as.track_blends)[blend_idx] * weight; real_t blend = (*as.track_blends)[blend_idx] * weight;
if (blend < CMP_EPSILON) { if (Math::is_zero_approx(blend)) {
continue; // Nothing to blend. continue; // Nothing to blend.
} }