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

removed dependency on plib, updated installer, fixed warnings

Browse Source
This commit is contained in:
Chris Danford
2003-01-08 04:16:39 +00:00
parent 5462cb2f6e
commit 7d1c2ea22e
10 changed files with 87 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/RageMath.cpp
+45 -12
View File
@@ -13,33 +13,66 @@
#include "RageMath.h"
#include "RageTypes.h"
#ifdef _DEBUG
#pragma comment(lib, "plib-1.6.0/sg_d.lib")
#pragma comment(lib, "plib-1.6.0/ul_d.lib")
#else
#pragma comment(lib, "plib-1.6.0/sg.lib")
#pragma comment(lib, "plib-1.6.0/ul.lib")
#endif
#include <math.h>
void RageVec2Normalize( RageVector2* pOut, const RageVector2* pV )
{
sgNormalizeVec2( (float*)pOut, (const float*)pV );
float scale = 1.0f / sqrtf( pV->x*pV->x + pV->y*pV->y );
pOut->x = pV->x * scale;
pOut->y = pV->y * scale;
}
void RageVec3TransformCoord( RageVector3* pOut, const RageVector3* pV, const RageMatrix* pM )
{
sgFullXformPnt3 ( (float*)pOut, (float*)pV, pM->m );
RageVector4 temp( pV->x, pV->y, pV->z, 1.0f );
RageVec4TransformCoord( &temp, &temp, pM );
*pOut = RageVector3( temp.x/temp.w, temp.y/temp.w, temp.z/temp.w );
}
void RageVec4TransformCoord( RageVector4* pOut, const RageVector4* pV, const RageMatrix* pM )
{
const RageMatrix &a = *pM;
const RageVector4 &v = *pOut;
*pOut = RageVector4(
a.m00*v.x+a.m10*v.y+a.m20*v.z+a.m30*v.w,
a.m01*v.x+a.m11*v.y+a.m21*v.z+a.m31*v.w,
a.m02*v.x+a.m12*v.y+a.m22*v.z+a.m32*v.w,
a.m03*v.x+a.m13*v.y+a.m23*v.z+a.m33*v.w );
}
void RageMatrixIdentity( RageMatrix* pOut )
{
sgMakeIdentMat4( pOut->m );
*pOut = RageMatrix(
1,0,0,0,
0,1,0,0,
0,0,1,0,
0,0,0,1 );
}
void RageMatrixMultiply( RageMatrix* pOut, const RageMatrix* pA, const RageMatrix* pB )
{
sgMultMat4( pOut->m, pB->m, pA->m );
const RageMatrix &a = *pA;
const RageMatrix &b = *pB;
*pOut = RageMatrix(
a.m00*b.m00+a.m01*b.m10+a.m02*b.m20+a.m03*b.m30,
a.m00*b.m01+a.m01*b.m11+a.m02*b.m21+a.m03*b.m31,
a.m00*b.m02+a.m01*b.m12+a.m02*b.m22+a.m03*b.m32,
a.m00*b.m03+a.m01*b.m13+a.m02*b.m23+a.m03*b.m33,
a.m10*b.m00+a.m11*b.m10+a.m12*b.m20+a.m13*b.m30,
a.m10*b.m01+a.m11*b.m11+a.m12*b.m21+a.m13*b.m31,
a.m10*b.m02+a.m11*b.m12+a.m12*b.m22+a.m13*b.m32,
a.m10*b.m03+a.m11*b.m13+a.m12*b.m23+a.m13*b.m33,
a.m20*b.m00+a.m21*b.m10+a.m22*b.m20+a.m23*b.m30,
a.m20*b.m01+a.m21*b.m11+a.m22*b.m21+a.m23*b.m31,
a.m20*b.m02+a.m21*b.m12+a.m22*b.m22+a.m23*b.m32,
a.m20*b.m03+a.m21*b.m13+a.m22*b.m23+a.m23*b.m33,
a.m30*b.m00+a.m31*b.m10+a.m32*b.m20+a.m33*b.m30,
a.m30*b.m01+a.m31*b.m11+a.m32*b.m21+a.m33*b.m31,
a.m30*b.m02+a.m31*b.m12+a.m32*b.m22+a.m33*b.m32,
a.m30*b.m03+a.m31*b.m13+a.m32*b.m23+a.m33*b.m33
);
// phew!
}
void RageMatrixTranslation( RageMatrix* pOut, float x, float y, float z )