November 2007 - Wine-Commits

Francois Gouget : ntdll/tests: Fix compilation on systems that don' t support nameless unions.
by Alexandre Julliard Nov. 20, 2007

Nov. 20, 2007

Module: wine Branch: master Commit: 10e738f23687526767dcd3ba4c95452c9ed36321 URL: http://source.winehq.org/git/wine.git/?a=commit;h=10e738f23687526767dcd3ba4… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Nov 20 13:48:15 2007 +0100 ntdll/tests: Fix compilation on systems that don't support nameless unions. --- dlls/ntdll/tests/file.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c index 8ea454c..846448e 100644 --- a/dlls/ntdll/tests/file.c +++ b/dlls/ntdll/tests/file.c @@ -512,7 +512,7 @@ static void test_iocp_fileio(HANDLE h) NTSTATUS res = pNtSetInformationFile( hPipeSrv, &iosb, &fci, sizeof(fci), FileCompletionInformation ); ok( res == STATUS_SUCCESS, "NtSetInformationFile failed: %x\n", res ); - ok( iosb.Status == STATUS_SUCCESS, "iosb.Status invalid: %x\n", iosb.Status ); + ok( U(iosb).Status == STATUS_SUCCESS, "iosb.Status invalid: %x\n", U(iosb).Status ); count = get_pending_msgs(h); ok( !count, "Unexpected msg count: %ld\n", count );

1 0

Francois Gouget : user32/tests: Add the trailing '\n' to an ok() call.
by Alexandre Julliard Nov. 20, 2007

Nov. 20, 2007

Module: wine Branch: master Commit: 5f1416ef2bdf70fd84700a56c3ea3faf94b03fed URL: http://source.winehq.org/git/wine.git/?a=commit;h=5f1416ef2bdf70fd84700a56c… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Nov 20 13:47:10 2007 +0100 user32/tests: Add the trailing '\n' to an ok() call. --- dlls/user32/tests/listbox.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/user32/tests/listbox.c b/dlls/user32/tests/listbox.c index 90f3e2c..529e2c0 100644 --- a/dlls/user32/tests/listbox.c +++ b/dlls/user32/tests/listbox.c @@ -1010,7 +1010,7 @@ static void test_listbox_dlgdir(void) /* Loaded path should have overwritten the label text */ SendMessage(g_label, WM_GETTEXT, (WPARAM)MAX_PATH, (LPARAM)pathBuffer); trace("Static control after DlgDirList: %s\n", pathBuffer); - ok (strcmp("default contents", pathBuffer), "DlgDirList() did not modify static control!"); + ok (strcmp("default contents", pathBuffer), "DlgDirList() did not modify static control!\n"); /* There should be some content in the listbox */ itemCount = SendMessage(g_listBox, LB_GETCOUNT, 0, 0);

1 0

David Adam : d3dx8: Implement D3DXQuaternionBaryCentric.
by Alexandre Julliard Nov. 20, 2007

Nov. 20, 2007

Module: wine Branch: master Commit: e8edc51d343baddd8d84798d83c5f30b0ea0911b URL: http://source.winehq.org/git/wine.git/?a=commit;h=e8edc51d343baddd8d84798d8… Author: David Adam <David.Adam(a)math.cnrs.fr> Date: Mon Nov 19 17:44:34 2007 +0100 d3dx8: Implement D3DXQuaternionBaryCentric. --- dlls/d3dx8/d3dx8.spec | 2 +- dlls/d3dx8/math.c | 7 +++++++ dlls/d3dx8/tests/math.c | 8 +++++++- include/d3dx8math.h | 1 + 4 files changed, 16 insertions(+), 2 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 b9893c0..e907be1 100644 --- a/dlls/d3dx8/math.c +++ b/dlls/d3dx8/math.c @@ -581,6 +581,13 @@ D3DXPLANE* WINAPI D3DXPlaneTransform(D3DXPLANE *pout, CONST D3DXPLANE *pplane, C /*_________________D3DXQUATERNION________________*/ +D3DXQUATERNION* WINAPI D3DXQuaternionBaryCentric(D3DXQUATERNION *pout, CONST 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 D3DXQUATERNION *pq) { D3DXQUATERNION temp; 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; nul.x = 0.0f; nul.y = 0.0f; nul.z = 0.0f; nul.w = 0.0f; @@ -564,6 +564,12 @@ static void D3X8QuaternionTest(void) u.x = 91.0f; u.y = - 82.0f; u.z = 7.3f; u.w = -6.4f; scale = 0.3f; + scale2 = 0.78f; + +/*_______________D3DXQuaternionBaryCentric________________________*/ + expectedquat.x = -867.444458; expectedquat.y = 87.851111f; expectedquat.z = -9.937778f; expectedquat.w = 3.235555f; + D3DXQuaternionBaryCentric(&gotquat,&q,&r,&t,scale,scale2); + expect_vec4(expectedquat,gotquat); /*_______________D3DXQuaternionConjugate________________*/ expectedquat.x = -1.0f; expectedquat.y = -2.0f; expectedquat.z = -4.0f; expectedquat.w = 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 *pplane, CONST D3DXMATRIX *pm); +D3DXQUATERNION* WINAPI D3DXQuaternionBaryCentric(D3DXQUATERNION *pout, CONST D3DXQUATERNION *pq1, CONST D3DXQUATERNION *pq2, CONST D3DXQUATERNION *pq3, FLOAT f, FLOAT g); D3DXQUATERNION* WINAPI D3DXQuaternionInverse(D3DXQUATERNION *pout, CONST D3DXQUATERNION *pq); D3DXQUATERNION* WINAPI D3DXQuaternionMultiply(D3DXQUATERNION *pout, CONST D3DXQUATERNION *pq1, CONST D3DXQUATERNION *pq2); D3DXQUATERNION* WINAPI D3DXQuaternionNormalize(D3DXQUATERNION *pout, CONST D3DXQUATERNION *pq);

1 0

David Adam : d3dx8: Implement D3DXQuaternionMultiply.
by Alexandre Julliard Nov. 20, 2007

Nov. 20, 2007

Module: wine Branch: master Commit: 45b13a6cabff57b48b26f2b8e7c58c3838fcb3d8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=45b13a6cabff57b48b26f2b8e… Author: David Adam <David.Adam(a)math.cnrs.fr> Date: Mon Nov 19 15:55:21 2007 +0100 d3dx8: Implement D3DXQuaternionMultiply. --- dlls/d3dx8/d3dx8.spec | 2 +- dlls/d3dx8/math.c | 9 +++++++++ dlls/d3dx8/tests/math.c | 5 +++++ include/d3dx8math.h | 1 + 4 files changed, 16 insertions(+), 1 deletions(-) diff --git a/dlls/d3dx8/d3dx8.spec b/dlls/d3dx8/d3dx8.spec index 4a6d26c..ea9d87f 100644 --- a/dlls/d3dx8/d3dx8.spec +++ b/dlls/d3dx8/d3dx8.spec @@ -53,7 +53,7 @@ @ stub D3DXQuaternionRotationMatrix @ stub D3DXQuaternionRotationAxis @ stub D3DXQuaternionRotationYawPitchRoll -@ stub D3DXQuaternionMultiply +@ stdcall D3DXQuaternionMultiply(ptr ptr ptr) @ stdcall D3DXQuaternionNormalize(ptr ptr) @ stub D3DXQuaternionInverse @ stub D3DXQuaternionLn diff --git a/dlls/d3dx8/math.c b/dlls/d3dx8/math.c index 3cff34f..242c2b1 100644 --- a/dlls/d3dx8/math.c +++ b/dlls/d3dx8/math.c @@ -581,6 +581,15 @@ D3DXPLANE* WINAPI D3DXPlaneTransform(D3DXPLANE *pout, CONST D3DXPLANE *pplane, C /*_________________D3DXQUATERNION________________*/ +D3DXQUATERNION* WINAPI D3DXQuaternionMultiply(D3DXQUATERNION * pout, CONST D3DXQUATERNION *pq1, CONST D3DXQUATERNION * pq2) +{ + pout->x = pq2->w * pq1->x + pq2->x * pq1->w + pq2->y * pq1->z - pq2->z * pq1->y; + pout->y = pq2->w * pq1->y - pq2->x * pq1->z + pq2->y * pq1->w + pq2->z * pq1->x; + pout->z = pq2->w * pq1->z + pq2->x * pq1->y - pq2->y * pq1->x + pq2->z * pq1->w; + pout->w = pq2->w * pq1->w - pq2->x * pq1->x - pq2->y * pq1->y - pq2->z * pq1->z; + return pout; +} + D3DXQUATERNION* WINAPI D3DXQuaternionNormalize(D3DXQUATERNION *pout, CONST D3DXQUATERNION *pq) { FLOAT norm; diff --git a/dlls/d3dx8/tests/math.c b/dlls/d3dx8/tests/math.c index f62bd80..fe9893b 100644 --- a/dlls/d3dx8/tests/math.c +++ b/dlls/d3dx8/tests/math.c @@ -622,6 +622,11 @@ static void D3X8QuaternionTest(void) got = D3DXQuaternionLengthSq(NULL); ok(fabs( got - expected ) < admitted_error, "Expected: %f, Got: %f\n", expected, got); +/*_______________D3DXQuaternionMultiply________________________*/ + expectedquat.x = 3.0f; expectedquat.y = 61.0f; expectedquat.z = -32.0f; expectedquat.w = 85.0f; + D3DXQuaternionMultiply(&gotquat,&q,&r); + expect_vec4(expectedquat,gotquat); + /*_______________D3DXQuaternionNormalize________________________*/ expectedquat.x = 1.0f/11.0f; expectedquat.y = 2.0f/11.0f; expectedquat.z = 4.0f/11.0f; expectedquat.w = 10.0f/11.0f; D3DXQuaternionNormalize(&gotquat,&q); diff --git a/include/d3dx8math.h b/include/d3dx8math.h index a3eca67..08c7c63 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 *pplane, CONST D3DXMATRIX *pm); +D3DXQUATERNION* WINAPI D3DXQuaternionMultiply(D3DXQUATERNION * pout, CONST D3DXQUATERNION *pq1, CONST D3DXQUATERNION * pq2); D3DXQUATERNION* WINAPI D3DXQuaternionNormalize(D3DXQUATERNION *pout, CONST D3DXQUATERNION *pq); D3DXVECTOR2* WINAPI D3DXVec2BaryCentric(D3DXVECTOR2 *pout, CONST D3DXVECTOR2 *pv1, CONST D3DXVECTOR2 *pv2, CONST D3DXVECTOR2 *pv3, FLOAT f, FLOAT g);

1 0

David Adam : d3dx8: Implement D3DXQuaternionInverse.
by Alexandre Julliard Nov. 20, 2007

Nov. 20, 2007

Module: wine Branch: master Commit: 54e8d08e45ea69653cbca8735d9435606d4207ee URL: http://source.winehq.org/git/wine.git/?a=commit;h=54e8d08e45ea69653cbca8735… Author: David Adam <David.Adam(a)math.cnrs.fr> Date: Mon Nov 19 16:18:09 2007 +0100 d3dx8: Implement D3DXQuaternionInverse. --- dlls/d3dx8/d3dx8.spec | 2 +- dlls/d3dx8/math.c | 26 +++++++++++++++++++++++++- dlls/d3dx8/tests/math.c | 9 +++++++++ include/d3dx8math.h | 3 ++- 4 files changed, 37 insertions(+), 3 deletions(-) diff --git a/dlls/d3dx8/d3dx8.spec b/dlls/d3dx8/d3dx8.spec index ea9d87f..ffa82a8 100644 --- a/dlls/d3dx8/d3dx8.spec +++ b/dlls/d3dx8/d3dx8.spec @@ -55,7 +55,7 @@ @ stub D3DXQuaternionRotationYawPitchRoll @ stdcall D3DXQuaternionMultiply(ptr ptr ptr) @ stdcall D3DXQuaternionNormalize(ptr ptr) -@ stub D3DXQuaternionInverse +@ stdcall D3DXQuaternionInverse(ptr ptr) @ stub D3DXQuaternionLn @ stub D3DXQuaternionExp @ stub D3DXQuaternionSlerp diff --git a/dlls/d3dx8/math.c b/dlls/d3dx8/math.c index 242c2b1..99c4a42 100644 --- a/dlls/d3dx8/math.c +++ b/dlls/d3dx8/math.c @@ -581,7 +581,31 @@ D3DXPLANE* WINAPI D3DXPlaneTransform(D3DXPLANE *pout, CONST D3DXPLANE *pplane, C /*_________________D3DXQUATERNION________________*/ -D3DXQUATERNION* WINAPI D3DXQuaternionMultiply(D3DXQUATERNION * pout, CONST D3DXQUATERNION *pq1, CONST D3DXQUATERNION * pq2) +D3DXQUATERNION* WINAPI D3DXQuaternionInverse(D3DXQUATERNION *pout, CONST D3DXQUATERNION *pq) +{ + D3DXQUATERNION temp; + FLOAT norm; + + norm = D3DXQuaternionLengthSq(pq); + if ( !norm ) + { + pout->x = 0.0f; + pout->y = 0.0f; + pout->z = 0.0f; + pout->w = 0.0f; + } + else + { + D3DXQuaternionConjugate(&temp, pq); + pout->x = temp.x / norm; + pout->y = temp.y / norm; + pout->z = temp.z / norm; + pout->w = temp.w / norm; + } + return pout; +} + +D3DXQUATERNION* WINAPI D3DXQuaternionMultiply(D3DXQUATERNION *pout, CONST D3DXQUATERNION *pq1, CONST D3DXQUATERNION *pq2) { pout->x = pq2->w * pq1->x + pq2->x * pq1->w + pq2->y * pq1->z - pq2->z * pq1->y; pout->y = pq2->w * pq1->y - pq2->x * pq1->z + pq2->y * pq1->w + pq2->z * pq1->x; diff --git a/dlls/d3dx8/tests/math.c b/dlls/d3dx8/tests/math.c index fe9893b..399bf46 100644 --- a/dlls/d3dx8/tests/math.c +++ b/dlls/d3dx8/tests/math.c @@ -591,6 +591,15 @@ static void D3X8QuaternionTest(void) funcpointer = D3DXQuaternionIdentity(NULL); ok(funcpointer == NULL, "Expected: %p, Got: %p\n", NULL, funcpointer); +/*_______________D3DXQuaternionInverse________________________*/ + expectedquat.x = -1.0f/121.0f; expectedquat.y = -2.0f/121.0f; expectedquat.z = -4.0f/121.0f; expectedquat.w = 10.0f/121.0f; + D3DXQuaternionInverse(&gotquat,&q); + expect_vec4(expectedquat,gotquat); + /* test the null quaternion */ + expectedquat.x = 0.0f; expectedquat.y = 0.0f; expectedquat.z = 0.0f; expectedquat.w = 0.0f; + D3DXQuaternionInverse(&gotquat,&nul); + expect_vec4(expectedquat,gotquat); + /*_______________D3DXQuaternionIsIdentity________________*/ s.x = 0.0f; s.y = 0.0f; s.z = 0.0f; s.w = 1.0f; expectedbool = TRUE; diff --git a/include/d3dx8math.h b/include/d3dx8math.h index 08c7c63..37641ed 100644 --- a/include/d3dx8math.h +++ b/include/d3dx8math.h @@ -302,7 +302,8 @@ D3DXVECTOR3* WINAPI D3DXPlaneIntersectLine(D3DXVECTOR3 *pout, CONST D3DXPLANE *p D3DXPLANE* WINAPI D3DXPlaneNormalize(D3DXPLANE *pout, CONST D3DXPLANE *pp); D3DXPLANE* WINAPI D3DXPlaneTransform(D3DXPLANE *pout, CONST D3DXPLANE *pplane, CONST D3DXMATRIX *pm); -D3DXQUATERNION* WINAPI D3DXQuaternionMultiply(D3DXQUATERNION * pout, CONST D3DXQUATERNION *pq1, CONST D3DXQUATERNION * pq2); +D3DXQUATERNION* WINAPI D3DXQuaternionInverse(D3DXQUATERNION *pout, CONST D3DXQUATERNION *pq); +D3DXQUATERNION* WINAPI D3DXQuaternionMultiply(D3DXQUATERNION *pout, CONST D3DXQUATERNION *pq1, CONST D3DXQUATERNION *pq2); D3DXQUATERNION* WINAPI D3DXQuaternionNormalize(D3DXQUATERNION *pout, CONST D3DXQUATERNION *pq); D3DXVECTOR2* WINAPI D3DXVec2BaryCentric(D3DXVECTOR2 *pout, CONST D3DXVECTOR2 *pv1, CONST D3DXVECTOR2 *pv2, CONST D3DXVECTOR2 *pv3, FLOAT f, FLOAT g);

1 0

David Adam : d3dx8: Implement D3DXColorAdjustContrast.
by Alexandre Julliard Nov. 20, 2007

Nov. 20, 2007

Module: wine Branch: master Commit: 375dcaa82e22efc02de82d929558bbb6ad63faeb URL: http://source.winehq.org/git/wine.git/?a=commit;h=375dcaa82e22efc02de82d929… Author: David Adam <David.Adam(a)math.cnrs.fr> Date: Mon Nov 19 15:38:34 2007 +0100 d3dx8: Implement D3DXColorAdjustContrast. --- dlls/d3dx8/d3dx8.spec | 2 +- dlls/d3dx8/math.c | 9 +++++++++ dlls/d3dx8/tests/math.c | 5 +++++ include/d3dx8math.h | 2 ++ 4 files changed, 17 insertions(+), 1 deletions(-) diff --git a/dlls/d3dx8/d3dx8.spec b/dlls/d3dx8/d3dx8.spec index ab796af..4a6d26c 100644 --- a/dlls/d3dx8/d3dx8.spec +++ b/dlls/d3dx8/d3dx8.spec @@ -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 diff --git a/dlls/d3dx8/math.c b/dlls/d3dx8/math.c index ac66481..3cff34f 100644 --- a/dlls/d3dx8/math.c +++ b/dlls/d3dx8/math.c @@ -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; diff --git a/dlls/d3dx8/tests/math.c b/dlls/d3dx8/tests/math.c index f349a28..f62bd80 100644 --- a/dlls/d3dx8/tests/math.c +++ b/dlls/d3dx8/tests/math.c @@ -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); diff --git a/include/d3dx8math.h b/include/d3dx8math.h index 28c1bbe..a3eca67 100644 --- a/include/d3dx8math.h +++ b/include/d3dx8math.h @@ -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);

1 0

David Adam : d3dx8: Implement D3DXColorAdjustSaturation.
by Alexandre Julliard Nov. 20, 2007

Nov. 20, 2007

Module: wine Branch: master Commit: 8389eab6b7b1c9be60426a743fa095205898e1a1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8389eab6b7b1c9be60426a743… Author: David Adam <David.Adam(a)math.cnrs.fr> Date: Mon Nov 19 15:26:22 2007 +0100 d3dx8: Implement D3DXColorAdjustSaturation. --- dlls/d3dx8/d3dx8.spec | 2 +- dlls/d3dx8/math.c | 14 ++++++++++++++ dlls/d3dx8/tests/math.c | 7 ++++++- include/d3dx8math.h | 1 + 4 files changed, 22 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx8/d3dx8.spec b/dlls/d3dx8/d3dx8.spec index 3a27e1a..ab796af 100644 --- a/dlls/d3dx8/d3dx8.spec +++ b/dlls/d3dx8/d3dx8.spec @@ -66,7 +66,7 @@ @ stdcall D3DXPlaneFromPointNormal(ptr ptr ptr) @ stdcall D3DXPlaneFromPoints(ptr ptr ptr ptr) @ stdcall D3DXPlaneTransform(ptr ptr ptr) -@ stub D3DXColorAdjustSaturation +@ stdcall D3DXColorAdjustSaturation(ptr ptr long) @ stub D3DXColorAdjustContrast @ stub D3DXCreateMatrixStack @ stdcall D3DXCreateFont(ptr ptr ptr) diff --git a/dlls/d3dx8/math.c b/dlls/d3dx8/math.c index 6372271..ac66481 100644 --- a/dlls/d3dx8/math.c +++ b/dlls/d3dx8/math.c @@ -32,6 +32,20 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3dx8); +/*_________________D3DXColor____________________*/ + +D3DXCOLOR* WINAPI D3DXColorAdjustSaturation(D3DXCOLOR *pout, CONST D3DXCOLOR *pc, FLOAT s) +{ + FLOAT grey; + + grey = pc->r * 0.2125f + pc->g * 0.7154f + pc->b * 0.0721f; + pout->r = grey + s * (pc->r - grey); + pout->g = grey + s * (pc->g - grey); + pout->b = grey + s * (pc->b - grey); + pout->a = pc->a; + return pout; +} + /*_________________D3DXMatrix____________________*/ D3DXMATRIX* WINAPI D3DXMatrixAffineTransformation(D3DXMATRIX *pout, float scaling, D3DXVECTOR3 *rotationcenter, D3DXQUATERNION *rotation, D3DXVECTOR3 *translation) diff --git a/dlls/d3dx8/tests/math.c b/dlls/d3dx8/tests/math.c index cb72b31..f349a28 100644 --- a/dlls/d3dx8/tests/math.c +++ b/dlls/d3dx8/tests/math.c @@ -67,6 +67,7 @@ static void D3DXColorTest(void) color.r = 0.2f; color.g = 0.75f; color.b = 0.41f; color.a = 0.93f; color1.r = 0.6f; color1.g = 0.55f; color1.b = 0.23f; color1.a = 0.82f; color2.r = 0.3f; color2.g = 0.5f; color2.b = 0.76f; color2.a = 0.11f; + scale = 0.3f; /*_______________D3DXColorAdd________________*/ @@ -81,6 +82,11 @@ static void D3DXColorTest(void) funcpointer = D3DXColorAdd(NULL,NULL,NULL); ok(funcpointer == NULL, "Expected: %p, Got: %p\n", NULL, funcpointer); +/*_______________D3DXColorAdjustSaturation______*/ + expected.r = 0.486028f; expected.g = 0.651028f; expected.b = 0.549028f, expected.a = 0.93f; + D3DXColorAdjustSaturation(&got,&color,scale); + expect_color(expected,got); + /*_______________D3DXColorLerp________________*/ expected.r = 0.32f; expected.g = 0.69f; expected.b = 0.356f; expected.a = 0.897f; D3DXColorLerp(&got,&color,&color1,scale); @@ -436,7 +442,6 @@ static void D3DXMatrixTest(void) static void D3DXPlaneTest(void) { - D3DXMATRIX mat; D3DXPLANE expectedplane, gotplane, nulplane, plane; D3DXVECTOR3 expectedvec, gotvec, vec1, vec2, vec3; diff --git a/include/d3dx8math.h b/include/d3dx8math.h index 06bc562..28c1bbe 100644 --- a/include/d3dx8math.h +++ b/include/d3dx8math.h @@ -263,6 +263,7 @@ typedef struct D3DXCOLOR extern "C" { #endif +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);

1 0

David Adam : d3dx8: Implement D3DXQuaternionSquad.
by Alexandre Julliard Nov. 20, 2007

Nov. 20, 2007

Module: wine Branch: master Commit: 8ec01f62b08aae4642470f4f00f3608608281db2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8ec01f62b08aae4642470f4f0… Author: David Adam <David.Adam(a)math.cnrs.fr> Date: Mon Nov 19 17:35:44 2007 +0100 d3dx8: Implement D3DXQuaternionSquad. --- dlls/d3dx8/d3dx8.spec | 2 +- dlls/d3dx8/math.c | 8 ++++++++ dlls/d3dx8/tests/math.c | 8 +++++++- include/d3dx8math.h | 1 + 4 files changed, 17 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx8/d3dx8.spec b/dlls/d3dx8/d3dx8.spec index 005ac87..d89bfe9 100644 --- a/dlls/d3dx8/d3dx8.spec +++ b/dlls/d3dx8/d3dx8.spec @@ -59,7 +59,7 @@ @ stub D3DXQuaternionLn @ stub D3DXQuaternionExp @ stdcall D3DXQuaternionSlerp(ptr ptr ptr long) -@ stub D3DXQuaternionSquad +@ stdcall D3DXQuaternionSquad(ptr ptr ptr ptr ptr long) @ stub D3DXQuaternionBaryCentric @ stdcall D3DXPlaneNormalize(ptr ptr) @ stdcall D3DXPlaneIntersectLine(ptr ptr ptr ptr) diff --git a/dlls/d3dx8/math.c b/dlls/d3dx8/math.c index 900566c..b9893c0 100644 --- a/dlls/d3dx8/math.c +++ b/dlls/d3dx8/math.c @@ -650,6 +650,14 @@ D3DXQUATERNION* WINAPI D3DXQuaternionSlerp(D3DXQUATERNION *pout, CONST D3DXQUATE return pout; } +D3DXQUATERNION* WINAPI D3DXQuaternionSquad(D3DXQUATERNION *pout, CONST D3DXQUATERNION *pq1, CONST D3DXQUATERNION *pq2, CONST D3DXQUATERNION *pq3, CONST D3DXQUATERNION *pq4, FLOAT t) +{ + D3DXQUATERNION temp1, temp2; + + D3DXQuaternionSlerp(pout, D3DXQuaternionSlerp(&temp1, pq1, pq4, t), D3DXQuaternionSlerp(&temp2, pq2, pq3, t), 2.0f * t * (1.0f - t)); + return pout; +} + /*_________________D3DXVec2_____________________*/ D3DXVECTOR2* WINAPI D3DXVec2BaryCentric(D3DXVECTOR2 *pout, CONST D3DXVECTOR2 *pv1, CONST D3DXVECTOR2 *pv2, CONST D3DXVECTOR2 *pv3, FLOAT f, FLOAT g) diff --git a/dlls/d3dx8/tests/math.c b/dlls/d3dx8/tests/math.c index 3f96e76..0a732bd 100644 --- a/dlls/d3dx8/tests/math.c +++ b/dlls/d3dx8/tests/math.c @@ -552,7 +552,7 @@ static void D3DXPlaneTest(void) static void D3X8QuaternionTest(void) { - D3DXQUATERNION expectedquat, gotquat, nul, q, r, s, t; + D3DXQUATERNION expectedquat, gotquat, nul, q, r, s, t, u; LPD3DXQUATERNION funcpointer; FLOAT expected, got, scale; BOOL expectedbool, gotbool; @@ -561,6 +561,7 @@ static void D3X8QuaternionTest(void) q.x = 1.0f, q.y = 2.0f; q.z = 4.0f; q.w = 10.0f; r.x = -3.0f; r.y = 4.0f; r.z = -5.0f; r.w = 7.0; t.x = -1111.0f, t.y= 111.0f; t.z = -11.0f; t.w = 1.0f; + u.x = 91.0f; u.y = - 82.0f; u.z = 7.3f; u.w = -6.4f; scale = 0.3f; @@ -655,6 +656,11 @@ static void D3X8QuaternionTest(void) expectedquat.x = 334.0f; expectedquat.y = -31.9f; expectedquat.z = 6.1f; expectedquat.w = 6.7f; D3DXQuaternionSlerp(&gotquat,&q,&t,scale); expect_vec4(expectedquat,gotquat); + +/*_______________D3DXQuaternionSquad________________________*/ + expectedquat.x = -156.296f; expectedquat.y = 30.242f; expectedquat.z = -2.5022f; expectedquat.w = 7.3576f; + D3DXQuaternionSquad(&gotquat,&q,&r,&t,&u,scale); + expect_vec4(expectedquat,gotquat); } static void D3X8Vector2Test(void) diff --git a/include/d3dx8math.h b/include/d3dx8math.h index 455089c..1fd7b07 100644 --- a/include/d3dx8math.h +++ b/include/d3dx8math.h @@ -306,6 +306,7 @@ D3DXQUATERNION* WINAPI D3DXQuaternionInverse(D3DXQUATERNION *pout, CONST D3DXQUA D3DXQUATERNION* WINAPI D3DXQuaternionMultiply(D3DXQUATERNION *pout, CONST D3DXQUATERNION *pq1, CONST D3DXQUATERNION *pq2); D3DXQUATERNION* WINAPI D3DXQuaternionNormalize(D3DXQUATERNION *pout, CONST D3DXQUATERNION *pq); D3DXQUATERNION* WINAPI D3DXQuaternionSlerp(D3DXQUATERNION *pout, CONST D3DXQUATERNION *pq1, CONST D3DXQUATERNION *pq2, FLOAT t); +D3DXQUATERNION* WINAPI D3DXQuaternionSquad(D3DXQUATERNION *pout, CONST D3DXQUATERNION *pq1, CONST D3DXQUATERNION *pq2, CONST D3DXQUATERNION *pq3, CONST D3DXQUATERNION *pq4, FLOAT t); D3DXVECTOR2* WINAPI D3DXVec2BaryCentric(D3DXVECTOR2 *pout, CONST D3DXVECTOR2 *pv1, CONST D3DXVECTOR2 *pv2, CONST D3DXVECTOR2 *pv3, FLOAT f, FLOAT g); D3DXVECTOR2* WINAPI D3DXVec2CatmullRom(D3DXVECTOR2 *pout, CONST D3DXVECTOR2 *pv0, CONST D3DXVECTOR2 *pv1, CONST D3DXVECTOR2 *pv2, CONST D3DXVECTOR2 *pv3, FLOAT s);

1 0

David Adam : d3dx8: Implement D3DXQuaternionSlerp.
by Alexandre Julliard Nov. 20, 2007

Nov. 20, 2007

Module: wine Branch: master Commit: cb954ca6b4a5b72aad6580482c6b9b0952c42e95 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cb954ca6b4a5b72aad6580482… Author: David Adam <David.Adam(a)math.cnrs.fr> Date: Mon Nov 19 17:21:11 2007 +0100 d3dx8: Implement D3DXQuaternionSlerp. --- dlls/d3dx8/d3dx8.spec | 2 +- dlls/d3dx8/math.c | 15 +++++++++++++++ dlls/d3dx8/tests/math.c | 15 +++++++++++++-- include/d3dx8math.h | 1 + 4 files changed, 30 insertions(+), 3 deletions(-) diff --git a/dlls/d3dx8/d3dx8.spec b/dlls/d3dx8/d3dx8.spec index ffa82a8..005ac87 100644 --- a/dlls/d3dx8/d3dx8.spec +++ b/dlls/d3dx8/d3dx8.spec @@ -58,7 +58,7 @@ @ stdcall D3DXQuaternionInverse(ptr ptr) @ stub D3DXQuaternionLn @ stub D3DXQuaternionExp -@ stub D3DXQuaternionSlerp +@ stdcall D3DXQuaternionSlerp(ptr ptr ptr long) @ stub D3DXQuaternionSquad @ stub D3DXQuaternionBaryCentric @ stdcall D3DXPlaneNormalize(ptr ptr) diff --git a/dlls/d3dx8/math.c b/dlls/d3dx8/math.c index 99c4a42..900566c 100644 --- a/dlls/d3dx8/math.c +++ b/dlls/d3dx8/math.c @@ -635,6 +635,21 @@ D3DXQUATERNION* WINAPI D3DXQuaternionNormalize(D3DXQUATERNION *pout, CONST D3DXQ } return pout; } + +D3DXQUATERNION* WINAPI D3DXQuaternionSlerp(D3DXQUATERNION *pout, CONST D3DXQUATERNION *pq1, CONST D3DXQUATERNION *pq2, FLOAT t) +{ + FLOAT dot, epsilon; + + epsilon = 1.0f; + dot = D3DXQuaternionDot(pq1, pq2); + if ( dot < 0.0f) epsilon = -1.0f; + pout->x = (1.0f - t) * pq1->x + epsilon * t * pq2->x; + pout->y = (1.0f - t) * pq1->y + epsilon * t * pq2->y; + pout->z = (1.0f - t) * pq1->z + epsilon * t * pq2->z; + pout->w = (1.0f - t) * pq1->w + epsilon * t * pq2->w; + return pout; +} + /*_________________D3DXVec2_____________________*/ D3DXVECTOR2* WINAPI D3DXVec2BaryCentric(D3DXVECTOR2 *pout, CONST D3DXVECTOR2 *pv1, CONST D3DXVECTOR2 *pv2, CONST D3DXVECTOR2 *pv3, FLOAT f, FLOAT g) diff --git a/dlls/d3dx8/tests/math.c b/dlls/d3dx8/tests/math.c index 399bf46..3f96e76 100644 --- a/dlls/d3dx8/tests/math.c +++ b/dlls/d3dx8/tests/math.c @@ -552,14 +552,17 @@ static void D3DXPlaneTest(void) static void D3X8QuaternionTest(void) { - D3DXQUATERNION expectedquat, gotquat, nul, q, r, s; + D3DXQUATERNION expectedquat, gotquat, nul, q, r, s, t; LPD3DXQUATERNION funcpointer; - FLOAT expected, got; + FLOAT expected, got, scale; BOOL expectedbool, gotbool; nul.x = 0.0f; nul.y = 0.0f; nul.z = 0.0f; nul.w = 0.0f; q.x = 1.0f, q.y = 2.0f; q.z = 4.0f; q.w = 10.0f; r.x = -3.0f; r.y = 4.0f; r.z = -5.0f; r.w = 7.0; + t.x = -1111.0f, t.y= 111.0f; t.z = -11.0f; t.w = 1.0f; + + scale = 0.3f; /*_______________D3DXQuaternionConjugate________________*/ expectedquat.x = -1.0f; expectedquat.y = -2.0f; expectedquat.z = -4.0f; expectedquat.w = 10.0f; @@ -644,6 +647,14 @@ static void D3X8QuaternionTest(void) expectedquat.x = 0.0f; expectedquat.y = 0.0f; expectedquat.z = 0.0f; expectedquat.w = 0.0f; D3DXQuaternionNormalize(&gotquat,&nul); expect_vec4(expectedquat,gotquat); + +/*_______________D3DXQuaternionSlerp________________________*/ + expectedquat.x = -0.2f; expectedquat.y = 2.6f; expectedquat.z = 1.3f; expectedquat.w = 9.1f; + D3DXQuaternionSlerp(&gotquat,&q,&r,scale); + expect_vec4(expectedquat,gotquat); + expectedquat.x = 334.0f; expectedquat.y = -31.9f; expectedquat.z = 6.1f; expectedquat.w = 6.7f; + D3DXQuaternionSlerp(&gotquat,&q,&t,scale); + expect_vec4(expectedquat,gotquat); } static void D3X8Vector2Test(void) diff --git a/include/d3dx8math.h b/include/d3dx8math.h index 37641ed..455089c 100644 --- a/include/d3dx8math.h +++ b/include/d3dx8math.h @@ -305,6 +305,7 @@ D3DXPLANE* WINAPI D3DXPlaneTransform(D3DXPLANE *pout, CONST D3DXPLANE *pplane, C D3DXQUATERNION* WINAPI D3DXQuaternionInverse(D3DXQUATERNION *pout, CONST D3DXQUATERNION *pq); D3DXQUATERNION* WINAPI D3DXQuaternionMultiply(D3DXQUATERNION *pout, CONST D3DXQUATERNION *pq1, CONST D3DXQUATERNION *pq2); D3DXQUATERNION* WINAPI D3DXQuaternionNormalize(D3DXQUATERNION *pout, CONST D3DXQUATERNION *pq); +D3DXQUATERNION* WINAPI D3DXQuaternionSlerp(D3DXQUATERNION *pout, CONST D3DXQUATERNION *pq1, CONST D3DXQUATERNION *pq2, FLOAT t); D3DXVECTOR2* WINAPI D3DXVec2BaryCentric(D3DXVECTOR2 *pout, CONST D3DXVECTOR2 *pv1, CONST D3DXVECTOR2 *pv2, CONST D3DXVECTOR2 *pv3, FLOAT f, FLOAT g); D3DXVECTOR2* WINAPI D3DXVec2CatmullRom(D3DXVECTOR2 *pout, CONST D3DXVECTOR2 *pv0, CONST D3DXVECTOR2 *pv1, CONST D3DXVECTOR2 *pv2, CONST D3DXVECTOR2 *pv3, FLOAT s);

1 0

David Adam : d3dx8: Implement D3DXPlaneFromPointNormal.
by Alexandre Julliard Nov. 20, 2007

Nov. 20, 2007

Module: wine Branch: master Commit: 3d308661334e23a99be74206129c8fa24240eac1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3d308661334e23a99be742061… Author: David Adam <David.Adam(a)math.cnrs.fr> Date: Mon Nov 19 13:43:28 2007 +0100 d3dx8: Implement D3DXPlaneFromPointNormal. --- dlls/d3dx8/d3dx8.spec | 2 +- dlls/d3dx8/math.c | 9 +++++++++ dlls/d3dx8/tests/math.c | 7 +++++++ include/d3dx8math.h | 1 + 4 files changed, 18 insertions(+), 1 deletions(-) diff --git a/dlls/d3dx8/d3dx8.spec b/dlls/d3dx8/d3dx8.spec index 9dca39b..5b35df4 100644 --- a/dlls/d3dx8/d3dx8.spec +++ b/dlls/d3dx8/d3dx8.spec @@ -63,7 +63,7 @@ @ stub D3DXQuaternionBaryCentric @ stdcall D3DXPlaneNormalize(ptr ptr) @ stdcall D3DXPlaneIntersectLine(ptr ptr ptr ptr) -@ stub D3DXPlaneFromPointNormal +@ stdcall D3DXPlaneFromPointNormal(ptr ptr ptr) @ stub D3DXPlaneFromPoints @ stub D3DXPlaneTransform @ stub D3DXColorAdjustSaturation diff --git a/dlls/d3dx8/math.c b/dlls/d3dx8/math.c index cb6789a..875ca49 100644 --- a/dlls/d3dx8/math.c +++ b/dlls/d3dx8/math.c @@ -482,6 +482,15 @@ D3DXMATRIX* WINAPI D3DXMatrixTranspose(D3DXMATRIX *pout, CONST D3DXMATRIX *pm) /*_________________D3DXPLANE________________*/ +D3DXPLANE* WINAPI D3DXPlaneFromPointNormal(D3DXPLANE *pout, CONST D3DXVECTOR3 *pvpoint, CONST D3DXVECTOR3 *pvnormal) +{ + pout->a = pvnormal->x; + pout->b = pvnormal->y; + pout->c = pvnormal->z; + pout->d = -D3DXVec3Dot(pvpoint, pvnormal); + return pout; +} + D3DXVECTOR3* WINAPI D3DXPlaneIntersectLine(D3DXVECTOR3 *pout, CONST D3DXPLANE *pp, CONST D3DXVECTOR3 *pv1, CONST D3DXVECTOR3 *pv2) { D3DXVECTOR3 direction, normal; diff --git a/dlls/d3dx8/tests/math.c b/dlls/d3dx8/tests/math.c index 05a72e9..2811fea 100644 --- a/dlls/d3dx8/tests/math.c +++ b/dlls/d3dx8/tests/math.c @@ -478,6 +478,13 @@ static void D3DXPlaneTest(void) got = D3DXPlaneDotNormal(NULL,NULL), ok( expected == got, "Expected : %f, Got : %f\n",expected, got); +/*_______________D3DXPlaneFromPointNormal_______*/ + vec1.x = 11.0f; vec1.y = 13.0f; vec1.z = 15.0f; + vec2.x = 17.0f; vec2.y = 31.0f; vec2.z = 24.0f; + expectedplane.a = 17.0f; expectedplane.b = 31.0f; expectedplane.c = 24.0f; expectedplane.d = -950.0f; + D3DXPlaneFromPointNormal(&gotplane,&vec1,&vec2); + expect_plane(expectedplane, gotplane); + /*_______________D3DXPlaneIntersectLine___________*/ vec1.x = 9.0f; vec1.y = 6.0f; vec1.z = 3.0f; vec2.x = 2.0f; vec2.y = 5.0f; vec2.z = 8.0f; diff --git a/include/d3dx8math.h b/include/d3dx8math.h index 930c417..8c2cdc3 100644 --- a/include/d3dx8math.h +++ b/include/d3dx8math.h @@ -293,6 +293,7 @@ D3DXMATRIX* WINAPI D3DXMatrixShadow(D3DXMATRIX *pout, CONST D3DXVECTOR4 *plight, D3DXMATRIX* WINAPI D3DXMatrixTranslation(D3DXMATRIX *pout, FLOAT x, FLOAT y, FLOAT z); D3DXMATRIX* WINAPI D3DXMatrixTranspose(D3DXMATRIX *pout, CONST D3DXMATRIX *pm); +D3DXPLANE* WINAPI D3DXPlaneFromPointNormal(D3DXPLANE *pout, CONST D3DXVECTOR3 *pvpoint, CONST D3DXVECTOR3 *pvnormal); D3DXVECTOR3* WINAPI D3DXPlaneIntersectLine(D3DXVECTOR3 *pout, CONST D3DXPLANE *pp, CONST D3DXVECTOR3 *pv1, CONST D3DXVECTOR3 *pv2); D3DXPLANE* WINAPI D3DXPlaneNormalize(D3DXPLANE *pout, CONST D3DXPLANE *pp);

1 0