DevKit7/libctru
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge e86c27d54b into ac0e9ef9ca

Browse Source
This commit is contained in:
Safar 2014-11-30 23:37:32 +00:00
commit f1e4d63dcd
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
examples/gpu/source/math.c
View File

@ -43,8 +43,8 @@ void rotateMatrixX(float* tm, float x, bool r)
rm[0]=1.0f; rm[0]=1.0f;
rm[5]=cos(x); rm[5]=cos(x);
rm[6]=sin(x); rm[6]=sin(x);
rm[9]=-sin(x); rm[9]=-rm[6];
rm[10]=cos(x); rm[10]=rm[5];
rm[15]=1.0f; rm[15]=1.0f;
if(!r)multMatrix44(tm,rm,m); if(!r)multMatrix44(tm,rm,m);
else multMatrix44(rm,tm,m); else multMatrix44(rm,tm,m);
@ -58,8 +58,8 @@ void rotateMatrixY(float* tm, float x, bool r)
rm[0]=cos(x); rm[0]=cos(x);
rm[2]=sin(x); rm[2]=sin(x);
rm[5]=1.0f; rm[5]=1.0f;
rm[8]=-sin(x); rm[8]=-rm[2];
rm[10]=cos(x); rm[10]=rm[0];
rm[15]=1.0f; rm[15]=1.0f;
if(!r)multMatrix44(tm,rm,m); if(!r)multMatrix44(tm,rm,m);
else multMatrix44(rm,tm,m); else multMatrix44(rm,tm,m);
@ -72,8 +72,8 @@ void rotateMatrixZ(float* tm, float x, bool r)
memset(rm, 0x00, 16*4); memset(rm, 0x00, 16*4);
rm[0]=cos(x); rm[0]=cos(x);
rm[1]=sin(x); rm[1]=sin(x);
rm[4]=-sin(x); rm[4]=-rm[1];
rm[5]=cos(x); rm[5]=rm[0];
rm[10]=1.0f; rm[10]=1.0f;
rm[15]=1.0f; rm[15]=1.0f;
if(!r)multMatrix44(tm,rm,m); if(!r)multMatrix44(tm,rm,m);
@ -109,7 +109,6 @@ void initProjectionMatrix(float* m, float fovy, float aspect, float near, float
mp[0x9] = 0.0f; mp[0x9] = 0.0f;
mp[0xA] = -(far+near)/(far-near); mp[0xA] = -(far+near)/(far-near);
mp[0xB] = -2.0f*(far*near)/(far-near); mp[0xB] = -2.0f*(far*near)/(far-near);
mp[0xC] = 0.0f; mp[0xC] = 0.0f;
mp[0xD] = 0.0f; mp[0xD] = 0.0f;
mp[0xE] = -1.0f; mp[0xE] = -1.0f;