David Adam : d3dx8: Implement D3DXPlaneColorSubtract.
Alexandre Julliard
julliard at winehq.org
Wed Oct 24 11:04:51 CDT 2007
Module: wine
Branch: master
Commit: 5b685e6ad73c79fa21ad57f88490bbcfe0eb11ba
URL: http://source.winehq.org/git/wine.git/?a=commit;h=5b685e6ad73c79fa21ad57f88490bbcfe0eb11ba
Author: David Adam <David.Adam at math.cnrs.fr>
Date: Tue Oct 23 13:19:27 2007 +0200
d3dx8: Implement D3DXPlaneColorSubtract.
---
dlls/d3dx8/tests/math.c | 12 ++++++++++++
include/d3dx8math.inl | 10 ++++++++++
2 files changed, 22 insertions(+), 0 deletions(-)
diff --git a/dlls/d3dx8/tests/math.c b/dlls/d3dx8/tests/math.c
index 2f6633f..7b80988 100644
--- a/dlls/d3dx8/tests/math.c
+++ b/dlls/d3dx8/tests/math.c
@@ -108,6 +108,18 @@ static void D3DXColorTest(void)
ok(funcpointer == NULL, "Expected: %p, Got: %p\n", NULL, funcpointer);
funcpointer = D3DXColorScale(NULL,NULL,scale);
ok(funcpointer == NULL, "Expected: %p, Got: %p\n", NULL, funcpointer);
+
+/*_______________D3DXColorSubtract_______________*/
+ expected.r = -0.1f; expected.g = 0.25f; expected.b = -0.35f, expected.a = 0.82f;
+ D3DXColorSubtract(&got,&color,&color2);
+ expect_color(expected,got);
+ /* Test the NULL case */
+ funcpointer = D3DXColorSubtract(&got,NULL,&color2);
+ ok(funcpointer == NULL, "Expected: %p, Got: %p\n", NULL, funcpointer);
+ funcpointer = D3DXColorSubtract(NULL,NULL,&color2);
+ ok(funcpointer == NULL, "Expected: %p, Got: %p\n", NULL, funcpointer);
+ funcpointer = D3DXColorSubtract(NULL,NULL,NULL);
+ ok(funcpointer == NULL, "Expected: %p, Got: %p\n", NULL, funcpointer);
}
static void D3DXPlaneTest(void)
diff --git a/include/d3dx8math.inl b/include/d3dx8math.inl
index 78ef7c5..d9f0b3d 100644
--- a/include/d3dx8math.inl
+++ b/include/d3dx8math.inl
@@ -71,6 +71,16 @@ static inline D3DXCOLOR* D3DXColorScale(D3DXCOLOR *pout, CONST D3DXCOLOR *pc, FL
return pout;
}
+static inline D3DXCOLOR* D3DXColorSubtract(D3DXCOLOR *pout, CONST D3DXCOLOR *pc1, CONST D3DXCOLOR *pc2)
+{
+ if ( !pout || !pc1 || !pc2 ) return NULL;
+ pout->r = (pc1->r) - (pc2->r);
+ pout->g = (pc1->g) - (pc2->g);
+ pout->b = (pc1->b) - (pc2->b);
+ pout->a = (pc1->a) - (pc2->a);
+ return pout;
+}
+
/*_______________D3DXVECTOR2________________________*/
static inline D3DXVECTOR2* D3DXVec2Add(D3DXVECTOR2 *pout, CONST D3DXVECTOR2 *pv1, CONST D3DXVECTOR2 *pv2)
More information about the wine-cvs
mailing list