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

[nostalgia/core] Cleanup on TileSheet

Browse Source
This commit is contained in:
Gary Talent 2023-12-09 17:46:16 -06:00
parent 0ac494998f
commit 62c671e823
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -174,19 +174,16 @@ struct TileSheet {
/** /**
* Gets the offset in tiles of the desired subsheet. * Gets the offset in tiles of the desired subsheet.
*/ */
[[nodiscard]]
ox::Result<unsigned> getTileOffset( ox::Result<unsigned> getTileOffset(
ox::SpanView<ox::StringView> const&pNamePath, ox::SpanView<ox::StringView> const&pNamePath,
int8_t pBpp, int8_t pBpp,
std::size_t pIt = 0, std::size_t pIt = 0,
unsigned pCurrentTotal = 0) const noexcept; unsigned pCurrentTotal = 0) const noexcept;
[[nodiscard]]
ox::Result<SubSheetId> getIdFor( ox::Result<SubSheetId> getIdFor(
ox::SpanView<ox::StringView> const&pNamePath, ox::SpanView<ox::StringView> const&pNamePath,
std::size_t pIt = 0) const noexcept; std::size_t pIt = 0) const noexcept;
[[nodiscard]]
ox::Result<ox::StringView> getNameFor(SubSheetId pId) const noexcept; ox::Result<ox::StringView> getNameFor(SubSheetId pId) const noexcept;
}; };
@ -310,7 +307,7 @@ oxModelBegin(TileSheetV2)
oxModelField(subsheet) oxModelField(subsheet)
oxModelEnd() oxModelEnd()
oxModelBegin(TileSheet::SubSheet) oxModelBegin(TileSheetV3::SubSheet)
oxModelField(name); oxModelField(name);
oxModelField(rows); oxModelField(rows);
oxModelField(columns); oxModelField(columns);
@ -318,7 +315,7 @@ oxModelBegin(TileSheet::SubSheet)
oxModelField(pixels) oxModelField(pixels)
oxModelEnd() oxModelEnd()
oxModelBegin(TileSheet) oxModelBegin(TileSheetV3)
oxModelField(bpp) oxModelField(bpp)
oxModelField(idIt) oxModelField(idIt)
oxModelField(defaultPalette) oxModelField(defaultPalette)