mirror of
https://github.com/isledecomp/isle.git
synced 2024-11-21 10:48:15 -05:00
Refactor LegoContainer (#587)
* Refactor LegoContainer * Fix name * Fix build * Refactor some includes * Update STL compat * Fix * Fix annotations
This commit is contained in:
Christian Semmler
GitHub
parent
9d8820ee06
commit
6b1c75ab5a
18 changed files with 249 additions and 227 deletions
|
|
@ -144,7 +144,7 @@ add_library(roi STATIC
|
|||
)
|
||||
register_lego1_target(roi)
|
||||
set_property(TARGET roi PROPERTY ARCHIVE_OUTPUT_NAME "roi$<$<CONFIG:Debug>:d>")
|
||||
target_include_directories(roi PRIVATE "${CMAKE_SOURCE_DIR}/LEGO1" "${CMAKE_SOURCE_DIR}/util")
|
||||
target_include_directories(roi PRIVATE "${CMAKE_SOURCE_DIR}/LEGO1" "${CMAKE_SOURCE_DIR}/LEGO1/lego/sources" "${CMAKE_SOURCE_DIR}/util")
|
||||
target_link_libraries(roi PRIVATE)
|
||||
|
||||
add_library(anim STATIC
|
||||
|
|
@ -152,10 +152,11 @@ add_library(anim STATIC
|
|||
)
|
||||
register_lego1_target(anim)
|
||||
set_property(TARGET anim PROPERTY ARCHIVE_OUTPUT_NAME "anim$<$<CONFIG:Debug>:d>")
|
||||
target_include_directories(anim PRIVATE "${CMAKE_SOURCE_DIR}/LEGO1/omni/include" "${CMAKE_SOURCE_DIR}/LEGO1" "${CMAKE_SOURCE_DIR}/util")
|
||||
target_include_directories(anim PRIVATE "${CMAKE_SOURCE_DIR}/LEGO1/omni/include" "${CMAKE_SOURCE_DIR}/LEGO1" "${CMAKE_SOURCE_DIR}/LEGO1/lego/sources" "${CMAKE_SOURCE_DIR}/util")
|
||||
target_link_libraries(anim PRIVATE)
|
||||
|
||||
add_library(misc STATIC
|
||||
LEGO1/lego/sources/misc/legocontainer.cpp
|
||||
LEGO1/lego/sources/misc/legoimage.cpp
|
||||
LEGO1/lego/sources/misc/legostorage.cpp
|
||||
LEGO1/lego/sources/misc/legotexture.cpp
|
||||
|
|
@ -163,7 +164,7 @@ add_library(misc STATIC
|
|||
)
|
||||
register_lego1_target(misc)
|
||||
set_property(TARGET misc PROPERTY ARCHIVE_OUTPUT_NAME "misc$<$<CONFIG:Debug>:d>")
|
||||
target_include_directories(misc PRIVATE "${CMAKE_SOURCE_DIR}/LEGO1/omni/include" "${CMAKE_SOURCE_DIR}/LEGO1" "${CMAKE_SOURCE_DIR}/LEGO1/realtime" "${CMAKE_SOURCE_DIR}/util")
|
||||
target_include_directories(misc PRIVATE "${CMAKE_SOURCE_DIR}/LEGO1/omni/include" "${CMAKE_SOURCE_DIR}/LEGO1" "${CMAKE_SOURCE_DIR}/util")
|
||||
target_link_libraries(misc PRIVATE)
|
||||
|
||||
add_library(3dmanager STATIC
|
||||
|
|
@ -293,12 +294,12 @@ add_library(lego1 SHARED
|
|||
LEGO1/lego/legoomni/src/common/animstate.cpp
|
||||
LEGO1/lego/legoomni/src/common/legoactioncontrolpresenter.cpp
|
||||
LEGO1/lego/legoomni/src/common/legobackgroundcolor.cpp
|
||||
LEGO1/lego/legoomni/src/common/legocontainer.cpp
|
||||
LEGO1/lego/legoomni/src/common/legofullscreenmovie.cpp
|
||||
LEGO1/lego/legoomni/src/common/legogamestate.cpp
|
||||
LEGO1/lego/legoomni/src/common/legoobjectfactory.cpp
|
||||
LEGO1/lego/legoomni/src/common/legoplantmanager.cpp
|
||||
LEGO1/lego/legoomni/src/common/legostate.cpp
|
||||
LEGO1/lego/legoomni/src/common/legotextureinfo.cpp
|
||||
LEGO1/lego/legoomni/src/common/legounksavedatawriter.cpp
|
||||
LEGO1/lego/legoomni/src/common/legoutil.cpp
|
||||
LEGO1/lego/legoomni/src/common/legovariables.cpp
|
||||
|
|
@ -407,7 +408,6 @@ target_include_directories(lego1 PUBLIC "${CMAKE_SOURCE_DIR}/LEGO1")
|
|||
target_include_directories(lego1 PUBLIC "${CMAKE_SOURCE_DIR}/LEGO1/omni/include")
|
||||
target_include_directories(lego1 PUBLIC "${CMAKE_SOURCE_DIR}/LEGO1/lego/sources")
|
||||
target_include_directories(lego1 PUBLIC "${CMAKE_SOURCE_DIR}/LEGO1/lego/legoomni/include")
|
||||
target_include_directories(lego1 PUBLIC "${CMAKE_SOURCE_DIR}/LEGO1/realtime")
|
||||
|
||||
# Link libraries
|
||||
target_link_libraries(lego1 PRIVATE tglrl viewmanager realtime mxdirectx roi anim FLIC::FLIC Vec::Vec dinput dxguid misc 3dmanager omni)
|
||||
|
|
|
|||
|
|
@ -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"
|
||||
|
||||
|
|
|
|||
|
|
@ -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,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"
|
||||
|
||||
|
|
|
|||
|
|
@ -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);
|
||||
|
|
|
|||
|
|
@ -30,11 +30,12 @@ class LegoPhonemePresenter : public MxFlcPresenter {
|
|||
|
||||
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,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
23
LEGO1/lego/legoomni/include/legotextureinfo.h
Normal 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,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"
|
||||
|
||||
|
|
|
|||
|
|
@ -1,18 +1,15 @@
|
|||
#include "legocontainer.h"
|
||||
#include "legotextureinfo.h"
|
||||
|
||||
#include "lego/sources/misc/legoimage.h"
|
||||
#include "lego/sources/misc/legotexture.h"
|
||||
#include "legoomni.h"
|
||||
#include "legovideomanager.h"
|
||||
#include "misc/legoimage.h"
|
||||
#include "misc/legotexture.h"
|
||||
#include "tgl/d3drm/impl.h"
|
||||
|
||||
DECOMP_SIZE_ASSERT(TextureData, 0x10);
|
||||
DECOMP_SIZE_ASSERT(LegoContainerInfo<LegoTexture>, 0x10);
|
||||
// DECOMP_SIZE_ASSERT(LegoContainer<LegoTexture>, 0x18);
|
||||
DECOMP_SIZE_ASSERT(LegoTextureContainer, 0x24);
|
||||
DECOMP_SIZE_ASSERT(LegoTextureInfo, 0x10);
|
||||
|
||||
// FUNCTION: LEGO1 0x10065bf0
|
||||
TextureData::TextureData()
|
||||
LegoTextureInfo::LegoTextureInfo()
|
||||
{
|
||||
m_name = NULL;
|
||||
m_surface = NULL;
|
||||
|
|
@ -21,7 +18,7 @@ TextureData::TextureData()
|
|||
}
|
||||
|
||||
// FUNCTION: LEGO1 0x10065c00
|
||||
TextureData::~TextureData()
|
||||
LegoTextureInfo::~LegoTextureInfo()
|
||||
{
|
||||
if (m_name) {
|
||||
delete[] m_name;
|
||||
|
|
@ -45,9 +42,9 @@ TextureData::~TextureData()
|
|||
}
|
||||
|
||||
// FUNCTION: LEGO1 0x10065c60
|
||||
TextureData* TextureData::Create(const char* p_name, LegoTexture* p_texture)
|
||||
LegoTextureInfo* LegoTextureInfo::Create(const char* p_name, LegoTexture* p_texture)
|
||||
{
|
||||
TextureData* texture = new TextureData();
|
||||
LegoTextureInfo* texture = new LegoTextureInfo();
|
||||
|
||||
if (p_name == NULL || p_texture == NULL) {
|
||||
return NULL;
|
||||
|
|
@ -154,35 +151,3 @@ TextureData* TextureData::Create(const char* p_name, LegoTexture* p_texture)
|
|||
|
||||
return NULL;
|
||||
}
|
||||
|
||||
// FUNCTION: LEGO1 0x10099870
|
||||
LegoTextureContainer::~LegoTextureContainer()
|
||||
{
|
||||
}
|
||||
|
||||
// FUNCTION: LEGO1 0x10099cc0
|
||||
void LegoTextureContainer::FUN_10099cc0(TextureData* p_data)
|
||||
{
|
||||
if (p_data == NULL) {
|
||||
return;
|
||||
}
|
||||
|
||||
#ifdef COMPAT_MODE
|
||||
TextureList::iterator it;
|
||||
for (it = m_list.begin(); it != m_list.end(); it++) {
|
||||
#else
|
||||
for (TextureList::iterator it = m_list.begin(); it != m_list.end(); it++) {
|
||||
#endif
|
||||
if (*it == p_data) {
|
||||
// TODO: This is wrong, but what is at +0x0c on the iterator?
|
||||
*it = NULL;
|
||||
|
||||
if (p_data->m_texture->Release() == TRUE) {
|
||||
delete p_data;
|
||||
m_list.erase(it);
|
||||
}
|
||||
|
||||
return;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
#include "ambulancemissionstate.h"
|
||||
#include "jukebox.h"
|
||||
#include "legocontainer.h"
|
||||
#include "legocontrolmanager.h"
|
||||
#include "legogamestate.h"
|
||||
#include "legoinputmanager.h"
|
||||
#include "legoomni.h"
|
||||
#include "misc/legocontainer.h"
|
||||
#include "mxnotificationmanager.h"
|
||||
#include "mxnotificationparam.h"
|
||||
#include "mxtransitionmanager.h"
|
||||
|
|
@ -233,7 +233,7 @@ void Score::Enable(MxBool p_enable)
|
|||
// FUNCTION: LEGO1 0x100019d0
|
||||
void Score::Paint()
|
||||
{
|
||||
TextureData* gd = GetTextureContainer()->Get("bigcube.gif");
|
||||
LegoTextureInfo* gd = TextureContainer()->Get("bigcube.gif");
|
||||
|
||||
if (gd) {
|
||||
RaceState* l78 = (RaceState*) GameState()->GetState("JetskiRaceState");
|
||||
|
|
|
|||
|
|
@ -2,7 +2,6 @@
|
|||
|
||||
#include "legoanimationmanager.h"
|
||||
#include "legobuildingmanager.h"
|
||||
#include "legocontainer.h"
|
||||
#include "legogamestate.h"
|
||||
#include "legoinputmanager.h"
|
||||
#include "legoobjectfactory.h"
|
||||
|
|
@ -14,6 +13,7 @@
|
|||
#include "legovideomanager.h"
|
||||
#include "legoworld.h"
|
||||
#include "legoworldlist.h"
|
||||
#include "misc/legocontainer.h"
|
||||
#include "mxactionnotificationparam.h"
|
||||
#include "mxautolocker.h"
|
||||
#include "mxbackgroundaudiomanager.h"
|
||||
|
|
@ -215,7 +215,7 @@ LegoBuildingManager* BuildingManager()
|
|||
}
|
||||
|
||||
// FUNCTION: LEGO1 0x10015800
|
||||
LegoTextureContainer* GetTextureContainer()
|
||||
LegoTextureContainer* TextureContainer()
|
||||
{
|
||||
return LegoOmni::GetInstance()->GetTextureContainer();
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
#include "legopalettepresenter.h"
|
||||
|
||||
#include "lego/sources/misc/legostorage.h"
|
||||
#include "legoomni.h"
|
||||
#include "legovideomanager.h"
|
||||
#include "misc/legostorage.h"
|
||||
#include "mxstreamchunk.h"
|
||||
|
||||
DECOMP_SIZE_ASSERT(LegoPalettePresenter, 0x68)
|
||||
|
|
|
|||
|
|
@ -2,8 +2,8 @@
|
|||
#define __LEGOANIM_H
|
||||
|
||||
#include "decomp.h"
|
||||
#include "lego/sources/misc/legostorage.h"
|
||||
#include "lego/sources/misc/legotree.h"
|
||||
#include "misc/legostorage.h"
|
||||
#include "misc/legotree.h"
|
||||
|
||||
// SIZE 0x08
|
||||
class LegoAnimKey {
|
||||
|
|
|
|||
43
LEGO1/lego/sources/misc/legocontainer.cpp
Normal file
43
LEGO1/lego/sources/misc/legocontainer.cpp
Normal file
|
|
@ -0,0 +1,43 @@
|
|||
#include "legocontainer.h"
|
||||
|
||||
DECOMP_SIZE_ASSERT(LegoContainerInfo<LegoTexture>, 0x10);
|
||||
// DECOMP_SIZE_ASSERT(LegoContainer<LegoTexture>, 0x18);
|
||||
DECOMP_SIZE_ASSERT(LegoTextureContainer, 0x24);
|
||||
|
||||
// FUNCTION: LEGO1 0x10099870
|
||||
LegoTextureContainer::~LegoTextureContainer()
|
||||
{
|
||||
}
|
||||
|
||||
// STUB: LEGO1 0x100998e0
|
||||
LegoTextureInfo* LegoTextureContainer::Create(undefined* p_und)
|
||||
{
|
||||
return NULL;
|
||||
}
|
||||
|
||||
// FUNCTION: LEGO1 0x10099cc0
|
||||
void LegoTextureContainer::Destroy(LegoTextureInfo* p_data)
|
||||
{
|
||||
if (p_data == NULL) {
|
||||
return;
|
||||
}
|
||||
|
||||
#ifdef COMPAT_MODE
|
||||
LegoTextureList::iterator it;
|
||||
for (it = m_list.begin(); it != m_list.end(); it++) {
|
||||
#else
|
||||
for (LegoTextureList::iterator it = m_list.begin(); it != m_list.end(); it++) {
|
||||
#endif
|
||||
if (((*it).first) == p_data) {
|
||||
// TODO: Element type
|
||||
(*it).second = 0;
|
||||
|
||||
if (p_data->m_texture->Release() == TRUE) {
|
||||
delete p_data;
|
||||
m_list.erase(it);
|
||||
}
|
||||
|
||||
return;
|
||||
}
|
||||
}
|
||||
}
|
||||
149
LEGO1/lego/sources/misc/legocontainer.h
Normal file
149
LEGO1/lego/sources/misc/legocontainer.h
Normal file
|
|
@ -0,0 +1,149 @@
|
|||
#ifndef LEGOCONTAINER_H
|
||||
#define LEGOCONTAINER_H
|
||||
|
||||
#include "compat.h"
|
||||
#include "decomp.h"
|
||||
#include "legotexture.h"
|
||||
#include "legotypes.h"
|
||||
#include "mxstl/stlcompat.h"
|
||||
|
||||
// Note: dependency on LegoOmni
|
||||
#include "lego/legoomni/include/legotextureinfo.h"
|
||||
|
||||
#pragma warning(disable : 4237)
|
||||
|
||||
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(LegoBool p_ownership) { m_ownership = p_ownership; }
|
||||
|
||||
protected:
|
||||
LegoBool m_ownership; // 0x04
|
||||
LegoContainerInfo<T> m_map; // 0x08
|
||||
};
|
||||
|
||||
// VTABLE: LEGO1 0x100d86d4
|
||||
// class LegoContainer<LegoTextureInfo>
|
||||
|
||||
// TODO: Element type
|
||||
typedef pair<LegoTextureInfo*, undefined4> LegoTextureListElement;
|
||||
typedef list<LegoTextureListElement> LegoTextureList;
|
||||
|
||||
// VTABLE: LEGO1 0x100d86fc
|
||||
// SIZE 0x24
|
||||
class LegoTextureContainer : public LegoContainer<LegoTextureInfo> {
|
||||
public:
|
||||
LegoTextureContainer() { m_ownership = TRUE; }
|
||||
~LegoTextureContainer() override;
|
||||
|
||||
LegoTextureInfo* Create(undefined* p_und);
|
||||
void Destroy(LegoTextureInfo* p_data);
|
||||
|
||||
protected:
|
||||
LegoTextureList m_list; // 0x18
|
||||
};
|
||||
|
||||
// TEMPLATE: LEGO1 0x10059c50
|
||||
// allocator<LegoTextureInfo *>::_Charalloc
|
||||
|
||||
// clang-format off
|
||||
// TEMPLATE: LEGO1 0x10001cc0
|
||||
// _Tree<char const *,pair<char const * const,LegoTextureInfo *>,map<char const *,LegoTextureInfo *,LegoContainerInfoComparator,allocator<LegoTextureInfo *> >::_Kfn,LegoContainerInfoComparator,allocator<LegoTextureInfo *> >::_Lbound
|
||||
|
||||
// TEMPLATE: LEGO1 0x1004f9b0
|
||||
// _Tree<char const *,pair<char const * const,LegoTextureInfo *>,map<char const *,LegoTextureInfo *,LegoContainerInfoComparator,allocator<LegoTextureInfo *> >::_Kfn,LegoContainerInfoComparator,allocator<LegoTextureInfo *> >::_Insert
|
||||
|
||||
// TEMPLATE: LEGO1 0x10059c70
|
||||
// _Tree<char const *,pair<char const * const,LegoTextureInfo *>,map<char const *,LegoTextureInfo *,LegoContainerInfoComparator,allocator<LegoTextureInfo *> >::_Kfn,LegoContainerInfoComparator,allocator<LegoTextureInfo *> >::_Color
|
||||
|
||||
// TEMPLATE: LEGO1 0x10059c80
|
||||
// _Tree<char const *,pair<char const * const,LegoTextureInfo *>,map<char const *,LegoTextureInfo *,LegoContainerInfoComparator,allocator<LegoTextureInfo *> >::_Kfn,LegoContainerInfoComparator,allocator<LegoTextureInfo *> >::_Left
|
||||
|
||||
// TEMPLATE: LEGO1 0x10059c90
|
||||
// _Tree<char const *,pair<char const * const,LegoTextureInfo *>,map<char const *,LegoTextureInfo *,LegoContainerInfoComparator,allocator<LegoTextureInfo *> >::_Kfn,LegoContainerInfoComparator,allocator<LegoTextureInfo *> >::_Parent
|
||||
|
||||
// TEMPLATE: LEGO1 0x10059ca0
|
||||
// _Tree<char const *,pair<char const * const,LegoTextureInfo *>,map<char const *,LegoTextureInfo *,LegoContainerInfoComparator,allocator<LegoTextureInfo *> >::_Kfn,LegoContainerInfoComparator,allocator<LegoTextureInfo *> >::_Right
|
||||
|
||||
// TEMPLATE: LEGO1 0x10059cb0
|
||||
// _Tree<char const *,pair<char const * const,LegoTextureInfo *>,map<char const *,LegoTextureInfo *,LegoContainerInfoComparator,allocator<LegoTextureInfo *> >::_Kfn,LegoContainerInfoComparator,allocator<LegoTextureInfo *> >::~_Tree<char const *,pair<char const * const,LegoTextureInfo *>,map<char const *,LegoTextureInfo *,LegoContainerInfoComparator,allocator<LegoTextureInfo *> >::_Kfn,LegoContainerInfoComparator,allocator<LegoTextureInfo *> >
|
||||
|
||||
// TEMPLATE: LEGO1 0x10059d80
|
||||
// _Tree<char const *,pair<char const * const,LegoTextureInfo *>,map<char const *,LegoTextureInfo *,LegoContainerInfoComparator,allocator<LegoTextureInfo *> >::_Kfn,LegoContainerInfoComparator,allocator<LegoTextureInfo *> >::iterator::_Inc
|
||||
|
||||
// TEMPLATE: LEGO1 0x10059dc0
|
||||
// _Tree<char const *,pair<char const * const,LegoTextureInfo *>,map<char const *,LegoTextureInfo *,LegoContainerInfoComparator,allocator<LegoTextureInfo *> >::_Kfn,LegoContainerInfoComparator,allocator<LegoTextureInfo *> >::erase
|
||||
|
||||
// TEMPLATE: LEGO1 0x1005a210
|
||||
// _Tree<char const *,pair<char const * const,LegoTextureInfo *>,map<char const *,LegoTextureInfo *,LegoContainerInfoComparator,allocator<LegoTextureInfo *> >::_Kfn,LegoContainerInfoComparator,allocator<LegoTextureInfo *> >::_Erase
|
||||
|
||||
// TEMPLATE: LEGO1 0x1005a250
|
||||
// list<pair<LegoTextureInfo *,unsigned int>,allocator<pair<LegoTextureInfo *,unsigned int> > >::~list<pair<LegoTextureInfo *,unsigned int>,allocator<pair<LegoTextureInfo *,unsigned int> > >
|
||||
|
||||
// TEMPLATE: LEGO1 0x1005a2c0
|
||||
// map<char const *,LegoTextureInfo *,LegoContainerInfoComparator,allocator<LegoTextureInfo *> >::~map<char const *,LegoTextureInfo *,LegoContainerInfoComparator,allocator<LegoTextureInfo *> >
|
||||
|
||||
// TEMPLATE: LEGO1 0x1005a310
|
||||
// LegoContainer<LegoTextureInfo>::`scalar deleting destructor'
|
||||
|
||||
// TEMPLATE: LEGO1 0x1005a400
|
||||
// LegoContainerInfo<LegoTextureInfo>::~LegoContainerInfo<LegoTextureInfo>
|
||||
|
||||
// TEMPLATE: LEGO1 0x1005a450
|
||||
// Map<char const *,LegoTextureInfo *,LegoContainerInfoComparator>::~Map<char const *,LegoTextureInfo *,LegoContainerInfoComparator>
|
||||
|
||||
// SYNTHETIC: LEGO1 0x1005a580
|
||||
// LegoTextureContainer::`scalar deleting destructor'
|
||||
|
||||
// TEMPLATE: LEGO1 0x1005a5a0
|
||||
// List<pair<LegoTextureInfo *,unsigned int> >::~List<pair<LegoTextureInfo *,unsigned int> >
|
||||
|
||||
// TEMPLATE: LEGO1 0x1005b660
|
||||
// LegoContainer<LegoTextureInfo>::~LegoContainer<LegoTextureInfo>
|
||||
|
||||
// GLOBAL: LEGO1 0x100f0100
|
||||
// _Tree<char const *,pair<char const * const,LegoTextureInfo *>,map<char const *,LegoTextureInfo *,LegoContainerInfoComparator,allocator<LegoTextureInfo *> >::_Kfn,LegoContainerInfoComparator,allocator<LegoTextureInfo *> >::_Nil
|
||||
// clang-format on
|
||||
|
||||
#endif // LEGOCONTAINER_H
|
||||
|
|
@ -1,7 +1,7 @@
|
|||
#ifndef LEGOROI_H
|
||||
#define LEGOROI_H
|
||||
|
||||
#include "lego/sources/misc/legotypes.h"
|
||||
#include "misc/legotypes.h"
|
||||
#include "viewmanager/viewroi.h"
|
||||
|
||||
typedef unsigned char (*ROIHandler)(char*, char*, unsigned int);
|
||||
|
|
|
|||
|
|
@ -12,9 +12,11 @@
|
|||
#include <list>
|
||||
#include <map>
|
||||
#include <set>
|
||||
#include <utility>
|
||||
#include <vector>
|
||||
using std::list;
|
||||
using std::map;
|
||||
using std::pair;
|
||||
using std::set;
|
||||
using std::vector;
|
||||
#endif
|
||||
|
|
|
|||
Loading…
Reference in a new issue