marko10_000
/
wine-wine
forked from Mirrors/wine-wine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

d3dx9: Fix the case output = input in D3DXVec3Cross.

oldstable
Nozomi Kodama 2013-06-08 02:26:45 -10:00 committed by Alexandre Julliard
parent 699eb85ce0
commit b3dff5b354
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
dlls/d3dx9_36/tests/math.c
View File

@ -1251,6 +1251,9 @@ static void D3DXVector3Test(void)
expectedvec.x = -18.0f; expectedvec.y = 40.0f; expectedvec.z = -39.0f;
D3DXVec3Cross(&gotvec,&u,&v);
expect_vec3(expectedvec,gotvec);
expectedvec.x = -277.0f; expectedvec.y = -150.0f; expectedvec.z = -26.0f;
D3DXVec3Cross(&gotvec,&gotvec,&v);
expect_vec3(expectedvec,gotvec);
/* Tests the case NULL */
funcpointer = D3DXVec3Cross(&gotvec,NULL,&v);
ok(funcpointer == NULL, "Expected: %p, Got: %p\n", NULL, funcpointer);

9
include/d3dx9math.inl
View File

@ -1029,10 +1029,13 @@ static inline D3DXVECTOR3* D3DXVec3Add(D3DXVECTOR3 *pout, CONST D3DXVECTOR3 *pv1
static inline D3DXVECTOR3* D3DXVec3Cross(D3DXVECTOR3 *pout, CONST D3DXVECTOR3 *pv1, CONST D3DXVECTOR3 *pv2)
{
D3DXVECTOR3 temp;
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);
temp.x = (pv1->y) * (pv2->z) - (pv1->z) * (pv2->y);
temp.y = (pv1->z) * (pv2->x) - (pv1->x) * (pv2->z);
temp.z = (pv1->x) * (pv2->y) - (pv1->y) * (pv2->x);
*pout = temp;
return pout;
}