2
0
mirror of https://github.com/AxioDL/metaforce.git synced 2025-12-09 02:27:43 +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

@@ -5,43 +5,69 @@
#include "IOStreams.hpp"
#include "IFactory.hpp"
namespace urde
{
namespace urde {
struct SObjectTag;
class CVParamTransfer;
class IObj;
class CFactoryMgr
{
std::unordered_map<FourCC, FFactoryFunc> m_factories;
std::unordered_map<FourCC, FMemFactoryFunc> m_memFactories;
class CFactoryMgr {
std::unordered_map<FourCC, FFactoryFunc> m_factories;
std::unordered_map<FourCC, FMemFactoryFunc> m_memFactories;
public:
CFactoryFnReturn MakeObject(const SObjectTag& tag, urde::CInputStream& in,
const CVParamTransfer& paramXfer, CObjectReference* selfRef);
bool CanMakeMemory(const urde::SObjectTag& tag) const;
CFactoryFnReturn MakeObjectFromMemory(const SObjectTag& tag,
std::unique_ptr<u8[]>&& buf,
int size, bool compressed,
const CVParamTransfer& paramXfer,
CObjectReference* selfRef);
void AddFactory(FourCC key, FFactoryFunc func) {m_factories[key] = func;}
void AddFactory(FourCC key, FMemFactoryFunc func) {m_memFactories[key] = func;}
CFactoryFnReturn MakeObject(const SObjectTag& tag, urde::CInputStream& in, const CVParamTransfer& paramXfer,
CObjectReference* selfRef);
bool CanMakeMemory(const urde::SObjectTag& tag) const;
CFactoryFnReturn MakeObjectFromMemory(const SObjectTag& tag, std::unique_ptr<u8[]>&& buf, int size, bool compressed,
const CVParamTransfer& paramXfer, CObjectReference* selfRef);
void AddFactory(FourCC key, FFactoryFunc func) { m_factories[key] = func; }
void AddFactory(FourCC key, FMemFactoryFunc func) { m_memFactories[key] = func; }
enum class ETypeTable : u8
{
CLSN, CMDL, CSKR, ANIM, CINF, TXTR,
PLTT, FONT, ANCS, EVNT, MADF, MLVL,
MREA, MAPW, MAPA, SAVW, SAVA, PART,
WPSC, SWHC, DPSC, ELSC, CRSC, AFSM,
DCLN, AGSC, ATBL, CSNG, STRG, SCAN,
PATH, DGRP, HMAP, CTWK, FRME, HINT,
MAPU, DUMB, OIDS,
Invalid = 127
};
enum class ETypeTable : u8 {
CLSN,
CMDL,
CSKR,
ANIM,
CINF,
TXTR,
PLTT,
FONT,
ANCS,
EVNT,
MADF,
MLVL,
MREA,
MAPW,
MAPA,
SAVW,
SAVA,
PART,
WPSC,
SWHC,
DPSC,
ELSC,
CRSC,
AFSM,
DCLN,
AGSC,
ATBL,
CSNG,
STRG,
SCAN,
PATH,
DGRP,
HMAP,
CTWK,
FRME,
HINT,
MAPU,
DUMB,
OIDS,
Invalid = 127
};
static ETypeTable FourCCToTypeIdx(FourCC fcc);
static FourCC TypeIdxToFourCC(ETypeTable fcc);
static ETypeTable FourCCToTypeIdx(FourCC fcc);
static FourCC TypeIdxToFourCC(ETypeTable fcc);
};
}
} // namespace urde