diff --git a/dlls/d3dx8/tests/math.c b/dlls/d3dx8/tests/math.c index 7d1a84efed1..1490a66c8f9 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 ab1b9be589e..1da846d44e3 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;