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

update nod

This commit is contained in:
Phillip Stephens 2017-05-21 03:27:21 -07:00
parent b172bd26e6
commit c97c8d054b
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
DataSpec/SpecMP1.cpp
View File

@ -341,7 +341,7 @@ struct SpecMP1 : SpecBase
/* Extract non-pak files */ /* Extract non-pak files */
progress(_S("MP1 Root"), _S(""), 3, 0.0); progress(_S("MP1 Root"), _S(""), 3, 0.0);
int prog = 0; int prog = 0;
ctx.progressCB = [&](const std::string& name) { ctx.progressCB = [&](const std::string& name, float) {
hecl::SystemStringView nameView(name); hecl::SystemStringView nameView(name);
progress(_S("MP1 Root"), nameView.c_str(), 3, prog / (float)m_nonPaks.size()); progress(_S("MP1 Root"), nameView.c_str(), 3, prog / (float)m_nonPaks.size());
}; };

2
DataSpec/SpecMP2.cpp
View File

@ -229,7 +229,7 @@ struct SpecMP2 : SpecBase
mp2OutPath.makeDir(); mp2OutPath.makeDir();
progress(_S("MP2 Root"), _S(""), 3, 0.0); progress(_S("MP2 Root"), _S(""), 3, 0.0);
int prog = 0; int prog = 0;
ctx.progressCB = [&](const std::string& name) { ctx.progressCB = [&](const std::string& name, float) {
hecl::SystemStringView nameView(name); hecl::SystemStringView nameView(name);
progress(_S("MP2 Root"), nameView.c_str(), 3, prog / (float)m_nonPaks.size()); progress(_S("MP2 Root"), nameView.c_str(), 3, prog / (float)m_nonPaks.size());
}; };

2
DataSpec/SpecMP3.cpp
View File

@ -334,7 +334,7 @@ struct SpecMP3 : SpecBase
size_t nodeCount = 0; size_t nodeCount = 0;
int prog = 0; int prog = 0;
nod::ExtractionContext ctx = {true, force, nod::ExtractionContext ctx = {true, force,
[&](const std::string& name) [&](const std::string& name, float)
{ {
hecl::SystemStringView nameView(name); hecl::SystemStringView nameView(name);
progress(currentTarget.c_str(), nameView.c_str(), compIdx, prog / (float)nodeCount); progress(currentTarget.c_str(), nameView.c_str(), compIdx, prog / (float)nodeCount);

2
nod

@ -1 +1 @@
Subproject commit 2bc7c4e568a78babce8bfd38012c8084b3f2157a Subproject commit e494dbba9f29634ccbd2b9af203b86d11d5466d5