Module: wine Branch: master Commit: c1892f258ffb012bbdeb4f635427947cebacb5a2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c1892f258ffb012bbdeb4f6354...
Author: David Adam David.Adam@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;