isledecomp/isle-portable
1
0
Fork 0
mirror of https://github.com/isledecomp/isle-portable.git synced 2026-01-19 22:01:14 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Revert "Merge branch 'isledecomp:master' into psp"

Browse Source 
This reverts commit e4f760f91e, reversing
changes made to 1c12e8ab03.
This commit is contained in:
VoxelTek 2025-06-20 10:05:38 +10:00
parent 8e94bdbe67
commit 1a26af602c
3 changed files with 10 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
miniwin/include/miniwin/d3drm.h
View File

@ -181,10 +181,10 @@ struct IDirect3DRMMesh : public IDirect3DRMVisual {
virtual HRESULT Clone(int flags, GUID iid, void** object) = 0; virtual HRESULT Clone(int flags, GUID iid, void** object) = 0;
virtual HRESULT GetBox(D3DRMBOX* box) = 0; virtual HRESULT GetBox(D3DRMBOX* box) = 0;
virtual HRESULT AddGroup( virtual HRESULT AddGroup(
unsigned int vertexCount, int vertexCount,
unsigned int faceCount, int faceCount,
unsigned int vertexPerFace, int vertexPerFace,
unsigned int* faceBuffer, DWORD* faceBuffer,
D3DRMGROUPINDEX* groupIndex D3DRMGROUPINDEX* groupIndex
) = 0; ) = 0;
virtual HRESULT GetGroup( virtual HRESULT GetGroup(

8
miniwin/src/d3drm/d3drmmesh.cpp
View File

@ -40,10 +40,10 @@ HRESULT Direct3DRMMeshImpl::Clone(int flags, GUID iid, void** object)
} }
HRESULT Direct3DRMMeshImpl::AddGroup( HRESULT Direct3DRMMeshImpl::AddGroup(
unsigned int vertexCount, int vertexCount,
unsigned int faceCount, int faceCount,
unsigned int vertexPerFace, int vertexPerFace,
unsigned int* faceBuffer, DWORD* faceBuffer,
D3DRMGROUPINDEX* groupIndex D3DRMGROUPINDEX* groupIndex
) )
{ {

9
miniwin/src/internal/d3drmmesh_impl.h
View File

@ -67,13 +67,8 @@ struct MeshGroup {
struct Direct3DRMMeshImpl : public Direct3DRMObjectBaseImpl<IDirect3DRMMesh> { struct Direct3DRMMeshImpl : public Direct3DRMObjectBaseImpl<IDirect3DRMMesh> {
HRESULT QueryInterface(const GUID& riid, void** ppvObject) override; HRESULT QueryInterface(const GUID& riid, void** ppvObject) override;
HRESULT Clone(int flags, GUID iid, void** object) override; HRESULT Clone(int flags, GUID iid, void** object) override;
HRESULT AddGroup( HRESULT AddGroup(int vertexCount, int faceCount, int vertexPerFace, DWORD* faceBuffer, D3DRMGROUPINDEX* groupIndex)
unsigned int vertexCount, override;
unsigned int faceCount,
unsigned int vertexPerFace,
unsigned int* faceBuffer,
D3DRMGROUPINDEX* groupIndex
) override;
HRESULT GetGroup( HRESULT GetGroup(
D3DRMGROUPINDEX groupIndex, D3DRMGROUPINDEX groupIndex,
unsigned int* vertexCount, unsigned int* vertexCount,