David Adam : d3dx8: Implement D3DXMatrixTranslation.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 4cd47e8b6451e16985ebc4377f4ebba2b5511ae3
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=4cd47e8b6451e16985ebc4377f...

Author: David Adam 
Date:   Tue Oct 30 15:31:18 2007 +0100

d3dx8: Implement D3DXMatrixTranslation.

---

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

diff --git a/dlls/d3dx8/d3dx8.spec b/dlls/d3dx8/d3dx8.spec
index 1e2d68c..c001d6b 100644
--- a/dlls/d3dx8/d3dx8.spec
+++ b/dlls/d3dx8/d3dx8.spec
@@ -25,7 +25,7 @@
 @ stdcall D3DXMatrixTranspose(ptr ptr)
 @ stub D3DXMatrixInverse
 @ stdcall D3DXMatrixScaling(ptr long long long)
-@ stub D3DXMatrixTranslation
+@ stdcall D3DXMatrixTranslation(ptr long long long)
 @ stub D3DXMatrixRotationX
 @ stub D3DXMatrixRotationY
 @ stub D3DXMatrixRotationZ
diff --git a/dlls/d3dx8/math.c b/dlls/d3dx8/math.c
index fd82774..bd9a3b4 100644
--- a/dlls/d3dx8/math.c
+++ b/dlls/d3dx8/math.c
@@ -67,6 +67,15 @@ D3DXMATRIX* WINAPI D3DXMatrixScaling(D3DXMATRIX *pout, FLOAT sx, FLOAT sy, FLOAT
     return pout;
 }

+D3DXMATRIX* WINAPI D3DXMatrixTranslation(D3DXMATRIX *pout, FLOAT x, FLOAT y, FLOAT z)
+{
+    D3DXMatrixIdentity(pout);
+    pout->m[3][0] = x;
+    pout->m[3][1] = y;
+    pout->m[3][2] = z;
+    return pout;
+}
+
 D3DXMATRIX* WINAPI D3DXMatrixTranspose(D3DXMATRIX *pout, CONST D3DXMATRIX *pm)
 {
     int i,j;
diff --git a/dlls/d3dx8/tests/math.c b/dlls/d3dx8/tests/math.c
index a1ffc23..e97e774 100644
--- a/dlls/d3dx8/tests/math.c
+++ b/dlls/d3dx8/tests/math.c
@@ -204,6 +204,14 @@ static void D3DXMatrixTest(void)
     D3DXMatrixScaling(&gotmat,0.69f,0.53f,4.11f);
     expect_mat(expectedmat,gotmat);

+/*____________D3DXMatrixTranslation______________*/
+    expectedmat.m[0][0] = 1.0f; expectedmat.m[0][1] = 0.0f; expectedmat.m[0][2] = 0.0f; expectedmat.m[0][3] = 0.0f;
+    expectedmat.m[1][0] = 0.0; expectedmat.m[1][1] = 1.0f; expectedmat.m[1][2] = 0.0f; expectedmat.m[1][3] = 0.0f;
+    expectedmat.m[2][0] = 0.0f; expectedmat.m[2][1] = 0.0f; expectedmat.m[2][2] = 1.0f; expectedmat.m[2][3] = 0.0f;
+    expectedmat.m[3][0] = 0.69f; expectedmat.m[3][1] = 0.53f; expectedmat.m[3][2] = 4.11f; expectedmat.m[3][3] = 1.0f;
+    D3DXMatrixTranslation(&gotmat,0.69f,0.53f,4.11f);
+    expect_mat(expectedmat,gotmat);
+
 /*____________D3DXMatrixTranspose______________*/
     expectedmat.m[0][0] = 10.0f; expectedmat.m[0][1] = 11.0f; expectedmat.m[0][2] = 19.0f; expectedmat.m[0][3] = 2.0f;
     expectedmat.m[1][0] = 5.0; expectedmat.m[1][1] = 20.0f; expectedmat.m[1][2] = -21.0f; expectedmat.m[1][3] = 3.0f;
diff --git a/include/d3dx8math.h b/include/d3dx8math.h
index dab1899..c09b3da 100644
--- a/include/d3dx8math.h
+++ b/include/d3dx8math.h
@@ -61,6 +61,7 @@ typedef struct D3DXCOLOR
 FLOAT WINAPI D3DXMatrixfDeterminant(CONST D3DXMATRIX *pm);
 D3DXMATRIX* WINAPI D3DXMatrixMultiply(D3DXMATRIX *pout, CONST D3DXMATRIX *pm1, CONST D3DXMATRIX *pm2);
 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);

D3DXQUATERNION* WINAPI D3DXQuaternionNormalize(D3DXQUATERNION *pout, CONST D3DXQUATERNION *pq);