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

simplify

Browse Source
This commit is contained in:
Glenn Maynard
2006-08-31 06:50:33 +00:00
parent 21454207d6
commit eb9a278c3e
1 changed files with 11 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/Model.cpp
+11 -12
View File
@@ -628,9 +628,6 @@ void Model::SetBones( const msAnimation* pAnimation, float fFrame, vector<myBone
continue; continue;
} }
RageVector3 vPos;
RageVector3 vRot;
// //
// search for the adjacent position keys // search for the adjacent position keys
// //
@@ -645,6 +642,8 @@ void Model::SetBones( const msAnimation* pAnimation, float fFrame, vector<myBone
} }
pLastPositionKey = pPositionKey; pLastPositionKey = pPositionKey;
} }
RageVector3 vPos;
if( pLastPositionKey != NULL && pThisPositionKey != NULL ) if( pLastPositionKey != NULL && pThisPositionKey != NULL )
{ {
float d = pThisPositionKey->fTime - pLastPositionKey->fTime; float d = pThisPositionKey->fTime - pLastPositionKey->fTime;
@@ -659,8 +658,6 @@ void Model::SetBones( const msAnimation* pAnimation, float fFrame, vector<myBone
// //
// search for the adjacent rotation keys // search for the adjacent rotation keys
// //
RageMatrix m;
RageMatrixIdentity( &m );
const msRotationKey *pLastRotationKey = NULL, *pThisRotationKey = NULL; const msRotationKey *pLastRotationKey = NULL, *pThisRotationKey = NULL;
for( int j = 0; j < nRotationKeyCount; j++ ) for( int j = 0; j < nRotationKeyCount; j++ )
{ {
@@ -672,23 +669,25 @@ void Model::SetBones( const msAnimation* pAnimation, float fFrame, vector<myBone
} }
pLastRotationKey = pRotationKey; pLastRotationKey = pRotationKey;
} }
RageVector4 vRot;
if( pLastRotationKey != 0 && pThisRotationKey != 0 ) if( pLastRotationKey != 0 && pThisRotationKey != 0 )
{ {
const float s = SCALE( fFrame, pLastRotationKey->fTime, pThisRotationKey->fTime, 0, 1 ); const float s = SCALE( fFrame, pLastRotationKey->fTime, pThisRotationKey->fTime, 0, 1 );
RageQuatSlerp( &vRot, pLastRotationKey->Rotation, pThisRotationKey->Rotation, s );
RageVector4 q;
RageQuatSlerp( &q, pLastRotationKey->Rotation, pThisRotationKey->Rotation, s );
RageMatrixFromQuat( &m, q );
} }
else if( pLastRotationKey == 0 ) else if( pLastRotationKey == 0 )
{ {
RageMatrixFromQuat( &m, pThisRotationKey->Rotation ); vRot = pThisRotationKey->Rotation;
} }
else if( pThisRotationKey == 0 ) else if( pThisRotationKey == 0 )
{ {
RageMatrixFromQuat( &m, pLastRotationKey->Rotation ); vRot = pLastRotationKey->Rotation;
} }
RageMatrix m;
RageMatrixIdentity( &m );
RageMatrixFromQuat( &m, vRot );
m.m[3][0] = vPos[0]; m.m[3][0] = vPos[0];
m.m[3][1] = vPos[1]; m.m[3][1] = vPos[1];
m.m[3][2] = vPos[2]; m.m[3][2] = vPos[2];