[PATCH] Implement D3DXQuaternionExp with a test

[David Adam]

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

diff --git a/dlls/d3dx8/d3dx8.spec b/dlls/d3dx8/d3dx8.spec
index d65dce0..52fa008 100644
--- a/dlls/d3dx8/d3dx8.spec
+++ b/dlls/d3dx8/d3dx8.spec
@@ -57,7 +57,7 @@
 @ stdcall D3DXQuaternionNormalize(ptr ptr)
 @ stdcall D3DXQuaternionInverse(ptr ptr)
 @ stdcall D3DXQuaternionLn(ptr ptr)
-@ stub D3DXQuaternionExp
+@ stdcall D3DXQuaternionExp(ptr ptr)
 @ stdcall D3DXQuaternionSlerp(ptr ptr ptr long)
 @ stdcall D3DXQuaternionSquad(ptr ptr ptr ptr ptr long)
 @ stdcall D3DXQuaternionBaryCentric(ptr ptr ptr ptr long long)
diff --git a/dlls/d3dx8/math.c b/dlls/d3dx8/math.c
index 19d6a9f..9f7522e 100644
--- a/dlls/d3dx8/math.c
+++ b/dlls/d3dx8/math.c
@@ -588,6 +588,28 @@ D3DXQUATERNION* WINAPI D3DXQuaternionBaryCentric(D3DXQU=
ATERNION *pout, CONST D3D
     return pout;
 }
=20
+D3DXQUATERNION* WINAPI D3DXQuaternionExp(D3DXQUATERNION *pout, CONST D3DXQU=
ATERNION *pq)
+{
+    FLOAT norm;
+
+    norm =3D sqrt(pq->x * pq->x + pq->y * pq->y + pq->z * pq->z);
+    if (norm )
+    {
+     pout->x =3D sin(norm) * pq->x / norm;
+     pout->y =3D sin(norm) * pq->y / norm;
+     pout->z =3D sin(norm) * pq->z / norm;
+     pout->w =3D cos(norm);
+    }
+    else
+    {
+     pout->x =3D 0.0f;
+     pout->y =3D 0.0f;
+     pout->z =3D 0.0f;
+     pout->w =3D 1.0f;
+    }
+    return pout;
+}
+
 D3DXQUATERNION* WINAPI D3DXQuaternionInverse(D3DXQUATERNION *pout, CONST D3=
DXQUATERNION *pq)
 {
     D3DXQUATERNION temp;
diff --git a/dlls/d3dx8/tests/math.c b/dlls/d3dx8/tests/math.c
index 6dfe49c..b689fb7 100644
--- a/dlls/d3dx8/tests/math.c
+++ b/dlls/d3dx8/tests/math.c
@@ -595,6 +595,20 @@ static void D3X8QuaternionTest(void)
     got =3D D3DXQuaternionDot(NULL,NULL);
     ok(fabs( got - expected ) < admitted_error, "Expected: %f, Got: %f\n", =
expected, got);
=20
+/*_______________D3DXQuaternionExp______________________________*/
+    expectedquat.x =3D -0.216382f; expectedquat.y =3D -0.432764f; expectedq=
uat.z =3D -0.8655270f; expectedquat.w =3D -0.129449f;
+    D3DXQuaternionExp(&gotquat,&q);
+    expect_vec4(expectedquat,gotquat);
+    /* Test the null quaternion */
+    expectedquat.x =3D 0.0f; expectedquat.y =3D 0.0f; expectedquat.z =3D 0.=
0f; expectedquat.w =3D 1.0f;
+    D3DXQuaternionExp(&gotquat,&nul);
+    expect_vec4(expectedquat,gotquat);
+    /* Test the case where the norm of the quaternion is <1 */
+    Nq1.x =3D 0.2f; Nq1.y =3D 0.1f; Nq1.z =3D 0.3; Nq1.w=3D 0.9f;
+    expectedquat.x =3D 0.195366; expectedquat.y =3D 0.097683f; expectedquat=
.z =3D 0.293049f; expectedquat.w =3D 0.930813f;
+    D3DXQuaternionExp(&gotquat,&Nq1);
+    expect_vec4(expectedquat,gotquat);
+
 /*_______________D3DXQuaternionIdentity________________*/
     expectedquat.x =3D 0.0f; expectedquat.y =3D 0.0f; expectedquat.z =3D 0.=
0f; expectedquat.w =3D 1.0f;
     D3DXQuaternionIdentity(&gotquat);
diff --git a/include/d3dx8math.h b/include/d3dx8math.h
index 6c5f18f..a799dee 100644
--- a/include/d3dx8math.h
+++ b/include/d3dx8math.h
@@ -303,6 +303,7 @@ D3DXPLANE* WINAPI D3DXPlaneNormalize(D3DXPLANE *pout, CO=
NST D3DXPLANE *pp);
 D3DXPLANE* WINAPI D3DXPlaneTransform(D3DXPLANE *pout, CONST D3DXPLANE *ppla=
ne, CONST D3DXMATRIX *pm);
=20
 D3DXQUATERNION* WINAPI D3DXQuaternionBaryCentric(D3DXQUATERNION *pout, CONS=
T D3DXQUATERNION *pq1, CONST D3DXQUATERNION *pq2, CONST D3DXQUATERNION *pq3,=
 FLOAT f, FLOAT g);
+D3DXQUATERNION* WINAPI D3DXQuaternionExp(D3DXQUATERNION *pout, CONST D3DXQU=
ATERNION *pq);
 D3DXQUATERNION* WINAPI D3DXQuaternionInverse(D3DXQUATERNION *pout, CONST D3=
DXQUATERNION *pq);
 D3DXQUATERNION* WINAPI D3DXQuaternionLn(D3DXQUATERNION *pout, CONST D3DXQUA=
TERNION *pq);
 D3DXQUATERNION* WINAPI D3DXQuaternionMultiply(D3DXQUATERNION *pout, CONST D=
3DXQUATERNION *pq1, CONST D3DXQUATERNION *pq2);
--=20
1.5.3.2


--=_66berq06gmos--