2
0
mirror of https://github.com/AxioDL/metaforce.git synced 2025-12-08 21:47:42 +00:00

New code style refactor

This commit is contained in:
Jack Andersen
2018-12-07 19:30:43 -10:00
parent 41ae32be31
commit 636c82a568
1451 changed files with 171430 additions and 203303 deletions

View File

@@ -3,39 +3,38 @@
#include "IOStreams.hpp"
#include "CToken.hpp"
namespace urde
{
namespace urde {
class CSimplePool;
class CGenDescription;
class CSpawnSystemKeyframeData
{
class CSpawnSystemKeyframeData {
public:
class CSpawnSystemKeyframeInfo
{
friend class CSpawnSystemKeyframeData;
u32 x0_id;
u32 x4;
u32 x8;
u32 xc;
TLockedToken<CGenDescription> x10_token;
bool x18_found = false;
void LoadToken(CSimplePool* pool);
public:
CSpawnSystemKeyframeInfo(CInputStream& in);
TLockedToken<CGenDescription>& GetToken() {return x10_token;}
};
private:
u32 x0;
class CSpawnSystemKeyframeInfo {
friend class CSpawnSystemKeyframeData;
u32 x0_id;
u32 x4;
u32 x8_endFrame;
u32 x8;
u32 xc;
std::vector<std::pair<u32, std::vector<CSpawnSystemKeyframeInfo>>> x10_spawns;
TLockedToken<CGenDescription> x10_token;
bool x18_found = false;
void LoadToken(CSimplePool* pool);
public:
CSpawnSystemKeyframeInfo(CInputStream& in);
TLockedToken<CGenDescription>& GetToken() { return x10_token; }
};
private:
u32 x0;
u32 x4;
u32 x8_endFrame;
u32 xc;
std::vector<std::pair<u32, std::vector<CSpawnSystemKeyframeInfo>>> x10_spawns;
public:
CSpawnSystemKeyframeData(CInputStream& in);
void LoadAllSpawnedSystemTokens(CSimplePool* pool);
std::vector<CSpawnSystemKeyframeInfo>& GetSpawnedSystemsAtFrame(u32 frame);
CSpawnSystemKeyframeData(CInputStream& in);
void LoadAllSpawnedSystemTokens(CSimplePool* pool);
std::vector<CSpawnSystemKeyframeInfo>& GetSpawnedSystemsAtFrame(u32 frame);
};
}
} // namespace urde