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

Refactor LegoContainer (#587)

Browse Source 
* Refactor LegoContainer

* Fix name

* Fix build

* Refactor some includes

* Update STL compat

* Fix

* Fix annotations
This commit is contained in:
Christian Semmler
2024-02-23 10:06:16 -05:00
committed by GitHub
parent 9d8820ee06
commit 6b1c75ab5a
18 changed files with 249 additions and 227 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
LEGO1/lego/legoomni/include/legoanimpresenter.h
View File

@@ -1,7 +1,7 @@
#ifndef LEGOANIMPRESENTER_H
#define LEGOANIMPRESENTER_H
#include "lego/sources/anim/legoanim.h"
#include "anim/legoanim.h"
#include "mxgeometry/mxgeometry3d.h"
#include "mxvideopresenter.h"

161
LEGO1/lego/legoomni/include/legocontainer.h
View File

@@ -1,161 +0,0 @@
#ifndef LEGOTEXTURECONTAINER_H
#define LEGOTEXTURECONTAINER_H
#include "compat.h"
#include "decomp.h"
#include "mxstl/stlcompat.h"
#include "mxtypes.h"
#include <d3drmobj.h>
#include <ddraw.h>
#pragma warning(disable : 4237)
class LegoTexture;
// SIZE 0x10
struct TextureData {
public:
TextureData();
~TextureData();
static TextureData* Create(const char* p_name, LegoTexture* p_texture);
char* m_name; // 0x00
LPDIRECTDRAWSURFACE m_surface; // 0x04
LPDIRECTDRAWPALETTE m_palette; // 0x08
LPDIRECT3DRMTEXTURE2 m_texture; // 0x0c
};
struct LegoContainerInfoComparator {
bool operator()(const char* const& p_key0, const char* const& p_key1) const { return strcmp(p_key0, p_key1) > 0; }
};
// SIZE 0x10
template <class T>
class LegoContainerInfo : public map<const char*, T*, LegoContainerInfoComparator> {};
// SIZE 0x18
template <class T>
class LegoContainer {
public:
virtual ~LegoContainer()
{
#ifdef COMPAT_MODE
typename LegoContainerInfo<T>::iterator it;
#else
LegoContainerInfo<T>::iterator it;
#endif
for (it = m_map.begin(); it != m_map.end(); it++) {
// DECOMP: Use of const_cast here matches ~ViewLODListManager from 96 source.
const char* const& key = (*it).first;
delete[] const_cast<char*>(key);
if (m_ownership) {
delete (*it).second;
}
}
}
inline T* Get(const char* p_name)
{
#ifdef COMPAT_MODE
typename LegoContainerInfo<T>::iterator it = m_map.find(p_name);
#else
LegoContainerInfo<T>::iterator it = m_map.find(p_name);
#endif
if (it != m_map.end()) {
return (*it).second;
}
return NULL;
}
inline void SetOwnership(MxBool p_ownership) { m_ownership = p_ownership; }
protected:
MxBool m_ownership; // 0x04
LegoContainerInfo<T> m_map; // 0x08
};
// VTABLE: LEGO1 0x100d86d4
// class LegoContainer<TextureData>
typedef list<TextureData*> TextureList;
// VTABLE: LEGO1 0x100d86fc
// SIZE 0x24
class LegoTextureContainer : public LegoContainer<TextureData> {
public:
LegoTextureContainer() { m_ownership = TRUE; }
~LegoTextureContainer() override;
void FUN_10099cc0(TextureData* p_data);
protected:
TextureList m_list; // 0x18
};
// TEMPLATE: LEGO1 0x10059c50
// allocator<TextureData *>::_Charalloc
// clang-format off
// TEMPLATE: LEGO1 0x10001cc0
// _Tree<char const *,pair<char const * const,TextureData *>,map<char const *,TextureData *,LegoContainerInfoComparator,allocator<TextureData *> >::_Kfn,LegoContainerInfoComparator,allocator<TextureData *> >::_Lbound
// TEMPLATE: LEGO1 0x1004f9b0
// _Tree<char const *,pair<char const * const,TextureData *>,map<char const *,TextureData *,LegoContainerInfoComparator,allocator<TextureData *> >::_Kfn,LegoContainerInfoComparator,allocator<TextureData *> >::_Insert
// TEMPLATE: LEGO1 0x10059c70
// _Tree<char const *,pair<char const * const,TextureData *>,map<char const *,TextureData *,LegoContainerInfoComparator,allocator<TextureData *> >::_Kfn,LegoContainerInfoComparator,allocator<TextureData *> >::_Color
// TEMPLATE: LEGO1 0x10059c80
// _Tree<char const *,pair<char const * const,TextureData *>,map<char const *,TextureData *,LegoContainerInfoComparator,allocator<TextureData *> >::_Kfn,LegoContainerInfoComparator,allocator<TextureData *> >::_Left
// TEMPLATE: LEGO1 0x10059c90
// _Tree<char const *,pair<char const * const,TextureData *>,map<char const *,TextureData *,LegoContainerInfoComparator,allocator<TextureData *> >::_Kfn,LegoContainerInfoComparator,allocator<TextureData *> >::_Parent
// TEMPLATE: LEGO1 0x10059ca0
// _Tree<char const *,pair<char const * const,TextureData *>,map<char const *,TextureData *,LegoContainerInfoComparator,allocator<TextureData *> >::_Kfn,LegoContainerInfoComparator,allocator<TextureData *> >::_Right
// TEMPLATE: LEGO1 0x10059cb0
// _Tree<char const *,pair<char const * const,TextureData *>,map<char const *,TextureData *,LegoContainerInfoComparator,allocator<TextureData *> >::_Kfn,LegoContainerInfoComparator,allocator<TextureData *> >::~_Tree<char const *,pair<char const * const,TextureData *>,map<char const *,TextureData *,LegoContainerInfoComparator,allocator<TextureData *> >::_Kfn,LegoContainerInfoComparator,allocator<TextureData *> >
// TEMPLATE: LEGO1 0x10059d80
// _Tree<char const *,pair<char const * const,TextureData *>,map<char const *,TextureData *,LegoContainerInfoComparator,allocator<TextureData *> >::_Kfn,LegoContainerInfoComparator,allocator<TextureData *> >::iterator::_Inc
// TEMPLATE: LEGO1 0x10059dc0
// _Tree<char const *,pair<char const * const,TextureData *>,map<char const *,TextureData *,LegoContainerInfoComparator,allocator<TextureData *> >::_Kfn,LegoContainerInfoComparator,allocator<TextureData *> >::erase
// TEMPLATE: LEGO1 0x1005a210
// _Tree<char const *,pair<char const * const,TextureData *>,map<char const *,TextureData *,LegoContainerInfoComparator,allocator<TextureData *> >::_Kfn,LegoContainerInfoComparator,allocator<TextureData *> >::_Erase
// TEMPLATE: LEGO1 0x1005a250
// list<TextureData *,allocator<TextureData *> >::~list<TextureData *,allocator<TextureData *> >
// TEMPLATE: LEGO1 0x1005a2c0
// map<char const *,TextureData *,LegoContainerInfoComparator,allocator<TextureData *> >::~map<char const *,TextureData *,LegoContainerInfoComparator,allocator<TextureData *> >
// TEMPLATE: LEGO1 0x1005a310
// LegoContainer<TextureData>::`scalar deleting destructor'
// TEMPLATE: LEGO1 0x1005a400
// LegoContainerInfo<TextureData>::~LegoContainerInfo<TextureData>
// TEMPLATE: LEGO1 0x1005a450
// Map<char const *,TextureData *,LegoContainerInfoComparator>::~Map<char const *,TextureData *,LegoContainerInfoComparator>
// SYNTHETIC: LEGO1 0x1005a580
// LegoTextureContainer::`scalar deleting destructor'
// TEMPLATE: LEGO1 0x1005a5a0
// List<TextureData *>::~List<TextureData *>
// TEMPLATE: LEGO1 0x1005b660
// LegoContainer<TextureData>::~LegoContainer<TextureData>
// GLOBAL: LEGO1 0x100f0100
// _Tree<char const *,pair<char const * const,TextureData *>,map<char const *,TextureData *,LegoContainerInfoComparator,allocator<TextureData *> >::_Kfn,LegoContainerInfoComparator,allocator<TextureData *> >::_Nil
// clang-format on
#endif // LEGOTEXTURECONTAINER_H

2
LEGO1/lego/legoomni/include/legogamestate.h
View File

@@ -2,9 +2,9 @@
#define LEGOGAMESTATE_H
#include "decomp.h"
#include "lego/sources/misc/legostorage.h"
#include "legobackgroundcolor.h"
#include "legofullscreenmovie.h"
#include "misc/legostorage.h"
#include "mxtypes.h"
#include "mxvariabletable.h"

2
LEGO1/lego/legoomni/include/legoomni.h
View File

@@ -275,7 +275,7 @@ ViewManager* GetViewManager();
LegoPlantManager* PlantManager();
LegoWorld* CurrentWorld();
LegoUnkSaveDataWriter* UnkSaveDataWriter();
LegoTextureContainer* GetTextureContainer();
LegoTextureContainer* TextureContainer();
void FUN_10015820(MxBool p_disable, MxU16 p_flags);
void SetROIUnknown0x0c(const char* p_name, undefined p_unk0x0c);
LegoWorld* FindWorld(const MxAtomId& p_atom, MxS32 p_entityid);

11
LEGO1/lego/legoomni/include/legophonemepresenter.h
View File

@@ -30,11 +30,12 @@ public:
private:
void Init();
int m_unk0x68;
int m_unk0x6c;
undefined m_unk0x70;
MxString m_string; // 0x74
undefined m_unk0x84;
undefined4 m_unk0x68; // 0x68
undefined4 m_unk0x6c; // 0x6c
undefined m_unk0x70; // 0x70
MxString m_unk0x74; // 0x74
undefined m_unk0x84; // 0x84
};
#endif // LEGOPHONEMEPRESENTER_H

2
LEGO1/lego/legoomni/include/legostate.h
View File

@@ -2,7 +2,7 @@
#define LEGOSTATE_H
#include "decomp.h"
#include "lego/sources/misc/legostorage.h"
#include "misc/legostorage.h"
#include "mxcore.h"
#include "mxstring.h"

23
LEGO1/lego/legoomni/include/legotextureinfo.h Normal file
View File

@@ -0,0 +1,23 @@
#ifndef LEGOTEXTUREINFO_H
#define LEGOTEXTUREINFO_H
#include <d3drmobj.h>
#include <ddraw.h>
class LegoTexture;
// SIZE 0x10
struct LegoTextureInfo {
public:
LegoTextureInfo();
~LegoTextureInfo();
static LegoTextureInfo* Create(const char* p_name, LegoTexture* p_texture);
char* m_name; // 0x00
LPDIRECTDRAWSURFACE m_surface; // 0x04
LPDIRECTDRAWPALETTE m_palette; // 0x08
LPDIRECT3DRMTEXTURE2 m_texture; // 0x0c
};
#endif // LEGOTEXTUREINFO_H

2
LEGO1/lego/legoomni/include/legounksavedatawriter.h
View File

@@ -2,8 +2,8 @@
#define LEGOUNKSAVEDATAWRITER_H
#include "decomp.h"
#include "lego/sources/misc/legostorage.h"
#include "legovariables.h"
#include "misc/legostorage.h"
#include "mxstl/stlcompat.h"
#include "mxtypes.h"