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

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
+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 );
RageVector4 q1, q2, q;
RageQuatFromHPR( &q1, pLastRotationKey->Rotation );
RageQuatFromHPR( &q2, pThisRotationKey->Rotation );
RageQuatSlerp( &q, q1, q2, s );
RageVector4 q;
RageQuatSlerp( &q, pLastRotationKey->Rotation, pThisRotationKey->Rotation, s );
RageMatrixFromQuat( &m, q );
}
else if( pLastRotationKey == 0 )
{
vRot = pThisRotationKey->Rotation;
RageMatrixAngles( &m, vRot );
RageMatrixFromQuat( &m, pThisRotationKey->Rotation );
}
else if( pThisRotationKey == 0 )
{
vRot = pLastRotationKey->Rotation;
RageMatrixAngles( &m, vRot );
RageMatrixFromQuat( &m, pLastRotationKey->Rotation );
}
m.m[3][0] = vPos[0];
m.m[3][1] = vPos[1];
+2 -1
View File
@@ -340,7 +340,8 @@ bool msAnimation::LoadMilkshapeAsciiBones( RString sAniName, RString sPath )
msRotationKey key;
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;
}
}
+1 -1
View File
@@ -110,7 +110,7 @@ struct msPositionKey
struct msRotationKey
{
float fTime;
RageVector3 Rotation;
RageVector4 Rotation;
};
struct msBone