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

Implement GetGroupMaterial() (#175)

Browse Source
This commit is contained in:
Anders Jenbo 2025-05-25 23:35:02 +02:00 committed by GitHub
parent 48958c304e
commit cea10248aa
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 18 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
miniwin/include/miniwin_d3drm.h
View File

@ -195,6 +195,7 @@ struct IDirect3DRMMesh : public IDirect3DRMVisual {
virtual HRESULT SetVertices(DWORD groupIndex, int offset, int count, D3DRMVERTEX* vertices) = 0; virtual HRESULT SetVertices(DWORD groupIndex, int offset, int count, D3DRMVERTEX* vertices) = 0;
virtual HRESULT GetGroupTexture(DWORD groupIndex, LPDIRECT3DRMTEXTURE* texture) = 0; virtual HRESULT GetGroupTexture(DWORD groupIndex, LPDIRECT3DRMTEXTURE* texture) = 0;
virtual D3DRMMAPPING GetGroupMapping(DWORD groupIndex) = 0; virtual D3DRMMAPPING GetGroupMapping(DWORD groupIndex) = 0;
virtual HRESULT GetGroupMaterial(DWORD groupIndex, LPDIRECT3DRMMATERIAL* material) = 0;
virtual D3DRMRENDERQUALITY GetGroupQuality(DWORD groupIndex) = 0; virtual D3DRMRENDERQUALITY GetGroupQuality(DWORD groupIndex) = 0;
virtual D3DCOLOR GetGroupColor(D3DRMGROUPINDEX index) = 0; virtual D3DCOLOR GetGroupColor(D3DRMGROUPINDEX index) = 0;
virtual HRESULT GetVertices(DWORD groupIndex, int startIndex, int count, D3DRMVERTEX* vertices) = 0; virtual HRESULT GetVertices(DWORD groupIndex, int startIndex, int count, D3DRMVERTEX* vertices) = 0;

1
miniwin/sdl3gpu/include/miniwin_d3drmmesh_sdl3gpu.h
View File

@ -83,6 +83,7 @@ struct Direct3DRMMesh_SDL3GPUImpl : public Direct3DRMObjectBase_SDL3GPUImpl<IDir
HRESULT SetGroupMaterial(DWORD groupIndex, IDirect3DRMMaterial* material) override; HRESULT SetGroupMaterial(DWORD groupIndex, IDirect3DRMMaterial* material) override;
HRESULT SetGroupTexture(DWORD groupIndex, IDirect3DRMTexture* texture) override; HRESULT SetGroupTexture(DWORD groupIndex, IDirect3DRMTexture* texture) override;
HRESULT GetGroupTexture(DWORD groupIndex, LPDIRECT3DRMTEXTURE* texture) override; HRESULT GetGroupTexture(DWORD groupIndex, LPDIRECT3DRMTEXTURE* texture) override;
HRESULT GetGroupMaterial(DWORD groupIndex, LPDIRECT3DRMMATERIAL* material) override;
HRESULT SetGroupMapping(D3DRMGROUPINDEX groupIndex, D3DRMMAPPING mapping) override; HRESULT SetGroupMapping(D3DRMGROUPINDEX groupIndex, D3DRMMAPPING mapping) override;
D3DRMMAPPING GetGroupMapping(DWORD groupIndex) override; D3DRMMAPPING GetGroupMapping(DWORD groupIndex) override;
HRESULT SetGroupQuality(DWORD groupIndex, D3DRMRENDERQUALITY quality) override; HRESULT SetGroupQuality(DWORD groupIndex, D3DRMRENDERQUALITY quality) override;

16
miniwin/sdl3gpu/src/miniwin_d3drmmesh.cpp
View File

@ -158,6 +158,22 @@ HRESULT Direct3DRMMesh_SDL3GPUImpl::SetGroupTexture(DWORD groupIndex, IDirect3DR
return DD_OK; return DD_OK;
} }
HRESULT Direct3DRMMesh_SDL3GPUImpl::GetGroupMaterial(DWORD groupIndex, LPDIRECT3DRMMATERIAL* material)
{
if (groupIndex >= m_groups.size()) {
return DDERR_GENERIC;
}
auto& group = m_groups[groupIndex];
if (!group.material) {
return DDERR_GENERIC;
}
group.material->AddRef();
*material = group.material;
return DD_OK;
}
HRESULT Direct3DRMMesh_SDL3GPUImpl::GetGroupTexture(DWORD groupIndex, LPDIRECT3DRMTEXTURE* texture) HRESULT Direct3DRMMesh_SDL3GPUImpl::GetGroupTexture(DWORD groupIndex, LPDIRECT3DRMTEXTURE* texture)
{ {
if (groupIndex >= m_groups.size()) { if (groupIndex >= m_groups.size()) {