drinkingtea/nostalgia
2
0
Fork 0
Code Issues 4 Pull Requests Actions Releases 13 Activity

[keel,nostalgia] Make core calls take Context references instead of pointers

Browse Source
This commit is contained in:
Gary Talent
2023-12-01 22:53:21 -06:00
parent 72c130d8a9
commit 453e08497d
16 changed files with 116 additions and 117 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -13,12 +13,12 @@ class Scene {
const SceneStatic &m_sceneStatic;
public:
explicit Scene(const SceneStatic &sceneStatic) noexcept;
explicit Scene(SceneStatic const&sceneStatic) noexcept;
ox::Error setupDisplay(core::Context &ctx) const noexcept;
private:
void setupLayer(core::Context*, const ox::Vector<uint16_t> &layer, unsigned layerNo) const noexcept;
void setupLayer(core::Context&, ox::Vector<uint16_t> const&layer, unsigned layerNo) const noexcept;
};

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

@@ -8,7 +8,7 @@
namespace nostalgia::scene {
Scene::Scene(const SceneStatic &sceneStatic) noexcept:
Scene::Scene(SceneStatic const&sceneStatic) noexcept:
m_sceneStatic(sceneStatic) {
}
@@ -18,19 +18,19 @@ ox::Error Scene::setupDisplay(core::Context &ctx) const noexcept {
}
const auto &palette = m_sceneStatic.palettes[0];
oxReturnError(core::loadBgTileSheet(
&ctx, 0, m_sceneStatic.tilesheet, palette));
ctx, 0, m_sceneStatic.tilesheet, palette));
// disable all backgrounds
core::setBgStatus(&ctx, 0);
core::setBgStatus(ctx, 0);
for (auto layerNo = 0u; const auto &layer : m_sceneStatic.tileMapIdx) {
setupLayer(&ctx, layer, layerNo);
setupLayer(ctx, layer, layerNo);
++layerNo;
}
return {};
}
void Scene::setupLayer(
core::Context *ctx,
const ox::Vector<uint16_t> &layer,
core::Context &ctx,
ox::Vector<uint16_t> const&layer,
unsigned layerNo) const noexcept {
core::setBgStatus(ctx, layerNo, true);
core::setBgCbb(ctx, layerNo, 0);

2
src/nostalgia/modules/scene/src/studio/sceneeditorview.cpp
View File

@@ -11,7 +11,7 @@ namespace nostalgia::scene {
SceneEditorView::SceneEditorView(turbine::Context *tctx, const SceneStatic &sceneStatic):
m_sceneStatic(sceneStatic),
m_scene(m_sceneStatic) {
oxThrowError(core::init(tctx, {.glInstallDrawer = false}).moveTo(&m_cctx));
oxThrowError(core::init(*tctx, {.glInstallDrawer = false}).moveTo(&m_cctx));
}
ox::Error SceneEditorView::setupScene() noexcept {