diff --git a/LEGO1/lego/sources/roi/legolod.cpp b/LEGO1/lego/sources/roi/legolod.cpp index 453a4dac..8fa16204 100644 --- a/LEGO1/lego/sources/roi/legolod.cpp +++ b/LEGO1/lego/sources/roi/legolod.cpp @@ -13,19 +13,34 @@ DECOMP_SIZE_ASSERT(LegoLOD, 0x20) DECOMP_SIZE_ASSERT(LegoLOD::Mesh, 0x08) // GLOBAL: LEGO1 0x101013d4 +// GLOBAL: BETA10 0x10207230 LPDIRECT3DRMMATERIAL g_unk0x101013d4 = NULL; // GLOBAL: LEGO1 0x101013dc const char* g_InhPrefix = "inh"; +#ifdef BETA10 +inline BOOL GetD3DRM(IDirect3DRM2*& d3drm, Tgl::Renderer* pRenderer); +#else inline IDirect3DRM2* GetD3DRM(Tgl::Renderer* pRenderer); +#endif inline BOOL GetMeshData(IDirect3DRMMesh*& mesh, D3DRMGROUPINDEX& index, Tgl::Mesh* pMesh); // FUNCTION: LEGO1 0x100aa380 +// FUNCTION: BETA10 0x1018ce90 LegoLOD::LegoLOD(Tgl::Renderer* p_renderer) : ViewLOD(p_renderer) { if (g_unk0x101013d4 == NULL) { +#ifdef BETA10 + IDirect3DRM2* d3drm = NULL; + assert((p_renderer != NULL)); + GetD3DRM(d3drm, p_renderer); + if (d3drm->CreateMaterial(10.0, &g_unk0x101013d4)) { + assert(0); + } +#else GetD3DRM(p_renderer)->CreateMaterial(10.0, &g_unk0x101013d4); +#endif } m_melems = NULL; @@ -36,6 +51,7 @@ LegoLOD::LegoLOD(Tgl::Renderer* p_renderer) : ViewLOD(p_renderer) } // FUNCTION: LEGO1 0x100aa450 +// FUNCTION: BETA10 0x1018d017 LegoLOD::~LegoLOD() { if (m_numMeshes && m_melems != NULL) { @@ -395,14 +411,31 @@ void LegoLOD::ClearMeshOffset() m_meshOffset = 0; } -inline BOOL GetMeshData(IDirect3DRMMesh*& mesh, D3DRMGROUPINDEX& index, Tgl::Mesh* pMesh) +// FUNCTION: BETA10 0x1018dfc4 +inline BOOL GetMeshData(IDirect3DRMMesh*& mesh, D3DRMGROUPINDEX& index, Tgl::Mesh* p_tglElem) { - mesh = ((TglImpl::MeshImpl*) pMesh)->ImplementationData()->groupMesh; - index = ((TglImpl::MeshImpl*) pMesh)->ImplementationData()->groupIndex; + assert(p_tglElem); + TglImpl::MeshImpl* meshImpl = (TglImpl::MeshImpl*) p_tglElem; + // Note: Diff in BETA10 (thunked in recompile but not in orig) + mesh = meshImpl->ImplementationData()->groupMesh; + index = meshImpl->ImplementationData()->groupIndex; return FALSE; } +#ifdef BETA10 +// FUNCTION: BETA10 0x1018cfc5 +inline BOOL GetD3DRM(IDirect3DRM2*& d3drm, Tgl::Renderer* p_tglRenderer) +{ + // Note: Code duplication with viewmanager.cpp:GetD3DRM() + assert(p_tglRenderer); + TglImpl::RendererImpl* renderer = (TglImpl::RendererImpl*) p_tglRenderer; + // Note: Diff in BETA10 (thunked in recompile but not in orig) + d3drm = renderer->ImplementationData(); + return 0; +} +#else inline IDirect3DRM2* GetD3DRM(Tgl::Renderer* pRenderer) { return ((TglImpl::RendererImpl*) pRenderer)->ImplementationData(); } +#endif diff --git a/LEGO1/lego/sources/roi/legolod.h b/LEGO1/lego/sources/roi/legolod.h index e787d377..fa59d97c 100644 --- a/LEGO1/lego/sources/roi/legolod.h +++ b/LEGO1/lego/sources/roi/legolod.h @@ -9,6 +9,7 @@ class LegoTextureInfo; class LegoStorage; // VTABLE: LEGO1 0x100dbf10 +// VTABLE: BETA10 0x101c3978 // SIZE 0x20 class LegoLOD : public ViewLOD { public: @@ -22,9 +23,11 @@ class LegoLOD : public ViewLOD { ~LegoLOD() override; // FUNCTION: LEGO1 0x100aae70 + // FUNCTION: BETA10 0x1018e650 int NumPolys() const override { return m_numPolys; } // vtable+0x0c // FUNCTION: LEGO1 0x100aae80 + // FUNCTION: BETA10 0x1018e670 float VTable0x10() override { return 0.0; } // vtable+0x10 LegoResult Read(Tgl::Renderer* p_renderer, LegoTextureContainer* p_textureContainer, LegoStorage* p_storage); @@ -38,6 +41,7 @@ class LegoLOD : public ViewLOD { static LegoBool HasInhPrefix(const LegoChar* p_name); // SYNTHETIC: LEGO1 0x100aa430 + // SYNTHETIC: BETA10 0x1018e530 // LegoLOD::`scalar deleting destructor' protected: diff --git a/LEGO1/realtime/roi.h b/LEGO1/realtime/roi.h index 73e837d6..64964ad3 100644 --- a/LEGO1/realtime/roi.h +++ b/LEGO1/realtime/roi.h @@ -70,12 +70,14 @@ class BoundingSphere { * a geometric object. */ // VTABLE: LEGO1 0x100dbd90 +// VTABLE: BETA10 0x101c34c0 // SIZE 0x04 class LODObject { public: // LODObject(); // FUNCTION: LEGO1 0x100a6f00 + // FUNCTION: BETA10 0x10174c70 virtual ~LODObject() {} virtual double AveragePolyArea() const = 0; // vtable+0x04 @@ -84,9 +86,13 @@ class LODObject { virtual float VTable0x10() = 0; // vtable+0x10 // SYNTHETIC: LEGO1 0x100a6f10 + // SYNTHETIC: BETA10 0x10174c90 // LODObject::`scalar deleting destructor' }; +// SYNTHETIC: BETA10 0x1018e620 +// LODObject::LODObject + /* * A CompoundObject is simply a set of ROI objects which * all together represent a single object with sub-parts. diff --git a/LEGO1/viewmanager/viewlod.cpp b/LEGO1/viewmanager/viewlod.cpp index aa04813e..d7ffef60 100644 --- a/LEGO1/viewmanager/viewlod.cpp +++ b/LEGO1/viewmanager/viewlod.cpp @@ -1,7 +1,11 @@ #include "viewlod.h" // FUNCTION: LEGO1 0x100a5e40 +// STUB: BETA10 0x10171bdf ViewLOD::~ViewLOD() { - delete m_meshBuilder; + // TODO: BETA10 mismatches + if (m_meshBuilder) { + delete m_meshBuilder; + } } diff --git a/LEGO1/viewmanager/viewlod.h b/LEGO1/viewmanager/viewlod.h index b7104526..cf4f1d7a 100644 --- a/LEGO1/viewmanager/viewlod.h +++ b/LEGO1/viewmanager/viewlod.h @@ -10,6 +10,7 @@ // // VTABLE: LEGO1 0x100dbd70 +// VTABLE: BETA10 0x101c34a8 // SIZE 0x0c class ViewLOD : public LODObject { public: @@ -17,13 +18,17 @@ class ViewLOD : public LODObject { c_hasMesh = 0x10 }; + // FUNCTION: BETA10 0x1018e570 ViewLOD(Tgl::Renderer* pRenderer) : m_meshBuilder(NULL), m_flags(3) {} + ~ViewLOD() override; // FUNCTION: LEGO1 0x100a6f30 + // FUNCTION: BETA10 0x10174db0 double AveragePolyArea() const override { return 2 * 3.14159 * 10.0 / NumPolys(); } // vtable+0x04 // FUNCTION: LEGO1 0x100a6f50 + // FUNCTION: BETA10 0x10174de0 int NVerts() const override { return NumPolys() * 2; } // vtable+0x08 Tgl::MeshBuilder* GetMeshBuilder() { return m_meshBuilder; } @@ -36,6 +41,7 @@ class ViewLOD : public LODObject { void ClearFlag(unsigned char p_flag) { m_flags &= ~p_flag; } // SYNTHETIC: LEGO1 0x100a6f60 + // SYNTHETIC: BETA10 0x10174f10 // ViewLOD::`scalar deleting destructor' protected: