[PATCH] Implement D3DXColorLerp with a test

[David Adam]

---
 dlls/d3dx8/tests/math.c |   15 +++++++++++++++
 include/d3dx8math.inl   |   12 ++++++++++++
 2 files changed, 27 insertions(+), 0 deletions(-)

diff --git a/dlls/d3dx8/tests/math.c b/dlls/d3dx8/tests/math.c
index 7c74b65..fbb8ab3 100644
--- a/dlls/d3dx8/tests/math.c
+++ b/dlls/d3dx8/tests/math.c
@@ -36,8 +36,23 @@ static void D3DXColorTest(void)
 {
     D3DXCOLOR color, color1, expected, got;
     LPD3DXCOLOR funcpointer;
+    FLOAT scale;
=20
     color.r =3D 0.2f; color.g =3D 0.75f; color.b =3D 0.41f; color.a =3D 0.9=
3f;
+    scale =3D 0.3f;
+
+/*_______________D3DXColorLerp________________*/
+    color1.r =3D 0.6f; color1.g =3D 0.55f; color1.b =3D 0.23f; color1.a =3D=
 0.82f;
+    expected.r =3D 0.32f; expected.g =3D 0.69f; expected.b =3D 0.356f; expe=
cted.a =3D 0.897f;
+    D3DXColorLerp(&got,&color,&color1,scale);
+    expect_color(expected,got);
+    /* Test the NULL case */
+    funcpointer =3D D3DXColorLerp(&got,NULL,&color1,scale);
+    ok(funcpointer =3D=3D NULL, "Expected: %p, Got: %p\n", NULL, funcpointe=
r);
+    funcpointer =3D D3DXColorLerp(NULL,NULL,&color1,scale);
+    ok(funcpointer =3D=3D NULL, "Expected: %p, Got: %p\n", NULL, funcpointe=
r);
+    funcpointer =3D D3DXColorLerp(NULL,NULL,NULL,scale);
+    ok(funcpointer =3D=3D NULL, "Expected: %p, Got: %p\n", NULL, funcpointe=
r);
=20
 /*_______________D3DXColorNegative________________*/
     expected.r =3D 0.8f; expected.g =3D 0.25f; expected.b =3D 0.59f; expect=
ed.a =3D 0.93f;
diff --git a/include/d3dx8math.inl b/include/d3dx8math.inl
index d4ddb14..da11f31 100644
--- a/include/d3dx8math.inl
+++ b/include/d3dx8math.inl
@@ -19,6 +19,18 @@
 #ifndef __D3DX8MATH_INL__
 #define __D3DX8MATH_INL__
=20
+/*_______________D3DXCOLOR_____________________*/
+
+static inline D3DXCOLOR* D3DXColorLerp(D3DXCOLOR *pout, CONST D3DXCOLOR *pc=
1, CONST D3DXCOLOR *pc2, FLOAT s)
+{
+    if ( !pout || !pc1 || !pc2 ) return NULL;
+    pout->r =3D (1-s) * (pc1->r) + s *(pc2->r);
+    pout->g =3D (1-s) * (pc1->g) + s *(pc2->g);
+    pout->b =3D (1-s) * (pc1->b) + s *(pc2->b);
+    pout->a =3D (1-s) * (pc1->a) + s *(pc2->a);
+    return pout;
+}
+
 static inline D3DXCOLOR* D3DXColorNegative(D3DXCOLOR *pout, CONST D3DXCOLOR=
 *pc)
 {
     if ( !pout || !pc ) return NULL;
--=20
1.5.3.2


--=_4ofo3jdm8c8w--