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

[nostalgia/gfx] Add navigateTo handler to TileSheetEditor

Browse Source
This commit is contained in:
Gary Talent 2025-05-15 20:39:50 -05:00
parent d848f78fc9
commit 6e1ff6ddef
4 changed files with 40 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
deps/nostalgia/src/nostalgia/modules/gfx/include/nostalgia/gfx/tilesheet.hpp vendored
View File

@ -426,6 +426,8 @@ ox::Error resizeSubsheet(TileSheet::SubSheet &ss, ox::Size const&sz) noexcept;
[[nodiscard]] [[nodiscard]]
TileSheet::SubSheetIdx validateSubSheetIdx(TileSheet const&ts, TileSheet::SubSheetIdx idx) noexcept; TileSheet::SubSheetIdx validateSubSheetIdx(TileSheet const&ts, TileSheet::SubSheetIdx idx) noexcept;
ox::Result<TileSheet::SubSheetIdx> getSubSheetIdx(TileSheet const &ts, SubSheetId pId) noexcept;
[[nodiscard]] [[nodiscard]]
TileSheet::SubSheet &getSubSheet( TileSheet::SubSheet &getSubSheet(
ox::SpanView<uint32_t> const&idx, ox::SpanView<uint32_t> const&idx,

13
deps/nostalgia/src/nostalgia/modules/gfx/src/studio/tilesheeteditor/tilesheeteditor-imgui.cpp vendored
View File

@ -388,6 +388,17 @@ ox::Error TileSheetEditorImGui::saveItem() noexcept {
return m_model.saveFile(); return m_model.saveFile();
} }
void TileSheetEditorImGui::navigateTo(ox::StringViewCR arg) noexcept {
auto const subSheetId = strToInt(arg);
if (subSheetId.error) {
return;
}
if (auto const [val, err] = getSubSheetIdx(m_model.img(), subSheetId.value);
!err) {
setActiveSubsheet(val);
}
}
void TileSheetEditorImGui::showSubsheetEditor() noexcept { void TileSheetEditorImGui::showSubsheetEditor() noexcept {
auto const&sheet = m_model.activeSubSheet(); auto const&sheet = m_model.activeSubSheet();
if (!sheet.subsheets.empty()) { if (!sheet.subsheets.empty()) {
@ -451,7 +462,7 @@ void TileSheetEditorImGui::drawTileSheet(ox::Vec2 const&fbSize) noexcept {
if (wheelh != 0) { if (wheelh != 0) {
m_view.scrollH(fbSize, wheelh); m_view.scrollH(fbSize, wheelh);
} }
if (ImGui::IsMouseDown(0) && m_prevMouseDownPos != mousePos) { if (ImGui::IsMouseClicked(0) && m_prevMouseDownPos != mousePos) {
m_prevMouseDownPos = mousePos; m_prevMouseDownPos = mousePos;
switch (m_tool) { switch (m_tool) {
case TileSheetTool::Draw: case TileSheetTool::Draw:

2
deps/nostalgia/src/nostalgia/modules/gfx/src/studio/tilesheeteditor/tilesheeteditor-imgui.hpp vendored
View File

@ -87,6 +87,8 @@ class TileSheetEditorImGui: public studio::Editor {
protected: protected:
ox::Error saveItem() noexcept override; ox::Error saveItem() noexcept override;
void navigateTo(ox::StringViewCR arg) noexcept override;
private: private:
void showSubsheetEditor() noexcept; void showSubsheetEditor() noexcept;

24
deps/nostalgia/src/nostalgia/modules/gfx/src/tilesheet.cpp vendored
View File

@ -2,6 +2,8 @@
* Copyright 2016 - 2025 Gary Talent (gary@drinkingtea.net). All rights reserved. * Copyright 2016 - 2025 Gary Talent (gary@drinkingtea.net). All rights reserved.
*/ */
#include "nostalgia/gfx/tilesheet.hpp"
#include <ox/std/size.hpp> #include <ox/std/size.hpp>
#include <ox/std/vector.hpp> #include <ox/std/vector.hpp>
@ -187,6 +189,28 @@ TileSheet::SubSheetIdx validateSubSheetIdx(TileSheet const&ts, TileSheet::SubShe
return validateSubSheetIdx(std::move(idx), 0, ts.subsheet); return validateSubSheetIdx(std::move(idx), 0, ts.subsheet);
} }
static ox::Error getSubSheetIdx(TileSheet::SubSheet const &ss, SubSheetId const pId, TileSheet::SubSheetIdx &idx) noexcept {
if (ss.id == pId) {
return {};
}
for (uint32_t i{}; auto const &sub : ss.subsheets) {
idx.emplace_back(i);
auto const err = getSubSheetIdx(sub, pId, idx);
if (!err) {
return {};
}
idx.pop_back();
++i;
}
return ox::Error{1, "SubSheet not found"};
}
ox::Result<TileSheet::SubSheetIdx> getSubSheetIdx(TileSheet const &ts, SubSheetId const pId) noexcept {
ox::Result<TileSheet::SubSheetIdx> out;
OX_RETURN_ERROR(getSubSheetIdx(ts.subsheet, pId, out.value));
return out;
}
#if defined(__GNUC__) && __GNUC__ >= 13 #if defined(__GNUC__) && __GNUC__ >= 13
#pragma GCC diagnostic push #pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wdangling-reference" #pragma GCC diagnostic ignored "-Wdangling-reference"