isledecomp/isle-portable
1
0
Fork 0
mirror of https://github.com/isledecomp/isle-portable.git synced 2024-11-22 15:37:55 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Implement/match LegoROI/LegoLOD::GetTexture (#814)

Browse source 
* Implement/match LegoROI/LegoLOD::GetTexture

* Remove explicit truth tests

* LegoTextureContainer::AddToList fix

* Revert "Remove explicit truth tests"

This reverts commit d169349bd61294e3cf4d645ac59244b48fb95867.
This commit is contained in:
Christian Semmler 2024-04-17 09:18:34 -04:00 committed by GitHub
parent a64bb4d460
commit 06fadd922e
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
7 changed files with 67 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
LEGO1/lego/legoomni/include/legotextureinfo.h
View file

@ -17,6 +17,7 @@ class LegoTextureInfo {
static LegoTextureInfo* Create(const char* p_name, LegoTexture* p_texture);
static BOOL SetGroupTexture(Tgl::Mesh* pMesh, LegoTextureInfo* p_textureInfo);
static BOOL GetGroupTexture(Tgl::Mesh* pMesh, LegoTextureInfo*& p_textureInfo);
LegoResult FUN_10066010(LegoU8* p_bits);
@ -27,4 +28,7 @@ class LegoTextureInfo {
LPDIRECT3DRMTEXTURE2 m_texture; // 0x0c
};
// GLOBAL: LEGO1 0x100db6f0
// IID_IDirect3DRMTexture2
#endif // LEGOTEXTUREINFO_H

24
LEGO1/lego/legoomni/src/common/legotextureinfo.cpp
View file

@ -160,6 +160,30 @@ BOOL LegoTextureInfo::SetGroupTexture(Tgl::Mesh* pMesh, LegoTextureInfo* p_textu
return TRUE;
}
// FUNCTION: LEGO1 0x10065f90
BOOL LegoTextureInfo::GetGroupTexture(Tgl::Mesh* pMesh, LegoTextureInfo*& p_textureInfo)
{
TglImpl::MeshImpl::MeshData* data = ((TglImpl::MeshImpl*) pMesh)->ImplementationData();
IDirect3DRMMesh* mesh = data->groupMesh;
D3DRMGROUPINDEX id = data->groupIndex;
LPDIRECT3DRMTEXTURE returnPtr = NULL;
LPDIRECT3DRMTEXTURE2 texture = NULL;
if (mesh->GetGroupTexture(id, &returnPtr) == D3DRM_OK) {
if (returnPtr->QueryInterface(IID_IDirect3DRMTexture2, (LPVOID*) &texture) == D3DRM_OK) {
p_textureInfo = (LegoTextureInfo*) texture->GetAppData();
texture->Release();
returnPtr->Release();
}
return TRUE;
}
return FALSE;
}
// STUB: LEGO1 0x10066010
LegoResult LegoTextureInfo::FUN_10066010(LegoU8* p_bits)
{

2
LEGO1/lego/sources/misc/legocontainer.cpp
View file

@ -54,7 +54,7 @@ LegoTextureInfo* LegoTextureContainer::AddToList(LegoTextureInfo* p_textureInfo)
LegoTextureInfo* textureInfo = new LegoTextureInfo();
textureInfo->m_palette = p_textureInfo->m_palette;
p_textureInfo->m_palette->Release();
textureInfo->m_palette->AddRef();
memset(&newDesc, 0, sizeof(newDesc));
newDesc.dwWidth = desc.dwWidth;

14
LEGO1/lego/sources/roi/legolod.cpp
View file

@ -362,6 +362,20 @@ LegoResult LegoLOD::FUN_100aad70(LegoTextureInfo* p_textureInfo)
return SUCCESS;
}
// FUNCTION: LEGO1 0x100aadc0
LegoResult LegoLOD::GetTexture(LegoTextureInfo*& p_textureInfo)
{
for (LegoU32 i = m_unk0x1c; i < m_numMeshes; i++) {
if (m_melems[i].m_unk0x04) {
if (LegoTextureInfo::GetGroupTexture(m_melems[i].m_tglMesh, p_textureInfo) == TRUE) {
return SUCCESS;
}
}
}
return FAILURE;
}
// FUNCTION: LEGO1 0x100aae20
LegoBool LegoLOD::FUN_100aae20(const LegoChar* p_name)
{

1
LEGO1/lego/sources/roi/legolod.h
View file

@ -32,6 +32,7 @@ class LegoLOD : public ViewLOD {
LegoResult FUN_100aacb0(LegoFloat p_red, LegoFloat p_green, LegoFloat p_blue, LegoFloat p_alpha);
LegoResult FUN_100aad00(LegoTextureInfo* p_textureInfo);
LegoResult FUN_100aad70(LegoTextureInfo* p_textureInfo);
LegoResult GetTexture(LegoTextureInfo*& p_textureInfo);
static LegoBool FUN_100aae20(const LegoChar* p_name);

25
LEGO1/lego/sources/roi/legoroi.cpp
View file

@ -498,10 +498,29 @@ LegoResult LegoROI::FUN_100a9210(LegoTextureInfo* p_textureInfo)
return result;
}
// STUB: LEGO1 0x100a92a0
LegoResult LegoROI::GetTexture(LegoTextureInfo*&)
// FUNCTION: LEGO1 0x100a92a0
// FUNCTION: BETA10 0x1018b12d
LegoResult LegoROI::GetTexture(LegoTextureInfo*& p_textureInfo)
{
// TODO
CompoundObject::iterator it;
int lodCount = GetLODCount();
for (LegoU32 i = 0; i < lodCount; i++) {
LegoLOD* lod = (LegoLOD*) GetLOD(i);
if (lod->GetTexture(p_textureInfo) == SUCCESS) {
return SUCCESS;
}
}
if (comp != NULL) {
for (it = comp->begin(); it != comp->end(); it++) {
if (((LegoROI*) *it)->GetTexture(p_textureInfo) == SUCCESS) {
return SUCCESS;
}
}
}
return FAILURE;
}

2
LEGO1/lego/sources/roi/legoroi.h
View file

@ -36,7 +36,7 @@ class LegoROI : public ViewROI {
LegoResult SetFrame(LegoAnim* p_anim, LegoTime p_time);
LegoResult FUN_100a9170(LegoFloat p_red, LegoFloat p_green, LegoFloat p_blue, LegoFloat p_alpha);
LegoResult FUN_100a9210(LegoTextureInfo* p_textureInfo);
LegoResult GetTexture(LegoTextureInfo*&);
LegoResult GetTexture(LegoTextureInfo*& p_textureInfo);
LegoU32 FUN_100a9410(Vector3&, Vector3&, float, float, Vector3&, LegoBool);
void SetName(const LegoChar* p_name);