From bed1bb88de388d82883d4c29f9956320eaa9e5be Mon Sep 17 00:00:00 2001 From: Luke Street Date: Mon, 18 Jul 2022 18:42:58 -0400 Subject: [PATCH] Reorganize includes to match asm Former-commit-id: 848752477e6833629bb0ce30125ca6f5dbffccd1 --- .../{Kyoto_CWD => Kyoto/Alloc}/CMemory.hpp | 0 .../Audio}/CSfxManager.hpp | 0 .../Audio}/CStreamAudioManager.hpp | 0 .../{Kyoto_CWD => Kyoto/Basics}/CBasics.hpp | 0 .../Basics}/COsContext.hpp | 0 .../Basics}/CStopwatch.hpp | 0 include/{Kyoto_CWD => Kyoto}/CARAMManager.hpp | 0 include/{Kyoto_CWD => Kyoto}/CARAMToken.hpp | 0 include/{Kyoto_CWD => Kyoto}/CDvdFile.hpp | 0 include/{Kyoto_CWD => Kyoto}/CFactoryMgr.hpp | 2 +- .../{Kyoto_CWD => Kyoto}/CMemoryCardSys.hpp | 0 include/{Kyoto_CWD => Kyoto}/CMemorySys.hpp | 0 include/{Kyoto_CWD => Kyoto}/CPakFile.hpp | 2 +- include/{Kyoto_CWD => Kyoto}/CResFactory.hpp | 0 include/{Kyoto_CWD => Kyoto}/CResLoader.hpp | 2 +- include/{Kyoto_CWD => Kyoto}/CSimplePool.hpp | 0 include/{Kyoto_CWD => Kyoto}/CToken.hpp | 0 .../Graphics}/CGraphics.hpp | 3 ++ .../Graphics}/CGraphicsSys.hpp | 0 .../Graphics}/CTevCombiners.hpp | 0 .../Graphics}/CTexture.hpp | 0 include/{Kyoto_CWD => Kyoto}/IObjectStore.hpp | 10 +++- .../Streams}/CInputStream.hpp | 0 .../Streams}/CMemoryInStream.hpp | 3 +- include/{Kyoto_CWD => Kyoto}/TOneStatic.hpp | 0 .../{Kyoto_CWD => Kyoto}/TReservedAverage.hpp | 0 .../{Kyoto_CWD => Kyoto/Text}/CRasterFont.hpp | 0 .../Text}/CStringTable.hpp | 2 +- include/Kyoto_CWD/TGameTypes.hpp | 31 ------------- .../CCubeRenderer.hpp | 0 .../CGameArchitectureSupport.hpp | 6 +-- .../CGameGlobalObjects.hpp | 24 +++++----- .../CIOWinManager.hpp | 0 .../CInGameTweakManager.hpp | 0 include/{Kyoto_CWD => MetroidPrime}/CMain.hpp | 14 +++--- .../Cameras}/CCameraFilterPass.hpp | 0 .../Enemies}/CAiFuncMap.hpp | 0 .../Factories}/CCharacterFactoryBuilder.hpp | 0 .../Player}/CGameOptions.hpp | 4 +- .../Player}/CGameState.hpp | 3 +- .../Player}/CHintOptions.hpp | 0 .../Player}/CPlayerState.hpp | 0 .../Player}/CSystemOptions.hpp | 3 +- .../Player}/CWorldState.hpp | 0 .../Player}/CWorldTransManager.hpp | 0 include/MetroidPrime/TGameTypes.hpp | 14 ++++++ .../Tweaks}/CTweakGame.hpp | 0 .../Tweaks}/CTweaks.hpp | 0 .../{Kyoto_CWD => MetroidPrime}/UserNames.hpp | 1 + include/rstl/rmemory_allocator.hpp | 2 +- src/Kyoto/Basics/CSWDataDolphin.cpp | 2 +- src/Kyoto/Streams/CInputStream.cpp | 4 +- src/Kyoto/Text/CStringTable.cpp | 5 +- src/MetroidPrime/Cameras/CCameraFilter.cpp | 6 +-- src/MetroidPrime/UserNames.cpp | 2 +- src/MetroidPrime/main.cpp | 46 +++++++++---------- 56 files changed, 93 insertions(+), 98 deletions(-) rename include/{Kyoto_CWD => Kyoto/Alloc}/CMemory.hpp (100%) rename include/{Kyoto_CWD => Kyoto/Audio}/CSfxManager.hpp (100%) rename include/{Kyoto_CWD => Kyoto/Audio}/CStreamAudioManager.hpp (100%) rename include/{Kyoto_CWD => Kyoto/Basics}/CBasics.hpp (100%) rename include/{Kyoto_CWD => Kyoto/Basics}/COsContext.hpp (100%) rename include/{Kyoto_CWD => Kyoto/Basics}/CStopwatch.hpp (100%) rename include/{Kyoto_CWD => Kyoto}/CARAMManager.hpp (100%) rename include/{Kyoto_CWD => Kyoto}/CARAMToken.hpp (100%) rename include/{Kyoto_CWD => Kyoto}/CDvdFile.hpp (100%) rename include/{Kyoto_CWD => Kyoto}/CFactoryMgr.hpp (94%) rename include/{Kyoto_CWD => Kyoto}/CMemoryCardSys.hpp (100%) rename include/{Kyoto_CWD => Kyoto}/CMemorySys.hpp (100%) rename include/{Kyoto_CWD => Kyoto}/CPakFile.hpp (97%) rename include/{Kyoto_CWD => Kyoto}/CResFactory.hpp (100%) rename include/{Kyoto_CWD => Kyoto}/CResLoader.hpp (96%) rename include/{Kyoto_CWD => Kyoto}/CSimplePool.hpp (100%) rename include/{Kyoto_CWD => Kyoto}/CToken.hpp (100%) rename include/{Kyoto_CWD => Kyoto/Graphics}/CGraphics.hpp (93%) rename include/{Kyoto_CWD => Kyoto/Graphics}/CGraphicsSys.hpp (100%) rename include/{Kyoto_CWD => Kyoto/Graphics}/CTevCombiners.hpp (100%) rename include/{Kyoto_CWD => Kyoto/Graphics}/CTexture.hpp (100%) rename include/{Kyoto_CWD => Kyoto}/IObjectStore.hpp (68%) rename include/{Kyoto_CWD => Kyoto/Streams}/CInputStream.hpp (100%) rename include/{Kyoto_CWD => Kyoto/Streams}/CMemoryInStream.hpp (78%) rename include/{Kyoto_CWD => Kyoto}/TOneStatic.hpp (100%) rename include/{Kyoto_CWD => Kyoto}/TReservedAverage.hpp (100%) rename include/{Kyoto_CWD => Kyoto/Text}/CRasterFont.hpp (100%) rename include/{Kyoto_CWD => Kyoto/Text}/CStringTable.hpp (88%) delete mode 100644 include/Kyoto_CWD/TGameTypes.hpp rename include/{Kyoto_CWD => MetaRender}/CCubeRenderer.hpp (100%) rename include/{Kyoto_CWD => MetroidPrime}/CGameArchitectureSupport.hpp (87%) rename include/{Kyoto_CWD => MetroidPrime}/CGameGlobalObjects.hpp (70%) rename include/{Kyoto_CWD => MetroidPrime}/CIOWinManager.hpp (100%) rename include/{Kyoto_CWD => MetroidPrime}/CInGameTweakManager.hpp (100%) rename include/{Kyoto_CWD => MetroidPrime}/CMain.hpp (84%) rename include/{Kyoto_CWD => MetroidPrime/Cameras}/CCameraFilterPass.hpp (100%) rename include/{Kyoto_CWD => MetroidPrime/Enemies}/CAiFuncMap.hpp (100%) rename include/{Kyoto_CWD => MetroidPrime/Factories}/CCharacterFactoryBuilder.hpp (100%) rename include/{Kyoto_CWD => MetroidPrime/Player}/CGameOptions.hpp (90%) rename include/{Kyoto_CWD => MetroidPrime/Player}/CGameState.hpp (96%) rename include/{Kyoto_CWD => MetroidPrime/Player}/CHintOptions.hpp (100%) rename include/{Kyoto_CWD => MetroidPrime/Player}/CPlayerState.hpp (100%) rename include/{Kyoto_CWD => MetroidPrime/Player}/CSystemOptions.hpp (95%) rename include/{Kyoto_CWD => MetroidPrime/Player}/CWorldState.hpp (100%) rename include/{Kyoto_CWD => MetroidPrime/Player}/CWorldTransManager.hpp (100%) create mode 100644 include/MetroidPrime/TGameTypes.hpp rename include/{Kyoto_CWD => MetroidPrime/Tweaks}/CTweakGame.hpp (100%) rename include/{Kyoto_CWD => MetroidPrime/Tweaks}/CTweaks.hpp (100%) rename include/{Kyoto_CWD => MetroidPrime}/UserNames.hpp (99%) diff --git a/include/Kyoto_CWD/CMemory.hpp b/include/Kyoto/Alloc/CMemory.hpp similarity index 100% rename from include/Kyoto_CWD/CMemory.hpp rename to include/Kyoto/Alloc/CMemory.hpp diff --git a/include/Kyoto_CWD/CSfxManager.hpp b/include/Kyoto/Audio/CSfxManager.hpp similarity index 100% rename from include/Kyoto_CWD/CSfxManager.hpp rename to include/Kyoto/Audio/CSfxManager.hpp diff --git a/include/Kyoto_CWD/CStreamAudioManager.hpp b/include/Kyoto/Audio/CStreamAudioManager.hpp similarity index 100% rename from include/Kyoto_CWD/CStreamAudioManager.hpp rename to include/Kyoto/Audio/CStreamAudioManager.hpp diff --git a/include/Kyoto_CWD/CBasics.hpp b/include/Kyoto/Basics/CBasics.hpp similarity index 100% rename from include/Kyoto_CWD/CBasics.hpp rename to include/Kyoto/Basics/CBasics.hpp diff --git a/include/Kyoto_CWD/COsContext.hpp b/include/Kyoto/Basics/COsContext.hpp similarity index 100% rename from include/Kyoto_CWD/COsContext.hpp rename to include/Kyoto/Basics/COsContext.hpp diff --git a/include/Kyoto_CWD/CStopwatch.hpp b/include/Kyoto/Basics/CStopwatch.hpp similarity index 100% rename from include/Kyoto_CWD/CStopwatch.hpp rename to include/Kyoto/Basics/CStopwatch.hpp diff --git a/include/Kyoto_CWD/CARAMManager.hpp b/include/Kyoto/CARAMManager.hpp similarity index 100% rename from include/Kyoto_CWD/CARAMManager.hpp rename to include/Kyoto/CARAMManager.hpp diff --git a/include/Kyoto_CWD/CARAMToken.hpp b/include/Kyoto/CARAMToken.hpp similarity index 100% rename from include/Kyoto_CWD/CARAMToken.hpp rename to include/Kyoto/CARAMToken.hpp diff --git a/include/Kyoto_CWD/CDvdFile.hpp b/include/Kyoto/CDvdFile.hpp similarity index 100% rename from include/Kyoto_CWD/CDvdFile.hpp rename to include/Kyoto/CDvdFile.hpp diff --git a/include/Kyoto_CWD/CFactoryMgr.hpp b/include/Kyoto/CFactoryMgr.hpp similarity index 94% rename from include/Kyoto_CWD/CFactoryMgr.hpp rename to include/Kyoto/CFactoryMgr.hpp index 31f64244..f17cce04 100644 --- a/include/Kyoto_CWD/CFactoryMgr.hpp +++ b/include/Kyoto/CFactoryMgr.hpp @@ -5,7 +5,7 @@ #include "CToken.hpp" #include "IObjectStore.hpp" -#include "TGameTypes.hpp" +#include "Streams/CInputStream.hpp" class CFactoryMgr { public: diff --git a/include/Kyoto_CWD/CMemoryCardSys.hpp b/include/Kyoto/CMemoryCardSys.hpp similarity index 100% rename from include/Kyoto_CWD/CMemoryCardSys.hpp rename to include/Kyoto/CMemoryCardSys.hpp diff --git a/include/Kyoto_CWD/CMemorySys.hpp b/include/Kyoto/CMemorySys.hpp similarity index 100% rename from include/Kyoto_CWD/CMemorySys.hpp rename to include/Kyoto/CMemorySys.hpp diff --git a/include/Kyoto_CWD/CPakFile.hpp b/include/Kyoto/CPakFile.hpp similarity index 97% rename from include/Kyoto_CWD/CPakFile.hpp rename to include/Kyoto/CPakFile.hpp index 1642c4b9..5a93bc14 100644 --- a/include/Kyoto_CWD/CPakFile.hpp +++ b/include/Kyoto/CPakFile.hpp @@ -8,7 +8,7 @@ #include "CDvdFile.hpp" #include "CResLoader.hpp" -#include "TGameTypes.hpp" +#include "IObjectStore.hpp" class CPakFile : CDvdFile { public: diff --git a/include/Kyoto_CWD/CResFactory.hpp b/include/Kyoto/CResFactory.hpp similarity index 100% rename from include/Kyoto_CWD/CResFactory.hpp rename to include/Kyoto/CResFactory.hpp diff --git a/include/Kyoto_CWD/CResLoader.hpp b/include/Kyoto/CResLoader.hpp similarity index 96% rename from include/Kyoto_CWD/CResLoader.hpp rename to include/Kyoto/CResLoader.hpp index f464131a..2680f24e 100644 --- a/include/Kyoto_CWD/CResLoader.hpp +++ b/include/Kyoto/CResLoader.hpp @@ -6,7 +6,7 @@ #include "rstl/list.hpp" #include "rstl/string.hpp" -#include "TGameTypes.hpp" +#include "IObjectStore.hpp" class CPakFile; diff --git a/include/Kyoto_CWD/CSimplePool.hpp b/include/Kyoto/CSimplePool.hpp similarity index 100% rename from include/Kyoto_CWD/CSimplePool.hpp rename to include/Kyoto/CSimplePool.hpp diff --git a/include/Kyoto_CWD/CToken.hpp b/include/Kyoto/CToken.hpp similarity index 100% rename from include/Kyoto_CWD/CToken.hpp rename to include/Kyoto/CToken.hpp diff --git a/include/Kyoto_CWD/CGraphics.hpp b/include/Kyoto/Graphics/CGraphics.hpp similarity index 93% rename from include/Kyoto_CWD/CGraphics.hpp rename to include/Kyoto/Graphics/CGraphics.hpp index efa4ae74..2f71726e 100644 --- a/include/Kyoto_CWD/CGraphics.hpp +++ b/include/Kyoto/Graphics/CGraphics.hpp @@ -3,6 +3,9 @@ #include "types.h" +#include "Kyoto/Math/CColor.hpp" +#include "Kyoto/Math/CVector3f.hpp" + #include "CTevCombiners.hpp" enum ERglTevStage { diff --git a/include/Kyoto_CWD/CGraphicsSys.hpp b/include/Kyoto/Graphics/CGraphicsSys.hpp similarity index 100% rename from include/Kyoto_CWD/CGraphicsSys.hpp rename to include/Kyoto/Graphics/CGraphicsSys.hpp diff --git a/include/Kyoto_CWD/CTevCombiners.hpp b/include/Kyoto/Graphics/CTevCombiners.hpp similarity index 100% rename from include/Kyoto_CWD/CTevCombiners.hpp rename to include/Kyoto/Graphics/CTevCombiners.hpp diff --git a/include/Kyoto_CWD/CTexture.hpp b/include/Kyoto/Graphics/CTexture.hpp similarity index 100% rename from include/Kyoto_CWD/CTexture.hpp rename to include/Kyoto/Graphics/CTexture.hpp diff --git a/include/Kyoto_CWD/IObjectStore.hpp b/include/Kyoto/IObjectStore.hpp similarity index 68% rename from include/Kyoto_CWD/IObjectStore.hpp rename to include/Kyoto/IObjectStore.hpp index 22d2763a..1405ecf2 100644 --- a/include/Kyoto_CWD/IObjectStore.hpp +++ b/include/Kyoto/IObjectStore.hpp @@ -5,7 +5,15 @@ #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 IObj; diff --git a/include/Kyoto_CWD/CInputStream.hpp b/include/Kyoto/Streams/CInputStream.hpp similarity index 100% rename from include/Kyoto_CWD/CInputStream.hpp rename to include/Kyoto/Streams/CInputStream.hpp diff --git a/include/Kyoto_CWD/CMemoryInStream.hpp b/include/Kyoto/Streams/CMemoryInStream.hpp similarity index 78% rename from include/Kyoto_CWD/CMemoryInStream.hpp rename to include/Kyoto/Streams/CMemoryInStream.hpp index cd3cb650..442f3ca5 100644 --- a/include/Kyoto_CWD/CMemoryInStream.hpp +++ b/include/Kyoto/Streams/CMemoryInStream.hpp @@ -12,7 +12,8 @@ public: CMemoryInStream(const void* ptr, unsigned long len); CMemoryInStream(const void* ptr, unsigned long len, EOwnerShip ownership); - virtual ~CMemoryInStream() {} + virtual ~CMemoryInStream() override {} + virtual u32 Read(void* dest, u32 len) override; }; #endif diff --git a/include/Kyoto_CWD/TOneStatic.hpp b/include/Kyoto/TOneStatic.hpp similarity index 100% rename from include/Kyoto_CWD/TOneStatic.hpp rename to include/Kyoto/TOneStatic.hpp diff --git a/include/Kyoto_CWD/TReservedAverage.hpp b/include/Kyoto/TReservedAverage.hpp similarity index 100% rename from include/Kyoto_CWD/TReservedAverage.hpp rename to include/Kyoto/TReservedAverage.hpp diff --git a/include/Kyoto_CWD/CRasterFont.hpp b/include/Kyoto/Text/CRasterFont.hpp similarity index 100% rename from include/Kyoto_CWD/CRasterFont.hpp rename to include/Kyoto/Text/CRasterFont.hpp diff --git a/include/Kyoto_CWD/CStringTable.hpp b/include/Kyoto/Text/CStringTable.hpp similarity index 88% rename from include/Kyoto_CWD/CStringTable.hpp rename to include/Kyoto/Text/CStringTable.hpp index c7f67257..0ae17a57 100644 --- a/include/Kyoto_CWD/CStringTable.hpp +++ b/include/Kyoto/Text/CStringTable.hpp @@ -5,7 +5,7 @@ #include "rstl/single_ptr.hpp" -#include "CInputStream.hpp" +#include "Kyoto/Streams/CInputStream.hpp" class CStringTable { s32 x0_stringCount; diff --git a/include/Kyoto_CWD/TGameTypes.hpp b/include/Kyoto_CWD/TGameTypes.hpp deleted file mode 100644 index 18c7692d..00000000 --- a/include/Kyoto_CWD/TGameTypes.hpp +++ /dev/null @@ -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 diff --git a/include/Kyoto_CWD/CCubeRenderer.hpp b/include/MetaRender/CCubeRenderer.hpp similarity index 100% rename from include/Kyoto_CWD/CCubeRenderer.hpp rename to include/MetaRender/CCubeRenderer.hpp diff --git a/include/Kyoto_CWD/CGameArchitectureSupport.hpp b/include/MetroidPrime/CGameArchitectureSupport.hpp similarity index 87% rename from include/Kyoto_CWD/CGameArchitectureSupport.hpp rename to include/MetroidPrime/CGameArchitectureSupport.hpp index 3aa3ec77..cab489a2 100644 --- a/include/Kyoto_CWD/CGameArchitectureSupport.hpp +++ b/include/MetroidPrime/CGameArchitectureSupport.hpp @@ -4,9 +4,9 @@ #include "types.h" #include "CIOWinManager.hpp" -#include "COsContext.hpp" -#include "CStopwatch.hpp" -#include "TOneStatic.hpp" +#include "Kyoto/Basics/COsContext.hpp" +#include "Kyoto/Basics/CStopwatch.hpp" +#include "Kyoto/TOneStatic.hpp" class CGameArchitectureSupport : public TOneStatic< CGameArchitectureSupport > { public: diff --git a/include/Kyoto_CWD/CGameGlobalObjects.hpp b/include/MetroidPrime/CGameGlobalObjects.hpp similarity index 70% rename from include/Kyoto_CWD/CGameGlobalObjects.hpp rename to include/MetroidPrime/CGameGlobalObjects.hpp index ef7b537a..8ae4f51c 100644 --- a/include/Kyoto_CWD/CGameGlobalObjects.hpp +++ b/include/MetroidPrime/CGameGlobalObjects.hpp @@ -6,19 +6,19 @@ #include "rstl/optional_object.hpp" #include "rstl/single_ptr.hpp" -#include "CAiFuncMap.hpp" -#include "CCharacterFactoryBuilder.hpp" -#include "CGameState.hpp" -#include "CGraphicsSys.hpp" #include "CInGameTweakManager.hpp" -#include "CMemoryCardSys.hpp" -#include "CMemorySys.hpp" -#include "COsContext.hpp" -#include "CRasterFont.hpp" -#include "CResFactory.hpp" -#include "CSimplePool.hpp" -#include "CToken.hpp" -#include "TOneStatic.hpp" +#include "Enemies/CAiFuncMap.hpp" +#include "Factories/CCharacterFactoryBuilder.hpp" +#include "Kyoto/Basics/COsContext.hpp" +#include "Kyoto/CMemoryCardSys.hpp" +#include "Kyoto/CMemorySys.hpp" +#include "Kyoto/CResFactory.hpp" +#include "Kyoto/CSimplePool.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 > { public: diff --git a/include/Kyoto_CWD/CIOWinManager.hpp b/include/MetroidPrime/CIOWinManager.hpp similarity index 100% rename from include/Kyoto_CWD/CIOWinManager.hpp rename to include/MetroidPrime/CIOWinManager.hpp diff --git a/include/Kyoto_CWD/CInGameTweakManager.hpp b/include/MetroidPrime/CInGameTweakManager.hpp similarity index 100% rename from include/Kyoto_CWD/CInGameTweakManager.hpp rename to include/MetroidPrime/CInGameTweakManager.hpp diff --git a/include/Kyoto_CWD/CMain.hpp b/include/MetroidPrime/CMain.hpp similarity index 84% rename from include/Kyoto_CWD/CMain.hpp rename to include/MetroidPrime/CMain.hpp index 87a9505d..dc9eca6b 100644 --- a/include/Kyoto_CWD/CMain.hpp +++ b/include/MetroidPrime/CMain.hpp @@ -7,13 +7,13 @@ #include "CGameArchitectureSupport.hpp" #include "CGameGlobalObjects.hpp" -#include "CInputStream.hpp" -#include "CMemorySys.hpp" -#include "COsContext.hpp" -#include "CStopwatch.hpp" -#include "CTweaks.hpp" -#include "TReservedAverage.hpp" -#include "TGameTypes.hpp" +#include "Kyoto/Basics/COsContext.hpp" +#include "Kyoto/Basics/CStopwatch.hpp" +#include "Kyoto/CMemorySys.hpp" +#include "Kyoto/Streams/CInputStream.hpp" +#include "Kyoto/TReservedAverage.hpp" +#include "MetroidPrime/TGameTypes.hpp" +#include "MetroidPrime/Tweaks/CTweaks.hpp" class CMain { public: diff --git a/include/Kyoto_CWD/CCameraFilterPass.hpp b/include/MetroidPrime/Cameras/CCameraFilterPass.hpp similarity index 100% rename from include/Kyoto_CWD/CCameraFilterPass.hpp rename to include/MetroidPrime/Cameras/CCameraFilterPass.hpp diff --git a/include/Kyoto_CWD/CAiFuncMap.hpp b/include/MetroidPrime/Enemies/CAiFuncMap.hpp similarity index 100% rename from include/Kyoto_CWD/CAiFuncMap.hpp rename to include/MetroidPrime/Enemies/CAiFuncMap.hpp diff --git a/include/Kyoto_CWD/CCharacterFactoryBuilder.hpp b/include/MetroidPrime/Factories/CCharacterFactoryBuilder.hpp similarity index 100% rename from include/Kyoto_CWD/CCharacterFactoryBuilder.hpp rename to include/MetroidPrime/Factories/CCharacterFactoryBuilder.hpp diff --git a/include/Kyoto_CWD/CGameOptions.hpp b/include/MetroidPrime/Player/CGameOptions.hpp similarity index 90% rename from include/Kyoto_CWD/CGameOptions.hpp rename to include/MetroidPrime/Player/CGameOptions.hpp index bd3eecdb..e5ff7417 100644 --- a/include/Kyoto_CWD/CGameOptions.hpp +++ b/include/MetroidPrime/Player/CGameOptions.hpp @@ -7,8 +7,8 @@ #include "rstl/reserved_vector.hpp" #include "rstl/vector.hpp" -#include "CInputStream.hpp" -#include "TGameTypes.hpp" +#include "Kyoto/Streams/CInputStream.hpp" +#include "MetroidPrime/TGameTypes.hpp" class CGameOptions { public: diff --git a/include/Kyoto_CWD/CGameState.hpp b/include/MetroidPrime/Player/CGameState.hpp similarity index 96% rename from include/Kyoto_CWD/CGameState.hpp rename to include/MetroidPrime/Player/CGameState.hpp index d68461f7..db5b4add 100644 --- a/include/Kyoto_CWD/CGameState.hpp +++ b/include/MetroidPrime/Player/CGameState.hpp @@ -8,13 +8,12 @@ #include "rstl/vector.hpp" #include "CGameOptions.hpp" -#include "CGameState.hpp" #include "CHintOptions.hpp" #include "CPlayerState.hpp" #include "CSystemOptions.hpp" #include "CWorldState.hpp" #include "CWorldTransManager.hpp" -#include "TGameTypes.hpp" +#include "MetroidPrime/TGameTypes.hpp" class CGameState { public: diff --git a/include/Kyoto_CWD/CHintOptions.hpp b/include/MetroidPrime/Player/CHintOptions.hpp similarity index 100% rename from include/Kyoto_CWD/CHintOptions.hpp rename to include/MetroidPrime/Player/CHintOptions.hpp diff --git a/include/Kyoto_CWD/CPlayerState.hpp b/include/MetroidPrime/Player/CPlayerState.hpp similarity index 100% rename from include/Kyoto_CWD/CPlayerState.hpp rename to include/MetroidPrime/Player/CPlayerState.hpp diff --git a/include/Kyoto_CWD/CSystemOptions.hpp b/include/MetroidPrime/Player/CSystemOptions.hpp similarity index 95% rename from include/Kyoto_CWD/CSystemOptions.hpp rename to include/MetroidPrime/Player/CSystemOptions.hpp index eeae256d..01cc2fec 100644 --- a/include/Kyoto_CWD/CSystemOptions.hpp +++ b/include/MetroidPrime/Player/CSystemOptions.hpp @@ -3,11 +3,12 @@ #include "types.h" -#include "TGameTypes.hpp" #include "rstl/pair.hpp" #include "rstl/reserved_vector.hpp" #include "rstl/vector.hpp" +#include "MetroidPrime/TGameTypes.hpp" + class CSystemOptions { public: CSystemOptions(); diff --git a/include/Kyoto_CWD/CWorldState.hpp b/include/MetroidPrime/Player/CWorldState.hpp similarity index 100% rename from include/Kyoto_CWD/CWorldState.hpp rename to include/MetroidPrime/Player/CWorldState.hpp diff --git a/include/Kyoto_CWD/CWorldTransManager.hpp b/include/MetroidPrime/Player/CWorldTransManager.hpp similarity index 100% rename from include/Kyoto_CWD/CWorldTransManager.hpp rename to include/MetroidPrime/Player/CWorldTransManager.hpp diff --git a/include/MetroidPrime/TGameTypes.hpp b/include/MetroidPrime/TGameTypes.hpp new file mode 100644 index 00000000..6155d130 --- /dev/null +++ b/include/MetroidPrime/TGameTypes.hpp @@ -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 diff --git a/include/Kyoto_CWD/CTweakGame.hpp b/include/MetroidPrime/Tweaks/CTweakGame.hpp similarity index 100% rename from include/Kyoto_CWD/CTweakGame.hpp rename to include/MetroidPrime/Tweaks/CTweakGame.hpp diff --git a/include/Kyoto_CWD/CTweaks.hpp b/include/MetroidPrime/Tweaks/CTweaks.hpp similarity index 100% rename from include/Kyoto_CWD/CTweaks.hpp rename to include/MetroidPrime/Tweaks/CTweaks.hpp diff --git a/include/Kyoto_CWD/UserNames.hpp b/include/MetroidPrime/UserNames.hpp similarity index 99% rename from include/Kyoto_CWD/UserNames.hpp rename to include/MetroidPrime/UserNames.hpp index 4a2d21ce..4e50f1c2 100644 --- a/include/Kyoto_CWD/UserNames.hpp +++ b/include/MetroidPrime/UserNames.hpp @@ -1,5 +1,6 @@ #ifndef __USERNAMES_HPP_ #define __USERNAMES_HPP_ + #include "types.h" bool IsUser(int name); diff --git a/include/rstl/rmemory_allocator.hpp b/include/rstl/rmemory_allocator.hpp index 36d127a3..b48dca5a 100644 --- a/include/rstl/rmemory_allocator.hpp +++ b/include/rstl/rmemory_allocator.hpp @@ -3,7 +3,7 @@ #include "types.h" -#include "../Kyoto_CWD/CMemory.hpp" +#include "Kyoto/Alloc/CMemory.hpp" namespace rstl { struct rmemory_allocator { diff --git a/src/Kyoto/Basics/CSWDataDolphin.cpp b/src/Kyoto/Basics/CSWDataDolphin.cpp index 1fc8cdf8..b30ccc83 100644 --- a/src/Kyoto/Basics/CSWDataDolphin.cpp +++ b/src/Kyoto/Basics/CSWDataDolphin.cpp @@ -1,4 +1,4 @@ -#include "Kyoto_CWD/CStopwatch.hpp" +#include "Kyoto/Basics/CStopwatch.hpp" #include "Dolphin/os.h" diff --git a/src/Kyoto/Streams/CInputStream.cpp b/src/Kyoto/Streams/CInputStream.cpp index 66eb1913..ee76ee0d 100644 --- a/src/Kyoto/Streams/CInputStream.cpp +++ b/src/Kyoto/Streams/CInputStream.cpp @@ -1,8 +1,8 @@ -#include "Kyoto_CWD/CInputStream.hpp" +#include "Kyoto/Streams/CInputStream.hpp" #include "string.h" -#include "Kyoto_CWD/CMemory.hpp" +#include "Kyoto/Alloc/CMemory.hpp" static u8 c; static u16 s; diff --git a/src/Kyoto/Text/CStringTable.cpp b/src/Kyoto/Text/CStringTable.cpp index 96b5b02a..caaf596b 100644 --- a/src/Kyoto/Text/CStringTable.cpp +++ b/src/Kyoto/Text/CStringTable.cpp @@ -1,10 +1,9 @@ -#include "Kyoto_CWD/CStringTable.hpp" +#include "Kyoto/Text/CStringTable.hpp" #include "rstl/pair.hpp" #include "rstl/vector.hpp" -#include "Kyoto_CWD/CFactoryMgr.hpp" -#include "Kyoto_CWD/TGameTypes.hpp" +#include "Kyoto/CFactoryMgr.hpp" static FourCC mCurrentLanguage = 'ENGL'; diff --git a/src/MetroidPrime/Cameras/CCameraFilter.cpp b/src/MetroidPrime/Cameras/CCameraFilter.cpp index 5e4faada..29072e69 100644 --- a/src/MetroidPrime/Cameras/CCameraFilter.cpp +++ b/src/MetroidPrime/Cameras/CCameraFilter.cpp @@ -1,6 +1,6 @@ -#include "Kyoto_CWD/CCameraFilterPass.hpp" -#include "Kyoto_CWD/CCubeRenderer.hpp" -#include "Kyoto_CWD/CGraphics.hpp" +#include "MetroidPrime/Cameras/CCameraFilterPass.hpp" +#include "MetaRender/CCubeRenderer.hpp" +#include "Kyoto/Graphics/CGraphics.hpp" // FIXME non-matching https://decomp.me/scratch/8N81d void CCameraFilterPass::DrawWideScreen(const CColor& color, const CTexture* tex, f32 lod) { diff --git a/src/MetroidPrime/UserNames.cpp b/src/MetroidPrime/UserNames.cpp index 9e2d51fe..8f6ccf44 100644 --- a/src/MetroidPrime/UserNames.cpp +++ b/src/MetroidPrime/UserNames.cpp @@ -1,6 +1,6 @@ #include "types.h" -#include "Kyoto_CWD/UserNames.hpp" +#include "MetroidPrime/UserNames.hpp" bool IsUser(int name) { return name == 1; diff --git a/src/MetroidPrime/main.cpp b/src/MetroidPrime/main.cpp index b2e9389c..54a24d1b 100644 --- a/src/MetroidPrime/main.cpp +++ b/src/MetroidPrime/main.cpp @@ -1,30 +1,30 @@ -#include "Kyoto_CWD/CMain.hpp" +#include "MetroidPrime/CMain.hpp" +#include "Dolphin/os.h" #include "Dolphin/OSCache.h" #include "Dolphin/PPCArch.h" -#include "Dolphin/os.h" -#include "Kyoto_CWD/CARAMManager.hpp" -#include "Kyoto_CWD/CARAMToken.hpp" -#include "Kyoto_CWD/CBasics.hpp" -#include "Kyoto_CWD/CCharacterFactoryBuilder.hpp" -#include "Kyoto_CWD/CCubeRenderer.hpp" -#include "Kyoto_CWD/CGameGlobalObjects.hpp" -#include "Kyoto_CWD/CGameOptions.hpp" -#include "Kyoto_CWD/CGameState.hpp" -#include "Kyoto_CWD/CGraphics.hpp" -#include "Kyoto_CWD/CInGameTweakManager.hpp" -#include "Kyoto_CWD/CMemoryCardSys.hpp" -#include "Kyoto_CWD/CMemoryInStream.hpp" -#include "Kyoto_CWD/CPakFile.hpp" -#include "Kyoto_CWD/CPlayerState.hpp" -#include "Kyoto_CWD/CResFactory.hpp" -#include "Kyoto_CWD/CSfxManager.hpp" -#include "Kyoto_CWD/CSimplePool.hpp" -#include "Kyoto_CWD/CStreamAudioManager.hpp" -#include "Kyoto_CWD/CStringTable.hpp" -#include "Kyoto_CWD/CSystemOptions.hpp" -#include "Kyoto_CWD/CTweakGame.hpp" +#include "Kyoto/Audio/CSfxManager.hpp" +#include "Kyoto/Audio/CStreamAudioManager.hpp" +#include "Kyoto/Basics/CBasics.hpp" +#include "Kyoto/CARAMManager.hpp" +#include "Kyoto/CARAMToken.hpp" +#include "Kyoto/CMemoryCardSys.hpp" +#include "Kyoto/CPakFile.hpp" +#include "Kyoto/CResFactory.hpp" +#include "Kyoto/CSimplePool.hpp" +#include "Kyoto/Graphics/CGraphics.hpp" +#include "Kyoto/Streams/CMemoryInStream.hpp" +#include "Kyoto/Text/CStringTable.hpp" +#include "MetaRender/CCubeRenderer.hpp" +#include "MetroidPrime/CGameGlobalObjects.hpp" +#include "MetroidPrime/CInGameTweakManager.hpp" +#include "MetroidPrime/Factories/CCharacterFactoryBuilder.hpp" +#include "MetroidPrime/Player/CGameOptions.hpp" +#include "MetroidPrime/Player/CGameState.hpp" +#include "MetroidPrime/Player/CPlayerState.hpp" +#include "MetroidPrime/Player/CSystemOptions.hpp" +#include "MetroidPrime/Tweaks/CTweakGame.hpp" extern "C" { // something pad