[nostalgia/studio] Update version to d2025.02.0

.gitattributes

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

.gitignore

@@ -6,14 +6,12 @@
 .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,16 +15,7 @@ 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_CAP}
+	${BC_CMD_ENVRUN} ${BC_PY3} ./util/scripts/pkg-gba.py sample_project ${BC_VAR_PROJECT_NAME}
-
-.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:
@@ -37,10 +28,10 @@ run-studio: build
 	${PROJECT_STUDIO}
 .PHONY: gba-run
 gba-run: pkg-gba
-	${MGBA} ${BC_VAR_PROJECT_NAME_CAP}.gba
+	${MGBA} ${BC_VAR_PROJECT_NAME}.gba
 .PHONY: debug
 debug: build
-	${BC_CMD_HOST_DEBUGGER} ${PROJECT_PLAYER} sample_project
+	${BC_CMD_HOST_DEBUGGER} ./build/${BC_VAR_CURRENT_BUILD}/bin/${BC_VAR_PROJECT_NAME} sample_project
 .PHONY: debug-studio
 debug-studio: build
 	${BC_CMD_HOST_DEBUGGER} ${PROJECT_STUDIO}
@@ -52,25 +43,3 @@ 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,7 +11,6 @@
 # "Python Busy Box" - adds cross-platform equivalents to Unix commands that
 #                     don't translate well to that other operating system
 
-import multiprocessing
 import os
 import platform
 import shutil
@@ -58,11 +57,7 @@ def cmake_build(base_path: str, target: Optional[str]) -> int:
         path = os.path.join(base_path, d)
         if not os.path.isdir(path):
             continue
-        args = ['cmake', '--build', path, f'-j{multiprocessing.cpu_count()}']
+        args = ['cmake', '--build', path]
-        if path.endswith('release'):
-            args.append('--config=release')
-        elif path.endswith('debug'):
-            args.append('--config=debug')
         if target is not None:
             args.extend(['--target', target])
         err = subprocess.run(args).returncode

deps/glutils/include/glutils/glutils.hpp

@@ -89,7 +89,7 @@ struct GLObject: public Base {
 		return id;
 	}
 
-	constexpr operator GLuint const&() const noexcept {
+	constexpr operator const GLuint&() const noexcept {
 		return id;
 	}
 
@@ -135,7 +135,7 @@ struct FrameBuffer {
 		return fbo.id;
 	}
 
-	constexpr operator GLuint const&() const noexcept {
+	constexpr operator const GLuint&() const noexcept {
 		return fbo.id;
 	}
 
@@ -158,14 +158,14 @@ struct FrameBuffer {
 
 class FrameBufferBind {
 	private:
-		static FrameBuffer const *s_activeFb;
+		static const FrameBuffer *s_activeFb;
-		FrameBuffer const *m_restoreFb = nullptr;
+		const FrameBuffer *m_restoreFb = nullptr;
 	public:
-		explicit FrameBufferBind(FrameBuffer const &fb) noexcept;
+		explicit FrameBufferBind(const FrameBuffer &fb) noexcept;
 		~FrameBufferBind() noexcept;
 };
 
-void bind(FrameBuffer const &fb) noexcept;
+void bind(const FrameBuffer &fb) noexcept;
 
 struct ShaderVarSet {
 	GLsizei len{};
@@ -201,9 +201,9 @@ void setupShaderParams(
 
 void setupShaderParams(GLProgram const&shader, ox::Vector<ShaderVarSet> const&vars) noexcept;
 
-GLVertexArray generateVertexArrayObject() noexcept;
+glutils::GLVertexArray generateVertexArrayObject() noexcept;
 
-GLBuffer generateBuffer() noexcept;
+glutils::GLBuffer generateBuffer() noexcept;
 
 [[nodiscard]]
 FrameBuffer generateFrameBuffer(int width, int height) noexcept;
@@ -218,10 +218,10 @@ void resizeInitFrameBuffer(FrameBuffer &fb, int width, int height) noexcept;
 void resizeInitFrameBuffer(FrameBuffer &fb, ox::Size const&sz) noexcept;
 
 struct BufferSet {
-	GLVertexArray vao;
+	glutils::GLVertexArray vao;
-	GLBuffer vbo;
+	glutils::GLBuffer vbo;
-	GLBuffer ebo;
+	glutils::GLBuffer ebo;
-	GLTexture tex;
+	glutils::GLTexture tex;
 	ox::Vector<float> vertices;
 	ox::Vector<GLuint> elements;
 };

deps/glutils/src/glutils.cpp

@@ -46,9 +46,9 @@ template struct GLObject<deleteVertexArray>;
 template struct GLObject<deleteProgram>;
 template struct GLObject<deleteShader>;
 
-FrameBuffer const *FrameBufferBind::s_activeFb = nullptr;
+const FrameBuffer *FrameBufferBind::s_activeFb = nullptr;
 
-FrameBufferBind::FrameBufferBind(FrameBuffer const &fb) noexcept: m_restoreFb(s_activeFb) {
+FrameBufferBind::FrameBufferBind(const FrameBuffer &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(FrameBuffer const &fb) noexcept {
+void bind(const FrameBuffer &fb) noexcept {
 	glBindFramebuffer(GL_FRAMEBUFFER, fb);
 	glViewport(0, 0, fb.width, fb.height);
 }
 
 
 static ox::Result<GLShader> buildShader(
-		GLuint const shaderType,
+		GLuint shaderType,
-		GLchar const *src,
+		const GLchar *src,
 		ox::StringViewCR shaderName) noexcept {
 	GLShader shader(glCreateShader(shaderType));
 	glShaderSource(shader, 1, &src, nullptr);
@@ -162,30 +162,16 @@ FrameBuffer generateFrameBuffer(int width, int height) noexcept {
 	// color texture
 	glGenTextures(1, &fb.color.id);
 	glBindTexture(GL_TEXTURE_2D, fb.color);
-	glTexImage2D(
+	glTexImage2D(GL_TEXTURE_2D, 0, GL_RGB, width, height, 0, GL_RGB, GL_UNSIGNED_BYTE, nullptr);
-		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(
+	glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, fb.color, 0);
-		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(
+	glFramebufferRenderbuffer(GL_FRAMEBUFFER, GL_DEPTH_STENCIL_ATTACHMENT, GL_RENDERBUFFER, fb.depth);
-		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
@@ -203,16 +189,7 @@ void resizeFrameBuffer(FrameBuffer &fb, int width, int height) noexcept {
 	glBindFramebuffer(GL_FRAMEBUFFER, fb);
 	// color texture
 	glBindTexture(GL_TEXTURE_2D, fb.color);
-	glTexImage2D(
+	glTexImage2D(GL_TEXTURE_2D, 0, GL_RGB, width, height, 0, GL_RGB, GL_UNSIGNED_BYTE, nullptr);
-		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
@@ -224,7 +201,7 @@ void resizeFrameBuffer(FrameBuffer &fb, int width, int height) noexcept {
 	glBindRenderbuffer(GL_RENDERBUFFER, 0);
 }
 
-void resizeInitFrameBuffer(FrameBuffer &fb, int const width, int const height) noexcept {
+void resizeInitFrameBuffer(FrameBuffer &fb, int width, int height) noexcept {
 	if (!fb) {
 		fb = generateFrameBuffer(width, height);
 		return;
@@ -237,13 +214,13 @@ void resizeInitFrameBuffer(FrameBuffer &fb, ox::Size const &sz) noexcept {
 }
 
 void sendVbo(BufferSet const&bs) noexcept {
-	auto const bufferSize = static_cast<GLsizeiptr>(sizeof(decltype(bs.vertices)::value_type) * bs.vertices.size());
+	const auto 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 {
-	auto const bufferSize = static_cast<GLsizeiptr>(sizeof(decltype(bs.elements)::value_type) * bs.elements.size());
+	const auto 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

@@ -29,7 +29,7 @@ ClArgs::ClArgs(ox::SpanView<const char*> args) noexcept {
 						m_bools[arg] = false;
 					}
 					m_strings[arg] = val;
-					if (auto r = ox::strToInt(val); r.error == 0) {
+					if (auto r = ox::atoi(val.c_str()); r.error == 0) {
 						m_ints[arg] = r.value;
 					}
 					++i;

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::strToInt(versionStr).copyTo(hdr.typeVersion);
+	std::ignore = ox::atoi(versionStr).copyTo(hdr.typeVersion);
 	hdr.data = buffRaw;
 	hdr.dataSize = buffLen;
 	return hdr;

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

@@ -39,7 +39,7 @@ struct TypeInfoCatcher {
 	}
 
 	constexpr Error field(...) noexcept {
-		return {};
+		return ox::Error(0);
 	}
 
 	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 {};
+		return ox::Error(0);
 	} 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 {};
+	return ox::Error(0);
 }
 
 }

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 {};
+	return ox::Error(0);
 }
 
 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 {};
+	return ox::Error(0);
 }
 
 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 {};
+						return ox::Error(0);
 					}
 				} 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 {};
+	return ox::Error(0);
 }
 
 template<typename size_t>
 Error FileStoreTemplate<size_t>::resize(std::size_t size, void *newBuff) {
 	if (m_buffer->size() > size) {
-		return ox::Error{1, "new buffer is too small for existing data"};
+		return ox::Error(1);
 	}
 	m_buffSize = static_cast<size_t>(size);
 	if (newBuff) {
-		m_buffer = static_cast<Buffer*>(newBuff);
+		m_buffer = reinterpret_cast<Buffer*>(newBuff);
 		OX_RETURN_ERROR(m_buffer->setSize(static_cast<size_t>(size)));
 	}
-	return {};
+	return ox::Error(0);
 }
 
 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 {};
+	return ox::Error(0);
 }
 
 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 {};
+			return ox::Error(0);
 		}
 		if (!item.valid()) {
 			return ox::Error(1);
@@ -524,7 +524,7 @@ Error FileStoreTemplate<size_t>::compact() {
 				parent->right = item;
 			}
 		}
-		return {};
+		return ox::Error(0);
 	});
 }
 
@@ -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 {};
+		return ox::Error(0);
 	} 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 {};
+			return ox::Error(0);
 		} 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 {};
+			return ox::Error(0);
 		} else {
 			return placeItem(left, item, depth + 1);
 		}
@@ -624,7 +624,7 @@ Error FileStoreTemplate<size_t>::unplaceItem(ItemPtr item) {
 		} else {
 			fsData->rootNode = 0;
 		}
-		return {};
+		return ox::Error(0);
 	} 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 {};
+	return ox::Error(0);
 }
 
 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 {};
+		return ox::Error(0);
 	}
 	return ox::Error(1);
 }

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_ALLOW_UNSAFE_BUFFERS_END
+OX_CLANG_NOWARN_END
 	m_type = FileAddressType::Path;
 }
 
@@ -48,11 +48,9 @@ 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,6 +24,9 @@ enum class FileAddressType: int8_t {
 	Inode,
 };
 
+template<typename T>
+constexpr Error model(T *h, CommonPtrWith<class FileAddress> auto *fa) noexcept;
+
 class FileAddress {
 
 	template<typename T>

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

@@ -20,7 +20,7 @@
 namespace ox {
 
 namespace detail {
-inline void fsBuffFree(char *buff) noexcept {
+static inline void fsBuffFree(char *buff) noexcept {
 	safeDelete(buff);
 }
 }
@@ -49,11 +49,11 @@ class FileSystem {
 
 		Result<Buffer> read(StringViewCR path) noexcept;
 
-		Error read(StringViewCR path, void *buffer, std::size_t buffSize) noexcept {
+		inline Error read(StringViewCR path, void *buffer, std::size_t buffSize) noexcept {
 			return readFilePath(path, buffer, buffSize);
 		}
 
-		Error read(uint64_t inode, void *buffer, std::size_t buffSize) noexcept {
+		inline Error read(uint64_t inode, void *buffer, std::size_t buffSize) noexcept {
 			return readFileInode(inode, buffer, buffSize);
 		}
 
@@ -69,7 +69,8 @@ class FileSystem {
 		 * @param path
 		 * @param readStart
 		 * @param readSize
-		 * @param buff
+		 * @param buffer
+		 * @param size
 		 * @return error or number of bytes read
 		 */
 		Result<size_t> read(
@@ -101,36 +102,36 @@ class FileSystem {
 
 		Error write(const FileAddress &addr, const void *buffer, uint64_t size, FileType fileType = FileType::NormalFile) noexcept;
 
-		Error write(StringViewCR path, const void *buffer, uint64_t size, FileType fileType) noexcept {
+		inline Error write(StringViewCR path, const void *buffer, uint64_t size, FileType fileType) noexcept {
 			return writeFilePath(path, buffer, size, fileType);
 		}
 
-		Error write(uint64_t inode, const void *buffer, uint64_t size, FileType fileType) noexcept {
+		inline Error write(uint64_t inode, const void *buffer, uint64_t size, FileType fileType) noexcept {
 			return writeFileInode(inode, buffer, size, fileType);
 		}
 
-		Result<FileStat> stat(uint64_t inode) const noexcept {
+		inline Result<FileStat> stat(uint64_t inode) const noexcept {
 			return statInode(inode);
 		}
 
-		Result<FileStat> stat(StringViewCR path) const noexcept {
+		inline Result<FileStat> stat(StringViewCR path) const noexcept {
 			return statPath(path);
 		}
 
 		Result<FileStat> stat(const FileAddress &addr) const noexcept;
 
 		[[nodiscard]]
-		bool exists(uint64_t inode) const noexcept {
+		inline bool exists(uint64_t inode) const noexcept {
 			return statInode(inode).ok();
 		}
 
 		[[nodiscard]]
-		bool exists(ox::StringView path) const noexcept {
+		inline bool exists(ox::StringView path) const noexcept {
 			return statPath(path).ok();
 		}
 
 		[[nodiscard]]
-		bool exists(FileAddress const&addr) const noexcept {
+		inline bool exists(FileAddress const&addr) const noexcept {
 			return stat(addr).ok();
 		}
 
@@ -177,11 +178,11 @@ class MemFS: public FileSystem {
 	public:
 		Result<const char*> directAccess(const FileAddress &addr) const noexcept;
 
-		Result<const char*> directAccess(StringViewCR path) const noexcept {
+		inline Result<const char*> directAccess(StringViewCR path) const noexcept {
 			return directAccessPath(path);
 		}
 
-		Result<const char*> directAccess(uint64_t inode) const noexcept {
+		inline Result<const char*> directAccess(uint64_t inode) const noexcept {
 			return directAccessInode(inode);
 		}
 
@@ -329,7 +330,7 @@ Error FileSystemTemplate<FileStore, Directory>::format(void *buff, uint64_t buff
 		return ox::Error(1);
 	}
 
-	return {};
+	return ox::Error(0);
 }
 
 template<typename FileStore, typename Directory>
@@ -346,7 +347,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 {};
+	return ox::Error(0);
 }
 
 template<typename FileStore, typename Directory>
@@ -407,7 +408,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 {};
+	return ox::Error(0);
 }
 
 template<typename FileStore, typename Directory>
@@ -424,7 +425,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{};
+		return ox::Error(0);
 	}));
 	return out;
 }
@@ -468,7 +469,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::intToStr(inode));
+	oxTrace("ox.fs.FileSystemTemplate.writeFileInode", ox::itoa(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 {};
+	return ox::Error(0);
 }
 
 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 {};
+	return ox::Error(0);
 }
 
 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 {};
+	return ox::Error(0);
 }
 
 Error PassThroughFS::writeFileInode(uint64_t, const void*, uint64_t, FileType) noexcept {

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 {};
+	return ox::Error(0);
 }
 
 }

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 {};
+		return ox::Error(0);
 	} else {
 		return ox::Error(1);
 	}
@@ -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 = {};
+		retval = ox::Error(0);
 		if (m_path[m_iterator] == '/') {
 			m_iterator++;
 		}
@@ -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 = {};
+		retval = ox::Error(0);
 		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 {};
+	return ox::Error(0);
 }
 
 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 {};
+		return ox::Error(0);
 	}
 }
 
@@ -422,7 +422,7 @@ Error NodeBuffer<size_t, Item>::compact(F cb) noexcept {
 		src = ptr(dest->next);
 		dest = uninitializedPtr(dest.offset() + dest->fullSize());
 	}
-	return {};
+	return ox::Error(0);
 }
 
 template<typename size_t, typename Item>

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

@@ -119,9 +119,7 @@ const std::map<ox::StringView, std::function<ox::Error(ox::StringView)>> tests =
 				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));
-				OX_ALLOW_UNSAFE_BUFFERS_BEGIN
 				oxAssert(it.dirPath(buff, path.len()) == 0 && ox::strcmp(buff, "/usr/share/") == 0, "PathIterator shows incorrect dir path");
-				OX_ALLOW_UNSAFE_BUFFERS_END
 				return ox::Error(0);
 			}
 		},
@@ -129,9 +127,7 @@ 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);
@@ -167,11 +163,9 @@ 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 {};
+	return ox::Error(0);
 }
 
 static ox::Error runRead(ox::FileSystem *fs, ox::Span<const char*> args) noexcept {
@@ -57,10 +57,8 @@ 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);
-	OX_ALLOW_UNSAFE_BUFFERS_END
+	return ox::Error(0);
-	return {};
 }
 
 static ox::Error run(int argc, const char **argv) noexcept {

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

@@ -91,7 +91,6 @@ ox::Error LoggerConn::sendInit(const InitTraceMsg &msg) noexcept {
 }
 
 void LoggerConn::msgSend() noexcept {
-	try {
 	while (true) {
 		std::unique_lock lk(m_waitMut);
 		m_waitCond.wait(lk);
@@ -110,10 +109,6 @@ void LoggerConn::msgSend() noexcept {
 			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,9 +71,7 @@ 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
@@ -96,9 +94,7 @@ 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;
 			}
@@ -108,9 +104,7 @@ 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;
 	}
@@ -166,9 +160,7 @@ constexpr Result<I> decodeInteger(Reader_c auto&rdr, std::size_t *bytesRead) noe
 			 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;
@@ -183,9 +175,7 @@ constexpr Result<I> decodeInteger(Reader_c auto&rdr, std::size_t *bytesRead) noe
 				 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;
 		 }
 	}

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

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 {};
+			return ox::Error(0);
 		}
 
 };
@@ -184,7 +184,7 @@ 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 {};
+	return ox::Error(0);
 }
 
 template<Writer_c Writer>
@@ -201,7 +201,7 @@ constexpr Error MetalClawWriter<Writer>::field(const char*, const BasicString<Sm
 	}
 	OX_RETURN_ERROR(m_fieldPresence.set(static_cast<std::size_t>(m_field), fieldSet));
 	++m_field;
-	return {};
+	return ox::Error(0);
 }
 
 template<Writer_c Writer>
@@ -214,12 +214,7 @@ 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));
@@ -229,7 +224,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 {};
+	return ox::Error(0);
 }
 
 template<Writer_c Writer>
@@ -255,7 +250,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 {};
+	return ox::Error(0);
 }
 
 template<Writer_c Writer>
@@ -319,7 +314,7 @@ OX_ALLOW_UNSAFE_BUFFERS_END
 	}
 	OX_RETURN_ERROR(m_fieldPresence.set(static_cast<std::size_t>(m_field), fieldSet));
 	++m_field;
-	return {};
+	return ox::Error(0);
 }
 
 template<Writer_c Writer>
@@ -356,7 +351,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 {};
+	return ox::Error(0);
 }
 
 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 {}; }
+#define OX_MODEL_END() return ox::Error(0); }
 #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

@@ -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 {};
+	return ox::Error(0);
 }
 #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 {};
+		return ox::Error(0);
 	}
 	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 {};
+		return ox::Error(0);
 	}
 	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 {};
+		return ox::Error(0);
 	}
 	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 {};
+			return ox::Error(0);
 		}
 
 		template<typename U>
 		constexpr ox::Error field(StringViewCR, U, std::size_t) noexcept {
 			++fields;
-			return {};
+			return ox::Error(0);
 		}
 
 		template<typename U, typename Handler>
 		constexpr Error field(StringViewCR, Handler) {
 			++fields;
-			return {};
+			return ox::Error(0);
 		}
 
 		template<typename ...Args>
 		constexpr Error fieldCString(Args&&...) noexcept {
 			++fields;
-			return {};
+			return ox::Error(0);
 		}
 
 		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 {};
+			return ox::Error(0);
 		}
 
 		template<typename T>
 		constexpr Error field(const char*, T *v, int) noexcept {
 			vars[m_i++] = static_cast<void*>(v);
-			return {};
+			return ox::Error(0);
 		}
 
 		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 {};
+			return ox::Error(0);
 		}
 
 		template<typename T>
@@ -107,7 +107,7 @@ class Copier {
 				auto &dst = *cbit_cast<FT*>(m_dst->vars[m_i]);
 				dst = src;
 				++m_i;
-				return {};
+				return ox::Error(0);
 			}
 		}
 
@@ -119,7 +119,7 @@ class Copier {
 				dst = src;
 			}
 			++m_i;
-			return {};
+			return ox::Error(0);
 		}
 
 		template<typename U, bool force = false>
@@ -128,7 +128,7 @@ class Copier {
 			auto &src = *u.get();
 			dst = src;
 			++m_i;
-			return {};
+			return ox::Error(0);
 		}
 
 		template<typename T = void>
@@ -168,7 +168,7 @@ class Mover {
 				dst = std::move(src);
 				src = FT{};
 				++m_i;
-				return {};
+				return ox::Error(0);
 			}
 		}
 
@@ -181,7 +181,7 @@ class Mover {
 				src = FT{};
 			}
 			++m_i;
-			return {};
+			return ox::Error(0);
 		}
 
 		template<typename U, bool force = false>
@@ -190,7 +190,7 @@ class Mover {
 			auto &src = *u.get();
 			dst = std::move(src);
 			++m_i;
-			return {};
+			return ox::Error(0);
 		}
 
 		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 {};
+				return ox::Error(0);
 			} else {
 				this->value = false;
 				return ox::Error(1);
@@ -246,7 +246,7 @@ class Equals {
 				}
 			}
 			++m_i;
-			return {};
+			return ox::Error(0);
 		}
 
 		template<typename U, bool force = false>
@@ -255,7 +255,7 @@ class Equals {
 			const auto &src = *u.get();
 			++m_i;
 			if (dst == src) {
-				return {};
+				return ox::Error(0);
 			} 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{});
+}() == ox::Error(0));
 
 }

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 {};
+	return ox::Error(0);
 }
 
 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 {};
+	return ox::Error(0);
 }
 
 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:
-			m_data = other.m_data;
+			ox::memcpy(&m_data, &other.m_data, sizeof(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:
-			m_data = other.m_data;
+			ox::memcpy(&m_data, &other.m_data, sizeof(m_data));
-			other.m_data.ui64 = 0;
+			ox::memset(&other.m_data, 0, sizeof(m_data));
 			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 {};
+	return ox::Error(0);
 }
 
 template<typename T>
@@ -1184,7 +1184,7 @@ constexpr Error ModelValue::set(const T &v) noexcept {
 		safeDelete(&value);
 	}
 	value = v;
-	return {};
+	return ox::Error(0);
 }
 
 template<typename T>
@@ -1199,7 +1199,7 @@ constexpr Error ModelValue::set(T &&v) noexcept {
 		safeDelete(&value);
 	}
 	value = std::move(v);
-	return {};
+	return ox::Error(0);
 }
 
 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:
-			m_data = other.m_data;
+			ox::memcpy(&m_data, &other.m_data, sizeof(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:
-			m_data = other.m_data;
+			ox::memcpy(&m_data, &other.m_data, sizeof(m_data));
-			other.m_data = {};
+			ox::memset(&other.m_data, 0, sizeof(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 {};
+		return ox::Error(0);
 	}
 
 	template<typename T>
 	constexpr Error field(const char*, T) noexcept {
-		return {};
+		return ox::Error(0);
 	}
 
 	template<typename ...Args>
 	constexpr Error fieldCString(Args&&...) noexcept {
-		return {};
+		return ox::Error(0);
 	}
 
 	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 {};
+		return ox::Error(0);
 	}
 
 	template<typename T>
 	constexpr Error field(const char*, T) noexcept {
-		return {};
+		return ox::Error(0);
 	}
 
 	template<typename T>
 	constexpr Error fieldCString(const char*, T) noexcept {
-		return {};
+		return ox::Error(0);
 	}
 
 	static constexpr auto opType() noexcept {

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

@@ -127,7 +127,7 @@ static constexpr Error parseField(const DescriptorField &field, Reader *rdr, Dat
 		}
 	}
 	walker->popNamePath();
-	return {};
+	return ox::Error(0);
 }
 
 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 {};
+	return ox::Error(0);
 }
 
 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_s(json, buffSize);
+	auto jsonLen = ox::strnlen(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 {
-	ox::Error err{};
+	auto err = ox::Error(0);
 	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 {
-	ox::Error err{};
+	auto err = ox::Error(0);
 	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 {
-	ox::Error err{};
+	auto err = ox::Error(0);
 	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 {
-	ox::Error err{};
+	auto err = ox::Error(0);
 	const char *begin = nullptr, *end = nullptr;
 	const auto &jv = value(key);
 	if (targetValid()) {

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

@@ -8,11 +8,7 @@
 
 #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>
@@ -137,7 +133,7 @@ class OrganicClawReader {
 
 template<typename T>
 Error OrganicClawReader::field(const char *key, T *val) noexcept {
-	ox::Error err{};
+	auto err = ox::Error(0);
 	try {
 		if constexpr (is_integer_v<T>) {
 			if (targetValid()) {
@@ -190,7 +186,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 {
-	ox::Error err{};
+	auto err = ox::Error(0);
 	if (targetValid()) {
 		const auto &jv = value(key);
 		if (jv.empty() || jv.isObject()) {
@@ -207,7 +203,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 {
-	ox::Error err{};
+	auto err = ox::Error(0);
 	if (targetValid()) {
 		const auto &jv = value(key);
 		if (jv.empty()) {
@@ -224,7 +220,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 {
-	ox::Error err{};
+	auto err = ox::Error(0);
 	if (targetValid()) {
 		const auto &jv = value(key);
 		if (jv.empty()) {
@@ -257,7 +253,7 @@ OX_ALLOW_UNSAFE_BUFFERS_BEGIN
 		OX_RETURN_ERROR(handler.field("", &val[i]));
 OX_ALLOW_UNSAFE_BUFFERS_END
 	}
-	return {};
+	return ox::Error(0);
 }
 
 template<typename T>
@@ -274,7 +270,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 {};
+	return ox::Error(0);
 }
 
 Error readOC(BufferView buff, auto &val) noexcept {

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 {};
+	return ox::Error(0);
 }
 
 Error OrganicClawWriter::fieldCString(const char *key, const char *const*val) noexcept {

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

@@ -8,11 +8,7 @@
 
 #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>
@@ -46,7 +42,7 @@ class OrganicClawWriter {
 				value(key) = *val;
 			}
 			++m_fieldIt;
-			return {};
+			return ox::Error(0);
 		}
 
 		Error field(const char *key, const int16_t *val) noexcept {
@@ -54,7 +50,7 @@ class OrganicClawWriter {
 				value(key) = *val;
 			}
 			++m_fieldIt;
-			return {};
+			return ox::Error(0);
 		}
 
 		Error field(const char *key, const int32_t *val) noexcept {
@@ -62,7 +58,7 @@ class OrganicClawWriter {
 				value(key) = *val;
 			}
 			++m_fieldIt;
-			return {};
+			return ox::Error(0);
 		}
 
 		Error field(const char *key, const int64_t *val) noexcept {
@@ -70,7 +66,7 @@ class OrganicClawWriter {
 				value(key) = *val;
 			}
 			++m_fieldIt;
-			return {};
+			return ox::Error(0);
 		}
 
 
@@ -79,7 +75,7 @@ class OrganicClawWriter {
 				value(key) = *val;
 			}
 			++m_fieldIt;
-			return {};
+			return ox::Error(0);
 		}
 
 		Error field(const char *key, const uint16_t *val) noexcept {
@@ -87,7 +83,7 @@ class OrganicClawWriter {
 				value(key) = *val;
 			}
 			++m_fieldIt;
-			return {};
+			return ox::Error(0);
 		}
 
 		Error field(const char *key, const uint32_t *val) noexcept {
@@ -95,7 +91,7 @@ class OrganicClawWriter {
 				value(key) = *val;
 			}
 			++m_fieldIt;
-			return {};
+			return ox::Error(0);
 		}
 
 		Error field(const char *key, const uint64_t *val) noexcept {
@@ -103,7 +99,7 @@ class OrganicClawWriter {
 				value(key) = *val;
 			}
 			++m_fieldIt;
-			return {};
+			return ox::Error(0);
 		}
 
 		Error field(char const*key, bool const*val) noexcept {
@@ -151,7 +147,7 @@ class OrganicClawWriter {
 				value(key) = val->c_str();
 			}
 			++m_fieldIt;
-			return {};
+			return ox::Error(0);
 		}
 
 		Error fieldCString(const char*, const char *const*val, int len) noexcept;
@@ -211,7 +207,7 @@ OX_ALLOW_UNSAFE_BUFFERS_END
 		value(key) = w.m_json;
 	}
 	++m_fieldIt;
-	return {};
+	return ox::Error(0);
 }
 
 template<typename T>
@@ -237,7 +233,7 @@ Error OrganicClawWriter::field(const char *key, const T *val) noexcept {
 		}
 	}
 	++m_fieldIt;
-	return {};
+	return ox::Error(0);
 }
 
 template<typename U, bool force>
@@ -251,7 +247,7 @@ Error OrganicClawWriter::field(const char *key, UnionView<U, force> val) noexcep
 		}
 	}
 	++m_fieldIt;
-	return {};
+	return ox::Error(0);
 }
 
 Result<ox::Buffer> writeOC(const auto &val) noexcept {
@@ -262,9 +258,7 @@ 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;
 }
 
@@ -276,9 +270,7 @@ 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/cstrops.hpp

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

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

@@ -245,7 +245,7 @@ struct MaybeView<ox::IString<sz>> {
 
 template<Integer_c Integer>
 [[nodiscard]]
-constexpr auto intToStr(Integer v) noexcept {
+constexpr auto itoa(Integer v) noexcept {
 	constexpr auto Cap = [] {
 		auto out = 0;
 		switch (sizeof(Integer)) {

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

@@ -8,10 +8,6 @@
 
 #pragma once
 
-#if __has_include(<array>)
-#include <array>
-#endif
-
 #include "array.hpp"
 #include "bit.hpp"
 #include "def.hpp"
@@ -39,20 +35,6 @@ 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()),
@@ -146,7 +128,12 @@ class Span {
 			return iterator<const T&, const T*, true>(m_items, MaxValue<size_type>, m_size);
 		}
 
-		constexpr T &operator[](std::size_t i) const noexcept {
+		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 {
 			boundsCheck(__FILE__, __LINE__, i, size(), "Span access overflow");
 			return m_items[i];
 		}

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> intToStr(Integer v) noexcept;
+constexpr ox::IString<21> itoa(Integer v) noexcept;
 
 template<std::size_t SmallStringSize_v>
 class BasicString {
@@ -182,7 +182,7 @@ class BasicString {
 			// 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 {};
+			return ox::Error(0);
 		}
 
 		constexpr Error append(ox::StringView sv) noexcept {
@@ -213,22 +213,22 @@ class BasicString {
 
 		[[nodiscard]]
 		constexpr const char *c_str() const noexcept {
-			return m_buff.data();
+			return static_cast<const char*>(m_buff.data());
 		}
 
 		[[nodiscard]]
-		constexpr explicit operator const char*() const {
+		inline explicit operator const char*() const {
 			return c_str();
 		}
 
 #if __has_include(<string>)
 		[[nodiscard]]
-		std::string toStdString() const {
+		inline std::string toStdString() const {
 			return c_str();
 		}
 
 		[[nodiscard]]
-		explicit operator std::string() const {
+		inline explicit operator std::string() const {
 			return c_str();
 		}
 #endif
@@ -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::intToStr(i));
+	set(ox::itoa(i));
 	return *this;
 }
 
 template<std::size_t SmallStringSize_v>
 constexpr BasicString<SmallStringSize_v> &BasicString<SmallStringSize_v>::operator=(uint64_t i) noexcept {
-	set(ox::intToStr(i));
+	set(ox::itoa(i));
 	return *this;
 }
 
@@ -371,7 +371,7 @@ 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::intToStr(i);
+	auto const str = ox::itoa(i);
 	return this->operator+=(str.c_str());
 }
 
@@ -414,7 +414,7 @@ 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::intToStr(i);
+	auto const str = ox::itoa(i);
 	return *this + str;
 }
 

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

@@ -16,28 +16,33 @@ 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:
-		consteval StringLiteral() noexcept = default;
+		constexpr StringLiteral() noexcept = default;
 
 		constexpr StringLiteral(StringLiteral const&sv) noexcept = default;
 
-		consteval explicit StringLiteral(std::nullptr_t) noexcept {}
+		constexpr explicit StringLiteral(std::nullptr_t) noexcept {}
 
-		consteval explicit StringLiteral(char const *str, std::size_t const len) noexcept: BaseStringView{str, len} {}
+		constexpr explicit StringLiteral(const char *str, std::size_t len) noexcept: BaseStringView(str, len) {}
 
-		OX_ALLOW_UNSAFE_BUFFERS_BEGIN
+		constexpr explicit StringLiteral(char const *str) noexcept: StringLiteral(str, ox::strlen(str)) {}
-		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());
+			}
 			return *this;
 		}
 
 		[[nodiscard]]
-		constexpr char const *c_str() const noexcept {
+		constexpr const char *c_str() const noexcept {
 			return data();
 		}
 

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

@@ -20,8 +20,6 @@ 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

@@ -60,7 +60,7 @@ class StringView: public detail::BaseStringView {
 
 };
 
-using StringViewCR = StringView const&;
+using StringViewCR = const StringView&;
 
 constexpr auto operator==(StringViewCR s1, StringViewCR s2) noexcept {
 	if (s2.len() != s1.len()) {
@@ -89,7 +89,7 @@ constexpr auto operator<=>(StringViewCR s1, StringViewCR s2) noexcept {
 	}
 }
 
-constexpr auto write(Writer_c auto &writer, StringViewCR sv) noexcept {
+constexpr auto write(Writer_c auto &writer, ox::StringViewCR sv) noexcept {
 	return writer.write(sv.data(), sv.bytes());
 }
 
@@ -100,24 +100,19 @@ constexpr auto toStdStringView(StringViewCR sv) noexcept {
 #endif
 
 
-constexpr ox::Result<int> strToInt(StringViewCR str) noexcept {
+constexpr ox::Result<int> atoi(ox::StringViewCR str) noexcept {
-	OX_ALLOW_UNSAFE_BUFFERS_BEGIN
 	int total = 0;
 	int multiplier = 1;
-	if (str.len() == 0) [[unlikely]] {
-		return Error{1, "Empty string passed to strToInt"};
-	}
 	for (auto i = static_cast<int64_t>(str.len()) - 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,8 +9,6 @@
 #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");
@@ -44,5 +42,3 @@ std::size_t strlen(const char *str) {
 }
 
 #endif
-
-OX_ALLOW_UNSAFE_BUFFERS_END

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

@@ -145,7 +145,6 @@ OX_CLANG_NOWARN_END
 			return ox::Error{};
 		}
 	},
-	OX_ALLOW_UNSAFE_BUFFERS_BEGIN
 	{
 		"ABCDEFG != HIJKLMN",
 		[]() {
@@ -170,7 +169,6 @@ OX_CLANG_NOWARN_END
 			return ox::Error(ox::memcmp("ABCDEFGHI", "ABCDEFG", 7) != 0);
 		}
 	},
-	OX_ALLOW_UNSAFE_BUFFERS_END
 	{
 		"IString",
 		[]() {

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

@@ -39,8 +39,6 @@ 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());
@@ -105,7 +103,5 @@ 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 t >= 0 && static_cast<ox::Unsigned<T>>(t) == u;
+		return ox::Signed<T>{t} == u;
 	} else {
-		return u >= 0 && t == static_cast<ox::Unsigned<U>>(u);
+		return t == ox::Signed<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 t < 0 || static_cast<ox::Unsigned<T>>(t) < u;
+		return ox::Signed<T>{t} < u;
 	} else {
-		return u >= 0 && t < static_cast<ox::Unsigned<U>>(u);
+		return t < ox::Signed<U>{u};
 	}
 }
 
@@ -69,13 +69,6 @@ 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

@@ -105,10 +105,6 @@ 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;

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

@@ -311,7 +311,7 @@ class Vector: detail::VectorAllocator<T, Allocator, SmallVectorSize> {
 		 */
 		constexpr Error unordered_erase(std::size_t pos) noexcept(useNoexcept);
 
-		constexpr Error remove(MaybeView_t<T> const &val);
+		constexpr Error remove(T const &val);
 
 		constexpr void reserve(std::size_t cap) noexcept(useNoexcept);
 
@@ -658,11 +658,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 {};
+	return ox::Error(0);
 }
 
 template<typename T, std::size_t SmallVectorSize, typename Allocator>
-constexpr ox::Error Vector<T, SmallVectorSize, Allocator>::remove(MaybeView_t<T> const &val) {
+constexpr ox::Error Vector<T, SmallVectorSize, Allocator>::remove(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,8 +5,6 @@
 #pragma once
 
 #include <ox/std/array.hpp>
-#include <ox/std/span.hpp>
-#include <ox/std/units.hpp>
 #include <ox/std/types.hpp>
 
 /////////////////////////////////////////////////////////////////
@@ -51,7 +49,7 @@ using BgCtl = uint16_t;
 #define REG_BG3CTL *reinterpret_cast<volatile BgCtl*>(0x0400'000e)
 
 [[nodiscard]]
-inline volatile BgCtl &regBgCtl(uintptr_t const bgIdx) noexcept {
+inline volatile BgCtl &regBgCtl(uintptr_t bgIdx) noexcept {
 	return *reinterpret_cast<volatile BgCtl*>(0x0400'0008 + 2 * bgIdx);
 }
 
@@ -62,7 +60,7 @@ inline volatile BgCtl &regBgCtl(uintptr_t const bgIdx) noexcept {
 #define REG_BG3HOFS *reinterpret_cast<volatile uint32_t*>(0x0400'001c)
 
 [[nodiscard]]
-volatile uint32_t &regBgHofs(auto const bgIdx) noexcept {
+inline volatile uint32_t &regBgHofs(auto bgIdx) noexcept {
 	return *reinterpret_cast<volatile uint32_t*>(0x0400'0010 + 4 * bgIdx);
 }
 
@@ -73,7 +71,7 @@ volatile uint32_t &regBgHofs(auto const bgIdx) noexcept {
 #define REG_BG3VOFS *reinterpret_cast<volatile uint32_t*>(0x0400'001e)
 
 [[nodiscard]]
-volatile uint32_t &regBgVofs(auto const bgIdx) noexcept {
+inline volatile uint32_t &regBgVofs(auto bgIdx) noexcept {
 	return *reinterpret_cast<volatile uint32_t*>(0x0400'0012 + 4 * bgIdx);
 }
 
@@ -85,23 +83,25 @@ volatile uint32_t &regBgVofs(auto const bgIdx) noexcept {
 /////////////////////////////////////////////////////////////////
 // Memory Addresses
 
-#define MEM_EWRAM (*reinterpret_cast<ox::Array<uint16_t, 0x0203'FFFF - 0x0200'0000>*>(0x0200'0000))
+#define MEM_EWRAM_BEGIN reinterpret_cast<uint8_t*>(0x0200'0000)
+#define MEM_EWRAM_END   reinterpret_cast<uint8_t*>(0x0203'FFFF)
 
-#define MEM_IWRAM (*reinterpret_cast<ox::Array<uint8_t, 0x0300'7FFF - 0x0300'0000>*>(0x0300'0000))
+#define MEM_IWRAM_BEGIN reinterpret_cast<uint8_t*>(0x0300'0000)
+#define MEM_IWRAM_END   reinterpret_cast<uint8_t*>(0x0300'7FFF)
 
 #define REG_BLNDCTL *reinterpret_cast<uint16_t*>(0x0400'0050)
 
-using Palette = ox::Array<uint16_t, 128>;
+#define MEM_BG_PALETTE reinterpret_cast<uint16_t*>(0x0500'0000)
-#define MEM_BG_PALETTE (*reinterpret_cast<::Palette*>(0x0500'0000))
+#define MEM_SPRITE_PALETTE reinterpret_cast<uint16_t*>(0x0500'0200)
-#define MEM_SPRITE_PALETTE (*reinterpret_cast<::Palette*>(0x0500'0200))
 
 using BgMapTile = ox::Array<uint16_t, 8192>;
-#define MEM_BG_TILES (*reinterpret_cast<ox::Array<BgMapTile, 4>*>(0x0600'0000))
+#define MEM_BG_TILES reinterpret_cast<BgMapTile*>(0x0600'0000)
-#define MEM_BG_MAP (*reinterpret_cast<ox::Array<BgMapTile, 4>*>(0x0600'e000))
+#define MEM_BG_MAP reinterpret_cast<BgMapTile*>(0x0600'e000)
 
-#define MEM_SPRITE_TILES (*reinterpret_cast<ox::Array<uint16_t, 32 * ox::units::KB>*>(0x0601'0000))
+#define MEM_SPRITE_TILES reinterpret_cast<uint16_t*>(0x0601'0000)
-#define MEM_OAM (*reinterpret_cast<ox::Array<uint64_t, 64>*>(0x0700'0000))
+#define MEM_OAM reinterpret_cast<uint64_t*>(0x0700'0000)
 
-#define MEM_ROM (*reinterpret_cast<ox::Array<char, 32 * ox::units::MB>*>(0x0700'0000))
+#define MEM_ROM reinterpret_cast<char*>(0x0800'0000)
 
-#define MEM_SRAM (*reinterpret_cast<ox::Array<char, 64 * ox::units::KB>*>(0x0e00'0000))
+#define MEM_SRAM reinterpret_cast<char*>(0x0e00'0000)
+#define MEM_SRAM_SIZE 65535

deps/teagba/include/teagba/gfx.hpp

@@ -37,7 +37,7 @@ struct OX_ALIGN8 GbaSpriteAttrUpdate {
 
 GbaSpriteAttrUpdate &spriteAttr(size_t i) noexcept;
 
-void addSpriteUpdate(GbaSpriteAttrUpdate const &upd) noexcept;
+void addSpriteUpdate(const GbaSpriteAttrUpdate &upd) noexcept;
 
 void applySpriteUpdates() noexcept;
 

deps/teagba/src/cstartup.cpp

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

deps/teagba/src/gfx.cpp

@@ -16,7 +16,7 @@ GbaSpriteAttrUpdate &spriteAttr(size_t i) noexcept {
 	return g_spriteBuffer[i];
 }
 
-void addSpriteUpdate(GbaSpriteAttrUpdate const &upd) noexcept {
+void addSpriteUpdate(const GbaSpriteAttrUpdate &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;

release-notes.md

@@ -1,50 +1,4 @@
-# d2025.06.0
+# d2025.02
-
-* 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

@@ -1,28 +0,0 @@
-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

@@ -1,269 +0,0 @@
-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 {
-	auto const r = static_cast<Color32>(((nc & 0b0000000000011111) >> 0) * 8);
+	const auto r = static_cast<Color32>(((nc & 0b0000000000011111) >> 0) * 8);
-	auto const g = static_cast<Color32>(((nc & 0b0000001111100000) >> 5) * 8);
+	const auto g = static_cast<Color32>(((nc & 0b0000001111100000) >> 5) * 8);
-	auto const b = static_cast<Color32>(((nc & 0b0111110000000000) >> 10) * 8);
+	const auto b = static_cast<Color32>(((nc & 0b0111110000000000) >> 10) * 8);
-	auto const a = static_cast<Color32>(255);
+	const auto a = static_cast<Color32>(255);
 	return r | (g << 8) | (b << 16) | (a << 24);
 }
 

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

@@ -12,18 +12,8 @@ constexpr auto TileWidth = 8;
 constexpr auto TileHeight = 8;
 constexpr auto PixelsPerTile = TileWidth * TileHeight;
 
-constexpr ox::StringLiteral FileExt_ng{"ng"};
+constexpr ox::StringLiteral FileExt_ng("ng");
-constexpr ox::StringLiteral FileExt_nts{"nts"};
+constexpr ox::StringLiteral FileExt_nts("nts");
-constexpr ox::StringLiteral FileExt_npal{"npal"};
+constexpr ox::StringLiteral FileExt_npal("npal");
-
-constexpr ox::Array<ox::StringLiteral, 2> FileExts_TileSheet{
-	FileExt_nts,
-	FileExt_ng,
-};
-
-[[nodiscard]]
-constexpr bool isTileSheet(ox::StringViewCR path) noexcept {
-	return endsWith(path, FileExt_nts) || endsWith(path, FileExt_ng);
-}
 
 }

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

@@ -8,12 +8,16 @@
 
 #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

@@ -0,0 +1,14 @@
+/*
+ * 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,11 +9,8 @@
 #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 {
@@ -105,19 +102,11 @@ OX_MODEL_BEGIN(TileSheetSet)
 	OX_MODEL_FIELD(entries)
 OX_MODEL_END()
 
-struct InitParams {
+[[nodiscard]]
-	bool glInstallDrawer = true;
+int tileColumns(Context&) noexcept;
-	uint_t glSpriteCount = 128;
-	uint_t glBlocksPerSprite = 64;
-};
-
-ox::Result<ox::UPtr<Context>> init(turbine::Context &tctx, InitParams const &params = {}) noexcept;
 
 [[nodiscard]]
-int tileColumns(Context const&) noexcept;
+int tileRows(Context&) noexcept;
-
-[[nodiscard]]
-int tileRows(Context const&) noexcept;
 
 ox::Error loadBgPalette(
 		Context &ctx,
@@ -234,7 +223,7 @@ bool bgStatus(Context &ctx, unsigned bg) noexcept;
 
 void setBgStatus(Context &ctx, unsigned bg, bool status) noexcept;
 
-void setBgCbb(Context &ctx, unsigned bgIdx, unsigned cbbIdx) noexcept;
+void setBgCbb(Context &ctx, unsigned bgIdx, unsigned cbb) noexcept;
 
 void setBgPriority(Context &ctx, uint_t bgIdx, uint_t priority) noexcept;
 
@@ -242,14 +231,14 @@ void hideSprite(Context &ctx, unsigned) noexcept;
 
 void showSprite(Context &ctx, unsigned) noexcept;
 
-void setSprite(Context &ctx, uint_t idx, Sprite const &sprite) noexcept;
+void setSprite(Context &c, uint_t idx, Sprite const&s) noexcept;
 
 [[nodiscard]]
-uint_t spriteCount(Context const &ctx) noexcept;
+uint_t spriteCount(Context &ctx) noexcept;
 
 ox::Error initConsole(Context &ctx) noexcept;
 
-void consoleWrite(Context &ctx, int column, int row, ox::StringViewCR str) noexcept;
+void puts(Context &ctx, int column, int row, ox::StringViewCR str) noexcept;
 
 }
 

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

@@ -0,0 +1,17 @@
+/*
+ * 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 {
 
-keel::Module const *keelModule() noexcept;
+const keel::Module *keelModule() noexcept;
 
 }

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

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

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

@@ -6,28 +6,6 @@
 
 #include <studio/studio.hpp>
 
-#include "tilesheet.hpp"
+namespace nostalgia::core {
-
-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 {
 
-studio::Module const *studioModule() noexcept;
+const studio::Module *studioModule() noexcept;
 
 }

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

@@ -336,7 +336,7 @@ struct TileSheetV5 {
 [[nodiscard]]
 constexpr bool valid(TileSheetV5::SubSheet const&ss) noexcept {
 	if (ss.subsheets.empty()) {
-		return std::cmp_equal(ss.columns * ss.rows * PixelsPerTile, ss.pixels.size());
+		return static_cast<size_t>(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) {
@@ -426,8 +426,6 @@ ox::Error resizeSubsheet(TileSheet::SubSheet &ss, ox::Size const&sz) noexcept;
 [[nodiscard]]
 TileSheet::SubSheetIdx validateSubSheetIdx(TileSheet const&ts, TileSheet::SubSheetIdx idx) noexcept;
 
-ox::Result<TileSheet::SubSheetIdx> getSubSheetIdx(TileSheet const &ts, SubSheetId pId) noexcept;
-
 [[nodiscard]]
 TileSheet::SubSheet &getSubSheet(
 		ox::SpanView<uint32_t> const&idx,

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

@@ -4,6 +4,11 @@ add_library(
 		tilesheet.cpp
 )
 
+add_subdirectory(gba)
+if(NOT BUILDCORE_TARGET STREQUAL "gba")
+	add_subdirectory(opengl)
+endif()
+
 target_include_directories(
 	NostalgiaGfx PUBLIC
 		../include
@@ -26,38 +31,3 @@ 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

@@ -0,0 +1,21 @@
+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

@@ -0,0 +1,36 @@
+/*
+ * 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

@@ -0,0 +1,34 @@
+/*
+ * 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.cpp

@@ -15,43 +15,15 @@
 #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;
 
-static ox::Error initGfx() noexcept {
+ox::Error initGfx(Context&, InitParams const&) noexcept {
 	for (auto bgCtl = &REG_BG0CTL; bgCtl <= &REG_BG3CTL; bgCtl += 2) {
 		teagba::bgSetSbb(*bgCtl, 28);
 	}
@@ -62,21 +34,15 @@ static ox::Error initGfx() 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 const palBank,
+		size_t palBank,
 		CompactPalette const&palette,
-		size_t const page) noexcept {
+		size_t page) noexcept {
 	if (palette.pages.empty()) {
 		return {};
 	}
-	auto const paletteMem = ox::Span{MEM_BG_PALETTE} + palBank * 16;
+	auto const paletteMem = MEM_BG_PALETTE + palBank * 16;
 	for (auto i = 0u; i < colorCnt(palette, page); ++i) {
 		paletteMem[i] = color(palette, page, i);
 	}
@@ -86,12 +52,13 @@ ox::Error loadBgPalette(
 ox::Error loadSpritePalette(
 		Context&,
 		CompactPalette const&palette,
-		size_t const page) noexcept {
+		size_t page) noexcept {
 	if (palette.pages.empty()) {
 		return {};
 	}
+	auto const paletteMem = MEM_SPRITE_PALETTE;
 	for (auto i = 0u; i < colorCnt(palette, page); ++i) {
-		MEM_SPRITE_PALETTE[i] = color(palette, page, i);
+		paletteMem[i] = color(palette, page, i);
 	}
 	return {};
 }
@@ -166,7 +133,7 @@ ox::Error loadBgTileSheet(
 
 ox::Error loadBgTileSheet(
 		Context &ctx,
-		unsigned const cbb,
+		unsigned cbb,
 		CompactTileSheet const&ts,
 		ox::Optional<unsigned> const&paletteBank) noexcept {
 	auto const cnt = (ts.pixels.size() * PixelsPerTile) / (1 + (ts.bpp == 4));
@@ -217,7 +184,7 @@ static void setSpritesBpp(unsigned const bpp) noexcept {
 ox::Error loadSpriteTileSheet(
 		Context &ctx,
 		CompactTileSheet const&ts,
-		bool const loadDefaultPalette) noexcept {
+		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);
@@ -234,17 +201,12 @@ ox::Error loadSpriteTileSheet(
 		Context &ctx,
 		TileSheetSet const&set) noexcept {
 	auto const bpp = static_cast<unsigned>(set.bpp);
-	OX_RETURN_ERROR(loadTileSheetSet(ctx, MEM_SPRITE_TILES, set));
+	OX_RETURN_ERROR(loadTileSheetSet(ctx, {MEM_SPRITE_TILES, 32 * ox::units::KB}, set));
 	setSpritesBpp(bpp);
 	return {};
 }
 
-void setBgTile(
+void setBgTile(Context &ctx, uint_t bgIdx, int column, int row, BgTile const&tile) noexcept {
-	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] =
@@ -254,7 +216,7 @@ void setBgTile(
 			static_cast<uint16_t>(tile.palBank << 0xc);
 }
 
-void clearBg(Context &ctx, uint_t const bgIdx) noexcept {
+void clearBg(Context &ctx, uint_t bgIdx) noexcept {
 	memset(MEM_BG_MAP[bgIdx].data(), 0, static_cast<size_t>(tileRows(ctx) * tileColumns(ctx)));
 }
 
@@ -262,39 +224,39 @@ uint8_t bgStatus(Context&) noexcept {
 	return (REG_DISPCTL >> 8u) & 0b1111u;
 }
 
-void setBgStatus(Context&, uint32_t const status) noexcept {
+void setBgStatus(Context&, uint32_t status) noexcept {
 	constexpr auto BgStatus = 8;
 	REG_DISPCTL = (REG_DISPCTL & ~0b111100000000u) | status << BgStatus;
 }
 
-bool bgStatus(Context&, unsigned const bg) noexcept {
+bool bgStatus(Context&, unsigned bg) noexcept {
 	return (REG_DISPCTL >> (8 + bg)) & 1;
 }
 
-void setBgStatus(Context&, unsigned const bg, bool const status) noexcept {
+void setBgStatus(Context&, unsigned bg, bool status) noexcept {
 	constexpr auto Bg0Status = 8;
-	auto const mask = static_cast<uint32_t>(status) << (Bg0Status + bg);
+	const auto mask = static_cast<uint32_t>(status) << (Bg0Status + bg);
 	REG_DISPCTL = REG_DISPCTL | ((REG_DISPCTL & ~mask) | mask);
 }
 
-void setBgBpp(Context&, unsigned const bgIdx, unsigned const bpp) noexcept {
+void setBgBpp(Context&, unsigned bgIdx, unsigned bpp) noexcept {
 	auto &bgCtl = regBgCtl(bgIdx);
 	teagba::bgSetBpp(bgCtl, bpp);
 }
 
-void setBgCbb(Context &ctx, unsigned const bgIdx, unsigned const cbbIdx) noexcept {
+void setBgCbb(Context &ctx, unsigned bgIdx, unsigned cbb) noexcept {
 	auto &bgCtl = regBgCtl(bgIdx);
-	auto const &cbbData = ctx.cbbData[cbbIdx];
+	const auto &cbbData = ctx.cbbData[cbb];
 	teagba::bgSetBpp(bgCtl, cbbData.bpp);
-	teagba::bgSetCbb(bgCtl, cbbIdx);
+	teagba::bgSetCbb(bgCtl, cbb);
 }
 
-void setBgPriority(Context&, uint_t const bgIdx, uint_t const priority) noexcept {
+void setBgPriority(Context&, uint_t bgIdx, uint_t priority) noexcept {
 	auto &bgCtl = regBgCtl(bgIdx);
 	bgCtl = (bgCtl & 0b1111'1111'1111'1100u) | (priority & 0b11);
 }
 
-void hideSprite(Context&, unsigned const idx) noexcept {
+void hideSprite(Context&, unsigned idx) noexcept {
 	//oxAssert(g_spriteUpdates < config::GbaSpriteBufferLen, "Sprite update buffer overflow");
 	teagba::addSpriteUpdate({
 		.attr0 = uint16_t{0b11 << 8},
@@ -302,7 +264,7 @@ void hideSprite(Context&, unsigned const idx) noexcept {
 	});
 }
 
-void showSprite(Context&, unsigned const idx) noexcept {
+void showSprite(Context&, unsigned idx) noexcept {
 	//oxAssert(g_spriteUpdates < config::GbaSpriteBufferLen, "Sprite update buffer overflow");
 	teagba::addSpriteUpdate({
 		.attr0 = 0,
@@ -310,7 +272,7 @@ void showSprite(Context&, unsigned const idx) noexcept {
 	});
 }
 
-void setSprite(Context&, uint_t const idx, Sprite const &s) noexcept {
+void setSprite(Context&, uint_t idx, Sprite const&s) noexcept {
 	//oxAssert(g_spriteUpdates < config::GbaSpriteBufferLen, "Sprite update buffer overflow");
 	uint16_t const eightBpp = s.bpp == 8;
 	teagba::addSpriteUpdate({
@@ -331,49 +293,10 @@ void setSprite(Context&, uint_t const idx, Sprite const &s) noexcept {
 	});
 }
 
-uint_t spriteCount(Context const &) noexcept {
+uint_t spriteCount(Context&) 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/gba/gfx.hpp

@@ -0,0 +1,11 @@
+/*
+ * 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

@@ -0,0 +1,58 @@
+/*
+ * 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.cpp

@@ -10,17 +10,17 @@ namespace nostalgia::gfx {
 constexpr auto GbaTileColumns = 32;
 constexpr auto GbaTileRows = 32;
 
-int tileColumns(Context const&) noexcept {
+int tileColumns(Context&) noexcept {
 	return GbaTileColumns;
 }
 
-int tileRows(Context const&) noexcept {
+int tileRows(Context&) noexcept {
 	return GbaTileRows;
 }
 
 ox::Error loadBgPalette(
 		Context &ctx,
-		size_t const palBank,
+		size_t palBank,
 		ox::StringViewCR palettePath) noexcept {
 	OX_REQUIRE(pal, keel::readObj<CompactPalette>(keelCtx(ctx), palettePath));
 	return loadBgPalette(ctx, palBank, *pal, 0);
@@ -28,7 +28,7 @@ ox::Error loadBgPalette(
 
 ox::Error loadBgPalette(
 		Context &ctx,
-		size_t const palBank,
+		size_t palBank,
 		ox::FileAddress const&paletteAddr) noexcept {
 	OX_REQUIRE(pal, keel::readObj<CompactPalette>(keelCtx(ctx), paletteAddr));
 	return loadBgPalette(ctx, palBank, *pal, 0);
@@ -50,11 +50,11 @@ ox::Error loadSpritePalette(
 
 ox::Error loadBgTileSheet(
 		Context &ctx,
-		unsigned const cbb,
+		unsigned cbb,
 		ox::FileAddress const&tsAddr,
-		size_t const dstTileIdx,
+		size_t dstTileIdx,
-		size_t const srcTileIdx,
+		size_t srcTileIdx,
-		size_t const tileCnt) noexcept {
+		size_t tileCnt) noexcept {
 	OX_REQUIRE(ts, keel::readObj<CompactTileSheet>(keelCtx(ctx), tsAddr));
 	return loadBgTileSheet(ctx, cbb, *ts, dstTileIdx, srcTileIdx, tileCnt);
 }
@@ -63,16 +63,16 @@ ox::Error loadBgTileSheet(
 		Context &ctx,
 		unsigned cbb,
 		ox::StringViewCR tsPath,
-		size_t const dstTileIdx,
+		size_t dstTileIdx,
-		size_t const srcTileIdx,
+		size_t srcTileIdx,
-		size_t const tileCnt) noexcept {
+		size_t 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 const cbb,
+		unsigned cbb,
 		ox::StringViewCR tilesheetPath,
 		ox::Optional<unsigned> const&paletteBank) noexcept {
 	OX_REQUIRE(ts, keel::readObj<CompactTileSheet>(keelCtx(ctx), tilesheetPath));
@@ -81,7 +81,7 @@ ox::Error loadBgTileSheet(
 
 ox::Error loadBgTileSheet(
 		Context &ctx,
-		unsigned const cbb,
+		unsigned cbb,
 		ox::FileAddress const&tilesheetAddr,
 		ox::Optional<unsigned> const&paletteBank) noexcept {
 	OX_REQUIRE(ts, keel::readObj<CompactTileSheet>(keelCtx(ctx), tilesheetAddr));
@@ -91,7 +91,7 @@ ox::Error loadBgTileSheet(
 ox::Error loadSpriteTileSheet(
 		Context &ctx,
 		ox::StringViewCR tilesheetPath,
-		bool const loadDefaultPalette) noexcept {
+		bool loadDefaultPalette) noexcept {
 	OX_REQUIRE(ts, readObj<CompactTileSheet>(keelCtx(ctx), tilesheetPath));
 	return loadSpriteTileSheet(ctx, *ts, loadDefaultPalette);
 }
@@ -99,7 +99,7 @@ ox::Error loadSpriteTileSheet(
 ox::Error loadSpriteTileSheet(
 		Context &ctx,
 		ox::FileAddress const&tilesheetAddr,
-		bool const loadDefaultPalette) noexcept {
+		bool loadDefaultPalette) noexcept {
 	OX_REQUIRE(ts, readObj<CompactTileSheet>(keelCtx(ctx), tilesheetAddr));
 	return loadSpriteTileSheet(ctx, *ts, loadDefaultPalette);
 }
@@ -235,13 +235,7 @@ constexpr ox::Array<char, 128> charMap = {
 	50, // ~
 };
 
-void setBgTile(
+void setBgTile(Context &ctx, uint_t bgIdx, int column, int row, unsigned tile, unsigned palBank) noexcept {
-	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,
@@ -257,7 +251,7 @@ ox::Error initConsole(Context &ctx) noexcept {
 	return loadBgPalette(ctx, 0, PaletteAddr);
 }
 
-void consoleWrite(
+void puts(
 		Context &ctx,
 		int const column,
 		int const row,

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

@@ -14,6 +14,19 @@
 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 {
@@ -39,19 +52,19 @@ static class: public keel::Module {
 		}
 
 		[[nodiscard]]
-		ox::Vector<keel::Converter> converters() const noexcept final {
+		ox::Vector<keel::BaseConverter const*> converters() const noexcept final {
 			return {
-				keel::Converter::make<convertNostalgiaPaletteToPaletteV1>(),
+				&m_nostalgiaPaletteToPaletteV1Converter,
-				keel::Converter::make<convertPaletteV1ToPaletteV2>(),
+				&m_paletteV1ToPaletteV2Converter,
-				keel::Converter::make<convertPaletteV2ToPaletteV3>(),
+				&m_paletteV2ToPaletteV3Converter,
-				keel::Converter::make<convertPaletteV3ToPaletteV4>(),
+				&m_paletteV3ToPaletteV4Converter,
-				keel::Converter::make<convertPaletteV4ToPaletteV5>(),
+				&m_paletteV4ToPaletteV5Converter,
-				keel::Converter::make<convertPaletteToCompactPalette>(),
+				&m_paletteToCompactPaletteConverter,
-				keel::Converter::make<convertTileSheetV1ToTileSheetV2>(),
+				&m_tileSheetV1ToTileSheetV2Converter,
-				keel::Converter::make<convertTileSheetV2ToTileSheetV3>(),
+				&m_tileSheetV2ToTileSheetV3Converter,
-				keel::Converter::make<convertTileSheetV3ToTileSheetV4>(),
+				&m_tileSheetV3ToTileSheetV4Converter,
-				keel::Converter::make<convertTileSheetV4ToTileSheetV5>(),
+				&m_tileSheetV4ToTileSheetV5Converter,
-				keel::Converter::make<convertTileSheetToCompactTileSheet>(),
+				&m_tileSheetToCompactTileSheetConverter,
 			};
 		}
 

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

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

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

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

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

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

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

@@ -0,0 +1,40 @@
+/*
+ * 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

@@ -0,0 +1,40 @@
+/*
+ * 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;
+};
+
+}

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

@@ -4,6 +4,7 @@
 
 #include <ox/std/array.hpp>
 #include <ox/std/fmt.hpp>
+#include <ox/std/vec.hpp>
 
 #include <keel/media.hpp>
 
@@ -14,105 +15,22 @@
 #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;
@@ -188,7 +106,7 @@ static constexpr ox::CStringView spritefshadTmpl = R"glsl(
 	})glsl";
 
 [[nodiscard]]
-static constexpr auto bgVertexRow(uint_t const x, uint_t const y) noexcept {
+static constexpr auto bgVertexRow(uint_t x, uint_t y) noexcept {
 	return y * TileRows + x;
 }
 
@@ -265,7 +183,7 @@ static void setTileBufferObject(
 	ox::spancpy<GLuint>(ebo, elms);
 }
 
-static void initSpriteBufferObjects(Context const &ctx, glutils::BufferSet &bs) noexcept {
+static void initSpriteBufferObjects(Context &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);
@@ -287,7 +205,7 @@ static void initSpriteBufferObjects(Context const &ctx, glutils::BufferSet &bs)
 static void initBackgroundBufferObjects(glutils::BufferSet &bs) noexcept {
 	for (auto x = 0u; x < TileColumns; ++x) {
 		for (auto y = 0u; y < TileRows; ++y) {
-			auto const i = bgVertexRow(x, y);
+			const auto 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}
@@ -323,13 +241,7 @@ static void initSpritesBufferset(Context &ctx) noexcept {
 	// in float vEnabled;
 	auto const enabledAttr = static_cast<GLuint>(glGetAttribLocation(shader, "vEnabled"));
 	glEnableVertexAttribArray(enabledAttr);
-	glVertexAttribPointer(
+	glVertexAttribPointer(enabledAttr, 1, GL_FLOAT, GL_FALSE, SpriteVertexVboRowLength * sizeof(float), nullptr);
-		enabledAttr,
-		1,
-		GL_FLOAT,
-		GL_FALSE,
-		SpriteVertexVboRowLength * sizeof(float),
-		nullptr);
 	// in vec3 vPosition;
 	auto const posAttr = static_cast<GLuint>(glGetAttribLocation(shader, "vPosition"));
 	glEnableVertexAttribArray(posAttr);
@@ -338,14 +250,13 @@ static void initSpritesBufferset(Context &ctx) noexcept {
 	// in vec2 vTexCoord;
 	auto const texCoordAttr = static_cast<GLuint>(glGetAttribLocation(shader, "vTexCoord"));
 	glEnableVertexAttribArray(texCoordAttr);
-	glVertexAttribPointer(
+	glVertexAttribPointer(texCoordAttr, 2, GL_FLOAT, GL_FALSE, SpriteVertexVboRowLength * sizeof(float),
-		texCoordAttr, 2, GL_FLOAT, GL_FALSE, SpriteVertexVboRowLength * sizeof(float),
 	                      std::bit_cast<void*>(uintptr_t{4 * sizeof(float)}));
 	glBindVertexArray(0);
 }
 
 static void initBackgroundBufferset(
-		GLuint const shader,
+		GLuint shader,
 		glutils::BufferSet &bs) noexcept {
 	// vao
 	bs.vao = glutils::generateVertexArrayObject();
@@ -359,13 +270,7 @@ static void initBackgroundBufferset(
 	// vbo layout
 	auto const posAttr = static_cast<GLuint>(glGetAttribLocation(shader, "vPosition"));
 	glEnableVertexAttribArray(posAttr);
-	glVertexAttribPointer(
+	glVertexAttribPointer(posAttr, 3, GL_FLOAT, GL_FALSE, BgVertexVboRowLength * sizeof(float), nullptr);
-		posAttr,
-		3,
-		GL_FLOAT,
-		GL_FALSE,
-		BgVertexVboRowLength * sizeof(float),
-		nullptr);
 	auto const texCoordAttr = static_cast<GLuint>(glGetAttribLocation(shader, "vTexCoord"));
 	glEnableVertexAttribArray(texCoordAttr);
 	glVertexAttribPointer(
@@ -385,8 +290,8 @@ static void initBackgroundBufferset(
 }
 
 static glutils::GLTexture createTexture(
-		GLsizei const w,
+		GLsizei w,
-		GLsizei const h,
+		GLsizei h,
 		void const*pixels) noexcept {
 	GLuint texId = 0;
 	glGenTextures(1, &texId);
@@ -395,16 +300,7 @@ static glutils::GLTexture createTexture(
 	tex.height = h;
 	glActiveTexture(GL_TEXTURE0);
 	glBindTexture(GL_TEXTURE_2D, tex.id);
-	glTexImage2D(
+	glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, tex.width, tex.height, 0, GL_RGBA, GL_UNSIGNED_BYTE, pixels);
-		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);
@@ -428,19 +324,19 @@ static void drawBackgrounds(
 		ox::Size const&renderSz) noexcept {
 	// load background shader and its uniforms
 	glUseProgram(ctx.bgShader);
-	auto const uniformSrcImgSz = glGetUniformLocation(ctx.bgShader, "fSrcImgSz");
+	const auto uniformSrcImgSz = glGetUniformLocation(ctx.bgShader, "fSrcImgSz");
-	auto const uniformXScale = static_cast<GLint>(glGetUniformLocation(ctx.bgShader, "vXScale"));
+	const auto uniformXScale = static_cast<GLint>(glGetUniformLocation(ctx.bgShader, "vXScale"));
-	auto const uniformTileHeight = static_cast<GLint>(glGetUniformLocation(ctx.bgShader, "vTileHeight"));
+	const auto uniformTileHeight = static_cast<GLint>(glGetUniformLocation(ctx.bgShader, "vTileHeight"));
-	auto const uniformBgIdx = static_cast<GLint>(glGetUniformLocation(ctx.bgShader, "vBgIdx"));
+	const auto uniformBgIdx = static_cast<GLint>(glGetUniformLocation(ctx.bgShader, "vBgIdx"));
-	auto const [wi, hi] = renderSz;
+	const auto [wi, hi] = renderSz;
-	auto const wf = static_cast<float>(wi);
+	const auto wf = static_cast<float>(wi);
-	auto const hf = static_cast<float>(hi);
+	const auto hf = static_cast<float>(hi);
 	glUniform1f(uniformXScale, hf / wf);
 	auto bgIdx = 0.f;
-	for (auto const &bg : ctx.backgrounds) {
+	for (const auto &bg : ctx.backgrounds) {
 		if (bg.enabled) {
 			auto &cbb = ctx.cbbs[bg.cbbIdx];
-			auto const tileRows = cbb.tex.height / (TileHeight * Scale);
+			const auto tileRows = cbb.tex.height / (TileHeight * Scale);
 			glUniform1f(uniformTileHeight, 1.0f / static_cast<float>(tileRows));
 			glUniform2f(
 					uniformSrcImgSz,
@@ -456,11 +352,11 @@ static void drawBackgrounds(
 static void drawSprites(Context &ctx, ox::Size const&renderSz) noexcept {
 	glUseProgram(ctx.spriteShader);
 	auto &sb = ctx.spriteBlocks;
-	auto const uniformXScale = glGetUniformLocation(ctx.bgShader, "vXScale");
+	const auto uniformXScale = glGetUniformLocation(ctx.bgShader, "vXScale");
-	auto const uniformTileHeight = glGetUniformLocation(ctx.spriteShader, "vTileHeight");
+	const auto uniformTileHeight = glGetUniformLocation(ctx.spriteShader, "vTileHeight");
-	auto const [wi, hi] = renderSz;
+	const auto [wi, hi] = renderSz;
-	auto const wf = static_cast<float>(wi);
+	const auto wf = static_cast<float>(wi);
-	auto const hf = static_cast<float>(hi);
+	const auto hf = static_cast<float>(hi);
 	glUniform1f(uniformXScale, hf / wf);
 	// update vbo
 	glBindVertexArray(sb.vao);
@@ -469,7 +365,7 @@ static void drawSprites(Context &ctx, ox::Size const &renderSz) noexcept {
 		glutils::sendVbo(sb);
 	}
 	// set vTileHeight uniform
-	auto const tileRows = sb.tex.height / (TileHeight * Scale);
+	const auto tileRows = sb.tex.height / (TileHeight * Scale);
 	glUniform1f(uniformTileHeight, 1.0f / static_cast<float>(tileRows));
 	// draw
 	glBindTexture(GL_TEXTURE_2D, sb.tex);
@@ -479,10 +375,10 @@ static void drawSprites(Context &ctx, ox::Size const &renderSz) noexcept {
 
 static void loadPalette(
 		ox::Array<GLfloat, 1024> &palette,
-		size_t const palOffset,
+		size_t palOffset,
-		GLuint const shaderPgrm,
+		GLuint shaderPgrm,
 		CompactPalette const&pal,
-		size_t const page = 0) noexcept {
+		size_t page = 0) noexcept {
 	static constexpr std::size_t ColorCnt = 256;
 	for (auto i = palOffset; auto const c : pal.pages[page]) {
 		palette[i++] = redf(c);
@@ -493,7 +389,7 @@ static void loadPalette(
 	// make first color transparent
 	palette[palOffset + 3] = 0;
 	glUseProgram(shaderPgrm);
-	auto const uniformPalette = static_cast<GLint>(glGetUniformLocation(shaderPgrm, "fPalette"));
+	const auto uniformPalette = static_cast<GLint>(glGetUniformLocation(shaderPgrm, "fPalette"));
 	glUniform4fv(uniformPalette, ColorCnt, palette.data());
 }
 
@@ -526,12 +422,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");
-	auto const spriteVboSz = ctx.blocksPerSprite * renderer::SpriteVertexVboLength;
+	const auto spriteVboSz = ctx.blocksPerSprite * renderer::SpriteVertexVboLength;
-	auto const spriteEboSz = ctx.blocksPerSprite * renderer::SpriteVertexEboLength;
+	const auto spriteEboSz = ctx.blocksPerSprite * renderer::SpriteVertexEboLength;
 	auto const vboBase = spriteVboSz * idx;
 	auto const eboBase = spriteEboSz * idx;
 	auto i = 0u;
-	auto const set = [&](int xIt, int yIt, bool enabled) {
+	const auto 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;
@@ -574,23 +470,28 @@ static void setSprite(
 
 }
 
-ox::Result<ox::UPtr<Context>> init(turbine::Context &tctx, InitParams const &params) noexcept {
+ox::Error initGfx(
-	auto ctx = ox::make_unique<Context>(tctx, params);
+		Context &ctx,
-	auto const bgVshad = ox::sfmt(renderer::bgvshadTmpl, gl::GlslVersion);
+		InitParams const&initParams) noexcept {
-	auto const bgFshad = ox::sfmt(renderer::bgfshadTmpl, gl::GlslVersion);
+	const auto bgVshad = ox::sfmt(renderer::bgvshadTmpl, gl::GlslVersion);
-	auto const spriteVshad = ox::sfmt(renderer::spritevshadTmpl, gl::GlslVersion);
+	const auto bgFshad = ox::sfmt(renderer::bgfshadTmpl, gl::GlslVersion);
-	auto const spriteFshad = ox::sfmt(renderer::spritefshadTmpl, gl::GlslVersion);
+	const auto spriteVshad = ox::sfmt(renderer::spritevshadTmpl, gl::GlslVersion);
-	OX_RETURN_ERROR(glutils::buildShaderProgram(bgVshad, bgFshad).moveTo(ctx->bgShader));
+	const auto 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));
+			glutils::buildShaderProgram(spriteVshad, spriteFshad).moveTo(ctx.spriteShader));
-	for (auto &cbb : ctx->cbbs) {
+	for (auto &cbb : ctx.cbbs) {
-		initBackgroundBufferset(ctx->bgShader, cbb);
+		initBackgroundBufferset(ctx.bgShader, cbb);
 	}
-	renderer::initSpritesBufferset(*ctx);
+	renderer::initSpritesBufferset(ctx);
-	if (params.glInstallDrawer) {
+	if (initParams.glInstallDrawer) {
-		turbine::gl::addDrawer(ctx->turbineCtx, &ctx->drawer);
+		turbine::gl::addDrawer(ctx.turbineCtx, &ctx.drawer);
 	}
-	return ctx;
+	return {};
+}
+
+void shutdownGfx(Context &ctx) noexcept {
+	turbine::gl::removeDrawer(ctx.turbineCtx, &ctx.drawer);
 }
 
 struct TileSheetData {
@@ -603,12 +504,12 @@ struct TileSheetData {
 	}
 };
 
-static ox::Result<TileSheetData> normalizeTileSheet
+static ox::Result<TileSheetData> normalizeTileSheet(
-		(CompactTileSheet const &ts) noexcept {
+		CompactTileSheet const&ts) noexcept {
 	const uint_t bytesPerTile = ts.bpp == 8 ? PixelsPerTile : PixelsPerTile / 2;
-	auto const tiles = ts.pixels.size() / bytesPerTile;
+	const auto tiles = ts.pixels.size() / bytesPerTile;
 	constexpr int width = 8;
-	int const height = 8 * static_cast<int>(tiles);
+	const int height = 8 * static_cast<int>(tiles);
 	ox::Vector<uint32_t> pixels;
 	if (bytesPerTile == 64) { // 8 BPP
 		pixels.resize(ts.pixels.size());
@@ -622,18 +523,14 @@ static ox::Result<TileSheetData> normalizeTileSheet
 			pixels[i * 2 + 1] = ts.pixels[i] >> 4;
 		}
 	}
-	return TileSheetData{
+	return TileSheetData{std::move(pixels), width, height};
-		.pixels = std::move(pixels),
-		.width = width,
-		.height = height
-	};
 }
 
 ox::Error loadBgPalette(
 		Context &ctx,
-		size_t const palBank,
+		size_t palBank,
 		CompactPalette const&palette,
-		size_t const page) noexcept {
+		size_t page) noexcept {
 	renderer::loadPalette(ctx.bgPalette, palBank * 16 * 4, ctx.bgShader, palette, page);
 	return {};
 }
@@ -641,14 +538,14 @@ ox::Error loadBgPalette(
 ox::Error loadSpritePalette(
 		Context &ctx,
 		CompactPalette const&palette,
-		size_t const page) noexcept {
+		size_t page) noexcept {
 	ox::Array<GLfloat, 1024> pal;
 	renderer::loadPalette(pal, 0, ctx.spriteShader, palette, page);
 	return {};
 }
 
 static ox::Result<TileSheetData> buildSetTsd(
-		Context const &ctx,
+		Context &ctx,
 		TileSheetSet const&set) noexcept {
 	auto &kctx = keelCtx(ctx.turbineCtx);
 	TileSheetData setTsd;
@@ -670,7 +567,7 @@ static ox::Result<TileSheetData> buildSetTsd(
 
 static void copyPixels(
 		CompactTileSheet const&ts,
-		ox::Span<uint32_t> const dst,
+		ox::Span<uint32_t> dst,
 		size_t const srcPxIdx,
 		size_t const pxlCnt) noexcept {
 	size_t idx{};
@@ -727,7 +624,7 @@ ox::Error loadBgTileSheet(
 
 ox::Error loadBgTileSheet(
 		Context &ctx,
-		uint_t const cbb,
+		uint_t cbb,
 		CompactTileSheet const&ts,
 		ox::Optional<unsigned> const&paletteBank) noexcept {
 	auto const bytesPerTile = static_cast<uint64_t>(PixelsPerTile / (1 + (ts.bpp == 4)));
@@ -741,7 +638,7 @@ ox::Error loadBgTileSheet(
 
 ox::Error loadBgTileSheet(
 		Context &ctx,
-		unsigned const cbb,
+		unsigned cbb,
 		TileSheetSet const&set) noexcept {
 	OX_REQUIRE(setTsd, buildSetTsd(ctx, set));
 	ctx.cbbs[cbb].tex = renderer::createTexture(setTsd.width, setTsd.height, setTsd.pixels.data());
@@ -751,7 +648,7 @@ ox::Error loadBgTileSheet(
 ox::Error loadSpriteTileSheet(
 		Context &ctx,
 		CompactTileSheet const&ts,
-		bool const loadDefaultPalette) noexcept {
+		bool 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());
@@ -771,21 +668,21 @@ ox::Error loadSpriteTileSheet(
 
 void setBgTile(
 		Context &ctx,
-		uint_t const bgIdx,
+		uint_t bgIdx,
-		int const column,
+		int column,
-		int const row,
+		int row,
 		BgTile const&tile) noexcept {
 	oxTracef(
 			"nostalgia.gfx.setBgTile",
 			"bgIdx: {}, column: {}, row: {}, tile: {}, palBank: {}",
 			bgIdx, column, row, tile.tileIdx, tile.palBank);
-	auto const z = static_cast<uint_t>(bgIdx);
+	const auto z = static_cast<uint_t>(bgIdx);
-	auto const y = static_cast<uint_t>(row);
+	const auto y = static_cast<uint_t>(row);
-	auto const x = static_cast<uint_t>(column);
+	const auto x = static_cast<uint_t>(column);
-	auto const i = renderer::bgVertexRow(x, y);
+	const auto i = renderer::bgVertexRow(x, y);
 	auto &cbb = ctx.cbbs[z];
-	auto const vbo = ox::Span{cbb.vertices} + i * renderer::BgVertexVboLength;
+	const auto vbo = ox::Span{cbb.vertices} + i * renderer::BgVertexVboLength;
-	auto const ebo = ox::Span{cbb.elements} + i * renderer::BgVertexEboLength;
+	const auto ebo = ox::Span{cbb.elements} + i * renderer::BgVertexEboLength;
 	auto &bg = ctx.backgrounds[bgIdx];
 	renderer::setTileBufferObject(
 			static_cast<uint_t>(i * renderer::BgVertexVboRows),
@@ -801,7 +698,7 @@ void setBgTile(
 	cbb.updated = true;
 }
 
-void clearBg(Context &ctx, uint_t const bgIdx) noexcept {
+void clearBg(Context &ctx, uint_t bgIdx) noexcept {
 	auto &cbb = ctx.cbbs[static_cast<std::size_t>(bgIdx)];
 	initBackgroundBufferObjects(cbb);
 	cbb.updated = true;
@@ -817,59 +714,61 @@ uint8_t bgStatus(Context &ctx) noexcept {
 	return out;
 }
 
-void setBgStatus(Context &ctx, uint32_t const status) noexcept {
+void setBgStatus(Context &ctx, uint32_t 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 const bg) noexcept {
+bool bgStatus(Context &ctx, uint_t bg) noexcept {
 	return ctx.backgrounds[bg].enabled;
 }
 
-void setBgStatus(Context&ctx, uint_t const bg, bool const status) noexcept {
+void setBgStatus(Context&ctx, uint_t bg, bool status) noexcept {
 	ctx.backgrounds[bg].enabled = status;
 }
 
-void setBgCbb(Context &ctx, uint_t const bgIdx, uint_t const cbbIdx) noexcept {
+void setBgBpp(Context&, unsigned, unsigned) noexcept {}
+
+void setBgCbb(Context &ctx, uint_t bgIdx, uint_t cbbIdx) noexcept {
 	auto &bg = ctx.backgrounds[bgIdx];
 	bg.cbbIdx = cbbIdx;
 }
 
-void setBgPriority(Context &ctx, uint_t const bgIdx, uint_t const priority) noexcept {
+void setBgPriority(Context &ctx, uint_t bgIdx, uint_t priority) noexcept {
 	auto &bg = ctx.backgrounds[bgIdx];
 	bg.priority = static_cast<float>(priority & 0b11);
 }
 
-void hideSprite(Context &ctx, uint_t const idx) noexcept {
+void hideSprite(Context &ctx, uint_t idx) noexcept {
 	auto &s = ctx.spriteStates[idx];
 	s.enabled = false;
 	renderer::setSprite(ctx, idx, s);
 }
 
-void showSprite(Context &ctx, uint_t const idx) noexcept {
+void showSprite(Context &ctx, uint_t idx) noexcept {
 	auto &s = ctx.spriteStates[idx];
 	s.enabled = true;
 	renderer::setSprite(ctx, idx, s);
 }
 
-void setSprite(Context &ctx, uint_t const idx, Sprite const &sprite) noexcept {
+void setSprite(Context &ctx, uint_t idx, Sprite const&sprite) noexcept {
 	auto &s = ctx.spriteStates[idx];
 	s = sprite;
 	renderer::setSprite(ctx, idx, s);
 }
 
-uint_t spriteCount(Context const &ctx) noexcept {
+uint_t spriteCount(Context &ctx) noexcept {
 	return ctx.spriteCount;
 }
 
 namespace gl {
 
-ox::Size drawSize(int const scale) noexcept {
+ox::Size drawSize(int scale) noexcept {
 	return {240 * scale, 160 * scale};
 }
 
-void draw(Context &ctx, ox::Size const &renderSz) noexcept {
+void draw(gfx::Context &ctx, ox::Size const&renderSz) noexcept {
 	glViewport(0, 0, renderSz.width, renderSz.height);
 	glEnable(GL_DEPTH_TEST);
 	glEnable(GL_BLEND);
@@ -884,7 +783,7 @@ void draw(Context &ctx, ox::Size const &renderSz) noexcept {
 	glDisable(GL_BLEND);
 }
 
-void draw(Context &ctx, int const scale) noexcept {
+void draw(gfx::Context &ctx, int scale) noexcept {
 	draw(ctx, drawSize(scale));
 }
 

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

@@ -0,0 +1,65 @@
+/*
+ * Copyright 2016 - 2025 Gary Talent (gary@drinkingtea.net). All rights reserved.
+ */
+
+#pragma once
+
+#include <ox/std/types.hpp>
+
+#include <turbine/gfx.hpp>
+
+#include <glutils/glutils.hpp>
+
+#include <nostalgia/gfx/context.hpp>
+
+namespace nostalgia::gfx::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: public glutils::BufferSet {
+	bool updated = false;
+	ox::Array<uint32_t, 32768> pixels;
+	constexpr CBB() noexcept {
+		vertices.resize(TileCount * BgVertexVboLength);
+		elements.resize(TileCount * BgVertexEboLength);
+	}
+};
+
+struct SpriteBlockset: public 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 Drawer: public turbine::gl::Drawer {
+	private:
+		Context &m_ctx;
+	public:
+		explicit Drawer(Context &ctx) noexcept;
+		void draw(turbine::Context&) noexcept final;
+};
+
+}
+
+namespace nostalgia::gfx {
+ox::Error initGfx(Context &ctx, InitParams const&) noexcept;
+void shutdownGfx(Context &ctx) noexcept;
+}

src/nostalgia/modules/gfx/src/studio/paletteeditor/commands/removepagecommand.cpp

@@ -8,7 +8,7 @@
 
 namespace nostalgia::gfx {
 
-RemovePageCommand::RemovePageCommand(Palette &pal, size_t const idx) noexcept:
+RemovePageCommand::RemovePageCommand(Palette &pal, size_t idx) noexcept:
 	m_pal(pal),
 	m_idx(idx) {}
 

src/nostalgia/modules/gfx/src/studio/paletteeditor/commands/updatecolorcommand.cpp

@@ -9,13 +9,13 @@ namespace nostalgia::gfx {
 
 UpdateColorCommand::UpdateColorCommand(
 	Palette &pal,
-	size_t const page,
+	size_t page,
-	size_t const idx,
+	size_t idx,
-	Color16 const newColor):
+	Color16 newColor):
-		m_pal{pal},
+		m_pal(pal),
-		m_page{page},
+		m_page(page),
-		m_idx{idx},
+		m_idx(idx),
-		m_altColor{newColor} {
+		m_altColor(newColor) {
 	if (color(m_pal, m_page, m_idx) == newColor) {
 		throw studio::NoChangesException();
 	}

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

@@ -50,25 +50,22 @@ void PaletteEditorImGui::PageRenameDialog::draw(turbine::Context &tctx) noexcept
 		return;
 	}
 	if (ig::BeginPopup(tctx, "Rename Page", m_show)) {
-		if (ImGui::IsWindowAppearing()) {
-			ImGui::SetKeyboardFocusHere();
-		}
 		ig::InputText("Name", m_name);
-		auto const nameInputFocused = ImGui::IsItemFocused();
+		switch (ig::PopupControlsOkCancel(m_show)) {
-		auto const resp = ig::PopupControlsOkCancel(m_show);
+			case ig::PopupResponse::OK:
-		if ((nameInputFocused && ImGui::IsKeyPressed(ImGuiKey_Enter))
-			|| resp == ig::PopupResponse::OK) {
 				inputSubmitted.emit(m_name);
+				[[fallthrough]];
+			case ig::PopupResponse::Cancel:
 				close();
-		} else if (resp == ig::PopupResponse::Cancel) {
+			default:
-			close();
+				break;
 		}
 		ImGui::EndPopup();
 	}
 }
 
 
-PaletteEditorImGui::PaletteEditorImGui(studio::Context &sctx, ox::StringParam path):
+PaletteEditorImGui::PaletteEditorImGui(studio::StudioContext &sctx, ox::StringParam path):
 		Editor(sctx, std::move(path)),
 		m_sctx(sctx),
 		m_tctx(sctx.tctx),
@@ -77,7 +74,7 @@ PaletteEditorImGui::PaletteEditorImGui(studio::Context &sctx, ox::StringParam pa
 	m_pageRenameDlg.inputSubmitted.connect(this, &PaletteEditorImGui::renamePage);
 }
 
-void PaletteEditorImGui::draw(studio::Context&) noexcept {
+void PaletteEditorImGui::draw(studio::StudioContext&) noexcept {
 	auto const paneSize = ImGui::GetContentRegionAvail();
 	{
 		ImGui::BeginChild("Pages", {280, paneSize.y}, true);
@@ -105,25 +102,25 @@ void PaletteEditorImGui::navigateTo(ox::StringViewCR arg) noexcept {
 	auto const &color = args[0];
 	auto const &page = args[1];
 	{
-		auto const [c, err] = strToInt(color);
+		auto const [c, err] = atoi(color);
 		if (!err && static_cast<size_t>(c) < colorCnt(m_pal)) {
 			m_selectedColorRow = static_cast<size_t>(c);
 		}
 	}
 	{
-		auto const [pg, err] = strToInt(page);
+		auto const [pg, err] = atoi(page);
 		if (!err && static_cast<size_t>(pg) < m_pal.pages.size()) {
 			m_page = static_cast<size_t>(pg);
 		}
 	}
 }
 
-void PaletteEditorImGui::drawColumnLeftAlign(ox::CStringViewCR txt) noexcept {
+void PaletteEditorImGui::drawColumnLeftAlign(ox::CStringView txt) noexcept {
 	ImGui::TableNextColumn();
 	ImGui::Text("%s", txt.c_str());
 }
 
-void PaletteEditorImGui::drawColumn(ox::CStringViewCR txt) noexcept {
+void PaletteEditorImGui::drawColumn(ox::CStringView txt) noexcept {
 	ImGui::TableNextColumn();
 	ImGui::SetCursorPosX(
 			ImGui::GetCursorPosX() + ImGui::GetColumnWidth() - ImGui::CalcTextSize(txt.data()).x);
@@ -134,7 +131,7 @@ void PaletteEditorImGui::numShortcuts(size_t &val, size_t const sizeRange) noexc
 	auto const lastElem = sizeRange - 1;
 	if (ImGui::IsKeyPressed(ImGuiKey_0)) {
 		val = ox::min<size_t>(9, lastElem);
-	} else for (auto i = 8u; i < 9; --i) {
+	} else for (auto i = 9u; i < 10; --i) {
 		auto const key = static_cast<ImGuiKey>(ImGuiKey_1 + i);
 		if (ImGui::IsKeyPressed(key)) {
 			val = ox::min<size_t>(i, lastElem);
@@ -143,15 +140,7 @@ void PaletteEditorImGui::numShortcuts(size_t &val, size_t const sizeRange) noexc
 	}
 }
 
-void PaletteEditorImGui::colorInput(
+void PaletteEditorImGui::colorInput(ox::CStringView label, int &v, bool &inputFocused) noexcept {
-	ox::CStringViewCR label,
-	int &v,
-	bool &inputFocused,
-	FocusCmd const colorChannel) noexcept {
-	if (colorChannel == m_focusCmd) [[unlikely]] {
-		ImGui::SetKeyboardFocusHere();
-		m_focusCmd = FocusCmd::None;
-	}
 	ImGui::InputInt(label.c_str(), &v, 1, 5);
 	inputFocused = inputFocused || ImGui::IsItemFocused();
 	v = ox::max(v, 0);
@@ -302,44 +291,21 @@ void PaletteEditorImGui::drawColorEditor() noexcept {
 	int const a = alpha16(c);
 	auto const newName = ig::InputText<50>(
 			"Name", m_pal.colorNames[m_selectedColorRow]);
-	auto const nameInputFocused = ImGui::IsItemFocused();
+	bool inputFocused = ImGui::IsItemFocused();
 	ImGui::Separator();
-	bool colorInFocused{};
+	colorInput("Red", r, inputFocused);
-	colorInput("Red", r, colorInFocused, FocusCmd::Red);
+	colorInput("Green", g, inputFocused);
-	colorInput("Green", g, colorInFocused, FocusCmd::Green);
+	colorInput("Blue", b, inputFocused);
-	colorInput("Blue", b, colorInFocused, FocusCmd::Blue);
-	// color preview
-	{
-		ImGui::PushStyleColor(
-			ImGuiCol_ChildBg,
-			color32(color16(r, g, b)) | 0xff'00'00'00);
-		ImGui::BeginChild("ColorPreview", {0, 25});
-		ImGui::EndChild();
-		ImGui::PopStyleColor();
-	}
 	if (ig::PushButton("Apply to all pages", {-1, ig::BtnSz.y})) {
 		std::ignore = pushCommand<ApplyColorAllPagesCommand>(
 				m_pal, m_page, m_selectedColorRow);
 	}
-	if (ig::mainWinHasFocus() && !ImGui::IsKeyDown(ImGuiKey_ModCtrl)) {
+	if (ig::mainWinHasFocus() && !inputFocused && !ImGui::IsKeyDown(ImGuiKey_ModCtrl)) {
 		if (!ImGui::IsKeyDown(ImGuiKey_ModAlt)) {
-			if (!nameInputFocused && !colorInFocused) {
 			numShortcuts(m_selectedColorRow, largestPage(m_pal));
-			}
 		} else {
 			numShortcuts(m_page, m_pal.pages.size());
 		}
-		if (!nameInputFocused) {
-			if (ImGui::IsKeyDown(ImGuiKey_R)) {
-				m_focusCmd = FocusCmd::Red;
-			}
-			if (ImGui::IsKeyDown(ImGuiKey_G)) {
-				m_focusCmd = FocusCmd::Green;
-			}
-			if (ImGui::IsKeyDown(ImGuiKey_B)) {
-				m_focusCmd = FocusCmd::Blue;
-			}
-		}
 	}
 	auto const newColor = color16(r, g, b, a);
 	if (c != newColor) {
@@ -351,7 +317,7 @@ void PaletteEditorImGui::drawColorEditor() noexcept {
 	}
 }
 
-ox::Error PaletteEditorImGui::renamePage(ox::StringViewCR name) noexcept {
+ox::Error PaletteEditorImGui::renamePage(ox::StringView name) noexcept {
 	return pushCommand<RenamePageCommand>(m_pal, m_page, name);
 }
 

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

@@ -31,23 +31,16 @@ class PaletteEditorImGui: public studio::Editor {
 				constexpr bool isOpen() const noexcept { return m_show; }
 				void draw(turbine::Context &tctx) noexcept;
 		} m_pageRenameDlg;
-		studio::Context &m_sctx;
+		studio::StudioContext &m_sctx;
 		turbine::Context &m_tctx;
 		Palette m_pal;
 		size_t m_selectedColorRow = 0;
 		size_t m_page = 0;
-		enum class FocusCmd {
-			None,
-			Red,
-			Green,
-			Blue,
-		};
-		FocusCmd m_focusCmd;
 
 	public:
-		PaletteEditorImGui(studio::Context &sctx, ox::StringParam path);
+		PaletteEditorImGui(studio::StudioContext &sctx, ox::StringParam path);
 
-		void draw(studio::Context&) noexcept final;
+		void draw(studio::StudioContext&) noexcept final;
 
 	protected:
 		ox::Error saveItem() noexcept final;
@@ -55,17 +48,17 @@ class PaletteEditorImGui: public studio::Editor {
 		void navigateTo(ox::StringViewCR arg) noexcept override;
 
 	private:
-		static void drawColumnLeftAlign(ox::CStringViewCR txt) noexcept;
+		static void drawColumnLeftAlign(ox::CStringView txt) noexcept;
 
-		static void drawColumn(ox::CStringViewCR txt) noexcept;
+		static void drawColumn(ox::CStringView txt) noexcept;
 
 		static void drawColumn(ox::Integer_c auto i) noexcept {
-			drawColumn(ox::intToStr(i));
+			drawColumn(ox::itoa(i));
 		}
 
 		static void numShortcuts(size_t &val, size_t sizeRange) noexcept;
 
-		void colorInput(ox::CStringViewCR label, int &v, bool &inputFocused, FocusCmd colorChannel) noexcept;
+		static void colorInput(ox::CStringView label, int &v, bool &inputFocused) noexcept;
 
 		void drawColorsEditor() noexcept;
 
@@ -73,7 +66,7 @@ class PaletteEditorImGui: public studio::Editor {
 
 		void drawColorEditor() noexcept;
 
-		ox::Error renamePage(ox::StringViewCR name) noexcept;
+		ox::Error renamePage(ox::StringView name) noexcept;
 
 		ox::Error handleCommand(studio::UndoCommand const*) noexcept;
 };

src/nostalgia/modules/gfx/src/studio/studiomodule.cpp

@@ -12,15 +12,15 @@
 namespace nostalgia::gfx {
 
 static class: public studio::Module {
-	ox::Vector<studio::EditorMaker> editors(studio::Context &ctx) const noexcept final {
+	ox::Vector<studio::EditorMaker> editors(studio::StudioContext &ctx) const noexcept final {
 		return {
 			studio::editorMaker<TileSheetEditorImGui>(ctx, {FileExt_ng, FileExt_nts}),
 			studio::editorMaker<PaletteEditorImGui>(ctx, FileExt_npal),
 		};
 	}
 
-	ox::Vector<ox::UPtr<studio::ItemMaker>> itemMakers(studio::Context&) const noexcept final {
+	ox::Vector<ox::UPtr<studio::ItemMaker>> itemMakers(studio::StudioContext&) const noexcept final {
-		ox::Vector<ox::UPtr<studio::ItemMaker>> out;
+		ox::Vector<ox::UniquePtr<studio::ItemMaker>> out;
 		out.emplace_back(ox::make<studio::ItemMakerT<TileSheet>>("Tile Sheet", "TileSheets", FileExt_nts));
 		out.emplace_back(ox::make<studio::ItemMakerT<Palette>>("Palette", "Palettes", FileExt_npal, Palette{
 			.colorNames = {},
@@ -30,7 +30,7 @@ static class: public studio::Module {
 	}
 } const mod;
 
-studio::Module const *studioModule() noexcept {
+const studio::Module *studioModule() noexcept {
 	return &mod;
 }
 

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

@@ -13,7 +13,7 @@ AddSubSheetCommand::AddSubSheetCommand(
 	auto &parent = getSubSheet(m_img, m_parentIdx);
 	if (!parent.subsheets.empty()) {
 		auto idx = m_parentIdx;
-		idx.emplace_back(static_cast<uint32_t>(parent.subsheets.size()));
+		idx.emplace_back(parent.subsheets.size());
 		m_addedSheets.push_back(idx);
 	} else {
 		auto idx = m_parentIdx;

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

@@ -27,14 +27,11 @@ CutPasteCommand::CutPasteCommand(
 		TileSheet::SubSheetIdx subSheetIdx,
 		ox::Point const&dstStart,
 		ox::Point dstEnd,
-		TileSheetClipboard const&cb):
+		TileSheetClipboard const&cb) noexcept:
 		m_commandId(commandId),
 		m_img(img),
 		m_subSheetIdx(std::move(subSheetIdx)) {
 	auto const&ss = getSubSheet(m_img, m_subSheetIdx);
-	if (dstStart.x >= ss.columns * TileWidth || dstStart.y >= ss.rows * TileHeight) {
-		throw ox::Exception{1, "paste starts beyond the bounds of target"};
-	}
 	dstEnd.x = std::min(ss.columns * TileWidth - 1, dstEnd.x);
 	dstEnd.y = std::min(ss.rows * TileHeight - 1, dstEnd.y);
 	for (auto const&p : cb.pixels()) {
@@ -48,7 +45,7 @@ CutPasteCommand::CutPasteCommand(
 
 ox::Error CutPasteCommand::redo() noexcept {
 	auto &subsheet = getSubSheet(m_img, m_subSheetIdx);
-	for (auto const &c : m_changes) {
+	for (const auto &c : m_changes) {
 		subsheet.pixels[c.idx] = static_cast<uint8_t>(c.newPalIdx);
 	}
 	return {};
@@ -56,7 +53,7 @@ ox::Error CutPasteCommand::redo() noexcept {
 
 ox::Error CutPasteCommand::undo() noexcept {
 	auto &subsheet = getSubSheet(m_img, m_subSheetIdx);
-	for (auto const &c : m_changes) {
+	for (const auto &c : m_changes) {
 		subsheet.pixels[c.idx] = static_cast<uint8_t>(c.oldPalIdx);
 	}
 	return {};

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

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

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

@@ -8,40 +8,35 @@
 
 namespace nostalgia::gfx {
 
-DeleteTilesCommand::DeleteTilesCommand(
+gfx::DeleteTilesCommand::DeleteTilesCommand(
 		TileSheet &img,
 		TileSheet::SubSheetIdx idx,
-		std::size_t const tileIdx,
+		std::size_t tileIdx,
-		std::size_t const tileCnt) noexcept:
+		std::size_t tileCnt) noexcept:
-		m_img{img},
+		m_img(img),
-		m_idx{std::move(idx)},
+		m_idx(std::move(idx)) {
-		m_deletePos{tileIdx * PixelsPerTile},
+	const unsigned bytesPerTile = m_img.bpp == 4 ? PixelsPerTile / 2 : PixelsPerTile;
-		m_deleteSz{tileCnt * PixelsPerTile},
+	m_deletePos = tileIdx * bytesPerTile;
-		m_deletedPixels{[this] {
+	m_deleteSz = tileCnt * bytesPerTile;
-			ox::Vector<uint8_t> deletedPixels(m_deleteSz);
+	m_deletedPixels.resize(m_deleteSz);
 	// copy pixels to be erased
-			auto const &s = getSubSheet(m_img, m_idx);
+	{
-			auto const dst = deletedPixels.begin();
+		auto &s = getSubSheet(m_img, m_idx);
-			auto const src = s.pixels.begin() + m_deletePos;
+		auto dst = m_deletedPixels.begin();
+		auto src = s.pixels.begin() + m_deletePos;
 		ox::copy_n(src, m_deleteSz, dst);
-			return deletedPixels;
+	}
-		}()} {}
+}
 
-ox::Error DeleteTilesCommand::redo() noexcept {
+ox::Error gfx::DeleteTilesCommand::redo() noexcept {
 	auto &s = getSubSheet(m_img, m_idx);
 	auto &p = s.pixels;
-	auto const srcPos = m_deletePos + m_deleteSz;
+	auto srcPos = m_deletePos + m_deleteSz;
+	auto const src = &p[srcPos];
 	auto const dst1 = &p[m_deletePos];
 	auto const dst2 = &p[(p.size() - m_deleteSz)];
-	OX_ALLOW_UNSAFE_BUFFERS_BEGIN
-	if (srcPos < p.size()) {
-		auto const src = &p[srcPos];
 	ox::memmove(dst1, src, p.size() - srcPos);
 	ox::memset(dst2, 0, m_deleteSz * sizeof(decltype(p[0])));
-	} else {
-		ox::memset(dst1, 0, p.size() - m_deletePos);
-	}
-	OX_ALLOW_UNSAFE_BUFFERS_END
 	return {};
 }
 
@@ -49,16 +44,11 @@ ox::Error DeleteTilesCommand::undo() noexcept {
 	auto &s = getSubSheet(m_img, m_idx);
 	auto &p = s.pixels;
 	auto const src = &p[m_deletePos];
-	auto const sz = p.size() - m_deletePos - m_deleteSz;
-	auto const srcPos = m_deletePos + m_deleteSz;
-	OX_ALLOW_UNSAFE_BUFFERS_BEGIN
-	if (srcPos < p.size()) {
 	auto const dst1 = &p[m_deletePos + m_deleteSz];
-		ox::memmove(dst1, src, sz);
-	}
 	auto const dst2 = src;
+	auto const sz = p.size() - m_deletePos - m_deleteSz;
+	ox::memmove(dst1, src, sz);
 	ox::memcpy(dst2, m_deletedPixels.data(), m_deletedPixels.size());
-	OX_ALLOW_UNSAFE_BUFFERS_END
 	return {};
 }
 

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

@@ -11,10 +11,10 @@ namespace nostalgia::gfx {
 class DeleteTilesCommand: public TileSheetCommand {
 	private:
 		TileSheet &m_img;
-		TileSheet::SubSheetIdx const m_idx;
+		TileSheet::SubSheetIdx m_idx;
-		std::size_t const m_deletePos = 0;
+		std::size_t m_deletePos = 0;
-		std::size_t const m_deleteSz = 0;
+		std::size_t m_deleteSz = 0;
-		ox::Vector<uint8_t> const m_deletedPixels;
+		ox::Vector<uint8_t> m_deletedPixels = {};
 
 	public:
 		DeleteTilesCommand(

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

@@ -62,11 +62,11 @@ constexpr void iterateLine(ox::Point const &a, ox::Point const &b, auto const &f
 DrawCommand::DrawCommand(
 		TileSheet &img,
 		TileSheet::SubSheetIdx subSheetIdx,
-		std::size_t const idx,
+		std::size_t idx,
 		int const palIdx) noexcept:
-		m_img{img},
+		m_img(img),
-		m_subSheetIdx{std::move(subSheetIdx)},
+		m_subSheetIdx(std::move(subSheetIdx)),
-		m_palIdx{palIdx} {
+		m_palIdx(palIdx) {
 	auto &subsheet = getSubSheet(m_img, m_subSheetIdx);
 	m_changes.emplace_back(static_cast<uint32_t>(idx), getPixel(subsheet, idx));
 }

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

@@ -9,29 +9,28 @@ namespace nostalgia::gfx {
 InsertTilesCommand::InsertTilesCommand(
 		TileSheet &img,
 		TileSheet::SubSheetIdx idx,
-		std::size_t const tileIdx,
+		std::size_t tileIdx,
-		std::size_t const tileCnt) noexcept:
+		std::size_t tileCnt) noexcept:
-		m_img{img},
+		m_img(img),
-		m_idx{std::move(idx)},
+		m_idx(std::move(idx)) {
-		m_insertPos{tileIdx * PixelsPerTile},
+	const unsigned bytesPerTile = m_img.bpp == 4 ? PixelsPerTile / 2 : PixelsPerTile;
-		m_insertCnt{tileCnt * PixelsPerTile},
+	m_insertPos = tileIdx * bytesPerTile;
-		m_insertedPixels{[this] {
+	m_insertCnt = tileCnt * bytesPerTile;
-			ox::Vector<uint8_t> insertedPixels(m_insertCnt);
+	m_deletedPixels.resize(m_insertCnt);
 	// copy pixels to be erased
+	{
 		auto &s = getSubSheet(m_img, m_idx);
 		auto &p = s.pixels;
-			auto const dst = insertedPixels.begin();
+		auto dst = m_deletedPixels.begin();
-			auto const src = p.begin() + p.size() - m_insertCnt;
+		auto src = p.begin() + p.size() - m_insertCnt;
 		ox::copy_n(src, m_insertCnt, dst);
-			return insertedPixels;
+	}
-		}()} {}
+}
-
-OX_ALLOW_UNSAFE_BUFFERS_BEGIN
 
 ox::Error InsertTilesCommand::redo() noexcept {
 	auto &s = getSubSheet(m_img, m_idx);
 	auto &p = s.pixels;
-	auto const dstPos = m_insertPos + m_insertCnt;
+	auto dstPos = m_insertPos + m_insertCnt;
 	auto const src = &p[m_insertPos];
 	if (dstPos < p.size()) {
 		auto const dst = &p[dstPos];
@@ -52,12 +51,10 @@ ox::Error InsertTilesCommand::undo() noexcept {
 		auto const src = &p[srcIdx];
 		ox::memmove(dst1, src, sz);
 	}
-	ox::memcpy(dst2, m_insertedPixels.data(), m_insertedPixels.size());
+	ox::memcpy(dst2, m_deletedPixels.data(), m_deletedPixels.size());
 	return {};
 }
 
-OX_ALLOW_UNSAFE_BUFFERS_END
-
 int InsertTilesCommand::commandId() const noexcept {
 	return static_cast<int>(CommandId::InsertTile);
 }