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

[nostalgia,studio] Cleanup

Browse Source
This commit is contained in:
Gary Talent
2023-12-03 19:59:27 -06:00
parent 5717d67462
commit d23b69ce17
24 changed files with 68 additions and 158 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/nostalgia/modules/core/src/studio/paletteeditor-imgui.cpp
View File

@@ -15,11 +15,11 @@
namespace nostalgia::core {
PaletteEditorImGui::PaletteEditorImGui(turbine::Context *ctx, ox::String path):
PaletteEditorImGui::PaletteEditorImGui(turbine::Context &ctx, ox::String path):
m_ctx(ctx),
m_itemPath(std::move(path)),
m_itemName(m_itemPath.substr(std::find(m_itemPath.rbegin(), m_itemPath.rend(), '/').offset() + 1)),
m_pal(*keel::readObj<Palette>(m_ctx->keelCtx, ox::FileAddress(m_itemPath.c_str())).unwrapThrow()) {
m_pal(*keel::readObj<Palette>(m_ctx.keelCtx, ox::FileAddress(m_itemPath.c_str())).unwrapThrow()) {
}
const ox::String &PaletteEditorImGui::itemName() const noexcept {
@@ -125,7 +125,7 @@ void PaletteEditorImGui::draw(turbine::Context*) noexcept {
int r = red16(c);
int g = green16(c);
int b = blue16(c);
int a = alpha16(c);
int const a = alpha16(c);
ImGui::InputInt("Red", &r, 1, 5);
ImGui::InputInt("Green", &g, 1, 5);
ImGui::InputInt("Blue", &b, 1, 5);
@@ -139,7 +139,7 @@ void PaletteEditorImGui::draw(turbine::Context*) noexcept {
}
ox::Error PaletteEditorImGui::saveItem() noexcept {
const auto sctx = applicationData<studio::StudioContext>(*m_ctx);
const auto sctx = applicationData<studio::StudioContext>(m_ctx);
return sctx->project->writeObj(m_itemPath, m_pal);
}

6
src/nostalgia/modules/core/src/studio/paletteeditor-imgui.hpp
View File

@@ -14,16 +14,14 @@ namespace nostalgia::core {
class PaletteEditorImGui: public studio::Editor {
private:
turbine::Context *m_ctx = nullptr;
turbine::Context &m_ctx;
ox::String m_itemPath;
ox::String m_itemName;
Palette m_pal;
std::size_t m_selectedRow = 0;
PaletteEditorImGui() noexcept = default;
public:
PaletteEditorImGui(turbine::Context *ctx, ox::String path);
PaletteEditorImGui(turbine::Context &ctx, ox::String path);
/**
* Returns the name of item being edited.

4
src/nostalgia/modules/core/src/studio/studiomodule.cpp
View File

@@ -12,14 +12,14 @@
namespace nostalgia::core {
class StudioModule: public studio::Module {
ox::Vector<studio::EditorMaker> editors(turbine::Context *ctx) const noexcept final {
ox::Vector<studio::EditorMaker> editors(turbine::Context &ctx) const noexcept final {
return {
studio::editorMaker<TileSheetEditorImGui>(ctx, FileExt_ng),
studio::editorMaker<PaletteEditorImGui>(ctx, FileExt_npal),
};
}
ox::Vector<ox::UPtr<studio::ItemMaker>> itemMakers(turbine::Context*) const noexcept final {
ox::Vector<ox::UPtr<studio::ItemMaker>> itemMakers(turbine::Context&) const noexcept final {
ox::Vector<ox::UniquePtr<studio::ItemMaker>> out;
out.emplace_back(ox::make<studio::ItemMakerT<core::TileSheet>>("Tile Sheet", "TileSheets", FileExt_ng));
out.emplace_back(ox::make<studio::ItemMakerT<core::Palette>>("Palette", "Palettes", FileExt_npal));

13
src/nostalgia/modules/core/src/studio/tilesheeteditor-imgui.cpp
View File

@@ -38,14 +38,15 @@ ox::Error toPngFile(const ox::String &path, const TileSheet::SubSheet &s, const
return OxError(static_cast<ox::ErrorCode>(lodepng_encode_file(path.c_str(), outData.data(), width, height, fmt, 8)));
}
TileSheetEditorImGui::TileSheetEditorImGui(turbine::Context *ctx, ox::String path): m_tileSheetEditor(ctx, path) {
m_ctx = ctx;
m_itemPath = std::move(path);
TileSheetEditorImGui::TileSheetEditorImGui(turbine::Context &ctx, ox::String path):
m_ctx(ctx),
m_itemPath(std::move(path)),
m_tileSheetEditor(m_ctx, m_itemPath) {
const auto lastSlash = ox::find(m_itemPath.rbegin(), m_itemPath.rend(), '/').offset();
m_itemName = m_itemPath.substr(lastSlash + 1);
// init palette idx
const auto &palPath = model()->palPath();
auto sctx = applicationData<studio::StudioContext>(*m_ctx);
auto sctx = applicationData<studio::StudioContext>(m_ctx);
const auto &palList = sctx->project->fileList(core::FileExt_npal);
for (std::size_t i = 0; const auto &pal : palList) {
if (palPath == pal) {
@@ -305,7 +306,7 @@ void TileSheetEditorImGui::drawTileSheet(const ox::Vec2 &fbSize) noexcept {
const auto wheelh = io.MouseWheelH;
if (wheel != 0) {
const auto zoomMod = ox::defines::OS == ox::OS::Darwin ?
io.KeySuper : turbine::buttonDown(*m_ctx, turbine::Key::Mod_Ctrl);
io.KeySuper : turbine::buttonDown(m_ctx, turbine::Key::Mod_Ctrl);
m_tileSheetEditor.scrollV(fbSize, wheel, zoomMod);
}
if (wheelh != 0) {
@@ -345,7 +346,7 @@ void TileSheetEditorImGui::drawTileSheet(const ox::Vec2 &fbSize) noexcept {
}
void TileSheetEditorImGui::drawPaletteSelector() noexcept {
auto sctx = applicationData<studio::StudioContext>(*m_ctx);
auto sctx = applicationData<studio::StudioContext>(m_ctx);
const auto &files = sctx->project->fileList(core::FileExt_npal);
const auto first = m_selectedPaletteIdx < files.size() ?
files[m_selectedPaletteIdx].c_str() : "";

4
src/nostalgia/modules/core/src/studio/tilesheeteditor-imgui.hpp
View File

@@ -43,7 +43,7 @@ class TileSheetEditorImGui: public studio::BaseEditor {
void close() noexcept;
};
std::size_t m_selectedPaletteIdx = 0;
turbine::Context *m_ctx = nullptr;
turbine::Context &m_ctx;
ox::Vector<ox::String> m_paletteList;
SubSheetEditor m_subsheetEditor;
ox::String m_itemPath;
@@ -55,7 +55,7 @@ class TileSheetEditorImGui: public studio::BaseEditor {
Tool m_tool = Tool::Draw;
public:
TileSheetEditorImGui(turbine::Context *ctx, ox::String path);
TileSheetEditorImGui(turbine::Context &ctx, ox::String path);
~TileSheetEditorImGui() override = default;

20
src/nostalgia/modules/core/src/studio/tilesheeteditormodel.cpp
View File

@@ -563,13 +563,13 @@ class PaletteChangeCommand: public TileSheetCommand {
};
TileSheetEditorModel::TileSheetEditorModel(turbine::Context *ctx, ox::StringView path):
TileSheetEditorModel::TileSheetEditorModel(turbine::Context &ctx, ox::StringView path):
m_ctx(ctx),
m_path(path) {
oxRequireT(img, readObj<TileSheet>(ctx->keelCtx, m_path));
oxRequireT(img, readObj<TileSheet>(m_ctx.keelCtx, m_path));
m_img = *img;
if (m_img.defaultPalette) {
oxThrowError(readObj<Palette>(ctx->keelCtx, m_img.defaultPalette).moveTo(&m_pal));
oxThrowError(readObj<Palette>(m_ctx.keelCtx, m_img.defaultPalette).moveTo(&m_pal));
}
m_pal.updated.connect(this, &TileSheetEditorModel::markUpdated);
m_undoStack.changeTriggered.connect(this, &TileSheetEditorModel::markUpdatedCmdId);
@@ -592,7 +592,7 @@ void TileSheetEditorModel::cut() {
}
const auto pt1 = m_selectionOrigin == ox::Point(-1, -1) ? ox::Point(0, 0) : m_selectionOrigin;
const auto pt2 = ox::Point(s->columns * TileWidth, s->rows * TileHeight);
turbine::setClipboardObject(*m_ctx, std::move(cb));
turbine::setClipboardObject(m_ctx, std::move(cb));
pushCommand(ox::make<CutPasteCommand<CommandId::Cut>>(m_img, m_activeSubsSheetIdx, pt1, pt2, blankCb));
}
@@ -609,11 +609,11 @@ void TileSheetEditorModel::copy() {
cb->addPixel(pt, c);
}
}
turbine::setClipboardObject(*m_ctx, std::move(cb));
turbine::setClipboardObject(m_ctx, std::move(cb));
}
void TileSheetEditorModel::paste() {
auto [cb, err] = turbine::getClipboardObject<TileSheetClipboard>(*m_ctx);
auto [cb, err] = turbine::getClipboardObject<TileSheetClipboard>(m_ctx);
if (err) {
oxLogError(err);
oxErrf("Could not read clipboard: {}", toStr(err));
@@ -633,7 +633,7 @@ ox::StringView TileSheetEditorModel::palPath() const noexcept {
constexpr ox::StringView uuidPrefix = "uuid://";
if (ox::beginsWith(path, uuidPrefix)) {
auto uuid = ox::StringView(path.data() + uuidPrefix.bytes(), path.bytes() - uuidPrefix.bytes());
auto out = m_ctx->keelCtx.uuidToPath.at(uuid);
auto out = m_ctx.keelCtx.uuidToPath.at(uuid);
if (out.error) {
return {};
}
@@ -644,7 +644,7 @@ ox::StringView TileSheetEditorModel::palPath() const noexcept {
}
ox::Error TileSheetEditorModel::setPalette(const ox::String &path) noexcept {
oxRequire(uuid, m_ctx->keelCtx.pathToUuid.at(path));
oxRequire(uuid, m_ctx.keelCtx.pathToUuid.at(path));
pushCommand(ox::make<PaletteChangeCommand>(activeSubSheetIdx(), m_img, uuid->toString()));
return {};
}
@@ -752,7 +752,7 @@ ox::Error TileSheetEditorModel::markUpdatedCmdId(const studio::UndoCommand *cmd)
m_updated = true;
const auto cmdId = cmd->commandId();
if (static_cast<CommandId>(cmdId) == CommandId::PaletteChange) {
oxReturnError(readObj<Palette>(m_ctx->keelCtx, ox::StringView(m_img.defaultPalette.getPath().value)).moveTo(&m_pal));
oxReturnError(readObj<Palette>(m_ctx.keelCtx, ox::StringView(m_img.defaultPalette.getPath().value)).moveTo(&m_pal));
}
auto tsCmd = dynamic_cast<const TileSheetCommand*>(cmd);
auto idx = m_img.validateSubSheetIdx(tsCmd->subsheetIdx());
@@ -772,7 +772,7 @@ void TileSheetEditorModel::ackUpdate() noexcept {
}
ox::Error TileSheetEditorModel::saveFile() noexcept {
const auto sctx = applicationData<studio::StudioContext>(*m_ctx);
const auto sctx = applicationData<studio::StudioContext>(m_ctx);
return sctx->project->writeObj(m_path, m_img);
}

4
src/nostalgia/modules/core/src/studio/tilesheeteditormodel.hpp
View File

@@ -29,14 +29,14 @@ class TileSheetEditorModel: public ox::SignalHandler {
studio::UndoStack m_undoStack;
class DrawCommand *m_ongoingDrawCommand = nullptr;
bool m_updated = false;
turbine::Context *m_ctx = nullptr;
turbine::Context &m_ctx;
ox::String m_path;
bool m_selectionOngoing = false;
ox::Point m_selectionOrigin = {-1, -1};
ox::Bounds m_selectionBounds = {{-1, -1}, {-1, -1}};
public:
TileSheetEditorModel(turbine::Context *ctx, ox::StringView path);
TileSheetEditorModel(turbine::Context &ctx, ox::StringView path);
~TileSheetEditorModel() override = default;

5
src/nostalgia/modules/core/src/studio/tilesheeteditorview.cpp
View File

@@ -11,8 +11,9 @@
namespace nostalgia::core {
TileSheetEditorView::TileSheetEditorView(turbine::Context *ctx, ox::StringView path):
m_model(ctx, path), m_pixelsDrawer(&m_model) {
TileSheetEditorView::TileSheetEditorView(turbine::Context &ctx, ox::StringView path):
m_model(ctx, path),
m_pixelsDrawer(&m_model) {
// build shaders
oxThrowError(m_pixelsDrawer.buildShader());
oxThrowError(m_pixelGridDrawer.buildShader());

2
src/nostalgia/modules/core/src/studio/tilesheeteditorview.hpp
View File

@@ -50,7 +50,7 @@ class TileSheetEditorView: public ox::SignalHandler {
std::size_t m_palIdx = 0;
public:
TileSheetEditorView(turbine::Context *ctx, ox::StringView path);
TileSheetEditorView(turbine::Context &ctx, ox::StringView path);
~TileSheetEditorView() override = default;