isledecomp/isle
1
0
Fork 0
mirror of https://github.com/isledecomp/isle.git synced 2026-01-31 04:01:16 +00:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Run clang-format

Browse Source
This commit is contained in:
Anonymous Maarten 2024-02-03 00:12:59 +01:00
parent b602c11c4a
commit 2778938be2
3 changed files with 340 additions and 331 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
LEGO1/lego/legoomni/include/act1state.h
View File

@ -2,7 +2,6 @@
#define ACT1STATE_H #define ACT1STATE_H
#include "legostate.h" #include "legostate.h"
#include "misc/legotexture.h" #include "misc/legotexture.h"
#include "roi/legoroi.h" #include "roi/legoroi.h"
@ -47,11 +46,11 @@ class Act1State : public LegoState {
class NamedPlane { class NamedPlane {
public: public:
// FUNCTION: LEGO1 0x10033800 // FUNCTION: LEGO1 0x10033800
NamedPlane() { } NamedPlane() {}
inline void SetName(const char *name) { m_name = name; } inline void SetName(const char* name) { m_name = name; }
inline const MxString *GetName() const { return &m_name; } inline const MxString* GetName() const { return &m_name; }
int Serialize(LegoFile *p_file); int Serialize(LegoFile* p_file);
private: private:
MxString m_name; // 0x00 MxString m_name; // 0x00
@ -63,20 +62,18 @@ class Act1State : public LegoState {
// SIZE 0x14 // SIZE 0x14
class NamedTexture { class NamedTexture {
public: public:
~NamedTexture() { ~NamedTexture() { delete m_texture; }
delete m_texture;
}
// FUNCTION: LEGO1 0x1003f920 // FUNCTION: LEGO1 0x1003f920
const MxString *GetName() const { const MxString* GetName() const { return &m_name; }
return &m_name; LegoTexture* GetTexture() { return m_texture; }
}
LegoTexture *GetTexture() { return m_texture; }
private: private:
MxString m_name; // 0x00 MxString m_name; // 0x00
LegoTexture *m_texture; // 0x4 LegoTexture* m_texture; // 0x4
}; };
protected: protected:
int *m_unk0x008; // 0x008 int* m_unk0x008; // 0x008
// FIXME: count for m_unk0x008 // FIXME: count for m_unk0x008
MxS16 m_unk0x00c; // 0x00c MxS16 m_unk0x00c; // 0x00c
undefined2 m_unk0x00e; // 0x00e undefined2 m_unk0x00e; // 0x00e
@ -95,22 +92,22 @@ class Act1State : public LegoState {
NamedPlane m_unk0x070; // 0x070 NamedPlane m_unk0x070; // 0x070
NamedPlane m_unk0x0bc; // 0x0bc NamedPlane m_unk0x0bc; // 0x0bc
NamedPlane m_unk0x108; // 0x108 NamedPlane m_unk0x108; // 0x108
NamedTexture *m_unk0x154; // 0x154 NamedTexture* m_unk0x154; // 0x154
NamedTexture *m_unk0x158; // 0x158 NamedTexture* m_unk0x158; // 0x158
NamedTexture *m_unk0x15c; // 0x15c NamedTexture* m_unk0x15c; // 0x15c
MxCore *m_unk0x160; // 0x160 MxCore* m_unk0x160; // 0x160
NamedPlane m_unk0x164; // 0x164 NamedPlane m_unk0x164; // 0x164
NamedTexture *m_unk0x1b0; // 0x1b0 NamedTexture* m_unk0x1b0; // 0x1b0
NamedTexture *m_unk0x1b4; // 0x1b4 NamedTexture* m_unk0x1b4; // 0x1b4
MxCore *m_unk0x1b8; // 0x1b8 MxCore* m_unk0x1b8; // 0x1b8
NamedPlane m_unk0x1bc; // 0x1bc NamedPlane m_unk0x1bc; // 0x1bc
NamedTexture *m_unk0x208; // 0x208 NamedTexture* m_unk0x208; // 0x208
MxCore *m_unk0x20c; // 0x20c MxCore* m_unk0x20c; // 0x20c
NamedPlane m_unk0x210; // 0x210 NamedPlane m_unk0x210; // 0x210
NamedTexture *m_unk0x25c; // 0x25c NamedTexture* m_unk0x25c; // 0x25c
NamedTexture *m_unk0x260; // 0x260 NamedTexture* m_unk0x260; // 0x260
NamedTexture *m_unk0x264; // 0x264 NamedTexture* m_unk0x264; // 0x264
MxCore *m_unk0x268; // 0x268 MxCore* m_unk0x268; // 0x268
}; };
#endif // ACT1STATE_H #endif // ACT1STATE_H

96
LEGO1/lego/legoomni/src/act1/act1state.cpp
View File

@ -7,9 +7,9 @@ DECOMP_SIZE_ASSERT(Act1State::NamedTexture, 0x14)
#define isle_asize(ARR) (sizeof(ARR) / sizeof((ARR)[0])) #define isle_asize(ARR) (sizeof(ARR) / sizeof((ARR)[0]))
// Forward declarations // Forward declarations
Act1State::NamedTexture *ReadNamedTexture(LegoFile *p_file); Act1State::NamedTexture* ReadNamedTexture(LegoFile* p_file);
void WriteNamedTexture(LegoFile *p_file, Act1State::NamedTexture *p_texture); void WriteNamedTexture(LegoFile* p_file, Act1State::NamedTexture* p_texture);
void FUN_1003f540(LegoFile *p_file, const char *p_filename); void FUN_1003f540(LegoFile* p_file, const char* p_filename);
enum { enum {
eUnk_953 = 953, eUnk_953 = 953,
@ -25,11 +25,7 @@ int g_act1_ints[] = {
}; };
// STUB: LEGO1 0x100334b0 // STUB: LEGO1 0x100334b0
Act1State::Act1State() Act1State::Act1State() : m_unk0x00c(0), m_unk0x00e(0), m_unk0x008(NULL), m_unk0x010(0)
: m_unk0x00c(0)
, m_unk0x00e(0)
, m_unk0x008(NULL)
, m_unk0x010(0)
{ {
m_unk0x01e = 0; m_unk0x01e = 0;
m_unk0x018 = 1; m_unk0x018 = 1;
@ -76,59 +72,69 @@ MxResult Act1State::VTable0x1c(LegoFile* p_legoFile)
if (m_unk0x108.GetName()->Compare("") != 0) { if (m_unk0x108.GetName()->Compare("") != 0) {
if (m_unk0x154) { if (m_unk0x154) {
WriteNamedTexture(p_legoFile, m_unk0x154); WriteNamedTexture(p_legoFile, m_unk0x154);
} else { }
else {
FUN_1003f540(p_legoFile, "chwind.gif"); FUN_1003f540(p_legoFile, "chwind.gif");
} }
if (m_unk0x158) { if (m_unk0x158) {
WriteNamedTexture(p_legoFile, m_unk0x158); WriteNamedTexture(p_legoFile, m_unk0x158);
} else { }
else {
FUN_1003f540(p_legoFile, "chjetl.gif"); FUN_1003f540(p_legoFile, "chjetl.gif");
} }
if (m_unk0x15c) { if (m_unk0x15c) {
WriteNamedTexture(p_legoFile, m_unk0x15c); WriteNamedTexture(p_legoFile, m_unk0x15c);
} else { }
else {
FUN_1003f540(p_legoFile, "chjetr.gif"); FUN_1003f540(p_legoFile, "chjetr.gif");
} }
} }
if (m_unk0x164.GetName()->Compare("") != 0) { if (m_unk0x164.GetName()->Compare("") != 0) {
if (m_unk0x1b0) { if (m_unk0x1b0) {
WriteNamedTexture(p_legoFile, m_unk0x1b0); WriteNamedTexture(p_legoFile, m_unk0x1b0);
} else { }
else {
FUN_1003f540(p_legoFile, "jsfrnt.gif"); FUN_1003f540(p_legoFile, "jsfrnt.gif");
} }
if (m_unk0x1b4) { if (m_unk0x1b4) {
WriteNamedTexture(p_legoFile, m_unk0x1b4); WriteNamedTexture(p_legoFile, m_unk0x1b4);
} else { }
else {
FUN_1003f540(p_legoFile, "jswnsh.gif"); FUN_1003f540(p_legoFile, "jswnsh.gif");
} }
} }
if (m_unk0x1bc.GetName()->Compare("") != 0) { if (m_unk0x1bc.GetName()->Compare("") != 0) {
if (m_unk0x208) { if (m_unk0x208) {
WriteNamedTexture(p_legoFile, m_unk0x208); WriteNamedTexture(p_legoFile, m_unk0x208);
} else { }
else {
FUN_1003f540(p_legoFile, "dbfrfn.gif"); FUN_1003f540(p_legoFile, "dbfrfn.gif");
} }
} }
if (m_unk0x210.GetName()->Compare("") != 0) { if (m_unk0x210.GetName()->Compare("") != 0) {
if (m_unk0x25c) { if (m_unk0x25c) {
WriteNamedTexture(p_legoFile, m_unk0x25c); WriteNamedTexture(p_legoFile, m_unk0x25c);
} else { }
else {
FUN_1003f540(p_legoFile, "rcfrnt.gif"); FUN_1003f540(p_legoFile, "rcfrnt.gif");
} }
if (m_unk0x260) { if (m_unk0x260) {
WriteNamedTexture(p_legoFile, m_unk0x260); WriteNamedTexture(p_legoFile, m_unk0x260);
} else { }
else {
FUN_1003f540(p_legoFile, "rcback.gif"); FUN_1003f540(p_legoFile, "rcback.gif");
} }
if (m_unk0x264) { if (m_unk0x264) {
WriteNamedTexture(p_legoFile, m_unk0x264); WriteNamedTexture(p_legoFile, m_unk0x264);
} else { }
else {
FUN_1003f540(p_legoFile, "rctail.gif"); FUN_1003f540(p_legoFile, "rctail.gif");
} }
} }
p_legoFile->Write(&m_unk0x010, sizeof(undefined2)); p_legoFile->Write(&m_unk0x010, sizeof(undefined2));
p_legoFile->Write(&m_unk0x022, sizeof(undefined)); p_legoFile->Write(&m_unk0x022, sizeof(undefined));
} else if (p_legoFile->IsReadMode()) { }
else if (p_legoFile->IsReadMode()) {
if (m_unk0x108.GetName()->Compare("") != 0) { if (m_unk0x108.GetName()->Compare("") != 0) {
m_unk0x154 = ReadNamedTexture(p_legoFile); m_unk0x154 = ReadNamedTexture(p_legoFile);
if (m_unk0x154 == NULL) { if (m_unk0x154 == NULL) {
@ -180,6 +186,24 @@ MxResult Act1State::VTable0x1c(LegoFile* p_legoFile)
return SUCCESS; return SUCCESS;
} }
// FUNCTION: LEGO1 0x100344d0
int Act1State::NamedPlane::Serialize(LegoFile* p_file)
{
if (p_file->IsWriteMode()) {
p_file->FUN_10006030(m_name);
p_file->WriteVector3(m_point1);
p_file->WriteVector3(m_point2);
p_file->WriteVector3(m_point3);
}
else if (p_file->IsReadMode()) {
p_file->ReadString(&m_name);
p_file->ReadVector3(&m_point1);
p_file->ReadVector3(&m_point2);
p_file->ReadVector3(&m_point3);
}
return 0;
}
// FUNCTION: LEGO1 0x100346d0 // FUNCTION: LEGO1 0x100346d0
MxBool Act1State::SetFlag() MxBool Act1State::SetFlag()
{ {
@ -252,34 +276,20 @@ void Act1State::FUN_10034d00()
// TODO // TODO
} }
// FUNCTION: LEGO1 0x1003f8a0
void WriteNamedTexture(LegoFile *p_file, Act1State::NamedTexture *p_texture) {
p_file->FUN_10006030(*p_texture->GetName());
p_texture->GetTexture()->Write(p_file);
}
// STUB: LEGO1 0x1003f3b0 // STUB: LEGO1 0x1003f3b0
Act1State::NamedTexture *ReadNamedTexture(LegoFile *p_file) { Act1State::NamedTexture* ReadNamedTexture(LegoFile* p_file)
{
return NULL; return NULL;
} }
// FUNCTION: LEGO1 0x100344d0
int Act1State::NamedPlane::Serialize(LegoFile *p_file) {
if (p_file->IsWriteMode()) {
p_file->FUN_10006030(m_name);
p_file->WriteVector3(m_point1);
p_file->WriteVector3(m_point2);
p_file->WriteVector3(m_point3);
} else if (p_file->IsReadMode()) {
p_file->ReadString(&m_name);
p_file->ReadVector3(&m_point1);
p_file->ReadVector3(&m_point2);
p_file->ReadVector3(&m_point3);
}
return 0;
}
// STUB: LEGO1 0x1003f540 // STUB: LEGO1 0x1003f540
void FUN_1003f540(LegoFile *p_file, const char *p_filename) { void FUN_1003f540(LegoFile* p_file, const char* p_filename)
{
}
// FUNCTION: LEGO1 0x1003f8a0
void WriteNamedTexture(LegoFile* p_file, Act1State::NamedTexture* p_texture)
{
p_file->FUN_10006030(*p_texture->GetName());
p_texture->GetTexture()->Write(p_file);
} }

12
LEGO1/lego/sources/misc/legostorage.h
View File

@ -3,7 +3,6 @@
#include "legotypes.h" #include "legotypes.h"
#include "mxstring.h" #include "mxstring.h"
#include "vector.h" #include "vector.h"
#include <stdio.h> #include <stdio.h>
@ -75,7 +74,8 @@ class LegoFile : public LegoStorage {
LegoResult Open(const char* p_name, LegoU32 p_mode); LegoResult Open(const char* p_name, LegoU32 p_mode);
// FUNCTION: LEGO1 0x10034430 // FUNCTION: LEGO1 0x10034430
LegoStorage *ReadVector3(Vector3 *p_vec3) { LegoStorage* ReadVector3(Vector3* p_vec3)
{
Read(&(*p_vec3)[0], sizeof(float)); Read(&(*p_vec3)[0], sizeof(float));
Read(&(*p_vec3)[1], sizeof(float)); Read(&(*p_vec3)[1], sizeof(float));
Read(&(*p_vec3)[2], sizeof(float)); Read(&(*p_vec3)[2], sizeof(float));
@ -83,7 +83,8 @@ class LegoFile : public LegoStorage {
} }
// FUNCTION: LEGO1 0x100343d0 // FUNCTION: LEGO1 0x100343d0
LegoStorage *WriteVector3(Vector3 p_vec3) { LegoStorage* WriteVector3(Vector3 p_vec3)
{
Write(&p_vec3[0], sizeof(float)); Write(&p_vec3[0], sizeof(float));
Write(&p_vec3[1], sizeof(float)); Write(&p_vec3[1], sizeof(float));
Write(&p_vec3[2], sizeof(float)); Write(&p_vec3[2], sizeof(float));
@ -91,10 +92,11 @@ class LegoFile : public LegoStorage {
} }
// FUNCTION: LEGO1 0x10034470 // FUNCTION: LEGO1 0x10034470
LegoStorage *ReadString(MxString *p_str) { LegoStorage* ReadString(MxString* p_str)
{
MxU16 len; MxU16 len;
Read(&len, sizeof(MxU16)); Read(&len, sizeof(MxU16));
char *text = new char[len + 1]; char* text = new char[len + 1];
Read(text, len); Read(text, len);
text[len] = '\0'; text[len] = '\0';
*p_str = text; *p_str = text;