Skip to content

Update animstate.cpp #204

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

Open
brawler-567 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Update animstate.cpp #204

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
55 changes: 31 additions & 24 deletions src/game/client/animstate.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,41 +11,48 @@ static void AnimSeqEval(const CAnimSequence *pSeq, float Time, CAnimKeyframe *pF
{
if(pSeq->m_NumFrames == 0)
{
pFrame->m_Time = 0;
pFrame->m_X = 0;
pFrame->m_Y = 0;
pFrame->m_Angle = 0;
*pFrame = {0, 0, 0, 0};
return;
}
else if(pSeq->m_NumFrames == 1)
if(pSeq->m_NumFrames == 1 || pSeq->m_aFrames[0].m_Time >= Time)
{
*pFrame = pSeq->m_aFrames[0];
return;
}
else
if(pSeq->m_aFrames[pSeq->m_NumFrames - 1].m_Time <= Time)
{
const CAnimKeyframe *pFrame1 = nullptr;
const CAnimKeyframe *pFrame2 = nullptr;
float Blend = 0.0f;
*pFrame = pSeq->m_aFrames[pSeq->m_NumFrames - 1];
return;
}

int Low = 0;
int High = pSeq->m_NumFrames - 1;
int Index = 0;

// TODO: make this smarter.. binary search
for(int i = 1; i < pSeq->m_NumFrames; i++)
while(Low <= High)
{
int Mid = Low + (High - Low) / 2;
if(pSeq->m_aFrames[Mid].m_Time <= Time)
{
if(pSeq->m_aFrames[i - 1].m_Time <= Time && pSeq->m_aFrames[i].m_Time >= Time)
{
pFrame1 = &pSeq->m_aFrames[i - 1];
pFrame2 = &pSeq->m_aFrames[i];
Blend = (Time - pFrame1->m_Time) / (pFrame2->m_Time - pFrame1->m_Time);
break;
}
Index = Mid;
Low = Mid + 1;
}

if(pFrame1 != nullptr && pFrame2 != nullptr)
else
{
pFrame->m_Time = Time;
pFrame->m_X = mix(pFrame1->m_X, pFrame2->m_X, Blend);
pFrame->m_Y = mix(pFrame1->m_Y, pFrame2->m_Y, Blend);
pFrame->m_Angle = mix(pFrame1->m_Angle, pFrame2->m_Angle, Blend);
High = Mid - 1;
}
}

const CAnimKeyframe *pFrame1 = &pSeq->m_aFrames[Index];
const CAnimKeyframe *pFrame2 = &pSeq->m_aFrames[Index + 1];

float Diff = pFrame2->m_Time - pFrame1->m_Time;
float Blend = (Diff > 0.0f) ? (Time - pFrame1->m_Time) / Diff : 0.0f;

pFrame->m_Time = Time;
pFrame->m_X = mix(pFrame1->m_X, pFrame2->m_X, Blend);
pFrame->m_Y = mix(pFrame1->m_Y, pFrame2->m_Y, Blend);
pFrame->m_Angle = mix(pFrame1->m_Angle, pFrame2->m_Angle, Blend);
}

static void AnimAddKeyframe(CAnimKeyframe *pSeq, const CAnimKeyframe *pAdded, float Amount)
Expand Down
Loading