AxioDL/metaforce
2
0
Fork 0
mirror of https://github.com/AxioDL/metaforce.git synced 2025-12-17 03:37:02 +00:00
Code Issues Projects Releases Wiki Activity

Use StringView in MultiProgressPrinter

Browse Source 
Also fixes the SpecMP1/2/3 using string_view instead of SystemStringView
This commit is contained in:
Henrique Gemignani Passos Lima
2021-06-29 00:01:04 +03:00
committed by Luke Street
parent de4ddcaa9c
commit d310dcfecb
9 changed files with 25 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
DataSpec/SpecMP3.cpp
View File

@@ -372,9 +372,8 @@ struct SpecMP3 : SpecBase {
hecl::SystemString currentTarget;
size_t nodeCount = 0;
int prog = 0;
nod::ExtractionContext ctx = {force, [&](std::string_view name, float) {
hecl::SystemStringConv nameView(name);
progress.print(currentTarget.c_str(), nameView.c_str(), prog / (float)nodeCount);
nod::ExtractionContext ctx = {force, [&](nod::SystemStringView name, float) {
progress.print(currentTarget, name, prog / (float)nodeCount);
}};
if (doMP3) {
m_workPath.makeDir();
@@ -420,7 +419,7 @@ struct SpecMP3 : SpecBase {
process.addLambdaTransaction([this, &progress, &pak, pakName, force](hecl::blender::Token& btok) {
m_pakRouter.extractResources(pak, force, btok,
[&progress, &pakName](const hecl::SystemChar* substr, float factor) {
progress.print(pakName.c_str(), substr, factor);
progress.print(pakName, substr, factor);
});
});
}
@@ -470,7 +469,7 @@ struct SpecMP3 : SpecBase {
process.addLambdaTransaction([this, &progress, &pak, pakName, force](hecl::blender::Token& btok) {
m_fePakRouter.extractResources(pak, force, btok,
[&progress, &pakName](const hecl::SystemChar* substr, float factor) {
progress.print(pakName.c_str(), substr, factor);
progress.print(pakName, substr, factor);
});
});
}