[PATCH] Implement D3DXMatrixRotationX with a test

[David Adam]

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

diff --git a/dlls/d3dx8/d3dx8.spec b/dlls/d3dx8/d3dx8.spec
index c001d6b..10d05fc 100644
--- a/dlls/d3dx8/d3dx8.spec
+++ b/dlls/d3dx8/d3dx8.spec
@@ -26,7 +26,7 @@
 @ stub D3DXMatrixInverse
 @ stdcall D3DXMatrixScaling(ptr long long long)
 @ stdcall D3DXMatrixTranslation(ptr long long long)
-@ stub D3DXMatrixRotationX
+@ stdcall D3DXMatrixRotationX(ptr long)
 @ stub D3DXMatrixRotationY
 @ stub D3DXMatrixRotationZ
 @ stub D3DXMatrixRotationAxis
diff --git a/dlls/d3dx8/math.c b/dlls/d3dx8/math.c
index bd9a3b4..e83ef4a 100644
--- a/dlls/d3dx8/math.c
+++ b/dlls/d3dx8/math.c
@@ -58,6 +58,16 @@ D3DXMATRIX* WINAPI D3DXMatrixMultiply(D3DXMATRIX *pout, C=
ONST D3DXMATRIX *pm1, C
     return pout;
 }
=20
+D3DXMATRIX* WINAPI D3DXMatrixRotationX(D3DXMATRIX *pout, FLOAT angle)
+{
+    D3DXMatrixIdentity(pout);
+    pout->m[1][1] =3D cos(angle);
+    pout->m[2][2] =3D cos(angle);
+    pout->m[1][2] =3D sin(angle);
+    pout->m[2][1] =3D -sin(angle);
+    return pout;
+}
+
 D3DXMATRIX* WINAPI D3DXMatrixScaling(D3DXMATRIX *pout, FLOAT sx, FLOAT sy, =
FLOAT sz)
 {
     D3DXMatrixIdentity(pout);
diff --git a/dlls/d3dx8/tests/math.c b/dlls/d3dx8/tests/math.c
index e97e774..f4ba606 100644
--- a/dlls/d3dx8/tests/math.c
+++ b/dlls/d3dx8/tests/math.c
@@ -150,7 +150,7 @@ static void D3DXMatrixTest(void)
 {
     D3DXMATRIX expectedmat, gotmat, mat, mat2, mat3;
     BOOL expected, got;
-    FLOAT expectedfloat, gotfloat;
+    FLOAT angle, expectedfloat, gotfloat;
=20
     U(mat).m[0][1] =3D 5.0f; U(mat).m[0][2] =3D 7.0f; U(mat).m[0][3] =3D 8.=
0f;
     U(mat).m[1][0] =3D 11.0f; U(mat).m[1][2] =3D 16.0f; U(mat).m[1][3] =3D =
33.0f;
@@ -166,6 +166,8 @@ static void D3DXMatrixTest(void)
     mat2.m[0][3] =3D -4.0f; mat2.m[1][3] =3D -3.0f; mat2.m[2][3] =3D -2.0f;
     mat2.m[3][3] =3D -1.0f;
=20
+    angle =3D D3DX_PI / 3.0f;
+
 /*____________D3DXMatrixfDeterminant_____________*/
     expectedfloat =3D -147888.0f;
     gotfloat =3D D3DXMatrixfDeterminant(&mat);
@@ -196,6 +198,14 @@ static void D3DXMatrixTest(void)
     D3DXMatrixMultiply(&gotmat,&mat,&mat2);
     expect_mat(expectedmat,gotmat);
=20
+/*____________D3DXMatrixRotationX______________*/
+    expectedmat.m[0][0] =3D 1.0f; expectedmat.m[0][1] =3D 0.0f; expectedmat=
.m[0][2] =3D 0.0f; expectedmat.m[0][3] =3D 0.0f;
+    expectedmat.m[1][0] =3D 0.0; expectedmat.m[1][1] =3D 0.5f; expectedmat.=
m[1][2] =3D sqrt(3.0f)/2.0f; expectedmat.m[1][3] =3D 0.0f;
+    expectedmat.m[2][0] =3D 0.0f; expectedmat.m[2][1] =3D -sqrt(3.0f)/2.0f;=
 expectedmat.m[2][2] =3D 0.5f; expectedmat.m[2][3] =3D 0.0f;
+    expectedmat.m[3][0] =3D 0.0f; expectedmat.m[3][1] =3D 0.0f; expectedmat=
.m[3][2] =3D 0.0f; expectedmat.m[3][3] =3D 1.0f;
+    D3DXMatrixRotationX(&gotmat,angle);
+    expect_mat(expectedmat,gotmat);
+
 /*____________D3DXMatrixScaling______________*/
     expectedmat.m[0][0] =3D 0.69f; expectedmat.m[0][1] =3D 0.0f; expectedma=
t.m[0][2] =3D 0.0f; expectedmat.m[0][3] =3D 0.0f;
     expectedmat.m[1][0] =3D 0.0; expectedmat.m[1][1] =3D 0.53f; expectedmat=
.m[1][2] =3D 0.0f; expectedmat.m[1][3] =3D 0.0f;
diff --git a/include/d3dx8math.h b/include/d3dx8math.h
index c09b3da..32d5ca7 100644
--- a/include/d3dx8math.h
+++ b/include/d3dx8math.h
@@ -60,6 +60,7 @@ typedef struct D3DXCOLOR
=20
 FLOAT WINAPI D3DXMatrixfDeterminant(CONST D3DXMATRIX *pm);
 D3DXMATRIX* WINAPI D3DXMatrixMultiply(D3DXMATRIX *pout, CONST D3DXMATRIX *p=
m1, CONST D3DXMATRIX *pm2);
+D3DXMATRIX* WINAPI D3DXMatrixRotationX(D3DXMATRIX *pout, FLOAT angle);
 D3DXMATRIX* WINAPI D3DXMatrixScaling(D3DXMATRIX *pout, FLOAT sx, FLOAT sy, =
FLOAT sz);
 D3DXMATRIX* WINAPI D3DXMatrixTranslation(D3DXMATRIX *pout, FLOAT x, FLOAT y=
, FLOAT z);
 D3DXMATRIX* WINAPI D3DXMatrixTranspose(D3DXMATRIX *pout, CONST D3DXMATRIX *=
pm);
--=20
1.5.3.2


--=_1pl5vjhkipq8--