drinkingtea/nostalgia
drinkingtea/nostalgia
2
0
Fork 0
Code Issues 6 Pull Requests Actions Releases 6 Activity

[nostalgia/tools/pack] Cleanup

Browse Source
This commit is contained in:
Gary Talent 2019-07-22 23:17:08 -05:00
parent 8a562e1cc5
commit 84feeb8c1f
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/nostalgia/tools/pack/imgconv.cpp
View File

@ -105,8 +105,8 @@ namespace {
// store colors in palette with the corresponding color id
for (auto key : colors.keys()) {
auto colorId = colors[key];
id->pal[colorId] = toGbaColor(key);
auto colorId = colors[key];
id->pal[colorId] = toGbaColor(key);
}
return imgDataBuff;

7
src/nostalgia/tools/pack/pack.cpp
View File

@ -74,7 +74,7 @@ namespace {
// copy
return src->ls(path.c_str(), [src, dest, path](const char *name, ox::InodeId_t) {
std::cout << "reading " << name << '\n';
const auto currentFile = path + name;
auto currentFile = path + name;
auto [stat, err] = src->stat((currentFile).c_str());
oxReturnError(err);
if (stat.fileType == ox::FileType_Directory) {
@ -83,10 +83,13 @@ namespace {
} else {
std::vector<char> buff;
// do transforms
if (endsWith(currentFile, ".png")) {
constexpr std::string_view PngExt = ".png";
constexpr std::string_view GbagExt = ".ng";
if (endsWith(currentFile, PngExt)) {
// load file from full path and transform
const auto fullPath = src->basePath() + currentFile;
buff = pngToGba(fullPath.c_str(), 0, 0);
currentFile = currentFile.substr(0, currentFile.size() - PngExt.size()) + GbagExt.data();
if (!buff.size()) {
return OxError(1);
}