Reorganize includes to match asm

This commit is contained in:
Luke Street 2022-07-18 18:42:58 -04:00
parent 69ddd71fc8
commit 848752477e
56 changed files with 93 additions and 98 deletions

View File

@ -5,7 +5,7 @@
#include "CToken.hpp" #include "CToken.hpp"
#include "IObjectStore.hpp" #include "IObjectStore.hpp"
#include "TGameTypes.hpp" #include "Streams/CInputStream.hpp"
class CFactoryMgr { class CFactoryMgr {
public: public:

View File

@ -8,7 +8,7 @@
#include "CDvdFile.hpp" #include "CDvdFile.hpp"
#include "CResLoader.hpp" #include "CResLoader.hpp"
#include "TGameTypes.hpp" #include "IObjectStore.hpp"
class CPakFile : CDvdFile { class CPakFile : CDvdFile {
public: public:

View File

@ -6,7 +6,7 @@
#include "rstl/list.hpp" #include "rstl/list.hpp"
#include "rstl/string.hpp" #include "rstl/string.hpp"
#include "TGameTypes.hpp" #include "IObjectStore.hpp"
class CPakFile; class CPakFile;

View File

@ -3,6 +3,9 @@
#include "types.h" #include "types.h"
#include "Kyoto/Math/CColor.hpp"
#include "Kyoto/Math/CVector3f.hpp"
#include "CTevCombiners.hpp" #include "CTevCombiners.hpp"
enum ERglTevStage { enum ERglTevStage {

View File

@ -5,7 +5,15 @@
#include "rstl/rc_ptr.hpp" #include "rstl/rc_ptr.hpp"
#include "TGameTypes.hpp" typedef u32 CAssetId;
typedef u32 FourCC;
struct SObjectTag {
FourCC type;
CAssetId id;
SObjectTag(const SObjectTag& other) : type(other.type), id(other.id) {}
};
class IObjectStore; class IObjectStore;
class IObj; class IObj;

View File

@ -12,7 +12,8 @@ public:
CMemoryInStream(const void* ptr, unsigned long len); CMemoryInStream(const void* ptr, unsigned long len);
CMemoryInStream(const void* ptr, unsigned long len, EOwnerShip ownership); CMemoryInStream(const void* ptr, unsigned long len, EOwnerShip ownership);
virtual ~CMemoryInStream() {} virtual ~CMemoryInStream() override {}
virtual u32 Read(void* dest, u32 len) override;
}; };
#endif #endif

View File

@ -5,7 +5,7 @@
#include "rstl/single_ptr.hpp" #include "rstl/single_ptr.hpp"
#include "CInputStream.hpp" #include "Kyoto/Streams/CInputStream.hpp"
class CStringTable { class CStringTable {
s32 x0_stringCount; s32 x0_stringCount;

View File

@ -1,31 +0,0 @@
#ifndef _TGAMETYPES_HPP
#define _TGAMETYPES_HPP
#include "types.h"
typedef s32 TAreaId;
typedef s32 TEditorId;
typedef u16 TUniqueId;
extern TAreaId kInvalidAreaId;
extern TEditorId kInvalidEditorId;
extern TUniqueId kInvalidUniqueId;
typedef u32 CAssetId;
// class CAssetId {
// public:
// u32 id;
// bool operator==(const CAssetId& other) { return id == other.id; }
// };
#define FourCC u32
struct SObjectTag {
FourCC type;
CAssetId id;
SObjectTag(const SObjectTag& other) : type(other.type), id(other.id) {}
};
#endif

View File

@ -4,9 +4,9 @@
#include "types.h" #include "types.h"
#include "CIOWinManager.hpp" #include "CIOWinManager.hpp"
#include "COsContext.hpp" #include "Kyoto/Basics/COsContext.hpp"
#include "CStopwatch.hpp" #include "Kyoto/Basics/CStopwatch.hpp"
#include "TOneStatic.hpp" #include "Kyoto/TOneStatic.hpp"
class CGameArchitectureSupport : public TOneStatic< CGameArchitectureSupport > { class CGameArchitectureSupport : public TOneStatic< CGameArchitectureSupport > {
public: public:

View File

@ -6,19 +6,19 @@
#include "rstl/optional_object.hpp" #include "rstl/optional_object.hpp"
#include "rstl/single_ptr.hpp" #include "rstl/single_ptr.hpp"
#include "CAiFuncMap.hpp"
#include "CCharacterFactoryBuilder.hpp"
#include "CGameState.hpp"
#include "CGraphicsSys.hpp"
#include "CInGameTweakManager.hpp" #include "CInGameTweakManager.hpp"
#include "CMemoryCardSys.hpp" #include "Enemies/CAiFuncMap.hpp"
#include "CMemorySys.hpp" #include "Factories/CCharacterFactoryBuilder.hpp"
#include "COsContext.hpp" #include "Kyoto/Basics/COsContext.hpp"
#include "CRasterFont.hpp" #include "Kyoto/CMemoryCardSys.hpp"
#include "CResFactory.hpp" #include "Kyoto/CMemorySys.hpp"
#include "CSimplePool.hpp" #include "Kyoto/CResFactory.hpp"
#include "CToken.hpp" #include "Kyoto/CSimplePool.hpp"
#include "TOneStatic.hpp" #include "Kyoto/CToken.hpp"
#include "Kyoto/Graphics/CGraphicsSys.hpp"
#include "Kyoto/Text/CRasterFont.hpp"
#include "Kyoto/TOneStatic.hpp"
#include "Player/CGameState.hpp"
class CGameGlobalObjects : public TOneStatic< CGameGlobalObjects > { class CGameGlobalObjects : public TOneStatic< CGameGlobalObjects > {
public: public:

View File

@ -7,13 +7,13 @@
#include "CGameArchitectureSupport.hpp" #include "CGameArchitectureSupport.hpp"
#include "CGameGlobalObjects.hpp" #include "CGameGlobalObjects.hpp"
#include "CInputStream.hpp" #include "Kyoto/Basics/COsContext.hpp"
#include "CMemorySys.hpp" #include "Kyoto/Basics/CStopwatch.hpp"
#include "COsContext.hpp" #include "Kyoto/CMemorySys.hpp"
#include "CStopwatch.hpp" #include "Kyoto/Streams/CInputStream.hpp"
#include "CTweaks.hpp" #include "Kyoto/TReservedAverage.hpp"
#include "TReservedAverage.hpp" #include "MetroidPrime/TGameTypes.hpp"
#include "TGameTypes.hpp" #include "MetroidPrime/Tweaks/CTweaks.hpp"
class CMain { class CMain {
public: public:

View File

@ -7,8 +7,8 @@
#include "rstl/reserved_vector.hpp" #include "rstl/reserved_vector.hpp"
#include "rstl/vector.hpp" #include "rstl/vector.hpp"
#include "CInputStream.hpp" #include "Kyoto/Streams/CInputStream.hpp"
#include "TGameTypes.hpp" #include "MetroidPrime/TGameTypes.hpp"
class CGameOptions { class CGameOptions {
public: public:

View File

@ -8,13 +8,12 @@
#include "rstl/vector.hpp" #include "rstl/vector.hpp"
#include "CGameOptions.hpp" #include "CGameOptions.hpp"
#include "CGameState.hpp"
#include "CHintOptions.hpp" #include "CHintOptions.hpp"
#include "CPlayerState.hpp" #include "CPlayerState.hpp"
#include "CSystemOptions.hpp" #include "CSystemOptions.hpp"
#include "CWorldState.hpp" #include "CWorldState.hpp"
#include "CWorldTransManager.hpp" #include "CWorldTransManager.hpp"
#include "TGameTypes.hpp" #include "MetroidPrime/TGameTypes.hpp"
class CGameState { class CGameState {
public: public:

View File

@ -3,11 +3,12 @@
#include "types.h" #include "types.h"
#include "TGameTypes.hpp"
#include "rstl/pair.hpp" #include "rstl/pair.hpp"
#include "rstl/reserved_vector.hpp" #include "rstl/reserved_vector.hpp"
#include "rstl/vector.hpp" #include "rstl/vector.hpp"
#include "MetroidPrime/TGameTypes.hpp"
class CSystemOptions { class CSystemOptions {
public: public:
CSystemOptions(); CSystemOptions();

View File

@ -0,0 +1,14 @@
#ifndef _TGAMETYPES_HPP
#define _TGAMETYPES_HPP
#include "types.h"
typedef s32 TAreaId;
typedef s32 TEditorId;
typedef u16 TUniqueId;
extern TAreaId kInvalidAreaId;
extern TEditorId kInvalidEditorId;
extern TUniqueId kInvalidUniqueId;
#endif

View File

@ -1,5 +1,6 @@
#ifndef __USERNAMES_HPP_ #ifndef __USERNAMES_HPP_
#define __USERNAMES_HPP_ #define __USERNAMES_HPP_
#include "types.h" #include "types.h"
bool IsUser(int name); bool IsUser(int name);

View File

@ -3,7 +3,7 @@
#include "types.h" #include "types.h"
#include "../Kyoto_CWD/CMemory.hpp" #include "Kyoto/Alloc/CMemory.hpp"
namespace rstl { namespace rstl {
struct rmemory_allocator { struct rmemory_allocator {

View File

@ -1,4 +1,4 @@
#include "Kyoto_CWD/CStopwatch.hpp" #include "Kyoto/Basics/CStopwatch.hpp"
#include "Dolphin/os.h" #include "Dolphin/os.h"

View File

@ -1,8 +1,8 @@
#include "Kyoto_CWD/CInputStream.hpp" #include "Kyoto/Streams/CInputStream.hpp"
#include "string.h" #include "string.h"
#include "Kyoto_CWD/CMemory.hpp" #include "Kyoto/Alloc/CMemory.hpp"
static u8 c; static u8 c;
static u16 s; static u16 s;

View File

@ -1,10 +1,9 @@
#include "Kyoto_CWD/CStringTable.hpp" #include "Kyoto/Text/CStringTable.hpp"
#include "rstl/pair.hpp" #include "rstl/pair.hpp"
#include "rstl/vector.hpp" #include "rstl/vector.hpp"
#include "Kyoto_CWD/CFactoryMgr.hpp" #include "Kyoto/CFactoryMgr.hpp"
#include "Kyoto_CWD/TGameTypes.hpp"
static FourCC mCurrentLanguage = 'ENGL'; static FourCC mCurrentLanguage = 'ENGL';

View File

@ -1,6 +1,6 @@
#include "Kyoto_CWD/CCameraFilterPass.hpp" #include "MetroidPrime/Cameras/CCameraFilterPass.hpp"
#include "Kyoto_CWD/CCubeRenderer.hpp" #include "MetaRender/CCubeRenderer.hpp"
#include "Kyoto_CWD/CGraphics.hpp" #include "Kyoto/Graphics/CGraphics.hpp"
// FIXME non-matching https://decomp.me/scratch/8N81d // FIXME non-matching https://decomp.me/scratch/8N81d
void CCameraFilterPass::DrawWideScreen(const CColor& color, const CTexture* tex, f32 lod) { void CCameraFilterPass::DrawWideScreen(const CColor& color, const CTexture* tex, f32 lod) {

View File

@ -1,6 +1,6 @@
#include "types.h" #include "types.h"
#include "Kyoto_CWD/UserNames.hpp" #include "MetroidPrime/UserNames.hpp"
bool IsUser(int name) { bool IsUser(int name) {
return name == 1; return name == 1;

View File

@ -1,30 +1,30 @@
#include "Kyoto_CWD/CMain.hpp" #include "MetroidPrime/CMain.hpp"
#include "Dolphin/os.h"
#include "Dolphin/OSCache.h" #include "Dolphin/OSCache.h"
#include "Dolphin/PPCArch.h" #include "Dolphin/PPCArch.h"
#include "Dolphin/os.h"
#include "Kyoto_CWD/CARAMManager.hpp" #include "Kyoto/Audio/CSfxManager.hpp"
#include "Kyoto_CWD/CARAMToken.hpp" #include "Kyoto/Audio/CStreamAudioManager.hpp"
#include "Kyoto_CWD/CBasics.hpp" #include "Kyoto/Basics/CBasics.hpp"
#include "Kyoto_CWD/CCharacterFactoryBuilder.hpp" #include "Kyoto/CARAMManager.hpp"
#include "Kyoto_CWD/CCubeRenderer.hpp" #include "Kyoto/CARAMToken.hpp"
#include "Kyoto_CWD/CGameGlobalObjects.hpp" #include "Kyoto/CMemoryCardSys.hpp"
#include "Kyoto_CWD/CGameOptions.hpp" #include "Kyoto/CPakFile.hpp"
#include "Kyoto_CWD/CGameState.hpp" #include "Kyoto/CResFactory.hpp"
#include "Kyoto_CWD/CGraphics.hpp" #include "Kyoto/CSimplePool.hpp"
#include "Kyoto_CWD/CInGameTweakManager.hpp" #include "Kyoto/Graphics/CGraphics.hpp"
#include "Kyoto_CWD/CMemoryCardSys.hpp" #include "Kyoto/Streams/CMemoryInStream.hpp"
#include "Kyoto_CWD/CMemoryInStream.hpp" #include "Kyoto/Text/CStringTable.hpp"
#include "Kyoto_CWD/CPakFile.hpp" #include "MetaRender/CCubeRenderer.hpp"
#include "Kyoto_CWD/CPlayerState.hpp" #include "MetroidPrime/CGameGlobalObjects.hpp"
#include "Kyoto_CWD/CResFactory.hpp" #include "MetroidPrime/CInGameTweakManager.hpp"
#include "Kyoto_CWD/CSfxManager.hpp" #include "MetroidPrime/Factories/CCharacterFactoryBuilder.hpp"
#include "Kyoto_CWD/CSimplePool.hpp" #include "MetroidPrime/Player/CGameOptions.hpp"
#include "Kyoto_CWD/CStreamAudioManager.hpp" #include "MetroidPrime/Player/CGameState.hpp"
#include "Kyoto_CWD/CStringTable.hpp" #include "MetroidPrime/Player/CPlayerState.hpp"
#include "Kyoto_CWD/CSystemOptions.hpp" #include "MetroidPrime/Player/CSystemOptions.hpp"
#include "Kyoto_CWD/CTweakGame.hpp" #include "MetroidPrime/Tweaks/CTweakGame.hpp"
extern "C" { extern "C" {
// something pad // something pad