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

[olympic,nostalgia] Move item name/path studio::Editor

Browse Source
This commit is contained in:
Gary Talent
2023-12-12 23:06:14 -06:00
parent d056323679
commit 1b93b2038f
8 changed files with 37 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/nostalgia/modules/core/src/studio/paletteeditor/paletteeditor-imgui.cpp
+3 -12
View File
@@ -16,18 +16,9 @@
namespace nostalgia::core {
PaletteEditorImGui::PaletteEditorImGui(turbine::Context &ctx, ox::CRStringView path):
Editor(path),
m_ctx(ctx),
m_itemPath(path),
m_itemName(m_itemPath.substr(std::find(m_itemPath.rbegin(), m_itemPath.rend(), '/').offset() + 1)),
m_pal(*keel::readObj<Palette>(keelCtx(m_ctx), ox::FileAddress(m_itemPath.c_str())).unwrapThrow()) {
}
ox::CStringView PaletteEditorImGui::itemName() const noexcept {
return m_itemPath;
}
ox::CStringView PaletteEditorImGui::itemDisplayName() const noexcept {
return m_itemName;
m_pal(*keel::readObj<Palette>(keelCtx(m_ctx), ox::FileAddress(itemName())).unwrapThrow()) {
}
void PaletteEditorImGui::draw(turbine::Context&) noexcept {
@@ -140,7 +131,7 @@ void PaletteEditorImGui::draw(turbine::Context&) noexcept {
ox::Error PaletteEditorImGui::saveItem() noexcept {
const auto sctx = applicationData<studio::StudioContext>(m_ctx);
return sctx->project->writeObj(m_itemPath, m_pal);
return sctx->project->writeObj(itemName(), m_pal);
}
}
src/nostalgia/modules/core/src/studio/paletteeditor/paletteeditor-imgui.hpp
-9
View File
@@ -15,21 +15,12 @@ class PaletteEditorImGui: public studio::Editor {
private:
turbine::Context &m_ctx;
ox::String m_itemPath;
ox::String m_itemName;
Palette m_pal;
std::size_t m_selectedRow = 0;
public:
PaletteEditorImGui(turbine::Context &ctx, ox::CRStringView path);
/**
* Returns the name of item being edited.
*/
ox::CStringView itemName() const noexcept final;
ox::CStringView itemDisplayName() const noexcept final;
void draw(turbine::Context&) noexcept final;
protected:
src/nostalgia/modules/scene/src/studio/sceneeditor-imgui.cpp
+4 -14
View File
@@ -11,23 +11,13 @@
namespace nostalgia::scene {
SceneEditorImGui::SceneEditorImGui(turbine::Context &ctx, ox::StringView path):
Editor(path),
m_ctx(ctx),
m_itemPath(path),
m_editor(m_ctx, m_itemPath),
m_editor(m_ctx, path),
m_view(m_ctx, m_editor.scene()) {
const auto lastSlash = std::find(m_itemPath.rbegin(), m_itemPath.rend(), '/').offset();
m_itemName = m_itemPath.substr(lastSlash + 1);
setRequiresConstantRefresh(false);
}
ox::CStringView SceneEditorImGui::itemName() const noexcept {
return m_itemPath;
}
ox::CStringView SceneEditorImGui::itemDisplayName() const noexcept {
return m_itemName;
}
void SceneEditorImGui::draw(turbine::Context&) noexcept {
auto const paneSize = ImGui::GetContentRegionAvail();
m_view.draw(ox::Size{static_cast<int>(paneSize.x), static_cast<int>(paneSize.y)});
@@ -59,8 +49,8 @@ void SceneEditorImGui::onActivated() noexcept {
ox::Error SceneEditorImGui::saveItem() noexcept {
const auto sctx = applicationData<studio::StudioContext>(m_ctx);
oxReturnError(sctx->project->writeObj(m_itemPath, m_editor.scene()));
oxReturnError(keelCtx(m_ctx).assetManager.setAsset(m_itemPath, m_editor.scene()));
oxReturnError(sctx->project->writeObj(itemName(), m_editor.scene()));
oxReturnError(keelCtx(m_ctx).assetManager.setAsset(itemName(), m_editor.scene()));
return {};
}
src/nostalgia/modules/scene/src/studio/sceneeditor-imgui.hpp
-9
View File
@@ -17,21 +17,12 @@ class SceneEditorImGui: public studio::Editor {
private:
turbine::Context &m_ctx;
ox::String m_itemName;
ox::String m_itemPath;
SceneEditor m_editor;
SceneEditorView m_view;
public:
SceneEditorImGui(turbine::Context &ctx, ox::StringView path);
/**
* Returns the name of item being edited.
*/
ox::CStringView itemName() const noexcept final;
ox::CStringView itemDisplayName() const noexcept final;
void draw(turbine::Context&) noexcept final;
void onActivated() noexcept override;