ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

include: Don't use min/max in d3dx9math.inl as they might not be defined at this point.

This commit is contained in:
Daniel Scharrer 2011-11-12 02:08:23 +01:00 committed by Alexandre Julliard
parent 076edfe9d4
commit 86781a6a52
1 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
include/d3dx9math.inl
View File

@ -991,16 +991,16 @@ static inline D3DXVECTOR2* D3DXVec2Lerp(D3DXVECTOR2 *pout, CONST D3DXVECTOR2 *pv
static inline D3DXVECTOR2* D3DXVec2Maximize(D3DXVECTOR2 *pout, CONST D3DXVECTOR2 *pv1, CONST D3DXVECTOR2 *pv2) static inline D3DXVECTOR2* D3DXVec2Maximize(D3DXVECTOR2 *pout, CONST D3DXVECTOR2 *pv1, CONST D3DXVECTOR2 *pv2)
{ {
if ( !pout || !pv1 || !pv2) return NULL; if ( !pout || !pv1 || !pv2) return NULL;
pout->x = max(pv1->x , pv2->x); pout->x = pv1->x > pv2->x ? pv1->x : pv2->x;
pout->y = max(pv1->y , pv2->y); pout->y = pv1->y > pv2->y ? pv1->y : pv2->y;
return pout; return pout;
} }
static inline D3DXVECTOR2* D3DXVec2Minimize(D3DXVECTOR2 *pout, CONST D3DXVECTOR2 *pv1, CONST D3DXVECTOR2 *pv2) static inline D3DXVECTOR2* D3DXVec2Minimize(D3DXVECTOR2 *pout, CONST D3DXVECTOR2 *pv1, CONST D3DXVECTOR2 *pv2)
{ {
if ( !pout || !pv1 || !pv2) return NULL; if ( !pout || !pv1 || !pv2) return NULL;
pout->x = min(pv1->x , pv2->x); pout->x = pv1->x < pv2->x ? pv1->x : pv2->x;
pout->y = min(pv1->y , pv2->y); pout->y = pv1->y < pv2->y ? pv1->y : pv2->y;
return pout; return pout;
} }
@ -1070,18 +1070,18 @@ static inline D3DXVECTOR3* D3DXVec3Lerp(D3DXVECTOR3 *pout, CONST D3DXVECTOR3 *pv
static inline D3DXVECTOR3* D3DXVec3Maximize(D3DXVECTOR3 *pout, CONST D3DXVECTOR3 *pv1, CONST D3DXVECTOR3 *pv2) static inline D3DXVECTOR3* D3DXVec3Maximize(D3DXVECTOR3 *pout, CONST D3DXVECTOR3 *pv1, CONST D3DXVECTOR3 *pv2)
{ {
if ( !pout || !pv1 || !pv2) return NULL; if ( !pout || !pv1 || !pv2) return NULL;
pout->x = max(pv1->x , pv2->x); pout->x = pv1->x > pv2->x ? pv1->x : pv2->x;
pout->y = max(pv1->y , pv2->y); pout->y = pv1->y > pv2->y ? pv1->y : pv2->y;
pout->z = max(pv1->z , pv2->z); pout->z = pv1->z > pv2->z ? pv1->z : pv2->z;
return pout; return pout;
} }
static inline D3DXVECTOR3* D3DXVec3Minimize(D3DXVECTOR3 *pout, CONST D3DXVECTOR3 *pv1, CONST D3DXVECTOR3 *pv2) static inline D3DXVECTOR3* D3DXVec3Minimize(D3DXVECTOR3 *pout, CONST D3DXVECTOR3 *pv1, CONST D3DXVECTOR3 *pv2)
{ {
if ( !pout || !pv1 || !pv2) return NULL; if ( !pout || !pv1 || !pv2) return NULL;
pout->x = min(pv1->x , pv2->x); pout->x = pv1->x < pv2->x ? pv1->x : pv2->x;
pout->y = min(pv1->y , pv2->y); pout->y = pv1->y < pv2->y ? pv1->y : pv2->y;
pout->z = min(pv1->z , pv2->z); pout->z = pv1->z < pv2->z ? pv1->z : pv2->z;
return pout; return pout;
} }
@ -1146,20 +1146,20 @@ static inline D3DXVECTOR4* D3DXVec4Lerp(D3DXVECTOR4 *pout, CONST D3DXVECTOR4 *pv
static inline D3DXVECTOR4* D3DXVec4Maximize(D3DXVECTOR4 *pout, CONST D3DXVECTOR4 *pv1, CONST D3DXVECTOR4 *pv2) static inline D3DXVECTOR4* D3DXVec4Maximize(D3DXVECTOR4 *pout, CONST D3DXVECTOR4 *pv1, CONST D3DXVECTOR4 *pv2)
{ {
if ( !pout || !pv1 || !pv2) return NULL; if ( !pout || !pv1 || !pv2) return NULL;
pout->x = max(pv1->x , pv2->x); pout->x = pv1->x > pv2->x ? pv1->x : pv2->x;
pout->y = max(pv1->y , pv2->y); pout->y = pv1->y > pv2->y ? pv1->y : pv2->y;
pout->z = max(pv1->z , pv2->z); pout->z = pv1->z > pv2->z ? pv1->z : pv2->z;
pout->w = max(pv1->w , pv2->w); pout->w = pv1->w > pv2->w ? pv1->w : pv2->w;
return pout; return pout;
} }
static inline D3DXVECTOR4* D3DXVec4Minimize(D3DXVECTOR4 *pout, CONST D3DXVECTOR4 *pv1, CONST D3DXVECTOR4 *pv2) static inline D3DXVECTOR4* D3DXVec4Minimize(D3DXVECTOR4 *pout, CONST D3DXVECTOR4 *pv1, CONST D3DXVECTOR4 *pv2)
{ {
if ( !pout || !pv1 || !pv2) return NULL; if ( !pout || !pv1 || !pv2) return NULL;
pout->x = min(pv1->x , pv2->x); pout->x = pv1->x < pv2->x ? pv1->x : pv2->x;
pout->y = min(pv1->y , pv2->y); pout->y = pv1->y < pv2->y ? pv1->y : pv2->y;
pout->z = min(pv1->z , pv2->z); pout->z = pv1->z < pv2->z ? pv1->z : pv2->z;
pout->w = min(pv1->w , pv2->w); pout->w = pv1->w < pv2->w ? pv1->w : pv2->w;
return pout; return pout;
} }