zdoom/gzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom.git synced 2025-03-24 11:42:19 +00:00
Code Issues Projects Releases Packages Wiki Activity

quick fix for interpolation, TODO better fix

Browse source
This commit is contained in:
Ricardo Luís Vaz Silva 2024-09-13 12:12:15 -03:00
parent 17d7006d72
commit b1318e4b22
1 changed files with 14 additions and 8 deletions

22
src/playsim/p_actionfunctions.cpp
View file

@ -5176,9 +5176,23 @@ void SetAnimationInternal(AActor * self, FName animName, double framerate, int s
return;
}
if(self->modelData->curAnim.startTic > tic)
{ // force instant switch if interpolating
flags |= SAF_INSTANT;
}
if(!(flags & SAF_INSTANT))
{
self->modelData->prevAnim = self->modelData->curAnim;
bool looped = false;
self->modelData->prevAnim.startFrame = getCurrentFrame(self->modelData->prevAnim, tic, &looped);
if(!looped)
{
self->modelData->prevAnim.flags &= ~ANIMOVERRIDE_LOOP;
}
}
int animEnd = mdl->FindLastFrame(animName);
@ -5218,14 +5232,6 @@ void SetAnimationInternal(AActor * self, FName animName, double framerate, int s
if(!(flags & SAF_INSTANT))
{
bool looped = false;
self->modelData->prevAnim.startFrame = getCurrentFrame(self->modelData->prevAnim, tic, &looped);
if(!looped)
{
self->modelData->prevAnim.flags &= ~ANIMOVERRIDE_LOOP;
}
int startTic = floor(tic) + interpolateTics;
self->modelData->curAnim.startTic = startTic;
self->modelData->curAnim.switchOffset = startTic - tic;