[PATCH] Implement D3DXMatrixLookAtLH with a test
David Adam
David.Adam at math.cnrs.fr
Sat Nov 3 03:39:30 CDT 2007
---
dlls/d3dx8/d3dx8.spec | 2 +-
dlls/d3dx8/math.c | 29 +++++++++++++++++++++++++++++
dlls/d3dx8/tests/math.c | 8 ++++++++
include/d3dx8math.h | 1 +
4 files changed, 39 insertions(+), 1 deletions(-)
diff --git a/dlls/d3dx8/d3dx8.spec b/dlls/d3dx8/d3dx8.spec
index 25f3bc4..e562cde 100644
--- a/dlls/d3dx8/d3dx8.spec
+++ b/dlls/d3dx8/d3dx8.spec
@@ -35,7 +35,7 @@
@ stub D3DXMatrixTransformation
@ stub D3DXMatrixAffineTransformation
@ stdcall D3DXMatrixLookAtRH(ptr ptr ptr ptr ptr)
-@ stub D3DXMatrixLookAtLH
+@ stdcall D3DXMatrixLookAtLH(ptr ptr ptr ptr)
@ stub D3DXMatrixPerspectiveRH
@ stub D3DXMatrixPerspectiveLH
@ stub D3DXMatrixPerspectiveFovRH
diff --git a/dlls/d3dx8/math.c b/dlls/d3dx8/math.c
index 2de1bd1..52a4c48 100644
--- a/dlls/d3dx8/math.c
+++ b/dlls/d3dx8/math.c
@@ -44,6 +44,35 @@ FLOAT WINAPI D3DXMatrixfDeterminant(CONST D3DXMATRIX *pm)
return det;
}
=20
+D3DXMATRIX* WINAPI D3DXMatrixLookAtLH(D3DXMATRIX *pout, CONST D3DXVECTOR3 *=
peye, CONST D3DXVECTOR3 *pat, CONST D3DXVECTOR3 *pup)
+{
+ D3DXVECTOR3 right, rightn, up, upn, vec, vec2;
+
+ D3DXVec3Subtract(&vec2, pat, peye);
+ D3DXVec3Normalize(&vec, &vec2);
+ D3DXVec3Cross(&right, pup, &vec);
+ D3DXVec3Cross(&up, &vec, &right);
+ D3DXVec3Normalize(&rightn, &right);
+ D3DXVec3Normalize(&upn, &up);
+ pout->m[0][0] =3D rightn.x;
+ pout->m[1][0] =3D rightn.y;
+ pout->m[2][0] =3D rightn.z;
+ pout->m[3][0] =3D -D3DXVec3Dot(&rightn,peye);
+ pout->m[0][1] =3D upn.x;
+ pout->m[1][1] =3D upn.y;
+ pout->m[2][1] =3D upn.z;
+ pout->m[3][1] =3D -D3DXVec3Dot(&upn, peye);
+ pout->m[0][2] =3D vec.x;
+ pout->m[1][2] =3D vec.y;
+ pout->m[2][2] =3D vec.z;
+ pout->m[3][2] =3D -D3DXVec3Dot(&vec, peye);
+ pout->m[0][3] =3D 0.0f;
+ pout->m[1][3] =3D 0.0f;
+ pout->m[2][3] =3D 0.0f;
+ pout->m[3][3] =3D 1.0f;
+ return pout;
+}
+
D3DXMATRIX* WINAPI D3DXMatrixLookAtRH(D3DXMATRIX *pout, CONST D3DXVECTOR3 *=
peye, CONST D3DXVECTOR3 *pat, CONST D3DXVECTOR3 *pup)
{
D3DXVECTOR3 right, rightn, up, upn, vec, vec2;
diff --git a/dlls/d3dx8/tests/math.c b/dlls/d3dx8/tests/math.c
index 71da793..040d6e0 100644
--- a/dlls/d3dx8/tests/math.c
+++ b/dlls/d3dx8/tests/math.c
@@ -198,6 +198,14 @@ static void D3DXMatrixTest(void)
got =3D D3DXMatrixIsIdentity(NULL);
ok(expected =3D=3D got, "Expected : %d, Got : %d\n", expected, got);
=20
+/*____________D3DXMatrixLookatLH_______________*/
+ expectedmat.m[0][0] =3D -0.822465f; expectedmat.m[0][1] =3D -0.409489f;=
expectedmat.m[0][2] =3D -0.394803f; expectedmat.m[0][3] =3D 0.0f;
+ expectedmat.m[1][0] =3D -0.555856f; expectedmat.m[1][1] =3D 0.431286f; =
expectedmat.m[1][2] =3D 0.710645f; expectedmat.m[1][3] =3D 0.0f;
+ expectedmat.m[2][0] =3D -0.120729f; expectedmat.m[2][1] =3D 0.803935f; =
expectedmat.m[2][2] =3D -0.582335f; expectedmat.m[2][3] =3D 0.0f;
+ expectedmat.m[3][0] =3D 4.494634f; expectedmat.m[3][1] =3D 0.809719f; e=
xpectedmat.m[3][2] =3D 10.060076f; expectedmat.m[3][3] =3D 1.0f;
+ D3DXMatrixLookAtLH(&gotmat,&eye,&at,&axis);
+ expect_mat(expectedmat,gotmat);
+
/*____________D3DXMatrixLookatRH_______________*/
expectedmat.m[0][0] =3D 0.822465f; expectedmat.m[0][1] =3D -0.409489f; =
expectedmat.m[0][2] =3D 0.394803f; expectedmat.m[0][3] =3D 0.0f;
expectedmat.m[1][0] =3D 0.555856f; expectedmat.m[1][1] =3D 0.431286f; e=
xpectedmat.m[1][2] =3D -0.710645f; expectedmat.m[1][3] =3D 0.0f;
diff --git a/include/d3dx8math.h b/include/d3dx8math.h
index b31e24d..7f005c1 100644
--- a/include/d3dx8math.h
+++ b/include/d3dx8math.h
@@ -59,6 +59,7 @@ typedef struct D3DXCOLOR
} D3DXCOLOR, *LPD3DXCOLOR;
=20
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 D3DXMatrixRotationAxis(D3DXMATRIX *pout, CONST D3DXVECTO=
R3 *pv, FLOAT angle);
--=20
1.5.3.2
--=_6eijnzibrvs4--
More information about the wine-patches
mailing list