October 2007 - Wine-Commits

David Adam : d3dx8: Implement D3DXQuaternionConjugate.
by Alexandre Julliard Oct. 22, 2007

Oct. 22, 2007

Module: wine Branch: master Commit: 77f5d4c88c02287f852c961962e3e9c12570c91d URL: http://source.winehq.org/git/wine.git/?a=commit;h=77f5d4c88c02287f852c96196… Author: David Adam <David.Adam(a)math.cnrs.fr> Date: Thu Oct 18 20:28:36 2007 +0200 d3dx8: Implement D3DXQuaternionConjugate. --- dlls/d3dx8/tests/math.c | 14 +++++++++++++- include/d3dx8math.inl | 10 ++++++++++ 2 files changed, 23 insertions(+), 1 deletions(-) diff --git a/dlls/d3dx8/tests/math.c b/dlls/d3dx8/tests/math.c index b7302b1..8c5baa3 100644 --- a/dlls/d3dx8/tests/math.c +++ b/dlls/d3dx8/tests/math.c @@ -32,12 +32,24 @@ static void D3X8QuaternionTest(void) { - D3DXQUATERNION q, r; + D3DXQUATERNION expectedquat, gotquat, q, r; + LPD3DXQUATERNION funcpointer; FLOAT expected, got; 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; +/*_______________D3DXQuaternionConjugate________________*/ + expectedquat.x = -1.0f; expectedquat.y = -2.0f; expectedquat.z = -4.0f; expectedquat.w = 10.0f; + D3DXQuaternionConjugate(&gotquat,&q); + expect_vec4(expectedquat,gotquat); + /* Test the NULL case */ + funcpointer = D3DXQuaternionConjugate(&gotquat,NULL); + ok(funcpointer == NULL, "Expected: %p, Got: %p\n", NULL, funcpointer); + funcpointer = D3DXQuaternionConjugate(NULL,NULL); + ok(funcpointer == NULL, "Expected: %p, Got: %p\n", NULL, funcpointer); + + /*_______________D3DXQuaternionDot______________________*/ expected = 55.0f; got = D3DXQuaternionDot(&q,&r); diff --git a/include/d3dx8math.inl b/include/d3dx8math.inl index 87e1289..a2fd8bf 100644 --- a/include/d3dx8math.inl +++ b/include/d3dx8math.inl @@ -258,6 +258,16 @@ static inline D3DXVECTOR4* D3DXVec4Subtract(D3DXVECTOR4 *pout, CONST D3DXVECTOR4 /*__________________D3DXQUATERNION____________________*/ +static inline D3DXQUATERNION* D3DXQuaternionConjugate(D3DXQUATERNION *pout, CONST D3DXQUATERNION *pq) +{ + if ( !pout || !pq) return NULL; + pout->x = -pq->x; + pout->y = -pq->y; + pout->z = -pq->z; + pout->w = pq->w; + return pout; +} + static inline FLOAT D3DXQuaternionDot(CONST D3DXQUATERNION *pq1, CONST D3DXQUATERNION *pq2) { if ( !pq1 || !pq2 ) return 0.0f;

1 0

David Adam : d3dx8: Implement D3DXVec3Cross.
by Alexandre Julliard Oct. 22, 2007

Oct. 22, 2007

Module: wine Branch: master Commit: a394fef4b75f6a1024644d1ac8d4302811e16722 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a394fef4b75f6a1024644d1ac… Author: David Adam <David.Adam(a)math.cnrs.fr> Date: Thu Oct 18 20:12:29 2007 +0200 d3dx8: Implement D3DXVec3Cross. --- dlls/d3dx8/tests/math.c | 9 +++++++++ include/d3dx8math.inl | 9 +++++++++ 2 files changed, 18 insertions(+), 0 deletions(-) diff --git a/dlls/d3dx8/tests/math.c b/dlls/d3dx8/tests/math.c index 9197ba1..b7302b1 100644 --- a/dlls/d3dx8/tests/math.c +++ b/dlls/d3dx8/tests/math.c @@ -203,6 +203,15 @@ static void D3X8Vector3Test(void) funcpointer = D3DXVec3Add(NULL,NULL,NULL); ok(funcpointer == NULL, "Expected: %p, Got: %p\n", NULL, funcpointer); +/*_______________D3DXVec3Cross________________________*/ + expectedvec.x = -18.0f; expectedvec.y = 40.0f; expectedvec.z = -30.0f; + D3DXVec3Cross(&gotvec,&u,&v); + /* Tests the case NULL */ + funcpointer = D3DXVec3Cross(&gotvec,NULL,&v); + ok(funcpointer == NULL, "Expected: %p, Got: %p\n", NULL, funcpointer); + funcpointer = D3DXVec3Cross(NULL,NULL,NULL); + ok(funcpointer == NULL, "Expected: %p, Got: %p\n", NULL, funcpointer); + /*_______________D3DXVec3Dot__________________________*/ expected = -8.0f; got = D3DXVec3Dot(&u,&v); diff --git a/include/d3dx8math.inl b/include/d3dx8math.inl index b9cf875..87e1289 100644 --- a/include/d3dx8math.inl +++ b/include/d3dx8math.inl @@ -104,6 +104,15 @@ static inline D3DXVECTOR3* D3DXVec3Add(D3DXVECTOR3 *pout, CONST D3DXVECTOR3 *pv1 return pout; } +static inline D3DXVECTOR3* D3DXVec3Cross(D3DXVECTOR3 *pout, CONST D3DXVECTOR3 *pv1, CONST D3DXVECTOR3 *pv2) +{ + if ( !pout || !pv1 || !pv2) return NULL; + pout->x = (pv1->y) * (pv2->z) - (pv1->z) * (pv2->y); + pout->y = (pv1->z) * (pv2->x) - (pv1->x) * (pv2->z); + pout->z = (pv1->x) * (pv2->y) - (pv1->y) * (pv2->x); + return pout; +} + static inline FLOAT D3DXVec3Dot(CONST D3DXVECTOR3 *pv1, CONST D3DXVECTOR3 *pv2) { if ( !pv1 || !pv2 ) return 0.0f;

1 0

David Adam : d3dx8: Implement D3DX*Scale.
by Alexandre Julliard Oct. 22, 2007

Oct. 22, 2007

Module: wine Branch: master Commit: 96576118788f0f32d7cb3cf2b48b4fa295ef0691 URL: http://source.winehq.org/git/wine.git/?a=commit;h=96576118788f0f32d7cb3cf2b… Author: David Adam <David.Adam(a)math.cnrs.fr> Date: Thu Oct 18 19:53:30 2007 +0200 d3dx8: Implement D3DX*Scale. --- dlls/d3dx8/tests/math.c | 20 ++++++++++++++++++++ include/d3dx8math.inl | 19 +++++++++++++++++++ 2 files changed, 39 insertions(+), 0 deletions(-) diff --git a/dlls/d3dx8/tests/math.c b/dlls/d3dx8/tests/math.c index dd7e26b..9197ba1 100644 --- a/dlls/d3dx8/tests/math.c +++ b/dlls/d3dx8/tests/math.c @@ -263,6 +263,16 @@ static void D3X8Vector3Test(void) funcpointer = D3DXVec3Minimize(NULL,NULL,NULL); ok(funcpointer == NULL, "Expected: %p, Got: %p\n", NULL, funcpointer); +/*_______________D3DXVec3Scale____________________________*/ + expectedvec.x = -58.5f; expectedvec.y = -39.0f; expectedvec.z = -13.0f; + D3DXVec3Scale(&gotvec,&u,scale); + expect_vec3(expectedvec,gotvec); + /* Tests the case NULL */ + funcpointer = D3DXVec3Scale(&gotvec,NULL,scale); + ok(funcpointer == NULL, "Expected: %p, Got: %p\n", NULL, funcpointer); + funcpointer = D3DXVec3Scale(NULL,NULL,scale); + ok(funcpointer == NULL, "Expected: %p, Got: %p\n", NULL, funcpointer); + /*_______________D3DXVec3Subtract_______________________*/ expectedvec.x = 7.0f; expectedvec.y = 9.0f; expectedvec.z = 6.0f; D3DXVec3Subtract(&gotvec,&u,&v); @@ -355,6 +365,16 @@ static void D3X8Vector4Test(void) funcpointer = D3DXVec4Minimize(NULL,NULL,NULL); ok(funcpointer == NULL, "Expected: %p, Got: %p\n", NULL, funcpointer); +/*_______________D3DXVec4Scale____________________________*/ + expectedvec.x = -6.5f; expectedvec.y = -13.0f; expectedvec.z = -26.0f; expectedvec.w = -65.0f; + D3DXVec4Scale(&gotvec,&u,scale); + expect_vec4(expectedvec,gotvec); + /* Tests the case NULL */ + funcpointer = D3DXVec4Scale(&gotvec,NULL,scale); + ok(funcpointer == NULL, "Expected: %p, Got: %p\n", NULL, funcpointer); + funcpointer = D3DXVec4Scale(NULL,NULL,scale); + ok(funcpointer == NULL, "Expected: %p, Got: %p\n", NULL, funcpointer); + /*_______________D3DXVec4Subtract__________________________*/ expectedvec.x = 4.0f; expectedvec.y = -2.0f; expectedvec.z = 9.0f; expectedvec.w = 3.0f; D3DXVec4Subtract(&gotvec,&u,&v); diff --git a/include/d3dx8math.inl b/include/d3dx8math.inl index ee628d3..b9cf875 100644 --- a/include/d3dx8math.inl +++ b/include/d3dx8math.inl @@ -149,6 +149,15 @@ static inline D3DXVECTOR3* D3DXVec3Minimize(D3DXVECTOR3 *pout, CONST D3DXVECTOR3 return pout; } +static inline D3DXVECTOR3* D3DXVec3Scale(D3DXVECTOR3 *pout, CONST D3DXVECTOR3 *pv, FLOAT s) +{ + if ( !pout || !pv) return NULL; + pout->x = s * (pv->x); + pout->y = s * (pv->y); + pout->z = s * (pv->z); + return pout; +} + static inline D3DXVECTOR3* D3DXVec3Subtract(D3DXVECTOR3 *pout, CONST D3DXVECTOR3 *pv1, CONST D3DXVECTOR3 *pv2) { if ( !pout || !pv1 || !pv2) return NULL; @@ -218,6 +227,16 @@ static inline D3DXVECTOR4* D3DXVec4Minimize(D3DXVECTOR4 *pout, CONST D3DXVECTOR4 return pout; } +static inline D3DXVECTOR4* D3DXVec4Scale(D3DXVECTOR4 *pout, CONST D3DXVECTOR4 *pv, FLOAT s) +{ + if ( !pout || !pv) return NULL; + pout->x = s * (pv->x); + pout->y = s * (pv->y); + pout->z = s * (pv->z); + pout->w = s * (pv->w); + return pout; +} + static inline D3DXVECTOR4* D3DXVec4Subtract(D3DXVECTOR4 *pout, CONST D3DXVECTOR4 *pv1, CONST D3DXVECTOR4 *pv2) { if ( !pout || !pv1 || !pv2) return NULL;

1 0

David Adam : d3dx8: Implement D3DX*Maximize.
by Alexandre Julliard Oct. 22, 2007

Oct. 22, 2007

Module: wine Branch: master Commit: c7f0eca4e3b9985fd66ac53c418861a621080688 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c7f0eca4e3b9985fd66ac53c4… Author: David Adam <David.Adam(a)math.cnrs.fr> Date: Thu Oct 18 19:29:21 2007 +0200 d3dx8: Implement D3DX*Maximize. --- dlls/d3dx8/tests/math.c | 20 ++++++++++++++++++++ include/d3dx8math.inl | 20 ++++++++++++++++++++ 2 files changed, 40 insertions(+), 0 deletions(-) diff --git a/dlls/d3dx8/tests/math.c b/dlls/d3dx8/tests/math.c index 7d1a84e..1490a66 100644 --- a/dlls/d3dx8/tests/math.c +++ b/dlls/d3dx8/tests/math.c @@ -243,6 +243,16 @@ static void D3X8Vector3Test(void) funcpointer = D3DXVec3Lerp(NULL,NULL,NULL,scale); ok(funcpointer == NULL, "Expected: %p, Got: %p\n", NULL, funcpointer); +/*_______________D3DXVec3Maximize__________________________*/ + expectedvec.x = 9.0f; expectedvec.y = 6.0f; expectedvec.z = 2.0f; + D3DXVec3Maximize(&gotvec,&u,&v); + expect_vec3(expectedvec,gotvec); + /* Tests the case NULL */ + funcpointer = D3DXVec3Maximize(&gotvec,NULL,&v); + ok(funcpointer == NULL, "Expected: %p, Got: %p\n", NULL, funcpointer); + funcpointer = D3DXVec3Maximize(NULL,NULL,NULL); + ok(funcpointer == NULL, "Expected: %p, Got: %p\n", NULL, funcpointer); + /*_______________D3DXVec3Subtract_______________________*/ expectedvec.x = 7.0f; expectedvec.y = 9.0f; expectedvec.z = 6.0f; D3DXVec3Subtract(&gotvec,&u,&v); @@ -315,6 +325,16 @@ static void D3X8Vector4Test(void) funcpointer = D3DXVec4Lerp(NULL,NULL,NULL,scale); ok(funcpointer == NULL, "Expected: %p, Got: %p\n", NULL, funcpointer); +/*_______________D3DXVec4Maximize__________________________*/ + expectedvec.x = 1.0f; expectedvec.y = 4.0f; expectedvec.z = 4.0f; expectedvec.w = 10.0; + D3DXVec4Maximize(&gotvec,&u,&v); + expect_vec4(expectedvec,gotvec); + /* Tests the case NULL */ + funcpointer = D3DXVec4Maximize(&gotvec,NULL,&v); + ok(funcpointer == NULL, "Expected: %p, Got: %p\n", NULL, funcpointer); + funcpointer = D3DXVec4Maximize(NULL,NULL,NULL); + ok(funcpointer == NULL, "Expected: %p, Got: %p\n", NULL, funcpointer); + /*_______________D3DXVec4Subtract__________________________*/ expectedvec.x = 4.0f; expectedvec.y = -2.0f; expectedvec.z = 9.0f; expectedvec.w = 3.0f; D3DXVec4Subtract(&gotvec,&u,&v); diff --git a/include/d3dx8math.inl b/include/d3dx8math.inl index ab1b9be..1da846d 100644 --- a/include/d3dx8math.inl +++ b/include/d3dx8math.inl @@ -131,6 +131,15 @@ static inline D3DXVECTOR3* D3DXVec3Lerp(D3DXVECTOR3 *pout, CONST D3DXVECTOR3 *pv return pout; } +static inline D3DXVECTOR3* D3DXVec3Maximize(D3DXVECTOR3 *pout, CONST D3DXVECTOR3 *pv1, CONST D3DXVECTOR3 *pv2) +{ + if ( !pout || !pv1 || !pv2) return NULL; + pout->x = max(pv1->x , pv2->x); + pout->y = max(pv1->y , pv2->y); + pout->z = max(pv1->z , pv2->z); + return pout; +} + static inline D3DXVECTOR3* D3DXVec3Subtract(D3DXVECTOR3 *pout, CONST D3DXVECTOR3 *pv1, CONST D3DXVECTOR3 *pv2) { if ( !pout || !pv1 || !pv2) return NULL; @@ -179,6 +188,17 @@ static inline D3DXVECTOR4* D3DXVec4Lerp(D3DXVECTOR4 *pout, CONST D3DXVECTOR4 *pv return pout; } + +static inline D3DXVECTOR4* D3DXVec4Maximize(D3DXVECTOR4 *pout, CONST D3DXVECTOR4 *pv1, CONST D3DXVECTOR4 *pv2) +{ + if ( !pout || !pv1 || !pv2) return NULL; + pout->x = max(pv1->x , pv2->x); + pout->y = max(pv1->y , pv2->y); + pout->z = max(pv1->z , pv2->z); + pout->w = max(pv1->w , pv2->w); + return pout; +} + static inline D3DXVECTOR4* D3DXVec4Subtract(D3DXVECTOR4 *pout, CONST D3DXVECTOR4 *pv1, CONST D3DXVECTOR4 *pv2) { if ( !pout || !pv1 || !pv2) return NULL;

1 0

David Adam : d3dx8: Implement D3DX*Lerp.
by Alexandre Julliard Oct. 22, 2007

Oct. 22, 2007

Module: wine Branch: master Commit: ab4e829757b3b6c9dee4be10afb5d9a3c406b66c URL: http://source.winehq.org/git/wine.git/?a=commit;h=ab4e829757b3b6c9dee4be10a… Author: David Adam <David.Adam(a)math.cnrs.fr> Date: Thu Oct 18 19:01:57 2007 +0200 d3dx8: Implement D3DX*Lerp. --- dlls/d3dx8/tests/math.c | 30 ++++++++++++++++++++++++++---- include/d3dx8math.inl | 20 ++++++++++++++++++++ 2 files changed, 46 insertions(+), 4 deletions(-) diff --git a/dlls/d3dx8/tests/math.c b/dlls/d3dx8/tests/math.c index dcee021..7d1a84e 100644 --- a/dlls/d3dx8/tests/math.c +++ b/dlls/d3dx8/tests/math.c @@ -187,10 +187,11 @@ static void D3X8Vector3Test(void) { D3DXVECTOR3 expectedvec, gotvec, u, v; LPD3DXVECTOR3 funcpointer; - FLOAT expected, got; + FLOAT expected, got, scale; u.x = 9.0f; u.y = 6.0f; u.z = 2.0f; v.x = 2.0f; v.y = -3.0f; v.z = -4.0; + scale = -6.5f; /*_______________D3DXVec3Add__________________________*/ expectedvec.x = 11.0f; expectedvec.y = 3.0f; expectedvec.z = -2.0f; @@ -232,6 +233,16 @@ static void D3X8Vector3Test(void) got = D3DXVec3LengthSq(NULL); ok(fabs( got - expected ) < admitted_error, "Expected: %f, Got: %f\n", expected, got); +/*_______________D3DXVec3Lerp__________________________*/ + expectedvec.x = 54.5f; expectedvec.y = 64.5f, expectedvec.z = 41.0f ; + D3DXVec3Lerp(&gotvec,&u,&v,scale); + expect_vec3(expectedvec,gotvec); + /* Tests the case NULL */ + funcpointer = D3DXVec3Lerp(&gotvec,NULL,&v,scale); + ok(funcpointer == NULL, "Expected: %p, Got: %p\n", NULL, funcpointer); + funcpointer = D3DXVec3Lerp(NULL,NULL,NULL,scale); + ok(funcpointer == NULL, "Expected: %p, Got: %p\n", NULL, funcpointer); + /*_______________D3DXVec3Subtract_______________________*/ expectedvec.x = 7.0f; expectedvec.y = 9.0f; expectedvec.z = 6.0f; D3DXVec3Subtract(&gotvec,&u,&v); @@ -248,12 +259,13 @@ static void D3X8Vector4Test(void) { D3DXVECTOR4 expectedvec, gotvec, u, v; LPD3DXVECTOR4 funcpointer; - FLOAT expected, got; + FLOAT expected, got, scale; + scale = -6.5f; u.x = 1.0f; u.y = 2.0f; u.z = 4.0f; u.w = 10.0; v.x = -3.0f; v.y = 4.0f; v.z = -5.0f; v.w = 7.0; -/*_______________D3DXVec3Add__________________________*/ +/*_______________D3DXVec4Add__________________________*/ expectedvec.x = -2.0f; expectedvec.y = 6.0f; expectedvec.z = -1.0f; expectedvec.w = 17.0f; D3DXVec4Add(&gotvec,&u,&v); expect_vec4(expectedvec,gotvec); @@ -293,7 +305,17 @@ static void D3X8Vector4Test(void) got = D3DXVec4LengthSq(NULL); ok(fabs( got - expected ) < admitted_error, "Expected: %f, Got: %f\n", expected, got); -/*_______________D3DXVec3Add__________________________*/ +/*_______________D3DXVec4Lerp__________________________*/ + expectedvec.x = 27.0f; expectedvec.y = -11.0f; expectedvec.z = 62.5; expectedvec.w = 29.5; + D3DXVec4Lerp(&gotvec,&u,&v,scale); + expect_vec4(expectedvec,gotvec); + /* Tests the case NULL */ + funcpointer = D3DXVec4Lerp(&gotvec,NULL,&v,scale); + ok(funcpointer == NULL, "Expected: %p, Got: %p\n", NULL, funcpointer); + funcpointer = D3DXVec4Lerp(NULL,NULL,NULL,scale); + ok(funcpointer == NULL, "Expected: %p, Got: %p\n", NULL, funcpointer); + +/*_______________D3DXVec4Subtract__________________________*/ expectedvec.x = 4.0f; expectedvec.y = -2.0f; expectedvec.z = 9.0f; expectedvec.w = 3.0f; D3DXVec4Subtract(&gotvec,&u,&v); expect_vec4(expectedvec,gotvec); diff --git a/include/d3dx8math.inl b/include/d3dx8math.inl index e25c3e6..ab1b9be 100644 --- a/include/d3dx8math.inl +++ b/include/d3dx8math.inl @@ -122,6 +122,15 @@ static inline FLOAT D3DXVec3LengthSq(CONST D3DXVECTOR3 *pv) return (pv->x) * (pv->x) + (pv->y) * (pv->y) + (pv->z) * (pv->z); } +static inline D3DXVECTOR3* D3DXVec3Lerp(D3DXVECTOR3 *pout, CONST D3DXVECTOR3 *pv1, CONST D3DXVECTOR3 *pv2, FLOAT s) +{ + if ( !pout || !pv1 || !pv2) return NULL; + pout->x = (1-s) * (pv1->x) + s * (pv2->x); + pout->y = (1-s) * (pv1->y) + s * (pv2->y); + pout->z = (1-s) * (pv1->z) + s * (pv2->z); + return pout; +} + static inline D3DXVECTOR3* D3DXVec3Subtract(D3DXVECTOR3 *pout, CONST D3DXVECTOR3 *pv1, CONST D3DXVECTOR3 *pv2) { if ( !pout || !pv1 || !pv2) return NULL; @@ -160,6 +169,16 @@ static inline FLOAT D3DXVec4LengthSq(CONST D3DXVECTOR4 *pv) return (pv->x) * (pv->x) + (pv->y) * (pv->y) + (pv->z) * (pv->z) + (pv->w) * (pv->w); } +static inline D3DXVECTOR4* D3DXVec4Lerp(D3DXVECTOR4 *pout, CONST D3DXVECTOR4 *pv1, CONST D3DXVECTOR4 *pv2, FLOAT s) +{ + if ( !pout || !pv1 || !pv2) return NULL; + pout->x = (1-s) * (pv1->x) + s * (pv2->x); + pout->y = (1-s) * (pv1->y) + s * (pv2->y); + pout->z = (1-s) * (pv1->z) + s * (pv2->z); + pout->w = (1-s) * (pv1->w) + s * (pv2->w); + return pout; +} + static inline D3DXVECTOR4* D3DXVec4Subtract(D3DXVECTOR4 *pout, CONST D3DXVECTOR4 *pv1, CONST D3DXVECTOR4 *pv2) { if ( !pout || !pv1 || !pv2) return NULL; @@ -169,6 +188,7 @@ static inline D3DXVECTOR4* D3DXVec4Subtract(D3DXVECTOR4 *pout, CONST D3DXVECTOR4 pout->w = pv1->w - pv2->w; return pout; } + /*__________________D3DXQUATERNION____________________*/ static inline FLOAT D3DXQuaternionDot(CONST D3DXQUATERNION *pq1, CONST D3DXQUATERNION *pq2)

1 0

David Adam : d3dx8: Implement D3DX*Minimize.
by Alexandre Julliard Oct. 22, 2007

Oct. 22, 2007

Module: wine Branch: master Commit: c1892f258ffb012bbdeb4f635427947cebacb5a2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c1892f258ffb012bbdeb4f635… Author: David Adam <David.Adam(a)math.cnrs.fr> Date: Thu Oct 18 19:35:52 2007 +0200 d3dx8: Implement D3DX*Minimize. --- dlls/d3dx8/tests/math.c | 20 ++++++++++++++++++++ include/d3dx8math.inl | 19 +++++++++++++++++++ 2 files changed, 39 insertions(+), 0 deletions(-) diff --git a/dlls/d3dx8/tests/math.c b/dlls/d3dx8/tests/math.c index 1490a66..dd7e26b 100644 --- a/dlls/d3dx8/tests/math.c +++ b/dlls/d3dx8/tests/math.c @@ -253,6 +253,16 @@ static void D3X8Vector3Test(void) funcpointer = D3DXVec3Maximize(NULL,NULL,NULL); ok(funcpointer == NULL, "Expected: %p, Got: %p\n", NULL, funcpointer); +/*_______________D3DXVec3Minimize__________________________*/ + expectedvec.x = 2.0f; expectedvec.y = -3.0f; expectedvec.z = -4.0f; + D3DXVec3Minimize(&gotvec,&u,&v); + expect_vec3(expectedvec,gotvec); + /* Tests the case NULL */ + funcpointer = D3DXVec3Minimize(&gotvec,NULL,&v); + ok(funcpointer == NULL, "Expected: %p, Got: %p\n", NULL, funcpointer); + funcpointer = D3DXVec3Minimize(NULL,NULL,NULL); + ok(funcpointer == NULL, "Expected: %p, Got: %p\n", NULL, funcpointer); + /*_______________D3DXVec3Subtract_______________________*/ expectedvec.x = 7.0f; expectedvec.y = 9.0f; expectedvec.z = 6.0f; D3DXVec3Subtract(&gotvec,&u,&v); @@ -335,6 +345,16 @@ static void D3X8Vector4Test(void) funcpointer = D3DXVec4Maximize(NULL,NULL,NULL); ok(funcpointer == NULL, "Expected: %p, Got: %p\n", NULL, funcpointer); +/*_______________D3DXVec4Minimize__________________________*/ + expectedvec.x = -3.0f; expectedvec.y = 2.0f; expectedvec.z = -5.0f; expectedvec.w = 7.0; + D3DXVec4Minimize(&gotvec,&u,&v); + expect_vec4(expectedvec,gotvec); + /* Tests the case NULL */ + funcpointer = D3DXVec4Minimize(&gotvec,NULL,&v); + ok(funcpointer == NULL, "Expected: %p, Got: %p\n", NULL, funcpointer); + funcpointer = D3DXVec4Minimize(NULL,NULL,NULL); + ok(funcpointer == NULL, "Expected: %p, Got: %p\n", NULL, funcpointer); + /*_______________D3DXVec4Subtract__________________________*/ expectedvec.x = 4.0f; expectedvec.y = -2.0f; expectedvec.z = 9.0f; expectedvec.w = 3.0f; D3DXVec4Subtract(&gotvec,&u,&v); diff --git a/include/d3dx8math.inl b/include/d3dx8math.inl index 1da846d..ee628d3 100644 --- a/include/d3dx8math.inl +++ b/include/d3dx8math.inl @@ -140,6 +140,15 @@ static inline D3DXVECTOR3* D3DXVec3Maximize(D3DXVECTOR3 *pout, CONST D3DXVECTOR3 return pout; } +static inline D3DXVECTOR3* D3DXVec3Minimize(D3DXVECTOR3 *pout, CONST D3DXVECTOR3 *pv1, CONST D3DXVECTOR3 *pv2) +{ + if ( !pout || !pv1 || !pv2) return NULL; + pout->x = min(pv1->x , pv2->x); + pout->y = min(pv1->y , pv2->y); + pout->z = min(pv1->z , pv2->z); + return pout; +} + static inline D3DXVECTOR3* D3DXVec3Subtract(D3DXVECTOR3 *pout, CONST D3DXVECTOR3 *pv1, CONST D3DXVECTOR3 *pv2) { if ( !pout || !pv1 || !pv2) return NULL; @@ -199,6 +208,16 @@ static inline D3DXVECTOR4* D3DXVec4Maximize(D3DXVECTOR4 *pout, CONST D3DXVECTOR4 return pout; } +static inline D3DXVECTOR4* D3DXVec4Minimize(D3DXVECTOR4 *pout, CONST D3DXVECTOR4 *pv1, CONST D3DXVECTOR4 *pv2) +{ + if ( !pout || !pv1 || !pv2) return NULL; + pout->x = min(pv1->x , pv2->x); + pout->y = min(pv1->y , pv2->y); + pout->z = min(pv1->z , pv2->z); + pout->w = min(pv1->w , pv2->w); + return pout; +} + static inline D3DXVECTOR4* D3DXVec4Subtract(D3DXVECTOR4 *pout, CONST D3DXVECTOR4 *pv1, CONST D3DXVECTOR4 *pv2) { if ( !pout || !pv1 || !pv2) return NULL;

1 0

David Adam : d3dx8: Implement D3DX*Subtract.
by Alexandre Julliard Oct. 22, 2007

Oct. 22, 2007

Module: wine Branch: master Commit: 4ef92a23e56cfff7013d7ad1af7927e3cded6574 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4ef92a23e56cfff7013d7ad1a… Author: David Adam <David.Adam(a)math.cnrs.fr> Date: Thu Oct 18 18:38:32 2007 +0200 d3dx8: Implement D3DX*Subtract. --- dlls/d3dx8/tests/math.c | 23 ++++++++++++++++++++++- include/d3dx8math.inl | 17 +++++++++++++++++ 2 files changed, 39 insertions(+), 1 deletions(-) diff --git a/dlls/d3dx8/tests/math.c b/dlls/d3dx8/tests/math.c index 631c8ee..dcee021 100644 --- a/dlls/d3dx8/tests/math.c +++ b/dlls/d3dx8/tests/math.c @@ -231,6 +231,17 @@ static void D3X8Vector3Test(void) expected=0.0f; got = D3DXVec3LengthSq(NULL); ok(fabs( got - expected ) < admitted_error, "Expected: %f, Got: %f\n", expected, got); + +/*_______________D3DXVec3Subtract_______________________*/ + expectedvec.x = 7.0f; expectedvec.y = 9.0f; expectedvec.z = 6.0f; + D3DXVec3Subtract(&gotvec,&u,&v); + expect_vec3(expectedvec,gotvec); + /* Tests the case NULL */ + funcpointer = D3DXVec3Subtract(&gotvec,NULL,&v); + ok(funcpointer == NULL, "Expected: %p, Got: %p\n", NULL, funcpointer); + funcpointer = D3DXVec3Subtract(NULL,NULL,NULL); + ok(funcpointer == NULL, "Expected: %p, Got: %p\n", NULL, funcpointer); + } static void D3X8Vector4Test(void) @@ -243,7 +254,7 @@ static void D3X8Vector4Test(void) v.x = -3.0f; v.y = 4.0f; v.z = -5.0f; v.w = 7.0; /*_______________D3DXVec3Add__________________________*/ - expectedvec.x = -2.0f; expectedvec.y = 6.0f; expectedvec.z = -1.0f; expectedvec.w = 17.0; + expectedvec.x = -2.0f; expectedvec.y = 6.0f; expectedvec.z = -1.0f; expectedvec.w = 17.0f; D3DXVec4Add(&gotvec,&u,&v); expect_vec4(expectedvec,gotvec); /* Tests the case NULL */ @@ -281,6 +292,16 @@ static void D3X8Vector4Test(void) expected=0.0f; got = D3DXVec4LengthSq(NULL); ok(fabs( got - expected ) < admitted_error, "Expected: %f, Got: %f\n", expected, got); + +/*_______________D3DXVec3Add__________________________*/ + expectedvec.x = 4.0f; expectedvec.y = -2.0f; expectedvec.z = 9.0f; expectedvec.w = 3.0f; + D3DXVec4Subtract(&gotvec,&u,&v); + expect_vec4(expectedvec,gotvec); + /* Tests the case NULL */ + funcpointer = D3DXVec4Subtract(&gotvec,NULL,&v); + ok(funcpointer == NULL, "Expected: %p, Got: %p\n", NULL, funcpointer); + funcpointer = D3DXVec4Subtract(NULL,NULL,NULL); + ok(funcpointer == NULL, "Expected: %p, Got: %p\n", NULL, funcpointer); } START_TEST(math) diff --git a/include/d3dx8math.inl b/include/d3dx8math.inl index 5f8544e..e25c3e6 100644 --- a/include/d3dx8math.inl +++ b/include/d3dx8math.inl @@ -122,6 +122,14 @@ static inline FLOAT D3DXVec3LengthSq(CONST D3DXVECTOR3 *pv) return (pv->x) * (pv->x) + (pv->y) * (pv->y) + (pv->z) * (pv->z); } +static inline D3DXVECTOR3* D3DXVec3Subtract(D3DXVECTOR3 *pout, CONST D3DXVECTOR3 *pv1, CONST D3DXVECTOR3 *pv2) +{ + if ( !pout || !pv1 || !pv2) return NULL; + pout->x = pv1->x - pv2->x; + pout->y = pv1->y - pv2->y; + pout->z = pv1->z - pv2->z; + return pout; +} /*__________________D3DXVECTOR4_______________________*/ static inline D3DXVECTOR4* D3DXVec4Add(D3DXVECTOR4 *pout, CONST D3DXVECTOR4 *pv1, CONST D3DXVECTOR4 *pv2) @@ -152,6 +160,15 @@ static inline FLOAT D3DXVec4LengthSq(CONST D3DXVECTOR4 *pv) return (pv->x) * (pv->x) + (pv->y) * (pv->y) + (pv->z) * (pv->z) + (pv->w) * (pv->w); } +static inline D3DXVECTOR4* D3DXVec4Subtract(D3DXVECTOR4 *pout, CONST D3DXVECTOR4 *pv1, CONST D3DXVECTOR4 *pv2) +{ + if ( !pout || !pv1 || !pv2) return NULL; + pout->x = pv1->x - pv2->x; + pout->y = pv1->y - pv2->y; + pout->z = pv1->z - pv2->z; + pout->w = pv1->w - pv2->w; + return pout; +} /*__________________D3DXQUATERNION____________________*/ static inline FLOAT D3DXQuaternionDot(CONST D3DXQUATERNION *pq1, CONST D3DXQUATERNION *pq2)

1 0

David Adam : d3dx8: Implement D3DX*Add with a test.
by Alexandre Julliard Oct. 22, 2007

Oct. 22, 2007

Module: wine Branch: master Commit: e205a210d262d8a4259a854d822492d814f5d10b URL: http://source.winehq.org/git/wine.git/?a=commit;h=e205a210d262d8a4259a854d8… Author: David Adam <David.Adam(a)math.cnrs.fr> Date: Thu Oct 18 18:32:17 2007 +0200 d3dx8: Implement D3DX*Add with a test. --- dlls/d3dx8/tests/math.c | 30 ++++++++++++++++++++++++++++-- include/d3dx8math.inl | 19 +++++++++++++++++++ 2 files changed, 47 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx8/tests/math.c b/dlls/d3dx8/tests/math.c index a222362..631c8ee 100644 --- a/dlls/d3dx8/tests/math.c +++ b/dlls/d3dx8/tests/math.c @@ -26,6 +26,10 @@ #define expect_vec(expectedvec,gotvec) ok((fabs(expectedvec.x-gotvec.x)<admitted_error)&&(fabs(expectedvec.y-gotvec.y)<admitted_error),"Expected Vector= (%f, %f)\n , Got Vector= (%f, %f)\n", expectedvec.x, expectedvec.y, gotvec.x, gotvec.y); +#define expect_vec3(expectedvec,gotvec) ok((fabs(expectedvec.x-gotvec.x)<admitted_error)&&(fabs(expectedvec.y-gotvec.y)<admitted_error)&&(fabs(expectedvec.z-gotvec.z)<admitted_error),"Expected Vector= (%f, %f,%f)\n , Got Vector= (%f, %f, %f)\n", expectedvec.x, expectedvec.y, expectedvec.z, gotvec.x, gotvec.y, gotvec.z); + +#define expect_vec4(expectedvec,gotvec) ok((fabs(expectedvec.x-gotvec.x)<admitted_error)&&(fabs(expectedvec.y-gotvec.y)<admitted_error)&&(fabs(expectedvec.z-gotvec.z)<admitted_error)&&(fabs(expectedvec.w-gotvec.w)<admitted_error),"Expected Vector= (%f, %f, %f, %f)\n , Got Vector= (%f, %f, %f, %f)\n", expectedvec.x, expectedvec.y, expectedvec.z, expectedvec.w, gotvec.x, gotvec.y, gotvec.z, gotvec.w); + static void D3X8QuaternionTest(void) { D3DXQUATERNION q, r; @@ -181,12 +185,23 @@ static void D3X8Vector2Test(void) static void D3X8Vector3Test(void) { - D3DXVECTOR3 u, v; + D3DXVECTOR3 expectedvec, gotvec, u, v; + LPD3DXVECTOR3 funcpointer; FLOAT expected, got; u.x = 9.0f; u.y = 6.0f; u.z = 2.0f; v.x = 2.0f; v.y = -3.0f; v.z = -4.0; +/*_______________D3DXVec3Add__________________________*/ + expectedvec.x = 11.0f; expectedvec.y = 3.0f; expectedvec.z = -2.0f; + D3DXVec3Add(&gotvec,&u,&v); + expect_vec3(expectedvec,gotvec); + /* Tests the case NULL */ + funcpointer = D3DXVec3Add(&gotvec,NULL,&v); + ok(funcpointer == NULL, "Expected: %p, Got: %p\n", NULL, funcpointer); + funcpointer = D3DXVec3Add(NULL,NULL,NULL); + ok(funcpointer == NULL, "Expected: %p, Got: %p\n", NULL, funcpointer); + /*_______________D3DXVec3Dot__________________________*/ expected = -8.0f; got = D3DXVec3Dot(&u,&v); @@ -220,12 +235,23 @@ static void D3X8Vector3Test(void) static void D3X8Vector4Test(void) { - D3DXVECTOR4 u, v; + D3DXVECTOR4 expectedvec, gotvec, u, v; + LPD3DXVECTOR4 funcpointer; FLOAT expected, got; u.x = 1.0f; u.y = 2.0f; u.z = 4.0f; u.w = 10.0; v.x = -3.0f; v.y = 4.0f; v.z = -5.0f; v.w = 7.0; +/*_______________D3DXVec3Add__________________________*/ + expectedvec.x = -2.0f; expectedvec.y = 6.0f; expectedvec.z = -1.0f; expectedvec.w = 17.0; + D3DXVec4Add(&gotvec,&u,&v); + expect_vec4(expectedvec,gotvec); + /* Tests the case NULL */ + funcpointer = D3DXVec4Add(&gotvec,NULL,&v); + ok(funcpointer == NULL, "Expected: %p, Got: %p\n", NULL, funcpointer); + funcpointer = D3DXVec4Add(NULL,NULL,NULL); + ok(funcpointer == NULL, "Expected: %p, Got: %p\n", NULL, funcpointer); + /*_______________D3DXVec4Dot__________________________*/ expected = 55.0f; got = D3DXVec4Dot(&u,&v); diff --git a/include/d3dx8math.inl b/include/d3dx8math.inl index cbe01ec..5f8544e 100644 --- a/include/d3dx8math.inl +++ b/include/d3dx8math.inl @@ -95,6 +95,15 @@ static inline D3DXVECTOR2* D3DXVec2Subtract(D3DXVECTOR2 *pout, CONST D3DXVECTOR2 /*__________________D3DXVECTOR3_______________________*/ +static inline D3DXVECTOR3* D3DXVec3Add(D3DXVECTOR3 *pout, CONST D3DXVECTOR3 *pv1, CONST D3DXVECTOR3 *pv2) +{ + if ( !pout || !pv1 || !pv2) return NULL; + pout->x = pv1->x + pv2->x; + pout->y = pv1->y + pv2->y; + pout->z = pv1->z + pv2->z; + return pout; +} + static inline FLOAT D3DXVec3Dot(CONST D3DXVECTOR3 *pv1, CONST D3DXVECTOR3 *pv2) { if ( !pv1 || !pv2 ) return 0.0f; @@ -115,6 +124,16 @@ static inline FLOAT D3DXVec3LengthSq(CONST D3DXVECTOR3 *pv) /*__________________D3DXVECTOR4_______________________*/ +static inline D3DXVECTOR4* D3DXVec4Add(D3DXVECTOR4 *pout, CONST D3DXVECTOR4 *pv1, CONST D3DXVECTOR4 *pv2) +{ + if ( !pout || !pv1 || !pv2) return NULL; + pout->x = pv1->x + pv2->x; + pout->y = pv1->y + pv2->y; + pout->z = pv1->z + pv2->z; + pout->w = pv1->w + pv2->w; + return pout; +} + static inline FLOAT D3DXVec4Dot(CONST D3DXVECTOR4 *pv1, CONST D3DXVECTOR4 *pv2) { if (!pv1 || !pv2 ) return 0.0f;

1 0

David Adam : d3dx8: Implement D3DX*Dot with a test.
by Alexandre Julliard Oct. 22, 2007

Oct. 22, 2007

Module: wine Branch: master Commit: 643bcd3e46d49ec9bb865dd5c53278790f7fd23d URL: http://source.winehq.org/git/wine.git/?a=commit;h=643bcd3e46d49ec9bb865dd5c… Author: David Adam <David.Adam(a)math.cnrs.fr> Date: Thu Oct 18 18:06:37 2007 +0200 d3dx8: Implement D3DX*Dot with a test. --- dlls/d3dx8/tests/math.c | 45 ++++++++++++++++++++++++++++++++++++++++++--- include/d3dx8math.inl | 22 ++++++++++++++++++++-- 2 files changed, 62 insertions(+), 5 deletions(-) diff --git a/dlls/d3dx8/tests/math.c b/dlls/d3dx8/tests/math.c index a598020..a222362 100644 --- a/dlls/d3dx8/tests/math.c +++ b/dlls/d3dx8/tests/math.c @@ -28,10 +28,23 @@ static void D3X8QuaternionTest(void) { - D3DXQUATERNION q; + D3DXQUATERNION q, r; FLOAT expected, got; 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; + +/*_______________D3DXQuaternionDot______________________*/ + expected = 55.0f; + got = D3DXQuaternionDot(&q,&r); + ok(fabs( got - expected ) < admitted_error, "Expected: %f, Got: %f\n", expected, got); + /* Tests the case NULL */ + expected=0.0f; + got = D3DXQuaternionDot(NULL,&r); + ok(fabs( got - expected ) < admitted_error, "Expected: %f, Got: %f\n", expected, got); + expected=0.0f; + got = D3DXQuaternionDot(NULL,NULL); + ok(fabs( got - expected ) < admitted_error, "Expected: %f, Got: %f\n", expected, got); /*_______________D3DXQuaternionLength__________________________*/ expected = 11.0f; @@ -168,10 +181,23 @@ static void D3X8Vector2Test(void) static void D3X8Vector3Test(void) { - D3DXVECTOR3 u; + D3DXVECTOR3 u, v; FLOAT expected, got; u.x = 9.0f; u.y = 6.0f; u.z = 2.0f; + v.x = 2.0f; v.y = -3.0f; v.z = -4.0; + +/*_______________D3DXVec3Dot__________________________*/ + expected = -8.0f; + got = D3DXVec3Dot(&u,&v); + ok(fabs( got - expected ) < admitted_error, "Expected: %f, Got: %f\n", expected, got); + /* Tests the case NULL */ + expected=0.0f; + got = D3DXVec3Dot(NULL,&v); + ok(fabs( got - expected ) < admitted_error, "Expected: %f, Got: %f\n", expected, got); + expected=0.0f; + got = D3DXVec3Dot(NULL,NULL); + ok(fabs( got - expected ) < admitted_error, "Expected: %f, Got: %f\n", expected, got); /*_______________D3DXVec3Length__________________________*/ expected = 11.0f; @@ -194,10 +220,23 @@ static void D3X8Vector3Test(void) static void D3X8Vector4Test(void) { - D3DXVECTOR4 u; + D3DXVECTOR4 u, v; FLOAT expected, got; u.x = 1.0f; u.y = 2.0f; u.z = 4.0f; u.w = 10.0; + v.x = -3.0f; v.y = 4.0f; v.z = -5.0f; v.w = 7.0; + +/*_______________D3DXVec4Dot__________________________*/ + expected = 55.0f; + got = D3DXVec4Dot(&u,&v); + ok(fabs( got - expected ) < admitted_error, "Expected: %f, Got: %f\n", expected, got); + /* Tests the case NULL */ + expected=0.0f; + got = D3DXVec4Dot(NULL,&v); + ok(fabs( got - expected ) < admitted_error, "Expected: %f, Got: %f\n", expected, got); + expected=0.0f; + got = D3DXVec4Dot(NULL,NULL); + ok(fabs( got - expected ) < admitted_error, "Expected: %f, Got: %f\n", expected, got); /*_______________D3DXVec4Length__________________________*/ expected = 11.0f; diff --git a/include/d3dx8math.inl b/include/d3dx8math.inl index c8de09b..cbe01ec 100644 --- a/include/d3dx8math.inl +++ b/include/d3dx8math.inl @@ -95,6 +95,12 @@ static inline D3DXVECTOR2* D3DXVec2Subtract(D3DXVECTOR2 *pout, CONST D3DXVECTOR2 /*__________________D3DXVECTOR3_______________________*/ +static inline FLOAT D3DXVec3Dot(CONST D3DXVECTOR3 *pv1, CONST D3DXVECTOR3 *pv2) +{ + if ( !pv1 || !pv2 ) return 0.0f; + return (pv1->x) * (pv2->x) + (pv1->y) * (pv2->y) + (pv1->z) * (pv2->z); +} + static inline FLOAT D3DXVec3Length(CONST D3DXVECTOR3 *pv) { if (!pv) return 0.0f; @@ -109,6 +115,12 @@ static inline FLOAT D3DXVec3LengthSq(CONST D3DXVECTOR3 *pv) /*__________________D3DXVECTOR4_______________________*/ +static inline FLOAT D3DXVec4Dot(CONST D3DXVECTOR4 *pv1, CONST D3DXVECTOR4 *pv2) +{ + if (!pv1 || !pv2 ) return 0.0f; + return (pv1->x) * (pv2->x) + (pv1->y) * (pv2->y) + (pv1->z) * (pv2->z) + (pv1->w) * (pv2->w); +} + static inline FLOAT D3DXVec4Length(CONST D3DXVECTOR4 *pv) { if (!pv) return 0.0f; @@ -123,13 +135,19 @@ static inline FLOAT D3DXVec4LengthSq(CONST D3DXVECTOR4 *pv) /*__________________D3DXQUATERNION____________________*/ -static inline FLOAT D3DXQuaternionLength( CONST D3DXQUATERNION *pq) +static inline FLOAT D3DXQuaternionDot(CONST D3DXQUATERNION *pq1, CONST D3DXQUATERNION *pq2) +{ + if ( !pq1 || !pq2 ) return 0.0f; + return (pq1->x) * (pq2->x) + (pq1->y) * (pq2->y) + (pq1->z) * (pq2->z) + (pq1->w) * (pq2->w); +} + +static inline FLOAT D3DXQuaternionLength(CONST D3DXQUATERNION *pq) { if (!pq) return 0.0f; return sqrt( (pq->x) * (pq->x) + (pq->y) * (pq->y) + (pq->z) * (pq->z) + (pq->w) * (pq->w) ); } -static inline FLOAT D3DXQuaternionLengthSq( CONST D3DXQUATERNION *pq) +static inline FLOAT D3DXQuaternionLengthSq(CONST D3DXQUATERNION *pq) { if (!pq) return 0.0f; return (pq->x) * (pq->x) + (pq->y) * (pq->y) + (pq->z) * (pq->z) + (pq->w) * (pq->w);

1 0

David Adam : d3dx8: Implement D3DX*LengthSq.
by Alexandre Julliard Oct. 22, 2007

Oct. 22, 2007

Module: wine Branch: master Commit: bf9a690dbc43727e2e4207f13197f3baf92fdc80 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bf9a690dbc43727e2e4207f13… Author: David Adam <David.Adam(a)math.cnrs.fr> Date: Thu Oct 18 17:47:50 2007 +0200 d3dx8: Implement D3DX*LengthSq. --- dlls/d3dx8/tests/math.c | 27 +++++++++++++++++++++++++++ include/d3dx8math.inl | 18 ++++++++++++++++-- 2 files changed, 43 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx8/tests/math.c b/dlls/d3dx8/tests/math.c index d0d0b03..a598020 100644 --- a/dlls/d3dx8/tests/math.c +++ b/dlls/d3dx8/tests/math.c @@ -41,6 +41,15 @@ static void D3X8QuaternionTest(void) expected=0.0f; got = D3DXQuaternionLength(NULL); ok(fabs( got - expected ) < admitted_error, "Expected: %f, Got: %f\n", expected, got); + +/*_______________D3DXQuaternionLengthSq________________________*/ + expected = 121.0f; + got = D3DXQuaternionLengthSq(&q); + ok(fabs( got - expected ) < admitted_error, "Expected: %f, Got: %f\n", expected, got); + /* Tests the case NULL */ + expected=0.0f; + got = D3DXQuaternionLengthSq(NULL); + ok(fabs( got - expected ) < admitted_error, "Expected: %f, Got: %f\n", expected, got); } static void D3X8Vector2Test(void) @@ -172,6 +181,15 @@ static void D3X8Vector3Test(void) expected=0.0f; got = D3DXVec3Length(NULL); ok(fabs( got - expected ) < admitted_error, "Expected: %f, Got: %f\n", expected, got); + +/*_______________D3DXVec3LengthSq________________________*/ + expected = 121.0f; + got = D3DXVec3LengthSq(&u); + ok(fabs( got - expected ) < admitted_error, "Expected: %f, Got: %f\n", expected, got); + /* Tests the case NULL */ + expected=0.0f; + got = D3DXVec3LengthSq(NULL); + ok(fabs( got - expected ) < admitted_error, "Expected: %f, Got: %f\n", expected, got); } static void D3X8Vector4Test(void) @@ -189,6 +207,15 @@ static void D3X8Vector4Test(void) expected=0.0f; got = D3DXVec4Length(NULL); ok(fabs( got - expected ) < admitted_error, "Expected: %f, Got: %f\n", expected, got); + +/*_______________D3DXVec4LengthSq________________________*/ + expected = 121.0f; + got = D3DXVec4LengthSq(&u); + ok(fabs( got - expected ) < admitted_error, "Expected: %f, Got: %f\n", expected, got); + /* Tests the case NULL */ + expected=0.0f; + got = D3DXVec4LengthSq(NULL); + ok(fabs( got - expected ) < admitted_error, "Expected: %f, Got: %f\n", expected, got); } START_TEST(math) diff --git a/include/d3dx8math.inl b/include/d3dx8math.inl index 94e0019..c8de09b 100644 --- a/include/d3dx8math.inl +++ b/include/d3dx8math.inl @@ -101,6 +101,12 @@ static inline FLOAT D3DXVec3Length(CONST D3DXVECTOR3 *pv) return sqrt( (pv->x) * (pv->x) + (pv->y) * (pv->y) + (pv->z) * (pv->z) ); } +static inline FLOAT D3DXVec3LengthSq(CONST D3DXVECTOR3 *pv) +{ + if (!pv) return 0.0f; + return (pv->x) * (pv->x) + (pv->y) * (pv->y) + (pv->z) * (pv->z); +} + /*__________________D3DXVECTOR4_______________________*/ static inline FLOAT D3DXVec4Length(CONST D3DXVECTOR4 *pv) @@ -109,6 +115,11 @@ static inline FLOAT D3DXVec4Length(CONST D3DXVECTOR4 *pv) return sqrt( (pv->x) * (pv->x) + (pv->y) * (pv->y) + (pv->z) * (pv->z) + (pv->w) * (pv->w) ); } +static inline FLOAT D3DXVec4LengthSq(CONST D3DXVECTOR4 *pv) +{ + if (!pv) return 0.0f; + return (pv->x) * (pv->x) + (pv->y) * (pv->y) + (pv->z) * (pv->z) + (pv->w) * (pv->w); +} /*__________________D3DXQUATERNION____________________*/ @@ -118,7 +129,10 @@ static inline FLOAT D3DXQuaternionLength( CONST D3DXQUATERNION *pq) return sqrt( (pq->x) * (pq->x) + (pq->y) * (pq->y) + (pq->z) * (pq->z) + (pq->w) * (pq->w) ); } - - +static inline FLOAT D3DXQuaternionLengthSq( CONST D3DXQUATERNION *pq) +{ + if (!pq) return 0.0f; + return (pq->x) * (pq->x) + (pq->y) * (pq->y) + (pq->z) * (pq->z) + (pq->w) * (pq->w); +} #endif

1 0