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

[nostalgia/core] Add a setSprite function that takes a Sprite type

Browse Source
This commit is contained in:
Gary Talent 2021-01-22 22:39:31 -06:00
parent c1239b5656
commit 9db256699d
1 changed files with 19 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/nostalgia/core/gfx.hpp
View File

@ -50,14 +50,14 @@ struct NostalgiaGraphic {
}; };
template<typename T> template<typename T>
ox::Error model(T *io, NostalgiaPalette *pal) { constexpr ox::Error model(T *io, NostalgiaPalette *pal) {
io->template setTypeInfo<NostalgiaPalette>(); io->template setTypeInfo<NostalgiaPalette>();
oxReturnError(io->field("colors", &pal->colors)); oxReturnError(io->field("colors", &pal->colors));
return OxError(0); return OxError(0);
} }
template<typename T> template<typename T>
ox::Error model(T *io, NostalgiaGraphic *ng) { constexpr ox::Error model(T *io, NostalgiaGraphic *ng) {
io->template setTypeInfo<NostalgiaGraphic>(); io->template setTypeInfo<NostalgiaGraphic>();
oxReturnError(io->field("bpp", &ng->bpp)); oxReturnError(io->field("bpp", &ng->bpp));
oxReturnError(io->field("rows", &ng->rows)); oxReturnError(io->field("rows", &ng->rows));
@ -68,6 +68,16 @@ ox::Error model(T *io, NostalgiaGraphic *ng) {
return OxError(0); return OxError(0);
} }
struct Sprite {
unsigned idx = 0;
unsigned x = 0;
unsigned y = 0;
unsigned tileIdx = 0;
unsigned spriteShape = 0;
unsigned spriteSize = 0;
unsigned flipX = 0;
};
ox::Error initGfx(Context *ctx); ox::Error initGfx(Context *ctx);
ox::Error shutdownGfx(Context*); ox::Error shutdownGfx(Context*);
@ -80,9 +90,9 @@ ox::Error initConsole(Context *ctx);
ox::Error loadBgTileSheet(Context *ctx, int section, ox::FileAddress tilesheet, ox::FileAddress palette = nullptr); ox::Error loadBgTileSheet(Context *ctx, int section, ox::FileAddress tilesheet, ox::FileAddress palette = nullptr);
ox::Error loadSpriteTileSheet(Context *ctx, ox::Error loadSpriteTileSheet(Context *ctx,
int section, int section,
ox::FileAddress tilesheetAddr, ox::FileAddress tilesheetAddr,
ox::FileAddress paletteAddr); ox::FileAddress paletteAddr);
[[nodiscard]] Color32 toColor32(Color16 nc) noexcept; [[nodiscard]] Color32 toColor32(Color16 nc) noexcept;
@ -133,4 +143,8 @@ void hideSprite(Context*, unsigned);
void setSprite(Context*, unsigned idx, unsigned x, unsigned y, unsigned tileIdx, unsigned spriteShape = 0, unsigned spriteSize = 0, unsigned flipX = 0); void setSprite(Context*, unsigned idx, unsigned x, unsigned y, unsigned tileIdx, unsigned spriteShape = 0, unsigned spriteSize = 0, unsigned flipX = 0);
inline void setSprite(Context *c, const Sprite &s) {
setSprite(c, s.idx, s.x, s.y, s.tileIdx, s.spriteShape, s.spriteSize, s.flipX);
}
} }