November 2007 - Wine-Commits

Gerald Pfeifer : oleaut32: Simplify two conditions based on the fact that unsigned variables cannot be negative .
by Alexandre Julliard Nov. 26, 2007

Nov. 26, 2007

Module: wine Branch: master Commit: 1d6206474837f6bae97637551dbc4e68483ecca1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1d6206474837f6bae97637551… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Thu Nov 22 01:06:32 2007 +0100 oleaut32: Simplify two conditions based on the fact that unsigned variables cannot be negative. --- dlls/oleaut32/typelib2.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/oleaut32/typelib2.c b/dlls/oleaut32/typelib2.c index 41ee8e6..7464b0c 100644 --- a/dlls/oleaut32/typelib2.c +++ b/dlls/oleaut32/typelib2.c @@ -3493,7 +3493,7 @@ static HRESULT WINAPI ITypeLib2_fnGetTypeInfo( TRACE("(%p,%d,%p)\n", iface, index, ppTInfo); - if ((index < 0) || (index >= This->typelib_header.nrtypeinfos)) { + if (index >= This->typelib_header.nrtypeinfos) { return TYPE_E_ELEMENTNOTFOUND; } @@ -3514,7 +3514,7 @@ static HRESULT WINAPI ITypeLib2_fnGetTypeInfoType( TRACE("(%p,%d,%p)\n", iface, index, pTKind); - if ((index < 0) || (index >= This->typelib_header.nrtypeinfos)) { + if (index >= This->typelib_header.nrtypeinfos) { return TYPE_E_ELEMENTNOTFOUND; }

1 0

Patrick Moran : msiexec: Fix atou() return value mistake.
by Alexandre Julliard Nov. 26, 2007

Nov. 26, 2007

Module: wine Branch: master Commit: 0b79b0e58ace9bb0f0bd0735c90ef869a5d19d42 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0b79b0e58ace9bb0f0bd0735c… Author: Patrick Moran <patrick.a.moran(a)gmail.com> Date: Sun Nov 25 02:35:27 2007 -0500 msiexec: Fix atou() return value mistake. --- programs/msiexec/msiexec.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/msiexec/msiexec.c b/programs/msiexec/msiexec.c index bdb1b90..6577c78 100644 --- a/programs/msiexec/msiexec.c +++ b/programs/msiexec/msiexec.c @@ -209,7 +209,7 @@ static DWORD msi_atou(LPCWSTR str) ret += (*str - '0'); str++; } - return 0; + return ret; } static LPWSTR msi_strdup(LPCWSTR str)

1 0

Gerald Pfeifer : oleaut32: Simplify two conditions based on the fact that unsigned variables cannot be negative .
by Alexandre Julliard Nov. 26, 2007

Nov. 26, 2007

Module: wine Branch: master Commit: 48d839822b072438ad35fd20825fc018f3067d9f URL: http://source.winehq.org/git/wine.git/?a=commit;h=48d839822b072438ad35fd208… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Thu Nov 22 21:49:37 2007 +0100 oleaut32: Simplify two conditions based on the fact that unsigned variables cannot be negative. --- dlls/oleaut32/typelib.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 62fe557..8e37de0 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -3758,7 +3758,7 @@ static HRESULT WINAPI ITypeLib2_fnGetTypeInfoType( int i; ITypeInfoImpl *pTInfo = This->pTypeInfo; - if ((ITypeLib2_fnGetTypeInfoCount(iface) < index + 1) || (index < 0)) + if (ITypeLib2_fnGetTypeInfoCount(iface) < index + 1) return TYPE_E_ELEMENTNOTFOUND; TRACE("(%p) index %d\n", This, index); @@ -6647,7 +6647,7 @@ static HRESULT WINAPI ITypeInfo2_fnGetParamCustData( for(i=0, pFDesc=This->funclist; i!=indexFunc && pFDesc; i++,pFDesc=pFDesc->next); - if(pFDesc && indexParam >=0 && indexParam<pFDesc->funcdesc.cParams) + if(pFDesc && indexParam<pFDesc->funcdesc.cParams) for(pCData=pFDesc->pParamDesc[indexParam].pCustData; pCData; pCData = pCData->next) if( IsEqualIID(guid, &pCData->guid)) break; @@ -6880,7 +6880,7 @@ static HRESULT WINAPI ITypeInfo2_fnGetAllParamCustData( ITypeInfo2 * iface, for(i=0, pFDesc=This->funclist; i!=indexFunc && pFDesc; i++, pFDesc=pFDesc->next) ; - if(pFDesc && indexParam >=0 && indexParam<pFDesc->funcdesc.cParams){ + if(pFDesc && indexParam<pFDesc->funcdesc.cParams){ pCustData->prgCustData = TLB_Alloc(pFDesc->pParamDesc[indexParam].ctCustData * sizeof(CUSTDATAITEM));

1 0

David Adam : d3dx8: Implement D3DXQuaternionLn.
by Alexandre Julliard Nov. 26, 2007

Nov. 26, 2007

Module: wine Branch: master Commit: 41029cc88c7592adc392f94b83120682cf3906d9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=41029cc88c7592adc392f94b8… Author: David Adam <David.Adam(a)math.cnrs.fr> Date: Wed Nov 21 14:34:32 2007 +0100 d3dx8: Implement D3DXQuaternionLn. --- dlls/d3dx8/d3dx8.spec | 2 +- dlls/d3dx8/math.c | 28 ++++++++++++++++++++++++++++ dlls/d3dx8/tests/math.c | 20 ++++++++++++++++++-- include/d3dx8math.h | 1 + 4 files changed, 48 insertions(+), 3 deletions(-) diff --git a/dlls/d3dx8/d3dx8.spec b/dlls/d3dx8/d3dx8.spec index d398791..d65dce0 100644 --- a/dlls/d3dx8/d3dx8.spec +++ b/dlls/d3dx8/d3dx8.spec @@ -56,7 +56,7 @@ @ stdcall D3DXQuaternionMultiply(ptr ptr ptr) @ stdcall D3DXQuaternionNormalize(ptr ptr) @ stdcall D3DXQuaternionInverse(ptr ptr) -@ stub D3DXQuaternionLn +@ stdcall D3DXQuaternionLn(ptr ptr) @ stub D3DXQuaternionExp @ stdcall D3DXQuaternionSlerp(ptr ptr ptr long) @ stdcall D3DXQuaternionSquad(ptr ptr ptr ptr ptr long) diff --git a/dlls/d3dx8/math.c b/dlls/d3dx8/math.c index aa8664f..19d6a9f 100644 --- a/dlls/d3dx8/math.c +++ b/dlls/d3dx8/math.c @@ -612,6 +612,34 @@ D3DXQUATERNION* WINAPI D3DXQuaternionInverse(D3DXQUATERNION *pout, CONST D3DXQUA return pout; } +D3DXQUATERNION* WINAPI D3DXQuaternionLn(D3DXQUATERNION *pout, CONST D3DXQUATERNION *pq) +{ + FLOAT norm, normvec, theta; + + norm = D3DXQuaternionLengthSq(pq); + if ( norm > 1.0001f ) + { + pout->x = pq->x; + pout->y = pq->y; + pout->z = pq->z; + pout->w = 0.0f; + } + else if( norm > 0.99999f) + { + normvec = sqrt( pq->x * pq->x + pq->y * pq->y + pq->z * pq->z ); + theta = atan2(normvec, pq->w) / normvec; + pout->x = theta * pq->x; + pout->y = theta * pq->y; + pout->z = theta * pq->z; + pout->w = 0.0f; + } + else + { + FIXME("The quaternion (%f, %f, %f, %f) has a norm <1. This should not happen. Windows returns a result anyway. This case is not implemented yet.\n", pq->x, pq->y, pq->z, pq->w); + } + 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; diff --git a/dlls/d3dx8/tests/math.c b/dlls/d3dx8/tests/math.c index 950bc5e..6dfe49c 100644 --- a/dlls/d3dx8/tests/math.c +++ b/dlls/d3dx8/tests/math.c @@ -553,7 +553,7 @@ static void D3DXPlaneTest(void) static void D3X8QuaternionTest(void) { D3DXMATRIX mat; - D3DXQUATERNION expectedquat, gotquat, Nq, nul, q, r, s, t, u; + D3DXQUATERNION expectedquat, gotquat, Nq, Nq1, nul, q, r, s, t, u; LPD3DXQUATERNION funcpointer; D3DXVECTOR3 axis, expectedvec; FLOAT angle, expected, got, scale, scale2; @@ -643,6 +643,23 @@ static void D3X8QuaternionTest(void) got = D3DXQuaternionLengthSq(NULL); ok(fabs( got - expected ) < admitted_error, "Expected: %f, Got: %f\n", expected, got); +/*_______________D3DXQuaternionLn______________________________*/ + expectedquat.x = 1.0f; expectedquat.y = 2.0f; expectedquat.z = 4.0f; expectedquat.w = 0.0f; + D3DXQuaternionLn(&gotquat,&q); + expect_vec4(expectedquat,gotquat); + expectedquat.x = -3.0f; expectedquat.y = 4.0f; expectedquat.z = -5.0f; expectedquat.w = 0.0f; + D3DXQuaternionLn(&gotquat,&r); + expect_vec4(expectedquat,gotquat); + Nq.x = 1.0f/11.0f; Nq.y = 2.0f/11.0f; Nq.z = 4.0f/11.0f; Nq.w=10.0f/11.0f; + expectedquat.x = 0.093768f; expectedquat.y = 0.187536f; expectedquat.z = 0.375073f; expectedquat.w = 0.0f; + D3DXQuaternionLn(&gotquat,&Nq); + expect_vec4(expectedquat,gotquat); + /* Test the cas where the norm of the quaternion is <1 */ + Nq1.x = 0.2f; Nq1.y = 0.1f; Nq1.z = 0.3; Nq1.w= 0.9f; + expectedquat.x = 0.206945f; expectedquat.y = 0.103473f; expectedquat.z = 0.310418f; expectedquat.w = 0.0f; + D3DXQuaternionLn(&gotquat,&Nq1); + todo_wine{ expect_vec4(expectedquat,gotquat) }; + /*_______________D3DXQuaternionMultiply________________________*/ expectedquat.x = 3.0f; expectedquat.y = 61.0f; expectedquat.z = -32.0f; expectedquat.w = 85.0f; D3DXQuaternionMultiply(&gotquat,&q,&r); @@ -706,7 +723,6 @@ static void D3X8QuaternionTest(void) D3DXQuaternionRotationYawPitchRoll(&gotquat,D3DX_PI/4.0f,D3DX_PI/11.0f,D3DX_PI/3.0f); 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); diff --git a/include/d3dx8math.h b/include/d3dx8math.h index 5ef85b4..6c5f18f 100644 --- a/include/d3dx8math.h +++ b/include/d3dx8math.h @@ -304,6 +304,7 @@ D3DXPLANE* WINAPI D3DXPlaneTransform(D3DXPLANE *pout, CONST D3DXPLANE *pplane, C 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 D3DXQuaternionLn(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 D3DXQuaternionRotationAxis(D3DXQUATERNION *pout, CONST D3DXVECTOR3 *pv, FLOAT angle);

1 0

Lionel Debroux : msvcrt: Fix memory leak (found by Smatch).
by Alexandre Julliard Nov. 26, 2007

Nov. 26, 2007

Module: wine Branch: master Commit: 68b1f2cde2727e381f41724d5348f9fc413b1425 URL: http://source.winehq.org/git/wine.git/?a=commit;h=68b1f2cde2727e381f41724d5… Author: Lionel Debroux <lionel_debroux(a)yahoo.fr> Date: Wed Nov 21 17:34:10 2007 +0100 msvcrt: Fix memory leak (found by Smatch). --- dlls/msvcrt/tests/heap.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/msvcrt/tests/heap.c b/dlls/msvcrt/tests/heap.c index afea53f..2cd4fb2 100644 --- a/dlls/msvcrt/tests/heap.c +++ b/dlls/msvcrt/tests/heap.c @@ -342,6 +342,7 @@ START_TEST(heap) mem = malloc(0); ok(mem != NULL, "memory not allocated for size 0\n"); + free(mem); mem = realloc(NULL, 10); ok(mem != NULL, "memory not allocated\n");

1 0

David Adam : d3dx8: Implement D3DXQuaternionExp.
by Alexandre Julliard Nov. 26, 2007

Nov. 26, 2007

Module: wine Branch: master Commit: f1bc484947b45ef0e08cbf51f1b8614baf5b587d URL: http://source.winehq.org/git/wine.git/?a=commit;h=f1bc484947b45ef0e08cbf51f… Author: David Adam <David.Adam(a)math.cnrs.fr> Date: Wed Nov 21 14:59:21 2007 +0100 d3dx8: Implement D3DXQuaternionExp. --- dlls/d3dx8/d3dx8.spec | 2 +- dlls/d3dx8/math.c | 22 ++++++++++++++++++++++ dlls/d3dx8/tests/math.c | 14 ++++++++++++++ include/d3dx8math.h | 1 + 4 files changed, 38 insertions(+), 1 deletions(-) diff --git a/dlls/d3dx8/d3dx8.spec b/dlls/d3dx8/d3dx8.spec index d65dce0..52fa008 100644 --- a/dlls/d3dx8/d3dx8.spec +++ b/dlls/d3dx8/d3dx8.spec @@ -57,7 +57,7 @@ @ stdcall D3DXQuaternionNormalize(ptr ptr) @ stdcall D3DXQuaternionInverse(ptr ptr) @ stdcall D3DXQuaternionLn(ptr ptr) -@ stub D3DXQuaternionExp +@ stdcall D3DXQuaternionExp(ptr ptr) @ stdcall D3DXQuaternionSlerp(ptr ptr ptr long) @ stdcall D3DXQuaternionSquad(ptr ptr ptr ptr ptr long) @ stdcall D3DXQuaternionBaryCentric(ptr ptr ptr ptr long long) diff --git a/dlls/d3dx8/math.c b/dlls/d3dx8/math.c index 19d6a9f..9f7522e 100644 --- a/dlls/d3dx8/math.c +++ b/dlls/d3dx8/math.c @@ -588,6 +588,28 @@ D3DXQUATERNION* WINAPI D3DXQuaternionBaryCentric(D3DXQUATERNION *pout, CONST D3D return pout; } +D3DXQUATERNION* WINAPI D3DXQuaternionExp(D3DXQUATERNION *pout, CONST D3DXQUATERNION *pq) +{ + FLOAT norm; + + norm = sqrt(pq->x * pq->x + pq->y * pq->y + pq->z * pq->z); + if (norm ) + { + pout->x = sin(norm) * pq->x / norm; + pout->y = sin(norm) * pq->y / norm; + pout->z = sin(norm) * pq->z / norm; + pout->w = cos(norm); + } + else + { + pout->x = 0.0f; + pout->y = 0.0f; + pout->z = 0.0f; + pout->w = 1.0f; + } + 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 6dfe49c..b689fb7 100644 --- a/dlls/d3dx8/tests/math.c +++ b/dlls/d3dx8/tests/math.c @@ -595,6 +595,20 @@ static void D3X8QuaternionTest(void) got = D3DXQuaternionDot(NULL,NULL); ok(fabs( got - expected ) < admitted_error, "Expected: %f, Got: %f\n", expected, got); +/*_______________D3DXQuaternionExp______________________________*/ + expectedquat.x = -0.216382f; expectedquat.y = -0.432764f; expectedquat.z = -0.8655270f; expectedquat.w = -0.129449f; + D3DXQuaternionExp(&gotquat,&q); + expect_vec4(expectedquat,gotquat); + /* Test the null quaternion */ + expectedquat.x = 0.0f; expectedquat.y = 0.0f; expectedquat.z = 0.0f; expectedquat.w = 1.0f; + D3DXQuaternionExp(&gotquat,&nul); + expect_vec4(expectedquat,gotquat); + /* Test the case where the norm of the quaternion is <1 */ + Nq1.x = 0.2f; Nq1.y = 0.1f; Nq1.z = 0.3; Nq1.w= 0.9f; + expectedquat.x = 0.195366; expectedquat.y = 0.097683f; expectedquat.z = 0.293049f; expectedquat.w = 0.930813f; + D3DXQuaternionExp(&gotquat,&Nq1); + expect_vec4(expectedquat,gotquat); + /*_______________D3DXQuaternionIdentity________________*/ expectedquat.x = 0.0f; expectedquat.y = 0.0f; expectedquat.z = 0.0f; expectedquat.w = 1.0f; D3DXQuaternionIdentity(&gotquat); diff --git a/include/d3dx8math.h b/include/d3dx8math.h index 6c5f18f..a799dee 100644 --- a/include/d3dx8math.h +++ b/include/d3dx8math.h @@ -303,6 +303,7 @@ 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 D3DXQuaternionExp(D3DXQUATERNION *pout, CONST D3DXQUATERNION *pq); D3DXQUATERNION* WINAPI D3DXQuaternionInverse(D3DXQUATERNION *pout, CONST D3DXQUATERNION *pq); D3DXQUATERNION* WINAPI D3DXQuaternionLn(D3DXQUATERNION *pout, CONST D3DXQUATERNION *pq); D3DXQUATERNION* WINAPI D3DXQuaternionMultiply(D3DXQUATERNION *pout, CONST D3DXQUATERNION *pq1, CONST D3DXQUATERNION *pq2);

1 0

David Adam : d3dx8: Implement D3DXMatrixTransformation.
by Alexandre Julliard Nov. 26, 2007

Nov. 26, 2007

Module: wine Branch: master Commit: cf443380ba53cf6b32277d31a95c582654ca02db URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf443380ba53cf6b32277d31a… Author: David Adam <David.Adam(a)math.cnrs.fr> Date: Wed Nov 21 17:23:13 2007 +0100 d3dx8: Implement D3DXMatrixTransformation. --- dlls/d3dx8/d3dx8.spec | 2 +- dlls/d3dx8/math.c | 80 +++++++++++++++++++++++++++++++++++++++++++++++ dlls/d3dx8/tests/math.c | 16 ++++++++- include/d3dx8math.h | 1 + 4 files changed, 96 insertions(+), 3 deletions(-) diff --git a/dlls/d3dx8/d3dx8.spec b/dlls/d3dx8/d3dx8.spec index 52fa008..28b772e 100644 --- a/dlls/d3dx8/d3dx8.spec +++ b/dlls/d3dx8/d3dx8.spec @@ -33,7 +33,7 @@ @ stdcall D3DXMatrixRotationAxis(ptr ptr long) @ stdcall D3DXMatrixRotationQuaternion(ptr ptr) @ stdcall D3DXMatrixRotationYawPitchRoll(ptr long long long) -@ stub D3DXMatrixTransformation +@ stdcall D3DXMatrixTransformation(ptr ptr ptr ptr ptr ptr ptr) @ stdcall D3DXMatrixAffineTransformation(ptr long ptr ptr ptr) @ stdcall D3DXMatrixLookAtRH(ptr ptr ptr ptr) @ stdcall D3DXMatrixLookAtLH(ptr ptr ptr ptr) diff --git a/dlls/d3dx8/math.c b/dlls/d3dx8/math.c index 9f7522e..04072bf 100644 --- a/dlls/d3dx8/math.c +++ b/dlls/d3dx8/math.c @@ -480,6 +480,86 @@ D3DXMATRIX* WINAPI D3DXMatrixShadow(D3DXMATRIX *pout, CONST D3DXVECTOR4 *plight, return pout; } +D3DXMATRIX* D3DXMatrixTransformation(D3DXMATRIX *pout, CONST D3DXVECTOR3 *pscalingcenter, CONST D3DXQUATERNION *pscalingrotation, CONST D3DXVECTOR3 *pscaling, CONST D3DXVECTOR3 *protationcenter, CONST D3DXQUATERNION *protation, CONST D3DXVECTOR3 *ptranslation) +{ + D3DXMATRIX m1, m2, m3, m4, m5, m6, m7, p1, p2, p3, p4, p5; + D3DXQUATERNION prc; + D3DXVECTOR3 psc, pt; + + if ( !pscalingcenter ) + { + psc.x = 0.0f; + psc.y = 0.0f; + psc.z = 0.0f; + } + else + { + psc.x = pscalingcenter->x; + psc.y = pscalingcenter->y; + psc.z = pscalingcenter->z; + } + if ( !protationcenter ) + { + prc.x = 0.0f; + prc.y = 0.0f; + prc.z = 0.0f; + } + else + { + prc.x = protationcenter->x; + prc.y = protationcenter->y; + prc.z = protationcenter->z; + } + if ( !ptranslation ) + { + pt.x = 0.0f; + pt.y = 0.0f; + pt.z = 0.0f; + } + else + { + pt.x = ptranslation->x; + pt.y = ptranslation->y; + pt.z = ptranslation->z; + } + D3DXMatrixTranslation(&m1, -psc.x, -psc.y, -psc.z); + if ( !pscalingrotation ) + { + D3DXMatrixIdentity(&m2); + D3DXMatrixIdentity(&m4); + } + else + { + D3DXMatrixRotationQuaternion(&m4, pscalingrotation); + D3DXMatrixInverse(&m2, NULL, &m4); + } + if ( !pscaling ) + { + D3DXMatrixIdentity(&m3); + } + else + { + D3DXMatrixScaling(&m3, pscaling->x, pscaling->y, pscaling->z); + } + if ( !protation ) + { + D3DXMatrixIdentity(&m6); + } + else + { + D3DXMatrixRotationQuaternion(&m6, protation); + } + D3DXMatrixTranslation(&m5, psc.x - prc.x, psc.y - prc.y, psc.z - prc.z); + D3DXMatrixTranslation(&m7, prc.x + pt.x, prc.y + pt.y, prc.z + pt.z); + D3DXMatrixMultiply(&p1, &m1, &m2); + D3DXMatrixMultiply(&p2, &p1, &m3); + D3DXMatrixMultiply(&p3, &p2, &m4); + D3DXMatrixMultiply(&p4, &p3, &m5); + D3DXMatrixMultiply(&p5, &p4, &m6); + D3DXMatrixMultiply(pout, &p5, &m7); + return pout; +} + D3DXMATRIX* WINAPI D3DXMatrixTranslation(D3DXMATRIX *pout, FLOAT x, FLOAT y, FLOAT z) { D3DXMatrixIdentity(pout); diff --git a/dlls/d3dx8/tests/math.c b/dlls/d3dx8/tests/math.c index b689fb7..6fb5736 100644 --- a/dlls/d3dx8/tests/math.c +++ b/dlls/d3dx8/tests/math.c @@ -164,8 +164,8 @@ static void D3DXMatrixTest(void) D3DXMATRIX expectedmat, gotmat, mat, mat2, mat3; LPD3DXMATRIX funcpointer; D3DXPLANE plane; - D3DXQUATERNION q; - D3DXVECTOR3 at, axis, eye; + D3DXQUATERNION q, r; + D3DXVECTOR3 at, axis, eye, last, scaling; D3DXVECTOR4 light; BOOL expected, got; FLOAT angle, determinant, expectedfloat, gotfloat; @@ -187,10 +187,13 @@ static void D3DXMatrixTest(void) plane.a = -3.0f; plane.b = -1.0f; plane.c = 4.0f; plane.d = 7.0f; q.x = 1.0f; q.y = -4.0f; q.z =7.0f; q.w = -11.0f; + r.x = 0.87f; r.y = 0.65f; r.z =0.43f; r.w= 0.21f; at.x = -2.0f; at.y = 13.0f; at.z = -9.0f; axis.x = 1.0f; axis.y = -3.0f; axis.z = 7.0f; eye.x = 8.0f; eye.y = -5.0f; eye.z = 5.75f; + last.x = 9.7f; last.y = -8.6; last.z = 1.3f; + scaling.x = 0.03f; scaling.y =0.05f; scaling.z = 0.06f; light.x = 9.6f; light.y = 8.5f; light.z = 7.4; light.w = 6.3; @@ -364,6 +367,7 @@ static void D3DXMatrixTest(void) U(expectedmat).m[3][0] = 1.615385f; U(expectedmat).m[3][1] = 0.538462f; U(expectedmat).m[3][2] = -2.153846f; U(expectedmat).m[3][3] = 1.0f; D3DXMatrixReflect(&gotmat,&plane); expect_mat(expectedmat,gotmat); + /*____________D3DXMatrixRotationAxis_____*/ U(expectedmat).m[0][0] = 0.508475f; U(expectedmat).m[0][1] = 0.763805f; U(expectedmat).m[0][2] = 0.397563f; U(expectedmat).m[0][3] = 0.0f; U(expectedmat).m[1][0] = -0.814652f; U(expectedmat).m[1][1] = 0.576271f; U(expectedmat).m[1][2] = -0.065219f; U(expectedmat).m[1][3] = 0.0f; @@ -428,6 +432,14 @@ static void D3DXMatrixTest(void) D3DXMatrixShadow(&gotmat,&light,&plane); expect_mat(expectedmat,gotmat); +/*____________D3DXMatrixTransformation______________*/ + U(expectedmat).m[0][0] = -0.2148f; U(expectedmat).m[0][1] = 1.3116f; U(expectedmat).m[0][2] = 0.4752f; U(expectedmat).m[0][3] = 0.0f; + U(expectedmat).m[1][0] = 0.9504f; U(expectedmat).m[1][1] = -0.8836f; U(expectedmat).m[1][2] = 0.9244f; U(expectedmat).m[1][3] = 0.0f; + U(expectedmat).m[2][0] = 1.0212f; U(expectedmat).m[2][1] = 0.1936f; U(expectedmat).m[2][2] = -1.3588f; U(expectedmat).m[2][3] = 0.0f; + U(expectedmat).m[3][0] = 18.2985f; U(expectedmat).m[3][1] = -29.624001f; U(expectedmat).m[3][2] = 15.683499f; U(expectedmat).m[3][3] = 1.0f; + D3DXMatrixTransformation(&gotmat,&at,&q,NULL,&eye,&r,&last); + expect_mat(expectedmat,gotmat); + /*____________D3DXMatrixTranslation______________*/ U(expectedmat).m[0][0] = 1.0f; U(expectedmat).m[0][1] = 0.0f; U(expectedmat).m[0][2] = 0.0f; U(expectedmat).m[0][3] = 0.0f; U(expectedmat).m[1][0] = 0.0; U(expectedmat).m[1][1] = 1.0f; U(expectedmat).m[1][2] = 0.0f; U(expectedmat).m[1][3] = 0.0f; diff --git a/include/d3dx8math.h b/include/d3dx8math.h index a799dee..4ea4d7d 100644 --- a/include/d3dx8math.h +++ b/include/d3dx8math.h @@ -293,6 +293,7 @@ D3DXMATRIX* WINAPI D3DXMatrixRotationYawPitchRoll(D3DXMATRIX *pout, FLOAT yaw, F D3DXMATRIX* WINAPI D3DXMatrixRotationZ(D3DXMATRIX *pout, FLOAT angle); D3DXMATRIX* WINAPI D3DXMatrixScaling(D3DXMATRIX *pout, FLOAT sx, FLOAT sy, FLOAT sz); D3DXMATRIX* WINAPI D3DXMatrixShadow(D3DXMATRIX *pout, CONST D3DXVECTOR4 *plight, CONST D3DXPLANE *pPlane); +D3DXMATRIX* D3DXMatrixTransformation(D3DXMATRIX *pout, CONST D3DXVECTOR3 *pscalingcenter, CONST D3DXQUATERNION *pscalingrotation, CONST D3DXVECTOR3 *pscaling, CONST D3DXVECTOR3 *protationcenter, CONST D3DXQUATERNION *protation, CONST D3DXVECTOR3 *ptranslation); D3DXMATRIX* WINAPI D3DXMatrixTranslation(D3DXMATRIX *pout, FLOAT x, FLOAT y, FLOAT z); D3DXMATRIX* WINAPI D3DXMatrixTranspose(D3DXMATRIX *pout, CONST D3DXMATRIX *pm);

1 0

David Adam : d3dx8: Implement D3DXQuaternionRotationAxis.
by Alexandre Julliard Nov. 26, 2007

Nov. 26, 2007

Module: wine Branch: master Commit: 345994fbcec4783657b7982ab3ce3f0bc3c53cae URL: http://source.winehq.org/git/wine.git/?a=commit;h=345994fbcec4783657b7982ab… Author: David Adam <David.Adam(a)math.cnrs.fr> Date: Tue Nov 20 13:04:16 2007 +0100 d3dx8: Implement D3DXQuaternionRotationAxis. --- dlls/d3dx8/d3dx8.spec | 2 +- dlls/d3dx8/math.c | 12 ++++++++++++ dlls/d3dx8/tests/math.c | 12 ++++++++++++ include/d3dx8math.h | 1 + 4 files changed, 26 insertions(+), 1 deletions(-) diff --git a/dlls/d3dx8/d3dx8.spec b/dlls/d3dx8/d3dx8.spec index 1c57f53..d3b0ffa 100644 --- a/dlls/d3dx8/d3dx8.spec +++ b/dlls/d3dx8/d3dx8.spec @@ -51,7 +51,7 @@ @ stdcall D3DXMatrixReflect(ptr ptr) @ stdcall D3DXQuaternionToAxisAngle(ptr ptr ptr) @ stub D3DXQuaternionRotationMatrix -@ stub D3DXQuaternionRotationAxis +@ stdcall D3DXQuaternionRotationAxis(ptr ptr long) @ stub D3DXQuaternionRotationYawPitchRoll @ stdcall D3DXQuaternionMultiply(ptr ptr ptr) @ stdcall D3DXQuaternionNormalize(ptr ptr) diff --git a/dlls/d3dx8/math.c b/dlls/d3dx8/math.c index 52e580d..adc100d 100644 --- a/dlls/d3dx8/math.c +++ b/dlls/d3dx8/math.c @@ -643,6 +643,18 @@ D3DXQUATERNION* WINAPI D3DXQuaternionNormalize(D3DXQUATERNION *pout, CONST D3DXQ return pout; } +D3DXQUATERNION* WINAPI D3DXQuaternionRotationAxis(D3DXQUATERNION *pout, CONST D3DXVECTOR3 *pv, FLOAT angle) +{ + D3DXVECTOR3 temp; + + D3DXVec3Normalize(&temp, pv); + pout->x = sin( angle / 2.0f ) * temp.x; + pout->y = sin( angle / 2.0f ) * temp.y; + pout->z = sin( angle / 2.0f ) * temp.z; + pout->w = cos( angle / 2.0f ); + return pout; +} + D3DXQUATERNION* WINAPI D3DXQuaternionSlerp(D3DXQUATERNION *pout, CONST D3DXQUATERNION *pq1, CONST D3DXQUATERNION *pq2, FLOAT t) { FLOAT dot, epsilon; diff --git a/dlls/d3dx8/tests/math.c b/dlls/d3dx8/tests/math.c index e3c6a28..589bb2a 100644 --- a/dlls/d3dx8/tests/math.c +++ b/dlls/d3dx8/tests/math.c @@ -656,6 +656,18 @@ static void D3X8QuaternionTest(void) D3DXQuaternionNormalize(&gotquat,&nul); expect_vec4(expectedquat,gotquat); +/*_______________D3DXQuaternionRotationAxis___________________*/ + axis.x = 2.0f; axis.y = 7.0; axis.z = 13.0f; + angle = D3DX_PI/3.0f; + expectedquat.x = 0.067116; expectedquat.y = 0.234905f; expectedquat.z = 0.436251f; expectedquat.w = 0.866025f; + D3DXQuaternionRotationAxis(&gotquat,&axis,angle); + expect_vec4(expectedquat,gotquat); + /* Test the nul quaternion */ + axis.x = 0.0f; axis.y = 0.0; axis.z = 0.0f; + expectedquat.x = 0.0f; expectedquat.y = 0.0f; expectedquat.z = 0.0f; expectedquat.w = 0.866025f; + D3DXQuaternionRotationAxis(&gotquat,&axis,angle); + 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); diff --git a/include/d3dx8math.h b/include/d3dx8math.h index dd85e3a..c5f18a2 100644 --- a/include/d3dx8math.h +++ b/include/d3dx8math.h @@ -306,6 +306,7 @@ D3DXQUATERNION* WINAPI D3DXQuaternionBaryCentric(D3DXQUATERNION *pout, CONST D3D 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 D3DXQuaternionRotationAxis(D3DXQUATERNION *pout, CONST D3DXVECTOR3 *pv, FLOAT angle); 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); void WINAPI D3DXQuaternionToAxisAngle(CONST D3DXQUATERNION *pq, D3DXVECTOR3 *paxis, FLOAT *pangle);

1 0

David Adam : d3dx8: Implement D3DXQuaternionRotationMatrix.
by Alexandre Julliard Nov. 26, 2007

Nov. 26, 2007

Module: wine Branch: master Commit: eee8dd17d8cbe1efe28d10128d3fbee68de769e6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eee8dd17d8cbe1efe28d10128… Author: David Adam <David.Adam(a)math.cnrs.fr> Date: Tue Nov 20 14:56:15 2007 +0100 d3dx8: Implement D3DXQuaternionRotationMatrix. --- dlls/d3dx8/d3dx8.spec | 2 +- dlls/d3dx8/math.c | 51 +++++++++++++++++++++++++++++++++++++++++++++++ dlls/d3dx8/tests/math.c | 33 ++++++++++++++++++++++++++++++ include/d3dx8math.h | 1 + 4 files changed, 86 insertions(+), 1 deletions(-) diff --git a/dlls/d3dx8/d3dx8.spec b/dlls/d3dx8/d3dx8.spec index d3b0ffa..4e7996a 100644 --- a/dlls/d3dx8/d3dx8.spec +++ b/dlls/d3dx8/d3dx8.spec @@ -50,7 +50,7 @@ @ stdcall D3DXMatrixShadow(ptr ptr ptr) @ stdcall D3DXMatrixReflect(ptr ptr) @ stdcall D3DXQuaternionToAxisAngle(ptr ptr ptr) -@ stub D3DXQuaternionRotationMatrix +@ stdcall D3DXQuaternionRotationMatrix(ptr ptr) @ stdcall D3DXQuaternionRotationAxis(ptr ptr long) @ stub D3DXQuaternionRotationYawPitchRoll @ stdcall D3DXQuaternionMultiply(ptr ptr ptr) diff --git a/dlls/d3dx8/math.c b/dlls/d3dx8/math.c index adc100d..f1cbf22 100644 --- a/dlls/d3dx8/math.c +++ b/dlls/d3dx8/math.c @@ -655,6 +655,57 @@ D3DXQUATERNION* WINAPI D3DXQuaternionRotationAxis(D3DXQUATERNION *pout, CONST D3 return pout; } +D3DXQUATERNION* WINAPI D3DXQuaternionRotationMatrix(D3DXQUATERNION *pout, CONST D3DXMATRIX *pm) +{ + int i, maxi; + FLOAT maxdiag, S, trace; + + trace = pm->u.m[0][0] + pm->u.m[1][1] + pm->u.m[2][2] + 1.0f; + if ( trace > 0.0f) + { + pout->x = ( pm->u.m[1][2] - pm->u.m[2][1] ) / ( 2.0f * sqrt(trace) ); + pout->y = ( pm->u.m[2][0] - pm->u.m[0][2] ) / ( 2.0f * sqrt(trace) ); + pout->z = ( pm->u.m[0][1] - pm->u.m[1][0] ) / ( 2.0f * sqrt(trace) ); + pout->w = sqrt(trace) / 2.0f; + return pout; + } + maxi = 0; + maxdiag = pm->u.m[0][0]; + for (i=1; i<3; i++) + { + if ( pm->u.m[i][i] > maxdiag ) + { + maxi = i; + maxdiag = pm->u.m[i][i]; + } + } + switch( maxi ) + { + case 0: + S = 2.0f * sqrt(1.0f + pm->u.m[0][0] - pm->u.m[1][1] - pm->u.m[2][2]); + pout->x = 0.25f * S; + pout->y = ( pm->u.m[0][1] + pm->u.m[1][0] ) / S; + pout->z = ( pm->u.m[0][2] + pm->u.m[2][0] ) / S; + pout->w = ( pm->u.m[1][2] - pm->u.m[2][1] ) / S; + break; + case 1: + S = 2.0f * sqrt(1.0f + pm->u.m[1][1] - pm->u.m[0][0] - pm->u.m[2][2]); + pout->x = ( pm->u.m[0][1] + pm->u.m[1][0] ) / S; + pout->y = 0.25f * S; + pout->z = ( pm->u.m[1][2] + pm->u.m[2][1] ) / S; + pout->w = ( pm->u.m[2][0] - pm->u.m[0][2] ) / S; + break; + case 2: + S = 2.0f * sqrt(1.0f + pm->u.m[2][2] - pm->u.m[0][0] - pm->u.m[1][1]); + pout->x = ( pm->u.m[0][2] + pm->u.m[2][0] ) / S; + pout->y = ( pm->u.m[1][2] + pm->u.m[2][1] ) / S; + pout->z = 0.25f * S; + pout->w = ( pm->u.m[0][1] - pm->u.m[1][0] ) / S; + break; + } + return pout; +} + D3DXQUATERNION* WINAPI D3DXQuaternionSlerp(D3DXQUATERNION *pout, CONST D3DXQUATERNION *pq1, CONST D3DXQUATERNION *pq2, FLOAT t) { FLOAT dot, epsilon; diff --git a/dlls/d3dx8/tests/math.c b/dlls/d3dx8/tests/math.c index 589bb2a..6a63fd8 100644 --- a/dlls/d3dx8/tests/math.c +++ b/dlls/d3dx8/tests/math.c @@ -552,6 +552,7 @@ static void D3DXPlaneTest(void) static void D3X8QuaternionTest(void) { + D3DXMATRIX mat; D3DXQUATERNION expectedquat, gotquat, Nq, nul, q, r, s, t, u; LPD3DXQUATERNION funcpointer; D3DXVECTOR3 axis, expectedvec; @@ -668,6 +669,38 @@ static void D3X8QuaternionTest(void) D3DXQuaternionRotationAxis(&gotquat,&axis,angle); expect_vec4(expectedquat,gotquat); +/*_______________D3DXQuaternionRotationMatrix___________________*/ + /* test when the trace is >0 */ + U(mat).m[0][1] = 5.0f; U(mat).m[0][2] = 7.0f; U(mat).m[0][3] = 8.0f; + U(mat).m[1][0] = 11.0f; U(mat).m[1][2] = 16.0f; U(mat).m[1][3] = 33.0f; + U(mat).m[2][0] = 19.0f; U(mat).m[2][1] = -21.0f; U(mat).m[2][3] = 43.0f; + U(mat).m[3][0] = 2.0f; U(mat).m[3][1] = 3.0f; U(mat).m[3][2] = -4.0f; + U(mat).m[0][0] = 10.0f; U(mat).m[1][1] = 20.0f; U(mat).m[2][2] = 30.0f; + U(mat).m[3][3] = 48.0f; + expectedquat.x = 2.368682f; expectedquat.y = 0.768221f; expectedquat.z = -0.384111f; expectedquat.w = 3.905125f; + D3DXQuaternionRotationMatrix(&gotquat,&mat); + expect_vec4(expectedquat,gotquat); + /* test the case when the greater element is (2,2) */ + U(mat).m[0][1] = 5.0f; U(mat).m[0][2] = 7.0f; U(mat).m[0][3] = 8.0f; + U(mat).m[1][0] = 11.0f; U(mat).m[1][2] = 16.0f; U(mat).m[1][3] = 33.0f; + U(mat).m[2][0] = 19.0f; U(mat).m[2][1] = -21.0f; U(mat).m[2][3] = 43.0f; + U(mat).m[3][0] = 2.0f; U(mat).m[3][1] = 3.0f; U(mat).m[3][2] = -4.0f; + U(mat).m[0][0] = -10.0f; U(mat).m[1][1] = -60.0f; U(mat).m[2][2] = 40.0f; + U(mat).m[3][3] = 48.0f; + expectedquat.x = 1.233905f; expectedquat.y = -0.237290f; expectedquat.z = 5.267827f; expectedquat.w = -0.284747f; + D3DXQuaternionRotationMatrix(&gotquat,&mat); + expect_vec4(expectedquat,gotquat); + /* test the case when the greater element is (1,1) */ + U(mat).m[0][1] = 5.0f; U(mat).m[0][2] = 7.0f; U(mat).m[0][3] = 8.0f; + U(mat).m[1][0] = 11.0f; U(mat).m[1][2] = 16.0f; U(mat).m[1][3] = 33.0f; + U(mat).m[2][0] = 19.0f; U(mat).m[2][1] = -21.0f; U(mat).m[2][3] = 43.0f; + U(mat).m[3][0] = 2.0f; U(mat).m[3][1] = 3.0f; U(mat).m[3][2] = -4.0f; + U(mat).m[0][0] = -10.0f; U(mat).m[1][1] = 60.0f; U(mat).m[2][2] = -80.0f; + U(mat).m[3][3] = 48.0f; + expectedquat.x = 0.651031f; expectedquat.y = 6.144103f; expectedquat.z = -0.203447f; expectedquat.w = 0.488273f; + D3DXQuaternionRotationMatrix(&gotquat,&mat); + 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); diff --git a/include/d3dx8math.h b/include/d3dx8math.h index c5f18a2..f9bc777 100644 --- a/include/d3dx8math.h +++ b/include/d3dx8math.h @@ -307,6 +307,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 D3DXQuaternionRotationAxis(D3DXQUATERNION *pout, CONST D3DXVECTOR3 *pv, FLOAT angle); +D3DXQUATERNION* WINAPI D3DXQuaternionRotationMatrix(D3DXQUATERNION *pout, CONST D3DXMATRIX *pm); 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); void WINAPI D3DXQuaternionToAxisAngle(CONST D3DXQUATERNION *pq, D3DXVECTOR3 *paxis, FLOAT *pangle);

1 0

David Adam : d3dx8: Implement D3DXQuaternionToAxisAngle.
by Alexandre Julliard Nov. 26, 2007

Nov. 26, 2007

Module: wine Branch: master Commit: 7a4490c06248e03817faf85a49e48c04350bc4c7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7a4490c06248e03817faf85a4… Author: David Adam <David.Adam(a)math.cnrs.fr> Date: Tue Nov 20 12:49:38 2007 +0100 d3dx8: Implement D3DXQuaternionToAxisAngle. --- dlls/d3dx8/d3dx8.spec | 2 +- dlls/d3dx8/math.c | 21 +++++++++++++++++++++ dlls/d3dx8/tests/math.c | 25 +++++++++++++++++++++++-- include/d3dx8math.h | 1 + 4 files changed, 46 insertions(+), 3 deletions(-) diff --git a/dlls/d3dx8/d3dx8.spec b/dlls/d3dx8/d3dx8.spec index af78fb2..1c57f53 100644 --- a/dlls/d3dx8/d3dx8.spec +++ b/dlls/d3dx8/d3dx8.spec @@ -49,7 +49,7 @@ @ stdcall D3DXMatrixOrthoOffCenterLH(ptr long long long long long long) @ stdcall D3DXMatrixShadow(ptr ptr ptr) @ stdcall D3DXMatrixReflect(ptr ptr) -@ stub D3DXQuaternionToAxisAngle +@ stdcall D3DXQuaternionToAxisAngle(ptr ptr ptr) @ stub D3DXQuaternionRotationMatrix @ stub D3DXQuaternionRotationAxis @ stub D3DXQuaternionRotationYawPitchRoll diff --git a/dlls/d3dx8/math.c b/dlls/d3dx8/math.c index e907be1..52e580d 100644 --- a/dlls/d3dx8/math.c +++ b/dlls/d3dx8/math.c @@ -665,6 +665,27 @@ D3DXQUATERNION* WINAPI D3DXQuaternionSquad(D3DXQUATERNION *pout, CONST D3DXQUATE return pout; } +void WINAPI D3DXQuaternionToAxisAngle(CONST D3DXQUATERNION *pq, D3DXVECTOR3 *paxis, FLOAT *pangle) +{ + FLOAT norm; + + *pangle = 0.0f; + norm = D3DXQuaternionLength(pq); + if ( norm ) + { + paxis->x = pq->x / norm; + paxis->y = pq->y / norm; + paxis->z = pq->z / norm; + if ( fabs( pq->w ) <= 1.0f ) *pangle = 2.0f * acos(pq->w); + } + else + { + paxis->x = 1.0f; + paxis->y = 0.0f; + paxis->z = 0.0f; + } +} + /*_________________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 229d0b7..e3c6a28 100644 --- a/dlls/d3dx8/tests/math.c +++ b/dlls/d3dx8/tests/math.c @@ -552,9 +552,10 @@ static void D3DXPlaneTest(void) static void D3X8QuaternionTest(void) { - D3DXQUATERNION expectedquat, gotquat, nul, q, r, s, t, u; + D3DXQUATERNION expectedquat, gotquat, Nq, nul, q, r, s, t, u; LPD3DXQUATERNION funcpointer; - FLOAT expected, got, scale, scale2; + D3DXVECTOR3 axis, expectedvec; + FLOAT angle, expected, got, scale, scale2; BOOL expectedbool, gotbool; nul.x = 0.0f; nul.y = 0.0f; nul.z = 0.0f; nul.w = 0.0f; @@ -667,6 +668,26 @@ static void D3X8QuaternionTest(void) 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); + +/*_______________D3DXQuaternionToAxisAngle__________________*/ + Nq.x = 1.0f/22.0f; Nq.y = 2.0f/22.0f; Nq.z = 4.0f/22.0f; Nq.w = 10.0f/22.0f; + expectedvec.x = 1.0f/11.0f; expectedvec.y = 2.0f/11.0f; expectedvec.z = 4.0f/11.0f; + expected = 2.197869f; + D3DXQuaternionToAxisAngle(&Nq,&axis,&angle); + expect_vec3(expectedvec,axis); + ok(fabs( angle - expected ) < admitted_error, "Expected: %f, Got: %f\n", expected, angle); + /* Test if |w|>1.0f */ + expectedvec.x = 1.0f/11.0f; expectedvec.y = 2.0f/11.0f; expectedvec.z = 4.0f/11.0f; + expected = 0.0f; + D3DXQuaternionToAxisAngle(&q,&axis,&angle); + expect_vec3(expectedvec,axis); + ok(fabs( angle - expected ) < admitted_error, "Expected: %f, Got: %f\n", expected, angle); + /* Test the null quaternion */ + expectedvec.x = 1.0f; expectedvec.y = 0.0f; expectedvec.z = 0.0f; + expected = 0.0f; + D3DXQuaternionToAxisAngle(&nul,&axis,&angle); + expect_vec3(expectedvec,axis); + ok(fabs( angle - expected ) < admitted_error, "Expected: %f, Got: %f\n", expected, angle); } static void D3X8Vector2Test(void) diff --git a/include/d3dx8math.h b/include/d3dx8math.h index 3e5581e..dd85e3a 100644 --- a/include/d3dx8math.h +++ b/include/d3dx8math.h @@ -308,6 +308,7 @@ D3DXQUATERNION* WINAPI D3DXQuaternionMultiply(D3DXQUATERNION *pout, CONST D3DXQU 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); +void WINAPI D3DXQuaternionToAxisAngle(CONST D3DXQUATERNION *pq, D3DXVECTOR3 *paxis, FLOAT *pangle); 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