[PATCH] Implement D3DXQuaternionBaryCentric with a test

[David Adam]

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

diff --git a/dlls/d3dx8/d3dx8.spec b/dlls/d3dx8/d3dx8.spec
index d89bfe9..af78fb2 100644
--- a/dlls/d3dx8/d3dx8.spec
+++ b/dlls/d3dx8/d3dx8.spec
@@ -60,7 +60,7 @@
 @ stub D3DXQuaternionExp
 @ stdcall D3DXQuaternionSlerp(ptr ptr ptr long)
 @ stdcall D3DXQuaternionSquad(ptr ptr ptr ptr ptr long)
-@ stub D3DXQuaternionBaryCentric
+@ stdcall D3DXQuaternionBaryCentric(ptr ptr ptr ptr long long)
 @ stdcall D3DXPlaneNormalize(ptr ptr)
 @ stdcall D3DXPlaneIntersectLine(ptr ptr ptr ptr)
 @ stdcall D3DXPlaneFromPointNormal(ptr ptr ptr)
diff --git a/dlls/d3dx8/math.c b/dlls/d3dx8/math.c
index 144c2c3..e907be1 100644
--- a/dlls/d3dx8/math.c
+++ b/dlls/d3dx8/math.c
@@ -581,6 +581,13 @@ D3DXPLANE* WINAPI D3DXPlaneTransform(D3DXPLANE *pout, C=
ONST D3DXPLANE *pplane, C
=20
 /*_________________D3DXQUATERNION________________*/
=20
+D3DXQUATERNION* WINAPI D3DXQuaternionBaryCentric(D3DXQUATERNION *pout, CONS=
T D3DXQUATERNION *pq1, CONST D3DXQUATERNION *pq2, CONST D3DXQUATERNION *pq3,=
 FLOAT f, FLOAT g)
+{
+    D3DXQUATERNION temp1, temp2;
+    D3DXQuaternionSlerp(pout, D3DXQuaternionSlerp(&temp1, pq1, pq2, f + g),=
 D3DXQuaternionSlerp(&temp2, pq1, pq3, f+g), g / (f + g));
+    return pout;
+}
+
 D3DXQUATERNION* WINAPI D3DXQuaternionInverse(D3DXQUATERNION *pout, CONST D3=
DXQUATERNION *pq)
 {
     D3DXQUATERNION temp;
@@ -655,7 +662,7 @@ D3DXQUATERNION* WINAPI D3DXQuaternionSquad(D3DXQUATERNIO=
N *pout, CONST D3DXQUATE
     D3DXQUATERNION temp1, temp2;
=20
     D3DXQuaternionSlerp(pout, D3DXQuaternionSlerp(&temp1, pq1, pq4, t), D3D=
XQuaternionSlerp(&temp2, pq2, pq3, t), 2.0f * t * (1.0f - t));
-    return pout;=20
+    return pout;
 }
=20
 /*_________________D3DXVec2_____________________*/
diff --git a/dlls/d3dx8/tests/math.c b/dlls/d3dx8/tests/math.c
index 0a732bd..229d0b7 100644
--- a/dlls/d3dx8/tests/math.c
+++ b/dlls/d3dx8/tests/math.c
@@ -554,7 +554,7 @@ static void D3X8QuaternionTest(void)
 {
     D3DXQUATERNION expectedquat, gotquat, nul, q, r, s, t, u;
     LPD3DXQUATERNION funcpointer;
-    FLOAT expected, got, scale;
+    FLOAT expected, got, scale, scale2;
     BOOL expectedbool, gotbool;
=20
     nul.x =3D 0.0f; nul.y =3D 0.0f; nul.z =3D 0.0f; nul.w =3D 0.0f;
@@ -564,6 +564,12 @@ static void D3X8QuaternionTest(void)
     u.x =3D 91.0f; u.y =3D - 82.0f; u.z =3D 7.3f; u.w =3D -6.4f;
=20
     scale =3D 0.3f;
+    scale2 =3D 0.78f;
+
+/*_______________D3DXQuaternionBaryCentric________________________*/
+    expectedquat.x =3D -867.444458; expectedquat.y =3D 87.851111f; expected=
quat.z =3D -9.937778f; expectedquat.w =3D 3.235555f;
+    D3DXQuaternionBaryCentric(&gotquat,&q,&r,&t,scale,scale2);
+    expect_vec4(expectedquat,gotquat);
=20
 /*_______________D3DXQuaternionConjugate________________*/
     expectedquat.x =3D -1.0f; expectedquat.y =3D -2.0f; expectedquat.z =3D =
-4.0f; expectedquat.w =3D 10.0f;
diff --git a/include/d3dx8math.h b/include/d3dx8math.h
index 1fd7b07..3e5581e 100644
--- a/include/d3dx8math.h
+++ b/include/d3dx8math.h
@@ -302,6 +302,7 @@ D3DXVECTOR3* WINAPI D3DXPlaneIntersectLine(D3DXVECTOR3 *=
pout, CONST D3DXPLANE *p
 D3DXPLANE* WINAPI D3DXPlaneNormalize(D3DXPLANE *pout, CONST 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 D3DXQuaternionInverse(D3DXQUATERNION *pout, CONST D3=
DXQUATERNION *pq);
 D3DXQUATERNION* WINAPI D3DXQuaternionMultiply(D3DXQUATERNION *pout, CONST D=
3DXQUATERNION *pq1, CONST D3DXQUATERNION *pq2);
 D3DXQUATERNION* WINAPI D3DXQuaternionNormalize(D3DXQUATERNION *pout, CONST =
D3DXQUATERNION *pq);
--=20
1.5.3.2


--=_79d04pgyxyww--