diff --git a/dlls/d3dx8/d3dx8.spec b/dlls/d3dx8/d3dx8.spec index 0f329c0954d..660675c82fa 100644 --- a/dlls/d3dx8/d3dx8.spec +++ b/dlls/d3dx8/d3dx8.spec @@ -39,7 +39,7 @@ @ stdcall D3DXMatrixPerspectiveRH(ptr long long long long) @ stdcall D3DXMatrixPerspectiveLH(ptr long long long long) @ stdcall D3DXMatrixPerspectiveFovRH(ptr long long long long) -@ stub D3DXMatrixPerspectiveFovLH +@ stdcall D3DXMatrixPerspectiveFovLH(ptr long long long long) @ stub D3DXMatrixPerspectiveOffCenterRH @ stub D3DXMatrixPerspectiveOffCenterLH @ stub D3DXMatrixOrthoRH diff --git a/dlls/d3dx8/math.c b/dlls/d3dx8/math.c index e2b5a8f70ad..8a1866b697d 100644 --- a/dlls/d3dx8/math.c +++ b/dlls/d3dx8/math.c @@ -116,6 +116,18 @@ D3DXMATRIX* WINAPI D3DXMatrixMultiply(D3DXMATRIX *pout, CONST D3DXMATRIX *pm1, C return pout; } +D3DXMATRIX* WINAPI D3DXMatrixPerspectiveFovLH(D3DXMATRIX *pout, FLOAT fovy, FLOAT aspect, FLOAT zn, FLOAT zf) +{ + D3DXMatrixIdentity(pout); + pout->m[0][0] = 1.0f / (aspect * tan(fovy/2.0f)); + pout->m[1][1] = 1.0f / tan(fovy/2.0f); + pout->m[2][2] = zf / (zf - zn); + pout->m[2][3] = 1.0f; + pout->m[3][2] = (zf * zn) / (zn - zf); + pout->m[3][3] = 0.0f; + return pout; +} + D3DXMATRIX* WINAPI D3DXMatrixPerspectiveFovRH(D3DXMATRIX *pout, FLOAT fovy, FLOAT aspect, FLOAT zn, FLOAT zf) { D3DXMatrixIdentity(pout); diff --git a/dlls/d3dx8/tests/math.c b/dlls/d3dx8/tests/math.c index 67728085f4b..0a143186da8 100644 --- a/dlls/d3dx8/tests/math.c +++ b/dlls/d3dx8/tests/math.c @@ -222,8 +222,16 @@ static void D3DXMatrixTest(void) D3DXMatrixMultiply(&gotmat,&mat,&mat2); 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; + expectedmat.m[2][0] = 0.0f; expectedmat.m[2][1] = 0.0f; expectedmat.m[2][2] = 0.783784f; expectedmat.m[2][3] = 1.0f; + expectedmat.m[3][0] = 0.0f; expectedmat.m[3][1] = 0.0f; expectedmat.m[3][2] = 1.881081f; expectedmat.m[3][3] = 0.0f; + D3DXMatrixPerspectiveFovLH(&gotmat, 0.2f, 0.75f, -2.4f, 8.7f); + expect_mat(expectedmat,gotmat); + /*____________D3DXMatrixPerspectiveFovRH_______________*/ - 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[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; expectedmat.m[2][0] = 0.0f; expectedmat.m[2][1] = 0.0f; expectedmat.m[2][2] = -0.783784f; expectedmat.m[2][3] = -1.0f; expectedmat.m[3][0] = 0.0f; expectedmat.m[3][1] = 0.0f; expectedmat.m[3][2] = 1.881081f; expectedmat.m[3][3] = 0.0f; diff --git a/include/d3dx8math.h b/include/d3dx8math.h index a78c0db0c62..55636012cc7 100644 --- a/include/d3dx8math.h +++ b/include/d3dx8math.h @@ -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 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); D3DXMATRIX* WINAPI D3DXMatrixPerspectiveRH(D3DXMATRIX *pout, FLOAT w, FLOAT h, FLOAT zn, FLOAT zf);