From e773d6f0ee4a62497dbd3d8da051f7a0774d55bb Mon Sep 17 00:00:00 2001 From: Gary Talent Date: Tue, 6 May 2025 22:36:49 -0500 Subject: [PATCH] [studio] Rename StudioContext to Context --- .../src/studio/paletteeditor/paletteeditor-imgui.cpp | 4 ++-- .../src/studio/paletteeditor/paletteeditor-imgui.hpp | 6 +++--- .../modules/gfx/src/studio/studiomodule.cpp | 4 ++-- .../studio/tilesheeteditor/tilesheeteditor-imgui.cpp | 4 ++-- .../studio/tilesheeteditor/tilesheeteditor-imgui.hpp | 6 +++--- .../studio/tilesheeteditor/tilesheeteditormodel.cpp | 2 +- .../studio/tilesheeteditor/tilesheeteditormodel.hpp | 4 ++-- .../studio/tilesheeteditor/tilesheeteditorview.cpp | 2 +- .../studio/tilesheeteditor/tilesheeteditorview.hpp | 2 +- .../modules/sound/src/studio/studiomodule.cpp | 4 ++-- src/olympic/studio/applib/src/aboutpopup.cpp | 2 +- src/olympic/studio/applib/src/aboutpopup.hpp | 2 +- src/olympic/studio/applib/src/app.cpp | 2 +- src/olympic/studio/applib/src/clawviewer.cpp | 4 ++-- src/olympic/studio/applib/src/clawviewer.hpp | 4 ++-- src/olympic/studio/applib/src/deleteconfirmation.cpp | 2 +- src/olympic/studio/applib/src/deleteconfirmation.hpp | 2 +- src/olympic/studio/applib/src/makecopypopup.cpp | 4 ++-- src/olympic/studio/applib/src/makecopypopup.hpp | 4 ++-- src/olympic/studio/applib/src/newdir.cpp | 2 +- src/olympic/studio/applib/src/newdir.hpp | 2 +- src/olympic/studio/applib/src/newmenu.cpp | 12 ++++++------ src/olympic/studio/applib/src/newmenu.hpp | 12 ++++++------ src/olympic/studio/applib/src/newproject.cpp | 6 +++--- src/olympic/studio/applib/src/newproject.hpp | 6 +++--- src/olympic/studio/applib/src/renamefile.cpp | 2 +- src/olympic/studio/applib/src/renamefile.hpp | 2 +- src/olympic/studio/applib/src/studioui.cpp | 4 ++-- src/olympic/studio/applib/src/studioui.hpp | 2 +- src/olympic/studio/modlib/include/studio/context.hpp | 8 ++++---- src/olympic/studio/modlib/include/studio/editor.hpp | 2 +- .../studio/modlib/include/studio/filepickerpopup.hpp | 2 +- .../studio/modlib/include/studio/filetreemodel.hpp | 2 +- .../studio/modlib/include/studio/imguiutil.hpp | 10 +++++----- .../studio/modlib/include/studio/itemmaker.hpp | 8 ++++---- src/olympic/studio/modlib/include/studio/module.hpp | 10 +++++----- src/olympic/studio/modlib/include/studio/widget.hpp | 2 +- src/olympic/studio/modlib/src/editor.cpp | 2 +- src/olympic/studio/modlib/src/filepickerpopup.cpp | 2 +- src/olympic/studio/modlib/src/filetreemodel.cpp | 2 +- src/olympic/studio/modlib/src/imguiutil.cpp | 8 ++++---- src/olympic/studio/modlib/src/module.cpp | 6 +++--- 42 files changed, 89 insertions(+), 89 deletions(-) diff --git a/src/nostalgia/modules/gfx/src/studio/paletteeditor/paletteeditor-imgui.cpp b/src/nostalgia/modules/gfx/src/studio/paletteeditor/paletteeditor-imgui.cpp index e54b7ffc..756c747a 100644 --- a/src/nostalgia/modules/gfx/src/studio/paletteeditor/paletteeditor-imgui.cpp +++ b/src/nostalgia/modules/gfx/src/studio/paletteeditor/paletteeditor-imgui.cpp @@ -68,7 +68,7 @@ void PaletteEditorImGui::PageRenameDialog::draw(turbine::Context &tctx) noexcept } -PaletteEditorImGui::PaletteEditorImGui(studio::StudioContext &sctx, ox::StringParam path): +PaletteEditorImGui::PaletteEditorImGui(studio::Context &sctx, ox::StringParam path): Editor(sctx, std::move(path)), m_sctx(sctx), m_tctx(sctx.tctx), @@ -77,7 +77,7 @@ PaletteEditorImGui::PaletteEditorImGui(studio::StudioContext &sctx, ox::StringPa m_pageRenameDlg.inputSubmitted.connect(this, &PaletteEditorImGui::renamePage); } -void PaletteEditorImGui::draw(studio::StudioContext&) noexcept { +void PaletteEditorImGui::draw(studio::Context&) noexcept { auto const paneSize = ImGui::GetContentRegionAvail(); { ImGui::BeginChild("Pages", {280, paneSize.y}, true); diff --git a/src/nostalgia/modules/gfx/src/studio/paletteeditor/paletteeditor-imgui.hpp b/src/nostalgia/modules/gfx/src/studio/paletteeditor/paletteeditor-imgui.hpp index c6b69e89..5fed246d 100644 --- a/src/nostalgia/modules/gfx/src/studio/paletteeditor/paletteeditor-imgui.hpp +++ b/src/nostalgia/modules/gfx/src/studio/paletteeditor/paletteeditor-imgui.hpp @@ -31,16 +31,16 @@ class PaletteEditorImGui: public studio::Editor { constexpr bool isOpen() const noexcept { return m_show; } void draw(turbine::Context &tctx) noexcept; } m_pageRenameDlg; - studio::StudioContext &m_sctx; + studio::Context &m_sctx; turbine::Context &m_tctx; Palette m_pal; size_t m_selectedColorRow = 0; size_t m_page = 0; public: - PaletteEditorImGui(studio::StudioContext &sctx, ox::StringParam path); + PaletteEditorImGui(studio::Context &sctx, ox::StringParam path); - void draw(studio::StudioContext&) noexcept final; + void draw(studio::Context&) noexcept final; protected: ox::Error saveItem() noexcept final; diff --git a/src/nostalgia/modules/gfx/src/studio/studiomodule.cpp b/src/nostalgia/modules/gfx/src/studio/studiomodule.cpp index 3b72690c..182f4464 100644 --- a/src/nostalgia/modules/gfx/src/studio/studiomodule.cpp +++ b/src/nostalgia/modules/gfx/src/studio/studiomodule.cpp @@ -12,14 +12,14 @@ namespace nostalgia::gfx { static class: public studio::Module { - ox::Vector editors(studio::StudioContext &ctx) const noexcept final { + ox::Vector editors(studio::Context &ctx) const noexcept final { return { studio::editorMaker(ctx, {FileExt_ng, FileExt_nts}), studio::editorMaker(ctx, FileExt_npal), }; } - ox::Vector> itemMakers(studio::StudioContext&) const noexcept final { + ox::Vector> itemMakers(studio::Context&) const noexcept final { ox::Vector> out; out.emplace_back(ox::make>("Tile Sheet", "TileSheets", FileExt_nts)); out.emplace_back(ox::make>("Palette", "Palettes", FileExt_npal, Palette{ diff --git a/src/nostalgia/modules/gfx/src/studio/tilesheeteditor/tilesheeteditor-imgui.cpp b/src/nostalgia/modules/gfx/src/studio/tilesheeteditor/tilesheeteditor-imgui.cpp index c2e18335..2bea0793 100644 --- a/src/nostalgia/modules/gfx/src/studio/tilesheeteditor/tilesheeteditor-imgui.cpp +++ b/src/nostalgia/modules/gfx/src/studio/tilesheeteditor/tilesheeteditor-imgui.cpp @@ -87,7 +87,7 @@ static ox::Error toPngFile( 8))); } -TileSheetEditorImGui::TileSheetEditorImGui(studio::StudioContext &sctx, ox::StringParam path): +TileSheetEditorImGui::TileSheetEditorImGui(studio::Context &sctx, ox::StringParam path): Editor(sctx, std::move(path)), m_sctx{sctx}, m_tctx{m_sctx.tctx}, @@ -188,7 +188,7 @@ void TileSheetEditorImGui::keyStateChanged(turbine::Key const key, bool const do } } -void TileSheetEditorImGui::draw(studio::StudioContext&) noexcept { +void TileSheetEditorImGui::draw(studio::Context&) noexcept { if (ig::mainWinHasFocus() && m_tool == TileSheetTool::Select) { if (ImGui::IsKeyDown(ImGuiKey_ModCtrl) && !m_palPathFocused) { if (ImGui::IsKeyPressed(ImGuiKey_A)) { diff --git a/src/nostalgia/modules/gfx/src/studio/tilesheeteditor/tilesheeteditor-imgui.hpp b/src/nostalgia/modules/gfx/src/studio/tilesheeteditor/tilesheeteditor-imgui.hpp index 9895e71a..e16a2ce4 100644 --- a/src/nostalgia/modules/gfx/src/studio/tilesheeteditor/tilesheeteditor-imgui.hpp +++ b/src/nostalgia/modules/gfx/src/studio/tilesheeteditor/tilesheeteditor-imgui.hpp @@ -45,7 +45,7 @@ class TileSheetEditorImGui: public studio::Editor { constexpr bool isOpen() const noexcept { return m_show; } }; static constexpr float s_palViewWidth = 335; - studio::StudioContext &m_sctx; + studio::Context &m_sctx; turbine::Context &m_tctx; ox::Vector m_paletteList; SubSheetEditor m_subsheetEditor; @@ -60,7 +60,7 @@ class TileSheetEditorImGui: public studio::Editor { ox::Vector, 1> m_deferredCmds; public: - TileSheetEditorImGui(studio::StudioContext &sctx, ox::StringParam path); + TileSheetEditorImGui(studio::Context &sctx, ox::StringParam path); ~TileSheetEditorImGui() override = default; @@ -77,7 +77,7 @@ class TileSheetEditorImGui: public studio::Editor { void keyStateChanged(turbine::Key key, bool down) override; - void draw(studio::StudioContext&) noexcept override; + void draw(studio::Context&) noexcept override; void drawSubsheetSelector(TileSheet::SubSheet&, TileSheet::SubSheetIdx &path); diff --git a/src/nostalgia/modules/gfx/src/studio/tilesheeteditor/tilesheeteditormodel.cpp b/src/nostalgia/modules/gfx/src/studio/tilesheeteditor/tilesheeteditormodel.cpp index 5178e50c..9efc5002 100644 --- a/src/nostalgia/modules/gfx/src/studio/tilesheeteditor/tilesheeteditormodel.cpp +++ b/src/nostalgia/modules/gfx/src/studio/tilesheeteditor/tilesheeteditormodel.cpp @@ -45,7 +45,7 @@ Palette const TileSheetEditorModel::s_defaultPalette = { }; TileSheetEditorModel::TileSheetEditorModel( - studio::StudioContext &sctx, ox::StringParam path, studio::UndoStack &undoStack): + studio::Context &sctx, ox::StringParam path, studio::UndoStack &undoStack): m_sctx(sctx), m_tctx(m_sctx.tctx), m_path(std::move(path)), diff --git a/src/nostalgia/modules/gfx/src/studio/tilesheeteditor/tilesheeteditormodel.hpp b/src/nostalgia/modules/gfx/src/studio/tilesheeteditor/tilesheeteditormodel.hpp index a373597e..46633065 100644 --- a/src/nostalgia/modules/gfx/src/studio/tilesheeteditor/tilesheeteditormodel.hpp +++ b/src/nostalgia/modules/gfx/src/studio/tilesheeteditor/tilesheeteditormodel.hpp @@ -22,7 +22,7 @@ class TileSheetEditorModel: public ox::SignalHandler { private: static Palette const s_defaultPalette; - studio::StudioContext &m_sctx; + studio::Context &m_sctx; turbine::Context &m_tctx; ox::String m_path; ox::String m_palPath; @@ -39,7 +39,7 @@ class TileSheetEditorModel: public ox::SignalHandler { bool m_updated = false; public: - TileSheetEditorModel(studio::StudioContext &sctx, ox::StringParam path, studio::UndoStack &undoStack); + TileSheetEditorModel(studio::Context &sctx, ox::StringParam path, studio::UndoStack &undoStack); ~TileSheetEditorModel() override = default; diff --git a/src/nostalgia/modules/gfx/src/studio/tilesheeteditor/tilesheeteditorview.cpp b/src/nostalgia/modules/gfx/src/studio/tilesheeteditor/tilesheeteditorview.cpp index 0776a9a8..6e555e65 100644 --- a/src/nostalgia/modules/gfx/src/studio/tilesheeteditor/tilesheeteditorview.cpp +++ b/src/nostalgia/modules/gfx/src/studio/tilesheeteditor/tilesheeteditorview.cpp @@ -12,7 +12,7 @@ namespace nostalgia::gfx { TileSheetEditorView::TileSheetEditorView( - studio::StudioContext &sctx, ox::StringViewCR path, studio::UndoStack &undoStack): + studio::Context &sctx, ox::StringViewCR path, studio::UndoStack &undoStack): m_model(sctx, path, undoStack), m_pixelsDrawer(m_model) { glBindVertexArray(0); diff --git a/src/nostalgia/modules/gfx/src/studio/tilesheeteditor/tilesheeteditorview.hpp b/src/nostalgia/modules/gfx/src/studio/tilesheeteditor/tilesheeteditorview.hpp index b0dbab27..34ee7094 100644 --- a/src/nostalgia/modules/gfx/src/studio/tilesheeteditor/tilesheeteditorview.hpp +++ b/src/nostalgia/modules/gfx/src/studio/tilesheeteditor/tilesheeteditorview.hpp @@ -56,7 +56,7 @@ class TileSheetEditorView: public ox::SignalHandler { std::size_t m_palIdx = 0; public: - TileSheetEditorView(studio::StudioContext &sctx, ox::StringViewCR path, studio::UndoStack &undoStack); + TileSheetEditorView(studio::Context &sctx, ox::StringViewCR path, studio::UndoStack &undoStack); ~TileSheetEditorView() override = default; diff --git a/src/nostalgia/modules/sound/src/studio/studiomodule.cpp b/src/nostalgia/modules/sound/src/studio/studiomodule.cpp index 1e6ca321..0a2369df 100644 --- a/src/nostalgia/modules/sound/src/studio/studiomodule.cpp +++ b/src/nostalgia/modules/sound/src/studio/studiomodule.cpp @@ -9,12 +9,12 @@ namespace nostalgia::sound { static class: public studio::Module { - ox::Vector editors(studio::StudioContext&) const noexcept final { + ox::Vector editors(studio::Context&) const noexcept final { return { }; } - ox::Vector> itemMakers(studio::StudioContext&) const noexcept final { + ox::Vector> itemMakers(studio::Context&) const noexcept final { ox::Vector> out; return out; } diff --git a/src/olympic/studio/applib/src/aboutpopup.cpp b/src/olympic/studio/applib/src/aboutpopup.cpp index 1b554204..98f82645 100644 --- a/src/olympic/studio/applib/src/aboutpopup.cpp +++ b/src/olympic/studio/applib/src/aboutpopup.cpp @@ -29,7 +29,7 @@ bool AboutPopup::isOpen() const noexcept { return m_stage == Stage::Open; } -void AboutPopup::draw(StudioContext &sctx) noexcept { +void AboutPopup::draw(Context &sctx) noexcept { if (ImGui::IsKeyPressed(ImGuiKey_Escape)) { close(); return; diff --git a/src/olympic/studio/applib/src/aboutpopup.hpp b/src/olympic/studio/applib/src/aboutpopup.hpp index d8a2e824..ea735e60 100644 --- a/src/olympic/studio/applib/src/aboutpopup.hpp +++ b/src/olympic/studio/applib/src/aboutpopup.hpp @@ -35,7 +35,7 @@ class AboutPopup: public studio::Popup { [[nodiscard]] bool isOpen() const noexcept override; - void draw(studio::StudioContext &sctx) noexcept override; + void draw(studio::Context &sctx) noexcept override; }; diff --git a/src/olympic/studio/applib/src/app.cpp b/src/olympic/studio/applib/src/app.cpp index b4bd9e3e..7f41ebad 100644 --- a/src/olympic/studio/applib/src/app.cpp +++ b/src/olympic/studio/applib/src/app.cpp @@ -28,7 +28,7 @@ class StudioUIDrawer: public turbine::gl::Drawer { }; static void keyEventHandler(turbine::Context &ctx, turbine::Key key, bool down) noexcept { - auto sctx = turbine::applicationData(ctx); + auto sctx = turbine::applicationData(ctx); sctx->ui.handleKeyEvent(key, down); } diff --git a/src/olympic/studio/applib/src/clawviewer.cpp b/src/olympic/studio/applib/src/clawviewer.cpp index d7b2e73b..3b4a9492 100644 --- a/src/olympic/studio/applib/src/clawviewer.cpp +++ b/src/olympic/studio/applib/src/clawviewer.cpp @@ -8,12 +8,12 @@ namespace studio { -ClawEditor::ClawEditor(StudioContext &sctx, ox::StringParam path): +ClawEditor::ClawEditor(Context &sctx, ox::StringParam path): Editor(sctx, std::move(path)), m_obj(sctx.project->loadObj(itemPath()).unwrapThrow()) { } -void ClawEditor::draw(StudioContext&) noexcept { +void ClawEditor::draw(Context&) noexcept { ImGui::BeginChild("PaletteEditor"); static constexpr auto flags = ImGuiTableFlags_RowBg | ImGuiTableFlags_NoBordersInBody; if (ImGui::BeginTable("ObjTree", 3, flags)) { diff --git a/src/olympic/studio/applib/src/clawviewer.hpp b/src/olympic/studio/applib/src/clawviewer.hpp index 50f7bd59..19d0a16a 100644 --- a/src/olympic/studio/applib/src/clawviewer.hpp +++ b/src/olympic/studio/applib/src/clawviewer.hpp @@ -16,9 +16,9 @@ class ClawEditor: public Editor { using ObjPath = ox::Vector; ox::ModelObject m_obj; public: - ClawEditor(StudioContext &sctx, ox::StringParam path); + ClawEditor(Context &sctx, ox::StringParam path); - void draw(StudioContext&) noexcept final; + void draw(Context&) noexcept final; private: static void drawRow(ox::ModelValue const&value) noexcept; diff --git a/src/olympic/studio/applib/src/deleteconfirmation.cpp b/src/olympic/studio/applib/src/deleteconfirmation.cpp index cac39562..56135433 100644 --- a/src/olympic/studio/applib/src/deleteconfirmation.cpp +++ b/src/olympic/studio/applib/src/deleteconfirmation.cpp @@ -31,7 +31,7 @@ bool DeleteConfirmation::isOpen() const noexcept { return m_open; } -void DeleteConfirmation::draw(StudioContext &ctx) noexcept { +void DeleteConfirmation::draw(Context &ctx) noexcept { if (ImGui::IsKeyPressed(ImGuiKey_Escape)) { close(); return; diff --git a/src/olympic/studio/applib/src/deleteconfirmation.hpp b/src/olympic/studio/applib/src/deleteconfirmation.hpp index 012dbcbb..fd938c1d 100644 --- a/src/olympic/studio/applib/src/deleteconfirmation.hpp +++ b/src/olympic/studio/applib/src/deleteconfirmation.hpp @@ -36,7 +36,7 @@ class DeleteConfirmation final: public Popup { [[nodiscard]] bool isOpen() const noexcept override; - void draw(StudioContext &ctx) noexcept override; + void draw(Context &ctx) noexcept override; }; diff --git a/src/olympic/studio/applib/src/makecopypopup.cpp b/src/olympic/studio/applib/src/makecopypopup.cpp index 1f7096ea..becc7130 100644 --- a/src/olympic/studio/applib/src/makecopypopup.cpp +++ b/src/olympic/studio/applib/src/makecopypopup.cpp @@ -28,7 +28,7 @@ bool MakeCopyPopup::isOpen() const noexcept { return m_open; } -void MakeCopyPopup::draw(StudioContext &ctx) noexcept { +void MakeCopyPopup::draw(Context &ctx) noexcept { switch (m_stage) { case Stage::Closed: break; @@ -70,7 +70,7 @@ void MakeCopyPopup::draw(StudioContext &ctx) noexcept { } } -void MakeCopyPopup::accept(StudioContext const &ctx) noexcept { +void MakeCopyPopup::accept(Context const &ctx) noexcept { auto const p = sfmt("{}{}", m_dirPath, m_fileName); if (!ctx.project->exists(p)) { makeCopy.emit(m_srcPath, p); diff --git a/src/olympic/studio/applib/src/makecopypopup.hpp b/src/olympic/studio/applib/src/makecopypopup.hpp index 7b67e445..41eabd87 100644 --- a/src/olympic/studio/applib/src/makecopypopup.hpp +++ b/src/olympic/studio/applib/src/makecopypopup.hpp @@ -37,10 +37,10 @@ class MakeCopyPopup: public Widget { [[nodiscard]] bool isOpen() const noexcept; - void draw(StudioContext &ctx) noexcept override; + void draw(Context &ctx) noexcept override; private: - void accept(StudioContext const &ctx) noexcept; + void accept(Context const &ctx) noexcept; }; } diff --git a/src/olympic/studio/applib/src/newdir.cpp b/src/olympic/studio/applib/src/newdir.cpp index 7e299318..8c94e923 100644 --- a/src/olympic/studio/applib/src/newdir.cpp +++ b/src/olympic/studio/applib/src/newdir.cpp @@ -32,7 +32,7 @@ bool NewDir::isOpen() const noexcept { return m_open; } -void NewDir::draw(StudioContext &ctx) noexcept { +void NewDir::draw(Context &ctx) noexcept { if (ImGui::IsKeyPressed(ImGuiKey_Escape)) { close(); return; diff --git a/src/olympic/studio/applib/src/newdir.hpp b/src/olympic/studio/applib/src/newdir.hpp index b79ef0b9..ac611544 100644 --- a/src/olympic/studio/applib/src/newdir.hpp +++ b/src/olympic/studio/applib/src/newdir.hpp @@ -37,7 +37,7 @@ class NewDir final: public Popup { [[nodiscard]] bool isOpen() const noexcept override; - void draw(StudioContext &ctx) noexcept override; + void draw(Context &ctx) noexcept override; [[nodiscard]] constexpr ox::CStringView value() const noexcept { diff --git a/src/olympic/studio/applib/src/newmenu.cpp b/src/olympic/studio/applib/src/newmenu.cpp index 1183d8a4..bc95411d 100644 --- a/src/olympic/studio/applib/src/newmenu.cpp +++ b/src/olympic/studio/applib/src/newmenu.cpp @@ -44,7 +44,7 @@ bool NewMenu::isOpen() const noexcept { return m_open; } -void NewMenu::draw(StudioContext &sctx) noexcept { +void NewMenu::draw(Context &sctx) noexcept { if (ImGui::IsKeyPressed(ImGuiKey_Escape)) { close(); return; @@ -88,7 +88,7 @@ void NewMenu::installItemTemplate(ox::UPtr &tmplt) noexcept { } } -void NewMenu::drawNewItemType(StudioContext const&sctx) noexcept { +void NewMenu::drawNewItemType(Context const&sctx) noexcept { setSize({280, 180}); drawWindow(sctx.tctx, m_open, [this] { ig::ListBox("Item Type", [&](size_t const i) -> ox::CStringView { @@ -105,7 +105,7 @@ void NewMenu::drawNewItemType(StudioContext const&sctx) noexcept { }); } -void NewMenu::drawNewItemTemplate(StudioContext const&sctx) noexcept { +void NewMenu::drawNewItemTemplate(Context const&sctx) noexcept { setSize({280, 180}); drawWindow(sctx.tctx, m_open, [this] { auto const&templates = @@ -117,7 +117,7 @@ void NewMenu::drawNewItemTemplate(StudioContext const&sctx) noexcept { }); } -void NewMenu::drawNewItemPath(StudioContext &sctx) noexcept { +void NewMenu::drawNewItemPath(Context &sctx) noexcept { setSize({380, 340}); drawWindow(sctx.tctx, m_open, [this, &sctx] { if (m_stage == Stage::NewItemTransitioningToPath) [[unlikely]] { @@ -170,7 +170,7 @@ void NewMenu::drawFirstPageButtons(Stage const next) noexcept { } } -void NewMenu::drawLastPageButtons(StudioContext &sctx) noexcept { +void NewMenu::drawLastPageButtons(Context &sctx) noexcept { ImGui::SetCursorPosX(ImGui::GetCursorPosX() + ImGui::GetContentRegionAvail().x - 198); ImGui::SetCursorPosY(ImGui::GetCursorPosY() + ImGui::GetContentRegionAvail().y - 20); constexpr ImVec2 btnSz{60, 20}; @@ -191,7 +191,7 @@ void NewMenu::drawLastPageButtons(StudioContext &sctx) noexcept { } } -void NewMenu::finish(StudioContext &sctx) noexcept { +void NewMenu::finish(Context &sctx) noexcept { if (m_itemName.len() == 0) { oxLogError(ox::Error{1, "New file error: no file name"}); return; diff --git a/src/olympic/studio/applib/src/newmenu.hpp b/src/olympic/studio/applib/src/newmenu.hpp index 82587ae0..35c08d96 100644 --- a/src/olympic/studio/applib/src/newmenu.hpp +++ b/src/olympic/studio/applib/src/newmenu.hpp @@ -53,7 +53,7 @@ class NewMenu final: public Popup { [[nodiscard]] bool isOpen() const noexcept override; - void draw(StudioContext &sctx) noexcept override; + void draw(Context &sctx) noexcept override; template void addItemType( @@ -75,19 +75,19 @@ class NewMenu final: public Popup { void installItemTemplate(ox::UPtr &tmplt) noexcept; private: - void drawNewItemType(StudioContext const&sctx) noexcept; + void drawNewItemType(Context const&sctx) noexcept; - void drawNewItemPath(StudioContext &sctx) noexcept; + void drawNewItemPath(Context &sctx) noexcept; - void drawNewItemTemplate(StudioContext const &sctx) noexcept; + void drawNewItemTemplate(Context const &sctx) noexcept; void drawButtons(Stage next) noexcept; void drawFirstPageButtons(Stage next) noexcept; - void drawLastPageButtons(StudioContext &sctx) noexcept; + void drawLastPageButtons(Context &sctx) noexcept; - void finish(StudioContext &sctx) noexcept; + void finish(Context &sctx) noexcept; }; diff --git a/src/olympic/studio/applib/src/newproject.cpp b/src/olympic/studio/applib/src/newproject.cpp index d90cb201..b4588092 100644 --- a/src/olympic/studio/applib/src/newproject.cpp +++ b/src/olympic/studio/applib/src/newproject.cpp @@ -33,7 +33,7 @@ bool NewProject::isOpen() const noexcept { return m_open; } -void NewProject::draw(StudioContext &ctx) noexcept { +void NewProject::draw(Context &ctx) noexcept { if (ImGui::IsKeyPressed(ImGuiKey_Escape)) { close(); return; @@ -53,7 +53,7 @@ void NewProject::draw(StudioContext &ctx) noexcept { } } -void NewProject::drawNewProjectName(StudioContext &sctx) noexcept { +void NewProject::drawNewProjectName(Context &sctx) noexcept { drawWindow(sctx.tctx, m_open, [this, &sctx] { ig::InputText("Name", m_projectName); ImGui::Text("Path: %s", m_projectPath.c_str()); @@ -64,7 +64,7 @@ void NewProject::drawNewProjectName(StudioContext &sctx) noexcept { }); } -void NewProject::drawLastPageButtons(StudioContext&) noexcept { +void NewProject::drawLastPageButtons(Context&) noexcept { ImGui::SetCursorPosX(ImGui::GetCursorPosX() + ImGui::GetContentRegionAvail().x - 110); ImGui::SetCursorPosY(ImGui::GetCursorPosY() + ImGui::GetContentRegionAvail().y - 22); if (ig::PushButton("Finish")) { diff --git a/src/olympic/studio/applib/src/newproject.hpp b/src/olympic/studio/applib/src/newproject.hpp index 1c354520..ee802493 100644 --- a/src/olympic/studio/applib/src/newproject.hpp +++ b/src/olympic/studio/applib/src/newproject.hpp @@ -42,12 +42,12 @@ class NewProject: public studio::Popup { [[nodiscard]] bool isOpen() const noexcept override; - void draw(studio::StudioContext &ctx) noexcept override; + void draw(studio::Context &ctx) noexcept override; private: - void drawNewProjectName(studio::StudioContext &ctx) noexcept; + void drawNewProjectName(studio::Context &ctx) noexcept; - void drawLastPageButtons(studio::StudioContext &ctx) noexcept; + void drawLastPageButtons(studio::Context &ctx) noexcept; void finish() noexcept; diff --git a/src/olympic/studio/applib/src/renamefile.cpp b/src/olympic/studio/applib/src/renamefile.cpp index 72f07caa..aa8fac19 100644 --- a/src/olympic/studio/applib/src/renamefile.cpp +++ b/src/olympic/studio/applib/src/renamefile.cpp @@ -34,7 +34,7 @@ bool RenameFile::isOpen() const noexcept { return m_open; } -void RenameFile::draw(StudioContext &ctx) noexcept { +void RenameFile::draw(Context &ctx) noexcept { if (ImGui::IsKeyPressed(ImGuiKey_Escape)) { close(); return; diff --git a/src/olympic/studio/applib/src/renamefile.hpp b/src/olympic/studio/applib/src/renamefile.hpp index 4625118f..7089df99 100644 --- a/src/olympic/studio/applib/src/renamefile.hpp +++ b/src/olympic/studio/applib/src/renamefile.hpp @@ -38,7 +38,7 @@ class RenameFile: public Popup { [[nodiscard]] bool isOpen() const noexcept override; - void draw(StudioContext &ctx) noexcept override; + void draw(Context &ctx) noexcept override; }; diff --git a/src/olympic/studio/applib/src/studioui.cpp b/src/olympic/studio/applib/src/studioui.cpp index c82ae85f..2593bf3a 100644 --- a/src/olympic/studio/applib/src/studioui.cpp +++ b/src/olympic/studio/applib/src/studioui.cpp @@ -26,11 +26,11 @@ namespace studio { static bool shutdownHandler(turbine::Context &ctx) { - auto sctx = turbine::applicationData(ctx); + auto sctx = turbine::applicationData(ctx); return sctx->ui.handleShutdown(); } -void navigateTo(StudioContext &ctx, ox::StringParam filePath, ox::StringParam navArgs) noexcept { +void navigateTo(Context &ctx, ox::StringParam filePath, ox::StringParam navArgs) noexcept { ctx.ui.navigateTo(std::move(filePath), std::move(navArgs)); } diff --git a/src/olympic/studio/applib/src/studioui.hpp b/src/olympic/studio/applib/src/studioui.hpp index e2fe5c98..811dac27 100644 --- a/src/olympic/studio/applib/src/studioui.hpp +++ b/src/olympic/studio/applib/src/studioui.hpp @@ -29,7 +29,7 @@ class StudioUI: public ox::SignalHandler { friend class StudioUIDrawer; private: - StudioContext m_sctx; + Context m_sctx; turbine::Context &m_tctx; ox::String m_projectDataDir; ox::UPtr m_project; diff --git a/src/olympic/studio/modlib/include/studio/context.hpp b/src/olympic/studio/modlib/include/studio/context.hpp index 30933130..bc6a3e30 100644 --- a/src/olympic/studio/modlib/include/studio/context.hpp +++ b/src/olympic/studio/modlib/include/studio/context.hpp @@ -14,19 +14,19 @@ namespace studio { class StudioUI; -struct StudioContext { +struct Context { StudioUI &ui; Project *project = nullptr; turbine::Context &tctx; - StudioContext(StudioUI &pUi, turbine::Context &pTctx) noexcept: + Context(StudioUI &pUi, turbine::Context &pTctx) noexcept: ui(pUi), tctx(pTctx) {} }; [[nodiscard]] -inline keel::Context &keelCtx(StudioContext &ctx) noexcept { +inline keel::Context &keelCtx(Context &ctx) noexcept { return keelCtx(ctx.tctx); } -void navigateTo(StudioContext &ctx, ox::StringParam filePath, ox::StringParam navArgs) noexcept; +void navigateTo(Context &ctx, ox::StringParam filePath, ox::StringParam navArgs) noexcept; } diff --git a/src/olympic/studio/modlib/include/studio/editor.hpp b/src/olympic/studio/modlib/include/studio/editor.hpp index 20e9ec61..6b68b241 100644 --- a/src/olympic/studio/modlib/include/studio/editor.hpp +++ b/src/olympic/studio/modlib/include/studio/editor.hpp @@ -121,7 +121,7 @@ class Editor: public studio::BaseEditor { ox::String m_itemName; public: - Editor(StudioContext &ctx, ox::StringParam itemPath) noexcept; + Editor(Context &ctx, ox::StringParam itemPath) noexcept; [[nodiscard]] ox::CStringView itemPath() const noexcept final; diff --git a/src/olympic/studio/modlib/include/studio/filepickerpopup.hpp b/src/olympic/studio/modlib/include/studio/filepickerpopup.hpp index d6d5b404..94708e56 100644 --- a/src/olympic/studio/modlib/include/studio/filepickerpopup.hpp +++ b/src/olympic/studio/modlib/include/studio/filepickerpopup.hpp @@ -31,7 +31,7 @@ class FilePickerPopup { [[nodiscard]] bool isOpen() const noexcept; - ox::Optional draw(StudioContext &ctx) noexcept; + ox::Optional draw(Context &ctx) noexcept; }; diff --git a/src/olympic/studio/modlib/include/studio/filetreemodel.hpp b/src/olympic/studio/modlib/include/studio/filetreemodel.hpp index 3d5a3656..74bd69df 100644 --- a/src/olympic/studio/modlib/include/studio/filetreemodel.hpp +++ b/src/olympic/studio/modlib/include/studio/filetreemodel.hpp @@ -32,7 +32,7 @@ class FileExplorer: public ox::SignalHandler { m_kctx{kctx}, m_fileDraggable{fileDraggable} {} - void draw(StudioContext &ctx, ImVec2 const &sz) const noexcept; + void draw(Context &ctx, ImVec2 const &sz) const noexcept; void setModel(ox::UPtr &&model, bool selectRoot = false) noexcept; diff --git a/src/olympic/studio/modlib/include/studio/imguiutil.hpp b/src/olympic/studio/modlib/include/studio/imguiutil.hpp index 1b38936a..e8d2bb25 100644 --- a/src/olympic/studio/modlib/include/studio/imguiutil.hpp +++ b/src/olympic/studio/modlib/include/studio/imguiutil.hpp @@ -272,7 +272,7 @@ bool ComboBox( bool FileComboBox( ox::CStringViewCR lbl, - StudioContext &sctx, + Context &sctx, ox::StringViewCR fileExt, size_t &selectedIdx) noexcept; @@ -295,7 +295,7 @@ bool ListBox(ox::CStringViewCR name, ox::SpanView const&list, size_t class FilePicker { private: bool m_show{}; - StudioContext &m_sctx; + Context &m_sctx; ox::String const m_title; ox::String const m_fileExt; ImVec2 const m_size; @@ -303,7 +303,7 @@ class FilePicker { ox::Signal filePicked; FilePicker( - studio::StudioContext &sctx, + studio::Context &sctx, ox::StringParam title, ox::StringParam fileExt, ImVec2 const&size = {}) noexcept; @@ -348,7 +348,7 @@ class QuestionPopup: public Popup { QuestionPopup(ox::StringParam title, ox::StringParam question) noexcept; - void draw(StudioContext &ctx) noexcept override; + void draw(Context &ctx) noexcept override; }; @@ -363,7 +363,7 @@ class MessagePopup: public Popup { void show(ox::StringParam msg) noexcept; - void draw(StudioContext &ctx) noexcept override; + void draw(Context &ctx) noexcept override; }; diff --git a/src/olympic/studio/modlib/include/studio/itemmaker.hpp b/src/olympic/studio/modlib/include/studio/itemmaker.hpp index 5aa6db19..6d52731a 100644 --- a/src/olympic/studio/modlib/include/studio/itemmaker.hpp +++ b/src/olympic/studio/modlib/include/studio/itemmaker.hpp @@ -162,7 +162,7 @@ class ItemMaker { * @return path of file or error in Result */ ox::Error write( - StudioContext &ctx, + Context &ctx, ox::StringViewCR pPath, size_t pTemplateIdx) const noexcept { return writeItem(ctx, pPath, pTemplateIdx); @@ -177,7 +177,7 @@ class ItemMaker { * @return path of file or error in Result */ ox::Error write( - StudioContext &ctx, + Context &ctx, ox::StringViewCR pPath, ox::StringViewCR pName, size_t pTemplateIdx) const noexcept { @@ -187,7 +187,7 @@ class ItemMaker { protected: virtual ox::Error writeItem( - StudioContext &ctx, + Context &ctx, ox::StringViewCR pPath, size_t pTemplateIdx) const noexcept = 0; @@ -249,7 +249,7 @@ class ItemMakerT final: public ItemMaker { } ox::Error writeItem( - StudioContext &ctx, + Context &ctx, ox::StringViewCR pPath, size_t const pTemplateIdx) const noexcept override { createUuidMapping(keelCtx(ctx.tctx), pPath, ox::UUID::generate().unwrap()); diff --git a/src/olympic/studio/modlib/include/studio/module.hpp b/src/olympic/studio/modlib/include/studio/module.hpp index 5d07f6fe..dbefd616 100644 --- a/src/olympic/studio/modlib/include/studio/module.hpp +++ b/src/olympic/studio/modlib/include/studio/module.hpp @@ -27,17 +27,17 @@ class Module { public: virtual ~Module() noexcept = default; - virtual ox::Vector editors(studio::StudioContext &ctx) const; + virtual ox::Vector editors(studio::Context &ctx) const; - virtual ox::Vector> itemMakers(studio::StudioContext&) const; + virtual ox::Vector> itemMakers(studio::Context&) const; - virtual ox::Vector> itemTemplates(studio::StudioContext&) const; + virtual ox::Vector> itemTemplates(studio::Context&) const; }; template [[nodiscard]] -EditorMaker editorMaker(StudioContext &ctx, ox::StringParam ext) noexcept { +EditorMaker editorMaker(Context &ctx, ox::StringParam ext) noexcept { return { {std::move(ext)}, [&ctx](ox::StringViewCR path) -> ox::Result { @@ -48,7 +48,7 @@ EditorMaker editorMaker(StudioContext &ctx, ox::StringParam ext) noexcept { template [[nodiscard]] -EditorMaker editorMaker(StudioContext &ctx, std::initializer_list exts) noexcept { +EditorMaker editorMaker(Context &ctx, std::initializer_list exts) noexcept { return { [&exts] { ox::Vector fileTypes; diff --git a/src/olympic/studio/modlib/include/studio/widget.hpp b/src/olympic/studio/modlib/include/studio/widget.hpp index 44788156..5cd0a490 100644 --- a/src/olympic/studio/modlib/include/studio/widget.hpp +++ b/src/olympic/studio/modlib/include/studio/widget.hpp @@ -15,7 +15,7 @@ namespace studio { class Widget: public ox::SignalHandler { public: ~Widget() noexcept override = default; - virtual void draw(StudioContext&) noexcept = 0; + virtual void draw(Context&) noexcept = 0; }; } diff --git a/src/olympic/studio/modlib/src/editor.cpp b/src/olympic/studio/modlib/src/editor.cpp index 37f4f235..442a586c 100644 --- a/src/olympic/studio/modlib/src/editor.cpp +++ b/src/olympic/studio/modlib/src/editor.cpp @@ -109,7 +109,7 @@ UndoStack *BaseEditor::undoStack() noexcept { void BaseEditor::navigateTo(ox::StringViewCR) noexcept {} -Editor::Editor(StudioContext &ctx, ox::StringParam itemPath) noexcept: +Editor::Editor(Context &ctx, ox::StringParam itemPath) noexcept: m_itemPath(std::move(itemPath)), m_itemName(m_itemPath.substr(std::find(m_itemPath.rbegin(), m_itemPath.rend(), '/').offset() + 1)) { m_undoStack.changeTriggered.connect(this, &Editor::markUnsavedChanges); diff --git a/src/olympic/studio/modlib/src/filepickerpopup.cpp b/src/olympic/studio/modlib/src/filepickerpopup.cpp index f498797f..2b499fe2 100644 --- a/src/olympic/studio/modlib/src/filepickerpopup.cpp +++ b/src/olympic/studio/modlib/src/filepickerpopup.cpp @@ -52,7 +52,7 @@ bool FilePickerPopup::isOpen() const noexcept { return m_open; } -ox::Optional FilePickerPopup::draw(StudioContext &ctx) noexcept { +ox::Optional FilePickerPopup::draw(Context &ctx) noexcept { ox::Optional out; if (!m_open) { return out; diff --git a/src/olympic/studio/modlib/src/filetreemodel.cpp b/src/olympic/studio/modlib/src/filetreemodel.cpp index 9a364b25..b921f8dd 100644 --- a/src/olympic/studio/modlib/src/filetreemodel.cpp +++ b/src/olympic/studio/modlib/src/filetreemodel.cpp @@ -11,7 +11,7 @@ namespace studio { -void FileExplorer::draw(StudioContext &ctx, ImVec2 const &sz) const noexcept { +void FileExplorer::draw(Context &ctx, ImVec2 const &sz) const noexcept { ImGui::BeginChild("ProjectExplorer", sz, true); ImGui::SetNextItemOpen(true); if (m_treeModel) { diff --git a/src/olympic/studio/modlib/src/imguiutil.cpp b/src/olympic/studio/modlib/src/imguiutil.cpp index 53c60309..9c61820a 100644 --- a/src/olympic/studio/modlib/src/imguiutil.cpp +++ b/src/olympic/studio/modlib/src/imguiutil.cpp @@ -169,7 +169,7 @@ bool ComboBox( bool FileComboBox( ox::CStringViewCR lbl, - StudioContext &sctx, + Context &sctx, ox::StringViewCR fileExt, size_t &selectedIdx) noexcept { auto const&list = sctx.project->fileList(fileExt); @@ -213,7 +213,7 @@ bool ListBox(ox::CStringViewCR name, ox::SpanView const&list, s FilePicker::FilePicker( - StudioContext &sctx, + Context &sctx, ox::StringParam title, ox::StringParam fileExt, ImVec2 const&size) noexcept: @@ -267,7 +267,7 @@ QuestionPopup::QuestionPopup(ox::StringParam title, ox::StringParam question) no m_question{std::move(question)} { } -void QuestionPopup::draw(StudioContext &ctx) noexcept { +void QuestionPopup::draw(Context &ctx) noexcept { switch (m_stage) { case Stage::Closed: break; @@ -312,7 +312,7 @@ void MessagePopup::show(ox::StringParam msg) noexcept { open(); } -void MessagePopup::draw(StudioContext &ctx) noexcept { +void MessagePopup::draw(Context &ctx) noexcept { switch (m_stage) { case Stage::Closed: break; diff --git a/src/olympic/studio/modlib/src/module.cpp b/src/olympic/studio/modlib/src/module.cpp index 4bd20ac8..9f57342e 100644 --- a/src/olympic/studio/modlib/src/module.cpp +++ b/src/olympic/studio/modlib/src/module.cpp @@ -6,15 +6,15 @@ namespace studio { -ox::Vector Module::editors(StudioContext&) const { +ox::Vector Module::editors(Context&) const { return {}; } -ox::Vector> Module::itemMakers(StudioContext&) const { +ox::Vector> Module::itemMakers(Context&) const { return {}; } -ox::Vector> Module::itemTemplates(StudioContext&) const { +ox::Vector> Module::itemTemplates(Context&) const { return {}; }