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

store bone rotations as quats; more common than HPR, and we don't

Browse Source 
have to convert constantly
This commit is contained in:
Glenn Maynard
2006-08-31 06:47:05 +00:00
parent 29c3866951
commit 0f5e5c5122
3 changed files with 7 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/Model.cpp
+4 -8
View File
@@ -676,22 +676,18 @@ void Model::SetBones( const msAnimation* pAnimation, float fFrame, vector<myBone
{ {
const float s = SCALE( fFrame, pLastRotationKey->fTime, pThisRotationKey->fTime, 0, 1 ); const float s = SCALE( fFrame, pLastRotationKey->fTime, pThisRotationKey->fTime, 0, 1 );
RageVector4 q1, q2, q; RageVector4 q;
RageQuatFromHPR( &q1, pLastRotationKey->Rotation ); RageQuatSlerp( &q, pLastRotationKey->Rotation, pThisRotationKey->Rotation, s );
RageQuatFromHPR( &q2, pThisRotationKey->Rotation );
RageQuatSlerp( &q, q1, q2, s );
RageMatrixFromQuat( &m, q ); RageMatrixFromQuat( &m, q );
} }
else if( pLastRotationKey == 0 ) else if( pLastRotationKey == 0 )
{ {
vRot = pThisRotationKey->Rotation; RageMatrixFromQuat( &m, pThisRotationKey->Rotation );
RageMatrixAngles( &m, vRot );
} }
else if( pThisRotationKey == 0 ) else if( pThisRotationKey == 0 )
{ {
vRot = pLastRotationKey->Rotation; RageMatrixFromQuat( &m, pLastRotationKey->Rotation );
RageMatrixAngles( &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];
stepmania/src/ModelTypes.cpp
+2 -1
View File
@@ -340,7 +340,8 @@ bool msAnimation::LoadMilkshapeAsciiBones( RString sAniName, RString sPath )
msRotationKey key; msRotationKey key;
key.fTime = fTime; key.fTime = fTime;
key.Rotation = RageVector3( Rotation[0], Rotation[1], Rotation[2] ); RageVector3 Rotation = RageVector3( Rotation[0], Rotation[1], Rotation[2] );
RageQuatFromHPR( &key.Rotation, Rotation );
Bone.RotationKeys[j] = key; Bone.RotationKeys[j] = key;
} }
} }
stepmania/src/ModelTypes.h
+1 -1
View File
@@ -110,7 +110,7 @@ struct msPositionKey
struct msRotationKey struct msRotationKey
{ {
float fTime; float fTime;
RageVector3 Rotation; RageVector4 Rotation;
}; };
struct msBone struct msBone