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

[nostalgia/gfx/keel] Cleanup
All checks were successful
Build / build (push) Successful in 1m9s
Details

Browse Source
This commit is contained in:
Gary Talent
2026-02-03 02:22:58 -06:00
parent 96c5223e44
commit 7848cbbbff
2 changed files with 63 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
src/nostalgia/modules/gfx/src/keel/keelmodule.cpp
View File

@@ -13,8 +13,8 @@
namespace nostalgia::gfx { namespace nostalgia::gfx {
static class: public keel::Module { static struct: keel::Module {
public:
[[nodiscard]] [[nodiscard]]
ox::String id() const noexcept override { ox::String id() const noexcept override {
return ox::String{"net.drinkingtea.nostalgia.gfx"}; return ox::String{"net.drinkingtea.nostalgia.gfx"};
@@ -59,31 +59,18 @@ static class: public keel::Module {
ox::Vector<keel::PackTransform> packTransforms() const noexcept final { ox::Vector<keel::PackTransform> packTransforms() const noexcept final {
return { return {
// convert tilesheets to CompactTileSheets // convert tilesheets to CompactTileSheets
[](keel::Context &ctx, ox::Buffer &buff, ox::StringViewCR typeId) -> ox::Result<bool> { keel::transformRule<TileSheetV1, CompactTileSheet>,
if (typeId == ox::ModelTypeId_v<TileSheetV1> || keel::transformRule<TileSheetV2, CompactTileSheet>,
typeId == ox::ModelTypeId_v<TileSheetV2> || keel::transformRule<TileSheetV3, CompactTileSheet>,
typeId == ox::ModelTypeId_v<TileSheetV3> || keel::transformRule<TileSheetV4, CompactTileSheet>,
typeId == ox::ModelTypeId_v<TileSheetV4> || keel::transformRule<TileSheetV5, CompactTileSheet>,
typeId == ox::ModelTypeId_v<TileSheetV5>) { // convert palettes to CompactPalettes
OX_RETURN_ERROR(keel::convertBuffToBuff<CompactTileSheet>( keel::transformRule<NostalgiaPalette, CompactPalette>,
ctx, buff, ox::ClawFormat::Metal).moveTo(buff)); keel::transformRule<PaletteV1, CompactPalette>,
return true; keel::transformRule<PaletteV2, CompactPalette>,
} keel::transformRule<PaletteV3, CompactPalette>,
return false; keel::transformRule<PaletteV4, CompactPalette>,
}, keel::transformRule<PaletteV5, CompactPalette>,
[](keel::Context &ctx, ox::Buffer &buff, ox::StringViewCR typeId) -> ox::Result<bool> {
if (typeId == ox::ModelTypeId_v<NostalgiaPalette> ||
typeId == ox::ModelTypeId_v<PaletteV1> ||
typeId == ox::ModelTypeId_v<PaletteV2> ||
typeId == ox::ModelTypeId_v<PaletteV3> ||
typeId == ox::ModelTypeId_v<PaletteV4> ||
typeId == ox::ModelTypeId_v<PaletteV5>) {
OX_RETURN_ERROR(keel::convertBuffToBuff<CompactPalette>(
ctx, buff, ox::ClawFormat::Metal).moveTo(buff));
return true;
}
return false;
},
}; };
} }

12
src/nostalgia/modules/gfx/src/keel/typeconv.cpp
View File

@@ -109,8 +109,8 @@ static void convertSubsheet(
dst.rows = src.rows; dst.rows = src.rows;
dst.pixels = std::move(src.pixels); dst.pixels = std::move(src.pixels);
++idIt; ++idIt;
dst.subsheets.resize(src.subsheets.size()); dst.subsheets.reserveResize(src.subsheets.size());
for (auto i = 0u; i < src.subsheets.size(); ++i) { for (size_t i{}; i < src.subsheets.size(); ++i) {
convertSubsheet(src.subsheets[i], dst.subsheets[i], idIt); convertSubsheet(src.subsheets[i], dst.subsheets[i], idIt);
} }
} }
@@ -136,8 +136,8 @@ static void convertSubsheet(
dst.rows = src.rows; dst.rows = src.rows;
dst.pixels = std::move(src.pixels); dst.pixels = std::move(src.pixels);
++idIt; ++idIt;
dst.subsheets.resize(src.subsheets.size()); dst.subsheets.reserveResize(src.subsheets.size());
for (auto i = 0u; i < src.subsheets.size(); ++i) { for (size_t i{}; i < src.subsheets.size(); ++i) {
convertSubsheet(src.subsheets[i], dst.subsheets[i], idIt); convertSubsheet(src.subsheets[i], dst.subsheets[i], idIt);
} }
} }
@@ -173,8 +173,8 @@ static void convertSubsheet(
} else { } else {
dst.pixels = std::move(src.pixels); dst.pixels = std::move(src.pixels);
} }
dst.subsheets.resize(src.subsheets.size()); dst.subsheets.reserveResize(src.subsheets.size());
for (auto i = 0u; i < src.subsheets.size(); ++i) { for (size_t i{}; i < src.subsheets.size(); ++i) {
convertSubsheet(bpp, src.subsheets[i], dst.subsheets[i]); convertSubsheet(bpp, src.subsheets[i], dst.subsheets[i]);
} }
} }