AxioDL
/
metaforce
mirror of https://github.com/AxioDL/metaforce.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Add version info to extracted data, clean up MP1.*

This commit is contained in:
Phillip Stephens 2020-04-15 00:56:59 -07:00
parent 5aae402149
commit 1eade15395
Signed by: Antidote
GPG Key ID: F8BEE4C83DACA60D
7 changed files with 112 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
DataSpec/SpecBase.cpp
View File

@ -75,18 +75,20 @@ bool SpecBase::canExtract(const ExtractPassInfo& info, std::vector<ExtractReport
if (m_standalone && !checkStandaloneID(gameID)) if (m_standalone && !checkStandaloneID(gameID))
return false; return false;
char region = m_disc->getHeader().m_gameID[3]; m_region = ERegion(m_disc->getHeader().m_gameID[3]);
const hecl::SystemString* regstr = &regNONE; const hecl::SystemString* regstr = &regNONE;
switch (region) { switch (m_region) {
case 'E': case ERegion::NTSC_U:
regstr = &regE; regstr = &regE;
break; break;
case 'J': case ERegion::PAL:
regstr = &regJ; regstr = &regJ;
break; break;
case 'P': case ERegion::NTSC_J:
regstr = &regP; regstr = &regP;
break; break;
default:
break;
} }
if (m_standalone) if (m_standalone)
@ -1206,4 +1208,15 @@ void SpecBase::waitForIndexComplete() const {
} }
} }
void SpecBase::WriteVersionInfo(hecl::Database::Project &project, const hecl::ProjectPath &pakPath) {
hecl::ProjectPath versionPath(pakPath, _SYS_STR("version.yaml"));
versionPath.makeDirChain(false);
athena::io::YAMLDocWriter yamlW("URDEVersionData");
yamlW.writeString("version", m_version);
yamlW.writeByte("region", atUint8(m_region));
yamlW.writeBool("is_trilogy", !m_standalone);
athena::io::FileWriter fileW(versionPath.getAbsolutePath());
yamlW.finish(&fileW);
}
} // namespace DataSpec } // namespace DataSpec

10
DataSpec/SpecBase.hpp
View File

@ -23,6 +23,12 @@ class YAMLDocWriter;
} // namespace athena::io } // namespace athena::io
namespace DataSpec { namespace DataSpec {
enum class ERegion {
Invalid = 0,
NTSC_U = 'E',
PAL = 'P',
NTSC_J = 'J'
};
struct SpecBase : hecl::Database::IDataSpec { struct SpecBase : hecl::Database::IDataSpec {
/* HECL Adaptors */ /* HECL Adaptors */
@ -199,6 +205,10 @@ protected:
std::unique_ptr<nod::DiscBase> m_disc; std::unique_ptr<nod::DiscBase> m_disc;
bool m_isWii; bool m_isWii;
bool m_standalone; bool m_standalone;
ERegion m_region = ERegion::Invalid;
std::string m_version;
void WriteVersionInfo(hecl::Database::Project& project, const hecl::ProjectPath& pakPath);
}; };
bool IsPathAudioGroup(const hecl::ProjectPath& path); bool IsPathAudioGroup(const hecl::ProjectPath& path);

26
DataSpec/SpecMP1.cpp
View File

@ -63,7 +63,8 @@ extern hecl::Database::DataSpecEntry SpecEntMP1PC;
extern hecl::Database::DataSpecEntry SpecEntMP1ORIG; extern hecl::Database::DataSpecEntry SpecEntMP1ORIG;
struct TextureCache { struct TextureCache {
static void Generate(PAKRouter<DNAMP1::PAKBridge>& pakRouter, hecl::Database::Project& project, const hecl::ProjectPath& pakPath) { static void Generate(PAKRouter<DNAMP1::PAKBridge>& pakRouter, hecl::Database::Project& project,
const hecl::ProjectPath& pakPath) {
hecl::ProjectPath texturePath(pakPath, _SYS_STR("texture_cache.yaml")); hecl::ProjectPath texturePath(pakPath, _SYS_STR("texture_cache.yaml"));
hecl::ProjectPath catalogPath(pakPath, _SYS_STR("!catalog.yaml")); hecl::ProjectPath catalogPath(pakPath, _SYS_STR("!catalog.yaml"));
texturePath.makeDirChain(false); texturePath.makeDirChain(false);
@ -112,9 +113,8 @@ struct TextureCache {
metaPairs.emplace_back(projectPath.parsedHash32(), meta); metaPairs.emplace_back(projectPath.parsedHash32(), meta);
} }
std::sort(metaPairs.begin(), metaPairs.end(), [](const auto& a, const auto& b) -> bool { std::sort(metaPairs.begin(), metaPairs.end(),
return a.first < b.first; [](const auto& a, const auto& b) -> bool { return a.first < b.first; });
});
athena::io::FileWriter w(outPath.getAbsolutePath()); athena::io::FileWriter w(outPath.getAbsolutePath());
w.writeUint32Big(metaPairs.size()); w.writeUint32Big(metaPairs.size());
@ -223,13 +223,13 @@ struct SpecMP1 : SpecBase {
if (!buildInfo) if (!buildInfo)
return false; return false;
m_version = std::string(buildInfo);
/* Root Report */ /* Root Report */
ExtractReport& rep = reps.emplace_back(); ExtractReport& rep = reps.emplace_back();
rep.name = _SYS_STR("MP1"); rep.name = _SYS_STR("MP1");
rep.desc = _SYS_STR("Metroid Prime ") + regstr; rep.desc = _SYS_STR("Metroid Prime ") + regstr;
if (buildInfo) { if (buildInfo) {
std::string buildStr(buildInfo); hecl::SystemStringConv buildView(m_version);
hecl::SystemStringConv buildView(buildStr);
rep.desc += _SYS_STR(" (") + buildView + _SYS_STR(")"); rep.desc += _SYS_STR(" (") + buildView + _SYS_STR(")");
} }
@ -378,6 +378,14 @@ struct SpecMP1 : SpecBase {
/* Generate Texture Cache containing meta data for every texture file */ /* Generate Texture Cache containing meta data for every texture file */
TextureCache::Generate(m_pakRouter, m_project, noAramPath); TextureCache::Generate(m_pakRouter, m_project, noAramPath);
/* Write version data */
hecl::ProjectPath versionPath;
if (m_standalone) {
versionPath = hecl::ProjectPath(m_project.getProjectWorkingPath(), _SYS_STR("out/files"));
} else {
versionPath = hecl::ProjectPath(m_project.getProjectWorkingPath(), _SYS_STR("out/files/MP1"));
}
WriteVersionInfo(m_project, versionPath);
return true; return true;
} }
@ -740,7 +748,8 @@ struct SpecMP1 : SpecBase {
} }
if (!colMesh) if (!colMesh)
Log.report(logvisor::Fatal, FMT_STRING(_SYS_STR("unable to find mesh named 'CMESH' in {}")), in.getAbsolutePath()); Log.report(logvisor::Fatal, FMT_STRING(_SYS_STR("unable to find mesh named 'CMESH' in {}")),
in.getAbsolutePath());
std::vector<Light> lights = ds.compileLights(); std::vector<Light> lights = ds.compileLights();
@ -1131,7 +1140,8 @@ struct SpecMP1 : SpecBase {
} }
void buildPakList(hecl::blender::Token& btok, athena::io::FileWriter& w, const std::vector<urde::SObjectTag>& list, void buildPakList(hecl::blender::Token& btok, athena::io::FileWriter& w, const std::vector<urde::SObjectTag>& list,
const std::vector<std::pair<urde::SObjectTag, std::string>>& nameList, atUint64& resTableOffset) override { const std::vector<std::pair<urde::SObjectTag, std::string>>& nameList,
atUint64& resTableOffset) override {
w.writeUint32Big(m_pc ? 0x80030005 : 0x00030005); w.writeUint32Big(m_pc ? 0x80030005 : 0x00030005);
w.writeUint32Big(0); w.writeUint32Big(0);

12
DataSpec/SpecMP2.cpp
View File

@ -187,12 +187,12 @@ struct SpecMP2 : SpecBase {
if (!buildInfo) if (!buildInfo)
return false; return false;
m_version = std::string(buildInfo);
/* Root Report */ /* Root Report */
ExtractReport& rep = reps.emplace_back(); ExtractReport& rep = reps.emplace_back();
rep.name = _SYS_STR("MP2"); rep.name = _SYS_STR("MP2");
rep.desc = _SYS_STR("Metroid Prime 2 ") + regstr; rep.desc = _SYS_STR("Metroid Prime 2 ") + regstr;
std::string buildStr(buildInfo); hecl::SystemStringConv buildView(m_version);
hecl::SystemStringConv buildView(buildStr);
rep.desc += _SYS_STR(" (") + buildView + _SYS_STR(")"); rep.desc += _SYS_STR(" (") + buildView + _SYS_STR(")");
/* Iterate PAKs and build level options */ /* Iterate PAKs and build level options */
@ -317,6 +317,14 @@ struct SpecMP2 : SpecBase {
hecl::ProjectPath noAramPath(m_project.getProjectWorkingPath(), _SYS_STR("MP2/URDE")); hecl::ProjectPath noAramPath(m_project.getProjectWorkingPath(), _SYS_STR("MP2/URDE"));
TextureCache::Generate(m_pakRouter, m_project, noAramPath); TextureCache::Generate(m_pakRouter, m_project, noAramPath);
/* Write version data */
hecl::ProjectPath versionPath;
if (m_standalone) {
versionPath = hecl::ProjectPath(m_project.getProjectWorkingPath(), _SYS_STR("out/files"));
} else {
versionPath = hecl::ProjectPath(m_project.getProjectWorkingPath(), _SYS_STR("out/files/MP2"));
}
WriteVersionInfo(m_project, versionPath);
return true; return true;
} }

12
DataSpec/SpecMP3.cpp
View File

@ -231,12 +231,12 @@ struct SpecMP3 : SpecBase {
if (!strcmp(buildInfo, "Build v3.068 3/2/2006 14:55:13")) if (!strcmp(buildInfo, "Build v3.068 3/2/2006 14:55:13"))
return false; return false;
m_version = std::string(buildInfo);
/* Root Report */ /* Root Report */
ExtractReport& rep = reps.emplace_back(); ExtractReport& rep = reps.emplace_back();
rep.name = _SYS_STR("MP3"); rep.name = _SYS_STR("MP3");
rep.desc = _SYS_STR("Metroid Prime 3 ") + regstr; rep.desc = _SYS_STR("Metroid Prime 3 ") + regstr;
std::string buildStr(buildInfo); hecl::SystemStringConv buildView(m_version);
hecl::SystemStringConv buildView(buildStr);
rep.desc += _SYS_STR(" (") + buildView + _SYS_STR(")"); rep.desc += _SYS_STR(" (") + buildView + _SYS_STR(")");
/* Iterate PAKs and build level options */ /* Iterate PAKs and build level options */
@ -473,12 +473,20 @@ struct SpecMP3 : SpecBase {
} }
process.waitUntilComplete(); process.waitUntilComplete();
}
/* Extract part of .dol for RandomStatic entropy */ /* Extract part of .dol for RandomStatic entropy */
hecl::ProjectPath noAramPath(m_project.getProjectWorkingPath(), _SYS_STR("MP3/URDE")); hecl::ProjectPath noAramPath(m_project.getProjectWorkingPath(), _SYS_STR("MP3/URDE"));
/* Generate Texture Cache containing meta data for every texture file */ /* Generate Texture Cache containing meta data for every texture file */
TextureCache::Generate(m_pakRouter, m_project, noAramPath); TextureCache::Generate(m_pakRouter, m_project, noAramPath);
/* Write version data */
hecl::ProjectPath versionPath;
if (m_standalone) {
versionPath = hecl::ProjectPath(m_project.getProjectWorkingPath(), _SYS_STR("out/files"));
} else {
versionPath = hecl::ProjectPath(m_project.getProjectWorkingPath(), _SYS_STR("out/files/MP3"));
} }
WriteVersionInfo(m_project, versionPath);
return true; return true;
} }

9
Runtime/MP1/MP1.cpp
View File

@ -61,6 +61,7 @@
#include "Runtime/Particle/CWeaponDescription.hpp" #include "Runtime/Particle/CWeaponDescription.hpp"
#include "Runtime/World/CPlayer.hpp" #include "Runtime/World/CPlayer.hpp"
#include "Runtime/World/CStateMachine.hpp" #include "Runtime/World/CStateMachine.hpp"
#include "Runtime/World/CScriptMazeNode.hpp"
#include <DataSpec/DNAMP1/SFX/Misc.h> #include <DataSpec/DNAMP1/SFX/Misc.h>
#include <DataSpec/DNAMP1/SFX/MiscSamus.h> #include <DataSpec/DNAMP1/SFX/MiscSamus.h>
@ -343,6 +344,14 @@ CGameGlobalObjects::~CGameGlobalObjects() {
g_GameState = nullptr; g_GameState = nullptr;
g_TweakManager = nullptr; g_TweakManager = nullptr;
} }
void CGameGlobalObjects::PostInitialize() {
AddPaksAndFactories();
LoadTextureCache();
LoadStringTable();
m_renderer.reset(AllocateRenderer(*xcc_simplePool, *x4_resFactory));
CEnvFxManager::Initialize();
CScriptMazeNode::LoadMazeSeeds();
}
void CMain::AddWorldPaks() { void CMain::AddWorldPaks() {
CResLoader* loader = g_ResFactory->GetResLoader(); CResLoader* loader = g_ResFactory->GetResLoader();

72
Runtime/MP1/MP1.hpp
View File

@ -7,40 +7,39 @@
#define MP1_VARIABLE_DELTA_TIME 1 #define MP1_VARIABLE_DELTA_TIME 1
#endif #endif
#include "IMain.hpp" #include "Runtime/IMain.hpp"
#include "CTweaks.hpp" #include "Runtime/MP1/CTweaks.hpp"
#include "CPlayMovie.hpp" #include "Runtime/MP1/CPlayMovie.hpp"
#include "IOStreams.hpp" #include "Runtime/IOStreams.hpp"
#include "CBasics.hpp" #include "Runtime/CBasics.hpp"
#include "CMemoryCardSys.hpp" #include "Runtime/CMemoryCardSys.hpp"
#include "CResFactory.hpp" #include "Runtime/CResFactory.hpp"
#include "CSimplePool.hpp" #include "Runtime/CSimplePool.hpp"
#include "Character/CAssetFactory.hpp" #include "Runtime/Character/CAssetFactory.hpp"
#include "World/CAi.hpp" #include "Runtime/World/CAi.hpp"
#include "CGameState.hpp" #include "Runtime/CGameState.hpp"
#include "CInGameTweakManager.hpp" #include "Runtime/MP1/CInGameTweakManager.hpp"
#include "Particle/CElementGen.hpp" #include "Runtime/Particle/CElementGen.hpp"
#include "Character/CAnimData.hpp" #include "Runtime/Character/CAnimData.hpp"
#include "Particle/CDecalManager.hpp" #include "Runtime/Particle/CDecalManager.hpp"
#include "Particle/CGenDescription.hpp" #include "Runtime/Particle/CGenDescription.hpp"
#include "Graphics/CBooRenderer.hpp" #include "Runtime/Graphics/CBooRenderer.hpp"
#include "Audio/CAudioSys.hpp" #include "Runtime/Audio/CAudioSys.hpp"
#include "Input/CInputGenerator.hpp" #include "Runtime/Input/CInputGenerator.hpp"
#include "GuiSys/CGuiSys.hpp" #include "Runtime/GuiSys/CGuiSys.hpp"
#include "CIOWinManager.hpp" #include "Runtime/CIOWinManager.hpp"
#include "GuiSys/CSplashScreen.hpp" #include "Runtime/GuiSys/CSplashScreen.hpp"
#include "CMainFlow.hpp" #include "Runtime/MP1/CMainFlow.hpp"
#include "GuiSys/CConsoleOutputWindow.hpp" #include "Runtime/GuiSys/CConsoleOutputWindow.hpp"
#include "GuiSys/CErrorOutputWindow.hpp" #include "Runtime/GuiSys/CErrorOutputWindow.hpp"
#include "GuiSys/CTextParser.hpp" #include "Runtime/GuiSys/CTextParser.hpp"
#include "CAudioStateWin.hpp" #include "Runtime/MP1/CAudioStateWin.hpp"
#include "GameGlobalObjects.hpp" #include "Runtime/GameGlobalObjects.hpp"
#include "CArchitectureQueue.hpp" #include "Runtime/CArchitectureQueue.hpp"
#include "CTimeProvider.hpp" #include "Runtime/CTimeProvider.hpp"
#include "GuiSys/CTextExecuteBuffer.hpp" #include "Runtime/GuiSys/CTextExecuteBuffer.hpp"
#include "DataSpec/DNAMP1/Tweaks/CTweakPlayer.hpp" #include "DataSpec/DNAMP1/Tweaks/CTweakPlayer.hpp"
#include "DataSpec/DNAMP1/Tweaks/CTweakGame.hpp" #include "DataSpec/DNAMP1/Tweaks/CTweakGame.hpp"
#include "World/CScriptMazeNode.hpp"
#include "hecl/Console.hpp" #include "hecl/Console.hpp"
struct DiscordUser; struct DiscordUser;
@ -104,14 +103,7 @@ public:
~CGameGlobalObjects(); ~CGameGlobalObjects();
void PostInitialize() { void PostInitialize();
AddPaksAndFactories();
LoadTextureCache();
LoadStringTable();
m_renderer.reset(AllocateRenderer(*xcc_simplePool, *x4_resFactory));
CEnvFxManager::Initialize();
CScriptMazeNode::LoadMazeSeeds();
}
void ResetGameState() { void ResetGameState() {
x134_gameState = std::make_unique<CGameState>(); x134_gameState = std::make_unique<CGameState>();