mirror of
https://foundry.openuru.org/gitblit/r/CWE-ou-minkata.git
synced 2025-07-18 19:29:09 +00:00
Convert custom HeadSpin integer types to standard types from stdint.h
This commit is contained in:
@ -153,7 +153,7 @@ void hsEuler::GetMatrix44(hsMatrix44* mat)
|
||||
//
|
||||
// Convert matrix to Euler angles (in radians)
|
||||
//
|
||||
void hsEuler::SetFromMatrix44(const hsMatrix44* mat, UInt32 order)
|
||||
void hsEuler::SetFromMatrix44(const hsMatrix44* mat, uint32_t order)
|
||||
{
|
||||
int i,j,k,h,n,s,f;
|
||||
|
||||
@ -203,7 +203,7 @@ void hsEuler::SetFromMatrix44(const hsMatrix44* mat, UInt32 order)
|
||||
//
|
||||
// Convert quaternion to Euler angles (in radians)
|
||||
//
|
||||
void hsEuler::SetFromQuat(const hsQuat* q, UInt32 order)
|
||||
void hsEuler::SetFromQuat(const hsQuat* q, uint32_t order)
|
||||
{
|
||||
hsMatrix44 mat;
|
||||
double Nq = q->fX*q->fX+q->fY*q->fY+q->fZ*q->fZ+q->fW*q->fW;
|
||||
|
@ -116,17 +116,17 @@ class hsEuler
|
||||
{
|
||||
public:
|
||||
hsScalar fX,fY,fZ;
|
||||
UInt32 fOrder;
|
||||
uint32_t fOrder;
|
||||
|
||||
hsEuler(hsScalar ai, hsScalar aj, hsScalar ah, UInt32 order) : fX(ai),fY(aj),fZ(ah),fOrder(order) {}
|
||||
hsEuler(hsScalar ai, hsScalar aj, hsScalar ah, uint32_t order) : fX(ai),fY(aj),fZ(ah),fOrder(order) {}
|
||||
|
||||
// getters, converters
|
||||
void GetQuat(hsQuat* res );
|
||||
void GetMatrix44(hsMatrix44* M);
|
||||
|
||||
// setters, converters
|
||||
void SetFromMatrix44(const hsMatrix44* M, UInt32 order);
|
||||
void SetFromQuat(const hsQuat* q, UInt32 order);
|
||||
void SetFromMatrix44(const hsMatrix44* M, uint32_t order);
|
||||
void SetFromQuat(const hsQuat* q, uint32_t order);
|
||||
};
|
||||
|
||||
#endif // HS_EULER_inc
|
||||
|
Reference in New Issue
Block a user