[nostalgia,studio] Add ability to navigate from tile sheet to palette color

deps/ox/src/ox/std/array.hpp

@@ -181,13 +181,13 @@ constexpr Array<T, ArraySize> &Array<T, ArraySize>::operator=(Array &&other) noe
 
 template<typename T, std::size_t ArraySize>
 constexpr T &Array<T, ArraySize>::operator[](std::size_t i) noexcept {
-	ox::primitiveAssert(__FILE__, __LINE__, i < size(), "Array access overflow");
+	boundsCheck(__FILE__, __LINE__, i, size(), "Array access overflow");
 	return m_items[i];
 }
 
 template<typename T, std::size_t ArraySize>
 constexpr const T &Array<T, ArraySize>::operator[](std::size_t i) const noexcept {
-	ox::primitiveAssert(__FILE__, __LINE__, i < size(), "Array access overflow");
+	boundsCheck(__FILE__, __LINE__, i, size(), "Array access overflow");
 	return m_items[i];
 }
 

deps/ox/src/ox/std/defines.hpp

@@ -41,6 +41,12 @@ constexpr auto Debug = true;
 constexpr auto Debug = false;
 #endif
 
+#if defined(OX_CHECK_BOUNDS)
+constexpr auto CheckBounds = true;
+#else
+constexpr auto CheckBounds = Debug;
+#endif
+
 #if defined(NDEBUG)
 constexpr auto NDebug = true;
 #else

deps/ox/src/ox/std/error.hpp

@@ -330,4 +330,17 @@ constexpr void primitiveAssert(char const*file, int line, bool pass, char const*
 	}
 }
 
+constexpr void boundsCheck(
+	char const*file,
+	int const line,
+	size_t const i,
+	size_t const sz,
+	char const*msg) noexcept {
+	if constexpr(defines::CheckBounds) {
+		if (i >= sz) [[unlikely]] {
+			panic(file, line, msg, ox::Error{1});
+		}
+	}
+}
+
 }

deps/ox/src/ox/std/iterator.hpp

@@ -133,17 +133,17 @@ struct SpanIterator {
 		}
 
 		constexpr PtrType operator->() const noexcept {
-			ox::primitiveAssert(__FILE__, __LINE__, m_offset < m_max, "SpanIterator access overflow");
+			boundsCheck(__FILE__, __LINE__, m_offset, m_max, "SpanIterator access overflow");
 			return &m_t[m_offset];
 		}
 
 		constexpr RefType operator*() const noexcept {
-			ox::primitiveAssert(__FILE__, __LINE__, m_offset < m_max, "SpanIterator access overflow");
+			boundsCheck(__FILE__, __LINE__, m_offset, m_max, "SpanIterator access overflow");
 			return m_t[m_offset];
 		}
 
 		constexpr RefType operator[](std::size_t s) const noexcept {
-			ox::primitiveAssert(__FILE__, __LINE__, s < m_max, "SpanIterator access overflow");
+			boundsCheck(__FILE__, __LINE__, s, m_max, "SpanIterator access overflow");
 			return m_t[s];
 		}
 

deps/ox/src/ox/std/span.hpp

@@ -129,22 +129,22 @@ class Span {
 		}
 
 		constexpr T &operator[](std::size_t i) noexcept {
-			ox::primitiveAssert(__FILE__, __LINE__, i < size(), "Span access overflow");
+			boundsCheck(__FILE__, __LINE__, i, size(), "Span access overflow");
 			return m_items[i];
 		}
 
 		constexpr T const&operator[](std::size_t i) const noexcept {
-			ox::primitiveAssert(__FILE__, __LINE__, i < size(), "Span access overflow");
+			boundsCheck(__FILE__, __LINE__, i, size(), "Span access overflow");
 			return m_items[i];
 		}
 
 		constexpr Span operator+(size_t i) const noexcept {
-			ox::primitiveAssert(__FILE__, __LINE__, i < size(), "Span access overflow");
+			boundsCheck(__FILE__, __LINE__, i, size(), "Span access overflow");
 			return {m_items + i, m_size - i};
 		}
 
 		constexpr Span operator+=(size_t i) noexcept {
-			ox::primitiveAssert(__FILE__, __LINE__, i < size(), "Span access overflow");
+			boundsCheck(__FILE__, __LINE__, i, size(), "Span access overflow");
 			m_items += i;
 			m_size -= i;
 			return *this;

deps/ox/src/ox/std/vector.hpp

@@ -427,13 +427,13 @@ constexpr Vector<T, SmallVectorSize, Allocator> &Vector<T, SmallVectorSize, Allo
 
 template<typename T, std::size_t SmallVectorSize, typename Allocator>
 constexpr T &Vector<T, SmallVectorSize, Allocator>::operator[](std::size_t i) noexcept {
-	ox::primitiveAssert(__FILE__, __LINE__, i < size(), "Vector access overflow");
+	boundsCheck(__FILE__, __LINE__, i, size(), "Vector access overflow");
 	return m_items[i];
 }
 
 template<typename T, std::size_t SmallVectorSize, typename Allocator>
 constexpr const T &Vector<T, SmallVectorSize, Allocator>::operator[](std::size_t i) const noexcept {
-	ox::primitiveAssert(__FILE__, __LINE__, i < size(), "Vector access overflow");
+	boundsCheck(__FILE__, __LINE__, i, size(), "Vector access overflow");
 	return m_items[i];
 }
 

src/nostalgia/modules/gfx/src/studio/paletteeditor/paletteeditor-imgui.cpp

@@ -94,6 +94,27 @@ ox::Error PaletteEditorImGui::saveItem() noexcept {
 	return m_sctx.project->writeObj(itemPath(), m_pal, ox::ClawFormat::Organic);
 }
 
+void PaletteEditorImGui::navigateTo(ox::StringViewCR arg) noexcept {
+	auto const args = ox::split<2>(arg, ';');
+	if (args.size() < 2) {
+		return;
+	}
+	auto const &color = args[0];
+	auto const &page = args[1];
+	{
+		auto const [c, err] = atoi(color);
+		if (!err && static_cast<size_t>(c) < colorCnt(m_pal)) {
+			m_selectedColorRow = static_cast<size_t>(c);
+		}
+	}
+	{
+		auto const [pg, err] = atoi(page);
+		if (!err && static_cast<size_t>(pg) < m_pal.pages.size()) {
+			m_page = static_cast<size_t>(pg);
+		}
+	}
+}
+
 void PaletteEditorImGui::drawColumnLeftAlign(ox::CStringView txt) noexcept {
 	ImGui::TableNextColumn();
 	ImGui::Text("%s", txt.c_str());

src/nostalgia/modules/gfx/src/studio/paletteeditor/paletteeditor-imgui.hpp

@@ -45,6 +45,8 @@ class PaletteEditorImGui: public studio::Editor {
 	protected:
 		ox::Error saveItem() noexcept final;
 
+		void navigateTo(ox::StringViewCR arg) noexcept override;
+
 	private:
 		static void drawColumnLeftAlign(ox::CStringView txt) noexcept;
 

src/nostalgia/modules/gfx/src/studio/tilesheeteditor/tilesheeteditor-imgui.cpp

@@ -565,9 +565,13 @@ void TileSheetEditorImGui::drawPaletteMenu() noexcept {
 							label.c_str(), rowSelected, ImGuiSelectableFlags_SpanAllColumns)) {
 						m_view.setPalIdx(i);
 					}
+					if (ImGui::IsItemHovered() && ImGui::IsMouseDoubleClicked(0)) {
+						auto const rqst = ox::sfmt<ox::BasicString<100>>("{};{}", i, m_model.palettePage());
+						oxLogError(studio::navigateTo(m_sctx, m_model.palPath(), rqst));
+					}
 					// Column: color RGB
 					ImGui::TableNextColumn();
-					auto ic = ImGui::GetColorU32(ImVec4(redf(c), greenf(c), bluef(c), 1));
+					auto const ic = ImGui::GetColorU32({redf(c), greenf(c), bluef(c), 1});
 					ImGui::TableSetBgColor(ImGuiTableBgTarget_CellBg, ic);
 					ImGui::TableNextColumn();
 					auto const&name =  i < pal.colorNames.size() ? pal.colorNames[i].c_str() : "";

src/olympic/studio/applib/src/studioapp.cpp

@@ -18,6 +18,10 @@
 
 namespace studio {
 
+ox::Error navigateTo(StudioContext &ctx, ox::StringViewCR filePath, ox::StringViewCR args) noexcept {
+	return ctx.ui.navigateTo(filePath, args);
+}
+
 namespace ig {
 extern bool s_mainWinHasFocus;
 }
@@ -107,6 +111,12 @@ void StudioUI::handleKeyEvent(turbine::Key const key, bool const down) noexcept
 	}
 }
 
+ox::Error StudioUI::navigateTo(ox::StringViewCR path, ox::StringViewCR navArgs) noexcept {
+	OX_RETURN_ERROR(openFile(path));
+	m_activeEditor->navigateTo(navArgs);
+	return {};
+}
+
 void StudioUI::draw() noexcept {
 	glutils::clearScreen();
 	drawMenu();

src/olympic/studio/applib/src/studioapp.hpp

@@ -68,6 +68,8 @@ class StudioUI: public ox::SignalHandler {
 
 		void handleKeyEvent(turbine::Key, bool down) noexcept;
 
+		ox::Error navigateTo(ox::StringViewCR path, ox::StringViewCR navArgs = {}) noexcept;
+
 		[[nodiscard]]
 		constexpr Project *project() noexcept {
 			return m_project.get();

src/olympic/studio/modlib/include/studio/context.hpp

@@ -27,4 +27,6 @@ inline keel::Context &keelCtx(StudioContext &ctx) noexcept {
 	return keelCtx(ctx.tctx);
 }
 
+ox::Error navigateTo(StudioContext &ctx, ox::StringViewCR filePath, ox::StringViewCR args) noexcept;
+
 }

src/olympic/studio/modlib/include/studio/editor.hpp

@@ -99,6 +99,8 @@ class BaseEditor: public Widget {
 		[[nodiscard]]
 		virtual UndoStack *undoStack() noexcept;
 
+		virtual void navigateTo(ox::StringViewCR arg) noexcept;
+
 		void setRequiresConstantRefresh(bool value) noexcept;
 
 	// signals

src/olympic/studio/modlib/src/editor.cpp

@@ -106,6 +106,8 @@ UndoStack *BaseEditor::undoStack() noexcept {
 	return nullptr;
 }
 
+void BaseEditor::navigateTo(ox::StringViewCR) noexcept {}
+
 
 Editor::Editor(StudioContext &ctx, ox::StringParam itemPath) noexcept:
 		m_itemPath(std::move(itemPath)),