Squashed 'deps/nostalgia/' changes from 89fab5cc..b46cb65b

b46cb65b [nostalgia/studio] Add version 877349df [nostalgia/core/studio] Increase max tilesheet export size, fix input handling when popups open 5418c062 [olympic] Change olympic::s_version to olympic::appVersion dd9c1100 [glutils] Update copyright for 2024 db82aee7 [teagba] Update copyright for 2024 edf15858 [teagba] Update copyright for 2024 d1efbb2f [ox] Update copyright for 2024 051623f4 [olympic,nostalgia] Update copyright for 2024 055d64b1 [olympic] Add support for an AppLib app specific version de9f8426 [ox/std] Add error.hpp include to memory.hpp 200e5867 Add .idea to .gitignore f1609519 [olympic] Cleanup e452d9db [nostalgia] Add python3-mypy to Debian deps 43a87b60 [nostalgia] Ensure pkg-gba reads .current_build without a new line 8acc6244 [olympic/keel] Improve error clarity on pack some common failures bd2aeee2 [ox/claw] Improve error clarity when loading ModelObjects git-subtree-dir: deps/nostalgia git-subtree-split: b46cb65b7f5b1ea17c115fcb31a6baff323ea1a3
2024-01-05 22:12:08 -06:00
parent d9cb493cf9
commit ab89463b0f
312 changed files with 451 additions and 375 deletions
--- a/src/olympic/studio/applib/include/studioapp/studioapp.hpp
+++ b/src/olympic/studio/applib/include/studioapp/studioapp.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved.
+ * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved.
 */

 #pragma once
--- a/src/olympic/studio/applib/src/aboutpopup.cpp
+++ b/src/olympic/studio/applib/src/aboutpopup.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved.
+ * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved.
 */

 #include <imgui.h>
@@ -7,10 +7,14 @@
 #include <studio/imguiuitl.hpp>
 #include "aboutpopup.hpp"

+namespace olympic {
+extern ox::String appVersion;
+}
+
 namespace studio {

 AboutPopup::AboutPopup(turbine::Context &ctx) noexcept {
-	m_text = ox::sfmt("{} - dev build", keelCtx(ctx).appName);
+	m_text = ox::sfmt("{} - {}", keelCtx(ctx).appName, olympic::appVersion);
 }

 void AboutPopup::open() noexcept {
--- a/src/olympic/studio/applib/src/aboutpopup.hpp
+++ b/src/olympic/studio/applib/src/aboutpopup.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved.
+ * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved.
 */

 #pragma once
--- a/src/olympic/studio/applib/src/clawviewer.cpp
+++ b/src/olympic/studio/applib/src/clawviewer.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved.
+ * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved.
 */

 #include <imgui.h>
--- a/src/olympic/studio/applib/src/clawviewer.hpp
+++ b/src/olympic/studio/applib/src/clawviewer.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved.
+ * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved.
 */

 #pragma once
--- a/src/olympic/studio/applib/src/filedialogmanager.cpp
+++ b/src/olympic/studio/applib/src/filedialogmanager.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved.
+ * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved.
 */

 #include <turbine/gfx.hpp>
--- a/src/olympic/studio/applib/src/filedialogmanager.hpp
+++ b/src/olympic/studio/applib/src/filedialogmanager.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved.
+ * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved.
 */

 #pragma once
--- a/src/olympic/studio/applib/src/main.cpp
+++ b/src/olympic/studio/applib/src/main.cpp
@@ -1,11 +1,10 @@
 /*
- * Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved.
+ * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved.
 */

 #include <ctime>

 #include <ox/logconn/logconn.hpp>
-#include <ox/logconn/def.hpp>
 #include <ox/std/trace.hpp>
 #include <ox/std/uuid.hpp>
 #include <keel/media.hpp>
@@ -31,21 +30,19 @@ class StudioUIDrawer: public turbine::gl::Drawer {

 static int updateHandler(turbine::Context &ctx) noexcept {
 	auto sctx = turbine::applicationData<studio::StudioContext>(ctx);
-	auto ui = dynamic_cast<StudioUI*>(sctx->ui);
-	ui->update();
+	sctx->ui->update();
 	return 16;
 }

 static void keyEventHandler(turbine::Context &ctx, turbine::Key key, bool down) noexcept {
 	auto sctx = turbine::applicationData<studio::StudioContext>(ctx);
-	auto ui = dynamic_cast<StudioUI*>(sctx->ui);
-	ui->handleKeyEvent(key, down);
+	sctx->ui->handleKeyEvent(key, down);
 }

 static ox::Error runApp(
 		ox::CRStringView appName,
 		ox::CRStringView projectDataDir,
-		ox::UniquePtr<ox::FileSystem> fs) noexcept {
+		ox::UPtr<ox::FileSystem> &&fs) noexcept {
 	oxRequireM(ctx, turbine::init(std::move(fs), appName));
 	turbine::setWindowTitle(*ctx, keelCtx(*ctx).appName);
 	turbine::setUpdateHandler(*ctx, updateHandler);
--- a/src/olympic/studio/applib/src/newmenu.cpp
+++ b/src/olympic/studio/applib/src/newmenu.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved.
+ * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved.
 */

 #include <algorithm>
--- a/src/olympic/studio/applib/src/newmenu.hpp
+++ b/src/olympic/studio/applib/src/newmenu.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved.
+ * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved.
 */

 #pragma once
--- a/src/olympic/studio/applib/src/newproject.cpp
+++ b/src/olympic/studio/applib/src/newproject.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved.
+ * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved.
 */

 #include <imgui.h>
--- a/src/olympic/studio/applib/src/newproject.hpp
+++ b/src/olympic/studio/applib/src/newproject.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved.
+ * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved.
 */

 #pragma once
--- a/src/olympic/studio/applib/src/projectexplorer.cpp
+++ b/src/olympic/studio/applib/src/projectexplorer.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved.
+ * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved.
 */

 #include <algorithm>
--- a/src/olympic/studio/applib/src/projectexplorer.hpp
+++ b/src/olympic/studio/applib/src/projectexplorer.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved.
+ * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved.
 */

 #pragma once
--- a/src/olympic/studio/applib/src/projecttreemodel.cpp
+++ b/src/olympic/studio/applib/src/projecttreemodel.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved.
+ * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved.
 */

 #include <imgui.h>
--- a/src/olympic/studio/applib/src/projecttreemodel.hpp
+++ b/src/olympic/studio/applib/src/projecttreemodel.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved.
+ * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved.
 */

 #pragma once
--- a/src/olympic/studio/applib/src/studioapp.cpp
+++ b/src/olympic/studio/applib/src/studioapp.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved.
+ * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved.
 */

 #include <filesystem>
@@ -334,13 +334,15 @@ ox::Error StudioUI::createOpenProject(ox::CRStringView path) noexcept {
 	std::filesystem::create_directories(toStdStringView(path), ec);
 	oxReturnError(OxError(ec.value() != 0, "Could not create project directory"));
 	oxReturnError(openProjectPath(path));
-	return m_project->writeAllTypeDescriptors();
+	return m_project->writeTypeStore();
 }

 ox::Error StudioUI::openProjectPath(ox::CRStringView path) noexcept {
 	oxRequireM(fs, keel::loadRomFs(path));
 	oxReturnError(keel::setRomFs(keelCtx(m_ctx), std::move(fs)));
-	m_project = ox::make_unique<studio::Project>(keelCtx(m_ctx), ox::String(path), m_projectDataDir);
+	oxReturnError(
+			ox::make_unique_catch<studio::Project>(keelCtx(m_ctx), ox::String(path), m_projectDataDir)
+			        .moveTo(m_project));
 	auto const sctx = applicationData<studio::StudioContext>(m_ctx);
 	sctx->project = m_project.get();
 	turbine::setWindowTitle(m_ctx, ox::sfmt("{} - {}", keelCtx(m_ctx).appName, m_project->projectPath()));
--- a/src/olympic/studio/applib/src/studioapp.hpp
+++ b/src/olympic/studio/applib/src/studioapp.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved.
+ * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved.
 */

 #pragma once
--- a/src/olympic/studio/modlib/include/studio/configio.hpp
+++ b/src/olympic/studio/modlib/include/studio/configio.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved.
+ * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved.
 */

 #pragma once
--- a/src/olympic/studio/modlib/include/studio/context.hpp
+++ b/src/olympic/studio/modlib/include/studio/context.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved.
+ * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved.
 */

 #pragma once
@@ -11,7 +11,7 @@
 namespace studio {

 struct StudioContext {
-	ox::SignalHandler *ui = nullptr;
+	class StudioUI *ui = nullptr;
 	Project *project = nullptr;
 };

--- a/src/olympic/studio/modlib/include/studio/editor.hpp
+++ b/src/olympic/studio/modlib/include/studio/editor.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved.
+ * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved.
 */

 #pragma once
--- a/src/olympic/studio/modlib/include/studio/filedialog.hpp
+++ b/src/olympic/studio/modlib/include/studio/filedialog.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved.
+ * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved.
 */

 #pragma once
--- a/src/olympic/studio/modlib/include/studio/imguiuitl.hpp
+++ b/src/olympic/studio/modlib/include/studio/imguiuitl.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved.
+ * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved.
 */

 #include <imgui.h>
--- a/src/olympic/studio/modlib/include/studio/itemmaker.hpp
+++ b/src/olympic/studio/modlib/include/studio/itemmaker.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved.
+ * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved.
 */

 #pragma once
--- a/src/olympic/studio/modlib/include/studio/module.hpp
+++ b/src/olympic/studio/modlib/include/studio/module.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved.
+ * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved.
 */

 #pragma once
--- a/src/olympic/studio/modlib/include/studio/popup.hpp
+++ b/src/olympic/studio/modlib/include/studio/popup.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved.
+ * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved.
 */

 #pragma once
--- a/src/olympic/studio/modlib/include/studio/project.hpp
+++ b/src/olympic/studio/modlib/include/studio/project.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved.
+ * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved.
 */

 #pragma once
@@ -56,7 +56,7 @@ class Project {
 		ox::HashMap<ox::String, ox::Vector<ox::String>> m_fileExtFileMap;

 	public:
-		explicit Project(keel::Context &ctx, ox::String path, ox::CRStringView projectDataDir) noexcept;
+		explicit Project(keel::Context &ctx, ox::String path, ox::CRStringView projectDataDir);

 		ox::Error create() noexcept;

@@ -91,7 +91,7 @@ class Project {
 		[[nodiscard]]
 		ox::Vector<ox::String> const&fileList(ox::CRStringView ext) noexcept;

-		ox::Error writeAllTypeDescriptors() noexcept;
+		ox::Error writeTypeStore() noexcept;

 	private:
 		void buildFileIndex() noexcept;
@@ -131,8 +131,8 @@ ox::Error Project::writeObj(ox::CRStringView path, T const&obj, ox::ClawFormat f
 	}
 	oxRequire(desc, m_typeStore.get<T>());
 	auto const descExists = m_fs.stat(ox::sfmt("{}/{}", m_typeDescPath, buildTypeId(*desc))).error != 0;
-	if (!descExists || ox::defines::Debug) {
-		oxReturnError(writeAllTypeDescriptors());
+	if (!descExists) {
+		oxReturnError(writeTypeStore());
 	}
 	oxReturnError(keel::setAsset(m_ctx, path, obj));
 	fileUpdated.emit(path);
--- a/src/olympic/studio/modlib/include/studio/studio.hpp
+++ b/src/olympic/studio/modlib/include/studio/studio.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved.
+ * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved.
 */

 #pragma once
--- a/src/olympic/studio/modlib/include/studio/task.hpp
+++ b/src/olympic/studio/modlib/include/studio/task.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved.
+ * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved.
 */

 #pragma once
--- a/src/olympic/studio/modlib/include/studio/undostack.hpp
+++ b/src/olympic/studio/modlib/include/studio/undostack.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved.
+ * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved.
 */

 #pragma once
--- a/src/olympic/studio/modlib/include/studio/widget.hpp
+++ b/src/olympic/studio/modlib/include/studio/widget.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved.
+ * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved.
 */

 #pragma once
--- a/src/olympic/studio/modlib/src/configio.cpp
+++ b/src/olympic/studio/modlib/src/configio.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved.
+ * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved.
 */

 #include <studio/configio.hpp>
--- a/src/olympic/studio/modlib/src/editor.cpp
+++ b/src/olympic/studio/modlib/src/editor.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved.
+ * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved.
 */

 #include <algorithm>
--- a/src/olympic/studio/modlib/src/filedialog_nfd.cpp
+++ b/src/olympic/studio/modlib/src/filedialog_nfd.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved.
+ * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved.
 */

 #include <nfd.hpp>
--- a/src/olympic/studio/modlib/src/imguiutil.cpp
+++ b/src/olympic/studio/modlib/src/imguiutil.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved.
+ * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved.
 */

 #include <imgui.h>
--- a/src/olympic/studio/modlib/src/module.cpp
+++ b/src/olympic/studio/modlib/src/module.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved.
+ * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved.
 */

 #include <studio/module.hpp>
--- a/src/olympic/studio/modlib/src/popup.cpp
+++ b/src/olympic/studio/modlib/src/popup.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved.
+ * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved.
 */

 #include <studio/imguiuitl.hpp>
--- a/src/olympic/studio/modlib/src/project.cpp
+++ b/src/olympic/studio/modlib/src/project.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved.
+ * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved.
 */

 #include <algorithm>
@@ -26,7 +26,7 @@ static void generateTypes(ox::TypeStore &ts) noexcept {
 	}
 }

-Project::Project(keel::Context &ctx, ox::String path, ox::CRStringView projectDataDir) noexcept:
+Project::Project(keel::Context &ctx, ox::String path, ox::CRStringView projectDataDir):
 	m_ctx(ctx),
 	m_path(std::move(path)),
 	m_projectDataDir(projectDataDir),
@@ -35,6 +35,9 @@ Project::Project(keel::Context &ctx, ox::String path, ox::CRStringView projectDa
 	m_fs(*m_ctx.rom) {
 	oxTracef("studio", "Project: {}", m_path);
 	generateTypes(m_typeStore);
+	if (ox::defines::Debug) {
+		oxThrowError(writeTypeStore());
+	}
 	buildFileIndex();
 }

@@ -70,7 +73,7 @@ ox::Vector<ox::String> const&Project::fileList(ox::CRStringView ext) noexcept {
 	return m_fileExtFileMap[ext];
 }

-ox::Error Project::writeAllTypeDescriptors() noexcept {
+ox::Error Project::writeTypeStore() noexcept {
 	// write all descriptors because we don't know which types T depends on
 	oxReturnError(mkdir(m_typeDescPath));
 	for (auto const &t: m_typeStore.typeList()) {
--- a/src/olympic/studio/modlib/src/task.cpp
+++ b/src/olympic/studio/modlib/src/task.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved.
+ * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved.
 */

 #include <algorithm>
--- a/src/olympic/studio/modlib/src/undostack.cpp
+++ b/src/olympic/studio/modlib/src/undostack.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved.
+ * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved.
 */

 #include <studio/undostack.hpp>