Identify model-related structures (#75)

This commit is contained in:
Yanis
2026-06-04 21:57:16 +02:00
committed by GitHub
parent 5a892963cd
commit 14cae7cbb1
29 changed files with 354 additions and 347 deletions
+1
View File
@@ -4,6 +4,7 @@
#include "Map/MapObjectId.hpp"
#include "MapObject/MapObjectProfile.hpp"
#include "Physics/Cylinder.hpp"
#include "Render/ModelRender.hpp"
#include "System/SysNew.hpp"
#include "flags.h"
#include "global.h"
+3 -2
View File
@@ -2,11 +2,12 @@
#include "Item/Item.hpp"
#include "MapObject/MapObject.hpp"
#include "Render/ModelRender.hpp"
#include "Unknown/Common.hpp"
#include "global.h"
#include "types.h"
class MapObjectTreasureSpawned_74 : public UnkSystem4 {
class MapObjectTreasureSpawned_74 : public ModelRender {
public:
/* 00 (base) */
/* 60 */ bool mUnk_60;
@@ -15,7 +16,7 @@ public:
/* 63 */ unk8 mUnk_63; // pad?
/* 64 */
MapObjectTreasureSpawned_74(unk32 param1);
MapObjectTreasureSpawned_74(G3d_Model *param1);
// data_ov031_02115844
/* 00 */ virtual ~MapObjectTreasureSpawned_74() override {}
+3 -2
View File
@@ -3,6 +3,7 @@
#include "MapObject/MapObject.hpp"
#include "MapObject/MapObjectDoorBase.hpp"
#include "MapObject/MapObjectProfile.hpp"
#include "Render/ModelRender.hpp"
#include "global.h"
#include "types.h"
#include "versions.h"
@@ -10,7 +11,7 @@
class MapObjectDoorSwitch : public MapObjectDoorBase {
public:
/* 000 (base) */
/* 094 */ UnkSystem4 mUnk_094;
/* 094 */ ModelRender mUnk_094;
/* 0F4 */ MapObject_10 mUnk_0F4;
#if IS_JP
/* 118 */ MapObject_10 mUnk_118;
@@ -45,7 +46,7 @@ public:
/* 74 */ virtual void vfunc_74() override;
// (MapObject_UnkStruct1_Derived1)
/* 10 */ virtual void *vfunc2_10();
/* 10 */ virtual G3d_Model *GetModel();
};
class MapObjectProfileDoorSwitch : public MapObjectProfile_Derived2 {
@@ -4,77 +4,18 @@
#include "Unknown/Common.hpp"
#include "types.h"
class MapObjectProfile_Derived2_20_Base_18 {
public:
/* 00 */ unk32 mUnk_00;
/* 04 */ unk32 mUnk_04;
/* 08 */
MapObjectProfile_Derived2_20_Base_18(); // func_02016620
};
class MapObjectProfile_Derived2_20_Base_20 {
public:
/* 00 */ void *mUnk_00;
/* 04 */ void *mUnk_04;
/* 08 */ unk32 mUnk_08;
/* 0C */
MapObjectProfile_Derived2_20_Base_20(unk32 param1, unk32 param2, unk32 param3, unk32 param4,
unk32 param5); // func_020153fc
};
class MapObjectProfile_Derived2_20_Base_54 {
public:
/* 00 */ unk32 mUnk_00;
/* 04 */ unk32 mUnk_04;
/* 08 */ unk32 mUnk_08;
/* 0C */ unk32 mUnk_0C;
/* 10 */
MapObjectProfile_Derived2_20_Base_54();
~MapObjectProfile_Derived2_20_Base_54();
};
class MapObjectProfile_Derived2_20_Base {
public:
/* 00 (vtable) */
/* 04 */ const char *mUnk_04;
/* 08 */ const char *mUnk_08;
/* 0C */ UnkResourceStruct_Base mUnk_0C;
/* 18 */ MapObjectProfile_Derived2_20_Base_18 mUnk_18;
/* 20 */ MapObjectProfile_Derived2_20_Base_20 mUnk_20;
/* 2C */ UnkFileSystem3 mUnk_2C;
/* 3C */ UnkFileSystem5 mUnk_3C;
/* 50 */ UnkResourceStruct *mUnk_50;
/* 54 */ MapObjectProfile_Derived2_20_Base_54 mUnk_54[4];
/* 94 */
MapObjectProfile_Derived2_20_Base(const char *directory, void *param2, void *param3, void *param4, unk32 param5,
unk32 param6); // func_ov000_02058540
// data_ov000_020b1b14
/* 00 */ virtual ~MapObjectProfile_Derived2_20_Base();
/* 08 */
void func_ov000_020586b4(unk32 param1, unk32 param2, unk32 param3, unk32 param4);
void func_ov000_020588f0(void);
void func_ov000_02058900(void);
void func_ov000_02058914(unk32 param1);
void func_ov000_020589e4(void);
unk32 func_ov000_02058a24();
void unc_ov000_02058a58(void);
unk32 func_ov000_02058a84(unk32 param1, const char *param2);
void func_ov000_02058ab0(void);
};
class MapObjectProfile_Derived2_20 : public MapObjectProfile_Derived2_20_Base {
public:
/* 00 (base) */
/* 94 */ unk16 mUnk_94;
/* 96 */ unk16 mUnk_96;
/* 98 */ unk16 mUnk_98;
/* 9A */ unk16 mUnk_9A;
/* 94 */ union {
wchar_t mUnk_94[4];
struct {
u16 unk_94;
u16 unk_96;
u16 unk_98;
u16 unk_9A;
};
};
/* 9C */ UnkFileSystem5 mUnk_9C;
/* B0 */ bool mUnk_B0;
/* B1 */ unk8 mUnk_B1; // bool?
+2 -1
View File
@@ -2,11 +2,12 @@
#include "MapObject/MapObject.hpp"
#include "MapObject/MapObjectProfile.hpp"
#include "Render/ModelRender.hpp"
#include "Unknown/Common.hpp"
#include "global.h"
#include "types.h"
class MapObjectSwitchStep_40 : public UnkSystem4 {
class MapObjectSwitchStep_40 : public ModelRender {
public:
/* 00 (base) */
/* 60 */ unk16 mUnk_60;