save work

CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.19)
+cmake_minimum_required(VERSION 3.25)
 set(CMAKE_POLICY_DEFAULT_CMP0110 NEW) # requires CMake 3.19
 
 if(BUILDCORE_TARGET STREQUAL "gba")
@@ -52,7 +52,7 @@ if(NOT BUILDCORE_TARGET STREQUAL "gba")
 	set(GLFW_BUILD_TESTS OFF)
 	set(GLFW_BUILD_DOCS OFF)
 	if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
-		set(GLFW_BUILD_WAYLAND OFF)
+		set(GLFW_BUILD_WAYLAND ON)
 	endif()
 	add_subdirectory(deps/glfw)
 	add_subdirectory(deps/glutils)

deps/oxlib/src/claw/include/ox/claw/write.hpp

@@ -120,4 +120,24 @@ Result<Buffer> writeClaw(
 	return out;
 }
 
+Error writeClaw(
+		auto const &obj,
+		Writer_c auto &writer,
+		ClawFormat const fmt = ClawFormat::Metal) noexcept {
+	OX_RETURN_ERROR(detail::writeClawHeader(writer, &obj, fmt));
+#ifdef OX_USE_STDLIB
+	if (fmt == ClawFormat::Metal) {
+		OX_RETURN_ERROR(writeMC(writer, obj));
+	} else if (fmt == ClawFormat::Organic) {
+		OX_RETURN_ERROR(writeOC(writer, obj));
+	}
+#else
+	if (fmt != ClawFormat::Metal) {
+		return ox::Error(1, "OC is not supported in this build");
+	}
+	OX_RETURN_ERROR(writeMC(writer, obj));
+#endif
+	return {};
+}
+
 }

deps/oxlib/src/oc/include/ox/oc/write.hpp

@@ -28,6 +28,7 @@ namespace ox {
 
 class OrganicClawWriter {
 
+	friend Error writeOC(Writer_c auto &writer, auto const &val) noexcept;
 	friend Result<Buffer> writeOC(const auto &val) noexcept;
 	friend Result<String> writeOCString(const auto &val) noexcept;
 
@@ -254,9 +255,19 @@ Error OrganicClawWriter::field(CString key, UnionView<U, force> val) noexcept {
 	return {};
 }
 
+Error writeOC(Writer_c auto &writer, auto const &val) noexcept {
+	OrganicClawWriter ocWriter;
+	ModelHandlerInterface handler(ocWriter);
+	OX_RETURN_ERROR(model(&handler, &val));
+	Json::StreamWriterBuilder const jsonBuilder;
+	auto const str = Json::writeString(jsonBuilder, ocWriter.m_json);
+	OX_RETURN_ERROR(writer.write(str.data(), str.size()));
+	return writer.put('\0');
+}
+
 Result<Buffer> writeOC(auto const &val) noexcept {
 	OrganicClawWriter writer;
-	ModelHandlerInterface<OrganicClawWriter, OpType::Write> handler(writer);
+	ModelHandlerInterface handler(writer);
 	OX_RETURN_ERROR(model(&handler, &val));
 	Json::StreamWriterBuilder const jsonBuilder;
 	auto const str = Json::writeString(jsonBuilder, writer.m_json);
@@ -270,7 +281,7 @@ Result<Buffer> writeOC(auto const &val) noexcept {
 
 Result<String> writeOCString(auto const &val) noexcept {
 	OrganicClawWriter writer;
-	ModelHandlerInterface<OrganicClawWriter, OpType::Write> handler(writer);
+	ModelHandlerInterface handler(writer);
 	OX_RETURN_ERROR(model(&handler, &val));
 	Json::StreamWriterBuilder const jsonBuilder;
 	auto const str = Json::writeString(jsonBuilder, writer.m_json);

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

@@ -345,6 +345,21 @@ struct [[nodiscard]] Result {
 		return *this;
 	}
 
+	constexpr Result reoriginate(
+		ErrorCode const pErrCode,
+		CString const pMsg = nullptr,
+		std::source_location const &pSrc = std::source_location::current()) const && noexcept {
+		if (error) {
+			return {std::move(value), Error{pErrCode, pMsg, pSrc}};
+		}
+		return {std::move(value)};
+	}
+
+	constexpr Result reoriginate(
+		std::source_location const &pSrc = std::source_location::current()) const && noexcept {
+		return {std::move(value), Error{error.errCode, error.msg, pSrc}};
+	}
+
 };
 
 namespace detail {

deps/oxlib/src/std/include/ox/std/strops.hpp

@@ -36,6 +36,27 @@ constexpr StringView substr(StringViewCR str, std::size_t const start, std::size
 	return {};
 }
 
+[[nodiscard]]
+constexpr char toUpper(char const c) noexcept {
+	return c & static_cast<char>(0b1101'1111);
+}
+
+[[nodiscard]]
+constexpr int caseInsensitiveStrCmp(StringViewCR a, StringViewCR b) noexcept {
+	auto const sz = ox::min(a.size(), b.size());
+	for (size_t i{}; i < sz; ++i) {
+		auto const ac = toUpper(a[i]);
+		auto const bc = toUpper(b[i]);
+		if (ac < bc) {
+			return -1;
+		}
+		if (ac > bc) {
+			return 1;
+		}
+	}
+	return 0;
+}
+
 [[nodiscard]]
 constexpr bool beginsWith(StringViewCR base, char const beginning) noexcept {
 	return base.size() && base[0] == beginning;

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

@@ -54,6 +54,10 @@ struct VectorAllocator {
 			// this totally idiotic redundant check (&& count <= Size) is required to address a bug in devkitARM,
 			// try removing it later
 			if (!std::is_constant_evaluated()) {
+#if defined(__GNUC__) && !defined(__clang__)
+	#pragma GCC diagnostic push
+	#pragma GCC diagnostic ignored "-Wstringop-overflow="
+#endif
 				if (cap <= m_data.size() && count <= m_data.size()) {
 					for (auto i = 0u; i < count; ++i) {
 						auto const srcItem = std::launder(reinterpret_cast<T*>(&src->m_data[i]));
@@ -65,6 +69,9 @@ struct VectorAllocator {
 						*items = reinterpret_cast<T*>(m_data.data());
 					}
 				}
+#if defined(__GNUC__) && !defined(__clang__)
+	#pragma GCC diagnostic pop
+#endif
 			}
 		}
 

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

@@ -155,19 +155,20 @@ void TileSheetEditorImGui::draw(studio::Context&) noexcept {
 			}
 		}
 	}
+	auto const scale = turbine::scale(m_tctx);
 	auto const paneSize = ImGui::GetContentRegionAvail();
-	auto const tileSheetParentSize = ImVec2{paneSize.x - s_palViewWidth, paneSize.y};
-	auto const fbSize = ox::Vec2{tileSheetParentSize.x - 16, tileSheetParentSize.y - 16};
+	auto const tileSheetParentSize = ImVec2{paneSize.x - s_palViewWidth * scale, paneSize.y};
+	auto const fbSize = ox::Vec2{tileSheetParentSize.x - 16 * scale, tileSheetParentSize.y - 16 * scale};
 	ImGui::BeginChild("TileSheetView", tileSheetParentSize, true);
 	{
 		drawTileSheet(fbSize);
 	}
 	ImGui::EndChild();
 	ImGui::SameLine();
-	ImGui::BeginChild("Controls", {s_palViewWidth - 8, paneSize.y}, true);
+	ImGui::BeginChild("Controls", {(s_palViewWidth - 8) * scale, paneSize.y}, true);
 	{
 		auto const controlsSize = ImGui::GetContentRegionAvail();
-		ImGui::BeginChild("ToolBox", {0, 32}, true);
+		ImGui::BeginChild("ToolBox", {0, 32 * scale}, true);
 		{
 			auto const btnSz = ImVec2{45, 14};
 			if (ImGui::Selectable("Select", m_tool == TileSheetTool::Select, 0, btnSz)) {
@@ -193,7 +194,7 @@ void TileSheetEditorImGui::draw(studio::Context&) noexcept {
 			//ig::ComboBox("##Operations", ox::Array<ox::CStringView, 1>{"Operations"}, i);
 		}
 		ImGui::EndChild();
-		ImGui::BeginChild("OperationsBox", {0, 35}, ImGuiWindowFlags_NoTitleBar);
+		ImGui::BeginChild("OperationsBox", {0, 35 * scale}, ImGuiWindowFlags_NoTitleBar);
 		{
 			if (ImGui::BeginCombo("##Operations", "Operations", 0)) {
 				if (ImGui::Selectable("Flip X", false)) {
@@ -216,12 +217,12 @@ void TileSheetEditorImGui::draw(studio::Context&) noexcept {
 		ImGui::EndChild();
 		auto const ySize = controlsSize.y - (38 + ig::BtnSz.y + 21);
 		// draw palette/color picker
-		ImGui::BeginChild("Palette", {s_palViewWidth - 24, ySize / 2.f}, true);
+		ImGui::BeginChild("Palette", {(s_palViewWidth - 24) * scale, ySize / 2.f}, true);
 		{
 			drawPaletteMenu();
 		}
 		ImGui::EndChild();
-		ImGui::BeginChild("SubSheets", {s_palViewWidth - 24, ySize / 2.f}, true);
+		ImGui::BeginChild("SubSheets", {(s_palViewWidth - 24) * scale, ySize / 2.f}, true);
 		{
 			static constexpr auto btnHeight = ig::BtnSz.y;
 			auto constexpr btnSize = ImVec2{btnHeight, btnHeight};

src/olympic/studio/applib/src/app.cpp

@@ -17,6 +17,7 @@
 #include "subcommands/change-format/change-format.hpp"
 
 #include "configfile.hpp"
+#include "font.hpp"
 #include "studioui.hpp"
 
 namespace studio {
@@ -129,7 +130,7 @@ static ox::Error run(
 			if (m->id() == moduleId) {
 				for (auto const &c : m->commands()) {
 					if (c.name == subCmd) {
-						auto kctx = keel::init(
+						auto const kctx = keel::init(
 							ox::make_unique<ox::PassThroughFS>(projectDir),
 							c.name);
 						if (kctx.error) {

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

@@ -132,7 +132,11 @@ StudioUI::StudioUI(turbine::Context &tctx, ox::StringParam projectDataDir) noexc
 		// that it will still be treated as const.
 		// ImGui documentation recognizes that this is a bad design,
 		// and hopefully it will change at some point.
-		io.Fonts->AddFontFromMemoryTTF(const_cast<uint8_t*>(font.data()), static_cast<int>(font.size()), 13, &fontCfg);
+		io.Fonts->AddFontFromMemoryTTF(
+			const_cast<uint8_t*>(font.data()),
+			static_cast<int>(font.size()),
+			13 * turbine::scale(m_tctx),
+			&fontCfg);
 	}
 	auto &kctx = keelCtx(m_tctx);
 	kctx.converters.emplace_back(keel::Converter::make<convertStudioConfigV1ToStudioConfigV2>());
@@ -215,7 +219,7 @@ void StudioUI::draw() noexcept {
 			ImGuiFocusedFlags_RootAndChildWindows | ImGuiFocusedFlags_NoPopupHierarchy);
 		if (m_showProjectExplorer) {
 			auto const v = ImGui::GetContentRegionAvail();
-			m_projectExplorer.draw(m_sctx, {300, v.y});
+			m_projectExplorer.draw(m_sctx, {300 * turbine::scale(m_tctx), v.y});
 			ImGui::SameLine();
 		}
 		drawTabBar();

src/olympic/studio/applib/src/subcommands/change-format/change-format.cpp

@@ -16,11 +16,16 @@ static ox::Error convertFile(
 	ox::TypeStore &ts,
 	ox::StringViewCR path,
 	ox::ClawFormat const fmt) noexcept {
-	ox::Buffer buff;
-	ox::ModelObject obj;
-	OX_RETURN_ERROR(fs.read(path).moveTo(buff).reoriginate(1, "unable to read file"));
-	OX_RETURN_ERROR(keel::readAsset(ts, buff).moveTo(obj).reoriginate(1, "unable to parse file"));
-	OX_RETURN_ERROR(ox::writeClaw(obj, fmt).moveTo(buff));
+	OX_REQUIRE_M(buff, fs.read(path).reoriginate(1, "unable to read file"));
+	OX_REQUIRE(uuid, keel::readUuidHeader(buff));
+	OX_REQUIRE(obj, keel::readAsset(ts, buff).reoriginate(1, "unable to parse file"));
+	buff.clear();
+	ox::BufferWriter writer{&buff};
+	OX_RETURN_ERROR(keel::writeUuidHeader(writer, uuid));
+	OX_RETURN_ERROR(ox::writeClaw(obj, writer, fmt));
+	if (fmt == ox::ClawFormat::Organic) {
+		*buff.back().value = '\n';
+	}
 	OX_RETURN_ERROR(fs.write(path, buff).reoriginate(1, "unable to write file"));
 	return {};
 }
@@ -31,12 +36,12 @@ static void printUsage() noexcept {
 
 [[nodiscard]]
 static constexpr ox::Result<ox::ClawFormat> getFmt(ox::StringViewCR fmtStr) noexcept {
-	if (fmtStr == "mc") {
+	if (caseInsensitiveStrCmp(fmtStr, "mc") == 0) {
 		return ox::ClawFormat::Metal;
-	} else if (fmtStr == "oc") {
+	} else if (caseInsensitiveStrCmp(fmtStr, "oc") == 0) {
 		return ox::ClawFormat::Organic;
 	}
-	return ox::Error(1, "invalid format");
+	return ox::Error{1, "invalid format"};
 }
 
 ox::Error cmdChangeFormat(Project &project, ox::SpanView<ox::CString> const args) noexcept {

src/olympic/studio/applib/src/subcommands/change-format/change-format.hpp

@@ -4,6 +4,8 @@
 
 #pragma once
 
+#include <studio/project.hpp>
+
 namespace studio {
 
 ox::Error cmdChangeFormat(Project &project, ox::SpanView<ox::CString> args) noexcept;

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

@@ -165,7 +165,7 @@ template<typename T>
 ox::Error Project::writeObj(ox::StringViewCR path, T const &obj, ox::ClawFormat fmt) noexcept {
 	OX_REQUIRE_M(buff, ox::writeClaw(obj, fmt));
 	if (fmt == ox::ClawFormat::Organic) {
-		buff.pop_back();
+		*buff.back().value = '\n';
 	}
 	// write to FS
 	OX_RETURN_ERROR(mkdir(parentDir(path)));

src/olympic/turbine/include/turbine/turbine.hpp

@@ -112,4 +112,7 @@ void setShutdownHandler(Context &ctx, ShutdownHandler handler) noexcept;
 // sleep time is a minimum of ~16 milliseconds.
 void setUpdateHandler(Context &ctx, UpdateHandler) noexcept;
 
+[[nodiscard]]
+float scale(Context const &ctx) noexcept;
+
 }

src/olympic/turbine/src/glfw/context.hpp

@@ -32,6 +32,7 @@ class Context {
 		uint64_t draws = 0;
 		bool running{};
 		ShutdownHandler shutdownHandler{};
+		float scale{};
 
 		Context() noexcept = default;
 

src/olympic/turbine/src/glfw/turbine.cpp

@@ -339,6 +339,7 @@ ox::Result<ox::UPtr<Context>> init(
 	setMandatoryRefreshPeriod(*ctx, ticksMs(*ctx) + config::MandatoryRefreshPeriod);
 	// init GLFW context
 	glfwInit();
+	glfwWindowHint(GLFW_SCALE_TO_MONITOR, GLFW_TRUE);
 	glfwSetErrorCallback(handleGlfwError);
 	glfwWindowHint(GLFW_CONTEXT_VERSION_MAJOR, 3);
 	glfwWindowHint(GLFW_CONTEXT_VERSION_MINOR, 3);
@@ -372,7 +373,13 @@ ox::Result<ox::UPtr<Context>> init(
 	ImGui_ImplGlfw_InitForOpenGL(ctx->window, true);
 	ImGui_ImplOpenGL3_Init();
 	io.IniFilename = nullptr;
+	float xscale{}, yscale{};
+	glfwGetWindowContentScale(ctx->window, &xscale, &yscale);
+	ctx->scale = ox::max(xscale, yscale);
+	io.DisplayFramebufferScale = ImVec2(ctx->scale, ctx->scale);
 	themeImgui();
+	auto &style = ImGui::GetStyle();
+	style.ScaleAllSizes(ctx->scale);
 #endif
 	return ctx;
 }
@@ -471,4 +478,8 @@ KeyEventHandler keyEventHandler(Context const &ctx) noexcept {
 	return ctx.keyEventHandler;
 }
 
+float scale(Context const &ctx) noexcept {
+	return ctx.scale;
+}
+
 }