AxioDL/metaforce
2
0
Fork 0
mirror of https://github.com/AxioDL/metaforce.git synced 2025-12-09 07:47:42 +00:00
Code Issues Projects Releases Wiki Activity

Humungous refactor

Browse Source
This commit is contained in:
Jack Andersen
2016-03-04 13:04:53 -10:00
parent 552ec1db4a
commit 783fb4c4fe
330 changed files with 2943 additions and 3077 deletions
Download Patch File Download Diff File Expand all files Collapse all files

108
DataSpec/SpecMP1.cpp
View File

@@ -13,8 +13,8 @@
namespace DataSpec
{
static LogVisor::LogModule Log("Retro::SpecMP1");
extern HECL::Database::DataSpecEntry SpecEntMP1;
static logvisor::Module Log("urde::SpecMP1");
extern hecl::Database::DataSpecEntry SpecEntMP1;
struct SpecMP1 : SpecBase
{
@@ -25,27 +25,27 @@ struct SpecMP1 : SpecBase
return false;
}
std::vector<const NOD::Node*> m_nonPaks;
std::vector<const nod::Node*> m_nonPaks;
std::vector<DNAMP1::PAKBridge> m_paks;
std::map<std::string, DNAMP1::PAKBridge*, HECL::CaseInsensitiveCompare> m_orderedPaks;
std::map<std::string, DNAMP1::PAKBridge*, hecl::CaseInsensitiveCompare> m_orderedPaks;
HECL::ProjectPath m_workPath;
HECL::ProjectPath m_cookPath;
hecl::ProjectPath m_workPath;
hecl::ProjectPath m_cookPath;
PAKRouter<DNAMP1::PAKBridge> m_pakRouter;
SpecMP1(HECL::Database::Project& project)
SpecMP1(hecl::Database::Project& project)
: SpecBase(project),
m_workPath(project.getProjectWorkingPath(), _S("MP1")),
m_cookPath(project.getProjectCookedPath(SpecEntMP1), _S("MP1")),
m_pakRouter(*this, m_workPath, m_cookPath) {}
void buildPaks(NOD::Node& root,
const std::vector<HECL::SystemString>& args,
void buildPaks(nod::Node& root,
const std::vector<hecl::SystemString>& args,
ExtractReport& rep)
{
m_nonPaks.clear();
m_paks.clear();
for (const NOD::Node& child : root)
for (const nod::Node& child : root)
{
bool isPak = false;
const std::string& name = child.getName();
@@ -67,8 +67,8 @@ struct SpecMP1 : SpecBase
good = false;
if (!lowerName.compare(0, 7, "metroid"))
{
HECL::SystemChar idxChar = lowerName[7];
for (const HECL::SystemString& arg : args)
hecl::SystemChar idxChar = lowerName[7];
for (const hecl::SystemString& arg : args)
{
if (arg.size() == 1 && iswdigit(arg[0]))
if (arg[0] == idxChar)
@@ -80,10 +80,10 @@ struct SpecMP1 : SpecBase
if (!good)
{
for (const HECL::SystemString& arg : args)
for (const hecl::SystemString& arg : args)
{
#if HECL_UCS2
std::string lowerArg = HECL::WideToUTF8(arg);
std::string lowerArg = hecl::WideToUTF8(arg);
#else
std::string lowerArg = arg;
#endif
@@ -116,18 +116,18 @@ struct SpecMP1 : SpecBase
continue;
rep.childOpts.emplace_back();
ExtractReport& childRep = rep.childOpts.back();
HECL::SystemStringView nameView(item.first);
hecl::SystemStringView nameView(item.first);
childRep.name = nameView;
childRep.desc = item.second->getLevelString();
}
}
bool checkFromStandaloneDisc(NOD::DiscBase& disc,
const HECL::SystemString& regstr,
const std::vector<HECL::SystemString>& args,
bool checkFromStandaloneDisc(nod::DiscBase& disc,
const hecl::SystemString& regstr,
const std::vector<hecl::SystemString>& args,
std::vector<ExtractReport>& reps)
{
NOD::Partition* partition = disc.getDataPartition();
nod::Partition* partition = disc.getDataPartition();
std::unique_ptr<uint8_t[]> dolBuf = partition->getDOLBuf();
const char* buildInfo = (char*)memmem(dolBuf.get(), partition->getDOLSize(), "MetroidBuildInfo", 16) + 19;
@@ -142,40 +142,40 @@ struct SpecMP1 : SpecBase
if (buildInfo)
{
std::string buildStr(buildInfo);
HECL::SystemStringView buildView(buildStr);
hecl::SystemStringView buildView(buildStr);
rep.desc += _S(" (") + buildView + _S(")");
}
/* Iterate PAKs and build level options */
NOD::Node& root = partition->getFSTRoot();
nod::Node& root = partition->getFSTRoot();
buildPaks(root, args, rep);
return true;
}
bool checkFromTrilogyDisc(NOD::DiscBase& disc,
const HECL::SystemString& regstr,
const std::vector<HECL::SystemString>& args,
bool checkFromTrilogyDisc(nod::DiscBase& disc,
const hecl::SystemString& regstr,
const std::vector<hecl::SystemString>& args,
std::vector<ExtractReport>& reps)
{
std::vector<HECL::SystemString> mp1args;
std::vector<hecl::SystemString> mp1args;
bool doExtract = false;
if (args.size())
{
/* Needs filter */
for (const HECL::SystemString& arg : args)
for (const hecl::SystemString& arg : args)
{
HECL::SystemString lowerArg = arg;
HECL::ToLower(lowerArg);
hecl::SystemString lowerArg = arg;
hecl::ToLower(lowerArg);
if (!lowerArg.compare(0, 3, _S("mp1")))
{
doExtract = true;
mp1args.reserve(args.size());
size_t slashPos = arg.find(_S('/'));
if (slashPos == HECL::SystemString::npos)
if (slashPos == hecl::SystemString::npos)
slashPos = arg.find(_S('\\'));
if (slashPos != HECL::SystemString::npos)
mp1args.emplace_back(HECL::SystemString(arg.begin() + slashPos + 1, arg.end()));
if (slashPos != hecl::SystemString::npos)
mp1args.emplace_back(hecl::SystemString(arg.begin() + slashPos + 1, arg.end()));
}
}
}
@@ -185,9 +185,9 @@ struct SpecMP1 : SpecBase
if (!doExtract)
return false;
NOD::Partition* partition = disc.getDataPartition();
NOD::Node& root = partition->getFSTRoot();
NOD::Node::DirectoryIterator dolIt = root.find("rs5mp1_p.dol");
nod::Partition* partition = disc.getDataPartition();
nod::Node& root = partition->getFSTRoot();
nod::Node::DirectoryIterator dolIt = root.find("rs5mp1_p.dol");
if (dolIt == root.end())
return false;
@@ -202,12 +202,12 @@ struct SpecMP1 : SpecBase
if (buildInfo)
{
std::string buildStr(buildInfo);
HECL::SystemStringView buildView(buildStr);
hecl::SystemStringView buildView(buildStr);
rep.desc += _S(" (") + buildView + _S(")");
}
/* Iterate PAKs and build level options */
NOD::Node::DirectoryIterator mp1It = root.find("MP1");
nod::Node::DirectoryIterator mp1It = root.find("MP1");
if (mp1It == root.end())
return false;
buildPaks(*mp1It, mp1args, rep);
@@ -215,9 +215,9 @@ struct SpecMP1 : SpecBase
return true;
}
bool extractFromDisc(NOD::DiscBase&, bool force, FProgress progress)
bool extractFromDisc(nod::DiscBase&, bool force, FProgress progress)
{
NOD::ExtractionContext ctx = {true, force, nullptr};
nod::ExtractionContext ctx = {true, force, nullptr};
progress(_S("Indexing PAKs"), _S(""), 2, 0.0);
m_pakRouter.build(m_paks, [&progress](float factor)
@@ -230,17 +230,17 @@ struct SpecMP1 : SpecBase
progress(_S("MP1 Root"), _S(""), 3, 0.0);
int prog = 0;
ctx.progressCB = [&](const std::string& name) {
HECL::SystemStringView nameView(name);
hecl::SystemStringView nameView(name);
progress(_S("MP1 Root"), nameView.sys_str().c_str(), 3, prog / (float)m_nonPaks.size());
};
for (const NOD::Node* node : m_nonPaks)
for (const nod::Node* node : m_nonPaks)
{
node->extractToDirectory(m_workPath.getAbsolutePath(), ctx);
prog++;
}
progress(_S("MP1 Root"), _S(""), 3, 1.0);
const HECL::ProjectPath& cookPath = m_project.getProjectCookedPath(SpecEntMP1);
const hecl::ProjectPath& cookPath = m_project.getProjectCookedPath(SpecEntMP1);
cookPath.makeDir();
m_cookPath.makeDir();
@@ -253,11 +253,11 @@ struct SpecMP1 : SpecBase
continue;
const std::string& name = pak.getName();
HECL::SystemStringView sysName(name);
hecl::SystemStringView sysName(name);
progress(sysName.sys_str().c_str(), _S(""), compIdx, 0.0);
m_pakRouter.extractResources(pak, force,
[&progress, &sysName, &compIdx](const HECL::SystemChar* substr, float factor)
[&progress, &sysName, &compIdx](const hecl::SystemChar* substr, float factor)
{
progress(sysName.sys_str().c_str(), substr, compIdx, factor);
});
@@ -267,12 +267,12 @@ struct SpecMP1 : SpecBase
return true;
}
virtual HECL::ProjectPath getWorking(class UniqueID32& id)
virtual hecl::ProjectPath getWorking(class UniqueID32& id)
{
return m_pakRouter.getWorking(id);
}
bool checkPathPrefix(const HECL::ProjectPath& path)
bool checkPathPrefix(const hecl::ProjectPath& path)
{
return path.getRelativePath().compare(0, 4, _S("MP1/")) == 0;
}
@@ -286,41 +286,41 @@ struct SpecMP1 : SpecBase
return false;
}
void cookMesh(const HECL::ProjectPath& out, const HECL::ProjectPath& in,
void cookMesh(const hecl::ProjectPath& out, const hecl::ProjectPath& in,
BlendStream& ds, bool fast, FCookProgress progress) const
{
Mesh mesh = ds.compileMesh(fast ? HECL::HMDLTopology::Triangles : HECL::HMDLTopology::TriStrips, -1,
Mesh mesh = ds.compileMesh(fast ? hecl::HMDLTopology::Triangles : hecl::HMDLTopology::TriStrips, -1,
[&progress](int surfCount)
{
progress(HECL::SysFormat(_S("%d"), surfCount).c_str());
progress(hecl::SysFormat(_S("%d"), surfCount).c_str());
});
DNAMP1::CMDL::Cook(out, in, mesh);
}
void cookActor(const HECL::ProjectPath& out, const HECL::ProjectPath& in,
void cookActor(const hecl::ProjectPath& out, const hecl::ProjectPath& in,
BlendStream& ds, bool fast, FCookProgress progress) const
{
Actor actor = ds.compileActor();
DNAMP1::ANCS::Cook(out, in, actor);
}
void cookArea(const HECL::ProjectPath& out, const HECL::ProjectPath& in,
void cookArea(const hecl::ProjectPath& out, const hecl::ProjectPath& in,
BlendStream& ds, bool fast, FCookProgress progress) const
{
}
void cookYAML(const HECL::ProjectPath& out, const HECL::ProjectPath& in,
void cookYAML(const hecl::ProjectPath& out, const hecl::ProjectPath& in,
FILE* fin, FCookProgress progress) const
{
}
};
HECL::Database::DataSpecEntry SpecEntMP1 =
hecl::Database::DataSpecEntry SpecEntMP1 =
{
_S("MP1"),
_S("Data specification for original Metroid Prime engine"),
[](HECL::Database::Project& project, HECL::Database::DataSpecTool)
-> HECL::Database::IDataSpec* {return new struct SpecMP1(project);}
[](hecl::Database::Project& project, hecl::Database::DataSpecTool)
-> hecl::Database::IDataSpec* {return new struct SpecMP1(project);}
};
}