mirrors/isle
1
0
Fork 0
mirror of https://github.com/isledecomp/isle.git synced 2025-10-24 08:54:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Implement LegoTexturePresenter::Read and Store (#641)

Browse Source 
* LegoTexturePresenter::Read

* Implement LegoTexturePresenter::Store

* Rename

* Fix naming
This commit is contained in:
Christian Semmler
2024-03-09 10:49:13 -05:00
committed by GitHub
parent fb800db862
commit 9e2f37e7ca
16 changed files with 281 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
LEGO1/lego/legoomni/src/act1/act1state.cpp
View File

@@ -1,5 +1,7 @@
#include "act1state.h"
#include "legoutil.h"
DECOMP_SIZE_ASSERT(Act1State, 0x26c)
DECOMP_SIZE_ASSERT(Act1State::NamedPlane, 0x4c)

15
LEGO1/lego/legoomni/src/common/legotextureinfo.cpp
View File

@@ -151,3 +151,18 @@ done:
return NULL;
}
// STUB: LEGO1 0x10065f60
BOOL LegoTextureInfo::SetGroupTexture(Tgl::Mesh* pMesh, LegoTextureInfo* p_textureInfo)
{
TglImpl::MeshImpl::MeshData* data = ((TglImpl::MeshImpl*) pMesh)->ImplementationData();
data->groupMesh->SetGroupTexture(data->groupIndex, p_textureInfo->m_texture);
return TRUE;
}
// STUB: LEGO1 0x10066010
LegoResult LegoTextureInfo::FUN_10066010(LegoU8* p_bits)
{
// TODO
return SUCCESS;
}

7
LEGO1/lego/legoomni/src/common/legoutil.cpp
View File

@@ -1,6 +1,7 @@
#include "legoutil.h"
#include "legoinputmanager.h"
#include "legonamedtexture.h"
#include "legoomni.h"
#include "legoworld.h"
#include "legoworldlist.h"
@@ -13,8 +14,6 @@
#include <process.h>
#include <string.h>
DECOMP_SIZE_ASSERT(NamedTexture, 0x14)
// STUB: LEGO1 0x1003e050
void FUN_1003e050(LegoAnimPresenter* p_presenter)
{
@@ -297,7 +296,7 @@ void SetLightPosition(MxU32)
}
// STUB: LEGO1 0x1003f3b0
NamedTexture* ReadNamedTexture(LegoFile* p_file)
LegoNamedTexture* ReadNamedTexture(LegoFile* p_file)
{
return NULL;
}
@@ -308,7 +307,7 @@ void FUN_1003f540(LegoFile* p_file, const char* p_filename)
}
// FUNCTION: LEGO1 0x1003f8a0
void WriteNamedTexture(LegoFile* p_file, NamedTexture* p_texture)
void WriteNamedTexture(LegoFile* p_file, LegoNamedTexture* p_texture)
{
p_file->FUN_10006030(*p_texture->GetName());
p_texture->GetTexture()->Write(p_file);

2
LEGO1/lego/legoomni/src/entity/legoworldpresenter.cpp
View File

@@ -227,7 +227,7 @@ MxResult LegoWorldPresenter::LoadWorld(char* p_worldName, LegoWorld* p_world)
LegoTexturePresenter texturePresenter;
if (texturePresenter.Read(chunk) == SUCCESS) {
texturePresenter.FUN_1004f290();
texturePresenter.Store();
}
delete[] buff;

93
LEGO1/lego/legoomni/src/video/legotexturepresenter.cpp
View File

@@ -2,9 +2,14 @@
#include "legoomni.h"
#include "legovideomanager.h"
#include "misc/legocontainer.h"
#include "misc/legoimage.h"
#include "misc/legostorage.h"
#include "mxcompositepresenter.h"
DECOMP_SIZE_ASSERT(LegoTexturePresenter, 0x54)
DECOMP_SIZE_ASSERT(LegoNamedTexture, 0x14)
DECOMP_SIZE_ASSERT(LegoNamedTextureList, 0x18)
// FUNCTION: LEGO1 0x1004eb40
LegoTexturePresenter::~LegoTexturePresenter()
@@ -19,17 +24,93 @@ MxResult LegoTexturePresenter::AddToManager()
return SUCCESS;
}
// STUB: LEGO1 0x1004ebd0
// FUNCTION: LEGO1 0x1004ebd0
MxResult LegoTexturePresenter::Read(MxDSChunk& p_chunk)
{
// TODO
return SUCCESS;
MxResult result = FAILURE;
LegoMemory storage(p_chunk.GetData());
LegoChar* textureName = NULL;
LegoS32 hardwareMode = VideoManager()->GetDirect3D()->AssignedDevice()->GetHardwareMode();
m_textures = new LegoNamedTextureList();
LegoU32 numTextures, i;
if (storage.Read(&numTextures, sizeof(numTextures)) != SUCCESS) {
goto done;
}
for (i = 0; i < numTextures; i++) {
LegoU32 textureNameLength;
LegoTexture* texture;
LegoNamedTexture* namedTexture;
if (storage.Read(&textureNameLength, sizeof(textureNameLength)) != SUCCESS) {
goto done;
}
textureName = new LegoChar[textureNameLength + 1];
if (storage.Read(textureName, textureNameLength) != SUCCESS) {
goto done;
}
textureName[textureNameLength] = '\0';
strlwr(textureName);
texture = new LegoTexture();
if (texture->Read(&storage, hardwareMode) != SUCCESS) {
goto done;
}
namedTexture = new LegoNamedTexture(textureName, texture);
m_textures->Append(namedTexture);
delete[] textureName;
textureName = NULL;
}
result = SUCCESS;
done:
if (textureName != NULL) {
delete[] textureName;
}
if (result != SUCCESS && m_textures != NULL) {
delete m_textures;
m_textures = NULL;
}
return result;
}
// STUB: LEGO1 0x1004f290
void LegoTexturePresenter::FUN_1004f290()
// FUNCTION: LEGO1 0x1004f290
MxResult LegoTexturePresenter::Store()
{
// TODO
LegoNamedTextureListCursor cursor(m_textures);
LegoNamedTexture* namedTexture;
VideoManager();
while (cursor.Next(namedTexture)) {
LegoTexture* texture = namedTexture->GetTexture();
LegoTextureInfo* textureInfo = TextureContainer()->Get(namedTexture->GetName()->GetData());
if (textureInfo == NULL) {
textureInfo = LegoTextureInfo::Create(namedTexture->GetName()->GetData(), texture);
if (textureInfo != NULL) {
TextureContainer()->Add(namedTexture->GetName()->GetData(), textureInfo);
}
}
else {
textureInfo->FUN_10066010(texture->GetImage()->GetBits());
}
}
if (m_textures != NULL) {
delete m_textures;
}
m_textures = NULL;
return SUCCESS;
}
// STUB: LEGO1 0x1004fc60