actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

simplify

Browse Source
This commit is contained in:
Glenn Maynard
2003-12-20 04:07:09 +00:00
parent b852227e42
commit ca165c9b14
1 changed files with 6 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/Model.cpp
+6 -10
View File
@@ -856,19 +856,15 @@ Model::AdvanceFrame (float dt)
} }
if (pLastRotationKey != 0 && pThisRotationKey != 0) if (pLastRotationKey != 0 && pThisRotationKey != 0)
{ {
float d = pThisRotationKey->fTime - pLastRotationKey->fTime; const float s = SCALE( m_fCurrFrame, pLastRotationKey->fTime, pThisRotationKey->fTime, 0, 1 );
float s = (m_fCurrFrame - pLastRotationKey->fTime) / d;
RageVector4 q1a(0,0,0,1); RageVector4 q1, q2, q;
RageQuatFromHPR( &q1a, RageVector3(pLastRotationKey->Rotation) * (180 / PI) ); RageQuatFromHPR( &q1, RageVector3(pLastRotationKey->Rotation) * (180 / PI) );
RageVector4 q2a(0,0,0,1); RageQuatFromHPR( &q2, RageVector3(pThisRotationKey->Rotation) * (180 / PI) );
RageQuatFromHPR( &q2a, RageVector3(pThisRotationKey->Rotation) * (180 / PI) ); RageQuatSlerp( &q, q1, q2, s );
RageVector4 qa;
RageQuatSlerp( &qa, q1a, q2a, s );
RageMatrix mm; RageMatrix mm;
RageMatrixFromQuat( &mm, qa ); RageMatrixFromQuat( &mm, q );
MakeMatrix( m, mm ); MakeMatrix( m, mm );
} }
else if (pLastRotationKey == 0) else if (pLastRotationKey == 0)