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

ddraw/tests: Fix the Visual C++ double to float conversion warnings.

This commit is contained in:
Francois Gouget 2007-05-28 01:20:03 +02:00 committed by Alexandre Julliard
parent e6196f9ae7
commit 30b7744472
1 changed files with 36 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

72
dlls/ddraw/tests/visual.c
View File

@ -195,38 +195,38 @@ static void lighting_test(IDirect3DDevice7 *device)
DWORD nfvf = D3DFVF_XYZ | D3DFVF_DIFFUSE | D3DFVF_NORMAL; DWORD nfvf = D3DFVF_XYZ | D3DFVF_DIFFUSE | D3DFVF_NORMAL;
DWORD color; DWORD color;
float mat[16] = { 1.0, 0.0, 0.0, 0.0, float mat[16] = { 1.0f, 0.0f, 0.0f, 0.0f,
0.0, 1.0, 0.0, 0.0, 0.0f, 1.0f, 0.0f, 0.0f,
0.0, 0.0, 1.0, 0.0, 0.0f, 0.0f, 1.0f, 0.0f,
0.0, 0.0, 0.0, 1.0 }; 0.0f, 0.0f, 0.0f, 1.0f };
struct vertex unlitquad[] = struct vertex unlitquad[] =
{ {
{-1.0, -1.0, 0.1, 0xffff0000}, {-1.0f, -1.0f, 0.1f, 0xffff0000},
{-1.0, 0.0, 0.1, 0xffff0000}, {-1.0f, 0.0f, 0.1f, 0xffff0000},
{ 0.0, 0.0, 0.1, 0xffff0000}, { 0.0f, 0.0f, 0.1f, 0xffff0000},
{ 0.0, -1.0, 0.1, 0xffff0000}, { 0.0f, -1.0f, 0.1f, 0xffff0000},
}; };
struct vertex litquad[] = struct vertex litquad[] =
{ {
{-1.0, 0.0, 0.1, 0xff00ff00}, {-1.0f, 0.0f, 0.1f, 0xff00ff00},
{-1.0, 1.0, 0.1, 0xff00ff00}, {-1.0f, 1.0f, 0.1f, 0xff00ff00},
{ 0.0, 1.0, 0.1, 0xff00ff00}, { 0.0f, 1.0f, 0.1f, 0xff00ff00},
{ 0.0, 0.0, 0.1, 0xff00ff00}, { 0.0f, 0.0f, 0.1f, 0xff00ff00},
}; };
struct nvertex unlitnquad[] = struct nvertex unlitnquad[] =
{ {
{ 0.0, -1.0, 0.1, 1.0, 1.0, 1.0, 0xff0000ff}, { 0.0f, -1.0f, 0.1f, 1.0f, 1.0f, 1.0f, 0xff0000ff},
{ 0.0, 0.0, 0.1, 1.0, 1.0, 1.0, 0xff0000ff}, { 0.0f, 0.0f, 0.1f, 1.0f, 1.0f, 1.0f, 0xff0000ff},
{ 1.0, 0.0, 0.1, 1.0, 1.0, 1.0, 0xff0000ff}, { 1.0f, 0.0f, 0.1f, 1.0f, 1.0f, 1.0f, 0xff0000ff},
{ 1.0, -1.0, 0.1, 1.0, 1.0, 1.0, 0xff0000ff}, { 1.0f, -1.0f, 0.1f, 1.0f, 1.0f, 1.0f, 0xff0000ff},
}; };
struct nvertex litnquad[] = struct nvertex litnquad[] =
{ {
{ 0.0, 0.0, 0.1, 1.0, 1.0, 1.0, 0xffffff00}, { 0.0f, 0.0f, 0.1f, 1.0f, 1.0f, 1.0f, 0xffffff00},
{ 0.0, 1.0, 0.1, 1.0, 1.0, 1.0, 0xffffff00}, { 0.0f, 1.0f, 0.1f, 1.0f, 1.0f, 1.0f, 0xffffff00},
{ 1.0, 1.0, 0.1, 1.0, 1.0, 1.0, 0xffffff00}, { 1.0f, 1.0f, 0.1f, 1.0f, 1.0f, 1.0f, 0xffffff00},
{ 1.0, 0.0, 0.1, 1.0, 1.0, 1.0, 0xffffff00}, { 1.0f, 0.0f, 0.1f, 1.0f, 1.0f, 1.0f, 0xffffff00},
}; };
WORD Indices[] = {0, 1, 2, 2, 3, 0}; WORD Indices[] = {0, 1, 2, 2, 3, 0};
@ -367,32 +367,32 @@ static void fog_test(IDirect3DDevice7 *device)
/* Gets full z based fog with linear fog, no fog with specular color */ /* Gets full z based fog with linear fog, no fog with specular color */
struct sVertex unstransformed_1[] = { struct sVertex unstransformed_1[] = {
{-1, -1, 0.1, 0xFFFF0000, 0xFF000000 }, {-1, -1, 0.1f, 0xFFFF0000, 0xFF000000 },
{-1, 0, 0.1, 0xFFFF0000, 0xFF000000 }, {-1, 0, 0.1f, 0xFFFF0000, 0xFF000000 },
{ 0, 0, 0.1, 0xFFFF0000, 0xFF000000 }, { 0, 0, 0.1f, 0xFFFF0000, 0xFF000000 },
{ 0, -1, 0.1, 0xFFFF0000, 0xFF000000 }, { 0, -1, 0.1f, 0xFFFF0000, 0xFF000000 },
}; };
/* Ok, I am too lazy to deal with transform matrices */ /* Ok, I am too lazy to deal with transform matrices */
struct sVertex unstransformed_2[] = { struct sVertex unstransformed_2[] = {
{-1, 0, 1.0, 0xFFFF0000, 0xFF000000 }, {-1, 0, 1.0f, 0xFFFF0000, 0xFF000000 },
{-1, 1, 1.0, 0xFFFF0000, 0xFF000000 }, {-1, 1, 1.0f, 0xFFFF0000, 0xFF000000 },
{ 0, 1, 1.0, 0xFFFF0000, 0xFF000000 }, { 0, 1, 1.0f, 0xFFFF0000, 0xFF000000 },
{ 0, 0, 1.0, 0xFFFF0000, 0xFF000000 }, { 0, 0, 1.0f, 0xFFFF0000, 0xFF000000 },
}; };
/* Untransformed ones. Give them a different diffuse color to make the test look /* Untransformed ones. Give them a different diffuse color to make the test look
* nicer. It also makes making sure that they are drawn correctly easier. * nicer. It also makes making sure that they are drawn correctly easier.
*/ */
struct sVertexT transformed_1[] = { struct sVertexT transformed_1[] = {
{320, 0, 1.0, 1.0, 0xFFFFFF00, 0xFF000000 }, {320, 0, 1.0f, 1.0f, 0xFFFFFF00, 0xFF000000 },
{640, 0, 1.0, 1.0, 0xFFFFFF00, 0xFF000000 }, {640, 0, 1.0f, 1.0f, 0xFFFFFF00, 0xFF000000 },
{640, 240, 1.0, 1.0, 0xFFFFFF00, 0xFF000000 }, {640, 240, 1.0f, 1.0f, 0xFFFFFF00, 0xFF000000 },
{320, 240, 1.0, 1.0, 0xFFFFFF00, 0xFF000000 }, {320, 240, 1.0f, 1.0f, 0xFFFFFF00, 0xFF000000 },
}; };
struct sVertexT transformed_2[] = { struct sVertexT transformed_2[] = {
{320, 240, 1.0, 1.0, 0xFFFFFF00, 0xFF000000 }, {320, 240, 1.0f, 1.0f, 0xFFFFFF00, 0xFF000000 },
{640, 240, 1.0, 1.0, 0xFFFFFF00, 0xFF000000 }, {640, 240, 1.0f, 1.0f, 0xFFFFFF00, 0xFF000000 },
{640, 480, 1.0, 1.0, 0xFFFFFF00, 0xFF000000 }, {640, 480, 1.0f, 1.0f, 0xFFFFFF00, 0xFF000000 },
{320, 480, 1.0, 1.0, 0xFFFFFF00, 0xFF000000 }, {320, 480, 1.0f, 1.0f, 0xFFFFFF00, 0xFF000000 },
}; };
WORD Indices[] = {0, 1, 2, 2, 3, 0}; WORD Indices[] = {0, 1, 2, 2, 3, 0};