From 04ac6a74dfa6c49e399d622a9bf87a3631078578 Mon Sep 17 00:00:00 2001 From: "Silc Lizard (Tokage) Renew" <61938263+TokageItLab@users.noreply.github.com> Date: Thu, 25 Jul 2024 10:57:59 +0900 Subject: [PATCH] Fix total weight calculation to separate track types --- scene/animation/animation_mixer.cpp | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/scene/animation/animation_mixer.cpp b/scene/animation/animation_mixer.cpp index e57be69eaf9d..e011dec79bf4 100644 --- a/scene/animation/animation_mixer.cpp +++ b/scene/animation/animation_mixer.cpp @@ -1081,24 +1081,23 @@ void AnimationMixer::_blend_calc_total_weight() { Ref a = ai.animation_data.animation; real_t weight = ai.playback_info.weight; Vector track_weights = ai.playback_info.track_weights; - Vector processed_indices; + Vector processed_hashes; for (int i = 0; i < a->get_track_count(); i++) { if (!a->track_is_enabled(i)) { continue; } Animation::TypeHash thash = a->track_get_type_hash(i); - if (!track_cache.has(thash)) { - continue; // No path, but avoid error spamming. + if (!track_cache.has(thash) || processed_hashes.has(thash)) { + // No path, but avoid error spamming. + // Or, there is the case different track type with same path; These can be distinguished by hash. So don't add the weight doubly. + continue; } TrackCache *track = track_cache[thash]; int blend_idx = track_map[track->path]; - if (processed_indices.has(blend_idx)) { - continue; // There is the case different track type with same path... Is there more faster iterating way than has()? - } ERR_CONTINUE(blend_idx < 0 || blend_idx >= track_count); real_t blend = blend_idx < track_weights.size() ? track_weights[blend_idx] * weight : weight; track->total_weight += blend; - processed_indices.push_back(blend_idx); + processed_hashes.push_back(thash); } } }