[PATCH] Implement D3DXMatrixPerspectiveFovRH with a test

[David Adam]

---
 dlls/d3dx8/d3dx8.spec   |    2 +-
 dlls/d3dx8/math.c       |   12 ++++++++++++
 dlls/d3dx8/tests/math.c |    8 ++++++++
 include/d3dx8math.h     |    1 +
 4 files changed, 22 insertions(+), 1 deletions(-)

diff --git a/dlls/d3dx8/d3dx8.spec b/dlls/d3dx8/d3dx8.spec
index fb1f99d..0f329c0 100644
--- a/dlls/d3dx8/d3dx8.spec
+++ b/dlls/d3dx8/d3dx8.spec
@@ -38,7 +38,7 @@
 @ stdcall D3DXMatrixLookAtLH(ptr ptr ptr ptr)
 @ stdcall D3DXMatrixPerspectiveRH(ptr long long long long)
 @ stdcall D3DXMatrixPerspectiveLH(ptr long long long long)
-@ stub D3DXMatrixPerspectiveFovRH
+@ stdcall D3DXMatrixPerspectiveFovRH(ptr long long long long)
 @ stub D3DXMatrixPerspectiveFovLH
 @ stub D3DXMatrixPerspectiveOffCenterRH
 @ stub D3DXMatrixPerspectiveOffCenterLH
diff --git a/dlls/d3dx8/math.c b/dlls/d3dx8/math.c
index 0fd2b78..e2b5a8f 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;
 }
=20
+D3DXMATRIX* WINAPI D3DXMatrixPerspectiveFovRH(D3DXMATRIX *pout, FLOAT fovy,=
 FLOAT aspect, FLOAT zn, FLOAT zf)
+{
+    D3DXMatrixIdentity(pout);
+    pout->m[0][0] =3D 1.0f / (aspect * tan(fovy/2.0f));
+    pout->m[1][1] =3D 1.0f / tan(fovy/2.0f);
+    pout->m[2][2] =3D zf / (zn - zf);
+    pout->m[2][3] =3D -1.0f;
+    pout->m[3][2] =3D (zf * zn) / (zn - zf);
+    pout->m[3][3] =3D 0.0f;
+    return pout;
+}
+
 D3DXMATRIX* WINAPI D3DXMatrixPerspectiveLH(D3DXMATRIX *pout, FLOAT w, FLOAT=
 h, FLOAT zn, FLOAT zf)
 {
     D3DXMatrixIdentity(pout);
diff --git a/dlls/d3dx8/tests/math.c b/dlls/d3dx8/tests/math.c
index a153e79..6772808 100644
--- a/dlls/d3dx8/tests/math.c
+++ b/dlls/d3dx8/tests/math.c
@@ -222,6 +222,14 @@ static void D3DXMatrixTest(void)
     D3DXMatrixMultiply(&gotmat,&mat,&mat2);
     expect_mat(expectedmat,gotmat);
=20
+/*____________D3DXMatrixPerspectiveFovRH_______________*/
+    expectedmat.m[0][0] =3D 13.288858f; expectedmat.m[0][1] =3D -0.0f; expe=
ctedmat.m[0][2] =3D 0.0f; expectedmat.m[0][3] =3D 0.0f;
+    expectedmat.m[1][0] =3D 0.0f; expectedmat.m[1][1] =3D 9.966644f; expect=
edmat.m[1][2] =3D 0.0; expectedmat.m[1][3] =3D 0.0f;
+    expectedmat.m[2][0] =3D 0.0f; expectedmat.m[2][1] =3D 0.0f; expectedmat=
.m[2][2] =3D -0.783784f; expectedmat.m[2][3] =3D -1.0f;
+    expectedmat.m[3][0] =3D 0.0f; expectedmat.m[3][1] =3D 0.0f; expectedmat=
.m[3][2] =3D 1.881081f; expectedmat.m[3][3] =3D 0.0f;
+    D3DXMatrixPerspectiveFovRH(&gotmat, 0.2f, 0.75f, -2.4f, 8.7f);
+    expect_mat(expectedmat,gotmat);
+
 /*____________D3DXMatrixPerspectiveLH_______________*/
     expectedmat.m[0][0] =3D -24.0f; expectedmat.m[0][1] =3D -0.0f; expected=
mat.m[0][2] =3D 0.0f; expectedmat.m[0][3] =3D 0.0f;
     expectedmat.m[1][0] =3D 0.0f; expectedmat.m[1][1] =3D -6.4f; expectedma=
t.m[1][2] =3D 0.0; expectedmat.m[1][3] =3D 0.0f;
diff --git a/include/d3dx8math.h b/include/d3dx8math.h
index cbaee31..a78c0db 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 *p=
m1, CONST D3DXMATRIX *pm2);
+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);
 D3DXMATRIX* WINAPI D3DXMatrixRotationAxis(D3DXMATRIX *pout, CONST D3DXVECTO=
R3 *pv, FLOAT angle);
--=20
1.5.3.2


--=_2wl5l61bj1q8--