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

Better boo init within CMain; shader fixes

This commit is contained in:
Jack Andersen
2016-08-16 20:18:18 -10:00
parent e9a5e4b7f6
commit 3acc93f1c0
7 changed files with 51 additions and 31 deletions

View File

@@ -80,7 +80,8 @@ class CGameGlobalObjects
}
public:
CGameGlobalObjects(IFactory& resFactory, CSimplePool& objStore)
CGameGlobalObjects(IFactory& resFactory,
CSimplePool& objStore)
: x20_resFactory(resFactory), x114_simplePool(objStore)
{
g_MemoryCardSys = &x0_memoryCardSys;
@@ -220,6 +221,13 @@ public:
};
private:
struct BooSetter
{
BooSetter(boo::IGraphicsDataFactory* factory,
boo::IGraphicsCommandQueue* cmdQ,
boo::ITextureR* spareTex);
} m_booSetter;
//CMemorySys x6c_memSys;
CTweaks x70_tweaks;
EGameplayResult xe4_gameplayResult;
@@ -252,24 +260,21 @@ private:
u32 x164_ = 0;
void InitializeSubsystems(boo::IGraphicsDataFactory* factory,
boo::IGraphicsCommandQueue* cc,
boo::ITextureR* renderTex,
const hecl::Runtime::FileStoreManager& storeMgr,
void InitializeSubsystems(const hecl::Runtime::FileStoreManager& storeMgr,
boo::IAudioVoiceEngine* voiceEngine);
public:
CMain(IFactory& resFactory, CSimplePool& resStore);
CMain(IFactory& resFactory, CSimplePool& resStore,
boo::IGraphicsDataFactory* gfxFactory,
boo::IGraphicsCommandQueue* cmdQ,
boo::ITextureR* spareTex);
void RegisterResourceTweaks();
void ResetGameState();
void StreamNewGameState(CInputStream&);
void CheckTweakManagerDebugOptions() {}
//int RsMain(int argc, const boo::SystemChar* argv[]);
void Init(boo::IGraphicsDataFactory* factory,
boo::IGraphicsCommandQueue* cc,
boo::ITextureR* renderTex,
const hecl::Runtime::FileStoreManager& storeMgr,
void Init(const hecl::Runtime::FileStoreManager& storeMgr,
boo::IAudioVoiceEngine* voiceEngine);
bool Proc();
void Shutdown();