hertog/godot-module-template
Template
2
1
Fork 1
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Revert "Implement reverse playback and ping-pong loop in AnimationPlayer and NodeAnimation"

Browse source
This commit is contained in:
Juan Linietsky 2021-10-11 19:27:50 -03:00 • committed by GitHub
parent 9ed4f8367b
commit 610de0974d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
29 changed files with 356 additions and 846 deletions
Download patch file Download diff file Expand all files Collapse all files

7
scene/animation/animation_blend_space_2d.cpp
View file

@ -30,7 +30,6 @@
#include "animation_blend_space_2d.h"
#include "animation_blend_tree.h"
#include "core/math/geometry_2d.h"
void AnimationNodeBlendSpace2D::get_parameter_list(List<PropertyInfo> *r_list) const {
@ -532,12 +531,6 @@ double AnimationNodeBlendSpace2D::process(double p_time, bool p_seek) {
if (new_closest != closest && new_closest != -1) {
float from = 0.0;
if (blend_mode == BLEND_MODE_DISCRETE_CARRY && closest != -1) {
//for ping-pong loop
Ref<AnimationNodeAnimation> na_c = static_cast<Ref<AnimationNodeAnimation>>(blend_points[closest].node);
Ref<AnimationNodeAnimation> na_n = static_cast<Ref<AnimationNodeAnimation>>(blend_points[new_closest].node);
if (!na_c.is_null() && !na_n.is_null()) {
na_n->set_backward(na_c->is_backward());
}
//see how much animation remains
from = length_internal - blend_node(blend_points[closest].name, blend_points[closest].node, p_time, false, 0.0, FILTER_IGNORE, false);
}