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

[nostalgia/scene] Cleanup

Browse Source
This commit is contained in:
Gary Talent 2023-06-18 20:28:08 -05:00
parent de45e7a075
commit bac3eed958
2 changed files with 27 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/nostalgia/modules/scene/include/nostalgia/scene/scene.hpp
View File

@ -17,6 +17,9 @@ class Scene {
ox::Error setupDisplay(core::Context *ctx) const noexcept; ox::Error setupDisplay(core::Context *ctx) const noexcept;
private:
void setupLayer(core::Context*, const ox::Vector<uint16_t> &layer, unsigned layerNo) const noexcept;
}; };
} }

41
src/nostalgia/modules/scene/src/scene.cpp
View File

@ -22,26 +22,33 @@ ox::Error Scene::setupDisplay(core::Context *ctx) const noexcept {
// disable all backgrounds // disable all backgrounds
core::setBgStatus(ctx, 0); core::setBgStatus(ctx, 0);
for (auto layerNo = 0u; const auto &layer : m_sceneStatic.tileMapIdx) { for (auto layerNo = 0u; const auto &layer : m_sceneStatic.tileMapIdx) {
core::setBgStatus(ctx, layerNo, true); setupLayer(ctx, layer, layerNo);
core::setBgCbb(ctx, layerNo, 0);
auto x = 0;
auto y = 0;
auto width = m_sceneStatic.rows[layerNo];
for (const auto &tile : layer) {
auto tile8 = static_cast<uint8_t >(tile);
core::setTile(ctx, layerNo, x, y, tile8);
core::setTile(ctx, layerNo, x + 1, y, tile8 + 1);
core::setTile(ctx, layerNo, x, y + 1, tile8 + 2);
core::setTile(ctx, layerNo, x + 1, y + 1, tile8 + 3);
x += 2;
if (x >= width * 2) {
x = 0;
y += 2;
}
}
++layerNo; ++layerNo;
} }
return {}; return {};
} }
void Scene::setupLayer(
core::Context *ctx,
const ox::Vector<uint16_t> &layer,
unsigned layerNo) const noexcept {
core::setBgStatus(ctx, layerNo, true);
core::setBgCbb(ctx, layerNo, 0);
auto x = 0;
auto y = 0;
const auto width = m_sceneStatic.rows[layerNo];
for (const auto &tile : layer) {
const auto tile8 = static_cast<uint8_t>(tile);
core::setTile(ctx, layerNo, x, y, tile8);
core::setTile(ctx, layerNo, x + 1, y, tile8 + 1);
core::setTile(ctx, layerNo, x, y + 1, tile8 + 2);
core::setTile(ctx, layerNo, x + 1, y + 1, tile8 + 3);
x += 2;
if (x >= width * 2) {
x = 0;
y += 2;
}
}
}
} }