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

[nostalgia/core] Fix CompactPalette TypeName and TypeVersion

Browse Source
This commit is contained in:
Gary Talent 2024-05-31 20:38:03 -05:00
parent eb46aeebf4
commit 1fb0a86642
3 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/nostalgia/modules/core/include/nostalgia/core/palette.hpp
View File

@ -58,8 +58,8 @@ using Palette = PaletteV3;
struct CompactPaletteV1 { struct CompactPaletteV1 {
static constexpr auto TypeName = "net.drinkingtea.nostalgia.core.Palette"; static constexpr auto TypeName = "net.drinkingtea.nostalgia.core.CompactPalette";
static constexpr auto TypeVersion = 2; static constexpr auto TypeVersion = 1;
static constexpr auto Preloadable = true; static constexpr auto Preloadable = true;
ox::Vector<ox::Vector<Color16>> pages{}; ox::Vector<ox::Vector<Color16>> pages{};
}; };

6
src/nostalgia/modules/core/include/nostalgia/core/tilesheet.hpp
View File

@ -293,7 +293,7 @@ ox::Vector<uint8_t> pixels(TileSheet &ts) noexcept;
using TileSheetV4 = TileSheet; using TileSheetV4 = TileSheet;
struct CompactTileSheet { struct CompactTileSheetV1 {
static constexpr auto TypeName = "net.drinkingtea.nostalgia.core.CompactTileSheet"; static constexpr auto TypeName = "net.drinkingtea.nostalgia.core.CompactTileSheet";
static constexpr auto TypeVersion = 1; static constexpr auto TypeVersion = 1;
int8_t bpp = 0; int8_t bpp = 0;
@ -301,6 +301,8 @@ struct CompactTileSheet {
ox::Vector<uint8_t> pixels = {}; ox::Vector<uint8_t> pixels = {};
}; };
using CompactTileSheet = CompactTileSheetV1;
oxModelBegin(TileSheetV1) oxModelBegin(TileSheetV1)
oxModelField(bpp) oxModelField(bpp)
oxModelField(rows) oxModelField(rows)
@ -355,7 +357,7 @@ oxModelBegin(TileSheetV4)
oxModelField(subsheet) oxModelField(subsheet)
oxModelEnd() oxModelEnd()
oxModelBegin(CompactTileSheet) oxModelBegin(CompactTileSheetV1)
oxModelField(bpp) oxModelField(bpp)
oxModelField(defaultPalette) oxModelField(defaultPalette)
oxModelField(pixels) oxModelField(pixels)

3
src/nostalgia/modules/core/src/keel/keelmodule.cpp
View File

@ -38,9 +38,10 @@ static class: public keel::Module {
keel::generateTypeDesc<TileSheetV2>, keel::generateTypeDesc<TileSheetV2>,
keel::generateTypeDesc<TileSheetV3>, keel::generateTypeDesc<TileSheetV3>,
keel::generateTypeDesc<TileSheetV4>, keel::generateTypeDesc<TileSheetV4>,
keel::generateTypeDesc<CompactTileSheet>, keel::generateTypeDesc<CompactTileSheetV1>,
keel::generateTypeDesc<PaletteV1>, keel::generateTypeDesc<PaletteV1>,
keel::generateTypeDesc<PaletteV2>, keel::generateTypeDesc<PaletteV2>,
keel::generateTypeDesc<CompactPaletteV1>,
}; };
} }