David Adam : d3dx8: Implement D3DXMatrixOrthoOffCenterLH.
Alexandre Julliard
julliard at winehq.org
Tue Nov 6 08:24:33 CST 2007
Module: wine
Branch: master
Commit: 951ca73ff7c95670530de6f93e703202f4323b2a
URL: http://source.winehq.org/git/wine.git/?a=commit;h=951ca73ff7c95670530de6f93e703202f4323b2a
Author: David Adam <David.Adam at math.cnrs.fr>
Date: Mon Nov 5 19:34:34 2007 +0100
d3dx8: Implement D3DXMatrixOrthoOffCenterLH.
---
dlls/d3dx8/d3dx8.spec | 2 +-
dlls/d3dx8/math.c | 12 ++++++++++++
dlls/d3dx8/tests/math.c | 8 ++++++++
include/d3dx8math.h | 2 ++
4 files changed, 23 insertions(+), 1 deletions(-)
diff --git a/dlls/d3dx8/d3dx8.spec b/dlls/d3dx8/d3dx8.spec
index 3e6c092..3d69e20 100644
--- a/dlls/d3dx8/d3dx8.spec
+++ b/dlls/d3dx8/d3dx8.spec
@@ -45,7 +45,7 @@
@ stdcall D3DXMatrixOrthoRH(ptr long long long long)
@ stdcall D3DXMatrixOrthoLH(ptr long long long long)
@ stdcall D3DXMatrixOrthoOffCenterRH(ptr long long long long long long)
-@ stub D3DXMatrixOrthoOffCenterLH
+@ stdcall D3DXMatrixOrthoOffCenterLH(ptr long long long long long long)
@ stub D3DXMatrixShadow
@ stub D3DXMatrixReflect
@ stub D3DXQuaternionToAxisAngle
diff --git a/dlls/d3dx8/math.c b/dlls/d3dx8/math.c
index 666c05a..1f14d5c 100644
--- a/dlls/d3dx8/math.c
+++ b/dlls/d3dx8/math.c
@@ -126,6 +126,18 @@ D3DXMATRIX* WINAPI D3DXMatrixOrthoLH(D3DXMATRIX *pout, FLOAT w, FLOAT h, FLOAT z
return pout;
}
+D3DXMATRIX* WINAPI D3DXMatrixOrthoOffCenterLH(D3DXMATRIX *pout, FLOAT l, FLOAT r, FLOAT b, FLOAT t, FLOAT zn, FLOAT zf)
+{
+ D3DXMatrixIdentity(pout);
+ pout->m[0][0] = 2.0f / (r - l);
+ pout->m[1][1] = 2.0f / (t - b);
+ pout->m[2][2] = 1.0f / (zf -zn);
+ pout->m[3][0] = -1.0f -2.0f *l / (r - l);
+ pout->m[3][1] = 1.0f + 2.0f * t / (b - t);
+ pout->m[3][2] = zn / (zn -zf);
+ return pout;
+}
+
D3DXMATRIX* WINAPI D3DXMatrixOrthoOffCenterRH(D3DXMATRIX *pout, FLOAT l, FLOAT r, FLOAT b, FLOAT t, FLOAT zn, FLOAT zf)
{
D3DXMatrixIdentity(pout);
diff --git a/dlls/d3dx8/tests/math.c b/dlls/d3dx8/tests/math.c
index 8b2ab5b..c3cef3b 100644
--- a/dlls/d3dx8/tests/math.c
+++ b/dlls/d3dx8/tests/math.c
@@ -230,6 +230,14 @@ static void D3DXMatrixTest(void)
D3DXMatrixOrthoLH(&gotmat, 2.5f, 7.4f, -3.2f, -9.8f);
expect_mat(expectedmat,gotmat);
+/*____________D3DXMatrixOrthoOffCenterLH_______________*/
+ expectedmat.m[0][0] = 3.636364f; 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] = 0.180180f; 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.045662f; expectedmat.m[2][3] = 0.0f;
+ expectedmat.m[3][0] = -1.727272f; expectedmat.m[3][1] = -0.567568f; expectedmat.m[3][2] = 0.424658f; expectedmat.m[3][3] = 1.0f;
+ D3DXMatrixOrthoOffCenterLH(&gotmat, 0.2f, 0.75f, -2.4f, 8.7f, 9.3, -12.6);
+ expect_mat(expectedmat,gotmat);
+
/*____________D3DXMatrixOrthoOffCenterRH_______________*/
expectedmat.m[0][0] = 3.636364f; 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] = 0.180180f; expectedmat.m[1][2] = 0.0; expectedmat.m[1][3] = 0.0f;
diff --git a/include/d3dx8math.h b/include/d3dx8math.h
index ecb6cd5..bd1dc4f 100644
--- a/include/d3dx8math.h
+++ b/include/d3dx8math.h
@@ -63,7 +63,9 @@ D3DXMATRIX* WINAPI D3DXMatrixLookAtLH(D3DXMATRIX *pout, CONST D3DXVECTOR3 *peye,
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 D3DXMatrixOrthoLH(D3DXMATRIX *pout, FLOAT w, FLOAT h, FLOAT zn, FLOAT zf);
+D3DXMATRIX* WINAPI D3DXMatrixOrthoOffCenterLH(D3DXMATRIX *pout, FLOAT l, FLOAT r, FLOAT b, FLOAT t, FLOAT zn, FLOAT zf);
D3DXMATRIX* WINAPI D3DXMatrixOrthoOffCenterRH(D3DXMATRIX *pout, FLOAT l, FLOAT r, FLOAT b, FLOAT t, FLOAT zn, FLOAT zf);
+D3DXMATRIX* WINAPI D3DXMatrixOrthoLH(D3DXMATRIX *pout, FLOAT w, FLOAT h, FLOAT zn, FLOAT zf);
D3DXMATRIX* WINAPI D3DXMatrixOrthoRH(D3DXMATRIX *pout, FLOAT w, FLOAT h, FLOAT zn, FLOAT zf);
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);
More information about the wine-cvs
mailing list