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

d3dx9: Implement D3DXLoadMeshFromX and D3DXLoadMeshFromXResource.

This commit is contained in:
Dylan Smith 2011-06-07 19:43:18 -04:00 committed by Alexandre Julliard
parent fe8615f889
commit c6f5f10434
2 changed files with 95 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
dlls/d3dx9_36/d3dx9_36.spec
View File

@ -168,10 +168,10 @@
@ stub D3DXIntersect(ptr ptr ptr ptr ptr ptr ptr ptr ptr ptr)
@ stub D3DXIntersectSubset(ptr long ptr ptr ptr ptr ptr ptr ptr ptr ptr)
@ stdcall D3DXIntersectTri(ptr ptr ptr ptr ptr ptr ptr ptr)
@ stub D3DXLoadMeshFromXA(ptr long ptr ptr ptr ptr ptr ptr)
@ stdcall D3DXLoadMeshFromXA(str long ptr ptr ptr ptr ptr ptr)
@ stdcall D3DXLoadMeshFromXInMemory(ptr long long ptr ptr ptr ptr ptr ptr)
@ stub D3DXLoadMeshFromXResource(long ptr ptr long ptr ptr ptr ptr ptr ptr)
@ stub D3DXLoadMeshFromXW(ptr long ptr ptr ptr ptr ptr ptr)
@ stdcall D3DXLoadMeshFromXResource(long str str long ptr ptr ptr ptr ptr ptr)
@ stdcall D3DXLoadMeshFromXW(wstr long ptr ptr ptr ptr ptr ptr)
@ stub D3DXLoadMeshFromXof(ptr long ptr ptr ptr ptr ptr ptr)
@ stdcall D3DXLoadMeshHierarchyFromXA(str long ptr ptr ptr ptr ptr)
@ stdcall D3DXLoadMeshHierarchyFromXInMemory(ptr long long ptr ptr ptr ptr ptr)

92
dlls/d3dx9_36/mesh.c
View File

@ -3066,6 +3066,98 @@ HRESULT WINAPI D3DXFrameDestroy(LPD3DXFRAME frame, LPD3DXALLOCATEHIERARCHY alloc
return D3D_OK;
}
HRESULT WINAPI D3DXLoadMeshFromXA(LPCSTR filename,
DWORD options,
LPDIRECT3DDEVICE9 device,
LPD3DXBUFFER *adjacency,
LPD3DXBUFFER *materials,
LPD3DXBUFFER *effect_instances,
DWORD *num_materials,
LPD3DXMESH *mesh)
{
HRESULT hr;
int len;
LPWSTR filenameW;
TRACE("(%s, %x, %p, %p, %p, %p, %p, %p)\n", debugstr_a(filename), options,
device, adjacency, materials, effect_instances, num_materials, mesh);
if (!filename)
return D3DERR_INVALIDCALL;
len = MultiByteToWideChar(CP_ACP, 0, filename, -1, NULL, 0);
filenameW = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR));
if (!filenameW) return E_OUTOFMEMORY;
MultiByteToWideChar(CP_ACP, 0, filename, -1, filenameW, len);
hr = D3DXLoadMeshFromXW(filenameW, options, device, adjacency, materials,
effect_instances, num_materials, mesh);
HeapFree(GetProcessHeap(), 0, filenameW);
return hr;
}
HRESULT WINAPI D3DXLoadMeshFromXW(LPCWSTR filename,
DWORD options,
LPDIRECT3DDEVICE9 device,
LPD3DXBUFFER *adjacency,
LPD3DXBUFFER *materials,
LPD3DXBUFFER *effect_instances,
DWORD *num_materials,
LPD3DXMESH *mesh)
{
HRESULT hr;
DWORD size;
LPVOID buffer;
TRACE("(%s, %x, %p, %p, %p, %p, %p, %p)\n", debugstr_w(filename), options,
device, adjacency, materials, effect_instances, num_materials, mesh);
if (!filename)
return D3DERR_INVALIDCALL;
hr = map_view_of_file(filename, &buffer, &size);
if (FAILED(hr))
return D3DXERR_INVALIDDATA;
hr = D3DXLoadMeshFromXInMemory(buffer, size, options, device, adjacency,
materials, effect_instances, num_materials, mesh);
UnmapViewOfFile(buffer);
return hr;
}
HRESULT WINAPI D3DXLoadMeshFromXResource(HMODULE module,
LPCSTR name,
LPCSTR type,
DWORD options,
LPDIRECT3DDEVICE9 device,
LPD3DXBUFFER *adjacency,
LPD3DXBUFFER *materials,
LPD3DXBUFFER *effect_instances,
DWORD *num_materials,
LPD3DXMESH *mesh)
{
HRESULT hr;
HRSRC resinfo;
DWORD size;
LPVOID buffer;
TRACE("(%p, %s, %s, %x, %p, %p, %p, %p, %p, %p)\n",
module, debugstr_a(name), debugstr_a(type), options, device,
adjacency, materials, effect_instances, num_materials, mesh);
resinfo = FindResourceA(module, name, type);
if (!resinfo) return D3DXERR_INVALIDDATA;
hr = load_resource_into_memory(module, resinfo, &buffer, &size);
if (!FAILED(hr)) return D3DXERR_INVALIDDATA;
return D3DXLoadMeshFromXInMemory(buffer, size, options, device, adjacency,
materials, effect_instances, num_materials, mesh);
}
struct mesh_container
{
struct list entry;