reactos/wine
1
0
Fork 0
mirror of https://github.com/reactos/wine.git synced 2024-12-01 15:40:43 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

d3drm: If there is no texture coordinates in loaded mesh, generate default texture coordinates for each vertex.

Browse Source
This commit is contained in:
Christian Costa 2012-03-16 08:16:18 +01:00 committed by Alexandre Julliard
parent ea532f633c
commit b89c32b2a1
2 changed files with 61 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
dlls/d3drm/meshbuilder.c
View File

@ -1272,6 +1272,18 @@ static HRESULT WINAPI IDirect3DRMMeshBuilder3Impl_Load(IDirect3DRMMeshBuilder3*
/* Set size (in number of DWORD) of all faces data */
This->face_data_size = faces_data_size;
/* If there is no texture coordinates, generate default texture coordinates (0.0f, 0.0f) for each vertex */
if (!This->pCoords2d)
{
This->nb_coords2d = This->nb_vertices;
This->pCoords2d = HeapAlloc(GetProcessHeap(), 0, This->nb_coords2d * sizeof(Coords2d));
for (i = 0; i < This->nb_coords2d; i++)
{
This->pCoords2d[i].u = 0.0f;
This->pCoords2d[i].v = 0.0f;
}
}
ret = D3DRM_OK;
end:
@ -1603,7 +1615,7 @@ static HRESULT WINAPI IDirect3DRMMeshBuilder3Impl_GetTextureCoordinates(IDirect3
TRACE("(%p)->(%d,%p,%p)\n", This, index, u, v);
if (index >= This->nb_coords2d)
return D3DRMERR_NOTFOUND;
return D3DRMERR_BADVALUE;
*u = This->pCoords2d[index].u;
*v = This->pCoords2d[index].v;

54
dlls/d3drm/tests/d3drm.c
View File

@ -180,12 +180,33 @@ static void test_MeshBuilder(void)
todo_wine ok(val2 == 4, "Wrong number of normals %d (must be 4)\n", val2);
ok(val3 == 22, "Wrong number of face data bytes %d (must be 22)\n", val3);
/* Check that Load method generated default texture coordinates (0.0f, 0.0f) for each vertex */
valu = 1.23f;
valv = 3.21f;
hr = IDirect3DRMMeshBuilder_GetTextureCoordinates(pMeshBuilder, 0, &valu, &valv);
ok(hr == D3DRM_OK, "Cannot get texture coordinates (hr = %x)\n", hr);
ok(valu == 0.0f, "Wrong coordinate %f (must be 0.0)\n", valu);
ok(valv == 0.0f, "Wrong coordinate %f (must be 0.0)\n", valv);
valu = 1.23f;
valv = 3.21f;
hr = IDirect3DRMMeshBuilder_GetTextureCoordinates(pMeshBuilder, 1, &valu, &valv);
todo_wine ok(hr == D3DRM_OK, "Cannot get texture coordinates (hr = %x)\n", hr);
todo_wine ok(valu == 0.0f, "Wrong coordinate %f (must be 0.0)\n", valu);
todo_wine ok(valv == 0.0f, "Wrong coordinate %f (must be 0.0)\n", valv);
ok(hr == D3DRM_OK, "Cannot get texture coordinates (hr = %x)\n", hr);
ok(valu == 0.0f, "Wrong coordinate %f (must be 0.0)\n", valu);
ok(valv == 0.0f, "Wrong coordinate %f (must be 0.0)\n", valv);
valu = 1.23f;
valv = 3.21f;
hr = IDirect3DRMMeshBuilder_GetTextureCoordinates(pMeshBuilder, 2, &valu, &valv);
ok(hr == D3DRM_OK, "Cannot get texture coordinates (hr = %x)\n", hr);
ok(valu == 0.0f, "Wrong coordinate %f (must be 0.0)\n", valu);
ok(valv == 0.0f, "Wrong coordinate %f (must be 0.0)\n", valv);
valu = 1.23f;
valv = 3.21f;
hr = IDirect3DRMMeshBuilder_GetTextureCoordinates(pMeshBuilder, 3, &valu, &valv);
ok(hr == D3DRM_OK, "Cannot get texture coordinates (hr = %x)\n", hr);
ok(valu == 0.0f, "Wrong coordinate %f (must be 0.0)\n", valu);
ok(valv == 0.0f, "Wrong coordinate %f (must be 0.0)\n", valv);
hr = IDirect3DRMMeshBuilder_GetTextureCoordinates(pMeshBuilder, 4, &valu, &valv);
ok(hr == D3DRMERR_BADVALUE, "Should fail and return D3DRM_BADVALUE (hr = %x)\n", hr);
valu = 1.23f;
valv = 3.21f;
@ -302,12 +323,33 @@ static void test_MeshBuilder3(void)
ok(hr == D3DRM_OK, "Cannot get vertices information (hr = %x)\n", hr);
ok(val1 == 4, "Wrong number of vertices %d (must be 4)\n", val1);
/* Check that Load method generated default texture coordinates (0.0f, 0.0f) for each vertex */
valu = 1.23f;
valv = 3.21f;
hr = IDirect3DRMMeshBuilder3_GetTextureCoordinates(pMeshBuilder3, 0, &valu, &valv);
ok(hr == D3DRM_OK, "Cannot get texture coordinates (hr = %x)\n", hr);
ok(valu == 0.0f, "Wrong coordinate %f (must be 0.0)\n", valu);
ok(valv == 0.0f, "Wrong coordinate %f (must be 0.0)\n", valv);
valu = 1.23f;
valv = 3.21f;
hr = IDirect3DRMMeshBuilder3_GetTextureCoordinates(pMeshBuilder3, 1, &valu, &valv);
todo_wine ok(hr == D3DRM_OK, "Cannot get texture coordinates (hr = %x)\n", hr);
todo_wine ok(valu == 0.0f, "Wrong coordinate %f (must be 0.0)\n", valu);
todo_wine ok(valv == 0.0f, "Wrong coordinate %f (must be 0.0)\n", valv);
ok(hr == D3DRM_OK, "Cannot get texture coordinates (hr = %x)\n", hr);
ok(valu == 0.0f, "Wrong coordinate %f (must be 0.0)\n", valu);
ok(valv == 0.0f, "Wrong coordinate %f (must be 0.0)\n", valv);
valu = 1.23f;
valv = 3.21f;
hr = IDirect3DRMMeshBuilder3_GetTextureCoordinates(pMeshBuilder3, 2, &valu, &valv);
ok(hr == D3DRM_OK, "Cannot get texture coordinates (hr = %x)\n", hr);
ok(valu == 0.0f, "Wrong coordinate %f (must be 0.0)\n", valu);
ok(valv == 0.0f, "Wrong coordinate %f (must be 0.0)\n", valv);
valu = 1.23f;
valv = 3.21f;
hr = IDirect3DRMMeshBuilder3_GetTextureCoordinates(pMeshBuilder3, 3, &valu, &valv);
ok(hr == D3DRM_OK, "Cannot get texture coordinates (hr = %x)\n", hr);
ok(valu == 0.0f, "Wrong coordinate %f (must be 0.0)\n", valu);
ok(valv == 0.0f, "Wrong coordinate %f (must be 0.0)\n", valv);
hr = IDirect3DRMMeshBuilder3_GetTextureCoordinates(pMeshBuilder3, 4, &valu, &valv);
ok(hr == D3DRMERR_BADVALUE, "Should fail and return D3DRM_BADVALUE (hr = %x)\n", hr);
valu = 1.23f;
valv = 3.21f;