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

d3dx9_36: Fix failing tests in Windows.

This commit is contained in:
David Adam 2009-01-31 12:04:55 +01:00 committed by Alexandre Julliard
parent befb0a06b1
commit 3f1a7abf48
2 changed files with 35 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
dlls/d3dx9_36/math.c
View File

@ -164,13 +164,13 @@ D3DXMATRIX* WINAPI D3DXMatrixTransformation2D(
{
sca.x=pscaling->x;
sca.y=pscaling->y;
sca.z=0.0f;
sca.z=1.0f;
}
else
{
sca.x=0.0f;
sca.y=0.0f;
sca.z=0.0f;
sca.x=1.0f;
sca.y=1.0f;
sca.z=1.0f;
}
if ( protationcenter )

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

@ -612,7 +612,7 @@ static void test_Matrix_Transformation2D(void)
U(exp_mat).m[3][1] = -13.401899f;
U(exp_mat).m[0][2] = 0.0f;
U(exp_mat).m[1][2] = 0.0f;
U(exp_mat).m[2][2] = 0.0f;
U(exp_mat).m[2][2] = 1.0f;
U(exp_mat).m[3][2] = 0.0f;
U(exp_mat).m[0][3] = 0.0f;
U(exp_mat).m[1][3] = 0.0f;
@ -635,17 +635,17 @@ static void test_Matrix_Transformation2D(void)
sca_rot = 5.0f*D3DX_PI/4.0f;
U(exp_mat).m[0][0] = 0.0f;
U(exp_mat).m[1][0] = 0.0f;
U(exp_mat).m[0][0] = 0.50f;
U(exp_mat).m[1][0] = -0.866025f;
U(exp_mat).m[2][0] = 0.0f;
U(exp_mat).m[3][0] = 2.830127f;
U(exp_mat).m[0][1] = 0.0f;
U(exp_mat).m[1][1] = 0.0f;
U(exp_mat).m[3][0] = -6.0f;
U(exp_mat).m[0][1] = 0.866025f;
U(exp_mat).m[1][1] = 0.50f;
U(exp_mat).m[2][1] = 0.0f;
U(exp_mat).m[3][1] = 12.294229f;
U(exp_mat).m[3][1] = 7.0f;
U(exp_mat).m[0][2] = 0.0f;
U(exp_mat).m[1][2] = 0.0f;
U(exp_mat).m[2][2] = 0.0f;
U(exp_mat).m[2][2] = 1.0f;
U(exp_mat).m[3][2] = 0.0f;
U(exp_mat).m[0][3] = 0.0f;
U(exp_mat).m[1][3] = 0.0f;
@ -654,6 +654,29 @@ static void test_Matrix_Transformation2D(void)
D3DXMatrixTransformation2D(&got_mat, &sca_center, sca_rot, NULL, NULL, rot, &trans);
expect_mat(&exp_mat, &got_mat);
/*_________*/
U(exp_mat).m[0][0] = 0.50f;
U(exp_mat).m[1][0] = -0.866025f;
U(exp_mat).m[2][0] = 0.0f;
U(exp_mat).m[3][0] = 0.0f;
U(exp_mat).m[0][1] = 0.866025f;
U(exp_mat).m[1][1] = 0.50f;
U(exp_mat).m[2][1] = 0.0f;
U(exp_mat).m[3][1] = 0.0f;
U(exp_mat).m[0][2] = 0.0f;
U(exp_mat).m[1][2] = 0.0f;
U(exp_mat).m[2][2] = 1.0f;
U(exp_mat).m[3][2] = 0.0f;
U(exp_mat).m[0][3] = 0.0f;
U(exp_mat).m[1][3] = 0.0f;
U(exp_mat).m[2][3] = 0.0f;
U(exp_mat).m[3][3] = 1.0f;
D3DXMatrixTransformation2D(&got_mat, NULL, sca_rot, NULL, NULL, rot, NULL);
expect_mat(&exp_mat, &got_mat);
}