[nostalgia] Make pkg-dmg delete bundle after archive created

deps/buildcore/scripts/pybb.py

@@ -11,7 +11,6 @@
 # "Python Busy Box" - adds cross-platform equivalents to Unix commands that
 #                     don't translate well to that other operating system
 
-import multiprocessing
 import os
 import platform
 import shutil
@@ -58,11 +57,7 @@ def cmake_build(base_path: str, target: Optional[str]) -> int:
         path = os.path.join(base_path, d)
         if not os.path.isdir(path):
             continue
-        args = ['cmake', '--build', path, f'-j{multiprocessing.cpu_count()}']
+        args = ['cmake', '--build', path]
-        if path.endswith('release'):
-            args.append('--config=release')
-        elif path.endswith('debug'):
-            args.append('--config=debug')
         if target is not None:
             args.extend(['--target', target])
         err = subprocess.run(args).returncode

deps/ox/src/ox/fs/filesystem/filelocation.hpp

@@ -24,6 +24,9 @@ enum class FileAddressType: int8_t {
 	Inode,
 };
 
+template<typename T>
+constexpr Error model(T *h, CommonPtrWith<class FileAddress> auto *fa) noexcept;
+
 class FileAddress {
 
 	template<typename T>

deps/ox/src/ox/std/string.hpp

@@ -213,22 +213,22 @@ class BasicString {
 
 		[[nodiscard]]
 		constexpr const char *c_str() const noexcept {
-			return m_buff.data();
+			return static_cast<const char*>(m_buff.data());
 		}
 
 		[[nodiscard]]
-		constexpr explicit operator const char*() const {
+		inline explicit operator const char*() const {
 			return c_str();
 		}
 
 #if __has_include(<string>)
 		[[nodiscard]]
-		std::string toStdString() const {
+		inline std::string toStdString() const {
 			return c_str();
 		}
 
 		[[nodiscard]]
-		explicit operator std::string() const {
+		inline explicit operator std::string() const {
 			return c_str();
 		}
 #endif

release-notes.md

@@ -1,9 +1,3 @@
-# d2025.05.1
-
-* TileSheetEditor: Fix overrun errors when switching subsheets, clear selection
-  on switch (261e324acd)
-* Fix new build error that occurs in MSVC (26d5048e6720c4c2d52508a6ee44c67dd9fe3ee5)
-
 # d2025.05.0
 
 * Add app icon for both window and file

src/nostalgia/modules/gfx/src/studio/tilesheeteditor/commands/cutpastecommand.cpp

@@ -27,14 +27,11 @@ CutPasteCommand::CutPasteCommand(
 		TileSheet::SubSheetIdx subSheetIdx,
 		ox::Point const&dstStart,
 		ox::Point dstEnd,
-		TileSheetClipboard const&cb):
+		TileSheetClipboard const&cb) noexcept:
 		m_commandId(commandId),
 		m_img(img),
 		m_subSheetIdx(std::move(subSheetIdx)) {
 	auto const&ss = getSubSheet(m_img, m_subSheetIdx);
-	if (dstStart.x >= ss.columns * TileWidth || dstStart.y >= ss.rows * TileHeight) {
-		throw ox::Exception{1, "paste starts beyond the bounds of target"};
-	}
 	dstEnd.x = std::min(ss.columns * TileWidth - 1, dstEnd.x);
 	dstEnd.y = std::min(ss.rows * TileHeight - 1, dstEnd.y);
 	for (auto const&p : cb.pixels()) {

src/nostalgia/modules/gfx/src/studio/tilesheeteditor/commands/cutpastecommand.hpp

@@ -69,7 +69,7 @@ class CutPasteCommand: public TileSheetCommand {
 				TileSheet::SubSheetIdx subSheetIdx,
 				ox::Point const&dstStart,
 				ox::Point dstEnd,
-				TileSheetClipboard const&cb);
+				TileSheetClipboard const&cb) noexcept;
 
 		ox::Error redo() noexcept final;
 

src/nostalgia/modules/gfx/src/studio/tilesheeteditor/commands/deletetilescommand.cpp

@@ -28,7 +28,7 @@ DeleteTilesCommand::DeleteTilesCommand(
 	}
 }
 
-ox::Error DeleteTilesCommand::redo() noexcept {
+ox::Error gfx::DeleteTilesCommand::redo() noexcept {
 	auto &s = getSubSheet(m_img, m_idx);
 	auto &p = s.pixels;
 	auto const srcPos = m_deletePos + m_deleteSz;

src/nostalgia/modules/gfx/src/studio/tilesheeteditor/commands/inserttilescommand.cpp

@@ -9,19 +9,20 @@ namespace nostalgia::gfx {
 InsertTilesCommand::InsertTilesCommand(
 		TileSheet &img,
 		TileSheet::SubSheetIdx idx,
-		std::size_t const tileIdx,
+		std::size_t tileIdx,
-		std::size_t const tileCnt) noexcept:
+		std::size_t tileCnt) noexcept:
-		m_img{img},
+		m_img(img),
-		m_idx{std::move(idx)} {
+		m_idx(std::move(idx)) {
-	m_insertPos = tileIdx * PixelsPerTile;
+	const unsigned bytesPerTile = m_img.bpp == 4 ? PixelsPerTile / 2 : PixelsPerTile;
-	m_insertCnt = tileCnt * PixelsPerTile;
+	m_insertPos = tileIdx * bytesPerTile;
+	m_insertCnt = tileCnt * bytesPerTile;
 	m_deletedPixels.resize(m_insertCnt);
 	// copy pixels to be erased
 	{
 		auto &s = getSubSheet(m_img, m_idx);
 		auto &p = s.pixels;
-		auto const dst = m_deletedPixels.begin();
+		auto dst = m_deletedPixels.begin();
-		auto const src = p.begin() + p.size() - m_insertCnt;
+		auto src = p.begin() + p.size() - m_insertCnt;
 		ox::copy_n(src, m_insertCnt, dst);
 	}
 }
@@ -31,7 +32,7 @@ OX_ALLOW_UNSAFE_BUFFERS_BEGIN
 ox::Error InsertTilesCommand::redo() noexcept {
 	auto &s = getSubSheet(m_img, m_idx);
 	auto &p = s.pixels;
-	auto const dstPos = m_insertPos + m_insertCnt;
+	auto dstPos = m_insertPos + m_insertCnt;
 	auto const src = &p[m_insertPos];
 	if (dstPos < p.size()) {
 		auto const dst = &p[dstPos];

src/nostalgia/modules/gfx/src/studio/tilesheeteditor/commands/updatesubsheetcommand.cpp

@@ -6,7 +6,7 @@
 
 namespace nostalgia::gfx {
 
-UpdateSubSheetCommand::UpdateSubSheetCommand(
+gfx::UpdateSubSheetCommand::UpdateSubSheetCommand(
 		TileSheet &img,
 		TileSheet::SubSheetIdx idx,
 		ox::StringParam name,

src/nostalgia/modules/gfx/src/studio/tilesheeteditor/tilesheeteditormodel.cpp

@@ -46,13 +46,13 @@ Palette const TileSheetEditorModel::s_defaultPalette = {
 
 TileSheetEditorModel::TileSheetEditorModel(
 		studio::Context &sctx, ox::StringParam path, studio::UndoStack &undoStack):
-		m_sctx{sctx},
+		m_sctx(sctx),
-		m_tctx{m_sctx.tctx},
+		m_tctx(m_sctx.tctx),
-		m_path{std::move(path)},
+		m_path(std::move(path)),
-		m_img{*readObj<TileSheet>(keelCtx(m_tctx), m_path).unwrapThrow()},
+		m_img(*readObj<TileSheet>(keelCtx(m_tctx), m_path).unwrapThrow()),
 		// ignore failure to load palette
-		m_pal{readObj<Palette>(keelCtx(m_tctx), m_img.defaultPalette).value},
+		m_pal(readObj<Palette>(keelCtx(m_tctx), m_img.defaultPalette).value),
-		m_undoStack{undoStack} {
+		m_undoStack(undoStack) {
 	normalizeSubsheets(m_img.subsheet);
 	m_pal.updated.connect(this, &TileSheetEditorModel::markUpdated);
 	m_undoStack.changeTriggered.connect(this, &TileSheetEditorModel::markUpdatedCmdId);
@@ -67,27 +67,19 @@ void TileSheetEditorModel::cut() {
 	TileSheetClipboard blankCb;
 	auto cb = ox::make_unique<TileSheetClipboard>();
 	auto const&s = activeSubSheet();
-	if (iterateSelectionRows(*m_selection, [&](int const x, int const y) {
+	iterateSelectionRows(*m_selection, [&](int const x, int const y) {
 		auto pt = ox::Point{x, y};
 		auto const idx = gfx::idx(s, pt);
-		if (idx >= s.pixels.size()) {
+		auto const c = getPixel(s, idx);
-			return ox::Error{1, "invalid idx"};
-		}
-		auto const c = s.pixels[idx];
 		pt -= m_selection->a;
 		cb->addPixel(pt, c);
 		blankCb.addPixel(pt, 0);
-		return ox::Error{};
+	});
-	})) {
-		return;
-	}
 	auto const pt1 = m_selection->a;
 	auto const pt2 = ox::Point{s.columns * TileWidth, s.rows * TileHeight};
 	turbine::setClipboardObject(m_tctx, std::move(cb));
-	if (auto const cmd = ox::makeCatch<CutPasteCommand>(
+	std::ignore = pushCommand(ox::make<CutPasteCommand>(
-		CommandId::Cut, m_img, m_activeSubsSheetIdx, pt1, pt2, blankCb); cmd.ok()) {
+		CommandId::Cut, m_img, m_activeSubsSheetIdx, pt1, pt2, blankCb));
-		std::ignore = pushCommand(cmd.value);
-	}
 }
 
 void TileSheetEditorModel::copy() {
@@ -95,20 +87,14 @@ void TileSheetEditorModel::copy() {
 		return;
 	}
 	auto cb = ox::make_unique<TileSheetClipboard>();
-	if (iterateSelectionRows(*m_selection, [&](int const x, int const y) {
+	iterateSelectionRows(*m_selection, [&](int const x, int const y) {
 		auto pt = ox::Point{x, y};
 		auto const&s = activeSubSheet();
 		auto const idx = gfx::idx(s, pt);
-		if (idx >= s.pixels.size()) {
+		auto const c = getPixel(s, idx);
-			return ox::Error{1, "invalid idx"};
-		}
-		auto const c = s.pixels[idx];
 		pt -= m_selection->a;
 		cb->addPixel(pt, c);
-		return ox::Error{};
+	});
-	})) {
-		return;
-	}
 	turbine::setClipboardObject(m_tctx, std::move(cb));
 }
 
@@ -125,10 +111,8 @@ void TileSheetEditorModel::paste() {
 	auto const&s = activeSubSheet();
 	auto const pt1 = m_selection->a;
 	auto const pt2 = ox::Point{s.columns * TileWidth, s.rows * TileHeight};
-	if (auto const cmd = ox::makeCatch<CutPasteCommand>(
+	std::ignore = pushCommand(ox::make<CutPasteCommand>(
-		CommandId::Paste, m_img, m_activeSubsSheetIdx, pt1, pt2, *cb); cmd.ok()) {
+		CommandId::Paste, m_img, m_activeSubsSheetIdx, pt1, pt2, *cb));
-		std::ignore = pushCommand(cmd.value);
-	}
 }
 
 bool TileSheetEditorModel::acceptsClipboardPayload() const noexcept {
@@ -168,7 +152,7 @@ void TileSheetEditorModel::drawCommand(ox::Point const &pt, std::size_t const pa
 	auto const idx = gfx::idx(activeSubSheet, pt);
 	if (m_ongoingDrawCommand) {
 		m_updated = m_updated || m_ongoingDrawCommand->append(idx);
-	} else if (activeSubSheet.pixels[idx] != palIdx) {
+	} else if (getPixel(activeSubSheet, idx) != palIdx) {
 		std::ignore = pushCommand(ox::make<DrawCommand>(
 			m_img, m_activeSubsSheetIdx, idx, static_cast<int>(palIdx)));
 	}
@@ -229,7 +213,6 @@ ox::Error TileSheetEditorModel::updateSubsheet(
 void TileSheetEditorModel::setActiveSubsheet(TileSheet::SubSheetIdx const&idx) noexcept {
 	m_activeSubsSheetIdx = idx;
 	this->activeSubsheetChanged.emit(m_activeSubsSheetIdx);
-	clearSelection();
 }
 
 void TileSheetEditorModel::fill(ox::Point const&pt, int const palIdx) noexcept {
@@ -398,7 +381,7 @@ void TileSheetEditorModel::getFillPixels(
 		int const oldColor) const noexcept {
 	auto const idx = ptToIdx(pt, activeSubSheet.columns);
 	auto const relIdx = idx % PixelsPerTile;
-	if (pixels[relIdx] || activeSubSheet.pixels[idx] != oldColor) {
+	if (pixels[relIdx] || getPixel(activeSubSheet, idx) != oldColor) {
 		return;
 	}
 	// mark pixels to update
@@ -436,7 +419,7 @@ void TileSheetEditorModel::setPalPath() noexcept {
 }
 
 ox::Error TileSheetEditorModel::pushCommand(studio::UndoCommand *cmd) noexcept {
-	std::ignore = m_undoStack.push(ox::UPtr{cmd});
+	std::ignore = m_undoStack.push(ox::UPtr<studio::UndoCommand>{cmd});
 	m_ongoingDrawCommand = dynamic_cast<DrawCommand*>(cmd);
 	m_updated = true;
 	return {};

src/nostalgia/studio/CMakeLists.txt

@@ -15,7 +15,7 @@ target_link_libraries(
 
 target_compile_definitions(
 	NostalgiaStudio PUBLIC
-		OLYMPIC_APP_VERSION="d2025.05.1"
+		OLYMPIC_APP_VERSION="d2025.05.0"
 )
 
 install(

src/nostalgia/studio/Info.plist

@@ -18,7 +18,7 @@
 	<string>APPL</string>
 
 	<key>CFBundleVersion</key>
-	<string>d2025.05.1</string>
+	<string>d2025.05.0</string>
 
 	<key>LSMinimumSystemVersion</key>
 	<string>12.0.0</string>

src/olympic/studio/applib/src/aboutpopup.cpp

@@ -13,10 +13,22 @@ extern ox::String appVersion;
 
 namespace studio {
 
-AboutPopup::AboutPopup(turbine::Context &ctx) noexcept: Popup("About") {
+AboutPopup::AboutPopup(turbine::Context &ctx) noexcept {
 	m_text = ox::sfmt("{} - {}", keelCtx(ctx).appName, olympic::appVersion);
 }
 
+void AboutPopup::open() noexcept {
+	m_stage = Stage::Opening;
+}
+
+void AboutPopup::close() noexcept {
+	m_stage = Stage::Closed;
+}
+
+bool AboutPopup::isOpen() const noexcept {
+	return m_stage == Stage::Open;
+}
+
 void AboutPopup::draw(Context &sctx) noexcept {
 	if (ImGui::IsKeyPressed(ImGuiKey_Escape)) {
 		close();
@@ -35,7 +47,7 @@ void AboutPopup::draw(Context &sctx) noexcept {
 			ig::centerNextWindow(sctx.tctx);
 			auto open = true;
 			if (ImGui::BeginPopupModal("About", &open, modalFlags)) {
-				ImGui::Text("%s\n\nBuild date: %s", m_text.c_str(), __DATE__);
+				ImGui::Text("%s", m_text.c_str());
 				ImGui::NewLine();
 				ImGui::Dummy({148.0f, 0.0f});
 				ImGui::SameLine();

src/olympic/studio/applib/src/aboutpopup.hpp

@@ -13,14 +13,29 @@
 
 namespace studio {
 
-class AboutPopup final: public ig::Popup {
+class AboutPopup: public studio::Popup {
+	public:
+		enum class Stage {
+			Closed,
+			Opening,
+			Open,
+		};
+
 	private:
+		Stage m_stage = Stage::Closed;
 		ox::String m_text;
 
 	public:
 		explicit AboutPopup(turbine::Context &ctx) noexcept;
 
-		void draw(Context &sctx) noexcept override;
+		void open() noexcept override;
+
+		void close() noexcept override;
+
+		[[nodiscard]]
+		bool isOpen() const noexcept override;
+
+		void draw(studio::Context &sctx) noexcept override;
 
 };
 

src/olympic/studio/applib/src/studioui.cpp

@@ -65,7 +65,10 @@ OX_MODEL_END()
 StudioUI::StudioUI(turbine::Context &ctx, ox::StringParam projectDataDir) noexcept:
 		m_sctx{*this, ctx},
 		m_tctx{ctx},
-		m_projectDataDir{std::move(projectDataDir)} {
+		m_projectDataDir{std::move(projectDataDir)},
+		m_projectExplorer{keelCtx(m_tctx)},
+		m_newProject{m_projectDataDir},
+		m_aboutPopup{m_tctx} {
 	{
 		ImFontConfig fontCfg;
 		fontCfg.FontDataOwnedByAtlas = false;

src/olympic/studio/applib/src/studioui.hpp

@@ -36,7 +36,7 @@ class StudioUI: public ox::SignalHandler {
 		TaskRunner m_taskRunner;
 		ox::Vector<ox::UPtr<BaseEditor>> m_editors;
 		ox::HashMap<ox::String, EditorMaker::Func> m_editorMakers;
-		ProjectExplorer m_projectExplorer{keelCtx(m_tctx)};
+		ProjectExplorer m_projectExplorer;
 		ox::Vector<ox::String> m_openFiles;
 		BaseEditor *m_activeEditorOnLastDraw = nullptr;
 		BaseEditor *m_activeEditor = nullptr;
@@ -45,7 +45,6 @@ class StudioUI: public ox::SignalHandler {
 		ox::Vector<ox::Pair<ox::String>> m_queuedMoves;
 		ox::Vector<ox::Pair<ox::String>> m_queuedDirMoves;
 		NewMenu m_newMenu{keelCtx(m_tctx)};
-		AboutPopup m_aboutPopup{m_tctx};
 		DeleteConfirmation m_deleteConfirmation;
 		NewDir m_newDirDialog;
 		ig::QuestionPopup m_closeFileConfirm{"Close File?", "This file has unsaved changes. Close?"};
@@ -56,7 +55,8 @@ class StudioUI: public ox::SignalHandler {
 		ig::MessagePopup m_messagePopup{"Message", ""};
 		MakeCopyPopup m_copyFilePopup;
 		RenameFile m_renameFile;
-		NewProject m_newProject{m_projectDataDir};
+		NewProject m_newProject;
+		AboutPopup m_aboutPopup;
 		ox::Array<Widget*, 10> const m_widgets {
 			&m_closeFileConfirm,
 			&m_closeAppConfirm,