drinkingtea/ox
2
0
Fork 0
Code Issues Pull Requests Actions Releases Wiki Activity

[studio] Rename StudioContext to Context

Browse Source
This commit is contained in:
Gary Talent
2025-05-06 22:36:49 -05:00
parent 7da2f68d30
commit e773d6f0ee
42 changed files with 89 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/nostalgia/modules/gfx/src/studio/paletteeditor/paletteeditor-imgui.cpp
+2 -2
View File
@@ -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);
src/nostalgia/modules/gfx/src/studio/paletteeditor/paletteeditor-imgui.hpp
+3 -3
View File
@@ -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;
src/nostalgia/modules/gfx/src/studio/studiomodule.cpp
+2 -2
View File
@@ -12,14 +12,14 @@
namespace nostalgia::gfx {
static class: public studio::Module {
ox::Vector<studio::EditorMaker> editors(studio::StudioContext &ctx) const noexcept final {
ox::Vector<studio::EditorMaker> editors(studio::Context &ctx) const noexcept final {
return {
studio::editorMaker<TileSheetEditorImGui>(ctx, {FileExt_ng, FileExt_nts}),
studio::editorMaker<PaletteEditorImGui>(ctx, FileExt_npal),
};
}
ox::Vector<ox::UPtr<studio::ItemMaker>> itemMakers(studio::StudioContext&) const noexcept final {
ox::Vector<ox::UPtr<studio::ItemMaker>> itemMakers(studio::Context&) const noexcept final {
ox::Vector<ox::UPtr<studio::ItemMaker>> out;
out.emplace_back(ox::make<studio::ItemMakerT<TileSheet>>("Tile Sheet", "TileSheets", FileExt_nts));
out.emplace_back(ox::make<studio::ItemMakerT<Palette>>("Palette", "Palettes", FileExt_npal, Palette{
src/nostalgia/modules/gfx/src/studio/tilesheeteditor/tilesheeteditor-imgui.cpp
+2 -2
View File
@@ -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)) {
src/nostalgia/modules/gfx/src/studio/tilesheeteditor/tilesheeteditor-imgui.hpp
+3 -3
View File
@@ -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<ox::String> m_paletteList;
SubSheetEditor m_subsheetEditor;
@@ -60,7 +60,7 @@ class TileSheetEditorImGui: public studio::Editor {
ox::Vector<ox::UPtr<studio::UndoCommand>, 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);
src/nostalgia/modules/gfx/src/studio/tilesheeteditor/tilesheeteditormodel.cpp
+1 -1
View File
@@ -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)),
src/nostalgia/modules/gfx/src/studio/tilesheeteditor/tilesheeteditormodel.hpp
+2 -2
View File
@@ -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;
src/nostalgia/modules/gfx/src/studio/tilesheeteditor/tilesheeteditorview.cpp
+1 -1
View File
@@ -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);
src/nostalgia/modules/gfx/src/studio/tilesheeteditor/tilesheeteditorview.hpp
+1 -1
View File
@@ -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;
src/nostalgia/modules/sound/src/studio/studiomodule.cpp
+2 -2
View File
@@ -9,12 +9,12 @@
namespace nostalgia::sound {
static class: public studio::Module {
ox::Vector<studio::EditorMaker> editors(studio::StudioContext&) const noexcept final {
ox::Vector<studio::EditorMaker> editors(studio::Context&) const noexcept final {
return {
};
}
ox::Vector<ox::UPtr<studio::ItemMaker>> itemMakers(studio::StudioContext&) const noexcept final {
ox::Vector<ox::UPtr<studio::ItemMaker>> itemMakers(studio::Context&) const noexcept final {
ox::Vector<ox::UPtr<studio::ItemMaker>> out;
return out;
}