system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-11-05 18:01:34 +00:00
Code Issues Projects Releases Packages Wiki Activity

d3dx8: Implement D3DXMatrixPerspectiveOrthoRH.

Browse source
This commit is contained in:
David Adam 2007-11-03 09:57:33 +01:00 committed by Alexandre Julliard
parent 515d7101ce
commit 23d9da1eb9
4 changed files with 18 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
dlls/d3dx8/d3dx8.spec
View file

@ -42,7 +42,7 @@
@ stdcall D3DXMatrixPerspectiveFovLH(ptr long long long long)
@ stdcall D3DXMatrixPerspectiveOffCenterRH(ptr long long long long long long)
@ stdcall D3DXMatrixPerspectiveOffCenterLH(ptr long long long long long long)
@ stub D3DXMatrixOrthoRH
@ stdcall D3DXMatrixOrthoRH(ptr long long long long)
@ stub D3DXMatrixOrthoLH
@ stub D3DXMatrixOrthoOffCenterRH
@ stub D3DXMatrixOrthoOffCenterLH

10
dlls/d3dx8/math.c
View file

@ -116,6 +116,16 @@ D3DXMATRIX* WINAPI D3DXMatrixMultiply(D3DXMATRIX *pout, CONST D3DXMATRIX *pm1, C
return pout;
}
D3DXMATRIX* WINAPI D3DXMatrixOrthoRH(D3DXMATRIX *pout, FLOAT w, FLOAT h, FLOAT zn, FLOAT zf)
{
D3DXMatrixIdentity(pout);
pout->m[0][0] = 2.0f / w;
pout->m[1][1] = 2.0f / h;
pout->m[2][2] = 1.0f / (zn - zf);
pout->m[3][2] = zn / (zn - zf);
return pout;
}
D3DXMATRIX* WINAPI D3DXMatrixPerspectiveFovLH(D3DXMATRIX *pout, FLOAT fovy, FLOAT aspect, FLOAT zn, FLOAT zf)
{
D3DXMatrixIdentity(pout);

6
dlls/d3dx8/tests/math.c
View file

@ -222,6 +222,12 @@ static void D3DXMatrixTest(void)
D3DXMatrixMultiply(&gotmat,&mat,&mat2);
expect_mat(expectedmat,gotmat);
/*____________D3DXMatrixOrthoRH_______________*/
D3DXMatrixIdentity(&expectedmat);
expectedmat.m[0][0] = 0.8f; expectedmat.m[1][1] = 0.270270f; expectedmat.m[2][2] = 0.151515f; expectedmat.m[3][2] = -0.484848f;
D3DXMatrixOrthoRH(&gotmat, 2.5f, 7.4f, -3.2f, -9.8f);
expect_mat(expectedmat,gotmat);
/*____________D3DXMatrixPerspectiveFovLH_______________*/
expectedmat.m[0][0] = 13.288858f; expectedmat.m[0][1] = 0.0f; expectedmat.m[0][2] = 0.0f; expectedmat.m[0][3] = 0.0f;
expectedmat.m[1][0] = 0.0f; expectedmat.m[1][1] = 9.966644f; expectedmat.m[1][2] = 0.0; expectedmat.m[1][3] = 0.0f;

1
include/d3dx8math.h
View file

@ -62,6 +62,7 @@ FLOAT WINAPI D3DXMatrixfDeterminant(CONST D3DXMATRIX *pm);
D3DXMATRIX* WINAPI D3DXMatrixLookAtLH(D3DXMATRIX *pout, CONST D3DXVECTOR3 *peye, CONST D3DXVECTOR3 *pat, CONST D3DXVECTOR3 *pup);
D3DXMATRIX* WINAPI D3DXMatrixLookAtRH(D3DXMATRIX *pout, CONST D3DXVECTOR3 *peye, CONST D3DXVECTOR3 *pat, CONST D3DXVECTOR3 *pup);
D3DXMATRIX* WINAPI D3DXMatrixMultiply(D3DXMATRIX *pout, CONST D3DXMATRIX *pm1, CONST D3DXMATRIX *pm2);
D3DXMATRIX* WINAPI D3DXMatrixOrthoRH(D3DXMATRIX *pout, FLOAT w, FLOAT h, FLOAT zn, FLOAT zf);
D3DXMATRIX* WINAPI D3DXMatrixPerspectiveFovLH(D3DXMATRIX *pout, FLOAT fovy, FLOAT aspect, FLOAT zn, FLOAT zf);
D3DXMATRIX* WINAPI D3DXMatrixPerspectiveFovRH(D3DXMATRIX *pout, FLOAT fovy, FLOAT aspect, FLOAT zn, FLOAT zf);
D3DXMATRIX* WINAPI D3DXMatrixPerspectiveLH(D3DXMATRIX *pout, FLOAT w, FLOAT h, FLOAT zn, FLOAT zf);