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

[nostalgia/tools/pack] Fix nost-pack to pass in proper Context

Browse Source
This commit is contained in:
Gary Talent 2023-02-03 01:54:56 -06:00
parent 7868b0678f
commit 8bcffc73ff
4 changed files with 23 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/nostalgia/scene/scene.hpp
View File

@ -18,7 +18,7 @@ struct Tile {
constexpr static auto Preloadable = true; constexpr static auto Preloadable = true;
ox::String sheetIdx; ox::String sheetIdx;
uint8_t type = 0; uint8_t type = 0;
}; };
@ -51,6 +51,10 @@ oxModelEnd()
struct SceneInstance { struct SceneInstance {
constexpr static auto TypeName = "net.drinkingtea.nostalgia.scene.SceneInstance";
constexpr static auto TypeVersion = 1;
constexpr static auto Preloadable = true;
struct Tile { struct Tile {
uint16_t &tileMapIdx; uint16_t &tileMapIdx;
uint8_t &tileType; uint8_t &tileType;

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

@ -10,6 +10,7 @@
#include <nostalgia/appmodules/appmodules.hpp> #include <nostalgia/appmodules/appmodules.hpp>
#include <nostalgia/core/typestore.hpp> #include <nostalgia/core/typestore.hpp>
#include <nostalgia/foundation/foundation.hpp>
#include "pack/pack.hpp" #include "pack/pack.hpp"
@ -57,10 +58,11 @@ static ox::Error run(const ox::ClArgs &args) noexcept {
} }
ox::Buffer dstBuff(32 * ox::units::MB); ox::Buffer dstBuff(32 * ox::units::MB);
oxReturnError(ox::FileSystem32::format(dstBuff.data(), dstBuff.size())); oxReturnError(ox::FileSystem32::format(dstBuff.data(), dstBuff.size()));
ox::PassThroughFS src(argSrc); auto src = ox::make_unique<ox::PassThroughFS>(argSrc);
ox::FileSystem32 dst(ox::FileStore32(dstBuff.data(), dstBuff.size())); ox::FileSystem32 dst(ox::FileStore32(dstBuff.data(), dstBuff.size()));
core::TypeStore ts(&src); core::TypeStore ts(src.get());
oxReturnError(pack(&ts, &src, &dst)); auto ctx = foundation::init(std::move(src), "nost-pack");
oxReturnError(pack(ctx.get(), &ts, ctx->rom.get(), &dst));
oxRequireM(pl, GbaPreloader::make()); oxRequireM(pl, GbaPreloader::make());
oxReturnError(preload(&ts, &dst, pl.get())); oxReturnError(preload(&ts, &dst, pl.get()));
oxReturnError(dst.resize()); oxReturnError(dst.resize());

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

@ -58,13 +58,13 @@ static ox::Error transformObj(ox::FileSystem *dest, ox::ModelObject *obj) noexce
return {}; return {};
} }
static ox::Error doTransformations(core::TypeStore *ts, ox::FileSystem *dest, ox::CRStringView filePath) noexcept { static ox::Error doTransformations(foundation::Context *ctx, core::TypeStore *ts, ox::FileSystem *dest, ox::CRStringView filePath) noexcept {
if (endsWith(filePath, ".ng") || endsWith(filePath, ".npal")) { if (endsWith(filePath, ".ng") || endsWith(filePath, ".npal")) {
// load file // load file
oxRequire(s, dest->stat(filePath)); oxRequire(s, dest->stat(filePath));
oxRequireM(buff, dest->read(s.inode)); oxRequireM(buff, dest->read(s.inode));
if (endsWith(filePath, ".ng")) { if (endsWith(filePath, ".ng")) {
oxReturnError(foundation::convertBuffToBuff<core::CompactTileSheet>(nullptr, buff, ox::ClawFormat::Metal).moveTo(&buff)); oxReturnError(foundation::convertBuffToBuff<core::CompactTileSheet>(ctx, buff, ox::ClawFormat::Metal).moveTo(&buff));
} }
oxRequireM(obj, ox::readClaw(ts, buff)); oxRequireM(obj, ox::readClaw(ts, buff));
// do transformations // do transformations
@ -78,7 +78,7 @@ static ox::Error doTransformations(core::TypeStore *ts, ox::FileSystem *dest, ox
// claw file transformations are broken out because path to inode // claw file transformations are broken out because path to inode
// transformations need to be done after the copy to the new FS is complete // transformations need to be done after the copy to the new FS is complete
static ox::Error transformClaw(core::TypeStore *ts, ox::FileSystem *dest, ox::CRStringView path) noexcept { static ox::Error transformClaw(foundation::Context *ctx, core::TypeStore *ts, ox::FileSystem *dest, ox::CRStringView path) noexcept {
// copy // copy
oxTracef("pack::transformClaw", "path: {}", path); oxTracef("pack::transformClaw", "path: {}", path);
oxRequire(fileList, dest->ls(path)); oxRequire(fileList, dest->ls(path));
@ -87,9 +87,9 @@ static ox::Error transformClaw(core::TypeStore *ts, ox::FileSystem *dest, ox::CR
oxRequire(stat, dest->stat(filePath)); oxRequire(stat, dest->stat(filePath));
if (stat.fileType == ox::FileType::Directory) { if (stat.fileType == ox::FileType::Directory) {
const auto dir = ox::sfmt("{}{}/", path, name); const auto dir = ox::sfmt("{}{}/", path, name);
oxReturnError(transformClaw(ts, dest, dir)); oxReturnError(transformClaw(ctx, ts, dest, dir));
} else { } else {
oxReturnError(doTransformations(ts, dest, filePath)); oxReturnError(doTransformations(ctx, ts, dest, filePath));
} }
} }
return {}; return {};
@ -204,10 +204,10 @@ ox::Error appendBinary(ox::Buffer *binBuff, ox::Buffer *fsBuff, GbaPreloader *pl
return {}; return {};
} }
ox::Error pack(core::TypeStore *ts, ox::FileSystem *src, ox::FileSystem *dest) noexcept { ox::Error pack(foundation::Context *ctx, core::TypeStore *ts, ox::FileSystem *src, ox::FileSystem *dest) noexcept {
oxReturnError(copy(src, dest, "/")); oxReturnError(copy(src, dest, "/"));
oxReturnError(ox::buildTypeDef<core::CompactTileSheet>(ts)); oxReturnError(ox::buildTypeDef<core::CompactTileSheet>(ts));
oxReturnError(transformClaw(ts, dest, "/")); oxReturnError(transformClaw(ctx, ts, dest, "/"));
return {}; return {};
} }

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

@ -2,10 +2,15 @@
* Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved. * Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved.
*/ */
#include <ox/fs/fs.hpp>
#include <ox/preloader/preloader.hpp> #include <ox/preloader/preloader.hpp>
namespace nostalgia { namespace nostalgia {
namespace foundation {
class Context;
}
namespace core { namespace core {
class TypeStore; class TypeStore;
} }
@ -90,7 +95,7 @@ using GbaPreloader = ox::Preloader<GbaPlatSpec>;
ox::Error appendBinary(ox::Buffer *binBuff, ox::Buffer *fsBuff, GbaPreloader *pl) noexcept; ox::Error appendBinary(ox::Buffer *binBuff, ox::Buffer *fsBuff, GbaPreloader *pl) noexcept;
auto pack(core::TypeStore *ts, ox::FileSystem *src, ox::FileSystem *dest) noexcept -> ox::Error; auto pack(foundation::Context *ctx, core::TypeStore *ts, ox::FileSystem *src, ox::FileSystem *dest) noexcept -> ox::Error;
auto preload(core::TypeStore *ts, ox::FileSystem *src, GbaPreloader *ph) noexcept -> ox::Error; auto preload(core::TypeStore *ts, ox::FileSystem *src, GbaPreloader *ph) noexcept -> ox::Error;