[nostalgia/studio] Set version to d2025.07.0

.gitattributes

@@ -0,0 +1 @@
+sample_project text eol=lf

.gitignore

@@ -6,12 +6,14 @@
 .mypy_cache
 .stfolder
 .stignore
+.vs
 util/scripts/__pycache__
 pyenv
 CMakeLists.txt.user
 ROM.oxfs
 Session.vim
 build
+cmake-build-*
 compile_commands.json
 dist
 graph_info.json

Makefile

@@ -15,7 +15,16 @@ PROJECT_PLAYER=./build/${BC_VAR_CURRENT_BUILD}/bin/${BC_VAR_PROJECT_NAME_CAP}
 
 .PHONY: pkg-gba
 pkg-gba: build
-	${BC_CMD_ENVRUN} ${BC_PY3} ./util/scripts/pkg-gba.py sample_project ${BC_VAR_PROJECT_NAME}
+	${BC_CMD_ENVRUN} ${BC_PY3} ./util/scripts/pkg-gba.py sample_project ${BC_VAR_PROJECT_NAME_CAP}
+
+.PHONY: pkg-mac
+pkg-mac: install
+	${BC_CMD_ENVRUN} ${BC_PY3} ./util/scripts/pkg-dmg.py NostalgiaStudio
+
+.PHONY: generate-studio-rsrc
+generate-studio-rsrc:
+	${BC_CMD_ENVRUN} ${BC_PY3} ./util/scripts/file-to-cpp.py --rsrc src/olympic/studio/applib/src/rsrc.json
+	${BC_CMD_ENVRUN} ${BC_PY3} ./util/scripts/file-to-cpp.py --rsrc src/nostalgia/studio/rsrc.json
 
 .PHONY: build-player
 build-player:
@@ -28,10 +37,10 @@ run-studio: build
 	${PROJECT_STUDIO}
 .PHONY: gba-run
 gba-run: pkg-gba
-	${MGBA} ${BC_VAR_PROJECT_NAME}.gba
+	${MGBA} ${BC_VAR_PROJECT_NAME_CAP}.gba
 .PHONY: debug
 debug: build
-	${BC_CMD_HOST_DEBUGGER} ./build/${BC_VAR_CURRENT_BUILD}/bin/${BC_VAR_PROJECT_NAME} sample_project
+	${BC_CMD_HOST_DEBUGGER} ${PROJECT_PLAYER} sample_project
 .PHONY: debug-studio
 debug-studio: build
 	${BC_CMD_HOST_DEBUGGER} ${PROJECT_STUDIO}
@@ -43,3 +52,25 @@ configure-gba:
 .PHONY: configure-gba-debug
 configure-gba-debug:
 	${BC_CMD_SETUP_BUILD} --toolchain=deps/gbabuildcore/cmake/modules/GBA.cmake --target=gba --current_build=0 --build_type=debug --build_root=${BC_VAR_BUILD_PATH}
+
+.PHONY: loc
+loc:
+	${BC_PY3} util/scripts/loc.py \
+		--search-dirs \
+			src \
+			deps/ox/src \
+			deps/buildcore \
+			deps/gbabuildcore \
+			deps/glutils \
+			deps/teagba \
+		--include-exts \
+			.cpp \
+			.hpp \
+			.py \
+			.s \
+			.cmake \
+		--exclude-paths \
+			deps/teagba/src/gba_crt0.s \
+			src/olympic/studio/applib/src/font.cpp \
+			src/olympic/studio/applib/src/font.hpp \
+			src/nostalgia/studio/icondata.cpp

deps/buildcore/scripts/pybb.py

@@ -11,6 +11,7 @@
 # "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
@@ -57,7 +58,11 @@ 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]
+        args = ['cmake', '--build', path, f'-j{multiprocessing.cpu_count()}']
+        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/glutils/include/glutils/glutils.hpp

@@ -89,7 +89,7 @@ struct GLObject: public Base {
 		return id;
 	}
 
-	constexpr operator const GLuint&() const noexcept {
+	constexpr operator GLuint const&() const noexcept {
 		return id;
 	}
 
@@ -135,7 +135,7 @@ struct FrameBuffer {
 		return fbo.id;
 	}
 
-	constexpr operator const GLuint&() const noexcept {
+	constexpr operator GLuint const&() const noexcept {
 		return fbo.id;
 	}
 
@@ -158,14 +158,14 @@ struct FrameBuffer {
 
 class FrameBufferBind {
 	private:
-		static const FrameBuffer *s_activeFb;
-		const FrameBuffer *m_restoreFb = nullptr;
+		static FrameBuffer const *s_activeFb;
+		FrameBuffer const *m_restoreFb = nullptr;
 	public:
-		explicit FrameBufferBind(const FrameBuffer &fb) noexcept;
+		explicit FrameBufferBind(FrameBuffer const &fb) noexcept;
 		~FrameBufferBind() noexcept;
 };
 
-void bind(const FrameBuffer &fb) noexcept;
+void bind(FrameBuffer const &fb) noexcept;
 
 struct ShaderVarSet {
 	GLsizei len{};
@@ -176,7 +176,7 @@ struct ProgramSource {
 	ox::Vector<glutils::ShaderVarSet> const shaderParams;
 	GLsizei const rowLen = [this] {
 		GLsizei len{};
-		for (auto const&v : shaderParams) {
+		for (auto const &v : shaderParams) {
 			len += v.len;
 		}
 		return len;
@@ -187,23 +187,23 @@ struct ProgramSource {
 	ox::String const geomShader{};
 };
 
-ox::Result<GLProgram> buildShaderProgram(ProgramSource const&src) noexcept;
+ox::Result<GLProgram> buildShaderProgram(ProgramSource const &src) noexcept;
 
 ox::Result<GLProgram> buildShaderProgram(
-		ox::CStringView const&vert,
-		ox::CStringView const&frag,
-		ox::CStringView const&geo = "") noexcept;
+		ox::CStringView const &vert,
+		ox::CStringView const &frag,
+		ox::CStringView const &geo = "") noexcept;
 
 void setupShaderParams(
-		GLProgram const&shader,
-		ox::Vector<ShaderVarSet> const&vars,
+		GLProgram const &shader,
+		ox::Vector<ShaderVarSet> const &vars,
 		GLsizei vertexRowLen) noexcept;
 
-void setupShaderParams(GLProgram const&shader, ox::Vector<ShaderVarSet> const&vars) noexcept;
+void setupShaderParams(GLProgram const &shader, ox::Vector<ShaderVarSet> const &vars) noexcept;
 
-glutils::GLVertexArray generateVertexArrayObject() noexcept;
+GLVertexArray generateVertexArrayObject() noexcept;
 
-glutils::GLBuffer generateBuffer() noexcept;
+GLBuffer generateBuffer() noexcept;
 
 [[nodiscard]]
 FrameBuffer generateFrameBuffer(int width, int height) noexcept;
@@ -215,20 +215,20 @@ void resizeFrameBuffer(FrameBuffer &fb, int width, int height) noexcept;
  */
 void resizeInitFrameBuffer(FrameBuffer &fb, int width, int height) noexcept;
 
-void resizeInitFrameBuffer(FrameBuffer &fb, ox::Size const&sz) noexcept;
+void resizeInitFrameBuffer(FrameBuffer &fb, ox::Size const &sz) noexcept;
 
 struct BufferSet {
-	glutils::GLVertexArray vao;
-	glutils::GLBuffer vbo;
-	glutils::GLBuffer ebo;
-	glutils::GLTexture tex;
+	GLVertexArray vao;
+	GLBuffer vbo;
+	GLBuffer ebo;
+	GLTexture tex;
 	ox::Vector<float> vertices;
 	ox::Vector<GLuint> elements;
 };
 
-void sendVbo(BufferSet const&bs) noexcept;
+void sendVbo(BufferSet const &bs) noexcept;
 
-void sendEbo(BufferSet const&bs) noexcept;
+void sendEbo(BufferSet const &bs) noexcept;
 
 void clearScreen() noexcept;
 

deps/glutils/src/glutils.cpp

@@ -46,9 +46,9 @@ template struct GLObject<deleteVertexArray>;
 template struct GLObject<deleteProgram>;
 template struct GLObject<deleteShader>;
 
-const FrameBuffer *FrameBufferBind::s_activeFb = nullptr;
+FrameBuffer const *FrameBufferBind::s_activeFb = nullptr;
 
-FrameBufferBind::FrameBufferBind(const FrameBuffer &fb) noexcept: m_restoreFb(s_activeFb) {
+FrameBufferBind::FrameBufferBind(FrameBuffer const &fb) noexcept: m_restoreFb(s_activeFb) {
 	s_activeFb = &fb;
 	glBindFramebuffer(GL_FRAMEBUFFER, fb);
 	glViewport(0, 0, fb.width, fb.height);
@@ -64,15 +64,15 @@ FrameBufferBind::~FrameBufferBind() noexcept {
 	}
 }
 
-void bind(const FrameBuffer &fb) noexcept {
+void bind(FrameBuffer const &fb) noexcept {
 	glBindFramebuffer(GL_FRAMEBUFFER, fb);
 	glViewport(0, 0, fb.width, fb.height);
 }
 
 
 static ox::Result<GLShader> buildShader(
-		GLuint shaderType,
-		const GLchar *src,
+		GLuint const shaderType,
+		GLchar const *src,
 		ox::StringViewCR shaderName) noexcept {
 	GLShader shader(glCreateShader(shaderType));
 	glShaderSource(shader, 1, &src, nullptr);
@@ -88,7 +88,7 @@ static ox::Result<GLShader> buildShader(
 	return shader;
 }
 
-ox::Result<GLProgram> buildShaderProgram(ProgramSource const&src) noexcept {
+ox::Result<GLProgram> buildShaderProgram(ProgramSource const &src) noexcept {
 	OX_REQUIRE_M(program, buildShaderProgram(
 			src.vertShader,
 			src.fragShader,
@@ -98,11 +98,11 @@ ox::Result<GLProgram> buildShaderProgram(ProgramSource const&src) noexcept {
 }
 
 void setupShaderParams(
-		GLProgram const&shader,
-		ox::Vector<ShaderVarSet> const&vars,
+		GLProgram const &shader,
+		ox::Vector<ShaderVarSet> const &vars,
 		GLsizei vertexRowLen) noexcept {
 	// setup vars
-	for (size_t lenWritten = 0; auto const&v : vars) {
+	for (size_t lenWritten = 0; auto const &v : vars) {
 		auto const attr = static_cast<GLuint>(glGetAttribLocation(shader, v.name.c_str()));
 		glEnableVertexAttribArray(attr);
 		glVertexAttribPointer(
@@ -113,19 +113,19 @@ void setupShaderParams(
 	}
 }
 
-void setupShaderParams(GLProgram const&shader, ox::Vector<ShaderVarSet> const&vars) noexcept {
+void setupShaderParams(GLProgram const &shader, ox::Vector<ShaderVarSet> const &vars) noexcept {
 	// get row len
 	GLsizei vertexRowLen{};
-	for (auto const&v : vars) {
+	for (auto const &v : vars) {
 		vertexRowLen += v.len;
 	}
 	setupShaderParams(shader, vars, vertexRowLen);
 }
 
 ox::Result<GLProgram> buildShaderProgram(
-		ox::CStringView const&vert,
-		ox::CStringView const&frag,
-		ox::CStringView const&geo) noexcept {
+		ox::CStringView const &vert,
+		ox::CStringView const &frag,
+		ox::CStringView const &geo) noexcept {
 	GLProgram prgm(glCreateProgram());
 	OX_REQUIRE(vs, buildShader(GL_VERTEX_SHADER, vert.c_str(), "vshad"));
 	glAttachShader(prgm, vs);
@@ -162,16 +162,30 @@ FrameBuffer generateFrameBuffer(int width, int height) noexcept {
 	// color texture
 	glGenTextures(1, &fb.color.id);
 	glBindTexture(GL_TEXTURE_2D, fb.color);
-	glTexImage2D(GL_TEXTURE_2D, 0, GL_RGB, width, height, 0, GL_RGB, GL_UNSIGNED_BYTE, nullptr);
+	glTexImage2D(
+		GL_TEXTURE_2D,
+		0,
+		GL_RGB,
+		width,
+		height,
+		0,
+		GL_RGB,
+		GL_UNSIGNED_BYTE,
+		nullptr);
 	glGenerateMipmap(GL_TEXTURE_2D);
 	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR_MIPMAP_LINEAR);
 	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR_MIPMAP_LINEAR);
-	glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, fb.color, 0);
+	glFramebufferTexture2D(
+		GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, fb.color, 0);
 	// depth texture
 	glGenRenderbuffers(1, &fb.depth.id);
 	glBindRenderbuffer(GL_RENDERBUFFER, fb.depth);
 	glRenderbufferStorage(GL_RENDERBUFFER, GL_DEPTH24_STENCIL8, width, height);
-	glFramebufferRenderbuffer(GL_FRAMEBUFFER, GL_DEPTH_STENCIL_ATTACHMENT, GL_RENDERBUFFER, fb.depth);
+	glFramebufferRenderbuffer(
+		GL_FRAMEBUFFER,
+		GL_DEPTH_STENCIL_ATTACHMENT,
+		GL_RENDERBUFFER,
+		fb.depth);
 	// verify FBO
 	oxAssert(glCheckFramebufferStatus(GL_FRAMEBUFFER) == GL_FRAMEBUFFER_COMPLETE, "Frame Buffer is incomplete");
 	// restore primary FB
@@ -189,7 +203,16 @@ void resizeFrameBuffer(FrameBuffer &fb, int width, int height) noexcept {
 	glBindFramebuffer(GL_FRAMEBUFFER, fb);
 	// color texture
 	glBindTexture(GL_TEXTURE_2D, fb.color);
-	glTexImage2D(GL_TEXTURE_2D, 0, GL_RGB, width, height, 0, GL_RGB, GL_UNSIGNED_BYTE, nullptr);
+	glTexImage2D(
+		GL_TEXTURE_2D,
+		0,
+		GL_RGB,
+		width,
+		height,
+		0,
+		GL_RGB,
+		GL_UNSIGNED_BYTE,
+		nullptr);
 	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
 	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
 	// depth texture
@@ -201,7 +224,7 @@ void resizeFrameBuffer(FrameBuffer &fb, int width, int height) noexcept {
 	glBindRenderbuffer(GL_RENDERBUFFER, 0);
 }
 
-void resizeInitFrameBuffer(FrameBuffer &fb, int width, int height) noexcept {
+void resizeInitFrameBuffer(FrameBuffer &fb, int const width, int const height) noexcept {
 	if (!fb) {
 		fb = generateFrameBuffer(width, height);
 		return;
@@ -209,18 +232,18 @@ void resizeInitFrameBuffer(FrameBuffer &fb, int width, int height) noexcept {
 	resizeFrameBuffer(fb, width, height);
 }
 
-void resizeInitFrameBuffer(FrameBuffer &fb, ox::Size const&sz) noexcept {
+void resizeInitFrameBuffer(FrameBuffer &fb, ox::Size const &sz) noexcept {
 	resizeInitFrameBuffer(fb, sz.width, sz.height);
 }
 
-void sendVbo(BufferSet const&bs) noexcept {
-	const auto bufferSize = static_cast<GLsizeiptr>(sizeof(decltype(bs.vertices)::value_type) * bs.vertices.size());
+void sendVbo(BufferSet const &bs) noexcept {
+	auto const bufferSize = static_cast<GLsizeiptr>(sizeof(decltype(bs.vertices)::value_type) * bs.vertices.size());
 	glBindBuffer(GL_ARRAY_BUFFER, bs.vbo);
 	glBufferData(GL_ARRAY_BUFFER, bufferSize, bs.vertices.data(), GL_DYNAMIC_DRAW);
 }
 
-void sendEbo(BufferSet const&bs) noexcept {
-	const auto bufferSize = static_cast<GLsizeiptr>(sizeof(decltype(bs.elements)::value_type) * bs.elements.size());
+void sendEbo(BufferSet const &bs) noexcept {
+	auto const bufferSize = static_cast<GLsizeiptr>(sizeof(decltype(bs.elements)::value_type) * bs.elements.size());
 	glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, bs.ebo);
 	glBufferData(GL_ELEMENT_ARRAY_BUFFER, bufferSize, bs.elements.data(), GL_STATIC_DRAW);
 }

deps/ox/src/ox/clargs/clargs.cpp

@@ -15,21 +15,21 @@ ClArgs::ClArgs(int argc, const char **args) noexcept: ClArgs({args, static_cast<
 
 ClArgs::ClArgs(ox::SpanView<const char*> args) noexcept {
 	for (auto i = 0u; i < args.size(); ++i) {
-		auto arg = StringView(args[i]);
+		auto arg = StringView{args[i]};
 		if (arg[0] == '-') {
-			while (arg[0] == '-' && arg.len()) {
+			while (arg[0] == '-' && arg.size()) {
 				arg = substr(arg, 1);
 			}
 			m_bools[arg] = true;
 			// parse additional arguments
 			if (i < args.size() && args[i + 1]) {
-				auto val = String(args[i + 1]);
-				if (val.len() && val[i] != '-') {
+				auto const val = StringView{args[i + 1]};
+				if (val.size() && val[0] != '-') {
 					if (val == "false") {
 						m_bools[arg] = false;
 					}
 					m_strings[arg] = val;
-					if (auto r = ox::atoi(val.c_str()); r.error == 0) {
+					if (auto r = ox::strToInt(val); r.error == 0) {
 						m_ints[arg] = r.value;
 					}
 					++i;
@@ -40,17 +40,17 @@ ClArgs::ClArgs(ox::SpanView<const char*> args) noexcept {
 }
 
 bool ClArgs::getBool(ox::StringViewCR arg, bool defaultValue) const noexcept {
-	auto [value, err] = m_ints.at(arg);
+	auto const [value, err] = m_ints.at(arg);
 	return !err ? *value : defaultValue;
 }
 
 String ClArgs::getString(ox::StringViewCR arg, ox::StringView defaultValue) const noexcept {
-	auto [value, err] = m_strings.at(arg);
+	auto const [value, err] = m_strings.at(arg);
 	return !err ? ox::String(*value) : ox::String(defaultValue);
 }
 
 int ClArgs::getInt(ox::StringViewCR arg, int defaultValue) const noexcept {
-	auto [value, err] = m_ints.at(arg);
+	auto const [value, err] = m_ints.at(arg);
 	return !err ? *value : defaultValue;
 }
 

deps/ox/src/ox/claw/read.cpp

@@ -81,7 +81,7 @@ Result<ClawHeader> readClawHeader(ox::BufferView buff) noexcept {
 		return ox::Error(4, "Claw format does not match any supported format/version combo");
 	}
 	hdr.typeName = typeName;
-	std::ignore = ox::atoi(versionStr).copyTo(hdr.typeVersion);
+	std::ignore = ox::strToInt(versionStr).copyTo(hdr.typeVersion);
 	hdr.data = buffRaw;
 	hdr.dataSize = buffLen;
 	return hdr;

deps/ox/src/ox/claw/test/tests.cpp

@@ -109,7 +109,7 @@ static std::map<ox::StringView, ox::Error(*)()> tests = {
 			"ClawHeaderReader",
 			[] {
 				constexpr auto hdr = ox::StringLiteral("O1;com.drinkingtea.ox.claw.test.Header;2;");
-				auto [ch, err] = ox::readClawHeader({hdr.c_str(), hdr.len() + 1});
+				auto [ch, err] = ox::readClawHeader({hdr.c_str(), hdr.size() + 1});
 				oxAssert(err, "Error parsing header");
 				oxAssert(ch.fmt == ox::ClawFormat::Organic, "Format wrong");
 				oxAssert(ch.typeName == "com.drinkingtea.ox.claw.test.Header", "Type name wrong");
@@ -121,7 +121,7 @@ static std::map<ox::StringView, ox::Error(*)()> tests = {
 			"ClawHeaderReader2",
 			[] {
 				constexpr auto hdr = ox::StringLiteral("M2;com.drinkingtea.ox.claw.test.Header2;3;");
-				auto [ch, err] = ox::readClawHeader({hdr.c_str(), hdr.len() + 1});
+				auto [ch, err] = ox::readClawHeader({hdr.c_str(), hdr.size() + 1});
 				oxAssert(err, "Error parsing header");
 				oxAssert(ch.fmt == ox::ClawFormat::Metal, "Format wrong");
 				oxAssert(ch.typeName == "com.drinkingtea.ox.claw.test.Header2", "Type name wrong");
@@ -134,7 +134,7 @@ static std::map<ox::StringView, ox::Error(*)()> tests = {
 			[] {
 				constexpr auto hdr = ox::StringLiteral("M2;com.drinkingtea.ox.claw.test.Header2;3;awefawf");
 				constexpr auto expected = ox::StringLiteral("com.drinkingtea.ox.claw.test.Header2;3");
-				OX_REQUIRE(actual, ox::readClawTypeId({hdr.data(), hdr.len() + 1}));
+				OX_REQUIRE(actual, ox::readClawTypeId({hdr.data(), hdr.size() + 1}));
 				oxExpect(actual, expected);
 				return ox::Error{};
 			}

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

@@ -39,7 +39,7 @@ struct TypeInfoCatcher {
 	}
 
 	constexpr Error field(...) noexcept {
-		return ox::Error(0);
+		return {};
 	}
 
 	static constexpr auto opType() {

deps/ox/src/ox/event/signal.hpp

@@ -218,7 +218,7 @@ Error Signal<Args...>::emitCheckError(Args... args) const noexcept {
 		for (auto &f : m_slots) {
 			f->call(args...);
 		}
-		return ox::Error(0);
+		return {};
 	} catch (const ox::Exception &ex) {
 		return ox::Error(ex.errCode, ex.msg, ex.src);
 	}
@@ -410,7 +410,7 @@ Error Signal<Error(Args...)>::emitCheckError(Args... args) const noexcept {
 	for (auto &f : m_slots) {
 		OX_RETURN_ERROR(f->call(ox::forward<Args>(args)...));
 	}
-	return ox::Error(0);
+	return {};
 }
 
 }

deps/ox/src/ox/fs/filestore/filestoretemplate.hpp

@@ -230,7 +230,7 @@ template<typename size_t>
 Error FileStoreTemplate<size_t>::incLinks(uint64_t id) {
 	OX_REQUIRE_M(item, find(static_cast<size_t>(id)).validate());
 	++item->links;
-	return ox::Error(0);
+	return {};
 }
 
 template<typename size_t>
@@ -240,7 +240,7 @@ Error FileStoreTemplate<size_t>::decLinks(uint64_t id) {
 	if (item->links == 0) {
 		OX_RETURN_ERROR(remove(item));
 	}
-	return ox::Error(0);
+	return {};
 }
 
 template<typename size_t>
@@ -298,7 +298,7 @@ Error FileStoreTemplate<size_t>::write(uint64_t id64, const void *data, FsSize_t
 						        dest->id.get(), dest.offset(), destData.size());
 						fsData->rootNode = dest.offset();
 						oxTracef("ox.fs.FileStoreTemplate.write", "Root inode: {}", dest->id.get());
-						return ox::Error(0);
+						return {};
 					}
 				} else {
 					oxTrace("ox.fs.FileStoreTemplate.write.fail", "Could not place item due to absence of FileStore header.");
@@ -427,20 +427,20 @@ Error FileStoreTemplate<size_t>::resize() {
 	oxTracef("ox.fs.FileStoreTemplate.resize", "resize to: {}", newSize);
 	OX_RETURN_ERROR(m_buffer->setSize(newSize));
 	oxTracef("ox.fs.FileStoreTemplate.resize", "resized to: {}", m_buffer->size());
-	return ox::Error(0);
+	return {};
 }
 
 template<typename size_t>
 Error FileStoreTemplate<size_t>::resize(std::size_t size, void *newBuff) {
 	if (m_buffer->size() > size) {
-		return ox::Error(1);
+		return ox::Error{1, "new buffer is too small for existing data"};
 	}
 	m_buffSize = static_cast<size_t>(size);
 	if (newBuff) {
-		m_buffer = reinterpret_cast<Buffer*>(newBuff);
+		m_buffer = static_cast<Buffer*>(newBuff);
 		OX_RETURN_ERROR(m_buffer->setSize(static_cast<size_t>(size)));
 	}
-	return ox::Error(0);
+	return {};
 }
 
 template<typename size_t>
@@ -479,7 +479,7 @@ Error FileStoreTemplate<size_t>::walk(Error(*cb)(uint8_t, uint64_t, uint64_t)) {
 	for (auto i = m_buffer->iterator(); i.valid(); i.next()) {
 		OX_RETURN_ERROR(cb(i->fileType, i.ptr().offset(), i.ptr().end()));
 	}
-	return ox::Error(0);
+	return {};
 }
 
 template<typename size_t>
@@ -503,7 +503,7 @@ Error FileStoreTemplate<size_t>::compact() {
 	return m_buffer->compact([this, &isFirstItem](uint64_t oldAddr, ItemPtr item) -> Error {
 		if (isFirstItem) {
 			isFirstItem = false;
-			return ox::Error(0);
+			return {};
 		}
 		if (!item.valid()) {
 			return ox::Error(1);
@@ -524,7 +524,7 @@ Error FileStoreTemplate<size_t>::compact() {
 				parent->right = item;
 			}
 		}
-		return ox::Error(0);
+		return {};
 	});
 }
 
@@ -552,7 +552,7 @@ Error FileStoreTemplate<size_t>::placeItem(ItemPtr item) {
 		item->left = root->left;
 		item->right = root->right;
 		oxTracef("ox.fs.FileStoreTemplate.placeItem", "Overwrote Root Item: {}", item->id.get());
-		return ox::Error(0);
+		return {};
 	} else {
 		return placeItem(root, item);
 	}
@@ -573,7 +573,7 @@ Error FileStoreTemplate<size_t>::placeItem(ItemPtr root, ItemPtr item, int depth
 				item->right = right->right;
 			}
 			oxTracef("ox.fs.FileStoreTemplate.placeItem", "Placed Item: {}", item->id.get());
-			return ox::Error(0);
+			return {};
 		} else {
 			return placeItem(right, item, depth + 1);
 		}
@@ -586,7 +586,7 @@ Error FileStoreTemplate<size_t>::placeItem(ItemPtr root, ItemPtr item, int depth
 				item->right = left->right;
 			}
 			oxTracef("ox.fs.FileStoreTemplate.placeItem", "Placed Item: {}", item->id.get());
-			return ox::Error(0);
+			return {};
 		} else {
 			return placeItem(left, item, depth + 1);
 		}
@@ -624,7 +624,7 @@ Error FileStoreTemplate<size_t>::unplaceItem(ItemPtr item) {
 		} else {
 			fsData->rootNode = 0;
 		}
-		return ox::Error(0);
+		return {};
 	} else {
 		return unplaceItem(root, item);
 	}
@@ -661,7 +661,7 @@ Error FileStoreTemplate<size_t>::unplaceItem(ItemPtr root, ItemPtr item, int dep
 	if (item->left) {
 		OX_RETURN_ERROR(placeItem(m_buffer->ptr(item->left)));
 	}
-	return ox::Error(0);
+	return {};
 }
 
 template<typename size_t>
@@ -669,7 +669,7 @@ Error FileStoreTemplate<size_t>::remove(ItemPtr item) {
 	if (item.valid()) {
 		OX_RETURN_ERROR(unplaceItem(item));
 		OX_RETURN_ERROR(m_buffer->free(item));
-		return ox::Error(0);
+		return {};
 	}
 	return ox::Error(1);
 }

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

@@ -52,7 +52,7 @@ struct OX_PACKED DirectoryEntry {
 			if (d.valid()) {
 				d->inode = inode;
 				auto const maxStrSz = bufferSize - 1 - sizeof(*this);
-				ox::strncpy(d->name, name.data(), ox::min(maxStrSz, name.len()));
+				ox::strncpy(d->name, name.data(), ox::min(maxStrSz, name.size()));
 				return {};
 			}
 			return ox::Error(1);
@@ -219,7 +219,7 @@ Error Directory<FileStore, InodeId_t>::write(PathIterator path, uint64_t inode64
 			oxTrace("ox.fs.Directory.write.fail", "Could not read existing version of Directory");
 			return ox::Error(1, "Could not read existing version of Directory");
 		}
-		const auto pathSize = name.len() + 1;
+		const auto pathSize = name.size() + 1;
 		const auto entryDataSize = DirectoryEntry<InodeId_t>::DirectoryEntryData::spaceNeeded(pathSize);
 		const auto newSize = oldStat.size + Buffer::spaceNeeded(entryDataSize);
 		auto cpy = ox_malloca(newSize, Buffer, *old, oldStat.size);

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

@@ -31,10 +31,10 @@ FileAddress::FileAddress(uint64_t inode) noexcept {
 FileAddress::FileAddress(ox::StringViewCR path) noexcept {
 	auto pathSize = path.bytes();
 	m_data.path = new char[pathSize + 1];
+	OX_ALLOW_UNSAFE_BUFFERS_BEGIN
 	memcpy(m_data.path, path.data(), pathSize);
-OX_CLANG_NOWARN_BEGIN(-Wunsafe-buffer-usage)
 	m_data.path[pathSize] = 0;
-OX_CLANG_NOWARN_END
+	OX_ALLOW_UNSAFE_BUFFERS_END
 	m_type = FileAddressType::Path;
 }
 
@@ -48,9 +48,11 @@ FileAddress &FileAddress::operator=(const FileAddress &other) noexcept {
 		case FileAddressType::Path:
 		{
 			if (other.m_data.path) {
+				OX_ALLOW_UNSAFE_BUFFERS_BEGIN
 				auto strSize = ox::strlen(other.m_data.path) + 1;
 				m_data.path = new char[strSize];
 				ox::memcpy(m_data.path, other.m_data.path, strSize);
+				OX_ALLOW_UNSAFE_BUFFERS_END
 			} else {
 				m_data.constPath = "";
 				m_type = FileAddressType::ConstPath;

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

@@ -24,9 +24,6 @@ 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/fs/filesystem/filesystem.hpp

@@ -20,7 +20,7 @@
 namespace ox {
 
 namespace detail {
-static inline void fsBuffFree(char *buff) noexcept {
+inline void fsBuffFree(char *buff) noexcept {
 	safeDelete(buff);
 }
 }
@@ -49,11 +49,11 @@ class FileSystem {
 
 		Result<Buffer> read(StringViewCR path) noexcept;
 
-		inline Error read(StringViewCR path, void *buffer, std::size_t buffSize) noexcept {
+		Error read(StringViewCR path, void *buffer, std::size_t buffSize) noexcept {
 			return readFilePath(path, buffer, buffSize);
 		}
 
-		inline Error read(uint64_t inode, void *buffer, std::size_t buffSize) noexcept {
+		Error read(uint64_t inode, void *buffer, std::size_t buffSize) noexcept {
 			return readFileInode(inode, buffer, buffSize);
 		}
 
@@ -69,8 +69,7 @@ class FileSystem {
 		 * @param path
 		 * @param readStart
 		 * @param readSize
-		 * @param buffer
-		 * @param size
+		 * @param buff
 		 * @return error or number of bytes read
 		 */
 		Result<size_t> read(
@@ -102,36 +101,36 @@ class FileSystem {
 
 		Error write(const FileAddress &addr, const void *buffer, uint64_t size, FileType fileType = FileType::NormalFile) noexcept;
 
-		inline Error write(StringViewCR path, const void *buffer, uint64_t size, FileType fileType) noexcept {
+		Error write(StringViewCR path, const void *buffer, uint64_t size, FileType fileType) noexcept {
 			return writeFilePath(path, buffer, size, fileType);
 		}
 
-		inline Error write(uint64_t inode, const void *buffer, uint64_t size, FileType fileType) noexcept {
+		Error write(uint64_t inode, const void *buffer, uint64_t size, FileType fileType) noexcept {
 			return writeFileInode(inode, buffer, size, fileType);
 		}
 
-		inline Result<FileStat> stat(uint64_t inode) const noexcept {
+		Result<FileStat> stat(uint64_t inode) const noexcept {
 			return statInode(inode);
 		}
 
-		inline Result<FileStat> stat(StringViewCR path) const noexcept {
+		Result<FileStat> stat(StringViewCR path) const noexcept {
 			return statPath(path);
 		}
 
 		Result<FileStat> stat(const FileAddress &addr) const noexcept;
 
 		[[nodiscard]]
-		inline bool exists(uint64_t inode) const noexcept {
+		bool exists(uint64_t inode) const noexcept {
 			return statInode(inode).ok();
 		}
 
 		[[nodiscard]]
-		inline bool exists(ox::StringView path) const noexcept {
+		bool exists(ox::StringView path) const noexcept {
 			return statPath(path).ok();
 		}
 
 		[[nodiscard]]
-		inline bool exists(FileAddress const&addr) const noexcept {
+		bool exists(FileAddress const&addr) const noexcept {
 			return stat(addr).ok();
 		}
 
@@ -178,11 +177,11 @@ class MemFS: public FileSystem {
 	public:
 		Result<const char*> directAccess(const FileAddress &addr) const noexcept;
 
-		inline Result<const char*> directAccess(StringViewCR path) const noexcept {
+		Result<const char*> directAccess(StringViewCR path) const noexcept {
 			return directAccessPath(path);
 		}
 
-		inline Result<const char*> directAccess(uint64_t inode) const noexcept {
+		Result<const char*> directAccess(uint64_t inode) const noexcept {
 			return directAccessInode(inode);
 		}
 
@@ -330,7 +329,7 @@ Error FileSystemTemplate<FileStore, Directory>::format(void *buff, uint64_t buff
 		return ox::Error(1);
 	}
 
-	return ox::Error(0);
+	return {};
 }
 
 template<typename FileStore, typename Directory>
@@ -347,7 +346,7 @@ Error FileSystemTemplate<FileStore, Directory>::move(StringViewCR src, StringVie
 	OX_REQUIRE_M(inode, rootDir.find(src));
 	OX_RETURN_ERROR(rootDir.write(dest, inode));
 	OX_RETURN_ERROR(rootDir.remove(src));
-	return ox::Error(0);
+	return {};
 }
 
 template<typename FileStore, typename Directory>
@@ -408,7 +407,7 @@ Error FileSystemTemplate<FileStore, Directory>::removePath(StringViewCR path, bo
 		oxTrace("FileSystemTemplate.remove.fail", "Tried to remove directory without recursive setting.");
 		return ox::Error(1);
 	}
-	return ox::Error(0);
+	return {};
 }
 
 template<typename FileStore, typename Directory>
@@ -425,7 +424,7 @@ Result<Vector<String>> FileSystemTemplate<FileStore, Directory>::ls(StringViewCR
 	Vector<String> out;
 	OX_RETURN_ERROR(ls(path, [&out](StringViewCR name, typename FileStore::InodeId_t) {
 		out.emplace_back(name);
-		return ox::Error(0);
+		return ox::Error{};
 	}));
 	return out;
 }
@@ -469,7 +468,7 @@ Error FileSystemTemplate<FileStore, Directory>::writeFilePath(
 
 template<typename FileStore, typename Directory>
 Error FileSystemTemplate<FileStore, Directory>::writeFileInode(uint64_t inode, const void *buffer, uint64_t size, FileType fileType) noexcept {
-	oxTrace("ox.fs.FileSystemTemplate.writeFileInode", ox::itoa(inode));
+	oxTrace("ox.fs.FileSystemTemplate.writeFileInode", ox::intToStr(inode));
 	return m_fs.write(inode, buffer, static_cast<size_t>(size), static_cast<uint8_t>(fileType));
 }
 

deps/ox/src/ox/fs/filesystem/passthroughfs.cpp

@@ -60,7 +60,7 @@ Error PassThroughFS::move(StringViewCR src, StringViewCR dest) noexcept {
 	if (ec.value()) {
 		return ox::Error(1);
 	}
-	return ox::Error(0);
+	return {};
 }
 
 Result<Vector<String>> PassThroughFS::ls(StringViewCR dir) const noexcept {
@@ -148,7 +148,7 @@ Error PassThroughFS::readFilePath(StringViewCR path, void *buffer, std::size_t b
 		oxTracef("ox.fs.PassThroughFS.read.error", "Read of {} failed: {}", path, f.what());
 		return ox::Error(2);
 	}
-	return ox::Error(0);
+	return {};
 }
 
 Error PassThroughFS::readFileInode(uint64_t, void*, std::size_t) noexcept {
@@ -197,7 +197,7 @@ Error PassThroughFS::writeFilePath(StringViewCR path, const void *buffer, uint64
 		oxTracef("ox.fs.PassThroughFS.read.error", "Write of {} failed: {}", path, f.what());
 		return ox::Error(1);
 	}
-	return ox::Error(0);
+	return {};
 }
 
 Error PassThroughFS::writeFileInode(uint64_t, const void*, uint64_t, FileType) noexcept {
@@ -206,7 +206,7 @@ Error PassThroughFS::writeFileInode(uint64_t, const void*, uint64_t, FileType) n
 }
 
 std::string_view PassThroughFS::stripSlash(StringView path) noexcept {
-	for (auto i = 0u; i < path.len() && path[0] == '/'; i++) {
+	for (auto i = 0u; i < path.size() && path[0] == '/'; i++) {
 		path = substr(path, 1);
 	}
 	return {path.data(), path.bytes()};

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

@@ -99,7 +99,7 @@ Error PassThroughFS::ls(StringViewCR dir, F cb) const noexcept {
 	for (auto &p : di) {
 		OX_RETURN_ERROR(cb(p.path().filename().c_str(), 0));
 	}
-	return ox::Error(0);
+	return {};
 }
 
 }

deps/ox/src/ox/fs/filesystem/pathiterator.cpp

@@ -36,7 +36,7 @@ Error PathIterator::dirPath(char *out, std::size_t outSize) {
 	if (idx >= 0 && size < outSize) {
 		ox::memcpy(out, m_path, size);
 		out[size] = 0;
-		return ox::Error(0);
+		return {};
 	} else {
 		return ox::Error(1);
 	}
@@ -74,7 +74,7 @@ Error PathIterator::get(StringView &fileName) {
 	if (size && fileName[size - 1] == '/') {
 		fileName = ox::substr(m_path, start, start + size - 1);
 	}
-	oxAssert(fileName[fileName.len()-1] != '/', "name ends in /");
+	oxAssert(fileName[fileName.size()-1] != '/', "name ends in /");
 	return {};
 }
 
@@ -85,7 +85,7 @@ Error PathIterator::next(StringView &fileName) {
 	std::size_t size = 0;
 	auto retval = ox::Error(1);
 	if (m_iterator < m_maxSize && ox::strlen(&m_path[m_iterator])) {
-		retval = ox::Error(0);
+		retval = {};
 		if (m_path[m_iterator] == '/') {
 			m_iterator++;
 		}
@@ -104,11 +104,11 @@ Error PathIterator::next(StringView &fileName) {
 		}
 		fileName = ox::substr(m_path, start, start + size);
 		// truncate trailing /
-		while (fileName.len() && fileName[fileName.len() - 1] == '/') {
+		while (fileName.size() && fileName[fileName.size() - 1] == '/') {
 			fileName = ox::substr(m_path, start, start + size);
 		}
 		m_iterator += size;
-		oxAssert(fileName.len() == 0 || fileName[fileName.len()-1] != '/', "name ends in /");
+		oxAssert(fileName.size() == 0 || fileName[fileName.size()-1] != '/', "name ends in /");
 	}
 	return retval;
 }
@@ -118,7 +118,7 @@ Result<std::size_t> PathIterator::nextSize() const {
 	auto retval = ox::Error(1);
 	auto it = m_iterator;
 	if (it < m_maxSize && ox::strlen(&m_path[it])) {
-		retval = ox::Error(0);
+		retval = {};
 		if (m_path[it] == '/') {
 			it++;
 		}

deps/ox/src/ox/fs/ptrarith/nodebuffer.hpp

@@ -354,7 +354,7 @@ Error NodeBuffer<size_t, Item>::free(ItemPtr item) noexcept {
 		}
 	}
 	m_header.bytesUsed -= item.size();
-	return ox::Error(0);
+	return {};
 }
 
 template<typename size_t, typename Item>
@@ -370,7 +370,7 @@ Error NodeBuffer<size_t, Item>::setSize(std::size_t size) noexcept {
 		m_header.size = static_cast<size_t>(size);
 		auto data = reinterpret_cast<uint8_t*>(this) + end;
 		ox::memset(data, 0, size - end);
-		return ox::Error(0);
+		return {};
 	}
 }
 
@@ -422,7 +422,7 @@ Error NodeBuffer<size_t, Item>::compact(F cb) noexcept {
 		src = ptr(dest->next);
 		dest = uninitializedPtr(dest.offset() + dest->fullSize());
 	}
-	return ox::Error(0);
+	return {};
 }
 
 template<typename size_t, typename Item>

deps/ox/src/ox/fs/test/tests.cpp

@@ -59,7 +59,7 @@ const std::map<ox::StringView, std::function<ox::Error(ox::StringView)>> tests =
 			"PathIterator::next1",
 			[](ox::StringView) {
 				auto constexpr path = ox::StringLiteral("/usr/share/charset.gbag");
-				ox::PathIterator it(path.c_str(), path.len());
+				ox::PathIterator it(path.c_str(), path.size());
 				ox::StringView buff;
 				oxAssert(it.next(buff) == 0 && buff == "usr", "PathIterator shows wrong next");
 				oxAssert(it.next(buff) == 0 && buff == "share", "PathIterator shows wrong next");
@@ -84,7 +84,7 @@ const std::map<ox::StringView, std::function<ox::Error(ox::StringView)>> tests =
 			"PathIterator::next3",
 			[](ox::StringView) {
 				auto const path = ox::String("/");
-				ox::PathIterator it(path.c_str(), path.len());
+				ox::PathIterator it(path.c_str(), path.size());
 				ox::StringView buff;
 				oxAssert(it.next(buff) == 0 && buff == "\0", "PathIterator shows wrong next");
 				return ox::Error(0);
@@ -106,7 +106,7 @@ const std::map<ox::StringView, std::function<ox::Error(ox::StringView)>> tests =
 			"PathIterator::next5",
 			[](ox::StringView) {
 				auto const path = ox::String("usr/share/");
-				ox::PathIterator it(path.c_str(), path.len());
+				ox::PathIterator it(path.c_str(), path.size());
 				ox::StringView buff;
 				oxAssert(it.next(buff) == 0 && buff == "usr", "PathIterator shows wrong next");
 				oxAssert(it.next(buff) == 0 && buff == "share", "PathIterator shows wrong next");
@@ -117,9 +117,11 @@ const std::map<ox::StringView, std::function<ox::Error(ox::StringView)>> tests =
 			"PathIterator::dirPath",
 			[] (ox::StringView) {
 				auto constexpr path = ox::StringLiteral("/usr/share/charset.gbag");
-				ox::PathIterator it(path.c_str(), path.len());
-				auto buff = static_cast<char*>(ox_alloca(path.len() + 1));
-				oxAssert(it.dirPath(buff, path.len()) == 0 && ox::strcmp(buff, "/usr/share/") == 0, "PathIterator shows incorrect dir path");
+				ox::PathIterator it(path.c_str(), path.size());
+				auto buff = static_cast<char*>(ox_alloca(path.size() + 1));
+				OX_ALLOW_UNSAFE_BUFFERS_BEGIN
+				oxAssert(it.dirPath(buff, path.size()) == 0 && ox::strcmp(buff, "/usr/share/") == 0, "PathIterator shows incorrect dir path");
+				OX_ALLOW_UNSAFE_BUFFERS_END
 				return ox::Error(0);
 			}
 		},
@@ -127,7 +129,9 @@ const std::map<ox::StringView, std::function<ox::Error(ox::StringView)>> tests =
 			"PathIterator::hasNext",
 			[](ox::StringView) {
 				const auto path = "/file1";
+				OX_ALLOW_UNSAFE_BUFFERS_BEGIN
 				ox::PathIterator it(path, ox::strlen(path));
+				OX_ALLOW_UNSAFE_BUFFERS_END
 				oxAssert(it.hasNext(), "PathIterator shows incorrect hasNext");
 				oxAssert(!it.next().hasNext(), "PathIterator shows incorrect hasNext");
 				return ox::Error(0);
@@ -163,9 +167,11 @@ const std::map<ox::StringView, std::function<ox::Error(ox::StringView)>> tests =
 			[](ox::StringView) {
 				constexpr auto buffLen = 5000;
 				constexpr auto str1 = "Hello, World!";
+				OX_ALLOW_UNSAFE_BUFFERS_BEGIN
 				constexpr auto str1Len = ox::strlen(str1) + 1;
 				constexpr auto str2 = "Hello, Moon!";
 				constexpr auto str2Len = ox::strlen(str2) + 1;
+				OX_ALLOW_UNSAFE_BUFFERS_END
 				auto list = new (ox_alloca(buffLen)) ox::ptrarith::NodeBuffer<uint32_t, ox::FileStoreItem<uint32_t>>(buffLen);
 				oxAssert(ox::FileStore32::format(list, buffLen), "FileStore::format failed.");
 				ox::FileStore32 fileStore(list, buffLen);

deps/ox/src/ox/fs/tool.cpp

@@ -48,7 +48,7 @@ static ox::Error runLs(ox::FileSystem *fs, ox::Span<const char*> args) noexcept
 	for (const auto &file : files) {
 		oxOutf("{}\n", file);
 	}
-	return ox::Error(0);
+	return {};
 }
 
 static ox::Error runRead(ox::FileSystem *fs, ox::Span<const char*> args) noexcept {
@@ -57,8 +57,10 @@ static ox::Error runRead(ox::FileSystem *fs, ox::Span<const char*> args) noexcep
 		return ox::Error(1);
 	}
 	OX_REQUIRE(buff, fs->read(ox::StringView(args[1])));
+	OX_ALLOW_UNSAFE_BUFFERS_BEGIN
 	std::ignore = fwrite(buff.data(), sizeof(decltype(buff)::value_type), buff.size(), stdout);
-	return ox::Error(0);
+	OX_ALLOW_UNSAFE_BUFFERS_END
+	return {};
 }
 
 static ox::Error run(int argc, const char **argv) noexcept {

deps/ox/src/ox/logconn/logconn.cpp

@@ -91,23 +91,28 @@ ox::Error LoggerConn::sendInit(const InitTraceMsg &msg) noexcept {
 }
 
 void LoggerConn::msgSend() noexcept {
-	while (true) {
-		std::unique_lock lk(m_waitMut);
-		m_waitCond.wait(lk);
-		if (!m_running) {
-			break;
-		}
-		std::lock_guard const buffLk(m_buffMut);
+	try {
 		while (true) {
-			Array<char, units::KB> tmp;
-			const auto read = m_buff.read(tmp.data(), tmp.size());
-			if (!read) {
+			std::unique_lock lk(m_waitMut);
+			m_waitCond.wait(lk);
+			if (!m_running) {
 				break;
 			}
-			oxAssert(read <= tmp.size(), "logger trying to read too much data");
-			//std::printf("LoggerConn: sending %lu bytes\n", read);
-			std::ignore = send(tmp.data(), read);
+			std::lock_guard const buffLk(m_buffMut);
+			while (true) {
+				Array<char, units::KB> tmp;
+				const auto read = m_buff.read(tmp.data(), tmp.size());
+				if (!read) {
+					break;
+				}
+				oxAssert(read <= tmp.size(), "logger trying to read too much data");
+				//std::printf("LoggerConn: sending %lu bytes\n", read);
+				std::ignore = send(tmp.data(), read);
+			}
 		}
+	} catch (std::exception const &e) {
+		oxErrf("Exception in logger thread: {}\n", e.what());
+		oxAssert(false, "logger thread exception");
 	}
 }
 

deps/ox/src/ox/mc/intops.hpp

@@ -71,7 +71,9 @@ constexpr McInt encodeInteger(I pInput) noexcept {
 	// move input to uint64_t to allow consistent bit manipulation, and to avoid
 	// overflow concerns
 	uint64_t val = 0;
+	OX_ALLOW_UNSAFE_BUFFERS_BEGIN
 	ox::memcpy(&val, &input, sizeof(input));
+	OX_ALLOW_UNSAFE_BUFFERS_END
 	if (val) {
 		// bits needed to represent number factoring in space possibly
 		// needed for signed bit
@@ -94,7 +96,9 @@ constexpr McInt encodeInteger(I pInput) noexcept {
 		}
 		if (bytes == 9) {
 			out.data[0] = bytesIndicator;
+			OX_ALLOW_UNSAFE_BUFFERS_BEGIN
 			ox::memcpy(&out.data[1], &leVal, 8);
+			OX_ALLOW_UNSAFE_BUFFERS_END
 			if (inputNegative) {
 				out.data[1] |= 0b1000'0000;
 			}
@@ -104,7 +108,9 @@ constexpr McInt encodeInteger(I pInput) noexcept {
 			auto intermediate =
 				static_cast<uint64_t>(leVal.raw() | (negBit << (valBits - 1))) << bytes |
 				static_cast<uint64_t>(bytesIndicator);
+			OX_ALLOW_UNSAFE_BUFFERS_BEGIN
 			ox::memcpy(&out.data[0], &intermediate, sizeof(intermediate));
+			OX_ALLOW_UNSAFE_BUFFERS_END
 		}
 		out.length = bytes;
 	}
@@ -151,33 +157,37 @@ constexpr Result<I> decodeInteger(Reader_c auto&rdr, std::size_t *bytesRead) noe
 	decoded >>= bytes;
 	// move sign bit
 	if constexpr(is_signed_v<I>) {
-		 const auto negBit = bytes * 8 - bytes - 1;
-		 // move sign
-		 const auto negative = (decoded >> negBit) == 1;
-		 if (negative) {
-			 // fill in all bits between encoded sign and real sign with 1s
-			 // split it up because the 32-bit ARM can't shift more than 32 bits
-			 ox::Array<uint32_t, 2> d = {};
-			 //d[0] = decoded & 0xffff'ffff;
-			 //d[1] = decoded >> 32;
-			 ox::memcpy(&d[0], &decoded, sizeof(decoded));
-			 auto bit = negBit;
-			 for (; bit < ox::min<std::size_t>(Bits<I>, 32); ++bit) {
-				 d[0] |= 1 << bit;
-			 }
-			 bit -= 32;
-			 for (; bit < Bits<I>; ++bit) {
-				 d[1] |= 1 << bit;
-			 }
-			 I out = 0;
-			 if constexpr(ox::defines::BigEndian) {
-				 const auto d0Tmp = d[0];
-				 d[0] = d[1];
-				 d[1] = d0Tmp;
-			 }
-			 ox::memcpy(&out, &d[0], sizeof(out));
-			 return out;
-		 }
+		const auto negBit = bytes * 8 - bytes - 1;
+		// move sign
+		const auto negative = (decoded >> negBit) == 1;
+		if (negative) {
+			// fill in all bits between encoded sign and real sign with 1s
+			// split it up because the 32-bit ARM can't shift more than 32 bits
+			ox::Array<uint32_t, 2> d = {};
+			//d[0] = decoded & 0xffff'ffff;
+			//d[1] = decoded >> 32;
+		 	OX_ALLOW_UNSAFE_BUFFERS_BEGIN
+			ox::memcpy(&d[0], &decoded, sizeof(decoded));
+		 	OX_ALLOW_UNSAFE_BUFFERS_END
+			auto bit = negBit;
+			for (; bit < ox::min<std::size_t>(Bits<I>, 32); ++bit) {
+				d[0] |= 1 << bit;
+			}
+			bit -= 32;
+			for (; bit < Bits<I>; ++bit) {
+				d[1] |= 1 << bit;
+			}
+			I out = 0;
+			if constexpr(ox::defines::BigEndian) {
+				const auto d0Tmp = d[0];
+				d[0] = d[1];
+				d[1] = d0Tmp;
+			}
+		 	OX_ALLOW_UNSAFE_BUFFERS_BEGIN
+			ox::memcpy(&out, &d[0], sizeof(out));
+			OX_ALLOW_UNSAFE_BUFFERS_END
+			return out;
+		}
 	}
 	return static_cast<I>(decoded);
 }

deps/ox/src/ox/mc/read.hpp

@@ -197,7 +197,7 @@ constexpr Error MetalClawReaderTemplate<Reader>::field(const char*, bool *val) n
 		OX_RETURN_ERROR(result);
 	}
 	++m_field;
-	return ox::Error(0);
+	return {};
 }
 
 // array handler
@@ -256,7 +256,7 @@ constexpr Error MetalClawReaderTemplate<Reader>::field(const char*, HashMap<Stri
 		}
 	}
 	++m_field;
-	return ox::Error(0);
+	return {};
 }
 
 template<Reader_c Reader>
@@ -330,7 +330,7 @@ constexpr Error MetalClawReaderTemplate<Reader>::field(const char*, BasicString<
 		}
 	}
 	++m_field;
-	return ox::Error(0);
+	return {};
 }
 
 template<Reader_c Reader>
@@ -370,7 +370,7 @@ constexpr Error MetalClawReaderTemplate<Reader>::fieldCString(const char*, char
 		data[size] = 0;
 	}
 	++m_field;
-	return ox::Error(0);
+	return {};
 }
 
 template<Reader_c Reader>
@@ -388,7 +388,7 @@ constexpr Error MetalClawReaderTemplate<Reader>::fieldCString(const char*, char
 		data[size] = 0;
 	}
 	++m_field;
-	return ox::Error(0);
+	return {};
 }
 
 template<Reader_c Reader>
@@ -416,7 +416,7 @@ constexpr Error MetalClawReaderTemplate<Reader>::fieldCString(const char*, char
 		}
 	}
 	++m_field;
-	return ox::Error(0);
+	return {};
 }
 
 template<Reader_c Reader>
@@ -464,7 +464,7 @@ constexpr Error MetalClawReaderTemplate<Reader>::readInteger(I *val) noexcept {
 		}
 	}
 	++m_field;
-	return ox::Error(0);
+	return {};
 }
 
 template<Reader_c Reader>
@@ -487,7 +487,7 @@ constexpr Error MetalClawReaderTemplate<Reader>::field(const char*, CB cb) noexc
 		}
 	}
 	++m_field;
-	return ox::Error(0);
+	return {};
 }
 
 template<Reader_c Reader>

deps/ox/src/ox/mc/test/tests.cpp

@@ -157,7 +157,7 @@ std::map<ox::StringView, ox::Error(*)()> tests = {
 				oxAssert(testIn.Int8                == testOut.Int8,                "Int8 value mismatch");
 				oxAssert(testIn.Union.Int           == testOut.Union.Int,           "Union.Int value mismatch");
 				oxAssert(testIn.String              == testOut.String,              "String value mismatch");
-				oxDebugf("{}", testOut.IString.len());
+				oxDebugf("{}", testOut.IString.size());
 				oxExpect(testIn.IString,               testOut.IString);
 				oxAssert(testIn.List[0]             == testOut.List[0],             "List[0] value mismatch");
 				oxAssert(testIn.List[1]             == testOut.List[1],             "List[1] value mismatch");

deps/ox/src/ox/mc/write.hpp

@@ -122,7 +122,7 @@ class MetalClawWriter {
 			}
 			OX_RETURN_ERROR(m_fieldPresence.set(static_cast<std::size_t>(m_field), fieldSet));
 			++m_field;
-			return ox::Error(0);
+			return {};
 		}
 
 };
@@ -184,37 +184,42 @@ constexpr Error MetalClawWriter<Writer>::field(const char*, const bool *val) noe
 		OX_RETURN_ERROR(m_fieldPresence.set(static_cast<std::size_t>(m_field), *val));
 	}
 	++m_field;
-	return ox::Error(0);
+	return {};
 }
 
 template<Writer_c Writer>
 template<std::size_t SmallStringSize>
 constexpr Error MetalClawWriter<Writer>::field(const char*, const BasicString<SmallStringSize> *val) noexcept {
 	bool fieldSet = false;
-	if (val->len() && (!m_unionIdx.has_value() || *m_unionIdx == m_field)) {
+	if (val->size() && (!m_unionIdx.has_value() || *m_unionIdx == m_field)) {
 		// write the length
-		const auto strLen = mc::encodeInteger(val->len());
+		const auto strLen = mc::encodeInteger(val->size());
 		OX_RETURN_ERROR(m_writer.write(reinterpret_cast<const char*>(strLen.data.data()), strLen.length));
 		// write the string
-		OX_RETURN_ERROR(m_writer.write(val->c_str(), static_cast<std::size_t>(val->len())));
+		OX_RETURN_ERROR(m_writer.write(val->c_str(), static_cast<std::size_t>(val->size())));
 		fieldSet = true;
 	}
 	OX_RETURN_ERROR(m_fieldPresence.set(static_cast<std::size_t>(m_field), fieldSet));
 	++m_field;
-	return ox::Error(0);
+	return {};
 }
 
 template<Writer_c Writer>
 template<std::size_t L>
 constexpr Error MetalClawWriter<Writer>::field(const char *name, const IString<L> *val) noexcept {
-	return fieldCString(name, val->data(), val->len());
+	return fieldCString(name, val->data(), val->size());
 }
 
 template<Writer_c Writer>
 constexpr Error MetalClawWriter<Writer>::fieldCString(const char*, const char *const*val, std::size_t) noexcept {
 	bool fieldSet = false;
 	if (!m_unionIdx.has_value() || *m_unionIdx == m_field) {
+		OX_ALLOW_UNSAFE_BUFFERS_BEGIN
+		// this strlen is tolerated because sometimes 0 gets passed to
+		// the size param, which is a lie
+		// this code should be cleaned up at some point...
 		const auto strLen = *val ? ox::strlen(*val) : 0;
+		OX_ALLOW_UNSAFE_BUFFERS_END
 		// write the length
 		const auto strLenBuff = mc::encodeInteger(strLen);
 		OX_RETURN_ERROR(m_writer.write(reinterpret_cast<const char*>(strLenBuff.data.data()), strLenBuff.length));
@@ -224,7 +229,7 @@ constexpr Error MetalClawWriter<Writer>::fieldCString(const char*, const char *c
 	}
 	OX_RETURN_ERROR(m_fieldPresence.set(static_cast<std::size_t>(m_field), fieldSet));
 	++m_field;
-	return ox::Error(0);
+	return {};
 }
 
 template<Writer_c Writer>
@@ -250,7 +255,7 @@ constexpr Error MetalClawWriter<Writer>::fieldCString(const char*, const char *v
 	}
 	OX_RETURN_ERROR(m_fieldPresence.set(static_cast<std::size_t>(m_field), fieldSet));
 	++m_field;
-	return ox::Error(0);
+	return {};
 }
 
 template<Writer_c Writer>
@@ -314,7 +319,7 @@ OX_ALLOW_UNSAFE_BUFFERS_END
 	}
 	OX_RETURN_ERROR(m_fieldPresence.set(static_cast<std::size_t>(m_field), fieldSet));
 	++m_field;
-	return ox::Error(0);
+	return {};
 }
 
 template<Writer_c Writer>
@@ -334,7 +339,7 @@ constexpr Error MetalClawWriter<Writer>::field(const char*, const HashMap<String
 		OX_RETURN_ERROR(handler.setTypeInfo("Map", 0, {}, len * 2));
 		// this loop body needs to be in a lambda because of the potential alloca call
 		constexpr auto loopBody = [](auto &handler, auto const&key, auto const&val) -> ox::Error {
-			const auto keyLen = key.len();
+			const auto keyLen = key.size();
 			auto wkey = ox_malloca(keyLen + 1, char, 0);
 			memcpy(wkey.get(), key.c_str(), keyLen + 1);
 			OX_RETURN_ERROR(handler.fieldCString("", wkey.get(), keyLen));
@@ -351,7 +356,7 @@ constexpr Error MetalClawWriter<Writer>::field(const char*, const HashMap<String
 	}
 	OX_RETURN_ERROR(m_fieldPresence.set(static_cast<std::size_t>(m_field), fieldSet));
 	++m_field;
-	return ox::Error(0);
+	return {};
 }
 
 template<Writer_c Writer>

deps/ox/src/ox/model/def.hpp

@@ -13,7 +13,7 @@
 // oxModelFwdDecl is necessary because Apple-Clang is broken...
 #define OX_MODEL_FWD_DECL(modelName) constexpr ox::Error model(auto *io, ox::CommonPtrWith<modelName> auto *o) noexcept
 #define OX_MODEL_BEGIN(modelName) constexpr ox::Error model(auto *io, [[maybe_unused]] ox::CommonPtrWith<modelName> auto *o) noexcept { OX_RETURN_ERROR(io->template setTypeInfo<modelName>());
-#define OX_MODEL_END() return ox::Error(0); }
+#define OX_MODEL_END() return {}; }
 #define OX_MODEL_FIELD(fieldName) OX_RETURN_ERROR(io->field(#fieldName, &o->fieldName));
 #define OX_MODEL_FIELD_RENAME(objFieldName, serFieldName) OX_RETURN_ERROR(io->field(#serFieldName, &o->objFieldName));
 #define OX_MODEL_FRIEND(modelName) friend constexpr ox::Error model(auto *io, ox::CommonPtrWith<modelName> auto *o) noexcept

deps/ox/src/ox/model/desctypes.hpp

@@ -43,7 +43,7 @@ static constexpr auto buildTypeId(
 		for (const auto &p : typeParams) {
 			tp += p + ",";
 		}
-		tp.resize(tp.len() - 1);
+		tp.resize(tp.size() - 1);
 		tp += "#";
 	}
 	return ox::sfmt("{}{};{}", name, tp, version);
@@ -244,7 +244,7 @@ constexpr Error model(TypeDescReader<T> *io, CommonPtrWith<DescriptorField> auto
 	// defaultValue is unused now, but placeholder for backwards compatibility
 	int defaultValue = 0;
 	oxReturnError(io->field("defaultValue", &defaultValue));
-	return ox::Error(0);
+	return {};
 }
 #endif
 

deps/ox/src/ox/model/descwrite.hpp

@@ -205,7 +205,7 @@ constexpr Error TypeDescWriter::field(StringViewCR name, T const*, std::size_t,
 		const auto t = type(p);
 		oxAssert(t != nullptr, "field(const char *name, T *val, std::size_t): Type not found or generated");
 		m_type->fieldList.emplace_back(t, String(name), detail::indirectionLevels_v<T> + 1, subscriptStack, buildTypeId(*t));
-		return ox::Error(0);
+		return {};
 	}
 	return ox::Error(1);
 }
@@ -220,7 +220,7 @@ constexpr Error TypeDescWriter::field(StringViewCR name, T const*, std::size_t)
 		auto const lvls = detail::indirectionLevels_v<T> + 1;
 		SubscriptStack subscriptStack{lvls};
 		m_type->fieldList.emplace_back(t, String(name), lvls, subscriptStack, buildTypeId(*t));
-		return ox::Error(0);
+		return {};
 	}
 	return ox::Error(1);
 }
@@ -231,7 +231,7 @@ constexpr Error TypeDescWriter::field(StringViewCR name, UnionView<T, force> val
 		const auto t = type(val);
 		oxAssert(t != nullptr, "field(const char *name, T val): Type not found or generated");
 		m_type->fieldList.emplace_back(t, String(name), 0, SubscriptStack{}, ox::String(t->typeName));
-		return ox::Error(0);
+		return {};
 	}
 	return ox::Error(1);
 }

deps/ox/src/ox/model/fieldcounter.hpp

@@ -31,25 +31,25 @@ class FieldCounter {
 		template<typename U>
 		constexpr ox::Error field(StringViewCR, U) noexcept {
 			++fields;
-			return ox::Error(0);
+			return {};
 		}
 
 		template<typename U>
 		constexpr ox::Error field(StringViewCR, U, std::size_t) noexcept {
 			++fields;
-			return ox::Error(0);
+			return {};
 		}
 
 		template<typename U, typename Handler>
 		constexpr Error field(StringViewCR, Handler) {
 			++fields;
-			return ox::Error(0);
+			return {};
 		}
 
 		template<typename ...Args>
 		constexpr Error fieldCString(Args&&...) noexcept {
 			++fields;
-			return ox::Error(0);
+			return {};
 		}
 
 		static constexpr auto opType() noexcept {

deps/ox/src/ox/model/modelops.hpp

@@ -56,19 +56,19 @@ class MemberList {
 		template<typename T>
 		constexpr Error field(const char*, T *v) noexcept {
 			vars[m_i++] = static_cast<void*>(v);
-			return ox::Error(0);
+			return {};
 		}
 
 		template<typename T>
 		constexpr Error field(const char*, T *v, int) noexcept {
 			vars[m_i++] = static_cast<void*>(v);
-			return ox::Error(0);
+			return {};
 		}
 
 		template<typename U, bool force = false>
 		constexpr Error field(const char*, UnionView<U, force> u) noexcept {
 			vars[m_i++] = static_cast<void*>(u.get());
-			return ox::Error(0);
+			return {};
 		}
 
 		template<typename T>
@@ -107,7 +107,7 @@ class Copier {
 				auto &dst = *cbit_cast<FT*>(m_dst->vars[m_i]);
 				dst = src;
 				++m_i;
-				return ox::Error(0);
+				return {};
 			}
 		}
 
@@ -119,7 +119,7 @@ class Copier {
 				dst = src;
 			}
 			++m_i;
-			return ox::Error(0);
+			return {};
 		}
 
 		template<typename U, bool force = false>
@@ -128,7 +128,7 @@ class Copier {
 			auto &src = *u.get();
 			dst = src;
 			++m_i;
-			return ox::Error(0);
+			return {};
 		}
 
 		template<typename T = void>
@@ -168,7 +168,7 @@ class Mover {
 				dst = std::move(src);
 				src = FT{};
 				++m_i;
-				return ox::Error(0);
+				return {};
 			}
 		}
 
@@ -181,7 +181,7 @@ class Mover {
 				src = FT{};
 			}
 			++m_i;
-			return ox::Error(0);
+			return {};
 		}
 
 		template<typename U, bool force = false>
@@ -190,7 +190,7 @@ class Mover {
 			auto &src = *u.get();
 			dst = std::move(src);
 			++m_i;
-			return ox::Error(0);
+			return {};
 		}
 
 		template<typename T = void>
@@ -228,7 +228,7 @@ class Equals {
 			const auto &dst = std::bit_cast<FT>(*m_other->vars[m_i]);
 			++m_i;
 			if (dst == src) {
-				return ox::Error(0);
+				return {};
 			} else {
 				this->value = false;
 				return ox::Error(1);
@@ -246,7 +246,7 @@ class Equals {
 				}
 			}
 			++m_i;
-			return ox::Error(0);
+			return {};
 		}
 
 		template<typename U, bool force = false>
@@ -255,7 +255,7 @@ class Equals {
 			const auto &src = *u.get();
 			++m_i;
 			if (dst == src) {
-				return ox::Error(0);
+				return {};
 			} else {
 				this->value = false;
 				return ox::Error(1);

deps/ox/src/ox/model/modelvalue.cpp

@@ -18,6 +18,6 @@ static_assert([]() -> ox::Error {
 	}
 	//oxReturnError(v.set<int32_t>(5));
 	return {};
-}() == ox::Error(0));
+}() == ox::Error{});
 
 }

deps/ox/src/ox/model/modelvalue.hpp

@@ -972,7 +972,7 @@ constexpr Error model(auto *h, CommonPtrWith<ModelObject> auto *obj) noexcept {
 	for (auto &f : obj->m_fieldsOrder) {
 		OX_RETURN_ERROR(h->field(f->name.c_str(), &f->value));
 	}
-	return ox::Error(0);
+	return {};
 }
 
 constexpr Error model(auto *h, CommonPtrWith<ModelUnion> auto *obj) noexcept {
@@ -981,7 +981,7 @@ constexpr Error model(auto *h, CommonPtrWith<ModelUnion> auto *obj) noexcept {
 	for (auto &f : obj->m_fieldsOrder) {
 		OX_RETURN_ERROR(h->field(f->name.c_str(), &f->value));
 	}
-	return ox::Error(0);
+	return {};
 }
 
 constexpr ModelValue::ModelValue(const ModelValue &other) noexcept {
@@ -997,7 +997,7 @@ constexpr ModelValue::ModelValue(const ModelValue &other) noexcept {
 		case Type::SignedInteger16:
 		case Type::SignedInteger32:
 		case Type::SignedInteger64:
-			ox::memcpy(&m_data, &other.m_data, sizeof(m_data));
+			m_data = other.m_data;
 			break;
 		case Type::String:
 			m_data.str = new String(other.get<String>());
@@ -1030,8 +1030,8 @@ constexpr ModelValue::ModelValue(ModelValue &&other) noexcept {
 		case Type::SignedInteger16:
 		case Type::SignedInteger32:
 		case Type::SignedInteger64:
-			ox::memcpy(&m_data, &other.m_data, sizeof(m_data));
-			ox::memset(&other.m_data, 0, sizeof(m_data));
+			m_data = other.m_data;
+			other.m_data.ui64 = 0;
 			break;
 		case Type::String:
 			m_data.str = other.m_data.str;
@@ -1129,7 +1129,7 @@ constexpr Error ModelValue::setType(
 		OX_RETURN_ERROR(m_data.uni->setType(type));
 	}
 	oxAssert(m_type != Type::Undefined, "No type set");
-	return ox::Error(0);
+	return {};
 }
 
 template<typename T>
@@ -1184,7 +1184,7 @@ constexpr Error ModelValue::set(const T &v) noexcept {
 		safeDelete(&value);
 	}
 	value = v;
-	return ox::Error(0);
+	return {};
 }
 
 template<typename T>
@@ -1199,7 +1199,7 @@ constexpr Error ModelValue::set(T &&v) noexcept {
 		safeDelete(&value);
 	}
 	value = std::move(v);
-	return ox::Error(0);
+	return {};
 }
 
 constexpr ModelValue &ModelValue::operator=(ModelValue &other) noexcept {
@@ -1223,7 +1223,7 @@ constexpr ModelValue &ModelValue::operator=(const ModelValue &other) noexcept {
 		case Type::SignedInteger16:
 		case Type::SignedInteger32:
 		case Type::SignedInteger64:
-			ox::memcpy(&m_data, &other.m_data, sizeof(m_data));
+			m_data = other.m_data;
 			break;
 		case Type::String:
 			m_data.str = new String(other.get<String>());
@@ -1261,8 +1261,8 @@ constexpr ModelValue &ModelValue::operator=(ModelValue &&other) noexcept {
 		case Type::SignedInteger16:
 		case Type::SignedInteger32:
 		case Type::SignedInteger64:
-			ox::memcpy(&m_data, &other.m_data, sizeof(m_data));
-			ox::memset(&other.m_data, 0, sizeof(m_data));
+			m_data = other.m_data;
+			other.m_data = {};
 			break;
 		case Type::String:
 			m_data.str = other.m_data.str;

deps/ox/src/ox/model/typenamecatcher.hpp

@@ -38,17 +38,17 @@ struct TypeNameCatcher {
 
 	template<typename T>
 	constexpr Error field(const char*, T*, std::size_t) noexcept {
-		return ox::Error(0);
+		return {};
 	}
 
 	template<typename T>
 	constexpr Error field(const char*, T) noexcept {
-		return ox::Error(0);
+		return {};
 	}
 
 	template<typename ...Args>
 	constexpr Error fieldCString(Args&&...) noexcept {
-		return ox::Error(0);
+		return {};
 	}
 
 	static constexpr auto opType() noexcept {
@@ -77,17 +77,17 @@ struct TypeInfoCatcher {
 
 	template<typename T>
 	constexpr Error field(const char*, T*, std::size_t) noexcept {
-		return ox::Error(0);
+		return {};
 	}
 
 	template<typename T>
 	constexpr Error field(const char*, T) noexcept {
-		return ox::Error(0);
+		return {};
 	}
 
 	template<typename T>
 	constexpr Error fieldCString(const char*, T) noexcept {
-		return ox::Error(0);
+		return {};
 	}
 
 	static constexpr auto opType() noexcept {
@@ -144,7 +144,7 @@ template<typename T, typename Str = const char*>
 [[nodiscard]]
 consteval auto requireModelTypeName() noexcept {
 	constexpr auto name = getModelTypeName<T, Str>();
-	static_assert(ox::StringView{name}.len(), "Type lacks required TypeName");
+	static_assert(ox::StringView{name}.size(), "Type lacks required TypeName");
 	return name;
 }
 
@@ -159,7 +159,7 @@ constexpr auto ModelTypeId_v = [] {
 	constexpr auto name = ModelTypeName_v<T, ox::StringView>;
 	constexpr auto version = ModelTypeVersion_v<T>;
 	constexpr auto versionStr = ox::sfmt<ox::IString<19>>("{}", version);
-	return ox::sfmt<ox::IString<name.len() + versionStr.len() + 1>>("{};{}", name, versionStr);
+	return ox::sfmt<ox::IString<name.size() + versionStr.size() + 1>>("{};{}", name, versionStr);
 }();
 
 }

deps/ox/src/ox/model/walk.hpp

@@ -127,7 +127,7 @@ static constexpr Error parseField(const DescriptorField &field, Reader *rdr, Dat
 		}
 	}
 	walker->popNamePath();
-	return ox::Error(0);
+	return {};
 }
 
 template<typename Reader, typename FH>
@@ -141,7 +141,7 @@ constexpr Error model(Reader *rdr, DataWalker<Reader, FH> *walker) noexcept {
 	for (const auto &field : fields) {
 		OX_RETURN_ERROR(parseField(field, rdr, walker));
 	}
-	return ox::Error(0);
+	return {};
 }
 
 template<typename Reader, typename Handler>

deps/ox/src/ox/oc/read.cpp

@@ -15,7 +15,7 @@ namespace ox {
 
 OrganicClawReader::OrganicClawReader(const uint8_t *buff, std::size_t buffSize) {
 	auto json = reinterpret_cast<const char*>(buff);
-	auto jsonLen = ox::strnlen(json, buffSize);
+	auto jsonLen = ox::strnlen_s(json, buffSize);
 	Json::CharReaderBuilder parserBuilder;
 	auto parser = std::unique_ptr<Json::CharReader>(parserBuilder.newCharReader());
 	if (!parser->parse(json, json + jsonLen, &m_json, nullptr)) {
@@ -37,7 +37,7 @@ OrganicClawReader::OrganicClawReader(Json::Value json, int unionIdx) noexcept:
 }
 
 Error OrganicClawReader::field(const char *key, bool *val) noexcept {
-	auto err = ox::Error(0);
+	ox::Error err{};
 	if (targetValid()) {
 		const auto &jv = value(key);
 		if (jv.empty()) {
@@ -53,7 +53,7 @@ Error OrganicClawReader::field(const char *key, bool *val) noexcept {
 }
 
 Error OrganicClawReader::fieldCString(const char *key, char *val, std::size_t buffLen) noexcept {
-	auto err = ox::Error(0);
+	ox::Error err{};
 	const char *begin = nullptr, *end = nullptr;
 	const auto &jv = value(key);
 	if (targetValid()) {
@@ -81,7 +81,7 @@ Error OrganicClawReader::fieldCString(const char *key, char *val, std::size_t bu
 }
 
 Error OrganicClawReader::fieldCString(const char *key, char **val) noexcept {
-	auto err = ox::Error(0);
+	ox::Error err{};
 	const char *begin = nullptr, *end = nullptr;
 	const auto &jv = value(key);
 	auto &data = *val;
@@ -106,7 +106,7 @@ Error OrganicClawReader::fieldCString(const char *key, char **val) noexcept {
 }
 
 Error OrganicClawReader::fieldCString(const char *key, char **val, std::size_t buffLen) noexcept {
-	auto err = ox::Error(0);
+	ox::Error err{};
 	const char *begin = nullptr, *end = nullptr;
 	const auto &jv = value(key);
 	if (targetValid()) {

deps/ox/src/ox/oc/read.hpp

@@ -8,7 +8,11 @@
 
 #pragma once
 
+#include <ox/std/def.hpp>
+
+OX_ALLOW_UNSAFE_BUFFERS_BEGIN
 #include <json/json.h>
+OX_ALLOW_UNSAFE_BUFFERS_END
 
 #include <ox/model/fieldcounter.hpp>
 #include <ox/model/modelhandleradaptor.hpp>
@@ -133,7 +137,7 @@ class OrganicClawReader {
 
 template<typename T>
 Error OrganicClawReader::field(const char *key, T *val) noexcept {
-	auto err = ox::Error(0);
+	ox::Error err{};
 	try {
 		if constexpr (is_integer_v<T>) {
 			if (targetValid()) {
@@ -186,7 +190,7 @@ Error OrganicClawReader::field(const char *key, T *val) noexcept {
 
 template<typename U, bool force>
 Error OrganicClawReader::field(const char *key, UnionView<U, force> val) noexcept {
-	auto err = ox::Error(0);
+	ox::Error err{};
 	if (targetValid()) {
 		const auto &jv = value(key);
 		if (jv.empty() || jv.isObject()) {
@@ -203,7 +207,7 @@ Error OrganicClawReader::field(const char *key, UnionView<U, force> val) noexcep
 
 template<std::size_t L>
 Error OrganicClawReader::field(const char *key, BasicString<L> *val) noexcept {
-	auto err = ox::Error(0);
+	ox::Error err{};
 	if (targetValid()) {
 		const auto &jv = value(key);
 		if (jv.empty()) {
@@ -220,7 +224,7 @@ Error OrganicClawReader::field(const char *key, BasicString<L> *val) noexcept {
 
 template<std::size_t L>
 Error OrganicClawReader::field(const char *key, IString<L> *val) noexcept {
-	auto err = ox::Error(0);
+	ox::Error err{};
 	if (targetValid()) {
 		const auto &jv = value(key);
 		if (jv.empty()) {
@@ -253,7 +257,7 @@ OX_ALLOW_UNSAFE_BUFFERS_BEGIN
 		OX_RETURN_ERROR(handler.field("", &val[i]));
 OX_ALLOW_UNSAFE_BUFFERS_END
 	}
-	return ox::Error(0);
+	return {};
 }
 
 template<typename T>
@@ -270,7 +274,7 @@ Error OrganicClawReader::field(const char *key, HashMap<String, T> *val) noexcep
 		const auto k = keys[i].c_str();
 		OX_RETURN_ERROR(handler.field(k, &val->operator[](k)));
 	}
-	return ox::Error(0);
+	return {};
 }
 
 Error readOC(BufferView buff, auto &val) noexcept {
@@ -303,7 +307,7 @@ Result<T> readOC(BufferView buff) noexcept {
 
 template<typename T>
 Result<T> readOC(ox::StringView json) noexcept {
-	return readOC<T>(ox::BufferView{json.data(), json.len()});
+	return readOC<T>(ox::BufferView{json.data(), json.size()});
 }
 
 }

deps/ox/src/ox/oc/write.cpp

@@ -23,7 +23,7 @@ Error OrganicClawWriter::fieldCString(const char *key, const char *const*val, in
 		value(key) = *val;
 	}
 	++m_fieldIt;
-	return ox::Error(0);
+	return {};
 }
 
 Error OrganicClawWriter::fieldCString(const char *key, const char *const*val) noexcept {
@@ -32,7 +32,7 @@ Error OrganicClawWriter::fieldCString(const char *key, const char *const*val) no
 
 Error OrganicClawWriter::field(const char *key, const UUID *uuid) noexcept {
 	const auto uuidStr = uuid->toString();
-	if (targetValid() && uuidStr.len()) {
+	if (targetValid() && uuidStr.size()) {
 		value(key) = uuidStr.c_str();
 	}
 	++m_fieldIt;

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

@@ -8,7 +8,11 @@
 
 #pragma once
 
+#include <ox/std/def.hpp>
+
+OX_ALLOW_UNSAFE_BUFFERS_BEGIN
 #include <json/json.h>
+OX_ALLOW_UNSAFE_BUFFERS_END
 
 #include <ox/model/fieldcounter.hpp>
 #include <ox/model/modelhandleradaptor.hpp>
@@ -42,7 +46,7 @@ class OrganicClawWriter {
 				value(key) = *val;
 			}
 			++m_fieldIt;
-			return ox::Error(0);
+			return {};
 		}
 
 		Error field(const char *key, const int16_t *val) noexcept {
@@ -50,7 +54,7 @@ class OrganicClawWriter {
 				value(key) = *val;
 			}
 			++m_fieldIt;
-			return ox::Error(0);
+			return {};
 		}
 
 		Error field(const char *key, const int32_t *val) noexcept {
@@ -58,7 +62,7 @@ class OrganicClawWriter {
 				value(key) = *val;
 			}
 			++m_fieldIt;
-			return ox::Error(0);
+			return {};
 		}
 
 		Error field(const char *key, const int64_t *val) noexcept {
@@ -66,7 +70,7 @@ class OrganicClawWriter {
 				value(key) = *val;
 			}
 			++m_fieldIt;
-			return ox::Error(0);
+			return {};
 		}
 
 
@@ -75,7 +79,7 @@ class OrganicClawWriter {
 				value(key) = *val;
 			}
 			++m_fieldIt;
-			return ox::Error(0);
+			return {};
 		}
 
 		Error field(const char *key, const uint16_t *val) noexcept {
@@ -83,7 +87,7 @@ class OrganicClawWriter {
 				value(key) = *val;
 			}
 			++m_fieldIt;
-			return ox::Error(0);
+			return {};
 		}
 
 		Error field(const char *key, const uint32_t *val) noexcept {
@@ -91,7 +95,7 @@ class OrganicClawWriter {
 				value(key) = *val;
 			}
 			++m_fieldIt;
-			return ox::Error(0);
+			return {};
 		}
 
 		Error field(const char *key, const uint64_t *val) noexcept {
@@ -99,7 +103,7 @@ class OrganicClawWriter {
 				value(key) = *val;
 			}
 			++m_fieldIt;
-			return ox::Error(0);
+			return {};
 		}
 
 		Error field(char const*key, bool const*val) noexcept {
@@ -134,7 +138,7 @@ class OrganicClawWriter {
 
 		template<std::size_t L>
 		Error field(char const*key, IString<L> const*val) noexcept {
-			if (targetValid() && val->len()) {
+			if (targetValid() && val->size()) {
 				value(key) = val->c_str();
 			}
 			++m_fieldIt;
@@ -143,11 +147,11 @@ class OrganicClawWriter {
 
 		template<std::size_t L>
 		Error field(char const*key, BasicString<L> const*val) noexcept {
-			if (targetValid() && val->len()) {
+			if (targetValid() && val->size()) {
 				value(key) = val->c_str();
 			}
 			++m_fieldIt;
-			return ox::Error(0);
+			return {};
 		}
 
 		Error fieldCString(const char*, const char *const*val, int len) noexcept;
@@ -207,7 +211,7 @@ OX_ALLOW_UNSAFE_BUFFERS_END
 		value(key) = w.m_json;
 	}
 	++m_fieldIt;
-	return ox::Error(0);
+	return {};
 }
 
 template<typename T>
@@ -233,7 +237,7 @@ Error OrganicClawWriter::field(const char *key, const T *val) noexcept {
 		}
 	}
 	++m_fieldIt;
-	return ox::Error(0);
+	return {};
 }
 
 template<typename U, bool force>
@@ -247,7 +251,7 @@ Error OrganicClawWriter::field(const char *key, UnionView<U, force> val) noexcep
 		}
 	}
 	++m_fieldIt;
-	return ox::Error(0);
+	return {};
 }
 
 Result<ox::Buffer> writeOC(const auto &val) noexcept {
@@ -258,7 +262,9 @@ Result<ox::Buffer> writeOC(const auto &val) noexcept {
 	const auto str = Json::writeString(jsonBuilder, writer.m_json);
 	Result<Buffer> buff;
 	buff.value.resize(str.size() + 1);
+	OX_ALLOW_UNSAFE_BUFFERS_BEGIN
 	memcpy(buff.value.data(), str.data(), str.size() + 1);
+	OX_ALLOW_UNSAFE_BUFFERS_END
 	return buff;
 }
 
@@ -270,7 +276,9 @@ Result<ox::String> writeOCString(const auto &val) noexcept {
 	const auto str = Json::writeString(jsonBuilder, writer.m_json);
 	Result<ox::String> buff;
 	buff.value.resize(str.size());
+	OX_ALLOW_UNSAFE_BUFFERS_BEGIN
 	memcpy(buff.value.data(), str.data(), str.size() + 1);
+	OX_ALLOW_UNSAFE_BUFFERS_END
 	return buff;
 }
 

deps/ox/src/ox/std/assert.cpp

@@ -33,6 +33,9 @@ void panic(StringViewCR file, int const line, StringViewCR panicMsg, Error const
 #endif
 }
 
+#if __GNUC__
+__attribute__((weak))
+#endif
 void panic(const char *file, int const line, char const*panicMsg, Error const&err) noexcept {
 	panic(StringView{file}, line, StringView{panicMsg}, err);
 }

deps/ox/src/ox/std/basestringview.hpp

@@ -185,7 +185,7 @@ class BaseStringView {
 		}
 
 		[[nodiscard]]
-		constexpr auto len() const noexcept {
+		constexpr auto size() const noexcept {
 			return m_len;
 		}
 

deps/ox/src/ox/std/cstringview.hpp

@@ -21,13 +21,13 @@ class CStringView: public detail::BaseStringView {
 
 		constexpr CStringView(CStringView const&sv) noexcept = default;
 
-		constexpr CStringView(StringLiteral const&str) noexcept: BaseStringView(str.data(), str.len()) {}
+		constexpr CStringView(StringLiteral const&str) noexcept: BaseStringView(str.data(), str.size()) {}
 
 		template<std::size_t SmallStrSz>
-		constexpr CStringView(BasicString<SmallStrSz> const&str) noexcept: BaseStringView(str.data(), str.len()) {}
+		constexpr CStringView(BasicString<SmallStrSz> const&str) noexcept: BaseStringView(str.data(), str.size()) {}
 
 		template<std::size_t SmallStrSz>
-		constexpr CStringView(IString<SmallStrSz> const&str) noexcept: BaseStringView(str.data(), str.len()) {}
+		constexpr CStringView(IString<SmallStrSz> const&str) noexcept: BaseStringView(str.data(), str.size()) {}
 
 		constexpr CStringView(std::nullptr_t) noexcept {}
 
@@ -37,7 +37,7 @@ class CStringView: public detail::BaseStringView {
 
 		constexpr auto &operator=(CStringView const&other) noexcept {
 			if (&other != this) {
-				set(other.data(), other.len());
+				set(other.data(), other.size());
 			}
 			return *this;
 		}

deps/ox/src/ox/std/cstrops.hpp

@@ -30,9 +30,12 @@ constexpr T1 strncpy(T1 dest, T2 src, std::size_t maxLen) noexcept {
 }
 
 [[nodiscard]]
-constexpr auto strnlen(const char *str1, std::size_t maxLen) noexcept {
-	std::size_t len = 0;
-	for (; len < maxLen && str1[len]; len++);
+constexpr size_t strnlen_s(const char *str, size_t const maxLen) noexcept {
+	if (!str) [[unlikely]] {
+		return 0;
+	}
+	size_t len = 0;
+	for (; len < maxLen && str[len]; len++);
 	return len;
 }
 

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

@@ -307,6 +307,13 @@ struct [[nodiscard]] Result {
 		return std::move(value);
 	}
 
+	constexpr Result transformError(ErrorCode const ec, CString const msg) && {
+		if (error) {
+			error = Error{ec, msg};
+		}
+		return *this;
+	}
+
 };
 
 namespace detail {

deps/ox/src/ox/std/ignore.hpp

@@ -16,7 +16,7 @@
 
 namespace std {
 
-inline constexpr struct {
+inline constexpr struct ignore_t {
 	constexpr void operator=(auto&&) const noexcept {}
 } ignore;
 

deps/ox/src/ox/std/istring.hpp

@@ -72,7 +72,7 @@ class IString {
 		 * Returns the number of characters in this string.
 		 */
 		[[nodiscard]]
-		constexpr std::size_t len() const noexcept;
+		constexpr std::size_t size() const noexcept;
 
 		/**
 		 * Returns the number of bytes used for this string.
@@ -121,7 +121,7 @@ constexpr IString<size> &IString<size>::operator=(Integer_c auto i) noexcept {
 
 template<std::size_t size>
 constexpr IString<size> &IString<size>::operator=(ox::StringViewCR str) noexcept {
-	std::size_t strLen = str.len();
+	std::size_t strLen = str.size();
 	if (cap() < strLen) {
 		strLen = cap();
 	}
@@ -171,7 +171,7 @@ constexpr char &IString<StrCap>::operator[](std::size_t i) noexcept {
 template<std::size_t StrCap>
 constexpr Error IString<StrCap>::append(const char *str, std::size_t strLen) noexcept {
 	Error err{};
-	auto const currentLen = len();
+	auto const currentLen = size();
 	if (cap() < currentLen + strLen) {
 		strLen = cap() - currentLen;
 		err = ox::Error(1, "Insufficient space for full string");
@@ -187,7 +187,7 @@ OX_CLANG_NOWARN_END
 
 template<std::size_t StrCap>
 constexpr Error IString<StrCap>::append(ox::StringView str) noexcept {
-	return append(str.data(), str.len());
+	return append(str.data(), str.size());
 }
 
 template<std::size_t StrCap>
@@ -207,7 +207,7 @@ constexpr const char *IString<StrCap>::c_str() const noexcept {
 
 
 template<std::size_t StrCap>
-constexpr std::size_t IString<StrCap>::len() const noexcept {
+constexpr std::size_t IString<StrCap>::size() const noexcept {
 	return m_size;
 }
 
@@ -245,7 +245,7 @@ struct MaybeView<ox::IString<sz>> {
 
 template<Integer_c Integer>
 [[nodiscard]]
-constexpr auto itoa(Integer v) noexcept {
+constexpr auto intToStr(Integer v) noexcept {
 	constexpr auto Cap = [] {
 		auto out = 0;
 		switch (sizeof(Integer)) {

deps/ox/src/ox/std/memory.hpp

@@ -213,8 +213,7 @@ class UniquePtr {
 			return m_t;
 		}
 
-		template<typename U, typename UDeleter>
-		constexpr void reset(UniquePtr<U, UDeleter> &&other = UniquePtr()) {
+		constexpr void reset(UniquePtr &&other = UniquePtr()) {
 			auto t = m_t;
 			m_t = other.release();
 			Deleter()(t);

deps/ox/src/ox/std/reader.cpp

@@ -30,13 +30,15 @@ constexpr std::ios_base::seekdir sdMap(ox::ios_base::seekdir in) noexcept {
 
 ox::Result<char> StreamReader::peek() const noexcept {
 	try {
+		if (m_strm.eof()) {
+			return Error{1, "EOF"};
+		}
 		char c{};
 		m_strm.get(c);
-		auto const ok = c != EOF;
-		if (ok && m_strm.unget()) [[unlikely]] {
-			return ox::Error(1, "Unable to unget character");
+		if (m_strm.unget()) [[unlikely]] {
+			return ox::Error{1, "Unable to unget character"};
 		}
-		return {static_cast<char>(c), ox::Error(!ok, "File peek failed")};
+		return static_cast<char>(c);
 	} catch (std::exception const&) {
 		return ox::Error(1, "peek failed");
 	}

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

@@ -8,6 +8,10 @@
 
 #pragma once
 
+#if __has_include(<array>)
+#include <array>
+#endif
+
 #include "array.hpp"
 #include "bit.hpp"
 #include "def.hpp"
@@ -35,6 +39,20 @@ class Span {
 
 		constexpr Span() noexcept = default;
 
+#if __has_include(<array>)
+		template<std::size_t sz>
+		constexpr Span(std::array<T, sz> &a) noexcept:
+			m_items(a.data()),
+			m_size(a.size()) {
+		}
+
+		template<std::size_t sz>
+		constexpr Span(std::array<ox::remove_const_t<T>, sz> const&a) noexcept:
+			m_items(a.data()),
+			m_size(a.size()) {
+		}
+#endif
+
 		template<std::size_t sz>
 		constexpr Span(ox::Array<T, sz> &a) noexcept:
 			m_items(a.data()),
@@ -128,12 +146,7 @@ class Span {
 			return iterator<const T&, const T*, true>(m_items, MaxValue<size_type>, m_size);
 		}
 
-		constexpr T &operator[](std::size_t i) noexcept {
-			boundsCheck(__FILE__, __LINE__, i, size(), "Span access overflow");
-			return m_items[i];
-		}
-
-		constexpr T const&operator[](std::size_t i) const noexcept {
+		constexpr T &operator[](std::size_t i) const noexcept {
 			boundsCheck(__FILE__, __LINE__, i, size(), "Span access overflow");
 			return m_items[i];
 		}
@@ -150,6 +163,24 @@ class Span {
 			return *this;
 		}
 
+		constexpr Span operator++(int) noexcept {
+			++m_items;
+			--m_size;
+			if (!m_size) [[unlikely]] {
+				m_items = nullptr;
+			}
+			return *this;
+		}
+
+		constexpr Span operator++() noexcept {
+			++m_items;
+			--m_size;
+			if (!m_size) [[unlikely]] {
+				m_items = nullptr;
+			}
+			return *this;
+		}
+
 		[[nodiscard]]
 		constexpr auto data() const noexcept {
 			return m_items;

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

@@ -28,7 +28,7 @@ OX_CLANG_NOWARN_BEGIN(-Wunsafe-buffer-usage)
 namespace ox {
 
 template<typename Integer>
-constexpr ox::IString<21> itoa(Integer v) noexcept;
+constexpr ox::IString<21> intToStr(Integer v) noexcept;
 
 template<std::size_t SmallStringSize_v>
 class BasicString {
@@ -139,7 +139,7 @@ class BasicString {
 
 		constexpr BasicString &operator+=(Integer_c auto i) noexcept;
 
-		constexpr BasicString &operator+=(StringView src) noexcept;
+		constexpr BasicString &operator+=(StringViewCR src) noexcept;
 
 		constexpr BasicString &operator+=(BasicString const&src) noexcept;
 
@@ -176,17 +176,17 @@ class BasicString {
 		constexpr char &operator[](std::size_t i) noexcept;
 
 		constexpr Error append(const char *str, std::size_t strLen) noexcept {
-			auto currentLen = len();
+			auto currentLen = size();
 			m_buff.resize(m_buff.size() + strLen);
 			ox::listcpy(&m_buff[currentLen], str, strLen);
 			// make sure last element is a null terminator
 			m_buff[currentLen + strLen] = 0;
 			// this can't fail, but it returns an Error to match BString::append
-			return ox::Error(0);
+			return {};
 		}
 
-		constexpr Error append(ox::StringView sv) noexcept {
-			return append(sv.data(), sv.len());
+		constexpr Error append(StringViewCR sv) noexcept {
+			return append(sv.data(), sv.size());
 		}
 
 		[[nodiscard]]
@@ -213,22 +213,22 @@ class BasicString {
 
 		[[nodiscard]]
 		constexpr const char *c_str() const noexcept {
-			return static_cast<const char*>(m_buff.data());
+			return m_buff.data();
 		}
 
 		[[nodiscard]]
-		inline explicit operator const char*() const {
+		constexpr explicit operator const char*() const {
 			return c_str();
 		}
 
 #if __has_include(<string>)
 		[[nodiscard]]
-		inline std::string toStdString() const {
+		std::string toStdString() const {
 			return c_str();
 		}
 
 		[[nodiscard]]
-		inline explicit operator std::string() const {
+		explicit operator std::string() const {
 			return c_str();
 		}
 #endif
@@ -237,7 +237,7 @@ class BasicString {
 		 * Returns the number of characters in this string.
 		 */
 		[[nodiscard]]
-		constexpr std::size_t len() const noexcept;
+		constexpr std::size_t size() const noexcept;
 
 		/**
 		 * Returns the number of bytes used for this string.
@@ -277,7 +277,7 @@ constexpr BasicString<SmallStringSize_v>::BasicString(const char *str, std::size
 
 template<std::size_t SmallStringSize_v>
 constexpr BasicString<SmallStringSize_v>::BasicString(StringLiteral const&str) noexcept:
-	BasicString(StringView{str.data(), str.len()}) {
+	BasicString(StringView{str.data(), str.size()}) {
 }
 
 template<std::size_t SmallStringSize_v>
@@ -317,13 +317,13 @@ constexpr BasicString<SmallStringSize_v> &BasicString<SmallStringSize_v>::operat
 
 template<std::size_t SmallStringSize_v>
 constexpr BasicString<SmallStringSize_v> &BasicString<SmallStringSize_v>::operator=(int64_t i) noexcept {
-	set(ox::itoa(i));
+	set(ox::intToStr(i));
 	return *this;
 }
 
 template<std::size_t SmallStringSize_v>
 constexpr BasicString<SmallStringSize_v> &BasicString<SmallStringSize_v>::operator=(uint64_t i) noexcept {
-	set(ox::itoa(i));
+	set(ox::intToStr(i));
 	return *this;
 }
 
@@ -371,12 +371,12 @@ constexpr BasicString<SmallStringSize_v> &BasicString<SmallStringSize_v>::operat
 
 template<std::size_t SmallStringSize_v>
 constexpr BasicString<SmallStringSize_v> &BasicString<SmallStringSize_v>::operator+=(Integer_c auto i) noexcept {
-	auto const str = ox::itoa(i);
+	auto const str = ox::intToStr(i);
 	return this->operator+=(str.c_str());
 }
 
 template<std::size_t SmallStringSize_v>
-constexpr BasicString<SmallStringSize_v> &BasicString<SmallStringSize_v>::operator+=(StringView s) noexcept {
+constexpr BasicString<SmallStringSize_v> &BasicString<SmallStringSize_v>::operator+=(StringViewCR s) noexcept {
 	std::size_t strLen = s.bytes();
 	std::ignore = append(s.data(), strLen);
 	return *this;
@@ -384,14 +384,14 @@ constexpr BasicString<SmallStringSize_v> &BasicString<SmallStringSize_v>::operat
 
 template<std::size_t SmallStringSize_v>
 constexpr BasicString<SmallStringSize_v> &BasicString<SmallStringSize_v>::operator+=(BasicString const&src) noexcept {
-	std::ignore = append(src.c_str(), src.len());
+	std::ignore = append(src.c_str(), src.size());
 	return *this;
 }
 
 template<std::size_t SmallStringSize_v>
 constexpr BasicString<SmallStringSize_v> BasicString<SmallStringSize_v>::operator+(const char *str) const noexcept {
 	const std::size_t strLen = ox::strlen(str);
-	const auto currentLen = len();
+	const auto currentLen = size();
 	BasicString<SmallStringSize_v> cpy;
 	cpy.m_buff.resize(m_buff.size() + strLen);
 	ox::listcpy(&cpy.m_buff[0], m_buff.data(), currentLen);
@@ -414,14 +414,14 @@ constexpr BasicString<SmallStringSize_v> BasicString<SmallStringSize_v>::operato
 
 template<std::size_t SmallStringSize_v>
 constexpr BasicString<SmallStringSize_v> BasicString<SmallStringSize_v>::operator+(Integer_c auto i) const noexcept {
-	auto const str = ox::itoa(i);
+	auto const str = ox::intToStr(i);
 	return *this + str;
 }
 
 template<std::size_t SmallStringSize_v>
 constexpr BasicString<SmallStringSize_v> BasicString<SmallStringSize_v>::operator+(StringViewCR src) const noexcept {
-	const std::size_t strLen = src.len();
-	const auto currentLen = len();
+	const std::size_t strLen = src.size();
+	const auto currentLen = size();
 	BasicString<SmallStringSize_v> cpy(currentLen + strLen);
 	cpy.m_buff.resize(m_buff.size() + strLen);
 	ox::listcpy(&cpy.m_buff[0], m_buff.data(), currentLen);
@@ -432,8 +432,8 @@ constexpr BasicString<SmallStringSize_v> BasicString<SmallStringSize_v>::operato
 
 template<std::size_t SmallStringSize_v>
 constexpr BasicString<SmallStringSize_v> BasicString<SmallStringSize_v>::operator+(BasicString const&src) const noexcept {
-	const std::size_t strLen = src.len();
-	const auto currentLen = len();
+	const std::size_t strLen = src.size();
+	const auto currentLen = size();
 	BasicString<SmallStringSize_v> cpy(currentLen + strLen);
 	cpy.m_buff.resize(m_buff.size() + strLen);
 	ox::listcpy(&cpy.m_buff[0], m_buff.data(), currentLen);
@@ -456,7 +456,7 @@ constexpr bool BasicString<SmallStringSize_v>::operator==(const char *other) con
 
 template<std::size_t SmallStringSize_v>
 constexpr bool BasicString<SmallStringSize_v>::operator==(OxString_c auto const&other) const noexcept {
-	return ox::StringView(*this) == ox::StringView(other);
+	return StringView(*this) == StringView(other);
 }
 
 template<std::size_t SmallStringSize_v>
@@ -521,7 +521,7 @@ constexpr std::size_t BasicString<SmallStringSize_v>::bytes() const noexcept {
 }
 
 template<std::size_t SmallStringSize_v>
-constexpr std::size_t BasicString<SmallStringSize_v>::len() const noexcept {
+constexpr std::size_t BasicString<SmallStringSize_v>::size() const noexcept {
 	return m_buff.size() - 1;
 }
 
@@ -548,28 +548,28 @@ using StringCR = String const&;
 
 
 [[nodiscard]]
-constexpr ox::String toString(ox::StringViewCR sv) noexcept {
+constexpr String toString(StringViewCR sv) noexcept {
 	return ox::String(sv);
 }
 
 
 template<typename PlatSpec, std::size_t SmallStringSize_v>
 [[nodiscard]]
-constexpr auto sizeOf(const ox::BasicString<SmallStringSize_v>*) noexcept {
+constexpr auto sizeOf(BasicString<SmallStringSize_v> const*) noexcept {
 	VectorMemMap<PlatSpec> v{.smallVecSize = SmallStringSize_v};
 	return sizeOf<PlatSpec>(&v);
 }
 
 template<typename PlatSpec, std::size_t SmallStringSize_v>
 [[nodiscard]]
-constexpr auto alignOf(const ox::BasicString<SmallStringSize_v>&) noexcept {
+constexpr auto alignOf(BasicString<SmallStringSize_v> const&) noexcept {
 	VectorMemMap<PlatSpec> v{.smallVecSize = SmallStringSize_v};
 	return alignOf<PlatSpec>(&v);
 }
 
 template<size_t sz>
-struct MaybeView<ox::BasicString<sz>> {
-	using type = ox::StringView;
+struct MaybeView<BasicString<sz>> {
+	using type = StringView;
 };
 
 }

deps/ox/src/ox/std/stringliteral.hpp

@@ -16,33 +16,28 @@ namespace ox {
  * StringLiteral is used for functions that want to ensure that they are taking
  * string literals, and not strings outside of the data section of the program
  * that might get deleted.
- * This type cannot force you to use it correctly, so don't give it something
- * that is not a literal.
- * If you do this:
- *		StringLiteral(str.c_str())
- *	the resulting segfault is on you.
  */
 class StringLiteral: public detail::BaseStringView {
 	public:
 		constexpr StringLiteral() noexcept = default;
 
-		constexpr StringLiteral(StringLiteral const&sv) noexcept = default;
+		constexpr StringLiteral(StringLiteral const &sv) noexcept = default;
 
-		constexpr explicit StringLiteral(std::nullptr_t) noexcept {}
+		consteval explicit StringLiteral(std::nullptr_t) noexcept {}
 
-		constexpr explicit StringLiteral(const char *str, std::size_t len) noexcept: BaseStringView(str, len) {}
+		consteval explicit StringLiteral(char const *str, std::size_t const len) noexcept: BaseStringView{str, len} {}
 
-		constexpr explicit StringLiteral(char const *str) noexcept: StringLiteral(str, ox::strlen(str)) {}
+		OX_ALLOW_UNSAFE_BUFFERS_BEGIN
+		consteval explicit StringLiteral(char const *str) noexcept: StringLiteral{str, ox::strlen(str)} {}
+		OX_ALLOW_UNSAFE_BUFFERS_END
 
-		constexpr StringLiteral &operator=(StringLiteral const&other) noexcept {
-			if (&other != this) {
-				set(other.data(), other.len());
-			}
+		constexpr StringLiteral &operator=(StringLiteral const &other) noexcept {
+			set(other.data(), other.size());
 			return *this;
 		}
 
 		[[nodiscard]]
-		constexpr const char *c_str() const noexcept {
+		constexpr char const *c_str() const noexcept {
 			return data();
 		}
 

deps/ox/src/ox/std/stringparam.hpp

@@ -8,6 +8,7 @@
 
 #pragma once
 
+#include "cstringview.hpp"
 #include "string.hpp"
 
 namespace ox {
@@ -20,6 +21,8 @@ class StringParam {
 		constexpr StringParam(StringParam &&o) noexcept: m_value{std::move(o.m_value)} {}
 		constexpr StringParam(char const*value) noexcept: m_value{value} {}
 		constexpr StringParam(detail::BaseStringView const&value) noexcept: m_value{value} {}
+		template<size_t sz>
+		constexpr StringParam(ox::IString<sz> const&value) noexcept: m_value{value} {}
 		constexpr StringParam(ox::String const&value) noexcept: m_value{value} {}
 		constexpr StringParam(ox::String &&value) noexcept: m_value{std::move(value)} {}
 		constexpr operator ox::String() && noexcept { return std::move(m_value); }

deps/ox/src/ox/std/stringview.hpp

@@ -40,10 +40,10 @@ class StringView: public detail::BaseStringView {
 		constexpr StringView(BaseStringView const&str) noexcept: BaseStringView(str.data(), str.bytes()) {}
 
 		template<std::size_t SmallStrSz>
-		constexpr StringView(const BasicString<SmallStrSz> &str) noexcept: BaseStringView(str.data(), str.len()) {}
+		constexpr StringView(const BasicString<SmallStrSz> &str) noexcept: BaseStringView(str.data(), str.size()) {}
 
 		template<std::size_t SmallStrSz>
-		constexpr StringView(const IString<SmallStrSz> &str) noexcept: BaseStringView(str.data(), str.len()) {}
+		constexpr StringView(const IString<SmallStrSz> &str) noexcept: BaseStringView(str.data(), str.size()) {}
 
 		constexpr StringView(std::nullptr_t) noexcept {}
 
@@ -53,24 +53,24 @@ class StringView: public detail::BaseStringView {
 
 		constexpr auto &operator=(StringView const&other) noexcept {
 			if (&other != this) {
-				set(other.data(), other.len());
+				set(other.data(), other.size());
 			}
 			return *this;
 		}
 
 };
 
-using StringViewCR = const StringView&;
+using StringViewCR = StringView const&;
 
 constexpr auto operator==(StringViewCR s1, StringViewCR s2) noexcept {
-	if (s2.len() != s1.len()) {
+	if (s2.size() != s1.size()) {
 		return false;
 	}
-	return ox::strncmp(s1.data(), s2.data(), s1.len()) == 0;
+	return ox::strncmp(s1.data(), s2.data(), s1.size()) == 0;
 }
 
 constexpr auto operator<=>(StringViewCR s1, StringViewCR s2) noexcept {
-	const auto maxLen = ox::min(s1.len(), s2.len());
+	const auto maxLen = ox::min(s1.size(), s2.size());
 	const auto a = &s1.front();
 	const auto b = &s2.front();
 	for (std::size_t i = 0; i < maxLen && (a[i] || b[i]); ++i) {
@@ -80,16 +80,16 @@ constexpr auto operator<=>(StringViewCR s1, StringViewCR s2) noexcept {
 			return 1;
 		}
 	}
-	if (s1.len() > s2.len()) {
+	if (s1.size() > s2.size()) {
 		return 1;
-	} else if (s1.len() < s2.len()) {
+	} else if (s1.size() < s2.size()) {
 		return -1;
 	} else {
 		return 0;
 	}
 }
 
-constexpr auto write(Writer_c auto &writer, ox::StringViewCR sv) noexcept {
+constexpr auto write(Writer_c auto &writer, StringViewCR sv) noexcept {
 	return writer.write(sv.data(), sv.bytes());
 }
 
@@ -100,19 +100,24 @@ constexpr auto toStdStringView(StringViewCR sv) noexcept {
 #endif
 
 
-constexpr ox::Result<int> atoi(ox::StringViewCR str) noexcept {
+constexpr ox::Result<int> strToInt(StringViewCR str) noexcept {
+	OX_ALLOW_UNSAFE_BUFFERS_BEGIN
 	int total = 0;
 	int multiplier = 1;
-	for (auto i = static_cast<int64_t>(str.len()) - 1; i != -1; --i) {
+	if (str.size() == 0) [[unlikely]] {
+		return Error{1, "Empty string passed to strToInt"};
+	}
+	for (auto i = static_cast<int64_t>(str.size()) - 1; i != -1; --i) {
 		auto s = static_cast<std::size_t>(i);
 		if (str[s] >= '0' && str[s] <= '9') {
 			total += (str[s] - '0') * multiplier;
 			multiplier *= 10;
 		} else {
-			return ox::Error(1);
+			return ox::Error{1};
 		}
 	}
 	return total;
+	OX_ALLOW_UNSAFE_BUFFERS_END
 }
 
 

deps/ox/src/ox/std/strops.cpp

@@ -9,6 +9,8 @@
 #include "def.hpp"
 #include "strops.hpp"
 
+OX_ALLOW_UNSAFE_BUFFERS_BEGIN
+
 static_assert(ox::strcmp("asdf", "hijk") < 0, "asdf < hijk");
 static_assert(ox::strcmp("hijk", "asdf") > 0, "hijk > asdf");
 static_assert(ox::strcmp("resize", "read") > 0, "resize > read");
@@ -42,3 +44,5 @@ std::size_t strlen(const char *str) {
 }
 
 #endif
+
+OX_ALLOW_UNSAFE_BUFFERS_END

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

@@ -21,37 +21,47 @@ OX_CLANG_NOWARN_BEGIN(-Wunsafe-buffer-usage)
 namespace ox {
 
 [[nodiscard]]
-constexpr ox::StringView substr(ox::StringView const&str, std::size_t pos) noexcept {
-	if (str.len() >= pos) {
-		return {&str[pos], str.len() - pos};
+constexpr StringView substr(StringViewCR str, std::size_t const pos) noexcept {
+	if (str.size() >= pos) {
+		return {&str[pos], str.size() - pos};
 	}
 	return {};
 }
 
 [[nodiscard]]
-constexpr ox::StringView substr(ox::StringView const&str, std::size_t start, std::size_t end) noexcept {
-	if (str.len() >= start && end >= start) {
+constexpr StringView substr(StringViewCR str, std::size_t const start, std::size_t const end) noexcept {
+	if (str.size() >= start && end >= start) {
 		return {&str[start], end - start};
 	}
 	return {};
 }
 
+[[nodiscard]]
+constexpr bool beginsWith(StringViewCR base, char const beginning) noexcept {
+	return base.size() && base[0] == beginning;
+}
+
+[[nodiscard]]
+constexpr bool endsWith(StringViewCR base, char const ending) noexcept {
+	return base.size() && base[base.size() - 1] == ending;
+}
+
 [[nodiscard]]
 constexpr bool beginsWith(StringViewCR base, StringViewCR beginning) noexcept {
-	const auto beginningLen = ox::min(beginning.len(), base.len());
-	return base.len() >= beginning.len() && ox::strncmp(base.data(), beginning, beginningLen) == 0;
+	const auto beginningLen = ox::min(beginning.size(), base.size());
+	return base.size() >= beginning.size() && ox::strncmp(base.data(), beginning, beginningLen) == 0;
 }
 
 [[nodiscard]]
 constexpr bool endsWith(StringViewCR base, StringViewCR ending) noexcept {
-	const auto endingLen = ending.len();
-	return base.len() >= endingLen && ox::strcmp(base.data() + (base.len() - endingLen), ending) == 0;
+	const auto endingLen = ending.size();
+	return base.size() >= endingLen && ox::strcmp(base.data() + (base.size() - endingLen), ending) == 0;
 }
 
 [[nodiscard]]
-constexpr std::size_t find(StringViewCR str, char search) noexcept {
+constexpr std::size_t find(StringViewCR str, char const search) noexcept {
 	std::size_t i = 0;
-	for (; i < str.len(); ++i) {
+	for (; i < str.size(); ++i) {
 		if (str[i] == search) {
 			break;
 		}
@@ -62,7 +72,7 @@ constexpr std::size_t find(StringViewCR str, char search) noexcept {
 [[nodiscard]]
 constexpr std::size_t find(StringViewCR str, StringViewCR search) noexcept {
 	std::size_t i = 0;
-	for (; i < str.len(); ++i) {
+	for (; i < str.size(); ++i) {
 		if (beginsWith(substr(str, i), search)) {
 			break;
 		}
@@ -72,14 +82,14 @@ constexpr std::size_t find(StringViewCR str, StringViewCR search) noexcept {
 
 template<std::size_t smallSz = 0>
 [[nodiscard]]
-constexpr ox::Vector<ox::StringView, smallSz> split(StringViewCR str, char del) noexcept {
+constexpr ox::Vector<ox::StringView, smallSz> split(StringViewCR str, char const del) noexcept {
 	ox::Vector<ox::StringView, smallSz> out;
 	constexpr auto nextSeg = [](StringViewCR current, char del) {
 		return substr(current, find(current, del) + 1);
 	};
-	for (auto current = str; current.len(); current = nextSeg(current, del)) {
+	for (auto current = str; current.size(); current = nextSeg(current, del)) {
 		const auto next = find(current, del);
-		if (const auto s = substr(current, 0, next); s.len()) {
+		if (const auto s = substr(current, 0, next); s.size()) {
 			out.emplace_back(s);
 		}
 		current = substr(current, next);
@@ -92,11 +102,11 @@ template<std::size_t smallSz = 0>
 constexpr ox::Vector<ox::StringView, smallSz> split(StringViewCR str, StringViewCR del) noexcept {
 	ox::Vector<ox::StringView, smallSz> out;
 	constexpr auto nextSeg = [](StringViewCR current, StringViewCR del) {
-		return substr(current, find(current, del) + del.len());
+		return substr(current, find(current, del) + del.size());
 	};
-	for (auto current = str; current.len(); current = nextSeg(current, del)) {
+	for (auto current = str; current.size(); current = nextSeg(current, del)) {
 		const auto next = find(current, del);
-		if (const auto s = substr(current, 0, next); s.len()) {
+		if (const auto s = substr(current, 0, next); s.size()) {
 			out.emplace_back(s);
 		}
 		current = substr(current, next);
@@ -105,7 +115,7 @@ constexpr ox::Vector<ox::StringView, smallSz> split(StringViewCR str, StringView
 }
 
 [[nodiscard]]
-constexpr ox::Result<std::size_t> lastIndexOf(ox::StringViewCR str, int character) noexcept {
+constexpr ox::Result<std::size_t> lastIndexOf(ox::StringViewCR str, int const character) noexcept {
 	ox::Result<std::size_t> retval = ox::Error(1, "Character not found");
 	for (auto i = static_cast<int>(str.bytes() - 1); i >= 0; --i) {
 		if (str[static_cast<std::size_t>(i)] == character) {

deps/ox/src/ox/std/test/tests.cpp

@@ -145,6 +145,7 @@ OX_CLANG_NOWARN_END
 			return ox::Error{};
 		}
 	},
+	OX_ALLOW_UNSAFE_BUFFERS_BEGIN
 	{
 		"ABCDEFG != HIJKLMN",
 		[]() {
@@ -169,6 +170,7 @@ OX_CLANG_NOWARN_END
 			return ox::Error(ox::memcmp("ABCDEFGHI", "ABCDEFG", 7) != 0);
 		}
 	},
+	OX_ALLOW_UNSAFE_BUFFERS_END
 	{
 		"IString",
 		[]() {
@@ -181,7 +183,7 @@ OX_CLANG_NOWARN_END
 			s = "asdf";
 			oxAssert(s == "asdf", "String assign broken");
 			oxAssert(s != "aoeu", "String assign broken");
-			oxAssert(s.len() == 4, "String assign broken");
+			oxAssert(s.size() == 4, "String assign broken");
 			return ox::Error(0);
 		}
 	},

deps/ox/src/ox/std/trace.hpp

@@ -166,7 +166,7 @@ class OutStream {
 		constexpr OutStream &operator<<(Integer_c auto v) noexcept;
 
 		constexpr OutStream &operator<<(char v) noexcept {
-			if (m_msg.msg.len()) {
+			if (m_msg.msg.size()) {
 				m_msg.msg += m_delimiter;
 			}
 			m_msg.msg += v;
@@ -174,7 +174,7 @@ class OutStream {
 		}
 
 		constexpr OutStream &operator<<(StringViewCR v) noexcept {
-			if (m_msg.msg.len()) {
+			if (m_msg.msg.size()) {
 				m_msg.msg += m_delimiter;
 			}
 			m_msg.msg += v;
@@ -209,7 +209,7 @@ class OutStream {
 
 	private:
 		constexpr OutStream &appendSignedInt(int64_t v) noexcept {
-			if (m_msg.msg.len()) {
+			if (m_msg.msg.size()) {
 				m_msg.msg += m_delimiter;
 			}
 			m_msg.msg += static_cast<int64_t>(v);
@@ -217,7 +217,7 @@ class OutStream {
 		}
 
 		constexpr OutStream &appendUnsignedInt(uint64_t v) noexcept {
-			if (m_msg.msg.len()) {
+			if (m_msg.msg.size()) {
 				m_msg.msg += m_delimiter;
 			}
 			m_msg.msg += static_cast<int64_t>(v);
@@ -227,7 +227,7 @@ class OutStream {
 };
 
 constexpr OutStream &OutStream::operator<<(Integer_c auto v) noexcept {
-	if (m_msg.msg.len()) {
+	if (m_msg.msg.size()) {
 		m_msg.msg += m_delimiter;
 	}
 	m_msg.msg += v;

deps/ox/src/ox/std/tracehook.cpp

@@ -39,6 +39,8 @@ enum LogChan {
 	Debug = 4,
 };
 
+OX_ALLOW_UNSAFE_BUFFERS_BEGIN
+
 template<LogChan chan>
 static void log(ox::StringViewCR str) {
 	const auto sz = ox::min<std::size_t>(0x100, str.bytes());
@@ -103,5 +105,7 @@ void oxTraceHook([[maybe_unused]] const char *file, [[maybe_unused]] int line,
 #endif
 }
 
+OX_ALLOW_UNSAFE_BUFFERS_END
+
 }
 

deps/ox/src/ox/std/utility.hpp

@@ -32,9 +32,9 @@ constexpr bool cmp_equal(T const t, U const u) noexcept {
 	if constexpr(ox::is_signed_v<T> == ox::is_signed_v<U>) {
 		return t == u;
 	} else if constexpr(ox::is_signed_v<T>) {
-		return ox::Signed<T>{t} == u;
+		return t >= 0 && static_cast<ox::Unsigned<T>>(t) == u;
 	} else {
-		return t == ox::Signed<U>{u};
+		return u >= 0 && t == static_cast<ox::Unsigned<U>>(u);
 	}
 }
 
@@ -43,9 +43,9 @@ constexpr bool cmp_less(T const t, U const u) noexcept {
 	if constexpr(ox::is_signed_v<T> == ox::is_signed_v<U>) {
 		return t < u;
 	} else if constexpr(ox::is_signed_v<T>) {
-		return ox::Signed<T>{t} < u;
+		return t < 0 || static_cast<ox::Unsigned<T>>(t) < u;
 	} else {
-		return t < ox::Signed<U>{u};
+		return u >= 0 && t < static_cast<ox::Unsigned<U>>(u);
 	}
 }
 
@@ -69,6 +69,13 @@ constexpr bool cmp_greater_equal(T const t, U const u) noexcept {
 	return !std::cmp_less(t, u);
 }
 
+static_assert(cmp_less(-1, 5u));
+static_assert(!cmp_less(5u, -1));
+static_assert(cmp_equal(5u, 5));
+static_assert(cmp_equal(5, 5u));
+static_assert(!cmp_equal(-5, 5u));
+static_assert(!cmp_equal(4u, 5u));
+
 }
 #endif
 

deps/ox/src/ox/std/uuid.hpp

@@ -58,7 +58,7 @@ constexpr ox::Result<uint8_t> fromHex(ox::StringViewCR v) noexcept {
 	if (!detail::isHexChar(v[0]) || !detail::isHexChar(v[1])) {
 		return ox::Error(1, "Invalid UUID");
 	}
-	if (v.len() != 2) {
+	if (v.size() != 2) {
 		return ox::Error(2);
 	}
 	uint8_t out = 0;
@@ -105,6 +105,10 @@ class UUID {
 		ox::Array<uint8_t, 16> m_value{};
 
 	public:
+
+		static constexpr auto TypeName = "net.drinkingtea.ox.UUID";
+		static constexpr auto TypeVersion = 1;
+
 		static void seedGenerator(const RandomSeed &seed) noexcept;
 
 		static ox::Result<UUID> generate() noexcept;
@@ -129,18 +133,18 @@ class UUID {
 		}
 
 		static constexpr ox::Result<ox::UUID> fromString(ox::StringViewCR s) noexcept {
-			if (s.len() < 36) {
+			if (s.size() < 36) {
 				return ox::Error(1, "Insufficient data to contain a complete UUID");
 			}
 			UUID out;
 			auto valueI = 0u;
-			for (size_t i = 0; i < s.len();) {
+			for (size_t i = 0; i < s.size();) {
 				if (s[i] == '-') {
 					++i;
 					continue;
 				}
 				const auto seg = substr(s, i, i + 2);
-				if (seg.len() != 2) {
+				if (seg.size() != 2) {
 					return ox::Error(1, "Invalid UUID");
 				}
 				OX_REQUIRE(val, detail::fromHex(seg));
@@ -170,7 +174,7 @@ class UUID {
 				for (auto i = 0u; i < cnt; ++i) {
 					const auto v = value[valueI];
 					const auto h = detail::toHex(v);
-					std::ignore = writer.write(h.c_str(), h.len());
+					std::ignore = writer.write(h.c_str(), h.size());
 					++valueI;
 				}
 			};

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

@@ -87,7 +87,9 @@ struct VectorAllocator {
 		constexpr void deallocate(T *items, std::size_t cap) noexcept {
 			// small vector optimization cannot be done it constexpr, but it doesn't really matter in constexpr
 			if (std::is_constant_evaluated()) {
-				Allocator{}.deallocate(items, cap);
+				if (items) {
+					Allocator{}.deallocate(items, cap);
+				}
 			} else {
 				if (items && static_cast<void*>(items) != static_cast<void*>(m_data.data())) {
 					Allocator{}.deallocate(items, cap);
@@ -311,7 +313,7 @@ class Vector: detail::VectorAllocator<T, Allocator, SmallVectorSize> {
 		 */
 		constexpr Error unordered_erase(std::size_t pos) noexcept(useNoexcept);
 
-		constexpr Error remove(T const &val);
+		constexpr Error remove(MaybeView_t<T> const &val);
 
 		constexpr void reserve(std::size_t cap) noexcept(useNoexcept);
 
@@ -658,11 +660,11 @@ constexpr Error Vector<T, SmallVectorSize, Allocator>::unordered_erase(std::size
 	--m_size;
 	m_items[pos] = std::move(m_items[m_size]);
 	m_items[m_size].~T();
-	return ox::Error(0);
+	return {};
 }
 
 template<typename T, std::size_t SmallVectorSize, typename Allocator>
-constexpr ox::Error Vector<T, SmallVectorSize, Allocator>::remove(T const &val) {
+constexpr ox::Error Vector<T, SmallVectorSize, Allocator>::remove(MaybeView_t<T> const &val) {
 	for (size_t i{}; auto const &v : *this) {
 		if (v == val) {
 			return erase(i).error;

deps/teagba/include/teagba/addresses.hpp

@@ -5,103 +5,117 @@
 #pragma once
 
 #include <ox/std/array.hpp>
-#include <ox/std/types.hpp>
+#include <ox/std/units.hpp>
 
 /////////////////////////////////////////////////////////////////
 // Interrupt Handler
 
-using interrupt_handler = void (*)();
-#define REG_ISR *reinterpret_cast<interrupt_handler*>(0x0300'7FFC)
-#define REG_IE  *reinterpret_cast<volatile uint16_t*>(0x0400'0200)
-#define REG_IF  *reinterpret_cast<volatile uint16_t*>(0x0400'0202)
-#define REG_IME *reinterpret_cast<volatile uint16_t*>(0x0400'0208)
+using InterruptHandler = void(*)();
+#define REG_ISR (*reinterpret_cast<InterruptHandler*>(0x0300'7FFC))
+#define REG_IE  (*reinterpret_cast<volatile uint16_t*>(0x0400'0200))
+#define REG_IF  (*reinterpret_cast<volatile uint16_t*>(0x0400'0202))
+#define REG_IME (*reinterpret_cast<volatile uint16_t*>(0x0400'0208))
 
 /////////////////////////////////////////////////////////////////
 // Display Registers
 
-#define REG_DISPCTL  *reinterpret_cast<volatile uint32_t*>(0x0400'0000)
-#define REG_DISPSTAT *reinterpret_cast<volatile uint32_t*>(0x0400'0004)
-#define REG_VCOUNT   *reinterpret_cast<volatile uint32_t*>(0x0400'0006)
+#define REG_DISPCTL  (*reinterpret_cast<volatile uint32_t*>(0x0400'0000))
+#define REG_DISPSTAT (*reinterpret_cast<volatile uint32_t*>(0x0400'0004))
+#define REG_VCOUNT   (*reinterpret_cast<volatile uint32_t*>(0x0400'0006))
 
 /////////////////////////////////////////////////////////////////
 // Timers
 
-#define REG_TIMER0    *reinterpret_cast<volatile uint16_t*>(0x0400'0100)
-#define REG_TIMER0CTL *reinterpret_cast<volatile uint16_t*>(0x0400'0102)
+#define REG_TIMER0    (*reinterpret_cast<volatile uint16_t*>(0x0400'0100))
+#define REG_TIMER0CTL (*reinterpret_cast<volatile uint16_t*>(0x0400'0102))
 
-#define REG_TIMER1    *reinterpret_cast<volatile uint16_t*>(0x0400'0104)
-#define REG_TIMER1CTL *reinterpret_cast<volatile uint16_t*>(0x0400'0106)
+#define REG_TIMER1    (*reinterpret_cast<volatile uint16_t*>(0x0400'0104))
+#define REG_TIMER1CTL (*reinterpret_cast<volatile uint16_t*>(0x0400'0106))
 
-#define REG_TIMER2    *reinterpret_cast<volatile uint16_t*>(0x0400'0108)
-#define REG_TIMER2CTL *reinterpret_cast<volatile uint16_t*>(0x0400'010a)
+#define REG_TIMER2    (*reinterpret_cast<volatile uint16_t*>(0x0400'0108))
+#define REG_TIMER2CTL (*reinterpret_cast<volatile uint16_t*>(0x0400'010a))
 
-#define REG_TIMER3    *reinterpret_cast<volatile uint16_t*>(0x0400'010c)
-#define REG_TIMER3CTL *reinterpret_cast<volatile uint16_t*>(0x0400'010e)
+#define REG_TIMER3    (*reinterpret_cast<volatile uint16_t*>(0x0400'010c))
+#define REG_TIMER3CTL (*reinterpret_cast<volatile uint16_t*>(0x0400'010e))
 
 /////////////////////////////////////////////////////////////////
 // background registers
 
 // background control registers
 using BgCtl = uint16_t;
-#define REG_BG0CTL *reinterpret_cast<volatile BgCtl*>(0x0400'0008)
-#define REG_BG1CTL *reinterpret_cast<volatile BgCtl*>(0x0400'000a)
-#define REG_BG2CTL *reinterpret_cast<volatile BgCtl*>(0x0400'000c)
-#define REG_BG3CTL *reinterpret_cast<volatile BgCtl*>(0x0400'000e)
+#define REG_BG0CTL (*reinterpret_cast<volatile BgCtl*>(0x0400'0008))
+#define REG_BG1CTL (*reinterpret_cast<volatile BgCtl*>(0x0400'000a))
+#define REG_BG2CTL (*reinterpret_cast<volatile BgCtl*>(0x0400'000c))
+#define REG_BG3CTL (*reinterpret_cast<volatile BgCtl*>(0x0400'000e))
 
 [[nodiscard]]
-inline volatile BgCtl &regBgCtl(uintptr_t bgIdx) noexcept {
+inline volatile BgCtl &regBgCtl(uintptr_t const bgIdx) noexcept {
 	return *reinterpret_cast<volatile BgCtl*>(0x0400'0008 + 2 * bgIdx);
 }
 
 // background horizontal scrolling registers
-#define REG_BG0HOFS *reinterpret_cast<volatile uint32_t*>(0x0400'0010)
-#define REG_BG1HOFS *reinterpret_cast<volatile uint32_t*>(0x0400'0014)
-#define REG_BG2HOFS *reinterpret_cast<volatile uint32_t*>(0x0400'0018)
-#define REG_BG3HOFS *reinterpret_cast<volatile uint32_t*>(0x0400'001c)
+#define REG_BG0HOFS (*reinterpret_cast<volatile int16_t*>(0x0400'0010))
+#define REG_BG1HOFS (*reinterpret_cast<volatile int16_t*>(0x0400'0014))
+#define REG_BG2HOFS (*reinterpret_cast<volatile int16_t*>(0x0400'0018))
+#define REG_BG3HOFS (*reinterpret_cast<volatile int16_t*>(0x0400'001c))
 
 [[nodiscard]]
-inline volatile uint32_t &regBgHofs(auto bgIdx) noexcept {
-	return *reinterpret_cast<volatile uint32_t*>(0x0400'0010 + 4 * bgIdx);
+volatile int16_t &regBgHofs(auto const bgIdx) noexcept {
+	return *reinterpret_cast<volatile int16_t*>(0x0400'0010 + 4 * bgIdx);
 }
 
 // background vertical scrolling registers
-#define REG_BG0VOFS *reinterpret_cast<volatile uint32_t*>(0x0400'0012)
-#define REG_BG1VOFS *reinterpret_cast<volatile uint32_t*>(0x0400'0016)
-#define REG_BG2VOFS *reinterpret_cast<volatile uint32_t*>(0x0400'001a)
-#define REG_BG3VOFS *reinterpret_cast<volatile uint32_t*>(0x0400'001e)
+#define REG_BG0VOFS (*reinterpret_cast<volatile int16_t*>(0x0400'0012))
+#define REG_BG1VOFS (*reinterpret_cast<volatile int16_t*>(0x0400'0016))
+#define REG_BG2VOFS (*reinterpret_cast<volatile int16_t*>(0x0400'001a))
+#define REG_BG3VOFS (*reinterpret_cast<volatile int16_t*>(0x0400'001e))
 
 [[nodiscard]]
-inline volatile uint32_t &regBgVofs(auto bgIdx) noexcept {
-	return *reinterpret_cast<volatile uint32_t*>(0x0400'0012 + 4 * bgIdx);
+volatile int16_t &regBgVofs(auto const bgIdx) noexcept {
+	return *reinterpret_cast<volatile int16_t*>(0x0400'0012 + 4 * bgIdx);
+}
+
+// background scrolling registers
+
+struct OffsetPair {
+	int16_t x{}, y{};
+};
+
+#define REG_BG0OFS (*reinterpret_cast<volatile OffsetPair*>(0x0400'0010))
+#define REG_BG1OFS (*reinterpret_cast<volatile OffsetPair*>(0x0400'0014))
+#define REG_BG2OFS (*reinterpret_cast<volatile OffsetPair*>(0x0400'0018))
+#define REG_BG3OFS (*reinterpret_cast<volatile OffsetPair*>(0x0400'001c))
+
+[[nodiscard]]
+volatile OffsetPair &regBgOfs(auto const bgIdx) noexcept {
+	return *reinterpret_cast<volatile OffsetPair*>(0x0400'0010 + sizeof(OffsetPair) * bgIdx);
 }
 
 /////////////////////////////////////////////////////////////////
 // User Input
 
-#define REG_GAMEPAD *reinterpret_cast<volatile uint16_t*>(0x0400'0130)
+#define REG_GAMEPAD (*reinterpret_cast<volatile uint16_t*>(0x0400'0130))
 
 /////////////////////////////////////////////////////////////////
 // Memory Addresses
 
-#define MEM_EWRAM_BEGIN reinterpret_cast<uint8_t*>(0x0200'0000)
-#define MEM_EWRAM_END   reinterpret_cast<uint8_t*>(0x0203'FFFF)
+#define MEM_EWRAM (*reinterpret_cast<ox::Array<uint16_t, 0x0203'FFFF - 0x0200'0000>*>(0x0200'0000))
 
-#define MEM_IWRAM_BEGIN reinterpret_cast<uint8_t*>(0x0300'0000)
-#define MEM_IWRAM_END   reinterpret_cast<uint8_t*>(0x0300'7FFF)
+#define MEM_IWRAM (*reinterpret_cast<ox::Array<uint8_t, 0x0300'7FFF - 0x0300'0000>*>(0x0300'0000))
 
-#define REG_BLNDCTL *reinterpret_cast<uint16_t*>(0x0400'0050)
+#define REG_BLNDCTL (*reinterpret_cast<uint16_t*>(0x0400'0050))
 
-#define MEM_BG_PALETTE reinterpret_cast<uint16_t*>(0x0500'0000)
-#define MEM_SPRITE_PALETTE reinterpret_cast<uint16_t*>(0x0500'0200)
+using Palette = ox::Array<uint16_t, 128>;
+#define MEM_BG_PALETTE (*reinterpret_cast<::Palette*>(0x0500'0000))
+#define MEM_SPRITE_PALETTE (*reinterpret_cast<::Palette*>(0x0500'0200))
 
 using BgMapTile = ox::Array<uint16_t, 8192>;
-#define MEM_BG_TILES reinterpret_cast<BgMapTile*>(0x0600'0000)
-#define MEM_BG_MAP reinterpret_cast<BgMapTile*>(0x0600'e000)
+#define MEM_BG_TILES (*reinterpret_cast<ox::Array<BgMapTile, 4>*>(0x0600'0000))
+#define MEM_BG_MAP (*reinterpret_cast<ox::Array<BgMapTile, 4>*>(0x0600'e000))
 
-#define MEM_SPRITE_TILES reinterpret_cast<uint16_t*>(0x0601'0000)
-#define MEM_OAM reinterpret_cast<uint64_t*>(0x0700'0000)
+#define MEM_SPRITE_TILES (*reinterpret_cast<ox::Array<uint16_t, 32 * ox::units::KB>*>(0x0601'0000))
+#define MEM_OAM (*reinterpret_cast<ox::Array<uint64_t, 64>*>(0x0700'0000))
 
-#define MEM_ROM reinterpret_cast<char*>(0x0800'0000)
+#define MEM_ROM (*reinterpret_cast<ox::Array<char, 32 * ox::units::MB>*>(0x0700'0000))
 
-#define MEM_SRAM reinterpret_cast<char*>(0x0e00'0000)
-#define MEM_SRAM_SIZE 65535
+#define MEM_SRAM (*reinterpret_cast<ox::Array<char, 64 * ox::units::KB>*>(0x0e00'0000))

deps/teagba/include/teagba/gfx.hpp

@@ -37,8 +37,12 @@ struct OX_ALIGN8 GbaSpriteAttrUpdate {
 
 GbaSpriteAttrUpdate &spriteAttr(size_t i) noexcept;
 
-void addSpriteUpdate(const GbaSpriteAttrUpdate &upd) noexcept;
+void addSpriteUpdate(GbaSpriteAttrUpdate const &upd) noexcept;
 
 void applySpriteUpdates() noexcept;
 
+void setBgOffset(uint16_t bg, int16_t x, int16_t y) noexcept;
+
+void scrollBgOffset(uint16_t bg, int16_t x, int16_t y) noexcept;
+
 }

deps/teagba/src/cstartup.cpp

@@ -2,6 +2,8 @@
  * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved.
  */
 
+#ifdef __GNUC__
+
 #include <ox/std/heapmgr.hpp>
 
 #include <teagba/bios.hpp>
@@ -24,7 +26,7 @@ extern void (*__preinit_array_end[]) (void);
 extern void (*__init_array_start[]) (void);
 extern void (*__init_array_end[]) (void);
 
-int main(int argc, const char **argv);
+int main(int argc, char const **argv);
 
 extern "C" {
 
@@ -48,7 +50,7 @@ void __libc_init_array() {
 }
 
 int c_start() {
-	const char *args[2] = {"", "rom.oxfs"};
+	char const *args[2] = {"", "rom.oxfs"};
 	ox::heapmgr::initHeap(HEAP_BEGIN, HEAP_END);
 	mgba::initConsole();
 #pragma GCC diagnostic push
@@ -58,3 +60,5 @@ int c_start() {
 }
 
 }
+
+#endif

deps/teagba/src/gfx.cpp

@@ -12,11 +12,11 @@ namespace teagba {
 
 static ox::Array<GbaSpriteAttrUpdate, 128> g_spriteBuffer;
 
-GbaSpriteAttrUpdate &spriteAttr(size_t i) noexcept {
+GbaSpriteAttrUpdate &spriteAttr(size_t const i) noexcept {
 	return g_spriteBuffer[i];
 }
 
-void addSpriteUpdate(const GbaSpriteAttrUpdate &upd) noexcept {
+void addSpriteUpdate(GbaSpriteAttrUpdate const &upd) noexcept {
 	const auto ie = REG_IE; // disable vblank interrupt handler
 	REG_IE = REG_IE & static_cast<uint16_t>(~teagba::Int_vblank); // disable vblank interrupt handler
 	g_spriteBuffer[upd.idx] = upd;
@@ -29,4 +29,16 @@ void applySpriteUpdates() noexcept {
 	}
 }
 
+void setBgOffset(uint16_t const bg, int16_t const x, int16_t const y) noexcept {
+	auto &o = regBgOfs(bg);
+	o.x = x;
+	o.y = y;
+}
+
+void scrollBgOffset(uint16_t const bg, int16_t const x, int16_t const y) noexcept {
+	auto &o = regBgOfs(bg);
+	o.x = o.x + x;
+	o.y = o.y + y;
+}
+
 }

release-notes.md

@@ -1,4 +1,56 @@
-# d2025.02
+# d2025.07.0
+
+* Add sub-command for exporting TileSheets as PNG files.
+* Add 'Reload Project' menu item under File.
+* Fix opening a project to mark an unopenable file as closed in the config file on startup.
+
+# d2025.06.0
+
+* Add ability to remember recent projects in config
+* Add navigation support (back and forward)
+* Fix file deletion to close file even if not active
+* Fix file copy to work when creating a copy with the name of a previously
+  deleted file
+* Fix crash that could occur after switching projects
+* Make file picker popup accept on double click of a file
+* TileSheetEditor: Fix copy/cut/paste enablement when there is no selection
+* TileSheetEditor: Fix manual redo of draw actions, fix drawing to pixel 0, 0
+  as first action
+* TileSheetEditor: Fix draw command to work on same pixel after switching
+  subsheets
+* PaletteEditor: Add RGB key shortcuts for focusing color channels
+* PaletteEditor: Add color preview to color editor
+
+# 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
+* Change application font to Roboto Medium
+* Closing application will now confirm with user if any files have unsaved
+  changes.
+* UUID duplicates will now be reported when opening a project.
+* Deleting a directory now closes files in that directory.
+* Delete key now initiates deletion of selected directory.
+* Remove ability to re-order tabs. There were bugs associated with that.
+* Mac: Menu bar shortcuts now say Cmd instead of Ctrl.
+* TileSheetEditor: Fix selection clearing to work when clicking outside image.
+* TileSheetEditor: Fix Delete Tile functionality, which was completely broken
+* TileSheetEditor: Fix Insert Tile functionality, which was completely broken
+* PaletteEditor: Fix color number key range. Previously, pressing A caused the
+  editor to jump to the last color.
+* PaletteEditor: Page rename will now take effect upon pressing enter if the
+  text input has focus
+
+# d2025.02.1
+
+* Fix closing tab with unsaved changes (a44c5acc4b)
+
+# d2025.02.0
 
 * Rename core namespace to gfx.
 * Add PaletteV5 to accommodate namespace change.

sample_project/Palettes/SC9K_Logo.npal

@@ -0,0 +1,28 @@
+K1;3d1a77ec-265f-4905-2061-4f1003ee2189;O1;net.drinkingtea.nostalgia.gfx.Palette;5;{
+	"colorNames" : 
+	[
+		"Color 1",
+		"Color 2",
+		"Color 3"
+	],
+	"pages" : 
+	[
+		{
+			"colors" : 
+			[
+				{
+					"b" : 10,
+					"g" : 5,
+					"r" : 5
+				},
+				{},
+				{
+					"b" : 31,
+					"g" : 31,
+					"r" : 31
+				}
+			],
+			"name" : "Page 1"
+		}
+	]
+}

sample_project/TileSheets/NS_Logo16.nts

@@ -0,0 +1,269 @@
+K1;e7ae945e-d6c5-4444-5738-be95b4e5937a;O1;net.drinkingtea.nostalgia.gfx.TileSheet;5;{
+	"bpp" : 4,
+	"defaultPalette" : "uuid://c79f21e2-f74f-4ad9-90ed-32b0ef7da6ed",
+	"subsheet" : 
+	{
+		"columns" : 2,
+		"name" : "Root",
+		"pixels" : 
+		[
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			1,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			1,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			1,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			1,
+			1,
+			0,
+			0,
+			0,
+			0,
+			0,
+			1,
+			0,
+			0,
+			0,
+			0,
+			3,
+			3,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			1,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			1,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			1,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			1,
+			1,
+			0,
+			0,
+			2,
+			3,
+			0,
+			0,
+			0,
+			0,
+			1,
+			0,
+			0,
+			1,
+			0,
+			0,
+			0,
+			0,
+			3,
+			2,
+			0,
+			0,
+			1,
+			1,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			1,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			1,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			1,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			3,
+			3,
+			0,
+			0,
+			0,
+			0,
+			1,
+			0,
+			0,
+			0,
+			0,
+			0,
+			1,
+			1,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			1,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			1,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			1,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0
+		],
+		"rows" : 2
+	}
+}

src/nostalgia/modules/gfx/include/nostalgia/gfx/color.hpp

@@ -19,10 +19,10 @@ using Color32 = uint32_t;
 
 [[nodiscard]]
 constexpr Color32 toColor32(Color16 nc) noexcept {
-	const auto r = static_cast<Color32>(((nc & 0b0000000000011111) >> 0) * 8);
-	const auto g = static_cast<Color32>(((nc & 0b0000001111100000) >> 5) * 8);
-	const auto b = static_cast<Color32>(((nc & 0b0111110000000000) >> 10) * 8);
-	const auto a = static_cast<Color32>(255);
+	auto const r = static_cast<Color32>(((nc & 0b0000000000011111) >> 0) * 8);
+	auto const g = static_cast<Color32>(((nc & 0b0000001111100000) >> 5) * 8);
+	auto const b = static_cast<Color32>(((nc & 0b0111110000000000) >> 10) * 8);
+	auto const a = static_cast<Color32>(255);
 	return r | (g << 8) | (b << 16) | (a << 24);
 }
 
@@ -142,9 +142,9 @@ constexpr Color16 color16(int r, int g, int b, int a = 0) noexcept {
 [[nodiscard]]
 constexpr Color16 color16(uint8_t r, uint8_t g, uint8_t b, uint8_t a = 0) noexcept {
 	return static_cast<Color16>(ox::min<uint8_t>(r, 31))
-	     | static_cast<Color16>(ox::min<uint8_t>(g, 31) << 5)
-	     | static_cast<Color16>(ox::min<uint8_t>(b, 31) << 10)
-        | static_cast<Color16>(a << 15);
+		| static_cast<Color16>(ox::min<uint8_t>(g, 31) << 5)
+		| static_cast<Color16>(ox::min<uint8_t>(b, 31) << 10)
+		| static_cast<Color16>(a << 15);
 }
 
 static_assert(color16(0, 31, 0) == 992);

src/nostalgia/modules/gfx/include/nostalgia/gfx/consts.hpp

@@ -12,8 +12,37 @@ constexpr auto TileWidth = 8;
 constexpr auto TileHeight = 8;
 constexpr auto PixelsPerTile = TileWidth * TileHeight;
 
-constexpr ox::StringLiteral FileExt_ng("ng");
-constexpr ox::StringLiteral FileExt_nts("nts");
-constexpr ox::StringLiteral FileExt_npal("npal");
+constexpr ox::StringLiteral FileExt_ng{"ng"};
+constexpr ox::StringLiteral FileExt_nts{"nts"};
+constexpr ox::StringLiteral FileExt_npal{"npal"};
+
+constexpr ox::Array<ox::StringLiteral, 2> FileExts_TileSheet{
+	FileExt_nts,
+	FileExt_ng,
+};
+
+constexpr ox::Array<ox::StringLiteral, 2> FileExts_Palette{
+	FileExt_npal,
+};
+
+[[nodiscard]]
+constexpr bool isTileSheet(ox::StringViewCR path) noexcept {
+	return ox::any_of(
+		FileExts_TileSheet.begin(),
+		FileExts_TileSheet.end(),
+		[path](ox::StringLiteral const &ext) {
+			return endsWith(path, ext);
+		});
+}
+
+[[nodiscard]]
+constexpr bool isPalette(ox::StringViewCR path) noexcept {
+	return ox::any_of(
+		FileExts_Palette.begin(),
+		FileExts_Palette.end(),
+		[path](ox::StringLiteral const &ext) {
+			return endsWith(path, ext);
+		});
+}
 
 }

src/nostalgia/modules/gfx/include/nostalgia/gfx/context.hpp

@@ -8,16 +8,12 @@
 
 #include <turbine/context.hpp>
 
-#include "initparams.hpp"
-
 namespace nostalgia::gfx {
 
 class Context;
 
 void safeDelete(Context *ctx) noexcept;
 
-ox::Result<ox::UPtr<Context>> init(turbine::Context &tctx, InitParams const&params = {}) noexcept;
-
 keel::Context &keelCtx(Context &ctx) noexcept;
 
 turbine::Context &turbineCtx(Context &ctx) noexcept;

src/nostalgia/modules/gfx/include/nostalgia/gfx/core.hpp

@@ -1,14 +0,0 @@
-/*
- * Copyright 2016 - 2025 Gary Talent (gary@drinkingtea.net). All rights reserved.
- */
-
-#pragma once
-
-#include "color.hpp"
-#include "context.hpp"
-#include "gfx.hpp"
-#include "initparams.hpp"
-#include "keelmodule.hpp"
-#include "palette.hpp"
-#include "ptidxconv.hpp"
-#include "tilesheet.hpp"

src/nostalgia/modules/gfx/include/nostalgia/gfx/gfx.hpp

@@ -9,8 +9,11 @@
 #include <ox/std/types.hpp>
 #include <ox/model/def.hpp>
 
+#include "color.hpp"
 #include "context.hpp"
+#include "keelmodule.hpp"
 #include "palette.hpp"
+#include "ptidxconv.hpp"
 #include "tilesheet.hpp"
 
 namespace nostalgia::gfx {
@@ -102,21 +105,29 @@ OX_MODEL_BEGIN(TileSheetSet)
 	OX_MODEL_FIELD(entries)
 OX_MODEL_END()
 
-[[nodiscard]]
-int tileColumns(Context&) noexcept;
+struct InitParams {
+	bool glInstallDrawer = true;
+	uint_t glSpriteCount = 128;
+	uint_t glBlocksPerSprite = 64;
+};
+
+ox::Result<ox::UPtr<Context>> init(turbine::Context &tctx, InitParams const &params = {}) noexcept;
 
 [[nodiscard]]
-int tileRows(Context&) noexcept;
+int tileColumns(Context const&) noexcept;
+
+[[nodiscard]]
+int tileRows(Context const&) noexcept;
 
 ox::Error loadBgPalette(
 		Context &ctx,
 		size_t palBank,
-		CompactPalette const&palette,
+		CompactPalette const &palette,
 		size_t page = 0) noexcept;
 
 ox::Error loadSpritePalette(
 		Context &ctx,
-		CompactPalette const&palette,
+		CompactPalette const &palette,
 		size_t page = 0) noexcept;
 
 ox::Error loadBgPalette(
@@ -127,7 +138,7 @@ ox::Error loadBgPalette(
 ox::Error loadBgPalette(
 		Context &ctx,
 		size_t palBank,
-		ox::FileAddress const&paletteAddr) noexcept;
+		ox::FileAddress const &paletteAddr) noexcept;
 
 ox::Error loadSpritePalette(
 		Context &ctx,
@@ -135,12 +146,12 @@ ox::Error loadSpritePalette(
 
 ox::Error loadSpritePalette(
 		Context &ctx,
-		ox::FileAddress const&paletteAddr) noexcept;
+		ox::FileAddress const &paletteAddr) noexcept;
 
 ox::Error loadBgTileSheet(
 		Context &ctx,
 		unsigned cbb,
-		TileSheetSet const&set) noexcept;
+		TileSheetSet const &set) noexcept;
 
 void clearCbb(Context &ctx, unsigned cbb) noexcept;
 
@@ -149,7 +160,7 @@ void clearCbbs(Context &ctx) noexcept;
 ox::Error loadBgTileSheet(
 		Context &ctx,
 		unsigned cbb,
-		CompactTileSheet const&ts,
+		CompactTileSheet const &ts,
 		size_t dstTileIdx,
 		size_t srcTileIdx,
 		size_t tileCnt) noexcept;
@@ -165,7 +176,7 @@ ox::Error loadBgTileSheet(
 ox::Error loadBgTileSheet(
 		Context &ctx,
 		unsigned cbb,
-		ox::FileAddress const&tsAddr,
+		ox::FileAddress const &tsAddr,
 		size_t dstTileIdx,
 		size_t srcTileIdx,
 		size_t tileCnt) noexcept;
@@ -173,24 +184,24 @@ ox::Error loadBgTileSheet(
 ox::Error loadBgTileSheet(
 		Context &ctx,
 		unsigned cbb,
-		CompactTileSheet const&ts,
-		ox::Optional<unsigned> const&paletteBank = {}) noexcept;
+		CompactTileSheet const &ts,
+		ox::Optional<unsigned> const &paletteBank = {}) noexcept;
 
 ox::Error loadBgTileSheet(
 		Context &ctx,
 		unsigned cbb,
 		ox::StringViewCR tilesheetPath,
-		ox::Optional<unsigned> const&paletteBank) noexcept;
+		ox::Optional<unsigned> const &paletteBank) noexcept;
 
 ox::Error loadBgTileSheet(
 		Context &ctx,
 		unsigned cbb,
-		ox::FileAddress const&tilesheetAddr,
-		ox::Optional<unsigned> const&paletteBank = {}) noexcept;
+		ox::FileAddress const &tilesheetAddr,
+		ox::Optional<unsigned> const &paletteBank = {}) noexcept;
 
 ox::Error loadSpriteTileSheet(
 		Context &ctx,
-		CompactTileSheet const&ts,
+		CompactTileSheet const &ts,
 		bool loadDefaultPalette) noexcept;
 
 ox::Error loadSpriteTileSheet(
@@ -200,16 +211,16 @@ ox::Error loadSpriteTileSheet(
 
 ox::Error loadSpriteTileSheet(
 		Context &ctx,
-		ox::FileAddress const&tilesheetAddr,
+		ox::FileAddress const &tilesheetAddr,
 		bool loadDefaultPalette = false) noexcept;
 
 ox::Error loadSpriteTileSheet(
 		Context &ctx,
-		TileSheetSet const&set) noexcept;
+		TileSheetSet const &set) noexcept;
 
 void setBgTile(Context &ctx, uint_t bgIdx, int column, int row, unsigned tile, unsigned palBank = 0) noexcept;
 
-void setBgTile(Context &ctx, uint_t bgIdx, int column, int row, BgTile const&tile) noexcept;
+void setBgTile(Context &ctx, uint_t bgIdx, int column, int row, BgTile const &tile) noexcept;
 
 void clearBg(Context &ctx, uint_t bgIdx) noexcept;
 
@@ -223,22 +234,26 @@ bool bgStatus(Context &ctx, unsigned bg) noexcept;
 
 void setBgStatus(Context &ctx, unsigned bg, bool status) noexcept;
 
-void setBgCbb(Context &ctx, unsigned bgIdx, unsigned cbb) noexcept;
+void setBgCbb(Context &ctx, unsigned bgIdx, unsigned cbbIdx) noexcept;
 
 void setBgPriority(Context &ctx, uint_t bgIdx, uint_t priority) noexcept;
 
+void setBgOffset(Context &ctx, uint16_t bg, int16_t x, int16_t y) noexcept;
+
+void scrollBgOffset(Context &ctx, uint16_t bg, int16_t x, int16_t y) noexcept;
+
 void hideSprite(Context &ctx, unsigned) noexcept;
 
 void showSprite(Context &ctx, unsigned) noexcept;
 
-void setSprite(Context &c, uint_t idx, Sprite const&s) noexcept;
+void setSprite(Context &ctx, uint_t idx, Sprite const &sprite) noexcept;
 
 [[nodiscard]]
-uint_t spriteCount(Context &ctx) noexcept;
+uint_t spriteCount(Context const &ctx) noexcept;
 
 ox::Error initConsole(Context &ctx) noexcept;
 
-void puts(Context &ctx, int column, int row, ox::StringViewCR str) noexcept;
+void consoleWrite(Context &ctx, int column, int row, ox::StringViewCR str) noexcept;
 
 }
 
@@ -249,8 +264,8 @@ constexpr ox::CStringView GlslVersion = "#version 330";
 [[nodiscard]]
 ox::Size drawSize(int scale = 5) noexcept;
 
-void draw(gfx::Context &ctx, ox::Size const&renderSz) noexcept;
+void draw(Context &ctx, ox::Size const &renderSz) noexcept;
 
-void draw(gfx::Context&, int scale = 5) noexcept;
+void draw(Context&, int scale = 5) noexcept;
 
 }

src/nostalgia/modules/gfx/include/nostalgia/gfx/initparams.hpp

@@ -1,17 +0,0 @@
-/*
- * Copyright 2016 - 2025 Gary Talent (gary@drinkingtea.net). All rights reserved.
- */
-
-#pragma once
-
-#include <ox/std/types.hpp>
-
-namespace nostalgia::gfx {
-
-struct InitParams {
-	bool glInstallDrawer = true;
-	uint_t glSpriteCount = 128;
-	uint_t glBlocksPerSprite = 64;
-};
-
-}

src/nostalgia/modules/gfx/include/nostalgia/gfx/keelmodule.hpp

@@ -8,6 +8,6 @@
 
 namespace nostalgia::gfx {
 
-const keel::Module *keelModule() noexcept;
+keel::Module const *keelModule() noexcept;
 
 }

src/nostalgia/modules/gfx/include/nostalgia/gfx/palette.hpp

@@ -168,9 +168,9 @@ OX_MODEL_BEGIN(PaletteV3)
 OX_MODEL_END()
 
 [[nodiscard]]
-constexpr bool valid(PaletteV3 const&p) noexcept {
+constexpr bool valid(PaletteV3 const &p) noexcept {
 	auto const colors = p.colorInfo.size();
-	return ox::all_of(p.pages.begin(), p.pages.end(), [colors](auto const&page) {
+	return ox::all_of(p.pages.begin(), p.pages.end(), [colors](auto const &page) {
 		return page.size() == colors;
 	});
 }
@@ -198,9 +198,9 @@ OX_MODEL_BEGIN(PaletteV4)
 OX_MODEL_END()
 
 [[nodiscard]]
-constexpr bool valid(PaletteV4 const&p) noexcept {
+constexpr bool valid(PaletteV4 const &p) noexcept {
 	auto const colors = p.colorNames.size();
-	return ox::all_of(p.pages.begin(), p.pages.end(), [colors](PalettePageV1 const&page) {
+	return ox::all_of(p.pages.begin(), p.pages.end(), [colors](PalettePageV1 const &page) {
 		return page.colors.size() == colors;
 	});
 }

src/nostalgia/modules/gfx/include/nostalgia/gfx/ptidxconv.hpp

@@ -11,39 +11,39 @@
 namespace nostalgia::gfx {
 
 [[nodiscard]]
-constexpr std::size_t ptToIdx(int x, int y, int c, int scale = 1) noexcept {
-	const auto tileWidth = TileWidth * scale;
-	const auto tileHeight = TileHeight * scale;
-	const auto pixelsPerTile = tileWidth * tileHeight;
-	const auto colLength = static_cast<std::size_t>(pixelsPerTile);
-	const auto rowLength = static_cast<std::size_t>(static_cast<std::size_t>(c / tileWidth) * colLength);
-	const auto colStart = static_cast<std::size_t>(colLength * static_cast<std::size_t>(x / tileWidth));
-	const auto rowStart = static_cast<std::size_t>(rowLength * static_cast<std::size_t>(y / tileHeight));
-	const auto colOffset = static_cast<std::size_t>(x % tileWidth);
-	const auto rowOffset = static_cast<std::size_t>((y % tileHeight) * tileHeight);
+constexpr std::size_t ptToIdx(int const x, int const y, int const c, int const scale = 1) noexcept {
+	auto const tileWidth = TileWidth * scale;
+	auto const tileHeight = TileHeight * scale;
+	auto const pixelsPerTile = tileWidth * tileHeight;
+	auto const colLength = static_cast<std::size_t>(pixelsPerTile);
+	auto const rowLength = static_cast<std::size_t>(static_cast<std::size_t>(c / tileWidth) * colLength);
+	auto const colStart = static_cast<std::size_t>(colLength * static_cast<std::size_t>(x / tileWidth));
+	auto const rowStart = static_cast<std::size_t>(rowLength * static_cast<std::size_t>(y / tileHeight));
+	auto const colOffset = static_cast<std::size_t>(x % tileWidth);
+	auto const rowOffset = static_cast<std::size_t>((y % tileHeight) * tileHeight);
 	return static_cast<std::size_t>(colStart + colOffset + rowStart + rowOffset);
 }
 
 [[nodiscard]]
-constexpr std::size_t ptToIdx(const ox::Point &pt, int c, int scale = 1) noexcept {
+constexpr std::size_t ptToIdx(ox::Point const &pt, int const c, int const scale = 1) noexcept {
 	return ptToIdx(pt.x, pt.y, c * TileWidth, scale);
 }
 
 [[nodiscard]]
-constexpr ox::Point idxToPt(int i, int c, int scale = 1) noexcept {
-	const auto tileWidth = TileWidth * scale;
-	const auto tileHeight = TileHeight * scale;
-	const auto pixelsPerTile = tileWidth * tileHeight;
+constexpr ox::Point idxToPt(int const i, int c, int const scale = 1) noexcept {
+	auto const tileWidth = TileWidth * scale;
+	auto const tileHeight = TileHeight * scale;
+	auto const pixelsPerTile = tileWidth * tileHeight;
 	// prevent divide by zeros
 	if (!c) {
 		++c;
 	}
-	const auto t = i / pixelsPerTile; // tile number
-	const auto iti = i % pixelsPerTile; // in tile index
-	const auto tc = t % c; // tile column
-	const auto tr = t / c; // tile row
-	const auto itx = iti % tileWidth; // in tile x
-	const auto ity = iti / tileHeight; // in tile y
+	auto const t = i / pixelsPerTile; // tile number
+	auto const iti = i % pixelsPerTile; // in tile index
+	auto const tc = t % c; // tile column
+	auto const tr = t / c; // tile row
+	auto const itx = iti % tileWidth; // in tile x
+	auto const ity = iti / tileHeight; // in tile y
 	return {
 		itx + tc * tileWidth,
 		ity + tr * tileHeight,

src/nostalgia/modules/gfx/include/nostalgia/gfx/studio.hpp

@@ -6,6 +6,28 @@
 
 #include <studio/studio.hpp>
 
-namespace nostalgia::core {
+#include "tilesheet.hpp"
+
+namespace nostalgia::gfx {
+
+inline void navigateToTileSheet(
+	studio::Context &ctx, ox::StringParam path, SubSheetId const subsheetId) noexcept {
+	studio::navigateTo(ctx, std::move(path), ox::intToStr(subsheetId));
+}
+
+inline void navigateToPalette(studio::Context &ctx, ox::StringParam path) noexcept {
+	studio::navigateTo(ctx, std::move(path));
+}
+
+inline void navigateToPalette(
+	studio::Context &ctx,
+	ox::StringParam path,
+	size_t const colorIdx,
+	size_t const palPage) noexcept {
+	studio::navigateTo(
+		ctx,
+		std::move(path),
+		ox::sfmt("{};{}", colorIdx, palPage));
+}
 
 }

src/nostalgia/modules/gfx/include/nostalgia/gfx/studiomodule.hpp

@@ -8,6 +8,6 @@
 
 namespace nostalgia::gfx {
 
-const studio::Module *studioModule() noexcept;
+studio::Module const *studioModule() noexcept;
 
 }

src/nostalgia/modules/gfx/include/nostalgia/gfx/tilesheet.hpp

@@ -30,7 +30,7 @@ struct TileSheetV1 {
 };
 
 [[nodiscard]]
-constexpr bool valid(TileSheetV1 const&ts) noexcept {
+constexpr bool valid(TileSheetV1 const &ts) noexcept {
 	auto const bytes = static_cast<size_t>(ts.columns * ts.rows * PixelsPerTile) / (ts.bpp == 4 ? 2 : 1);
 	return (ts.bpp == 4 || ts.bpp == 8) && ts.pixels.size() == bytes;
 }
@@ -71,16 +71,16 @@ struct TileSheetV2 {
 };
 
 [[nodiscard]]
-constexpr bool valid(TileSheetV2::SubSheet const&ss, int bpp) noexcept {
+constexpr bool valid(TileSheetV2::SubSheet const &ss, int bpp) noexcept {
 	auto const bytes = static_cast<size_t>(ss.columns * ss.rows * PixelsPerTile) / (bpp == 4 ? 2 : 1);
 	return ox::all_of(ss.subsheets.begin(), ss.subsheets.end(),
-			[bpp, bytes](TileSheetV2::SubSheet const&s) {
+			[bpp, bytes](TileSheetV2::SubSheet const &s) {
 		return bytes == s.pixels.size() && valid(s, bpp);
 	});
 }
 
 [[nodiscard]]
-constexpr bool valid(TileSheetV2 const&ts) noexcept {
+constexpr bool valid(TileSheetV2 const &ts) noexcept {
 	return (ts.bpp == 4 || ts.bpp == 8) && valid(ts.subsheet, ts.bpp);
 }
 
@@ -141,16 +141,16 @@ struct TileSheetV3 {
 };
 
 [[nodiscard]]
-constexpr bool valid(TileSheetV3::SubSheet const&ss, int bpp) noexcept {
+constexpr bool valid(TileSheetV3::SubSheet const &ss, int bpp) noexcept {
 	auto const bytes = static_cast<size_t>(ss.columns * ss.rows * PixelsPerTile) / (bpp == 4 ? 2 : 1);
 	return ox::all_of(ss.subsheets.begin(), ss.subsheets.end(),
-			[bpp, bytes](TileSheetV3::SubSheet const&s) {
+			[bpp, bytes](TileSheetV3::SubSheet const &s) {
 		return bytes == s.pixels.size() && valid(s, bpp);
 	});
 }
 
 [[nodiscard]]
-constexpr bool valid(TileSheetV3 const&ts) noexcept {
+constexpr bool valid(TileSheetV3 const &ts) noexcept {
 	return (ts.bpp == 4 || ts.bpp == 8) && valid(ts.subsheet, ts.bpp);
 }
 
@@ -233,18 +233,18 @@ struct TileSheetV4 {
 };
 
 [[nodiscard]]
-constexpr bool valid(TileSheetV4::SubSheet const&ss, int bpp) noexcept {
+constexpr bool valid(TileSheetV4::SubSheet const &ss, int bpp) noexcept {
 	auto const bytes = static_cast<size_t>(ss.columns * ss.rows * PixelsPerTile) / (bpp == 4 ? 2 : 1);
 	return
 		(ss.pixels.empty() || ss.subsheets.empty()) &&
 		ox::all_of(ss.subsheets.begin(), ss.subsheets.end(),
-				[bpp, bytes](TileSheetV4::SubSheet const&s) {
+				[bpp, bytes](TileSheetV4::SubSheet const &s) {
 			return bytes == s.pixels.size() && valid(s, bpp);
 		});
 }
 
 [[nodiscard]]
-constexpr bool valid(TileSheetV4 const&ts) noexcept {
+constexpr bool valid(TileSheetV4 const &ts) noexcept {
 	return (ts.bpp == 4 || ts.bpp == 8) && valid(ts.subsheet, ts.bpp);
 }
 
@@ -334,19 +334,19 @@ struct TileSheetV5 {
 };
 
 [[nodiscard]]
-constexpr bool valid(TileSheetV5::SubSheet const&ss) noexcept {
+constexpr bool valid(TileSheetV5::SubSheet const &ss) noexcept {
 	if (ss.subsheets.empty()) {
-		return static_cast<size_t>(ss.columns * ss.rows * PixelsPerTile) == ss.pixels.size();
+		return std::cmp_equal(ss.columns * ss.rows * PixelsPerTile, ss.pixels.size());
 	} else {
 		return ss.pixels.empty() && ox::all_of(ss.subsheets.begin(), ss.subsheets.end(),
-				[](TileSheetV5::SubSheet const&s) {
+				[](TileSheetV5::SubSheet const &s) {
 			return valid(s);
 		});
 	}
 }
 
 [[nodiscard]]
-constexpr bool valid(TileSheetV5 const&ts) noexcept {
+constexpr bool valid(TileSheetV5 const &ts) noexcept {
 	return (ts.bpp == 4 || ts.bpp == 8) && valid(ts.subsheet);
 }
 
@@ -376,24 +376,24 @@ constexpr ox::Error repair(TileSheetV5 &ts) noexcept {
 using TileSheet = TileSheetV5;
 
 [[nodiscard]]
-std::size_t idx(TileSheet::SubSheet const&ss, ox::Point const&pt) noexcept;
+std::size_t idx(TileSheet::SubSheet const &ss, ox::Point const &pt) noexcept;
 
 [[nodiscard]]
-size_t getTileCnt(TileSheet const&ts) noexcept;
+size_t getTileCnt(TileSheet const &ts) noexcept;
 
 [[nodiscard]]
-TileSheet::SubSheet const*getSubsheet(TileSheet const&ts, SubSheetId id) noexcept;
+TileSheet::SubSheet const*getSubsheet(TileSheet const &ts, SubSheetId id) noexcept;
 
 [[nodiscard]]
-ox::Optional<size_t> getTileIdx(TileSheet const&ts, SubSheetId id) noexcept;
+ox::Optional<size_t> getTileIdx(TileSheet const &ts, SubSheetId id) noexcept;
 
 [[nodiscard]]
-uint8_t getPixel(TileSheet::SubSheet const&ss, std::size_t idx) noexcept;
+uint8_t getPixel(TileSheet::SubSheet const &ss, std::size_t idx) noexcept;
 
 [[nodiscard]]
-uint8_t getPixel(TileSheet::SubSheet const&ss, ox::Point const&pt) noexcept;
+uint8_t getPixel(TileSheet::SubSheet const &ss, ox::Point const &pt) noexcept;
 
-void setPixel(TileSheet::SubSheet &ss, ox::Point const&pt, uint8_t palIdx) noexcept;
+void setPixel(TileSheet::SubSheet &ss, ox::Point const &pt, uint8_t palIdx) noexcept;
 
 ox::Error setPixelCount(TileSheet::SubSheet &ss, std::size_t cnt) noexcept;
 
@@ -406,14 +406,14 @@ void flipY(TileSheet::SubSheet &ss, ox::Point const &a, ox::Point const &b) noex
  * @return a count of the pixels in this sheet
  */
 [[nodiscard]]
-unsigned pixelCnt(TileSheet::SubSheet const&ss) noexcept;
+unsigned pixelCnt(TileSheet::SubSheet const &ss) noexcept;
 
 /**
  *
  * @param ss
  * @param sz size of Subsheet in tiles (not pixels)
  */
-ox::Error resizeSubsheet(TileSheet::SubSheet &ss, ox::Size const&sz) noexcept;
+ox::Error resizeSubsheet(TileSheet::SubSheet &ss, ox::Size const &sz) noexcept;
 
 /**
  * validateSubSheetIdx takes a SubSheetIdx and moves the index to the
@@ -424,11 +424,21 @@ ox::Error resizeSubsheet(TileSheet::SubSheet &ss, ox::Size const&sz) noexcept;
  * @return a valid version of idx
  */
 [[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;
+
+ox::Result<TileSheet::SubSheet*> getSubSheet(
+		ox::SpanView<ox::StringView> const &idx,
+		TileSheet &ts) noexcept;
+
+ox::Result<TileSheet::SubSheet const*> getSubSheet(
+		ox::SpanView<ox::StringView> const &idx,
+		TileSheet const &ts) noexcept;
 
 [[nodiscard]]
 TileSheet::SubSheet &getSubSheet(
-		ox::SpanView<uint32_t> const&idx,
+		ox::SpanView<uint32_t> const &idx,
 		std::size_t idxIt,
 		TileSheet::SubSheet &pSubsheet) noexcept;
 
@@ -437,7 +447,7 @@ TileSheet::SubSheet &getSubSheet(
 #pragma GCC diagnostic ignored "-Wdangling-reference"
 #endif
 [[nodiscard]]
-TileSheet::SubSheet const&getSubSheet(TileSheet const&ts, ox::SpanView<uint32_t> const &idx) noexcept;
+TileSheet::SubSheet const &getSubSheet(TileSheet const &ts, ox::SpanView<uint32_t> const &idx) noexcept;
 
 [[nodiscard]]
 TileSheet::SubSheet &getSubSheet(TileSheet &ts, ox::SpanView<uint32_t> const &idx) noexcept;
@@ -451,27 +461,29 @@ ox::Error insertSubSheet(TileSheet &ts, ox::SpanView<uint32_t> const &idx, TileS
 
 ox::Error rmSubSheet(
 		TileSheet &ts,
-		TileSheet::SubSheetIdx const&idx,
+		TileSheet::SubSheetIdx const &idx,
 		std::size_t idxIt,
 		TileSheet::SubSheet &pSubsheet) noexcept;
 
-ox::Error rmSubSheet(TileSheet &ts, TileSheet::SubSheetIdx const&idx) noexcept;
+ox::Error rmSubSheet(TileSheet &ts, TileSheet::SubSheetIdx const &idx) noexcept;
 
 [[nodiscard]]
 uint8_t getPixel(
-		TileSheet const&ts,
-		ox::Point const&pt,
-		TileSheet::SubSheetIdx const&subsheetIdx) noexcept;
+		TileSheet const &ts,
+		ox::Point const &pt,
+		TileSheet::SubSheetIdx const &subsheetIdx) noexcept;
 
-ox::Result<SubSheetId> getIdFor(TileSheet const&ts, ox::StringViewCR path) noexcept;
+ox::Result<SubSheetId> getIdFor(TileSheet const &ts, ox::StringViewCR path) noexcept;
 
-ox::Result<unsigned> getTileOffset(TileSheet const&ts, ox::StringViewCR pNamePath) noexcept;
+ox::Result<unsigned> getTileOffset(TileSheet const &ts, ox::StringViewCR pNamePath) noexcept;
 
-ox::Result<uint32_t> getTileOffset(TileSheet const&ts, SubSheetId pId) noexcept;
+ox::Result<uint32_t> getTileOffset(TileSheet const &ts, SubSheetId pId) noexcept;
 
-ox::Result<ox::StringView> getNameFor(TileSheet::SubSheet const&ss, SubSheetId pId) noexcept;
+ox::Result<ox::StringView> getNameFor(TileSheet::SubSheet const &ss, SubSheetId pId) noexcept;
 
-ox::Result<ox::StringView> getNameFor(TileSheet const&ts, SubSheetId pId) noexcept;
+ox::Result<ox::StringView> getNameFor(TileSheet &ts, SubSheetId pId) noexcept;
+
+ox::Result<ox::StringView> getNameFor(TileSheet const &ts, SubSheetId pId) noexcept;
 
 [[nodiscard]]
 ox::Vector<uint8_t> pixels(TileSheet &ts) noexcept;
@@ -487,7 +499,7 @@ struct CompactTileSheetV1 {
 };
 
 [[nodiscard]]
-constexpr bool valid(CompactTileSheetV1 const&ts) noexcept {
+constexpr bool valid(CompactTileSheetV1 const &ts) noexcept {
 	return ts.bpp == 4 || ts.bpp == 8;
 }
 
@@ -496,22 +508,22 @@ using CompactTileSheet = CompactTileSheetV1;
 
 [[nodiscard]]
 uint8_t getPixel4Bpp(
-		CompactTileSheet const&ts,
+		CompactTileSheet const &ts,
 		size_t idx) noexcept;
 
 [[nodiscard]]
 uint8_t getPixel8Bpp(
-		CompactTileSheet const&ts,
+		CompactTileSheet const &ts,
 		size_t idx) noexcept;
 
 [[nodiscard]]
 ox::Pair<uint8_t> get2Pixels4Bpp(
-		CompactTileSheet const&ts,
+		CompactTileSheet const &ts,
 		size_t idx) noexcept;
 
 [[nodiscard]]
 ox::Pair<uint8_t> get2Pixels8Bpp(
-		CompactTileSheet const&ts,
+		CompactTileSheet const &ts,
 		size_t idx) noexcept;
 
 OX_MODEL_BEGIN(TileSheetV1)
@@ -591,8 +603,8 @@ OX_MODEL_BEGIN(CompactTileSheetV1)
 OX_MODEL_END()
 
 ox::Vector<uint32_t> resizeTileSheetData(
-		ox::Vector<uint32_t> const&srcPixels,
-		ox::Size const&srcSize,
+		ox::Vector<uint32_t> const &srcPixels,
+		ox::Size const &srcSize,
 		int scale = 2) noexcept;
 
 }

src/nostalgia/modules/gfx/src/CMakeLists.txt

@@ -4,11 +4,6 @@ add_library(
 		tilesheet.cpp
 )
 
-add_subdirectory(gba)
-if(NOT BUILDCORE_TARGET STREQUAL "gba")
-	add_subdirectory(opengl)
-endif()
-
 target_include_directories(
 	NostalgiaGfx PUBLIC
 		../include
@@ -31,3 +26,38 @@ install(
 		LIBRARY DESTINATION lib
 		ARCHIVE DESTINATION lib
 )
+
+# OpenGL
+
+if(NOT BUILDCORE_TARGET STREQUAL "gba")
+	target_sources(
+		NostalgiaGfx PRIVATE
+			gfx-opengl.cpp
+	)
+	target_link_libraries(
+		NostalgiaGfx PUBLIC
+			GlUtils
+	)
+endif()
+
+# GBA
+
+add_library(
+	NostalgiaGfx-GBA OBJECT
+		gfx-gba.cpp
+)
+target_include_directories(
+	NostalgiaGfx-GBA PUBLIC
+		../include
+)
+target_link_libraries(
+	NostalgiaGfx-GBA PUBLIC
+		TeaGBA
+		Keel
+		Turbine
+)
+
+if(BUILDCORE_TARGET STREQUAL "gba")
+	set_source_files_properties(gfx-gba.cpp PROPERTIES COMPILE_FLAGS -marm)
+	target_link_libraries(NostalgiaGfx PUBLIC NostalgiaGfx-GBA)
+endif()

src/nostalgia/modules/gfx/src/gba/CMakeLists.txt

@@ -1,21 +0,0 @@
-add_library(
-	NostalgiaGfx-GBA OBJECT
-		context.cpp
-		gfx.cpp
-		panic.cpp
-)
-target_include_directories(
-	NostalgiaGfx-GBA PUBLIC
-		../../include
-)
-target_link_libraries(
-	NostalgiaGfx-GBA PUBLIC
-		TeaGBA
-		Keel
-		Turbine
-)
-
-if(BUILDCORE_TARGET STREQUAL "gba")
-	set_source_files_properties(gfx.cpp PROPERTIES COMPILE_FLAGS -marm)
-	target_link_libraries(NostalgiaGfx PUBLIC NostalgiaGfx-GBA)
-endif()

src/nostalgia/modules/gfx/src/gba/context.cpp

@@ -1,36 +0,0 @@
-/*
- * Copyright 2016 - 2025 Gary Talent (gary@drinkingtea.net). All rights reserved.
- */
-
-#include <turbine/turbine.hpp>
-
-#include <nostalgia/gfx/gfx.hpp>
-
-#include "context.hpp"
-
-namespace nostalgia::gfx {
-
-void safeDelete(Context *ctx) noexcept {
-	delete ctx;
-}
-
-Context::Context(turbine::Context &tctx) noexcept: turbineCtx(tctx) {
-}
-
-ox::Error initGfx(Context &ctx, InitParams const&) noexcept;
-
-ox::Result<ox::UPtr<Context>> init(turbine::Context &tctx, InitParams const&params) noexcept {
-	auto ctx = ox::make_unique<Context>(tctx);
-	OX_RETURN_ERROR(initGfx(*ctx, params));
-	return ox::UPtr<Context>(std::move(ctx));
-}
-
-keel::Context &keelCtx(Context &ctx) noexcept {
-	return turbine::keelCtx(ctx.turbineCtx);
-}
-
-turbine::Context &turbineCtx(Context &ctx) noexcept {
-	return ctx.turbineCtx;
-}
-
-}

src/nostalgia/modules/gfx/src/gba/context.hpp

@@ -1,34 +0,0 @@
-/*
- * Copyright 2016 - 2025 Gary Talent (gary@drinkingtea.net). All rights reserved.
- */
-
-#pragma once
-
-#include <nostalgia/gfx/context.hpp>
-
-namespace nostalgia::gfx {
-
-struct BgCbbData {
-	unsigned bpp = 4;
-};
-
-class Context {
-
-	public:
-		turbine::Context &turbineCtx;
-		ox::Array<BgCbbData, 4> cbbData;
-
-		explicit Context(turbine::Context &tctx) noexcept;
-		Context(Context &other) noexcept = delete;
-		Context(Context const&other) noexcept = delete;
-		Context(Context const&&other) noexcept = delete;
-		virtual ~Context() noexcept = default;
-
-		[[nodiscard]]
-		ox::MemFS const&rom() const noexcept {
-			return static_cast<ox::MemFS const&>(*turbine::rom(turbineCtx));
-		}
-
-};
-
-}

src/nostalgia/modules/gfx/src/gba/gfx.hpp

@@ -1,11 +0,0 @@
-/*
- * Copyright 2016 - 2025 Gary Talent (gary@drinkingtea.net). All rights reserved.
- */
-
-#pragma once
-
-#include <nostalgia/gfx/context.hpp>
-
-namespace nostalgia::gfx {
-ox::Error initGfx(Context &ctx, InitParams const&) noexcept;
-}

src/nostalgia/modules/gfx/src/gba/panic.cpp

@@ -1,58 +0,0 @@
-/*
- * Copyright 2016 - 2025 Gary Talent (gary@drinkingtea.net). All rights reserved.
- */
-
-
-#include <ox/std/def.hpp>
-#include <ox/std/realstd.hpp>
-
-#include <keel/media.hpp>
-#include <turbine/turbine.hpp>
-
-#include <teagba/addresses.hpp>
-#include <teagba/bios.hpp>
-
-#include <nostalgia/gfx/core.hpp>
-
-#include "gfx.hpp"
-
-#define HEAP_BEGIN (reinterpret_cast<char*>(MEM_EWRAM_BEGIN))
-#define HEAP_SIZE ((MEM_EWRAM_END - MEM_EWRAM_BEGIN) / 2)
-#define HEAP_END  (reinterpret_cast<char*>(MEM_EWRAM_BEGIN + HEAP_SIZE))
-
-namespace ox {
-
-using namespace nostalgia::gfx;
-
-void panic(const char *file, int line, const char *panicMsg, ox::Error const&err) noexcept {
-	// reset heap to make sure we have enough memory to allocate context data
-OX_ALLOW_UNSAFE_BUFFERS_BEGIN
-	ox::heapmgr::initHeap(HEAP_BEGIN, HEAP_END);
-OX_ALLOW_UNSAFE_BUFFERS_END
-	auto tctx = turbine::init(keel::loadRomFs("").unwrap(), "Nostalgia").unwrap();
-	auto ctx = init(*tctx).unwrap();
-	std::ignore = initGfx(*ctx, {});
-	std::ignore = initConsole(*ctx);
-	setBgStatus(*ctx, 0, true);
-	clearBg(*ctx, 0);
-	auto const serr = ox::sfmt<ox::IString<23>>("Error code: {}", static_cast<int64_t>(err));
-	puts(*ctx, 32 + 1,  1, "SADNESS...");
-	puts(*ctx, 32 + 1,  4, "UNEXPECTED STATE:");
-	puts(*ctx, 32 + 2,  6, panicMsg);
-	if (err) {
-		puts(*ctx, 32 + 2,  8, serr);
-	}
-	puts(*ctx, 32 + 1, 15, "PLEASE RESTART THE SYSTEM");
-	// print to terminal if in mGBA
-	oxErrf("\033[31;1;1mPANIC:\033[0m [{}:{}]: {}\n", file, line, panicMsg);
-	if (err.msg) {
-		oxErrf("\tError Message:\t{}\n", err.msg);
-	}
-	oxErrf("\tError Code:\t{}\n", static_cast<ErrorCode>(err));
-	if (err.src.file_name() != nullptr) {
-		oxErrf("\tError Location:\t{}:{}\n", err.src.file_name(), err.src.line());
-	}
-	abort();
-}
-
-}

src/nostalgia/modules/gfx/src/gfx-gba.cpp

@@ -15,15 +15,43 @@
 #include <nostalgia/gfx/gfx.hpp>
 #include <nostalgia/gfx/tilesheet.hpp>
 
-#include "context.hpp"
-
 OX_ALLOW_UNSAFE_BUFFERS_BEGIN
 
 namespace nostalgia::gfx {
 
+struct BgCbbData {
+	unsigned bpp = 4;
+};
+
+class Context {
+
+	public:
+		turbine::Context &turbineCtx;
+		ox::Array<BgCbbData, 4> cbbData;
+
+		explicit Context(turbine::Context &tctx) noexcept: turbineCtx{tctx} {}
+		Context(Context &other) noexcept = delete;
+		Context(Context const &other) noexcept = delete;
+		Context(Context const &&other) noexcept = delete;
+		virtual ~Context() noexcept = default;
+
+};
+
+void safeDelete(Context *ctx) noexcept {
+	delete ctx;
+}
+
+keel::Context &keelCtx(Context &ctx) noexcept {
+	return turbine::keelCtx(ctx.turbineCtx);
+}
+
+turbine::Context &turbineCtx(Context &ctx) noexcept {
+	return ctx.turbineCtx;
+}
+
 static constexpr auto SpriteCount = 128;
 
-ox::Error initGfx(Context&, InitParams const&) noexcept {
+static ox::Error initGfx() noexcept {
 	for (auto bgCtl = &REG_BG0CTL; bgCtl <= &REG_BG3CTL; bgCtl += 2) {
 		teagba::bgSetSbb(*bgCtl, 28);
 	}
@@ -34,15 +62,21 @@ ox::Error initGfx(Context&, InitParams const&) noexcept {
 	return {};
 }
 
+ox::Result<ox::UPtr<Context>> init(turbine::Context &tctx, InitParams const&) noexcept {
+	auto ctx = ox::make_unique<Context>(tctx);
+	OX_RETURN_ERROR(initGfx());
+	return ctx;
+}
+
 ox::Error loadBgPalette(
 		Context&,
-		size_t palBank,
-		CompactPalette const&palette,
-		size_t page) noexcept {
+		size_t const palBank,
+		CompactPalette const &palette,
+		size_t const page) noexcept {
 	if (palette.pages.empty()) {
 		return {};
 	}
-	auto const paletteMem = MEM_BG_PALETTE + palBank * 16;
+	auto const paletteMem = ox::Span{MEM_BG_PALETTE} + palBank * 16;
 	for (auto i = 0u; i < colorCnt(palette, page); ++i) {
 		paletteMem[i] = color(palette, page, i);
 	}
@@ -51,14 +85,13 @@ ox::Error loadBgPalette(
 
 ox::Error loadSpritePalette(
 		Context&,
-		CompactPalette const&palette,
-		size_t page) noexcept {
+		CompactPalette const &palette,
+		size_t const page) noexcept {
 	if (palette.pages.empty()) {
 		return {};
 	}
-	auto const paletteMem = MEM_SPRITE_PALETTE;
 	for (auto i = 0u; i < colorCnt(palette, page); ++i) {
-		paletteMem[i] = color(palette, page, i);
+		MEM_SPRITE_PALETTE[i] = color(palette, page, i);
 	}
 	return {};
 }
@@ -79,15 +112,15 @@ void clearCbbs(Context &ctx) noexcept {
 static ox::Error loadTileSheetSet(
 		Context &ctx,
 		ox::Span<uint16_t> tileMapTargetMem,
-		TileSheetSet const&set) noexcept {
+		TileSheetSet const &set) noexcept {
 	size_t tileWriteIdx = 0;
 	size_t const bppMod = set.bpp == 4;
-	for (auto const&entry : set.entries) {
+	for (auto const &entry : set.entries) {
 		OX_REQUIRE(ts, keel::readObj<CompactTileSheet>(keelCtx(ctx), entry.tilesheet));
 		if (set.bpp != ts->bpp && ts->bpp == 8) {
 			return ox::Error(1, "cannot load an 8 BPP tilesheet into a 4 BPP CBB");
 		}
-		for (auto const&s : entry.sections) {
+		for (auto const &s : entry.sections) {
 			auto const cnt = (static_cast<size_t>(s.tiles) * PixelsPerTile) >> bppMod;
 			for (size_t i = 0; i < cnt; ++i) {
 				auto const begin = static_cast<size_t>(s.begin) * (PixelsPerTile >> bppMod);
@@ -106,7 +139,7 @@ static ox::Error loadTileSheetSet(
 ox::Error loadBgTileSheet(
 		Context &ctx,
 		unsigned const cbb,
-		CompactTileSheet const&ts,
+		CompactTileSheet const &ts,
 		size_t const dstTileIdx,
 		size_t const srcTileIdx,
 		size_t const tileCnt) noexcept {
@@ -133,11 +166,11 @@ ox::Error loadBgTileSheet(
 
 ox::Error loadBgTileSheet(
 		Context &ctx,
-		unsigned cbb,
-		CompactTileSheet const&ts,
-		ox::Optional<unsigned> const&paletteBank) noexcept {
-	auto const cnt = (ts.pixels.size() * PixelsPerTile) / (1 + (ts.bpp == 4));
-	for (size_t i = 0; i < cnt; ++i) {
+		unsigned const cbb,
+		CompactTileSheet const &ts,
+		ox::Optional<unsigned> const &paletteBank) noexcept {
+	auto const cnt = ts.pixels.size() >> (ts.bpp == 4);
+	for (size_t i{}; i < cnt; ++i) {
 		auto const srcIdx = i * 2;
 		auto const p1 = static_cast<uint16_t>(ts.pixels[srcIdx]);
 		auto const p2 = static_cast<uint16_t>(ts.pixels[srcIdx + 1]);
@@ -159,7 +192,7 @@ ox::Error loadBgTileSheet(
 ox::Error loadBgTileSheet(
 		Context &ctx,
 		unsigned const cbb,
-		TileSheetSet const&set) noexcept {
+		TileSheetSet const &set) noexcept {
 	auto const bpp = static_cast<unsigned>(set.bpp);
 	OX_RETURN_ERROR(loadTileSheetSet(ctx, MEM_BG_TILES[cbb], set));
 	// update bpp of all bgs with the updated cbb
@@ -183,12 +216,13 @@ static void setSpritesBpp(unsigned const bpp) noexcept {
 
 ox::Error loadSpriteTileSheet(
 		Context &ctx,
-		CompactTileSheet const&ts,
-		bool loadDefaultPalette) noexcept {
-	for (size_t i = 0; i < ts.pixels.size(); i += 2) {
-		uint16_t v = ts.pixels[i];
-		v |= static_cast<uint16_t>(ts.pixels[i + 1] << 8);
-		MEM_SPRITE_TILES[i] = v;
+		CompactTileSheet const &ts,
+		bool const loadDefaultPalette) noexcept {
+	for (size_t i{}; i < ts.pixels.size(); i += 2) {
+		MEM_SPRITE_TILES[i >> 1] =
+			static_cast<uint16_t>(
+				ts.pixels[i] |
+				(static_cast<uint16_t>(ts.pixels[i + 1]) << 8));
 	}
 	if (loadDefaultPalette && ts.defaultPalette) {
 		OX_RETURN_ERROR(loadSpritePalette(ctx, ts.defaultPalette));
@@ -199,14 +233,19 @@ ox::Error loadSpriteTileSheet(
 
 ox::Error loadSpriteTileSheet(
 		Context &ctx,
-		TileSheetSet const&set) noexcept {
+		TileSheetSet const &set) noexcept {
 	auto const bpp = static_cast<unsigned>(set.bpp);
-	OX_RETURN_ERROR(loadTileSheetSet(ctx, {MEM_SPRITE_TILES, 32 * ox::units::KB}, set));
+	OX_RETURN_ERROR(loadTileSheetSet(ctx, MEM_SPRITE_TILES, set));
 	setSpritesBpp(bpp);
 	return {};
 }
 
-void setBgTile(Context &ctx, uint_t bgIdx, int column, int row, BgTile const&tile) noexcept {
+void setBgTile(
+	Context &ctx,
+	uint_t const bgIdx,
+	int const column,
+	int const row,
+	BgTile const &tile) noexcept {
 	auto const tileIdx = static_cast<std::size_t>(row * tileColumns(ctx) + column);
 	// see Tonc 9.3
 	MEM_BG_MAP[bgIdx][tileIdx] =
@@ -216,7 +255,7 @@ void setBgTile(Context &ctx, uint_t bgIdx, int column, int row, BgTile const&til
 			static_cast<uint16_t>(tile.palBank << 0xc);
 }
 
-void clearBg(Context &ctx, uint_t bgIdx) noexcept {
+void clearBg(Context &ctx, uint_t const bgIdx) noexcept {
 	memset(MEM_BG_MAP[bgIdx].data(), 0, static_cast<size_t>(tileRows(ctx) * tileColumns(ctx)));
 }
 
@@ -224,39 +263,47 @@ uint8_t bgStatus(Context&) noexcept {
 	return (REG_DISPCTL >> 8u) & 0b1111u;
 }
 
-void setBgStatus(Context&, uint32_t status) noexcept {
+void setBgStatus(Context&, uint32_t const status) noexcept {
 	constexpr auto BgStatus = 8;
 	REG_DISPCTL = (REG_DISPCTL & ~0b111100000000u) | status << BgStatus;
 }
 
-bool bgStatus(Context&, unsigned bg) noexcept {
+bool bgStatus(Context&, unsigned const bg) noexcept {
 	return (REG_DISPCTL >> (8 + bg)) & 1;
 }
 
-void setBgStatus(Context&, unsigned bg, bool status) noexcept {
+void setBgStatus(Context&, unsigned const bg, bool const status) noexcept {
 	constexpr auto Bg0Status = 8;
-	const auto mask = static_cast<uint32_t>(status) << (Bg0Status + bg);
+	auto const mask = static_cast<uint32_t>(status) << (Bg0Status + bg);
 	REG_DISPCTL = REG_DISPCTL | ((REG_DISPCTL & ~mask) | mask);
 }
 
-void setBgBpp(Context&, unsigned bgIdx, unsigned bpp) noexcept {
+void setBgBpp(Context&, unsigned const bgIdx, unsigned const bpp) noexcept {
 	auto &bgCtl = regBgCtl(bgIdx);
 	teagba::bgSetBpp(bgCtl, bpp);
 }
 
-void setBgCbb(Context &ctx, unsigned bgIdx, unsigned cbb) noexcept {
+void setBgCbb(Context &ctx, unsigned const bgIdx, unsigned const cbbIdx) noexcept {
 	auto &bgCtl = regBgCtl(bgIdx);
-	const auto &cbbData = ctx.cbbData[cbb];
+	auto const &cbbData = ctx.cbbData[cbbIdx];
 	teagba::bgSetBpp(bgCtl, cbbData.bpp);
-	teagba::bgSetCbb(bgCtl, cbb);
+	teagba::bgSetCbb(bgCtl, cbbIdx);
 }
 
-void setBgPriority(Context&, uint_t bgIdx, uint_t priority) noexcept {
+void setBgPriority(Context&, uint_t const bgIdx, uint_t const priority) noexcept {
 	auto &bgCtl = regBgCtl(bgIdx);
 	bgCtl = (bgCtl & 0b1111'1111'1111'1100u) | (priority & 0b11);
 }
 
-void hideSprite(Context&, unsigned idx) noexcept {
+void setBgOffset(Context&, uint16_t const bg, int16_t const x, int16_t const y) noexcept {
+	teagba::setBgOffset(bg, x, y);
+}
+
+void scrollBgOffset(Context&, uint16_t const bg, int16_t const x, int16_t const y) noexcept {
+	teagba::scrollBgOffset(bg, x, y);
+}
+
+void hideSprite(Context&, unsigned const idx) noexcept {
 	//oxAssert(g_spriteUpdates < config::GbaSpriteBufferLen, "Sprite update buffer overflow");
 	teagba::addSpriteUpdate({
 		.attr0 = uint16_t{0b11 << 8},
@@ -264,7 +311,7 @@ void hideSprite(Context&, unsigned idx) noexcept {
 	});
 }
 
-void showSprite(Context&, unsigned idx) noexcept {
+void showSprite(Context&, unsigned const idx) noexcept {
 	//oxAssert(g_spriteUpdates < config::GbaSpriteBufferLen, "Sprite update buffer overflow");
 	teagba::addSpriteUpdate({
 		.attr0 = 0,
@@ -272,7 +319,7 @@ void showSprite(Context&, unsigned idx) noexcept {
 	});
 }
 
-void setSprite(Context&, uint_t idx, Sprite const&s) noexcept {
+void setSprite(Context&, uint_t const idx, Sprite const &s) noexcept {
 	//oxAssert(g_spriteUpdates < config::GbaSpriteBufferLen, "Sprite update buffer overflow");
 	uint16_t const eightBpp = s.bpp == 8;
 	teagba::addSpriteUpdate({
@@ -293,10 +340,49 @@ void setSprite(Context&, uint_t idx, Sprite const&s) noexcept {
 	});
 }
 
-uint_t spriteCount(Context&) noexcept {
+uint_t spriteCount(Context const &) noexcept {
 	return SpriteCount;
 }
 
 }
 
+namespace ox {
+
+void panic(char const *file, int line, char const *panicMsg, ox::Error const &err) noexcept {
+	using namespace nostalgia::gfx;
+	// reset heap to make sure we have enough memory to allocate context data
+	OX_ALLOW_UNSAFE_BUFFERS_BEGIN
+	auto const heapBegin = reinterpret_cast<char*>(MEM_EWRAM.data());
+	auto const heapSz = MEM_EWRAM.size() / 2;
+	auto const heapEnd = reinterpret_cast<char*>(MEM_EWRAM.data() + heapSz);
+	ox::heapmgr::initHeap(heapBegin, heapEnd);
+	OX_ALLOW_UNSAFE_BUFFERS_END
+	auto tctx = turbine::init(keel::loadRomFs("").unwrap(), "Nostalgia").unwrap();
+	auto ctx = init(*tctx).unwrap();
+	std::ignore = initGfx();
+	std::ignore = initConsole(*ctx);
+	setBgStatus(*ctx, 0, true);
+	clearBg(*ctx, 0);
+	auto const serr = ox::sfmt<ox::IString<23>>("Error code: {}", static_cast<int64_t>(err));
+	consoleWrite(*ctx, 32 + 1,  1, "SADNESS...");
+	consoleWrite(*ctx, 32 + 1,  4, "UNEXPECTED STATE:");
+	consoleWrite(*ctx, 32 + 2,  6, panicMsg);
+	if (err) {
+		consoleWrite(*ctx, 32 + 2,  8, serr);
+	}
+	consoleWrite(*ctx, 32 + 1, 15, "PLEASE RESTART THE SYSTEM");
+	// print to terminal if in mGBA
+	oxErrf("\033[31;1;1mPANIC:\033[0m [{}:{}]: {}\n", file, line, panicMsg);
+	if (err.msg) {
+		oxErrf("\tError Message:\t{}\n", err.msg);
+	}
+	oxErrf("\tError Code:\t{}\n", static_cast<ErrorCode>(err));
+	if (err.src.file_name() != nullptr) {
+		oxErrf("\tError Location:\t{}:{}\n", err.src.file_name(), err.src.line());
+	}
+	abort();
+}
+
+}
+
 OX_ALLOW_UNSAFE_BUFFERS_END

src/nostalgia/modules/gfx/src/gfx-opengl.cpp

@@ -4,7 +4,6 @@
 
 #include <ox/std/array.hpp>
 #include <ox/std/fmt.hpp>
-#include <ox/std/vec.hpp>
 
 #include <keel/media.hpp>
 
@@ -15,22 +14,105 @@
 #include <nostalgia/gfx/palette.hpp>
 #include <nostalgia/gfx/tilesheet.hpp>
 
-#include "context.hpp"
-#include "gfx.hpp"
-
 namespace nostalgia::gfx {
 
+namespace renderer {
+
+constexpr uint64_t TileRows = 128;
+constexpr uint64_t TileColumns = 128;
+constexpr uint64_t TileCount = TileRows * TileColumns;
+constexpr uint64_t BgVertexVboRows = 4;
+constexpr uint64_t BgVertexVboRowLength = 7;
+constexpr uint64_t BgVertexVboLength = BgVertexVboRows * BgVertexVboRowLength;
+constexpr uint64_t BgVertexEboLength = 6;
+constexpr uint64_t SpriteVertexVboRows = 4;
+constexpr uint64_t SpriteVertexVboRowLength = 6;
+constexpr uint64_t SpriteVertexVboLength = SpriteVertexVboRows * SpriteVertexVboRowLength;
+constexpr uint64_t SpriteVertexEboLength = 6;
+
+struct CBB: glutils::BufferSet {
+	bool updated = false;
+	ox::Array<uint32_t, 32768> pixels;
+	constexpr CBB() noexcept {
+		vertices.resize(TileCount * BgVertexVboLength);
+		elements.resize(TileCount * BgVertexEboLength);
+	}
+};
+
+struct SpriteBlockset: glutils::BufferSet {
+	bool updated = false;
+	constexpr SpriteBlockset(uint64_t spriteCount, uint64_t blocksPerSprite) noexcept {
+		vertices.resize(spriteCount * SpriteVertexVboLength * blocksPerSprite);
+		elements.resize(spriteCount * SpriteVertexEboLength * blocksPerSprite);
+	}
+};
+
+struct Background {
+	float priority = 0;
+	bool enabled = false;
+	unsigned cbbIdx = 0;
+};
+
+}
+
+class Context {
+	public:
+		class Drawer final: public turbine::gl::Drawer {
+			private:
+				Context &m_ctx;
+			public:
+				explicit Drawer(Context &ctx) noexcept: m_ctx{ctx} {}
+				void draw(turbine::Context &tctx) noexcept override {
+					gl::draw(m_ctx, turbine::getScreenSize(tctx));
+				}
+		};
+
+		turbine::Context &turbineCtx;
+		glutils::GLProgram bgShader;
+		glutils::GLProgram spriteShader;
+		ox::Array<renderer::CBB, 4> cbbs;
+		renderer::SpriteBlockset spriteBlocks;
+		ox::Array<Sprite, 128> spriteStates;
+		ox::Array<GLfloat, 1024> bgPalette;
+		ox::Array<renderer::Background, 4> backgrounds;
+		Drawer drawer;
+		uint_t spriteCount = 0;
+		uint_t blocksPerSprite = 0;
+
+		explicit Context(turbine::Context &tctx, InitParams const &params) noexcept:
+			turbineCtx{tctx},
+			spriteBlocks{params.glSpriteCount, params.glBlocksPerSprite},
+			drawer{*this},
+			spriteCount{params.glSpriteCount},
+			blocksPerSprite{params.glBlocksPerSprite} {
+		}
+		Context(Context const&) = delete;
+		Context(Context&&) = delete;
+		Context &operator=(Context const&) = delete;
+		Context &operator=(Context&&) = delete;
+		~Context() noexcept {
+			turbine::gl::removeDrawer(turbineCtx, &drawer);
+		}
+};
+
+void safeDelete(Context *ctx) noexcept {
+	delete ctx;
+}
+
+keel::Context &keelCtx(Context &ctx) noexcept {
+	return turbine::keelCtx(ctx.turbineCtx);
+}
+
+turbine::Context &turbineCtx(Context &ctx) noexcept {
+	return ctx.turbineCtx;
+}
+
+
 namespace renderer {
 
 static constexpr auto Scale = 1;
 static constexpr auto PriorityScale = 0.01f;
 
-Drawer::Drawer(Context &ctx) noexcept: m_ctx(ctx) {}
-
-void Drawer::draw(turbine::Context &tctx) noexcept {
-	gfx::gl::draw(m_ctx, turbine::getScreenSize(tctx));
-}
-
 static constexpr ox::CStringView bgvshadTmpl = R"glsl(
 	{}
 	in vec2 vTexCoord;
@@ -106,7 +188,7 @@ static constexpr ox::CStringView spritefshadTmpl = R"glsl(
 	})glsl";
 
 [[nodiscard]]
-static constexpr auto bgVertexRow(uint_t x, uint_t y) noexcept {
+static constexpr auto bgVertexRow(uint_t const x, uint_t const y) noexcept {
 	return y * TileRows + x;
 }
 
@@ -183,7 +265,7 @@ static void setTileBufferObject(
 	ox::spancpy<GLuint>(ebo, elms);
 }
 
-static void initSpriteBufferObjects(Context &ctx, glutils::BufferSet &bs) noexcept {
+static void initSpriteBufferObjects(Context const &ctx, glutils::BufferSet &bs) noexcept {
 	for (auto i = 0u; i < ctx.spriteCount; ++i) {
 		auto const vbo = ox::Span{bs.vertices}
 			+ i * static_cast<std::size_t>(SpriteVertexVboLength);
@@ -205,7 +287,7 @@ static void initSpriteBufferObjects(Context &ctx, glutils::BufferSet &bs) noexce
 static void initBackgroundBufferObjects(glutils::BufferSet &bs) noexcept {
 	for (auto x = 0u; x < TileColumns; ++x) {
 		for (auto y = 0u; y < TileRows; ++y) {
-			const auto i = bgVertexRow(x, y);
+			auto const i = bgVertexRow(x, y);
 			auto const vbo = ox::Span{bs.vertices}
 				+ i * static_cast<std::size_t>(BgVertexVboLength);
 			auto const ebo = ox::Span{bs.elements}
@@ -241,7 +323,13 @@ static void initSpritesBufferset(Context &ctx) noexcept {
 	// in float vEnabled;
 	auto const enabledAttr = static_cast<GLuint>(glGetAttribLocation(shader, "vEnabled"));
 	glEnableVertexAttribArray(enabledAttr);
-	glVertexAttribPointer(enabledAttr, 1, GL_FLOAT, GL_FALSE, SpriteVertexVboRowLength * sizeof(float), nullptr);
+	glVertexAttribPointer(
+		enabledAttr,
+		1,
+		GL_FLOAT,
+		GL_FALSE,
+		SpriteVertexVboRowLength * sizeof(float),
+		nullptr);
 	// in vec3 vPosition;
 	auto const posAttr = static_cast<GLuint>(glGetAttribLocation(shader, "vPosition"));
 	glEnableVertexAttribArray(posAttr);
@@ -250,13 +338,14 @@ static void initSpritesBufferset(Context &ctx) noexcept {
 	// in vec2 vTexCoord;
 	auto const texCoordAttr = static_cast<GLuint>(glGetAttribLocation(shader, "vTexCoord"));
 	glEnableVertexAttribArray(texCoordAttr);
-	glVertexAttribPointer(texCoordAttr, 2, GL_FLOAT, GL_FALSE, SpriteVertexVboRowLength * sizeof(float),
-	                      std::bit_cast<void*>(uintptr_t{4 * sizeof(float)}));
+	glVertexAttribPointer(
+		texCoordAttr, 2, GL_FLOAT, GL_FALSE, SpriteVertexVboRowLength * sizeof(float),
+		std::bit_cast<void*>(uintptr_t{4 * sizeof(float)}));
 	glBindVertexArray(0);
 }
 
 static void initBackgroundBufferset(
-		GLuint shader,
+		GLuint const shader,
 		glutils::BufferSet &bs) noexcept {
 	// vao
 	bs.vao = glutils::generateVertexArrayObject();
@@ -270,7 +359,13 @@ static void initBackgroundBufferset(
 	// vbo layout
 	auto const posAttr = static_cast<GLuint>(glGetAttribLocation(shader, "vPosition"));
 	glEnableVertexAttribArray(posAttr);
-	glVertexAttribPointer(posAttr, 3, GL_FLOAT, GL_FALSE, BgVertexVboRowLength * sizeof(float), nullptr);
+	glVertexAttribPointer(
+		posAttr,
+		3,
+		GL_FLOAT,
+		GL_FALSE,
+		BgVertexVboRowLength * sizeof(float),
+		nullptr);
 	auto const texCoordAttr = static_cast<GLuint>(glGetAttribLocation(shader, "vTexCoord"));
 	glEnableVertexAttribArray(texCoordAttr);
 	glVertexAttribPointer(
@@ -290,9 +385,9 @@ static void initBackgroundBufferset(
 }
 
 static glutils::GLTexture createTexture(
-		GLsizei w,
-		GLsizei h,
-		void const*pixels) noexcept {
+		GLsizei const w,
+		GLsizei const h,
+		void const *pixels) noexcept {
 	GLuint texId = 0;
 	glGenTextures(1, &texId);
 	glutils::GLTexture tex(texId);
@@ -300,7 +395,16 @@ static glutils::GLTexture createTexture(
 	tex.height = h;
 	glActiveTexture(GL_TEXTURE0);
 	glBindTexture(GL_TEXTURE_2D, tex.id);
-	glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, tex.width, tex.height, 0, GL_RGBA, GL_UNSIGNED_BYTE, pixels);
+	glTexImage2D(
+		GL_TEXTURE_2D,
+		0,
+		GL_RGBA,
+		tex.width,
+		tex.height,
+		0,
+		GL_RGBA,
+		GL_UNSIGNED_BYTE,
+		pixels);
 	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
 	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
 	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
@@ -321,22 +425,22 @@ static void drawBackground(CBB &cbb) noexcept {
 
 static void drawBackgrounds(
 		Context &ctx,
-		ox::Size const&renderSz) noexcept {
+		ox::Size const &renderSz) noexcept {
 	// load background shader and its uniforms
 	glUseProgram(ctx.bgShader);
-	const auto uniformSrcImgSz = glGetUniformLocation(ctx.bgShader, "fSrcImgSz");
-	const auto uniformXScale = static_cast<GLint>(glGetUniformLocation(ctx.bgShader, "vXScale"));
-	const auto uniformTileHeight = static_cast<GLint>(glGetUniformLocation(ctx.bgShader, "vTileHeight"));
-	const auto uniformBgIdx = static_cast<GLint>(glGetUniformLocation(ctx.bgShader, "vBgIdx"));
-	const auto [wi, hi] = renderSz;
-	const auto wf = static_cast<float>(wi);
-	const auto hf = static_cast<float>(hi);
+	auto const uniformSrcImgSz = glGetUniformLocation(ctx.bgShader, "fSrcImgSz");
+	auto const uniformXScale = static_cast<GLint>(glGetUniformLocation(ctx.bgShader, "vXScale"));
+	auto const uniformTileHeight = static_cast<GLint>(glGetUniformLocation(ctx.bgShader, "vTileHeight"));
+	auto const uniformBgIdx = static_cast<GLint>(glGetUniformLocation(ctx.bgShader, "vBgIdx"));
+	auto const [wi, hi] = renderSz;
+	auto const wf = static_cast<float>(wi);
+	auto const hf = static_cast<float>(hi);
 	glUniform1f(uniformXScale, hf / wf);
 	auto bgIdx = 0.f;
-	for (const auto &bg : ctx.backgrounds) {
+	for (auto const &bg : ctx.backgrounds) {
 		if (bg.enabled) {
 			auto &cbb = ctx.cbbs[bg.cbbIdx];
-			const auto tileRows = cbb.tex.height / (TileHeight * Scale);
+			auto const tileRows = cbb.tex.height / (TileHeight * Scale);
 			glUniform1f(uniformTileHeight, 1.0f / static_cast<float>(tileRows));
 			glUniform2f(
 					uniformSrcImgSz,
@@ -349,14 +453,14 @@ static void drawBackgrounds(
 	}
 }
 
-static void drawSprites(Context &ctx, ox::Size const&renderSz) noexcept {
+static void drawSprites(Context &ctx, ox::Size const &renderSz) noexcept {
 	glUseProgram(ctx.spriteShader);
 	auto &sb = ctx.spriteBlocks;
-	const auto uniformXScale = glGetUniformLocation(ctx.bgShader, "vXScale");
-	const auto uniformTileHeight = glGetUniformLocation(ctx.spriteShader, "vTileHeight");
-	const auto [wi, hi] = renderSz;
-	const auto wf = static_cast<float>(wi);
-	const auto hf = static_cast<float>(hi);
+	auto const uniformXScale = glGetUniformLocation(ctx.bgShader, "vXScale");
+	auto const uniformTileHeight = glGetUniformLocation(ctx.spriteShader, "vTileHeight");
+	auto const [wi, hi] = renderSz;
+	auto const wf = static_cast<float>(wi);
+	auto const hf = static_cast<float>(hi);
 	glUniform1f(uniformXScale, hf / wf);
 	// update vbo
 	glBindVertexArray(sb.vao);
@@ -365,7 +469,7 @@ static void drawSprites(Context &ctx, ox::Size const&renderSz) noexcept {
 		glutils::sendVbo(sb);
 	}
 	// set vTileHeight uniform
-	const auto tileRows = sb.tex.height / (TileHeight * Scale);
+	auto const tileRows = sb.tex.height / (TileHeight * Scale);
 	glUniform1f(uniformTileHeight, 1.0f / static_cast<float>(tileRows));
 	// draw
 	glBindTexture(GL_TEXTURE_2D, sb.tex);
@@ -375,10 +479,10 @@ static void drawSprites(Context &ctx, ox::Size const&renderSz) noexcept {
 
 static void loadPalette(
 		ox::Array<GLfloat, 1024> &palette,
-		size_t palOffset,
-		GLuint shaderPgrm,
-		CompactPalette const&pal,
-		size_t page = 0) noexcept {
+		size_t const palOffset,
+		GLuint const shaderPgrm,
+		CompactPalette const &pal,
+		size_t const page = 0) noexcept {
 	static constexpr std::size_t ColorCnt = 256;
 	for (auto i = palOffset; auto const c : pal.pages[page]) {
 		palette[i++] = redf(c);
@@ -389,14 +493,14 @@ static void loadPalette(
 	// make first color transparent
 	palette[palOffset + 3] = 0;
 	glUseProgram(shaderPgrm);
-	const auto uniformPalette = static_cast<GLint>(glGetUniformLocation(shaderPgrm, "fPalette"));
+	auto const uniformPalette = static_cast<GLint>(glGetUniformLocation(shaderPgrm, "fPalette"));
 	glUniform4fv(uniformPalette, ColorCnt, palette.data());
 }
 
 static void setSprite(
 		Context &ctx,
 		uint_t const idx,
-		Sprite const&s) noexcept {
+		Sprite const &s) noexcept {
 	// Tonc Table 8.4
 	struct Sz { uint_t x{}, y{}; };
 	static constexpr ox::Array<Sz, 12> dimensions{
@@ -422,12 +526,12 @@ static void setSprite(
 	auto const uY = static_cast<int>(s.y + 8) % 255 - 8;
 	oxAssert(1 < ctx.spriteBlocks.vertices.size(), "vbo overflow");
 	oxAssert(1 < ctx.spriteBlocks.elements.size(), "ebo overflow");
-	const auto spriteVboSz = ctx.blocksPerSprite * renderer::SpriteVertexVboLength;
-	const auto spriteEboSz = ctx.blocksPerSprite * renderer::SpriteVertexEboLength;
+	auto const spriteVboSz = ctx.blocksPerSprite * renderer::SpriteVertexVboLength;
+	auto const spriteEboSz = ctx.blocksPerSprite * renderer::SpriteVertexEboLength;
 	auto const vboBase = spriteVboSz * idx;
 	auto const eboBase = spriteEboSz * idx;
 	auto i = 0u;
-	const auto set = [&](int xIt, int yIt, bool enabled) {
+	auto const set = [&](int xIt, int yIt, bool enabled) {
 		auto const fX = static_cast<float>(uX + xIt * 8) / 8;
 		auto const fY = static_cast<float>(uY + yIt * 8) / 8;
 		auto const vboIdx = vboBase + renderer::SpriteVertexVboLength * i;
@@ -470,28 +574,23 @@ static void setSprite(
 
 }
 
-ox::Error initGfx(
-		Context &ctx,
-		InitParams const&initParams) noexcept {
-	const auto bgVshad = ox::sfmt(renderer::bgvshadTmpl, gl::GlslVersion);
-	const auto bgFshad = ox::sfmt(renderer::bgfshadTmpl, gl::GlslVersion);
-	const auto spriteVshad = ox::sfmt(renderer::spritevshadTmpl, gl::GlslVersion);
-	const auto spriteFshad = ox::sfmt(renderer::spritefshadTmpl, gl::GlslVersion);
-	OX_RETURN_ERROR(glutils::buildShaderProgram(bgVshad, bgFshad).moveTo(ctx.bgShader));
+ox::Result<ox::UPtr<Context>> init(turbine::Context &tctx, InitParams const &params) noexcept {
+	auto ctx = ox::make_unique<Context>(tctx, params);
+	auto const bgVshad = ox::sfmt(renderer::bgvshadTmpl, gl::GlslVersion);
+	auto const bgFshad = ox::sfmt(renderer::bgfshadTmpl, gl::GlslVersion);
+	auto const spriteVshad = ox::sfmt(renderer::spritevshadTmpl, gl::GlslVersion);
+	auto const spriteFshad = ox::sfmt(renderer::spritefshadTmpl, gl::GlslVersion);
+	OX_RETURN_ERROR(glutils::buildShaderProgram(bgVshad, bgFshad).moveTo(ctx->bgShader));
 	OX_RETURN_ERROR(
-			glutils::buildShaderProgram(spriteVshad, spriteFshad).moveTo(ctx.spriteShader));
-	for (auto &cbb : ctx.cbbs) {
-		initBackgroundBufferset(ctx.bgShader, cbb);
+			glutils::buildShaderProgram(spriteVshad, spriteFshad).moveTo(ctx->spriteShader));
+	for (auto &cbb : ctx->cbbs) {
+		initBackgroundBufferset(ctx->bgShader, cbb);
 	}
-	renderer::initSpritesBufferset(ctx);
-	if (initParams.glInstallDrawer) {
-		turbine::gl::addDrawer(ctx.turbineCtx, &ctx.drawer);
+	renderer::initSpritesBufferset(*ctx);
+	if (params.glInstallDrawer) {
+		turbine::gl::addDrawer(ctx->turbineCtx, &ctx->drawer);
 	}
-	return {};
-}
-
-void shutdownGfx(Context &ctx) noexcept {
-	turbine::gl::removeDrawer(ctx.turbineCtx, &ctx.drawer);
+	return ctx;
 }
 
 struct TileSheetData {
@@ -504,12 +603,12 @@ struct TileSheetData {
 	}
 };
 
-static ox::Result<TileSheetData> normalizeTileSheet(
-		CompactTileSheet const&ts) noexcept {
+static ox::Result<TileSheetData> normalizeTileSheet
+		(CompactTileSheet const &ts) noexcept {
 	const uint_t bytesPerTile = ts.bpp == 8 ? PixelsPerTile : PixelsPerTile / 2;
-	const auto tiles = ts.pixels.size() / bytesPerTile;
+	auto const tiles = ts.pixels.size() / bytesPerTile;
 	constexpr int width = 8;
-	const int height = 8 * static_cast<int>(tiles);
+	int const height = 8 * static_cast<int>(tiles);
 	ox::Vector<uint32_t> pixels;
 	if (bytesPerTile == 64) { // 8 BPP
 		pixels.resize(ts.pixels.size());
@@ -523,37 +622,41 @@ static ox::Result<TileSheetData> normalizeTileSheet(
 			pixels[i * 2 + 1] = ts.pixels[i] >> 4;
 		}
 	}
-	return TileSheetData{std::move(pixels), width, height};
+	return TileSheetData{
+		.pixels = std::move(pixels),
+		.width = width,
+		.height = height
+	};
 }
 
 ox::Error loadBgPalette(
 		Context &ctx,
-		size_t palBank,
-		CompactPalette const&palette,
-		size_t page) noexcept {
+		size_t const palBank,
+		CompactPalette const &palette,
+		size_t const page) noexcept {
 	renderer::loadPalette(ctx.bgPalette, palBank * 16 * 4, ctx.bgShader, palette, page);
 	return {};
 }
 
 ox::Error loadSpritePalette(
 		Context &ctx,
-		CompactPalette const&palette,
-		size_t page) noexcept {
+		CompactPalette const &palette,
+		size_t const page) noexcept {
 	ox::Array<GLfloat, 1024> pal;
 	renderer::loadPalette(pal, 0, ctx.spriteShader, palette, page);
 	return {};
 }
 
 static ox::Result<TileSheetData> buildSetTsd(
-		Context &ctx,
-		TileSheetSet const&set) noexcept {
+		Context const &ctx,
+		TileSheetSet const &set) noexcept {
 	auto &kctx = keelCtx(ctx.turbineCtx);
 	TileSheetData setTsd;
 	setTsd.width = TileWidth;
-	for (auto const&entry : set.entries) {
+	for (auto const &entry : set.entries) {
 		OX_REQUIRE(tilesheet, readObj<CompactTileSheet>(kctx, entry.tilesheet));
 		OX_REQUIRE(tsd, normalizeTileSheet(*tilesheet));
-		for (auto const&s : entry.sections) {
+		for (auto const &s : entry.sections) {
 			auto const size = s.tiles * PixelsPerTile;
 			for (auto i = 0; i < size; ++i) {
 				auto const srcIdx = static_cast<size_t>(i) + static_cast<size_t>(s.begin * PixelsPerTile);
@@ -566,8 +669,8 @@ static ox::Result<TileSheetData> buildSetTsd(
 }
 
 static void copyPixels(
-		CompactTileSheet const&ts,
-		ox::Span<uint32_t> dst,
+		CompactTileSheet const &ts,
+		ox::Span<uint32_t> const dst,
 		size_t const srcPxIdx,
 		size_t const pxlCnt) noexcept {
 	size_t idx{};
@@ -601,7 +704,7 @@ void clearCbbs(Context &ctx) noexcept {
 ox::Error loadBgTileSheet(
 		Context &ctx,
 		unsigned const cbb,
-		CompactTileSheet const&ts,
+		CompactTileSheet const &ts,
 		size_t const dstTileIdx,
 		size_t const srcTileIdx,
 		size_t const tileCnt) noexcept {
@@ -624,9 +727,9 @@ ox::Error loadBgTileSheet(
 
 ox::Error loadBgTileSheet(
 		Context &ctx,
-		uint_t cbb,
-		CompactTileSheet const&ts,
-		ox::Optional<unsigned> const&paletteBank) noexcept {
+		uint_t const cbb,
+		CompactTileSheet const &ts,
+		ox::Optional<unsigned> const &paletteBank) noexcept {
 	auto const bytesPerTile = static_cast<uint64_t>(PixelsPerTile / (1 + (ts.bpp == 4)));
 	auto const tiles = ts.pixels.size() / bytesPerTile;
 	OX_RETURN_ERROR(loadBgTileSheet(ctx, cbb, ts, 0, 0, tiles));
@@ -638,8 +741,8 @@ ox::Error loadBgTileSheet(
 
 ox::Error loadBgTileSheet(
 		Context &ctx,
-		unsigned cbb,
-		TileSheetSet const&set) noexcept {
+		unsigned const cbb,
+		TileSheetSet const &set) noexcept {
 	OX_REQUIRE(setTsd, buildSetTsd(ctx, set));
 	ctx.cbbs[cbb].tex = renderer::createTexture(setTsd.width, setTsd.height, setTsd.pixels.data());
 	return {};
@@ -647,8 +750,8 @@ ox::Error loadBgTileSheet(
 
 ox::Error loadSpriteTileSheet(
 		Context &ctx,
-		CompactTileSheet const&ts,
-		bool loadDefaultPalette) noexcept {
+		CompactTileSheet const &ts,
+		bool const loadDefaultPalette) noexcept {
 	OX_REQUIRE(tsd, normalizeTileSheet(ts));
 	oxTracef("nostalgia.gfx.gl", "loadSpriteTexture: { w: {}, h: {} }", tsd.width, tsd.height);
 	ctx.spriteBlocks.tex = renderer::createTexture(tsd.width, tsd.height, tsd.pixels.data());
@@ -660,7 +763,7 @@ ox::Error loadSpriteTileSheet(
 
 ox::Error loadSpriteTileSheet(
 		Context &ctx,
-		TileSheetSet const&set) noexcept {
+		TileSheetSet const &set) noexcept {
 	OX_REQUIRE(setTsd, buildSetTsd(ctx, set));
 	ctx.spriteBlocks.tex = renderer::createTexture(setTsd.width, setTsd.height, setTsd.pixels.data());
 	return {};
@@ -668,21 +771,21 @@ ox::Error loadSpriteTileSheet(
 
 void setBgTile(
 		Context &ctx,
-		uint_t bgIdx,
-		int column,
-		int row,
-		BgTile const&tile) noexcept {
+		uint_t const bgIdx,
+		int const column,
+		int const row,
+		BgTile const &tile) noexcept {
 	oxTracef(
 			"nostalgia.gfx.setBgTile",
 			"bgIdx: {}, column: {}, row: {}, tile: {}, palBank: {}",
 			bgIdx, column, row, tile.tileIdx, tile.palBank);
-	const auto z = static_cast<uint_t>(bgIdx);
-	const auto y = static_cast<uint_t>(row);
-	const auto x = static_cast<uint_t>(column);
-	const auto i = renderer::bgVertexRow(x, y);
+	auto const z = static_cast<uint_t>(bgIdx);
+	auto const y = static_cast<uint_t>(row);
+	auto const x = static_cast<uint_t>(column);
+	auto const i = renderer::bgVertexRow(x, y);
 	auto &cbb = ctx.cbbs[z];
-	const auto vbo = ox::Span{cbb.vertices} + i * renderer::BgVertexVboLength;
-	const auto ebo = ox::Span{cbb.elements} + i * renderer::BgVertexEboLength;
+	auto const vbo = ox::Span{cbb.vertices} + i * renderer::BgVertexVboLength;
+	auto const ebo = ox::Span{cbb.elements} + i * renderer::BgVertexEboLength;
 	auto &bg = ctx.backgrounds[bgIdx];
 	renderer::setTileBufferObject(
 			static_cast<uint_t>(i * renderer::BgVertexVboRows),
@@ -698,7 +801,7 @@ void setBgTile(
 	cbb.updated = true;
 }
 
-void clearBg(Context &ctx, uint_t bgIdx) noexcept {
+void clearBg(Context &ctx, uint_t const bgIdx) noexcept {
 	auto &cbb = ctx.cbbs[static_cast<std::size_t>(bgIdx)];
 	initBackgroundBufferObjects(cbb);
 	cbb.updated = true;
@@ -714,61 +817,59 @@ uint8_t bgStatus(Context &ctx) noexcept {
 	return out;
 }
 
-void setBgStatus(Context &ctx, uint32_t status) noexcept {
+void setBgStatus(Context &ctx, uint32_t const status) noexcept {
 	for (uint_t i = 0; i < ctx.cbbs.size(); ++i) {
 		ctx.backgrounds[i].enabled = (status >> i) & 1;
 	}
 }
 
-bool bgStatus(Context &ctx, uint_t bg) noexcept {
+bool bgStatus(Context &ctx, uint_t const bg) noexcept {
 	return ctx.backgrounds[bg].enabled;
 }
 
-void setBgStatus(Context&ctx, uint_t bg, bool status) noexcept {
+void setBgStatus(Context&ctx, uint_t const bg, bool const status) noexcept {
 	ctx.backgrounds[bg].enabled = status;
 }
 
-void setBgBpp(Context&, unsigned, unsigned) noexcept {}
-
-void setBgCbb(Context &ctx, uint_t bgIdx, uint_t cbbIdx) noexcept {
+void setBgCbb(Context &ctx, uint_t const bgIdx, uint_t const cbbIdx) noexcept {
 	auto &bg = ctx.backgrounds[bgIdx];
 	bg.cbbIdx = cbbIdx;
 }
 
-void setBgPriority(Context &ctx, uint_t bgIdx, uint_t priority) noexcept {
+void setBgPriority(Context &ctx, uint_t const bgIdx, uint_t const priority) noexcept {
 	auto &bg = ctx.backgrounds[bgIdx];
 	bg.priority = static_cast<float>(priority & 0b11);
 }
 
-void hideSprite(Context &ctx, uint_t idx) noexcept {
+void hideSprite(Context &ctx, uint_t const idx) noexcept {
 	auto &s = ctx.spriteStates[idx];
 	s.enabled = false;
 	renderer::setSprite(ctx, idx, s);
 }
 
-void showSprite(Context &ctx, uint_t idx) noexcept {
+void showSprite(Context &ctx, uint_t const idx) noexcept {
 	auto &s = ctx.spriteStates[idx];
 	s.enabled = true;
 	renderer::setSprite(ctx, idx, s);
 }
 
-void setSprite(Context &ctx, uint_t idx, Sprite const&sprite) noexcept {
+void setSprite(Context &ctx, uint_t const idx, Sprite const &sprite) noexcept {
 	auto &s = ctx.spriteStates[idx];
 	s = sprite;
 	renderer::setSprite(ctx, idx, s);
 }
 
-uint_t spriteCount(Context &ctx) noexcept {
+uint_t spriteCount(Context const &ctx) noexcept {
 	return ctx.spriteCount;
 }
 
 namespace gl {
 
-ox::Size drawSize(int scale) noexcept {
+ox::Size drawSize(int const scale) noexcept {
 	return {240 * scale, 160 * scale};
 }
 
-void draw(gfx::Context &ctx, ox::Size const&renderSz) noexcept {
+void draw(Context &ctx, ox::Size const &renderSz) noexcept {
 	glViewport(0, 0, renderSz.width, renderSz.height);
 	glEnable(GL_DEPTH_TEST);
 	glEnable(GL_BLEND);
@@ -783,7 +884,7 @@ void draw(gfx::Context &ctx, ox::Size const&renderSz) noexcept {
 	glDisable(GL_BLEND);
 }
 
-void draw(gfx::Context &ctx, int scale) noexcept {
+void draw(Context &ctx, int const scale) noexcept {
 	draw(ctx, drawSize(scale));
 }
 

src/nostalgia/modules/gfx/src/gfx.cpp

@@ -10,17 +10,17 @@ namespace nostalgia::gfx {
 constexpr auto GbaTileColumns = 32;
 constexpr auto GbaTileRows = 32;
 
-int tileColumns(Context&) noexcept {
+int tileColumns(Context const&) noexcept {
 	return GbaTileColumns;
 }
 
-int tileRows(Context&) noexcept {
+int tileRows(Context const&) noexcept {
 	return GbaTileRows;
 }
 
 ox::Error loadBgPalette(
 		Context &ctx,
-		size_t palBank,
+		size_t const palBank,
 		ox::StringViewCR palettePath) noexcept {
 	OX_REQUIRE(pal, keel::readObj<CompactPalette>(keelCtx(ctx), palettePath));
 	return loadBgPalette(ctx, palBank, *pal, 0);
@@ -28,8 +28,8 @@ ox::Error loadBgPalette(
 
 ox::Error loadBgPalette(
 		Context &ctx,
-		size_t palBank,
-		ox::FileAddress const&paletteAddr) noexcept {
+		size_t const palBank,
+		ox::FileAddress const &paletteAddr) noexcept {
 	OX_REQUIRE(pal, keel::readObj<CompactPalette>(keelCtx(ctx), paletteAddr));
 	return loadBgPalette(ctx, palBank, *pal, 0);
 }
@@ -43,18 +43,18 @@ ox::Error loadSpritePalette(
 
 ox::Error loadSpritePalette(
 		Context &ctx,
-		ox::FileAddress const&paletteAddr) noexcept {
+		ox::FileAddress const &paletteAddr) noexcept {
 	OX_REQUIRE(pal, keel::readObj<CompactPalette>(keelCtx(ctx), paletteAddr));
 	return loadSpritePalette(ctx, *pal, 0);
 }
 
 ox::Error loadBgTileSheet(
 		Context &ctx,
-		unsigned cbb,
-		ox::FileAddress const&tsAddr,
-		size_t dstTileIdx,
-		size_t srcTileIdx,
-		size_t tileCnt) noexcept {
+		unsigned const cbb,
+		ox::FileAddress const &tsAddr,
+		size_t const dstTileIdx,
+		size_t const srcTileIdx,
+		size_t const tileCnt) noexcept {
 	OX_REQUIRE(ts, keel::readObj<CompactTileSheet>(keelCtx(ctx), tsAddr));
 	return loadBgTileSheet(ctx, cbb, *ts, dstTileIdx, srcTileIdx, tileCnt);
 }
@@ -63,27 +63,27 @@ ox::Error loadBgTileSheet(
 		Context &ctx,
 		unsigned cbb,
 		ox::StringViewCR tsPath,
-		size_t dstTileIdx,
-		size_t srcTileIdx,
-		size_t tileCnt) noexcept {
+		size_t const dstTileIdx,
+		size_t const srcTileIdx,
+		size_t const tileCnt) noexcept {
 	OX_REQUIRE(ts, keel::readObj<CompactTileSheet>(keelCtx(ctx), tsPath));
 	return loadBgTileSheet(ctx, cbb, *ts, dstTileIdx, srcTileIdx, tileCnt);
 }
 
 ox::Error loadBgTileSheet(
 		Context &ctx,
-		unsigned cbb,
+		unsigned const cbb,
 		ox::StringViewCR tilesheetPath,
-		ox::Optional<unsigned> const&paletteBank) noexcept {
+		ox::Optional<unsigned> const &paletteBank) noexcept {
 	OX_REQUIRE(ts, keel::readObj<CompactTileSheet>(keelCtx(ctx), tilesheetPath));
 	return loadBgTileSheet(ctx, cbb, *ts, paletteBank);
 }
 
 ox::Error loadBgTileSheet(
 		Context &ctx,
-		unsigned cbb,
-		ox::FileAddress const&tilesheetAddr,
-		ox::Optional<unsigned> const&paletteBank) noexcept {
+		unsigned const cbb,
+		ox::FileAddress const &tilesheetAddr,
+		ox::Optional<unsigned> const &paletteBank) noexcept {
 	OX_REQUIRE(ts, keel::readObj<CompactTileSheet>(keelCtx(ctx), tilesheetAddr));
 	return loadBgTileSheet(ctx, cbb, *ts, paletteBank);
 }
@@ -91,15 +91,15 @@ ox::Error loadBgTileSheet(
 ox::Error loadSpriteTileSheet(
 		Context &ctx,
 		ox::StringViewCR tilesheetPath,
-		bool loadDefaultPalette) noexcept {
+		bool const loadDefaultPalette) noexcept {
 	OX_REQUIRE(ts, readObj<CompactTileSheet>(keelCtx(ctx), tilesheetPath));
 	return loadSpriteTileSheet(ctx, *ts, loadDefaultPalette);
 }
 
 ox::Error loadSpriteTileSheet(
 		Context &ctx,
-		ox::FileAddress const&tilesheetAddr,
-		bool loadDefaultPalette) noexcept {
+		ox::FileAddress const &tilesheetAddr,
+		bool const loadDefaultPalette) noexcept {
 	OX_REQUIRE(ts, readObj<CompactTileSheet>(keelCtx(ctx), tilesheetAddr));
 	return loadSpriteTileSheet(ctx, *ts, loadDefaultPalette);
 }
@@ -235,7 +235,13 @@ constexpr ox::Array<char, 128> charMap = {
 	50, // ~
 };
 
-void setBgTile(Context &ctx, uint_t bgIdx, int column, int row, unsigned tile, unsigned palBank) noexcept {
+void setBgTile(
+	Context &ctx,
+	uint_t const bgIdx,
+	int const column,
+	int const row,
+	unsigned const tile,
+	unsigned const palBank) noexcept {
 	setBgTile(ctx, bgIdx, column, row, {
 		.tileIdx = tile,
 		.palBank = palBank,
@@ -243,7 +249,7 @@ void setBgTile(Context &ctx, uint_t bgIdx, int column, int row, unsigned tile, u
 }
 
 ox::Error initConsole(Context &ctx) noexcept {
-	constexpr ox::FileAddress TilesheetAddr = ox::StringLiteral("/TileSheets/Charset.ng");
+	constexpr ox::FileAddress TilesheetAddr = ox::StringLiteral("/TileSheets/Charset.nts");
 	constexpr ox::FileAddress PaletteAddr = ox::StringLiteral("/Palettes/Charset.npal");
 	setBgStatus(ctx, 0b0001);
 	setBgCbb(ctx, 0, 0);
@@ -251,7 +257,7 @@ ox::Error initConsole(Context &ctx) noexcept {
 	return loadBgPalette(ctx, 0, PaletteAddr);
 }
 
-void puts(
+void consoleWrite(
 		Context &ctx,
 		int const column,
 		int const row,

src/nostalgia/modules/gfx/src/keel/keelmodule.cpp

@@ -14,19 +14,6 @@
 namespace nostalgia::gfx {
 
 static class: public keel::Module {
-	private:
-		NostalgiaPaletteToPaletteV1Converter m_nostalgiaPaletteToPaletteV1Converter;
-		PaletteV1ToPaletteV2Converter m_paletteV1ToPaletteV2Converter;
-		PaletteV2ToPaletteV3Converter m_paletteV2ToPaletteV3Converter;
-		PaletteV3ToPaletteV4Converter m_paletteV3ToPaletteV4Converter;
-		PaletteV4ToPaletteV5Converter m_paletteV4ToPaletteV5Converter;
-		PaletteToCompactPaletteConverter m_paletteToCompactPaletteConverter;
-		TileSheetV1ToTileSheetV2Converter m_tileSheetV1ToTileSheetV2Converter;
-		TileSheetV2ToTileSheetV3Converter m_tileSheetV2ToTileSheetV3Converter;
-		TileSheetV3ToTileSheetV4Converter m_tileSheetV3ToTileSheetV4Converter;
-		TileSheetV4ToTileSheetV5Converter m_tileSheetV4ToTileSheetV5Converter;
-		TileSheetToCompactTileSheetConverter m_tileSheetToCompactTileSheetConverter;
-
 	public:
 		[[nodiscard]]
 		ox::String id() const noexcept override {
@@ -52,19 +39,19 @@ static class: public keel::Module {
 		}
 
 		[[nodiscard]]
-		ox::Vector<keel::BaseConverter const*> converters() const noexcept final {
+		ox::Vector<keel::Converter> converters() const noexcept final {
 			return {
-				&m_nostalgiaPaletteToPaletteV1Converter,
-				&m_paletteV1ToPaletteV2Converter,
-				&m_paletteV2ToPaletteV3Converter,
-				&m_paletteV3ToPaletteV4Converter,
-				&m_paletteV4ToPaletteV5Converter,
-				&m_paletteToCompactPaletteConverter,
-				&m_tileSheetV1ToTileSheetV2Converter,
-				&m_tileSheetV2ToTileSheetV3Converter,
-				&m_tileSheetV3ToTileSheetV4Converter,
-				&m_tileSheetV4ToTileSheetV5Converter,
-				&m_tileSheetToCompactTileSheetConverter,
+				keel::Converter::make<convertNostalgiaPaletteToPaletteV1>(),
+				keel::Converter::make<convertPaletteV1ToPaletteV2>(),
+				keel::Converter::make<convertPaletteV2ToPaletteV3>(),
+				keel::Converter::make<convertPaletteV3ToPaletteV4>(),
+				keel::Converter::make<convertPaletteV4ToPaletteV5>(),
+				keel::Converter::make<convertPaletteToCompactPalette>(),
+				keel::Converter::make<convertTileSheetV1ToTileSheetV2>(),
+				keel::Converter::make<convertTileSheetV2ToTileSheetV3>(),
+				keel::Converter::make<convertTileSheetV3ToTileSheetV4>(),
+				keel::Converter::make<convertTileSheetV4ToTileSheetV5>(),
+				keel::Converter::make<convertTileSheetToCompactTileSheet>(),
 			};
 		}
 
@@ -102,7 +89,7 @@ static class: public keel::Module {
 
 } const mod;
 
-keel::Module const*keelModule() noexcept {
+keel::Module const *keelModule() noexcept {
 	return &mod;
 }
 

src/nostalgia/modules/gfx/src/keel/typeconv.cpp

@@ -6,26 +6,26 @@
 
 namespace nostalgia::gfx {
 
-ox::Error NostalgiaPaletteToPaletteV1Converter::convert(
+ox::Error convertNostalgiaPaletteToPaletteV1(
 		keel::Context&,
 		NostalgiaPalette &src,
-		PaletteV1 &dst) const noexcept {
+		PaletteV1 &dst) noexcept {
 	dst.colors = std::move(src.colors);
 	return {};
 }
 
-ox::Error PaletteV1ToPaletteV2Converter::convert(
+ox::Error convertPaletteV1ToPaletteV2(
 		keel::Context&,
 		PaletteV1 &src,
-		PaletteV2 &dst) const noexcept {
+		PaletteV2 &dst) noexcept {
 	dst.pages.emplace_back(std::move(src.colors));
 	return {};
 }
 
-ox::Error PaletteV2ToPaletteV3Converter::convert(
+ox::Error convertPaletteV2ToPaletteV3(
 		keel::Context&,
 		PaletteV2 &src,
-		PaletteV3 &dst) const noexcept {
+		PaletteV3 &dst) noexcept {
 	dst.pages = std::move(src.pages);
 	if (!dst.pages.empty()) {
 		dst.colorInfo.reserve(dst.pages[0].size());
@@ -36,10 +36,10 @@ ox::Error PaletteV2ToPaletteV3Converter::convert(
 	return {};
 }
 
-ox::Error PaletteV3ToPaletteV4Converter::convert(
+ox::Error convertPaletteV3ToPaletteV4(
 		keel::Context&,
 		PaletteV3 &src,
-		PaletteV4 &dst) const noexcept {
+		PaletteV4 &dst) noexcept {
 	dst.pages.reserve(src.pages.size());
 	for (auto i = 1; auto &page : src.pages) {
 		dst.pages.emplace_back(ox::sfmt("Page {}", i), std::move(page));
@@ -52,16 +52,16 @@ ox::Error PaletteV3ToPaletteV4Converter::convert(
 	return {};
 }
 
-ox::Error PaletteV4ToPaletteV5Converter::convert(
+ox::Error convertPaletteV4ToPaletteV5(
 		keel::Context&,
 		PaletteV4 &src,
-		PaletteV5 &dst) const noexcept {
+		PaletteV5 &dst) noexcept {
 	dst.colorNames = std::move(src.colorNames);
 	dst.pages.reserve(src.pages.size());
 	for (auto &s : src.pages) {
 		ox::Vector<PaletteColorV2> colors;
 		colors.reserve(s.colors.size());
-		for (auto const&c : s.colors) {
+		for (auto const &c : s.colors) {
 			colors.emplace_back(c.r, c.g, c.b, c.a);
 		}
 		dst.pages.emplace_back(PalettePageV2{
@@ -72,10 +72,10 @@ ox::Error PaletteV4ToPaletteV5Converter::convert(
 	return {};
 }
 
-ox::Error PaletteToCompactPaletteConverter::convert(
+ox::Error convertPaletteToCompactPalette(
 		keel::Context&,
 		Palette &src,
-		CompactPalette &dst) const noexcept {
+		CompactPalette &dst) noexcept {
 	dst.pages.reserve(src.pages.size());
 	for (auto &page : src.pages) {
 		auto &p = dst.pages.emplace_back();
@@ -86,10 +86,10 @@ ox::Error PaletteToCompactPaletteConverter::convert(
 	return {};
 }
 
-ox::Error TileSheetV1ToTileSheetV2Converter::convert(
+ox::Error convertTileSheetV1ToTileSheetV2(
 		keel::Context&,
 		TileSheetV1 &src,
-		TileSheetV2 &dst) const noexcept {
+		TileSheetV2 &dst) noexcept {
 	dst.bpp              = src.bpp;
 	dst.defaultPalette   = std::move(src.defaultPalette);
 	dst.subsheet.name    = "Root";
@@ -99,7 +99,7 @@ ox::Error TileSheetV1ToTileSheetV2Converter::convert(
 	return {};
 }
 
-void TileSheetV2ToTileSheetV3Converter::convertSubsheet(
+static void convertSubsheet(
 		TileSheetV2::SubSheet &src,
 		TileSheetV3::SubSheet &dst,
 		SubSheetId &idIt) noexcept {
@@ -115,10 +115,10 @@ void TileSheetV2ToTileSheetV3Converter::convertSubsheet(
 	}
 }
 
-ox::Error TileSheetV2ToTileSheetV3Converter::convert(
+ox::Error convertTileSheetV2ToTileSheetV3(
 		keel::Context&,
 		TileSheetV2 &src,
-		TileSheetV3 &dst) const noexcept {
+		TileSheetV3 &dst) noexcept {
 	dst.bpp            = src.bpp;
 	dst.defaultPalette = std::move(src.defaultPalette);
 	convertSubsheet(src.subsheet, dst.subsheet, dst.idIt);
@@ -126,7 +126,7 @@ ox::Error TileSheetV2ToTileSheetV3Converter::convert(
 }
 
 
-void TileSheetV3ToTileSheetV4Converter::convertSubsheet(
+static void convertSubsheet(
 		TileSheetV3::SubSheet &src,
 		TileSheetV4::SubSheet &dst,
 		SubSheetId &idIt) noexcept {
@@ -142,10 +142,10 @@ void TileSheetV3ToTileSheetV4Converter::convertSubsheet(
 	}
 }
 
-ox::Error TileSheetV3ToTileSheetV4Converter::convert(
+ox::Error convertTileSheetV3ToTileSheetV4(
 		keel::Context&,
 		TileSheetV3 &src,
-		TileSheetV4 &dst) const noexcept {
+		TileSheetV4 &dst) noexcept {
 	dst.bpp            = src.bpp;
 	dst.idIt           = src.idIt;
 	dst.defaultPalette = std::move(src.defaultPalette);
@@ -154,7 +154,7 @@ ox::Error TileSheetV3ToTileSheetV4Converter::convert(
 }
 
 
-void TileSheetV4ToTileSheetV5Converter::convertSubsheet(
+static void convertSubsheet(
 		int const bpp,
 		TileSheetV4::SubSheet &src,
 		TileSheetV5::SubSheet &dst) noexcept {
@@ -179,22 +179,22 @@ void TileSheetV4ToTileSheetV5Converter::convertSubsheet(
 	}
 }
 
-ox::Error TileSheetV4ToTileSheetV5Converter::convert(
+ox::Error convertTileSheetV4ToTileSheetV5(
 		keel::Context&,
 		TileSheetV4 &src,
-		TileSheetV5 &dst) const noexcept {
-	dst.bpp            = src.bpp;
-	dst.idIt           = src.idIt;
+		TileSheetV5 &dst) noexcept {
+	dst.bpp  = src.bpp;
+	dst.idIt = src.idIt;
 	OX_RETURN_ERROR(src.defaultPalette.getPath().moveTo(dst.defaultPalette));
 	convertSubsheet(dst.bpp, src.subsheet, dst.subsheet);
 	return {};
 }
 
 
-ox::Error TileSheetToCompactTileSheetConverter::convert(
+ox::Error convertTileSheetToCompactTileSheet(
 		keel::Context&,
 		TileSheet &src,
-		CompactTileSheet &dst) const noexcept {
+		CompactTileSheet &dst) noexcept {
 	dst.bpp            = src.bpp;
 	dst.defaultPalette = ox::FileAddress{src.defaultPalette};
 	dst.pixels         = pixels(src);

src/nostalgia/modules/gfx/src/keel/typeconv.hpp

@@ -8,7 +8,6 @@
 
 #include <keel/typeconv.hpp>
 
-#include <nostalgia/gfx/context.hpp>
 #include <nostalgia/gfx/palette.hpp>
 #include <nostalgia/gfx/tilesheet.hpp>
 
@@ -16,60 +15,26 @@ namespace nostalgia::gfx {
 
 // Type converters
 
-class NostalgiaPaletteToPaletteV1Converter: public keel::Converter<NostalgiaPalette, PaletteV1> {
-	ox::Error convert(keel::Context&, NostalgiaPalette &src, PaletteV1 &dst) const noexcept final;
-};
+ox::Error convertNostalgiaPaletteToPaletteV1(keel::Context&, NostalgiaPalette &src, PaletteV1 &dst) noexcept;
 
-class PaletteV1ToPaletteV2Converter: public keel::Converter<PaletteV1, PaletteV2> {
-	ox::Error convert(keel::Context&, PaletteV1 &src, PaletteV2 &dst) const noexcept final;
-};
+ox::Error convertPaletteV1ToPaletteV2(keel::Context&, PaletteV1 &src, PaletteV2 &dst) noexcept;
 
-class PaletteV2ToPaletteV3Converter: public keel::Converter<PaletteV2, PaletteV3> {
-	ox::Error convert(keel::Context&, PaletteV2 &src, PaletteV3 &dst) const noexcept final;
-};
+ox::Error convertPaletteV2ToPaletteV3(keel::Context&, PaletteV2 &src, PaletteV3 &dst) noexcept;
 
-class PaletteV3ToPaletteV4Converter: public keel::Converter<PaletteV3, PaletteV4> {
-	ox::Error convert(keel::Context&, PaletteV3 &src, PaletteV4 &dst) const noexcept final;
-};
+ox::Error convertPaletteV3ToPaletteV4(keel::Context&, PaletteV3 &src, PaletteV4 &dst) noexcept;
 
-class PaletteV4ToPaletteV5Converter: public keel::Converter<PaletteV4, PaletteV5> {
-	ox::Error convert(keel::Context&, PaletteV4 &src, PaletteV5 &dst) const noexcept final;
-};
+ox::Error convertPaletteV4ToPaletteV5(keel::Context&, PaletteV4 &src, PaletteV5 &dst) noexcept;
 
-class PaletteToCompactPaletteConverter: public keel::Converter<Palette, CompactPalette> {
-	ox::Error convert(keel::Context&, Palette &src, CompactPalette &dst) const noexcept final;
-};
+ox::Error convertPaletteToCompactPalette(keel::Context&, Palette &src, CompactPalette &dst) noexcept;
 
-class TileSheetV1ToTileSheetV2Converter: public keel::Converter<TileSheetV1, TileSheetV2> {
-	ox::Error convert(keel::Context&, TileSheetV1 &src, TileSheetV2 &dst) const noexcept final;
-};
+ox::Error convertTileSheetV1ToTileSheetV2(keel::Context&, TileSheetV1 &src, TileSheetV2 &dst) noexcept;
 
-class TileSheetV2ToTileSheetV3Converter: public keel::Converter<TileSheetV2, TileSheetV3> {
-	static void convertSubsheet(
-			TileSheetV2::SubSheet &src,
-			TileSheetV3::SubSheet &dst,
-			SubSheetId &idIt) noexcept;
-	ox::Error convert(keel::Context&, TileSheetV2 &src, TileSheetV3 &dst) const noexcept final;
-};
+ox::Error convertTileSheetV2ToTileSheetV3(keel::Context&, TileSheetV2 &src, TileSheetV3 &dst) noexcept;
 
-class TileSheetV3ToTileSheetV4Converter: public keel::Converter<TileSheetV3, TileSheetV4> {
-	static void convertSubsheet(
-			TileSheetV3::SubSheet &src,
-			TileSheetV4::SubSheet &dst,
-			SubSheetId &idIt) noexcept;
-	ox::Error convert(keel::Context&, TileSheetV3 &src, TileSheetV4 &dst) const noexcept final;
-};
+ox::Error convertTileSheetV3ToTileSheetV4(keel::Context&, TileSheetV3 &src, TileSheetV4 &dst) noexcept;
 
-class TileSheetV4ToTileSheetV5Converter final: public keel::Converter<TileSheetV4, TileSheetV5> {
-	static void convertSubsheet(
-			int bpp,
-			TileSheetV4::SubSheet &src,
-			TileSheetV5::SubSheet &dst) noexcept;
-	ox::Error convert(keel::Context&, TileSheetV4 &src, TileSheetV5 &dst) const noexcept override;
-};
+ox::Error convertTileSheetV4ToTileSheetV5(keel::Context&, TileSheetV4 &src, TileSheetV5 &dst) noexcept;
 
-class TileSheetToCompactTileSheetConverter: public keel::Converter<TileSheet, CompactTileSheet> {
-	ox::Error convert(keel::Context&, TileSheet &src, CompactTileSheet &dst) const noexcept final;
-};
+ox::Error convertTileSheetToCompactTileSheet(keel::Context&, TileSheet &src, CompactTileSheet &dst) noexcept;
 
 }

src/nostalgia/modules/gfx/src/opengl/CMakeLists.txt

@@ -1,9 +0,0 @@
-target_sources(
-	NostalgiaGfx PRIVATE
-		context.cpp
-		gfx.cpp
-)
-target_link_libraries(
-	NostalgiaGfx PUBLIC
-		GlUtils
-)

src/nostalgia/modules/gfx/src/opengl/context.cpp

@@ -1,40 +0,0 @@
-/*
- * Copyright 2016 - 2025 Gary Talent (gary@drinkingtea.net). All rights reserved.
- */
-
-#include "context.hpp"
-#include "gfx.hpp"
-
-namespace nostalgia::gfx {
-
-void safeDelete(Context *ctx) noexcept {
-	delete ctx;
-}
-
-Context::Context(turbine::Context &tctx, InitParams const&params) noexcept:
-	turbineCtx(tctx),
-	spriteBlocks(params.glSpriteCount, params.glBlocksPerSprite),
-	drawer(*this),
-	spriteCount(params.glSpriteCount),
-	blocksPerSprite(params.glBlocksPerSprite) {
-}
-
-Context::~Context() noexcept {
-	shutdownGfx(*this);
-}
-
-ox::Result<ox::UPtr<Context>> init(turbine::Context &tctx, InitParams const&params) noexcept {
-	auto ctx = ox::make_unique<Context>(tctx, params);
-	OX_RETURN_ERROR(initGfx(*ctx, params));
-	return ox::UPtr<Context>(ctx.release());
-}
-
-keel::Context &keelCtx(Context &ctx) noexcept {
-	return turbine::keelCtx(ctx.turbineCtx);
-}
-
-turbine::Context &turbineCtx(Context &ctx) noexcept {
-	return ctx.turbineCtx;
-}
-
-}

src/nostalgia/modules/gfx/src/opengl/context.hpp

@@ -1,40 +0,0 @@
-/*
- * Copyright 2016 - 2025 Gary Talent (gary@drinkingtea.net). All rights reserved.
- */
-
-#pragma once
-
-#include <ox/std/types.hpp>
-
-#include <glutils/glutils.hpp>
-
-#include <nostalgia/gfx/gfx.hpp>
-#include <nostalgia/gfx/context.hpp>
-
-#include "gfx.hpp"
-
-namespace nostalgia::gfx {
-
-class Context {
-
-	public:
-		turbine::Context &turbineCtx;
-		glutils::GLProgram bgShader;
-		glutils::GLProgram spriteShader;
-		ox::Array<renderer::CBB, 4> cbbs;
-		renderer::SpriteBlockset spriteBlocks;
-		ox::Array<Sprite, 128> spriteStates;
-		ox::Array<GLfloat, 1024> bgPalette;
-		ox::Array<renderer::Background, 4> backgrounds;
-		renderer::Drawer drawer;
-		uint_t spriteCount = 0;
-		uint_t blocksPerSprite = 0;
-		explicit Context(turbine::Context &tctx, InitParams const&params) noexcept;
-		Context(Context const&) = delete;
-		Context(Context&&) = delete;
-		Context &operator=(Context const&) = delete;
-		Context &operator=(Context&&) = delete;
-		~Context() noexcept;
-};
-
-}