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

Implement ViewManager::FUN_100a65b0 (#650)

Browse Source
This commit is contained in:
Christian Semmler
2024-03-09 23:12:15 -05:00
committed by GitHub
parent a55b01d186
commit 660c1e1170
5 changed files with 65 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
LEGO1/tgl/d3drm/group.cpp
View File

@@ -86,11 +86,10 @@ Result GroupImpl::Add(const Group* pGroup)
} }
// FUNCTION: LEGO1 0x100a3430 // FUNCTION: LEGO1 0x100a3430
Result GroupImpl::Add(const Mesh* pMesh) Result GroupImpl::Add(const MeshBuilder* pMeshBuilder)
{ {
const MeshImpl* pMeshImpl = static_cast<const MeshImpl*>(pMesh); const MeshBuilderImpl* pMeshBuilderImpl = static_cast<const MeshBuilderImpl*>(pMeshBuilder);
// TODO: Incorrect structure return ResultVal(m_data->AddVisual(pMeshBuilderImpl->ImplementationData()));
return ResultVal(m_data->AddVisual((IDirect3DRMMesh*) pMeshImpl->ImplementationData()));
} }
// FUNCTION: LEGO1 0x100a3450 // FUNCTION: LEGO1 0x100a3450

2
LEGO1/tgl/d3drm/impl.h
View File

@@ -321,7 +321,7 @@ public:
Result Add(const Group*) override; Result Add(const Group*) override;
// vtable+0x20 // vtable+0x20
Result Add(const Mesh*) override; Result Add(const MeshBuilder*) override;
Result Remove(const Group*) override; Result Remove(const Group*) override;
Result Remove(const MeshBuilder*) override; Result Remove(const MeshBuilder*) override;
Result RemoveAll() override; Result RemoveAll() override;

2
LEGO1/tgl/tgl.h
View File

@@ -298,7 +298,7 @@ public:
virtual Result GetTexture(Texture*&) = 0; virtual Result GetTexture(Texture*&) = 0;
virtual Result SetMaterialMode(MaterialMode) = 0; virtual Result SetMaterialMode(MaterialMode) = 0;
virtual Result Add(const Group*) = 0; virtual Result Add(const Group*) = 0;
virtual Result Add(const Mesh*) = 0; virtual Result Add(const MeshBuilder*) = 0;
virtual Result Remove(const Group*) = 0; virtual Result Remove(const Group*) = 0;
virtual Result Remove(const MeshBuilder*) = 0; virtual Result Remove(const MeshBuilder*) = 0;
virtual Result RemoveAll() = 0; virtual Result RemoveAll() = 0;

1
LEGO1/viewmanager/viewlod.h
View File

@@ -28,6 +28,7 @@ public:
Tgl::MeshBuilder* GetMeshBuilder() { return m_meshBuilder; } Tgl::MeshBuilder* GetMeshBuilder() { return m_meshBuilder; }
const Tgl::MeshBuilder* GetMeshBuilder() const { return m_meshBuilder; } const Tgl::MeshBuilder* GetMeshBuilder() const { return m_meshBuilder; }
undefined4 GetUnknown0x08() { return m_unk0x08; }
unsigned char GetUnknown0x08Test4() { return m_unk0x08 & 0xffffff04; } unsigned char GetUnknown0x08Test4() { return m_unk0x08 & 0xffffff04; }
unsigned char GetUnknown0x08Test8() { return m_unk0x08 & 0xffffff08; } unsigned char GetUnknown0x08Test8() { return m_unk0x08 & 0xffffff08; }

61
LEGO1/viewmanager/viewmanager.cpp
View File

@@ -24,6 +24,7 @@ float g_unk0x1010105c = 0.000125F;
// GLOBAL: LEGO1 0x10101060 // GLOBAL: LEGO1 0x10101060
float g_elapsedSeconds = 0; float g_elapsedSeconds = 0;
inline void SetAppData(ViewROI* p_roi, DWORD data);
inline undefined4 GetD3DRM(IDirect3DRM2*& d3drm, Tgl::Renderer* pRenderer); inline undefined4 GetD3DRM(IDirect3DRM2*& d3drm, Tgl::Renderer* pRenderer);
inline undefined4 GetFrame(IDirect3DRMFrame2*& frame, Tgl::Group* scene); inline undefined4 GetFrame(IDirect3DRMFrame2*& frame, Tgl::Group* scene);
@@ -106,10 +107,57 @@ void ViewManager::RemoveAll(ViewROI* p_roi)
} }
} }
// STUB: LEGO1 0x100a65b0 // FUNCTION: LEGO1 0x100a65b0
void ViewManager::FUN_100a65b0(ViewROI* p_roi, int p_und) void ViewManager::FUN_100a65b0(ViewROI* p_roi, int p_und)
{ {
// TODO if (p_roi->GetLODCount() <= p_und) {
p_und = p_roi->GetLODCount() - 1;
}
int unk0xe0 = p_roi->GetUnknown0xe0();
if (unk0xe0 == p_und) {
return;
}
Tgl::Group* group = p_roi->GetGeometry();
Tgl::MeshBuilder* meshBuilder;
ViewLOD* lod;
if (unk0xe0 < 0) {
lod = (ViewLOD*) p_roi->GetLOD(p_und);
if (lod->GetUnknown0x08() & ViewLOD::c_bit4) {
scene->Add((Tgl::MeshBuilder*) group);
SetAppData(p_roi, (DWORD) p_roi);
}
}
else {
lod = (ViewLOD*) p_roi->GetLOD(unk0xe0);
if (lod != NULL) {
meshBuilder = lod->GetMeshBuilder();
if (meshBuilder != NULL) {
group->Remove(meshBuilder);
}
}
lod = (ViewLOD*) p_roi->GetLOD(p_und);
}
if (lod->GetUnknown0x08() & ViewLOD::c_bit4) {
meshBuilder = lod->GetMeshBuilder();
if (meshBuilder != NULL) {
group->Add(meshBuilder);
SetAppData(p_roi, (DWORD) p_roi);
p_roi->SetUnknown0xe0(p_und);
return;
}
}
p_roi->SetUnknown0xe0(-1);
} }
// FUNCTION: LEGO1 0x100a66a0 // FUNCTION: LEGO1 0x100a66a0
@@ -399,6 +447,15 @@ ViewROI* ViewManager::Pick(Tgl::View* p_view, unsigned long x, unsigned long y)
return NULL; return NULL;
} }
inline void SetAppData(ViewROI* p_roi, DWORD data)
{
IDirect3DRMFrame2* frame = NULL;
if (GetFrame(frame, p_roi->GetGeometry()) == 0) {
frame->SetAppData(data);
}
}
inline undefined4 GetD3DRM(IDirect3DRM2*& d3drm, Tgl::Renderer* pRenderer) inline undefined4 GetD3DRM(IDirect3DRM2*& d3drm, Tgl::Renderer* pRenderer)
{ {
d3drm = ((TglImpl::RendererImpl*) pRenderer)->ImplementationData(); d3drm = ((TglImpl::RendererImpl*) pRenderer)->ImplementationData();