Skip to content

Anim blending fixes #91

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

Merged
Andreas-W merged 2 commits into from
Jun 8, 2026
Merged

Anim blending fixes #91

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0acda66
fix issues in anim blending
Andreas-W May 27, 2026
0a19df8
Merge branch 'main' of https://github.com/Andreas-W/GeneralsGameCode_…
Andreas-W Jun 8, 2026
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
5 changes: 3 additions & 2 deletions Core/GameEngineDevice/Source/W3DDevice/GameClient/Drawable/Draw/W3DModelDraw.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2391,11 +2391,12 @@ void W3DModelDraw::adjustAnimation(const ModelConditionInfo* prevState, Real pre
isCommonMaintainFrameFlagSet(m_curState->m_flags, prevState->m_flags) &&
prevAnimFraction >= 0.0)
{
startFrame = REAL_TO_INT(prevAnimFraction * animHandle->Get_Num_Frames()-1);
startFrame = REAL_TO_INT(prevAnimFraction * (animHandle->Get_Num_Frames()-1));
}

// ANIMATION BLENDING
if (prevState &&
m_whichAnimInPrevState >= 0 &&
m_curState->m_animBlendTime > 0) {

const W3DAnimationInfo& animInfoPrev = prevState->m_animations[m_whichAnimInPrevState];
Expand All @@ -2409,7 +2410,7 @@ void W3DModelDraw::adjustAnimation(const ModelConditionInfo* prevState, Real pre

Real factor = GameClientRandomValueReal(m_curState->m_animMinSpeedFactor, m_curState->m_animMaxSpeedFactor);

Int startFramePrev = REAL_TO_INT(prevAnimFraction * m_prevAnimHelper.numFrames - 1);
Int startFramePrev = REAL_TO_INT(m_prevAnimHelper.frameNum);

// maxBlendTime = currentAnim duration in milliseconds
Int animBlendTime = m_curState->m_animBlendTime;
Expand Down
Loading