Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fixed incorrect blending in Pos/Rot/Scl Track #54205

Closed
wants to merge 1 commit into from
Closed

Fixed incorrect blending in Pos/Rot/Scl Track #54205

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
72 changes: 40 additions & 32 deletions scene/animation/animation_tree.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -936,15 +936,14 @@ void AnimationTree::_process_graph(real_t p_delta) {
#ifndef _3D_DISABLED
TrackCacheTransform *t = static_cast<TrackCacheTransform *>(track);

if (t->process_pass != process_pass) {
t->process_pass = process_pass;
t->loc = Vector3();
t->rot = Quaternion();
t->rot_blend_accum = 0;
t->scale = Vector3(1, 1, 1);
}

if (track->root_motion) {
if (t->process_pass != process_pass) {
t->process_pass = process_pass;
t->loc = Vector3();
t->rot = Quaternion();
t->scale = Vector3(1, 1, 1);
}

double prev_time = time - delta;
if (!backward) {
if (prev_time < 0) {
Expand Down Expand Up @@ -1017,6 +1016,12 @@ void AnimationTree::_process_graph(real_t p_delta) {
Vector3 loc;

Error err = a->position_track_interpolate(i, time, &loc);

if (t->process_pass != process_pass) {
t->process_pass = process_pass;
t->loc = loc;
}

if (err != OK) {
continue;
}
Expand All @@ -1029,15 +1034,14 @@ void AnimationTree::_process_graph(real_t p_delta) {
#ifndef _3D_DISABLED
TrackCacheTransform *t = static_cast<TrackCacheTransform *>(track);

if (t->process_pass != process_pass) {
t->process_pass = process_pass;
t->loc = Vector3();
t->rot = Quaternion();
t->rot_blend_accum = 0;
t->scale = Vector3(1, 1, 1);
}

if (track->root_motion) {
if (t->process_pass != process_pass) {
t->process_pass = process_pass;
t->loc = Vector3();
t->rot = Quaternion();
t->scale = Vector3(1, 1, 1);
}

double prev_time = time - delta;
if (!backward) {
if (prev_time < 0) {
Expand Down Expand Up @@ -1113,34 +1117,32 @@ void AnimationTree::_process_graph(real_t p_delta) {
Quaternion rot;

Error err = a->rotation_track_interpolate(i, time, &rot);

if (t->process_pass != process_pass) {
t->process_pass = process_pass;
t->rot = rot;
}

if (err != OK) {
continue;
}

if (t->rot_blend_accum == 0) {
t->rot = rot;
t->rot_blend_accum = blend;
} else {
real_t rot_total = t->rot_blend_accum + blend;
t->rot = rot.slerp(t->rot, t->rot_blend_accum / rot_total).normalized();
t->rot_blend_accum = rot_total;
}
t->rot = t->rot.slerp(rot, blend).normalized();
}
#endif // _3D_DISABLED
} break;
case Animation::TYPE_SCALE_3D: {
#ifndef _3D_DISABLED
TrackCacheTransform *t = static_cast<TrackCacheTransform *>(track);

if (t->process_pass != process_pass) {
t->process_pass = process_pass;
t->loc = Vector3();
t->rot = Quaternion();
t->rot_blend_accum = 0;
t->scale = Vector3(1, 1, 1);
}

if (track->root_motion) {
if (t->process_pass != process_pass) {
t->process_pass = process_pass;
t->loc = Vector3();
t->rot = Quaternion();
t->scale = Vector3(1, 1, 1);
}

double prev_time = time - delta;
if (!backward) {
if (prev_time < 0) {
Expand Down Expand Up @@ -1213,6 +1215,12 @@ void AnimationTree::_process_graph(real_t p_delta) {
Vector3 scale;

Error err = a->scale_track_interpolate(i, time, &scale);

if (t->process_pass != process_pass) {
t->process_pass = process_pass;
t->scale = scale;
}

if (err != OK) {
continue;
}
Expand Down
1 change: 0 additions & 1 deletion scene/animation/animation_tree.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -199,7 +199,6 @@ class AnimationTree : public Node {
bool scale_used = false;
Vector3 loc;
Quaternion rot;
real_t rot_blend_accum = 0.0;
Vector3 scale;

TrackCacheTransform() {
Expand Down