marko10_000
/
wine-wine
forked from Mirrors/wine-wine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

d3dx8: Implement D3DXColorAdjustContrast.

oldstable
David Adam 2007-11-19 15:38:34 +01:00 committed by Alexandre Julliard
parent 8389eab6b7
commit 375dcaa82e
4 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dlls/d3dx8/d3dx8.spec
View File

@ -67,7 +67,7 @@
@ stdcall D3DXPlaneFromPoints(ptr ptr ptr ptr)
@ stdcall D3DXPlaneTransform(ptr ptr ptr)
@ stdcall D3DXColorAdjustSaturation(ptr ptr long)
@ stub D3DXColorAdjustContrast
@ stdcall D3DXColorAdjustContrast(ptr ptr long)
@ stub D3DXCreateMatrixStack
@ stdcall D3DXCreateFont(ptr ptr ptr)
@ stub D3DXCreateFontIndirect

9
dlls/d3dx8/math.c
View File

@ -34,6 +34,15 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3dx8);
/*_________________D3DXColor____________________*/
D3DXCOLOR* WINAPI D3DXColorAdjustContrast(D3DXCOLOR *pout, CONST D3DXCOLOR *pc, FLOAT s)
{
pout->r = 0.5f + s * (pc->r - 0.5f);
pout->g = 0.5f + s * (pc->g - 0.5f);
pout->b = 0.5f + s * (pc->b - 0.5f);
pout->a = pc->a;
return pout;
}
D3DXCOLOR* WINAPI D3DXColorAdjustSaturation(D3DXCOLOR *pout, CONST D3DXCOLOR *pc, FLOAT s)
{
FLOAT grey;

5
dlls/d3dx8/tests/math.c
View File

@ -82,6 +82,11 @@ static void D3DXColorTest(void)
funcpointer = D3DXColorAdd(NULL,NULL,NULL);
ok(funcpointer == NULL, "Expected: %p, Got: %p\n", NULL, funcpointer);
/*_______________D3DXColorAdjustContrast______*/
expected.r = 0.41f; expected.g = 0.575f; expected.b = 0.473f, expected.a = 0.93f;
D3DXColorAdjustContrast(&got,&color,scale);
expect_color(expected,got);
/*_______________D3DXColorAdjustSaturation______*/
expected.r = 0.486028f; expected.g = 0.651028f; expected.b = 0.549028f, expected.a = 0.93f;
D3DXColorAdjustSaturation(&got,&color,scale);

2
include/d3dx8math.h
View File

@ -263,7 +263,9 @@ typedef struct D3DXCOLOR
extern "C" {
#endif
D3DXCOLOR* WINAPI D3DXColorAdjustContrast(D3DXCOLOR *pout, CONST D3DXCOLOR *pc, FLOAT s);
D3DXCOLOR* WINAPI D3DXColorAdjustSaturation(D3DXCOLOR *pout, CONST D3DXCOLOR *pc, FLOAT s);
D3DXMATRIX* WINAPI D3DXMatrixAffineTransformation(D3DXMATRIX *pout, float scaling, D3DXVECTOR3 *rotationcenter, D3DXQUATERNION *rotation, D3DXVECTOR3 *translation);
FLOAT WINAPI D3DXMatrixfDeterminant(CONST D3DXMATRIX *pm);
D3DXMATRIX* WINAPI D3DXMatrixInverse(D3DXMATRIX *pout, FLOAT *pdeterminant, CONST D3DXMATRIX *pm);