diff --git a/src/nostalgia/modules/gfx/include/nostalgia/gfx/gfx.hpp b/src/nostalgia/modules/gfx/include/nostalgia/gfx/gfx.hpp index 2850bb82..1271ac6e 100644 --- a/src/nostalgia/modules/gfx/include/nostalgia/gfx/gfx.hpp +++ b/src/nostalgia/modules/gfx/include/nostalgia/gfx/gfx.hpp @@ -231,10 +231,10 @@ void hideSprite(Context &ctx, unsigned) noexcept; void showSprite(Context &ctx, unsigned) noexcept; -void setSprite(Context &c, uint_t idx, Sprite const&s) noexcept; +void setSprite(Context &ctx, uint_t idx, Sprite const&sprite) noexcept; [[nodiscard]] -uint_t spriteCount(Context &ctx) noexcept; +uint_t spriteCount(Context const &ctx) noexcept; ox::Error initConsole(Context &ctx) noexcept; diff --git a/src/nostalgia/modules/gfx/src/gba/gfx.cpp b/src/nostalgia/modules/gfx/src/gba/gfx.cpp index 65b9ca73..2bccaa0f 100644 --- a/src/nostalgia/modules/gfx/src/gba/gfx.cpp +++ b/src/nostalgia/modules/gfx/src/gba/gfx.cpp @@ -293,7 +293,7 @@ void setSprite(Context&, uint_t idx, Sprite const&s) noexcept { }); } -uint_t spriteCount(Context&) noexcept { +uint_t spriteCount(Context const &) noexcept { return SpriteCount; } diff --git a/src/nostalgia/modules/gfx/src/opengl/gfx.cpp b/src/nostalgia/modules/gfx/src/opengl/gfx.cpp index e6e26d4b..e88e7e0c 100644 --- a/src/nostalgia/modules/gfx/src/opengl/gfx.cpp +++ b/src/nostalgia/modules/gfx/src/opengl/gfx.cpp @@ -183,7 +183,7 @@ static void setTileBufferObject( ox::spancpy(ebo, elms); } -static void initSpriteBufferObjects(Context &ctx, glutils::BufferSet &bs) noexcept { +static void initSpriteBufferObjects(Context const &ctx, glutils::BufferSet &bs) noexcept { for (auto i = 0u; i < ctx.spriteCount; ++i) { auto const vbo = ox::Span{bs.vertices} + i * static_cast(SpriteVertexVboLength); @@ -256,7 +256,7 @@ static void initSpritesBufferset(Context &ctx) noexcept { } static void initBackgroundBufferset( - GLuint shader, + GLuint const shader, glutils::BufferSet &bs) noexcept { // vao bs.vao = glutils::generateVertexArrayObject(); @@ -375,10 +375,10 @@ static void drawSprites(Context &ctx, ox::Size const&renderSz) noexcept { static void loadPalette( ox::Array &palette, - size_t palOffset, - GLuint shaderPgrm, + size_t const palOffset, + GLuint const shaderPgrm, CompactPalette const&pal, - size_t page = 0) noexcept { + size_t const page = 0) noexcept { static constexpr std::size_t ColorCnt = 256; for (auto i = palOffset; auto const c : pal.pages[page]) { palette[i++] = redf(c); @@ -528,9 +528,9 @@ static ox::Result normalizeTileSheet( ox::Error loadBgPalette( Context &ctx, - size_t palBank, + size_t const palBank, CompactPalette const&palette, - size_t page) noexcept { + size_t const page) noexcept { renderer::loadPalette(ctx.bgPalette, palBank * 16 * 4, ctx.bgShader, palette, page); return {}; } @@ -538,14 +538,14 @@ ox::Error loadBgPalette( ox::Error loadSpritePalette( Context &ctx, CompactPalette const&palette, - size_t page) noexcept { + size_t const page) noexcept { ox::Array pal; renderer::loadPalette(pal, 0, ctx.spriteShader, palette, page); return {}; } static ox::Result buildSetTsd( - Context &ctx, + Context const &ctx, TileSheetSet const&set) noexcept { auto &kctx = keelCtx(ctx.turbineCtx); TileSheetData setTsd; @@ -624,7 +624,7 @@ ox::Error loadBgTileSheet( ox::Error loadBgTileSheet( Context &ctx, - uint_t cbb, + uint_t const cbb, CompactTileSheet const&ts, ox::Optional const&paletteBank) noexcept { auto const bytesPerTile = static_cast(PixelsPerTile / (1 + (ts.bpp == 4))); @@ -638,7 +638,7 @@ ox::Error loadBgTileSheet( ox::Error loadBgTileSheet( Context &ctx, - unsigned cbb, + unsigned const cbb, TileSheetSet const&set) noexcept { OX_REQUIRE(setTsd, buildSetTsd(ctx, set)); ctx.cbbs[cbb].tex = renderer::createTexture(setTsd.width, setTsd.height, setTsd.pixels.data()); @@ -648,7 +648,7 @@ ox::Error loadBgTileSheet( ox::Error loadSpriteTileSheet( Context &ctx, CompactTileSheet const&ts, - bool loadDefaultPalette) noexcept { + bool const loadDefaultPalette) noexcept { OX_REQUIRE(tsd, normalizeTileSheet(ts)); oxTracef("nostalgia.gfx.gl", "loadSpriteTexture: { w: {}, h: {} }", tsd.width, tsd.height); ctx.spriteBlocks.tex = renderer::createTexture(tsd.width, tsd.height, tsd.pixels.data()); @@ -669,8 +669,8 @@ ox::Error loadSpriteTileSheet( void setBgTile( Context &ctx, uint_t bgIdx, - int column, - int row, + int const column, + int const row, BgTile const&tile) noexcept { oxTracef( "nostalgia.gfx.setBgTile", @@ -698,7 +698,7 @@ void setBgTile( cbb.updated = true; } -void clearBg(Context &ctx, uint_t bgIdx) noexcept { +void clearBg(Context &ctx, uint_t const bgIdx) noexcept { auto &cbb = ctx.cbbs[static_cast(bgIdx)]; initBackgroundBufferObjects(cbb); cbb.updated = true; @@ -714,51 +714,49 @@ uint8_t bgStatus(Context &ctx) noexcept { return out; } -void setBgStatus(Context &ctx, uint32_t status) noexcept { +void setBgStatus(Context &ctx, uint32_t const status) noexcept { for (uint_t i = 0; i < ctx.cbbs.size(); ++i) { ctx.backgrounds[i].enabled = (status >> i) & 1; } } -bool bgStatus(Context &ctx, uint_t bg) noexcept { +bool bgStatus(Context &ctx, uint_t const bg) noexcept { return ctx.backgrounds[bg].enabled; } -void setBgStatus(Context&ctx, uint_t bg, bool status) noexcept { +void setBgStatus(Context&ctx, uint_t const bg, bool const status) noexcept { ctx.backgrounds[bg].enabled = status; } -void setBgBpp(Context&, unsigned, unsigned) noexcept {} - -void setBgCbb(Context &ctx, uint_t bgIdx, uint_t cbbIdx) noexcept { +void setBgCbb(Context &ctx, uint_t const bgIdx, uint_t const cbbIdx) noexcept { auto &bg = ctx.backgrounds[bgIdx]; bg.cbbIdx = cbbIdx; } -void setBgPriority(Context &ctx, uint_t bgIdx, uint_t priority) noexcept { +void setBgPriority(Context &ctx, uint_t const bgIdx, uint_t const priority) noexcept { auto &bg = ctx.backgrounds[bgIdx]; bg.priority = static_cast(priority & 0b11); } -void hideSprite(Context &ctx, uint_t idx) noexcept { +void hideSprite(Context &ctx, uint_t const idx) noexcept { auto &s = ctx.spriteStates[idx]; s.enabled = false; renderer::setSprite(ctx, idx, s); } -void showSprite(Context &ctx, uint_t idx) noexcept { +void showSprite(Context &ctx, uint_t const idx) noexcept { auto &s = ctx.spriteStates[idx]; s.enabled = true; renderer::setSprite(ctx, idx, s); } -void setSprite(Context &ctx, uint_t idx, Sprite const&sprite) noexcept { +void setSprite(Context &ctx, uint_t const idx, Sprite const&sprite) noexcept { auto &s = ctx.spriteStates[idx]; s = sprite; renderer::setSprite(ctx, idx, s); } -uint_t spriteCount(Context &ctx) noexcept { +uint_t spriteCount(Context const &ctx) noexcept { return ctx.spriteCount; } @@ -768,7 +766,7 @@ ox::Size drawSize(int scale) noexcept { return {240 * scale, 160 * scale}; } -void draw(gfx::Context &ctx, ox::Size const&renderSz) noexcept { +void draw(Context &ctx, ox::Size const&renderSz) noexcept { glViewport(0, 0, renderSz.width, renderSz.height); glEnable(GL_DEPTH_TEST); glEnable(GL_BLEND); @@ -783,7 +781,7 @@ void draw(gfx::Context &ctx, ox::Size const&renderSz) noexcept { glDisable(GL_BLEND); } -void draw(gfx::Context &ctx, int scale) noexcept { +void draw(Context &ctx, int scale) noexcept { draw(ctx, drawSize(scale)); }