[ox/std] Fix string append issues

.gitea/workflows/build.yaml

@@ -4,7 +4,7 @@ on: [push]
 
 jobs:
   build:
-    runs-on: olympic
+    runs-on: nostalgia
     steps:
       - name: Check out repository code
         uses: actions/checkout@v3
@@ -17,10 +17,3 @@ jobs:
       - run: make purge configure-release
       - run: make build
       - run: make test
-      - run: make install
-      - run: mv dist/linux-x86_64-release nostalgia-linux-x86_64
-      - run: tar cf nostalgia-linux-x86_64.tar nostalgia-linux-x86_64
-      - uses: actions/upload-artifact@v3
-        with:
-          name: nostalgia-linux-x86_64
-          path: nostalgia-linux-x86_64.tar

.gitignore

@@ -6,7 +6,7 @@
 .mypy_cache
 .stfolder
 .stignore
-util/scripts/__pycache__
+scripts/__pycache__
 pyenv
 CMakeLists.txt.user
 ROM.oxfs

Dockerfile

@@ -1,4 +1,4 @@
-FROM fedora:41
+FROM fedora:36
 
 RUN dnf update -y
 

Makefile

@@ -1,31 +1,26 @@
 BC_VAR_PROJECT_NAME=nostalgia
 BC_VAR_PROJECT_NAME_CAP=Nostalgia
-BC_VAR_DEVENV_ROOT=util
 BUILDCORE_PATH=deps/buildcore
 include ${BUILDCORE_PATH}/base.mk
 
 ifeq ($(BC_VAR_OS),darwin)
-	PROJECT_STUDIO=./build/${BC_VAR_CURRENT_BUILD}/bin/${BC_VAR_PROJECT_NAME_CAP}Studio.app/Contents/MacOS/${BC_VAR_PROJECT_NAME_CAP}Studio
+	NOSTALGIA_STUDIO=./build/${BC_VAR_CURRENT_BUILD}/bin/${BC_VAR_PROJECT_NAME_CAP}Studio.app/Contents/MacOS/${BC_VAR_PROJECT_NAME_CAP}Studio
 	MGBA=/Applications/mGBA.app/Contents/MacOS/mGBA
 else
-	PROJECT_STUDIO=./build/${BC_VAR_CURRENT_BUILD}/bin/${BC_VAR_PROJECT_NAME_CAP}Studio
+	NOSTALGIA_STUDIO=./build/${BC_VAR_CURRENT_BUILD}/bin/${BC_VAR_PROJECT_NAME_CAP}Studio
 	MGBA=mgba-qt
 endif
-PROJECT_PLAYER=./build/${BC_VAR_CURRENT_BUILD}/bin/${BC_VAR_PROJECT_NAME_CAP}
 
 .PHONY: pkg-gba
 pkg-gba: build
-	${BC_CMD_ENVRUN} ${BC_PY3} ./util/scripts/pkg-gba.py sample_project ${BC_VAR_PROJECT_NAME}
+	${BC_CMD_ENVRUN} ${BC_PY3} ./scripts/pkg-gba.py sample_project ${BC_VAR_PROJECT_NAME}
 
-.PHONY: build-player
-build-player:
-	${BC_CMD_CMAKE_BUILD} ${BC_VAR_BUILD_PATH} ${BC_VAR_PROJECT_NAME_CAP}
 .PHONY: run
-run: build-player
+run: build
-	${PROJECT_PLAYER} sample_project
+	./build/${BC_VAR_CURRENT_BUILD}/bin/${BC_VAR_PROJECT_NAME} sample_project
 .PHONY: run-studio
 run-studio: build
-	${PROJECT_STUDIO}
+	${NOSTALGIA_STUDIO}
 .PHONY: gba-run
 gba-run: pkg-gba
 	${MGBA} ${BC_VAR_PROJECT_NAME}.gba
@@ -34,7 +29,7 @@ debug: build
 	${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}
+	${BC_CMD_HOST_DEBUGGER} ${NOSTALGIA_STUDIO}
 
 .PHONY: configure-gba
 configure-gba:

deps/buildcore/base.mk

@@ -93,7 +93,7 @@ purge:
 	${BC_CMD_RM_RF} compile_commands.json
 .PHONY: test
 test: build
-	${BC_CMD_ENVRUN} ${BC_CMD_PY3} -m mypy ${BC_VAR_SCRIPTS}
+	${BC_CMD_ENVRUN} mypy ${BC_VAR_SCRIPTS}
 	${BC_CMD_CMAKE_BUILD} ${BC_VAR_BUILD_PATH} test
 .PHONY: test-verbose
 test-verbose: build

deps/buildcore/scripts/file-to-cpp.py

@@ -1,30 +0,0 @@
-#! /usr/bin/env python3
-
-#
-#  Copyright 2016 - 2025 gary@drinkingtea.net
-#
-#  This Source Code Form is subject to the terms of the Mozilla Public
-#  License, v. 2.0. If a copy of the MPL was not distributed with this
-#  file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-
-import argparse
-import sys
-
-
-def main() -> int:
-    parser = argparse.ArgumentParser()
-    parser.add_argument('--file', help='path to file')
-    parser.add_argument('--out-cpp', help='path to output cpp file')
-    parser.add_argument('--out-hpp', help='path to output hpp file')
-    parser.add_argument('--namespace', help='path to output hpp file')
-    args = parser.parse_args()
-    return 0
-
-
-if __name__ == '__main__':
-    try:
-        err = main()
-        sys.exit(err)
-    except KeyboardInterrupt:
-        sys.exit(1)

deps/buildcore/scripts/util.py

@@ -35,6 +35,4 @@ def get_arch() -> str:
     arch = platform.machine().lower()
     if arch == 'amd64':
         arch = 'x86_64'
-    elif arch == 'aarch64':
-        arch = 'arm64'
     return arch

deps/gbabuildcore/base.cmake

@@ -1,8 +1,8 @@
 list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR}/cmake/modules)
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -nostdlib")
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -nostdinc++")
-#set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-unwind-tables")
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-unwind-tables")
-#set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-exceptions")
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-exceptions")
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-rtti")
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-strict-aliasing")
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mthumb-interwork")

deps/glad/CMakeLists.txt

@@ -1,11 +1,2 @@
-add_library(glad src/glad.c)
+add_library(glad OBJECT src/glad.c)
-
+target_include_directories(glad PUBLIC include)
-target_include_directories(glad PUBLIC include)
-
-install(
-	TARGETS
-		glad
-	DESTINATION
-		LIBRARY DESTINATION lib
-		ARCHIVE DESTINATION lib
-)

deps/imgui/CMakeLists.txt

@@ -6,7 +6,7 @@ endif()
 # DrinkingTea: end
 
 add_library(
-	imgui
+	imgui OBJECT
 		imgui.cpp
 		imgui_demo.cpp
 		imgui_draw.cpp
@@ -19,12 +19,4 @@ add_library(
 target_include_directories(
 	imgui SYSTEM PUBLIC
 		.
-)
+)
-
-install(
-	TARGETS
-		imgui
-	DESTINATION
-		LIBRARY DESTINATION lib
-		ARCHIVE DESTINATION lib
-)

deps/nfde/CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.19)
+cmake_minimum_required(VERSION 3.5)
 project(nativefiledialog-extended VERSION 1.1.1)
 
 set(nfd_ROOT_PROJECT OFF)

deps/ox/deps/jsoncpp/CMakeLists.txt

@@ -12,7 +12,7 @@
 # CMake versions greater than the JSONCPP_NEWEST_VALIDATED_POLICIES_VERSION policies will
 # continue to generate policy warnings "CMake Warning (dev)...Policy CMP0XXX is not set:"
 #
-set(JSONCPP_OLDEST_VALIDATED_POLICIES_VERSION "3.13.2")
+set(JSONCPP_OLDEST_VALIDATED_POLICIES_VERSION "3.8.0")
 set(JSONCPP_NEWEST_VALIDATED_POLICIES_VERSION "3.13.2")
 cmake_minimum_required(VERSION ${JSONCPP_OLDEST_VALIDATED_POLICIES_VERSION})
 if("${CMAKE_VERSION}" VERSION_LESS "${JSONCPP_NEWEST_VALIDATED_POLICIES_VERSION}")

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

@@ -143,11 +143,6 @@ class Signal {
 
 		Error disconnectObject(const void *receiver) const noexcept;
 
-		[[nodiscard]]
-		size_t connectionCnt() const noexcept {
-			return m_slots.size();
-		}
-
 		void emit(Args... args) const;
 
 		Error emitCheckError(Args... args) const noexcept;
@@ -220,7 +215,7 @@ Error Signal<Args...>::emitCheckError(Args... args) const noexcept {
 		}
 		return ox::Error(0);
 	} catch (const ox::Exception &ex) {
-		return ox::Error(ex.errCode, ex.msg, ex.src);
+		return ox::Error(ex.file, ex.line, ex.errCode, ex.msg);
 	}
 }
 
@@ -324,11 +319,6 @@ class Signal<Error(Args...)> {
 
 		Error disconnectObject(const void *receiver) const noexcept;
 
-		[[nodiscard]]
-		size_t connectionCnt() const noexcept {
-			return m_slots.size();
-		}
-
 		void emit(Args... args) const noexcept;
 
 		Error emitCheckError(Args... args) const noexcept;

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

@@ -37,30 +37,6 @@ Error FileSystem::read(const FileAddress &addr, void *buffer, std::size_t size)
 	}
 }
 
-Result<Buffer> FileSystem::read(FileAddress const &addr, size_t const size) noexcept {
-	Result<Buffer> out;
-	out.value.resize(size);
-	switch (addr.type()) {
-		case FileAddressType::Inode:
-			OX_RETURN_ERROR(readFileInode(addr.getInode().value, out.value.data(), size));
-			break;
-		case FileAddressType::ConstPath:
-		case FileAddressType::Path:
-			OX_RETURN_ERROR(readFilePath(StringView{addr.getPath().value}, out.value.data(), size));
-			break;
-		default:
-			return ox::Error{1};
-	}
-	return out;
-}
-
-Result<Buffer> FileSystem::read(StringViewCR path, size_t const size) noexcept {
-	Result<Buffer> out;
-	out.value.resize(size);
-	OX_RETURN_ERROR(readFilePath(path, out.value.data(), size));
-	return out;
-}
-
 Result<Buffer> FileSystem::read(const FileAddress &addr) noexcept {
 	OX_REQUIRE(s, stat(addr));
 	Buffer buff(static_cast<std::size_t>(s.size));
@@ -75,31 +51,28 @@ Result<Buffer> FileSystem::read(StringViewCR path) noexcept {
 	return buff;
 }
 
-Error FileSystem::read(
+Error FileSystem::read(const FileAddress &addr, std::size_t readStart, std::size_t readSize, void *buffer, std::size_t *size) noexcept {
-		FileAddress const &addr,
-		std::size_t const readStart,
-		std::size_t const readSize,
-		void *buffer,
-		std::size_t *size) noexcept {
 	switch (addr.type()) {
 		case FileAddressType::Inode:
-			return readFileInodeRange(addr.getInode().value, readStart, readSize, buffer, size);
+			return read(addr.getInode().value, readStart, readSize, buffer, size);
 		case FileAddressType::ConstPath:
 		case FileAddressType::Path:
-			return readFilePathRange(addr.getPath().value, readStart, readSize, buffer, size);
+			return ox::Error(2, "Unsupported for path lookups");
 		default:
 			return ox::Error(1);
 	}
 }
 
-Result<size_t> FileSystem::read(
+Error FileSystem::remove(const FileAddress &addr, bool recursive) noexcept {
-		StringViewCR path,
+	switch (addr.type()) {
-		std::size_t const readStart,
+		case FileAddressType::Inode:
-		std::size_t const readSize,
+			return remove(addr.getInode().value, recursive);
-		Span<char> buff) noexcept {
+		case FileAddressType::ConstPath:
-	size_t szOut{buff.size()};
+		case FileAddressType::Path:
-	OX_RETURN_ERROR(readFilePathRange(path, readStart, readSize, buff.data(), &szOut));
+			return remove(StringView(addr.getPath().value), recursive);
-	return szOut;
+		default:
+			return ox::Error(1);
+	}
 }
 
 Error FileSystem::write(const FileAddress &addr, const void *buffer, uint64_t size, FileType fileType) noexcept {

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

@@ -41,10 +41,6 @@ class FileSystem {
 
 		Error read(const FileAddress &addr, void *buffer, std::size_t size) noexcept;
 
-		Result<Buffer> read(FileAddress const &addr, size_t size) noexcept;
-
-		Result<Buffer> read(StringViewCR path, size_t size) noexcept;
-
 		Result<Buffer> read(const FileAddress &addr) noexcept;
 
 		Result<Buffer> read(StringViewCR path) noexcept;
@@ -57,30 +53,13 @@ class FileSystem {
 			return readFileInode(inode, buffer, buffSize);
 		}
 
-		Error read(
+		Error read(const FileAddress &addr, std::size_t readStart, std::size_t readSize, void *buffer, std::size_t *size) noexcept;
-			FileAddress const &addr,
-			size_t readStart,
-			size_t readSize,
-			void *buffer,
-			size_t *size) noexcept;
-
-		/**
-		 *
-		 * @param path
-		 * @param readStart
-		 * @param readSize
-		 * @param buffer
-		 * @param size
-		 * @return error or number of bytes read
-		 */
-		Result<size_t> read(
-			StringViewCR path, size_t readStart, size_t readSize, ox::Span<char> buff) noexcept;
 
 		virtual Result<Vector<String>> ls(StringViewCR dir) const noexcept = 0;
 
-		Error remove(StringViewCR path, bool recursive = false) noexcept {
+		virtual Error remove(StringViewCR path, bool recursive) noexcept = 0;
-			return removePath(path, recursive);
+
-		}
+		Error remove(const FileAddress &addr, bool recursive = false) noexcept;
 
 		virtual Error resize(uint64_t size, void *buffer) noexcept = 0;
 
@@ -161,12 +140,7 @@ class FileSystem {
 
 		virtual Error readFileInode(uint64_t inode, void *buffer, std::size_t size) noexcept = 0;
 
-		virtual Error readFilePathRange(
+		virtual Error readFileInodeRange(uint64_t inode, std::size_t readStart, std::size_t readSize, void *buffer, std::size_t *size) noexcept = 0;
-			StringViewCR path, size_t readStart, size_t readSize, void *buffer, size_t *buffSize) noexcept = 0;
-
-		virtual Error readFileInodeRange(uint64_t inode, size_t readStart, size_t readSize, void *buffer, size_t *size) noexcept = 0;
-
-		virtual Error removePath(StringViewCR path, bool recursive) noexcept = 0;
 
 		virtual Error writeFilePath(StringViewCR path, const void *buffer, uint64_t size, FileType fileType) noexcept = 0;
 
@@ -235,11 +209,6 @@ class FileSystemTemplate: public MemFS {
 
 		Error readFileInodeRange(uint64_t inode, std::size_t readStart, std::size_t readSize, void *buffer, std::size_t *size) noexcept override;
 
-		Error readFilePathRange(
-			StringViewCR path, size_t readStart, size_t readSize, void *buffer, size_t *buffSize) noexcept override;
-
-		Error removePath(StringViewCR path, bool recursive) noexcept override;
-
 		Result<const char*> directAccessInode(uint64_t) const noexcept override;
 
 		Result<Vector<String>> ls(StringViewCR dir) const noexcept override;
@@ -247,6 +216,8 @@ class FileSystemTemplate: public MemFS {
 		template<typename F>
 		Error ls(StringViewCR path, F cb) const;
 
+		Error remove(StringViewCR path, bool recursive) noexcept override;
+
 		/**
 		 * Resizes FileSystem to minimum possible size.
 		 */
@@ -385,32 +356,6 @@ Error FileSystemTemplate<FileStore, Directory>::readFileInodeRange(uint64_t inod
 	return m_fs.read(inode, readStart, readSize, reinterpret_cast<uint8_t*>(buffer), size);
 }
 
-template<typename FileStore, typename Directory>
-Error FileSystemTemplate<FileStore, Directory>::readFilePathRange(
-	StringViewCR path, size_t readStart, size_t readSize, void *buffer, size_t *buffSize) noexcept {
-	OX_REQUIRE(s, stat(path));
-	return readFileInodeRange(s.inode, readStart, readSize, buffer, buffSize);
-}
-
-template<typename FileStore, typename Directory>
-Error FileSystemTemplate<FileStore, Directory>::removePath(StringViewCR path, bool recursive) noexcept {
-	OX_REQUIRE(fd, fileSystemData());
-	Directory rootDir(m_fs, fd.rootDirInode);
-	OX_REQUIRE(inode, rootDir.find(path));
-	OX_REQUIRE(st, statInode(inode));
-	if (st.fileType == FileType::NormalFile || recursive) {
-		if (auto err = rootDir.remove(path)) {
-			// removal failed, try putting the index back
-			oxLogError(rootDir.write(path, inode));
-			return err;
-		}
-	} else {
-		oxTrace("FileSystemTemplate.remove.fail", "Tried to remove directory without recursive setting.");
-		return ox::Error(1);
-	}
-	return ox::Error(0);
-}
-
 template<typename FileStore, typename Directory>
 Result<const char*> FileSystemTemplate<FileStore, Directory>::directAccessInode(uint64_t inode) const noexcept {
 	auto data = m_fs.read(inode);
@@ -439,6 +384,25 @@ Error FileSystemTemplate<FileStore, Directory>::ls(StringViewCR path, F cb) cons
 	return dir.ls(cb);
 }
 
+template<typename FileStore, typename Directory>
+Error FileSystemTemplate<FileStore, Directory>::remove(StringViewCR path, bool recursive) noexcept {
+	OX_REQUIRE(fd, fileSystemData());
+	Directory rootDir(m_fs, fd.rootDirInode);
+	OX_REQUIRE(inode, rootDir.find(path));
+	OX_REQUIRE(st, statInode(inode));
+	if (st.fileType == FileType::NormalFile || recursive) {
+		if (auto err = rootDir.remove(path)) {
+			// removal failed, try putting the index back
+			oxLogError(rootDir.write(path, inode));
+			return err;
+		}
+	} else {
+		oxTrace("FileSystemTemplate.remove.fail", "Tried to remove directory without recursive setting.");
+		return ox::Error(1);
+	}
+	return ox::Error(0);
+}
+
 template<typename FileStore, typename Directory>
 Error FileSystemTemplate<FileStore, Directory>::resize() noexcept {
 	return m_fs.resize();

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

@@ -75,6 +75,14 @@ Result<Vector<String>> PassThroughFS::ls(StringViewCR dir) const noexcept {
 	return out;
 }
 
+Error PassThroughFS::remove(StringViewCR path, bool recursive) noexcept {
+	if (recursive) {
+		return ox::Error(std::filesystem::remove_all(m_path / stripSlash(path)) != 0);
+	} else {
+		return ox::Error(std::filesystem::remove(m_path / stripSlash(path)) != 0);
+	}
+}
+
 Error PassThroughFS::resize(uint64_t, void*) noexcept {
 	// unsupported
 	return ox::Error(1, "resize is not supported by PassThroughFS");
@@ -93,9 +101,7 @@ Result<FileStat> PassThroughFS::statPath(StringViewCR path) const noexcept {
 	oxTracef("ox.fs.PassThroughFS.statInode", "{} {}", ec.message(), path);
 	const uint64_t size = type == FileType::Directory ? 0 : std::filesystem::file_size(p, ec);
 	oxTracef("ox.fs.PassThroughFS.statInode.size", "{} {}", path, size);
-	if (auto err = ec.value()) {
+	OX_RETURN_ERROR(ox::Error(static_cast<ox::ErrorCode>(ec.value()), "PassThroughFS: stat failed"));
-		return ox::Error{static_cast<ox::ErrorCode>(err), "PassThroughFS: stat failed"};
-	}
 	return FileStat{0, 0, size, type};
 }
 
@@ -156,38 +162,11 @@ Error PassThroughFS::readFileInode(uint64_t, void*, std::size_t) noexcept {
 	return ox::Error(1, "readFileInode(uint64_t, void*, std::size_t) is not supported by PassThroughFS");
 }
 
-Error PassThroughFS::readFilePathRange(
-	StringViewCR path, size_t const readStart, size_t readSize, void *buffer, size_t *buffSize) noexcept {
-	try {
-		std::ifstream file(m_path / stripSlash(path), std::ios::binary | std::ios::ate);
-		auto const size = static_cast<size_t>(file.tellg());
-		readSize = ox::min(readSize, size);
-		file.seekg(static_cast<off_t>(readStart), std::ios::beg);
-		if (readSize > *buffSize) {
-			oxTracef("ox.fs.PassThroughFS.read.error", "Read failed: Buffer too small: {}", path);
-			return ox::Error{1};
-		}
-		file.read(static_cast<char*>(buffer), static_cast<std::streamsize>(readSize));
-		return {};
-	} catch (std::fstream::failure const &f) {
-		oxTracef("ox.fs.PassThroughFS.read.error", "Read of {} failed: {}", path, f.what());
-		return ox::Error{2};
-	}
-}
-
 Error PassThroughFS::readFileInodeRange(uint64_t, std::size_t, std::size_t, void*, std::size_t*) noexcept {
 	// unsupported
 	return ox::Error(1, "read(uint64_t, std::size_t, std::size_t, void*, std::size_t*) is not supported by PassThroughFS");
 }
 
-Error PassThroughFS::removePath(StringViewCR path, bool const recursive) noexcept {
-	if (recursive) {
-		return ox::Error{std::filesystem::remove_all(m_path / stripSlash(path)) == 0};
-	} else {
-		return ox::Error{!std::filesystem::remove(m_path / stripSlash(path))};
-	}
-}
-
 Error PassThroughFS::writeFilePath(StringViewCR path, const void *buffer, uint64_t size, FileType) noexcept {
 	const auto p = (m_path / stripSlash(path));
 	try {
@@ -206,7 +185,8 @@ Error PassThroughFS::writeFileInode(uint64_t, const void*, uint64_t, FileType) n
 }
 
 std::string_view PassThroughFS::stripSlash(StringView path) noexcept {
-	for (auto i = 0u; i < path.len() && path[0] == '/'; i++) {
+	const auto pathLen = ox::strlen(path);
+	for (auto i = 0u; i < pathLen && path[0] == '/'; i++) {
 		path = substr(path, 1);
 	}
 	return {path.data(), path.bytes()};

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

@@ -45,6 +45,8 @@ class PassThroughFS: public FileSystem {
 		template<typename F>
 		Error ls(StringViewCR dir, F cb) const noexcept;
 
+		Error remove(StringViewCR path, bool recursive) noexcept override;
+
 		Error resize(uint64_t size, void *buffer) noexcept override;
 
 		Result<FileStat> statInode(uint64_t inode) const noexcept override;
@@ -71,13 +73,8 @@ class PassThroughFS: public FileSystem {
 
 		Error readFileInode(uint64_t inode, void *buffer, std::size_t size) noexcept override;
 
-		Error readFilePathRange(
-			StringViewCR path, size_t readStart, size_t readSize, void *buffer, size_t *buffSize) noexcept override;
-
 		Error readFileInodeRange(uint64_t inode, std::size_t readStart, std::size_t readSize, void *buffer, std::size_t *size) noexcept override;
 
-		Error removePath(StringViewCR path, bool recursive) noexcept override;
-
 		Error writeFilePath(StringViewCR path, const void *buffer, uint64_t size, FileType fileType) noexcept override;
 
 		Error writeFileInode(uint64_t inode, const void *buffer, uint64_t size, FileType fileType) noexcept override;

deps/ox/src/ox/logconn/def.hpp

@@ -14,7 +14,7 @@
     { \
 		const auto loggerErr = (loggerName).initConn(appName); \
 		if (loggerErr) { \
-			oxErrf("Could not connect to logger: {} ({}:{})\n", toStr(loggerErr), loggerErr.src.file_name(), loggerErr.src.line()); \
+			oxErrf("Could not connect to logger: {} ({}:{})\n", toStr(loggerErr), loggerErr.file, loggerErr.line); \
 		} else { \
 			ox::trace::setLogger(&(loggerName)); \
 		} \

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

@@ -140,16 +140,16 @@ constexpr Str getModelTypeName() noexcept {
 	return out;
 }
 
-template<typename T, typename Str = const char*>
+template<typename T>
 [[nodiscard]]
 consteval auto requireModelTypeName() noexcept {
-	constexpr auto name = getModelTypeName<T, Str>();
+	constexpr auto name = getModelTypeName<T>();
 	static_assert(ox::StringView{name}.len(), "Type lacks required TypeName");
 	return name;
 }
 
 template<typename T, typename Str = const char*>
-constexpr auto ModelTypeName_v = requireModelTypeName<T, Str>();
+constexpr auto ModelTypeName_v = getModelTypeName<T, Str>();
 
 template<typename T, typename Str = const char*>
 constexpr auto ModelTypeVersion_v = requireModelTypeVersion<T>();

deps/ox/src/ox/model/typestore.hpp

@@ -58,11 +58,7 @@ class TypeStore {
 				if (!std::is_constant_evaluated()) {
 					OX_REQUIRE_M(dt, loadDescriptor(typeId));
 					for (auto &f : dt->fieldList) {
-						if (typeId == f.typeId) {
+						OX_RETURN_ERROR(this->getLoad(f.typeId).moveTo(f.type));
-							f.type = dt.get();
-						} else {
-							OX_RETURN_ERROR(this->getLoad(f.typeId).moveTo(f.type));
-						}
 					}
 					auto &out = m_cache[typeId];
 					out = std::move(dt);

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

@@ -144,11 +144,7 @@ Error OrganicClawReader::field(const char *key, T *val) noexcept {
 				if (jv.empty()) {
 					*val = 0;
 				} else if (rightType) {
-					if constexpr(ox::is_signed_v<T>) {
+					*val = static_cast<T>(jv.asUInt());
-						*val = static_cast<T>(jv.asInt64());
-					} else {
-						*val = static_cast<T>(jv.asUInt64());
-					}
 				} else {
 					err = ox::Error(1, "Type mismatch");
 				}
@@ -176,8 +172,7 @@ Error OrganicClawReader::field(const char *key, T *val) noexcept {
 				err = ox::Error(1, "Type mismatch");
 			}
 		}
-	} catch (Json::LogicError const&e) {
+	} catch (Json::LogicError const&) {
-		oxDebugf("JSON error: {}", e.what());
 		err = ox::Error(1, "error reading JSON data");
 	}
 	++m_fieldIt;

deps/ox/src/ox/std/algorithm.hpp

@@ -9,25 +9,13 @@
 #pragma once
 
 #include "def.hpp"
-#include "error.hpp"
 
 OX_CLANG_NOWARN_BEGIN(-Wunsafe-buffer-usage)
 
 namespace ox {
 
 template<typename It, typename T>
-constexpr ox::Result<size_t> findIdx(It begin, It end, T const&value) {
+constexpr It find(It begin, It end, const T &value) {
-	auto it = begin;
-	for (; it != end; ++it) {
-		if (*it == value) {
-			return it.offset();
-		}
-	}
-	return ox::Error{1, "item not found"};
-}
-
-template<typename It, typename T>
-constexpr It find(It begin, It end, T const&value) {
 	for (; begin != end; ++begin) {
 		if (*begin == value) {
 			return begin;

deps/ox/src/ox/std/anyptr.hpp

@@ -15,22 +15,18 @@
 
 namespace ox {
 
-namespace detail {
+class AnyPtr {
-
-template<bool unique>
-class AnyPtrT {
 	private:
 		struct WrapBase {
 			virtual constexpr ~WrapBase() = default;
 			virtual constexpr WrapBase *copyTo(ox::Span<char> s) noexcept = 0;
 			virtual constexpr operator bool() const noexcept = 0;
-			virtual void free() noexcept = 0;
 		};
 
 		template<typename T>
-		struct Wrap final: WrapBase {
+		struct Wrap: public WrapBase {
 			T *data{};
-			explicit constexpr Wrap(T *pData) noexcept: data(pData) {
+			constexpr Wrap(T *pData) noexcept: data(pData) {
 			}
 			constexpr WrapBase *copyTo(ox::Span<char> s) noexcept override {
 				oxAssert(s.size() >= sizeof(Wrap), "too small buffer");
@@ -43,60 +39,39 @@ class AnyPtrT {
 			constexpr operator bool() const noexcept override {
 				return data != nullptr;
 			}
-			constexpr void free() noexcept override {
-				safeDelete(data);
-				data = {};
-			}
 		};
 
 		WrapBase *m_wrapPtr{};
 		ox::Array<char, sizeof(Wrap<void*>)> m_wrapData;
 
 	public:
-		constexpr AnyPtrT() noexcept = default;
+		constexpr AnyPtr() noexcept = default;
 
 		template<typename T>
-		constexpr AnyPtrT(T *ptr) noexcept {
+		constexpr AnyPtr(T *ptr) noexcept {
 			if (std::is_constant_evaluated()) {
-				m_wrapPtr = new Wrap<T>(ptr);
+				m_wrapPtr = new Wrap(ptr);
 			} else {
-				m_wrapPtr = new(m_wrapData.data()) Wrap<T>(ptr);
+				m_wrapPtr = new(m_wrapData.data()) Wrap(ptr);
 			}
 		}
 
-		constexpr AnyPtrT(AnyPtrT const&other) noexcept requires(!unique) {
+		constexpr AnyPtr(AnyPtr const&other) noexcept {
 			if (other) {
 				m_wrapPtr = other.m_wrapPtr->copyTo(m_wrapData);
 			}
 		}
 
-		constexpr AnyPtrT(AnyPtrT &&other) noexcept {
+		constexpr ~AnyPtr() noexcept {
-			if (other) {
-				m_wrapPtr = other.m_wrapPtr->copyTo(m_wrapData);
-				if (std::is_constant_evaluated()) {
-					ox::safeDelete(m_wrapPtr);
-				}
-				other.m_wrapPtr = {};
-			}
-		}
-
-		constexpr ~AnyPtrT() noexcept {
-			if constexpr(unique) {
-				free();
-			}
 			if (std::is_constant_evaluated()) {
 				ox::safeDelete(m_wrapPtr);
 			}
 		}
 
 		template<typename T>
-		constexpr AnyPtrT &operator=(T *ptr) noexcept {
+		constexpr AnyPtr &operator=(T *ptr) noexcept {
-			if constexpr(unique) {
-				free();
-			} else if (std::is_constant_evaluated()) {
-				ox::safeDelete(m_wrapPtr);
-			}
 			if (std::is_constant_evaluated()) {
+				ox::safeDelete(m_wrapPtr);
 				m_wrapPtr = new Wrap(ptr);
 			} else {
 				m_wrapPtr = new(m_wrapData.data()) Wrap(ptr);
@@ -104,33 +79,11 @@ class AnyPtrT {
 			return *this;
 		}
 
-		constexpr AnyPtrT &operator=(AnyPtrT const&ptr) noexcept requires(!unique) {
+		constexpr AnyPtr &operator=(AnyPtr const&ptr) noexcept {
 			if (this != &ptr) {
-				if (std::is_constant_evaluated()) {
-					ox::safeDelete(m_wrapPtr);
-				}
 				if (ptr) {
-					m_wrapPtr = ptr.m_wrapPtr->copyTo(m_wrapData);
-				} else {
-					m_wrapPtr = nullptr;
-				}
-			}
-			return *this;
-		}
-
-		constexpr AnyPtrT &operator=(AnyPtrT &&ptr) noexcept {
-			if (this != &ptr) {
-				if constexpr(unique) {
-					free();
-				} else if (std::is_constant_evaluated()) {
 					ox::safeDelete(m_wrapPtr);
-				}
-				if (ptr) {
 					m_wrapPtr = ptr.m_wrapPtr->copyTo(m_wrapData);
-					if (std::is_constant_evaluated()) {
-						ox::safeDelete(ptr.m_wrapPtr);
-						ptr.m_wrapPtr = nullptr;
-					}
 				} else {
 					m_wrapPtr = nullptr;
 				}
@@ -142,16 +95,6 @@ class AnyPtrT {
 			return m_wrapPtr && *m_wrapPtr;
 		}
 
-		constexpr void free() noexcept {
-			if (m_wrapPtr) {
-				m_wrapPtr->free();
-			}
-			if (std::is_constant_evaluated()) {
-				ox::safeDelete(m_wrapPtr);
-			}
-			m_wrapPtr = nullptr;
-		}
-
 		template<typename T>
 		[[nodiscard]]
 		constexpr T *get() const noexcept {
@@ -161,12 +104,6 @@ class AnyPtrT {
 			return dynamic_cast<Wrap<T>*>(m_wrapPtr)->data;
 #endif
 		}
-
 };
 
-}
-
-using AnyPtr = detail::AnyPtrT<false>;
-using UAnyPtr = detail::AnyPtrT<true>;
-
 }

deps/ox/src/ox/std/array.hpp

@@ -181,13 +181,13 @@ constexpr Array<T, ArraySize> &Array<T, ArraySize>::operator=(Array &&other) noe
 
 template<typename T, std::size_t ArraySize>
 constexpr T &Array<T, ArraySize>::operator[](std::size_t i) noexcept {
-	boundsCheck(__FILE__, __LINE__, i, size(), "Array access overflow");
+	ox::primitiveAssert(__FILE__, __LINE__, i < size(), "Array access overflow");
 	return m_items[i];
 }
 
 template<typename T, std::size_t ArraySize>
 constexpr const T &Array<T, ArraySize>::operator[](std::size_t i) const noexcept {
-	boundsCheck(__FILE__, __LINE__, i, size(), "Array access overflow");
+	ox::primitiveAssert(__FILE__, __LINE__, i < size(), "Array access overflow");
 	return m_items[i];
 }
 

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

@@ -7,7 +7,6 @@
  */
 
 #include "fmt.hpp"
-#include "realstd.hpp"
 #include "stacktrace.hpp"
 #include "trace.hpp"
 
@@ -15,14 +14,14 @@
 
 namespace ox {
 
-void panic(StringViewCR file, int const line, StringViewCR panicMsg, Error const&err) noexcept {
+void panic(StringViewCR file, int line, StringViewCR panicMsg, const Error &err) noexcept {
 	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) {
+	if (err.file != nullptr) {
-		oxErrf("\tError Location:\t{}:{}\n", err.src.file_name(), err.src.line());
+		oxErrf("\tError Location:\t{}:{}\n", err.file, err.line);
 	}
 #ifdef OX_USE_STDLIB
 	printStackTrace(2);
@@ -33,19 +32,16 @@ void panic(StringViewCR file, int const line, StringViewCR panicMsg, Error const
 #endif
 }
 
-void panic(const char *file, int const line, char const*panicMsg, Error const&err) noexcept {
+void panic(const char *file, int line, const char *panicMsg, const Error &err) noexcept {
 	panic(StringView{file}, line, StringView{panicMsg}, err);
 }
 
-void assertFailFuncRuntime(
+void assertFailFuncRuntime(StringViewCR file, int line, StringViewCR assertTxt, StringViewCR msg) noexcept {
-	StringViewCR file,
-	int const line,
-	StringViewCR assertTxt,
-	StringViewCR msg) noexcept {
 #ifdef OX_USE_STDLIB
-	auto const st = genStackTrace(2);
+	auto output = sfmt("\n\033[31;1;1mASSERT FAILURE:\033[0m [{}:{}]: {}\n", file, line, msg);
-	oxTracef("assert", "Failed assert: {} ({}) [{}:{}]:\n{}", msg, assertTxt, file, line, st);
+	output += genStackTrace(2);
-	abort();
+	oxTracef("assert", "Failed assert: {} ({}) [{}:{}]", msg, assertTxt, file, line);
+	std::abort();
 #else
 	oxErrf("\n\033[31;1;1mASSERT FAILURE:\033[0m [{}:{}]: {}\n", file, line, msg);
 	oxTracef("assert", "Failed assert: {} ({}) [{}:{}]", msg, assertTxt, file, line);
@@ -53,25 +49,20 @@ void assertFailFuncRuntime(
 #endif
 }
 
-void assertFailFuncRuntime(
+void assertFailFuncRuntime(StringViewCR file, int line, [[maybe_unused]] const Error &err, StringViewCR, StringViewCR assertMsg) noexcept {
-	StringViewCR file,
-	int const line,
-	[[maybe_unused]] Error const&err,
-	StringViewCR,
-	StringViewCR assertMsg) noexcept {
 #if defined(OX_USE_STDLIB)
 	auto msg = sfmt("\n\033[31;1;1mASSERT FAILURE:\033[0m [{}:{}]: {}\n", file, line, assertMsg);
 	if (err.msg) {
 		msg += sfmt("\tError Message:\t{}\n", err.msg);
 	}
 	msg += sfmt("\tError Code:\t{}\n", static_cast<ErrorCode>(err));
-	if (err.src.file_name() != nullptr) {
+	if (err.file != nullptr) {
-		msg += sfmt("\tError Location:\t{}:{}\n", err.src.file_name(), err.src.line());
+		msg += sfmt("\tError Location:\t{}:{}\n", err.file, err.line);
 	}
 	msg += genStackTrace(2);
 	oxErr(msg);
 	oxTracef("assert", "Failed assert: {} [{}:{}]", assertMsg, file, line);
-	abort();
+	std::abort();
 #else
 	constexprPanic(file, line, assertMsg);
 #endif

deps/ox/src/ox/std/assert.hpp

@@ -22,15 +22,9 @@
 
 namespace ox {
 
-[[noreturn]]
+void panic(StringViewCR file, int line, StringViewCR panicMsg, const Error &err = ox::Error(0)) noexcept;
-void panic(StringViewCR file, int line, StringViewCR panicMsg, Error const&err = {}) noexcept;
 
-[[noreturn]]
+constexpr void constexprPanic(StringViewCR file, int line, StringViewCR panicMsg, const Error &err = ox::Error(0)) noexcept {
-constexpr void constexprPanic(
-	StringViewCR file,
-	int const line,
-	StringViewCR panicMsg,
-	Error const&err = {}) noexcept {
 	if (!std::is_constant_evaluated()) {
 		panic(file, line, panicMsg, err);
 	} else {
@@ -38,24 +32,10 @@ constexpr void constexprPanic(
 	}
 }
 
-void assertFailFuncRuntime(
+void assertFailFuncRuntime(StringViewCR file, int line, StringViewCR assertTxt, StringViewCR msg) noexcept;
-	StringViewCR file,
+void assertFailFuncRuntime(StringViewCR file, int line, const Error &err, StringViewCR, StringViewCR assertMsg) noexcept;
-	int line,
-	StringViewCR assertTxt,
-	StringViewCR msg) noexcept;
-void assertFailFuncRuntime(
-	StringViewCR file,
-	int line,
-	Error const&err,
-	StringViewCR,
-	StringViewCR assertMsg) noexcept;
 
-constexpr void assertFunc(
+constexpr void assertFunc(StringViewCR file, int line, bool pass, [[maybe_unused]]StringViewCR assertTxt, [[maybe_unused]]StringViewCR msg) noexcept {
-	StringViewCR file,
-	int const line,
-	bool const pass,
-	[[maybe_unused]]StringViewCR assertTxt,
-	[[maybe_unused]]StringViewCR msg) noexcept {
 	if (!pass) {
 		if (!std::is_constant_evaluated()) {
 			assertFailFuncRuntime(file, line, assertTxt, msg);
@@ -65,12 +45,7 @@ constexpr void assertFunc(
 	}
 }
 
-constexpr void assertFunc(
+constexpr void assertFunc(StringViewCR file, int line, const Error &err, StringViewCR, StringViewCR assertMsg) noexcept {
-	StringViewCR file,
-	int const line,
-	Error const&err,
-	StringViewCR,
-	StringViewCR assertMsg) noexcept {
 	if (err) {
 		if (!std::is_constant_evaluated()) {
 			assertFailFuncRuntime(file, line, err, {}, assertMsg);
@@ -80,11 +55,7 @@ constexpr void assertFunc(
 	}
 }
 
-constexpr void expect(
+constexpr void expect(StringViewCR file, int line, const auto &actual, const auto &expected) noexcept {
-	StringViewCR file,
-	int const line,
-	auto const&actual,
-	auto const&expected) noexcept {
 	if (actual != expected) {
 		 if (!std::is_constant_evaluated()) {
 #if defined(OX_USE_STDLIB)

deps/ox/src/ox/std/defines.hpp

@@ -41,12 +41,6 @@ constexpr auto Debug = true;
 constexpr auto Debug = false;
 #endif
 
-#if defined(OX_CHECK_BOUNDS)
-constexpr auto CheckBounds = true;
-#else
-constexpr auto CheckBounds = Debug;
-#endif
-
 #if defined(NDEBUG)
 constexpr auto NDebug = true;
 #else

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

@@ -36,16 +36,28 @@ using ErrorCode = uint16_t;
 
 
 struct [[nodiscard]] Error {
-	std::source_location src;
 	ox::CString msg = nullptr;
+	ox::CString file = nullptr;
+	uint16_t line = 0;
 	ErrorCode errCode = 0;
 
 	constexpr Error() noexcept = default;
 
+	explicit constexpr Error(
+		ox::CString file,
+		uint32_t const line,
+		ErrorCode const errCode,
+		ox::CString msg = nullptr) noexcept:
+		msg{msg},
+		file{file},
+		line{static_cast<uint16_t>(line)},
+		errCode{errCode} {}
+
 	explicit constexpr Error(
 		ErrorCode const errCode,
 		std::source_location const&src = std::source_location::current()) noexcept:
-		src{src},
+		file{src.file_name()},
+		line{static_cast<uint16_t>(src.line())},
 		errCode{errCode}
 	{}
 
@@ -53,8 +65,9 @@ struct [[nodiscard]] Error {
 		ErrorCode const errCode,
 		ox::CString msg,
 		std::source_location const&src = std::source_location::current()) noexcept:
-		src{src},
 		msg{msg},
+		file{src.file_name()},
+		line{static_cast<uint16_t>(src.line())},
 		errCode{errCode}
 	{}
 
@@ -76,31 +89,42 @@ constexpr auto toStr(Error const&err) noexcept {
 }
 
 struct Exception: public std::exception {
-	std::source_location src;
 	ox::CString msg = nullptr;
+	ox::CString file = nullptr;
+	uint16_t line = 0;
 	ErrorCode errCode = 0;
 
-	explicit Exception(
+	explicit inline Exception(ox::CString file, uint32_t line, ErrorCode errCode, char const*msg = "") noexcept {
+		this->file = file;
+		this->line = static_cast<uint16_t>(line);
+		this->msg = msg;
+		this->errCode = errCode;
+	}
+
+	explicit inline Exception(
 		ErrorCode const errCode,
 		std::source_location const&src = std::source_location::current()) noexcept:
-		src{src},
+		file{src.file_name()},
+		line{static_cast<uint16_t>(src.line())},
 		errCode{errCode} {}
 
-	explicit Exception(
+	explicit inline Exception(
 		ErrorCode const errCode,
 		ox::CString msg,
 		std::source_location const&src = std::source_location::current()) noexcept:
-		src{src},
 		msg{msg},
+		file{src.file_name()},
+		line{static_cast<uint16_t>(src.line())},
 		errCode{errCode} {}
 
-	explicit Exception(Error const&err) noexcept:
+	explicit inline Exception(Error const&err) noexcept:
-		src{err.src},
 		msg{err.msg ? err.msg : ""},
+		file{err.file},
+		line{err.line},
 		errCode{err.errCode} {}
 
 	constexpr Error toError() const noexcept {
-		return Error(errCode, msg, src);
+		return Error(file, line, errCode, msg);
 	}
 
 	[[nodiscard]]
@@ -109,7 +133,6 @@ struct Exception: public std::exception {
 	}
 };
 
-[[noreturn]]
 void panic(char const*file, int line, char const*panicMsg, Error const&err) noexcept;
 
 template<typename T>
@@ -330,17 +353,4 @@ constexpr void primitiveAssert(char const*file, int line, bool pass, char const*
 	}
 }
 
-constexpr void boundsCheck(
-	char const*file,
-	int const line,
-	size_t const i,
-	size_t const sz,
-	char const*msg) noexcept {
-	if constexpr(defines::CheckBounds) {
-		if (i >= sz) [[unlikely]] {
-			panic(file, line, msg, ox::Error{1});
-		}
-	}
-}
-
 }

deps/ox/src/ox/std/hashmap.hpp

@@ -11,7 +11,6 @@
 #include "algorithm.hpp"
 #include "hash.hpp"
 #include "ignore.hpp"
-#include "optional.hpp"
 #include "stringview.hpp"
 #include "strops.hpp"
 #include "vector.hpp"
@@ -27,12 +26,11 @@ class HashMap {
 
 	private:
 		struct Pair {
-			UPtr<Pair> next;
 			K key = {};
 			T value{};
 		};
 		Vector<K> m_keys;
-		Vector<UPtr<Pair>> m_pairs;
+		Vector<Pair*> m_pairs;
 
 	public:
 		explicit constexpr HashMap(std::size_t size = 127);
@@ -75,10 +73,10 @@ class HashMap {
 		constexpr void expand();
 
 		template<typename KK>
-		constexpr UPtr<Pair> const &access(Vector<UPtr<Pair>> const &pairs, KK const &key) const;
+		constexpr Pair *const&access(Vector<Pair*> const&pairs, KK const&key) const;
 
 		template<typename KK>
-		constexpr UPtr<Pair> &access(Vector<UPtr<Pair>> &pairs, KK const &key);
+		constexpr Pair *&access(Vector<Pair*> &pairs, KK const&key);
 
 };
 
@@ -87,13 +85,14 @@ constexpr HashMap<K, T>::HashMap(std::size_t size): m_pairs(size) {
 }
 
 template<typename K, typename T>
-constexpr HashMap<K, T>::HashMap(HashMap const &other) {
+constexpr HashMap<K, T>::HashMap(HashMap<K, T> const&other) {
-	operator=(other);
+	m_pairs = other.m_pairs;
 }
 
 template<typename K, typename T>
-constexpr HashMap<K, T>::HashMap(HashMap &&other) noexcept {
+constexpr HashMap<K, T>::HashMap(HashMap<K, T> &&other) noexcept {
-	operator=(std::move(other));
+	m_keys = std::move(other.m_keys);
+	m_pairs = std::move(other.m_pairs);
 }
 
 template<typename K, typename T>
@@ -102,7 +101,7 @@ constexpr HashMap<K, T>::~HashMap() {
 }
 
 template<typename K, typename T>
-constexpr bool HashMap<K, T>::operator==(HashMap const &other) const {
+constexpr bool HashMap<K, T>::operator==(HashMap const&other) const {
 	if (m_keys != other.m_keys) {
 		return false;
 	}
@@ -116,25 +115,19 @@ constexpr bool HashMap<K, T>::operator==(HashMap const &other) const {
 }
 
 template<typename K, typename T>
-constexpr HashMap<K, T> &HashMap<K, T>::operator=(HashMap const &other) {
+constexpr HashMap<K, T> &HashMap<K, T>::operator=(HashMap<K, T> const&other) {
 	if (this != &other) {
 		clear();
 		m_keys = other.m_keys;
-		m_pairs.resize(other.m_pairs.size());
+		m_pairs = other.m_pairs;
-		for (auto const&k : m_keys) {
-			auto const &src = access(other.m_pairs, k);
-			auto &dst = access(m_pairs, k);
-			dst = ox::make_unique<Pair>();
-			dst->key = src->key;
-			dst->value = src->value;
-		}
 	}
 	return *this;
 }
 
 template<typename K, typename T>
-constexpr HashMap<K, T> &HashMap<K, T>::operator=(HashMap &&other) noexcept {
+constexpr HashMap<K, T> &HashMap<K, T>::operator=(HashMap<K, T> &&other) noexcept {
 	if (this != &other) {
+		clear();
 		m_keys = std::move(other.m_keys);
 		m_pairs = std::move(other.m_pairs);
 	}
@@ -142,52 +135,60 @@ constexpr HashMap<K, T> &HashMap<K, T>::operator=(HashMap &&other) noexcept {
 }
 
 template<typename K, typename T>
-constexpr T &HashMap<K, T>::operator[](MaybeView_t<K> const &key) {
+constexpr T &HashMap<K, T>::operator[](MaybeView_t<K> const&k) {
-	auto p = &access(m_pairs, key);
+	auto p = &access(m_pairs, k);
 	if (*p == nullptr) {
 		if (static_cast<double>(m_pairs.size()) * 0.7 <
 			 static_cast<double>(m_keys.size())) {
 			expand();
-			p = &access(m_pairs, key);
+			p = &access(m_pairs, k);
 		}
-		*p = ox::make_unique<Pair>();
+		*p = new Pair;
-		(*p)->key = key;
+		(*p)->key = k;
-		m_keys.emplace_back(key);
+		m_keys.emplace_back(k);
 	}
 	return (*p)->value;
 }
 
 template<typename K, typename T>
-constexpr Result<T*> HashMap<K, T>::at(MaybeView_t<K> const &key) noexcept {
+constexpr Result<T*> HashMap<K, T>::at(MaybeView_t<K> const&k) noexcept {
-	auto &p = access(m_pairs, key);
+	auto p = access(m_pairs, k);
 	if (!p) {
-		return ox::Error{1, "value not found for given key"};
+		return {nullptr, ox::Error(1, "value not found for given key")};
 	}
 	return &p->value;
 }
 
 template<typename K, typename T>
-constexpr Result<const T*> HashMap<K, T>::at(MaybeView_t<K> const &key) const noexcept {
+constexpr Result<const T*> HashMap<K, T>::at(MaybeView_t<K> const&k) const noexcept {
-	auto &p = access(m_pairs, key);
+	auto p = access(m_pairs, k);
 	if (!p) {
-		return ox::Error{1, "value not found for given key"};
+		return {nullptr, ox::Error(1, "value not found for given key")};
 	}
 	return &p->value;
 }
 
 template<typename K, typename T>
-constexpr void HashMap<K, T>::erase(MaybeView_t<K> const &key) {
+constexpr void HashMap<K, T>::erase(MaybeView_t<K> const&k) {
-	if (!contains(key)) {
+	if (!contains(k)) {
 		return;
 	}
-	auto &c = access(m_pairs, key);
+	auto h = ox::hash<MaybeView_t<K>>{}(k) % m_pairs.size();
-	c = std::move(c->next);
+	while (true) {
-	std::ignore = m_keys.erase(ox::find(m_keys.begin(), m_keys.end(), key));
+		const auto &p = m_pairs[h];
+		if (p == nullptr || p->key == k) {
+			std::ignore = m_pairs.erase(h);
+			break;
+		} else {
+			h = ox::hash<MaybeView_t<K>>{}(k) % m_pairs.size();
+		}
+	}
+	std::ignore = m_keys.erase(ox::find(m_keys.begin(), m_keys.end(), k));
 }
 
 template<typename K, typename T>
-constexpr bool HashMap<K, T>::contains(MaybeView_t<K> const &key) const noexcept {
+constexpr bool HashMap<K, T>::contains(MaybeView_t<K> const&k) const noexcept {
-	return access(m_pairs, key).get() != nullptr;
+	return access(m_pairs, k) != nullptr;
 }
 
 template<typename K, typename T>
@@ -203,26 +204,27 @@ constexpr Vector<K> const&HashMap<K, T>::keys() const noexcept {
 template<typename K, typename T>
 constexpr Vector<T> HashMap<K, T>::values() const noexcept {
 	Vector<T> out;
-	out.reserve(m_keys.size());
+	out.reserve(m_pairs.size());
-	for (auto const &p : m_pairs) {
+	for (auto const&p : m_pairs) {
-		if (out) {
+		out.emplace_back(p->value);
-			out.emplace_back(p->value);
-		}
 	}
 	return out;
 }
 
 template<typename K, typename T>
 constexpr void HashMap<K, T>::clear() {
+	for (std::size_t i = 0; i < m_pairs.size(); i++) {
+		delete m_pairs[i];
+	}
 	m_pairs.clear();
 	m_pairs.resize(127);
 }
 
 template<typename K, typename T>
 constexpr void HashMap<K, T>::expand() {
-	Vector<UPtr<Pair>> r{m_pairs.size() * 2};
+	Vector<Pair*> r(m_pairs.size() * 2);
 	for (std::size_t i = 0; i < m_keys.size(); ++i) {
-		auto const &k = m_keys[i];
+		auto const&k = m_keys[i];
 		access(r, k) = std::move(access(m_pairs, k));
 	}
 	m_pairs = std::move(r);
@@ -230,39 +232,29 @@ constexpr void HashMap<K, T>::expand() {
 
 template<typename K, typename T>
 template<typename KK>
-constexpr UPtr<typename HashMap<K, T>::Pair> const &HashMap<K, T>::access(
+constexpr typename HashMap<K, T>::Pair *const&HashMap<K, T>::access(Vector<Pair*> const&pairs, KK const&k) const {
-		Vector<UPtr<Pair>> const& pairs,
+	auto h = static_cast<std::size_t>(ox::hash<KK>{}(k) % pairs.size());
-		KK const &key) const {
-	auto const h = static_cast<std::size_t>(ox::hash<KK>{}(key) % pairs.size());
-	auto const &p = *pairs.at(h).unwrap();
-	if (p == nullptr || p->key == key) {
-		return p;
-	}
-	auto c = &p->next;
 	while (true) {
-		if (*c == nullptr || (*c)->key == key) {
+		auto const&p = *pairs.at(h).unwrap();
-			return *c;
+		if (p == nullptr || p->key == k) {
+			return p;
+		} else {
+			h = (h + 1) % pairs.size();
 		}
-		c = &(*c)->next;
 	}
 }
 
 template<typename K, typename T>
 template<typename KK>
-constexpr UPtr<typename HashMap<K, T>::Pair> &HashMap<K, T>::access(
+constexpr typename HashMap<K, T>::Pair *&HashMap<K, T>::access(Vector<Pair*> &pairs, KK const&k) {
-		Vector<UPtr<Pair>> &pairs,
+	auto h = static_cast<std::size_t>(ox::hash<KK>{}(k) % pairs.size());
-		KK const &key) {
-	auto const h = static_cast<std::size_t>(ox::hash<KK>{}(key) % pairs.size());
-	auto &p = *pairs.at(h).unwrap();
-	if (p == nullptr || p->key == key) {
-		return p;
-	}
-	auto c = &p->next;
 	while (true) {
-		if (*c == nullptr || (*c)->key == key) {
+		auto &p = *pairs.at(h).unwrap();
-			return *c;
+		if (p == nullptr || p->key == k) {
+			return p;
+		} else {
+			h = (h + 1) % pairs.size();
 		}
-		c = &(*c)->next;
 	}
 }
 

deps/ox/src/ox/std/iterator.hpp

@@ -133,17 +133,17 @@ struct SpanIterator {
 		}
 
 		constexpr PtrType operator->() const noexcept {
-			boundsCheck(__FILE__, __LINE__, m_offset, m_max, "SpanIterator access overflow");
+			ox::primitiveAssert(__FILE__, __LINE__, m_offset < m_max, "SpanIterator access overflow");
 			return &m_t[m_offset];
 		}
 
 		constexpr RefType operator*() const noexcept {
-			boundsCheck(__FILE__, __LINE__, m_offset, m_max, "SpanIterator access overflow");
+			ox::primitiveAssert(__FILE__, __LINE__, m_offset < m_max, "SpanIterator access overflow");
 			return m_t[m_offset];
 		}
 
 		constexpr RefType operator[](std::size_t s) const noexcept {
-			boundsCheck(__FILE__, __LINE__, s, m_max, "SpanIterator access overflow");
+			ox::primitiveAssert(__FILE__, __LINE__, s < m_max, "SpanIterator access overflow");
 			return m_t[s];
 		}
 

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

@@ -260,12 +260,12 @@ constexpr bool operator==(const UniquePtr<T> &p1, const UniquePtr<T> &p2) noexce
 
 template<typename T>
 constexpr bool operator==(const UniquePtr<T> &p1, std::nullptr_t) noexcept {
-	return p1.get() == nullptr;
+	return p1.get();
 }
 
 template<typename T>
 constexpr bool operator==(std::nullptr_t, const UniquePtr<T> &p2) noexcept {
-	return p2.get() == nullptr;
+	return p2.get();
 }
 
 

deps/ox/src/ox/std/reader.hpp

@@ -31,6 +31,7 @@ concept Reader_c = requires(T v) {
 class Reader_v {
 	public:
 		virtual constexpr ~Reader_v() noexcept = default;
+		[[nodiscard]]
 		virtual constexpr ox::Result<char> peek() const noexcept = 0;
 		virtual constexpr ox::Result<std::size_t> read(char*, std::size_t) noexcept = 0;
 		virtual constexpr ox::Result<std::size_t> tellg() noexcept = 0;

deps/ox/src/ox/std/realstd.hpp

@@ -12,13 +12,4 @@
 #include <cassert>
 #else
 #define	assert(e) while (!(e));
-#endif
-
-#if __has_include(<cstdlib>)
-#include <cstdlib>
-#else
-extern "C" {
-[[noreturn]]
-void abort();
-}
 #endif

deps/ox/src/ox/std/smallmap.hpp

@@ -62,9 +62,6 @@ class SmallMap {
 		[[nodiscard]]
 		constexpr Vector<K> keys() const noexcept;
 
-		[[nodiscard]]
-		constexpr Vector<T> values() const noexcept;
-
 		[[nodiscard]]
 		constexpr K const&key(size_t i) const noexcept;
 
@@ -85,22 +82,14 @@ class SmallMap {
 			return m_pairs;
 		}
 
-		[[nodiscard]]
-		constexpr ox::Span<Pair> pairs() noexcept {
-			return m_pairs;
-		}
-
 		constexpr void clear();
 
 	private:
 		template<typename KK>
-		constexpr Pair const*access(PairVector const&pairs, KK const&key, bool &isNew) const;
+		constexpr Pair const&access(PairVector const&pairs, KK const&key, bool &isNew) const;
 
 		template<typename KK>
-		constexpr Pair *access(PairVector &pairs, KK const&key, bool &isNew);
+		constexpr Pair &access(PairVector &pairs, KK const&key, bool &isNew);
-
-		template<typename KK>
-		constexpr Pair *accessNoCreate(PairVector &pairs, KK const&key);
 
 };
 
@@ -140,7 +129,7 @@ constexpr SmallMap<K, T, SmallSz> &SmallMap<K, T, SmallSz>::operator=(SmallMap<K
 template<typename K, typename T, size_t SmallSz>
 constexpr T &SmallMap<K, T, SmallSz>::operator[](MaybeView_t<K> const&k) {
 	bool isNew{};
-	auto p = access(m_pairs, k, isNew);
+	auto p = &access(m_pairs, k, isNew);
 	if (isNew) {
 		p->key = k;
 	}
@@ -149,7 +138,7 @@ constexpr T &SmallMap<K, T, SmallSz>::operator[](MaybeView_t<K> const&k) {
 
 template<typename K, typename T, size_t SmallSz>
 constexpr Result<T*> SmallMap<K, T, SmallSz>::at(MaybeView_t<K> const&k) noexcept {
-	auto const p = accessNoCreate(m_pairs, k);
+	auto p = access(m_pairs, k);
 	if (!p) {
 		return {nullptr, ox::Error(1, "value not found for given key")};
 	}
@@ -158,8 +147,7 @@ constexpr Result<T*> SmallMap<K, T, SmallSz>::at(MaybeView_t<K> const&k) noexcep
 
 template<typename K, typename T, size_t SmallSz>
 constexpr Result<const T*> SmallMap<K, T, SmallSz>::at(MaybeView_t<K> const&k) const noexcept {
-	bool isNew{};
+	auto p = access(m_pairs, k);
-	auto p = access(m_pairs, k, isNew);
 	if (!p) {
 		return {nullptr, ox::Error(1, "value not found for given key")};
 	}
@@ -180,8 +168,7 @@ constexpr void SmallMap<K, T, SmallSz>::erase(MaybeView_t<K> const&k) {
 
 template<typename K, typename T, size_t SmallSz>
 constexpr bool SmallMap<K, T, SmallSz>::contains(MaybeView_t<K> const&k) const noexcept {
-	bool isNew{};
+	return access(m_pairs, k) != nullptr;
-	return access(m_pairs, k, isNew) != nullptr;
 }
 
 template<typename K, typename T, size_t SmallSz>
@@ -199,16 +186,6 @@ constexpr Vector<K> SmallMap<K, T, SmallSz>::keys() const noexcept {
 	return keys;
 }
 
-template<typename K, typename T, size_t SmallSz>
-constexpr Vector<T> SmallMap<K, T, SmallSz>::values() const noexcept {
-	ox::Vector<T> keys;
-	keys.reserve(m_pairs.size());
-	for (auto const&p : m_pairs) {
-		keys.emplace_back(p.key);
-	}
-	return keys;
-}
-
 template<typename K, typename T, size_t SmallSz>
 constexpr K const&SmallMap<K, T, SmallSz>::key(size_t i) const noexcept {
 	return m_pairs[i].key;
@@ -241,42 +218,30 @@ constexpr void SmallMap<K, T, SmallSz>::clear() {
 
 template<typename K, typename T, size_t SmallSz>
 template<typename KK>
-constexpr typename SmallMap<K, T, SmallSz>::Pair const*SmallMap<K, T, SmallSz>::access(
+constexpr typename SmallMap<K, T, SmallSz>::Pair const&SmallMap<K, T, SmallSz>::access(
 		PairVector const&pairs, KK const&k, bool &isNew) const {
 	for (auto const&p : pairs) {
 		if (p.key == k) {
 			isNew = false;
-			return &p;
+			return p;
 		}
 	}
 	isNew = true;
-	return nullptr;
+	return pairs.emplace_back();
 }
 
 template<typename K, typename T, size_t SmallSz>
 template<typename KK>
-constexpr typename SmallMap<K, T, SmallSz>::Pair *SmallMap<K, T, SmallSz>::access(
+constexpr typename SmallMap<K, T, SmallSz>::Pair &SmallMap<K, T, SmallSz>::access(
 		PairVector &pairs, KK const&k, bool &isNew) {
 	for (auto &p : pairs) {
 		if (p.key == k) {
 			isNew = false;
-			return &p;
+			return p;
 		}
 	}
 	isNew = true;
-	return &pairs.emplace_back();
+	return pairs.emplace_back();
-}
-
-template<typename K, typename T, size_t SmallSz>
-template<typename KK>
-constexpr typename SmallMap<K, T, SmallSz>::Pair *SmallMap<K, T, SmallSz>::accessNoCreate(
-		PairVector &pairs, KK const&k) {
-	for (auto &p : pairs) {
-		if (p.key == k) {
-			return &p;
-		}
-	}
-	return nullptr;
 }
 
 template<typename T, typename K, typename V, size_t SmallSz>

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

@@ -14,7 +14,7 @@
 #include "iterator.hpp"
 #include "vector.hpp"
 
-OX_ALLOW_UNSAFE_BUFFERS_BEGIN
+OX_CLANG_NOWARN_BEGIN(-Wunsafe-buffer-usage)
 
 namespace ox {
 
@@ -129,22 +129,22 @@ class Span {
 		}
 
 		constexpr T &operator[](std::size_t i) noexcept {
-			boundsCheck(__FILE__, __LINE__, i, size(), "Span access overflow");
+			ox::primitiveAssert(__FILE__, __LINE__, i < size(), "Span access overflow");
 			return m_items[i];
 		}
 
-		constexpr T const&operator[](std::size_t i) const noexcept {
+		constexpr const T &operator[](std::size_t i) const noexcept {
-			boundsCheck(__FILE__, __LINE__, i, size(), "Span access overflow");
+			ox::primitiveAssert(__FILE__, __LINE__, i < size(), "Span access overflow");
 			return m_items[i];
 		}
 
 		constexpr Span operator+(size_t i) const noexcept {
-			boundsCheck(__FILE__, __LINE__, i, size(), "Span access overflow");
+			ox::primitiveAssert(__FILE__, __LINE__, i < size(), "Span access overflow");
 			return {m_items + i, m_size - i};
 		}
 
 		constexpr Span operator+=(size_t i) noexcept {
-			boundsCheck(__FILE__, __LINE__, i, size(), "Span access overflow");
+			ox::primitiveAssert(__FILE__, __LINE__, i < size(), "Span access overflow");
 			m_items += i;
 			m_size -= i;
 			return *this;
@@ -168,20 +168,8 @@ class Span {
 };
 
 template<typename T>
-using SpanView = Span<T const>;
+using SpanView = Span<const T>;
-
-template<typename T>
-constexpr void spancpy(ox::Span<T> const dst, ox::SpanView<T> const src) noexcept {
-	auto const sz = ox::min(dst.size(), src.size());
-	if (std::is_constant_evaluated() || std::is_trivially_copyable_v<T>) {
-		for (size_t i{}; i < sz; ++i) {
-			dst.data()[i] = src.data()[i];
-		}
-	} else {
-		memcpy(dst.data(), src.data(), sz * sizeof(T));
-	}
-}
 
 }
 
-OX_ALLOW_UNSAFE_BUFFERS_END
+OX_CLANG_NOWARN_END

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

@@ -171,7 +171,7 @@ class BasicString {
 
 		constexpr bool operator>=(BasicString const&other) const noexcept;
 
-		constexpr char const&operator[](std::size_t i) const noexcept;
+		constexpr char operator[](std::size_t i) const noexcept;
 
 		constexpr char &operator[](std::size_t i) noexcept;
 
@@ -490,7 +490,7 @@ constexpr bool BasicString<SmallStringSize_v>::operator>=(BasicString const&othe
 }
 
 template<std::size_t SmallStringSize_v>
-constexpr char const&BasicString<SmallStringSize_v>::operator[](std::size_t i) const noexcept {
+constexpr char BasicString<SmallStringSize_v>::operator[](std::size_t i) const noexcept {
 	return m_buff[i];
 }
 

deps/ox/src/ox/std/test/CMakeLists.txt

@@ -17,8 +17,6 @@ add_test("[ox/std] String" ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/StdTest "String")
 add_test("[ox/std] SmallMap" ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/StdTest "SmallMap")
 add_test("[ox/std] SmallMap2" ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/StdTest "SmallMap2")
 add_test("[ox/std] Vector" ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/StdTest "Vector")
-add_test("[ox/std] Vector::shrink_to_fit" ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/StdTest "Vector::shrink_to_fit")
-add_test("[ox/std] findIdx" ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/StdTest "findIdx")
 add_test("[ox/std] HashMap" ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/StdTest "HashMap")
 add_test("[ox/std] HeapMgr" ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/StdTest malloc)
 add_test("[ox/std] Serialize-Int" ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/StdTest "Serialize-Int")

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

@@ -237,50 +237,6 @@ OX_CLANG_NOWARN_END
 			return ox::Error(0);
 		}
 	},
-	{
-		"Vector::shrink_to_fit",
-		[] {
-			{
-				ox::Vector<ox::IString<8>> v;
-				v.reserve(50);
-				v.emplace_back("asdf");
-				v.emplace_back("aoeu");
-				auto const origData = v.data();
-				v.shrink_to_fit();
-				oxExpect(v[0], "asdf");
-				oxExpect(v[1], "aoeu");
-				oxExpect(v.capacity(), 2u);
-				oxAssert(origData != v.data(), "shrink_to_fit did not create a new allocation");
-			}
-			{
-				ox::Vector<ox::IString<8>> v;
-				v.reserve(2);
-				v.emplace_back("asdf");
-				v.emplace_back("aoeu");
-				auto const origData = v.data();
-				v.shrink_to_fit();
-				oxExpect(v[0], "asdf");
-				oxExpect(v[1], "aoeu");
-				oxExpect(v.capacity(), 2u);
-				oxAssert(origData == v.data(), "shrink_to_fit inappropriately created a new allocation");
-			}
-			return ox::Error{};
-		}
-	},
-	{
-		"findIdx",
-		[] {
-			ox::Vector<ox::IString<8>> const v {"zero", "one", "two", "three", "four"};
-			oxExpect(ox::findIdx(v.begin(), v.end(), "zero").or_value(5), 0u);
-			oxExpect(ox::findIdx(v.begin(), v.end(), "one").or_value(5), 1u);
-			oxExpect(ox::findIdx(v.begin(), v.end(), "two").or_value(5), 2u);
-			oxExpect(ox::findIdx(v.begin(), v.end(), "three").or_value(5), 3u);
-			oxExpect(ox::findIdx(v.begin(), v.end(), "four").or_value(5), 4u);
-			oxExpect(ox::findIdx(v.begin(), v.end(), "five").or_value(5), 5u);
-			oxExpect(ox::findIdx(v.begin(), v.end(), "six").or_value(6), 6u);
-			return ox::Error{};
-		}
-	},
 	{
 		"SmallMap",
 		[] {
@@ -290,18 +246,7 @@ OX_CLANG_NOWARN_END
 			oxExpect(map.size(), 1u);
 			oxExpect(map["aoeu"], "");
 			oxExpect(map.size(), 2u);
-			ox::SmallMap<ox::String, ox::String> cmap;
+			return ox::Error(0);
-			cmap["asdf"] = "aoeu";
-			auto constexpr constTest = [](ox::SmallMap<ox::String, ox::String> const&map) {
-				OX_REQUIRE(asdf, map.at("asdf"));
-				oxExpect(*asdf, "aoeu");
-				oxExpect(map.size(), 1u);
-				auto const aoeu = map.at("aoeu");
-				oxExpect(aoeu.ok(), false);
-				oxExpect(map.size(), 1u);
-				return ox::Error{};
-			};
-			return constTest(cmap);
 		}
 	},
 	{
@@ -328,16 +273,6 @@ OX_CLANG_NOWARN_END
 			si["aoeu"] = 100;
 			oxAssert(si["asdf"] == 42, "asdf != 42");
 			oxAssert(si["aoeu"] == 100, "aoeu != 100");
-			si.erase("asdf");
-			oxAssert(!si.contains("asdf"), "wrongly contains asdf");
-			oxAssert(si.contains("aoeu"), "does not contains aoeu");
-			oxAssert(!si.at("asdf").ok(), "asdf != 0");
-			oxExpect(si["asdf"], 0);
-			oxAssert(si["aoeu"] == 100, "aoeu != 100");
-			auto si2 = si;
-			oxDebugf("{}", si2["asdf"]);
-			oxExpect(si2["asdf"], 0);
-			oxAssert(si2["aoeu"] == 100, "aoeu != 100");
 			ox::HashMap<int, int> ii;
 			ii[4] = 42;
 			ii[5] = 100;

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

@@ -269,8 +269,8 @@ using TraceStream = NullStream;
 inline void logError(const char *file, int line, const char *fmt, const Error &err) noexcept {
 	if (err) {
 		TraceStream trc(file, line, "ox::error");
-		if (err.src.file_name() != nullptr) {
+		if (err.file != nullptr) {
-			trc << "Error: (" << err.src.file_name() << ":" << err.src.line() << "):";
+			trc << "Error: (" << err.file << ":" << err.line << "):";
 		} else {
 			trc <<  "Error:";
 		}
@@ -282,8 +282,8 @@ inline void logError(const char *file, int line, const Error &err) noexcept {
 	if (err) {
 		TraceStream trc(file, line, "ox::error");
 		trc <<  "Error:" << err;
-		if (err.src.file_name() != nullptr) {
+		if (err.file != nullptr) {
-			trc << "(" << err.src.file_name() << ":" << err.src.line() << ")";
+			trc << "(" << err.file << ":" << err.line << ")";
 		}
 	}
 }

deps/ox/src/ox/std/typetraits.hpp

@@ -19,15 +19,12 @@
 namespace std {
 
 template<typename T>
-inline constexpr bool is_union_v = __is_union(T);
+constexpr bool is_union_v = __is_union(T);
 
-inline constexpr bool is_constant_evaluated() noexcept {
+constexpr bool is_constant_evaluated() noexcept {
 	return __builtin_is_constant_evaluated();
 }
 
-template<typename T>
-inline constexpr bool is_trivially_copyable_v = __is_trivially_copyable(T);
-
 }
 
 #endif
@@ -159,9 +156,6 @@ static_assert(is_class<int>::value == false);
 template<typename T>
 constexpr bool is_class_v = is_class<T>();
 
-template<typename T>
-inline constexpr bool is_trivially_copyable_v = std::is_trivially_copyable_v<T>;
-
 template<typename T>
 constexpr bool is_signed_v = integral_constant<bool, T(-1) < T(0)>::value;
 

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

@@ -27,48 +27,6 @@ constexpr void swap(T &a, T &b) noexcept {
 	b = std::move(temp);
 }
 
-template<typename T, typename U>
-constexpr bool cmp_equal(T const t, U const u) noexcept {
-	if constexpr(ox::is_signed_v<T> == ox::is_signed_v<U>) {
-		return t == u;
-	} else if constexpr(ox::is_signed_v<T>) {
-		return ox::Signed<T>{t} == u;
-	} else {
-		return t == ox::Signed<U>{u};
-	}
-}
-
-template<typename T, typename U>
-constexpr bool cmp_less(T const t, U const u) noexcept {
-	if constexpr(ox::is_signed_v<T> == ox::is_signed_v<U>) {
-		return t < u;
-	} else if constexpr(ox::is_signed_v<T>) {
-		return ox::Signed<T>{t} < u;
-	} else {
-		return t < ox::Signed<U>{u};
-	}
-}
-
-template<typename T, typename U>
-constexpr bool cmp_not_equal(T const t, U const u) noexcept {
-	return !std::cmp_equal(t, u);
-}
-
-template<typename T, typename U>
-constexpr bool cmp_greater(T const t, U const u) noexcept {
-	return std::cmp_less(u, t);
-}
-
-template<typename T, typename U>
-constexpr bool cmp_less_equal(T const t, U const u) noexcept {
-	return !std::cmp_less(u, t);
-}
-
-template<typename T, typename U>
-constexpr bool cmp_greater_equal(T const t, U const u) noexcept {
-	return !std::cmp_less(t, u);
-}
-
 }
 #endif
 

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

@@ -311,12 +311,8 @@ class Vector: detail::VectorAllocator<T, Allocator, SmallVectorSize> {
 		 */
 		constexpr Error unordered_erase(std::size_t pos) noexcept(useNoexcept);
 
-		constexpr Error remove(T const &val);
-
 		constexpr void reserve(std::size_t cap) noexcept(useNoexcept);
 
-		constexpr void shrink_to_fit() noexcept(useNoexcept);
-
 	private:
 		constexpr void reserveInsert(
 				std::size_t cap, std::size_t pos, std::size_t offset = 1) noexcept(useNoexcept);
@@ -345,7 +341,6 @@ constexpr Vector<T, SmallVectorSize, Allocator>::Vector(std::size_t size) noexce
 
 template<typename T, std::size_t SmallVectorSize, typename Allocator>
 constexpr Vector<T, SmallVectorSize, Allocator>::Vector(std::initializer_list<T> list) noexcept {
-	reserve(list.size());
 	for (auto &item : list) {
 		emplace_back(std::move(item));
 	}
@@ -429,13 +424,13 @@ constexpr Vector<T, SmallVectorSize, Allocator> &Vector<T, SmallVectorSize, Allo
 
 template<typename T, std::size_t SmallVectorSize, typename Allocator>
 constexpr T &Vector<T, SmallVectorSize, Allocator>::operator[](std::size_t i) noexcept {
-	boundsCheck(__FILE__, __LINE__, i, size(), "Vector access overflow");
+	ox::primitiveAssert(__FILE__, __LINE__, i < size(), "Vector access overflow");
 	return m_items[i];
 }
 
 template<typename T, std::size_t SmallVectorSize, typename Allocator>
 constexpr const T &Vector<T, SmallVectorSize, Allocator>::operator[](std::size_t i) const noexcept {
-	boundsCheck(__FILE__, __LINE__, i, size(), "Vector access overflow");
+	ox::primitiveAssert(__FILE__, __LINE__, i < size(), "Vector access overflow");
 	return m_items[i];
 }
 
@@ -661,17 +656,6 @@ constexpr Error Vector<T, SmallVectorSize, Allocator>::unordered_erase(std::size
 	return ox::Error(0);
 }
 
-template<typename T, std::size_t SmallVectorSize, typename Allocator>
-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;
-		}
-		++i;
-	}
-	return ox::Error{1, "element not found"};
-}
-
 template<typename T, std::size_t SmallVectorSize, typename Allocator>
 constexpr void Vector<T, SmallVectorSize, Allocator>::reserve(std::size_t cap) noexcept(useNoexcept) {
 	if (cap <= m_cap) {
@@ -691,24 +675,6 @@ constexpr void Vector<T, SmallVectorSize, Allocator>::reserve(std::size_t cap) n
 	}
 }
 
-template<typename T, std::size_t SmallVectorSize, typename Allocator>
-constexpr void Vector<T, SmallVectorSize, Allocator>::shrink_to_fit() noexcept(useNoexcept)  {
-	if (m_size == m_cap) {
-		return;
-	}
-	const auto oldItems = m_items;
-	const auto oldCap = m_cap;
-	m_cap = m_size;
-	this->allocate(&m_items, m_size);
-	if (oldItems) { // move over old items
-		for (std::size_t i = 0; i < m_size; ++i) {
-			std::construct_at(&m_items[i], std::move(oldItems[i]));
-			oldItems[i].~T();
-		}
-		this->deallocate(oldItems, oldCap);
-	}
-}
-
 template<typename T, std::size_t SmallVectorSize, typename Allocator>
 constexpr void Vector<T, SmallVectorSize, Allocator>::reserveInsert(
 		std::size_t cap,

deps/teagba/src/cstartup.cpp

@@ -4,20 +4,17 @@
 
 #include <ox/std/heapmgr.hpp>
 
-#include <teagba/bios.hpp>
-#include <teagba/registers.hpp>
-
 namespace mgba {
 void initConsole();
 }
 
-#define MEM_HEAP_BEGIN reinterpret_cast<char*>(0x02000000)
+#define MEM_EWRAM_BEGIN reinterpret_cast<char*>(0x02000000)
-#define MEM_HEAP_END   reinterpret_cast<char*>(0x0203FFFF)
+#define MEM_EWRAM_END   reinterpret_cast<char*>(0x0203FFFF)
 
-#define HEAP_BEGIN reinterpret_cast<char*>(MEM_HEAP_BEGIN)
+#define HEAP_BEGIN reinterpret_cast<char*>(MEM_EWRAM_BEGIN)
 // set size to half of EWRAM
-#define HEAP_SIZE ((MEM_HEAP_END - MEM_HEAP_BEGIN) / 2)
+#define HEAP_SIZE ((MEM_EWRAM_END - MEM_EWRAM_BEGIN) / 2)
-#define HEAP_END  reinterpret_cast<char*>(MEM_HEAP_BEGIN + HEAP_SIZE)
+#define HEAP_END  reinterpret_cast<char*>(MEM_EWRAM_BEGIN + HEAP_SIZE)
 
 extern void (*__preinit_array_start[]) (void);
 extern void (*__preinit_array_end[]) (void);
@@ -28,14 +25,6 @@ int main(int argc, const char **argv);
 
 extern "C" {
 
-void abort() {
-	REG_IE = 0;
-	teagba::intrwait(0, 0);
-	while (true);
-}
-
-void *__gxx_personality_v0{};
-
 void __libc_init_array() {
 	auto preInits = __preinit_array_end - __preinit_array_start;
 	for (decltype(preInits) i = 0; i < preInits; i++) {

developer-handbook.md

@@ -162,9 +162,11 @@ The Ox way of doing things is the Olympic way of doing things.
 
 ### Error Handling
 
-Instead of throwing exceptions, generally try to use
+The GBA build has exceptions disabled.
-[ox::Errors](deps/ox/ox-docs.md#error-handling) for error reporting,
+Instead of throwing exceptions, all engine code should return
-but exceptions may be used where they make sense.
+[ox::Errors](deps/ox/ox-docs.md#error-handling) for error reporting.
+For the sake of consistency, try to stick to ```ox::Error``` in non-engine code
+as well, but non-engine code is free to use exceptions when they make sense.
 
 Exceptions should generally just use ```OxException```, which is bascially an
 exception form of ```ox::Error```.

release-notes.md

@@ -1,23 +0,0 @@
-# d2025.02
-
-* Rename core namespace to gfx.
-* Add PaletteV5 to accommodate namespace change.
-* Add TileSheetV5. TileSheetV5 retains the bpp field for the sake of
-  CompactTileSheet, but always store it pixel as 8 bpp for itself.
-* Add ability to move subsheets in the subsheet tree.
-* Add Flip X and Flip Y functionality to TileSheet Editor.
-* Add rotate functionality to TileSheet Editor.
-* Add draw line tool to TileSheet editor
-* Replace file picker combo boxes with a browse button and file picker, and
-  support for dragging files from the project explorer.
-* Add ability to jump to a color in a Palette by double clicking on the
-  color from the TileSheet editor
-* Add ability to create directories.
-* Add ability to add files to specific directories.
-* Add ability to delete files from the project explorer.
-* Ctrl-<num key> keyboard shortcuts for jumping between tabs.
-* Fix Palette Editor to ignore keyboard input when popups are open.
-* Palette Editor move color mechanism now uses drag and drop.
-* Add ability to reorder Palette pages.
-* Add warning for closing a tab with unsaved changes.
-* Add ability to close a tab with Ctrl/Cmd-W

sample_project/.nostalgia/type_descriptors/net.drinkingtea.nostalgia.gfx.CompactPalette;1

@@ -1,23 +0,0 @@
-O1;net.drinkingtea.ox.TypeDescriptor;1;{
-	"fieldList" : 
-	[
-		{
-			"fieldName" : "pages",
-			"subscriptLevels" : 2,
-			"subscriptStack" : 
-			[
-				{
-					"subscriptType" : 4
-				},
-				{
-					"subscriptType" : 4
-				}
-			],
-			"typeId" : "B.uint16;0"
-		}
-	],
-	"preloadable" : true,
-	"primitiveType" : 5,
-	"typeName" : "net.drinkingtea.nostalgia.gfx.CompactPalette",
-	"typeVersion" : 1
-}

sample_project/.nostalgia/type_descriptors/net.drinkingtea.nostalgia.gfx.CompactTileSheet;1

@@ -1,28 +0,0 @@
-O1;net.drinkingtea.ox.TypeDescriptor;1;{
-	"fieldList" : 
-	[
-		{
-			"fieldName" : "bpp",
-			"typeId" : "B.int8;0"
-		},
-		{
-			"fieldName" : "defaultPalette",
-			"typeId" : "net.drinkingtea.ox.FileAddress;1"
-		},
-		{
-			"fieldName" : "pixels",
-			"subscriptLevels" : 1,
-			"subscriptStack" : 
-			[
-				{
-					"subscriptType" : 4
-				}
-			],
-			"typeId" : "B.uint8;0"
-		}
-	],
-	"preloadable" : true,
-	"primitiveType" : 5,
-	"typeName" : "net.drinkingtea.nostalgia.gfx.CompactTileSheet",
-	"typeVersion" : 1
-}

sample_project/.nostalgia/type_descriptors/net.drinkingtea.nostalgia.gfx.Palette.PalettePage;2

@@ -1,23 +0,0 @@
-O1;net.drinkingtea.ox.TypeDescriptor;1;{
-	"fieldList" : 
-	[
-		{
-			"fieldName" : "name",
-			"typeId" : "net.drinkingtea.ox.BasicString#8#;1"
-		},
-		{
-			"fieldName" : "colors",
-			"subscriptLevels" : 1,
-			"subscriptStack" : 
-			[
-				{
-					"subscriptType" : 4
-				}
-			],
-			"typeId" : "net.drinkingtea.nostalgia.gfx.PaletteColor;2"
-		}
-	],
-	"primitiveType" : 5,
-	"typeName" : "net.drinkingtea.nostalgia.gfx.Palette.PalettePage",
-	"typeVersion" : 2
-}

sample_project/.nostalgia/type_descriptors/net.drinkingtea.nostalgia.gfx.Palette;5

@@ -1,31 +0,0 @@
-O1;net.drinkingtea.ox.TypeDescriptor;1;{
-	"fieldList" : 
-	[
-		{
-			"fieldName" : "colorNames",
-			"subscriptLevels" : 1,
-			"subscriptStack" : 
-			[
-				{
-					"subscriptType" : 4
-				}
-			],
-			"typeId" : "net.drinkingtea.ox.BasicString#8#;1"
-		},
-		{
-			"fieldName" : "pages",
-			"subscriptLevels" : 1,
-			"subscriptStack" : 
-			[
-				{
-					"subscriptType" : 4
-				}
-			],
-			"typeId" : "net.drinkingtea.nostalgia.gfx.Palette.PalettePage;2"
-		}
-	],
-	"preloadable" : true,
-	"primitiveType" : 5,
-	"typeName" : "net.drinkingtea.nostalgia.gfx.Palette",
-	"typeVersion" : 5
-}

sample_project/.nostalgia/type_descriptors/net.drinkingtea.nostalgia.gfx.PaletteColor;2

@@ -1,24 +0,0 @@
-O1;net.drinkingtea.ox.TypeDescriptor;1;{
-	"fieldList" : 
-	[
-		{
-			"fieldName" : "r",
-			"typeId" : "B.uint8;0"
-		},
-		{
-			"fieldName" : "g",
-			"typeId" : "B.uint8;0"
-		},
-		{
-			"fieldName" : "b",
-			"typeId" : "B.uint8;0"
-		},
-		{
-			"fieldName" : "a",
-			"typeId" : "B.uint8;0"
-		}
-	],
-	"primitiveType" : 5,
-	"typeName" : "net.drinkingtea.nostalgia.gfx.PaletteColor",
-	"typeVersion" : 2
-}

sample_project/.nostalgia/type_descriptors/net.drinkingtea.nostalgia.gfx.TileSheet.SubSheet;5

@@ -1,46 +0,0 @@
-O1;net.drinkingtea.ox.TypeDescriptor;1;{
-	"fieldList" : 
-	[
-		{
-			"fieldName" : "id",
-			"typeId" : "B.int32;0"
-		},
-		{
-			"fieldName" : "name",
-			"typeId" : "net.drinkingtea.ox.BasicString#8#;1"
-		},
-		{
-			"fieldName" : "rows",
-			"typeId" : "B.int32;0"
-		},
-		{
-			"fieldName" : "columns",
-			"typeId" : "B.int32;0"
-		},
-		{
-			"fieldName" : "subsheets",
-			"subscriptLevels" : 1,
-			"subscriptStack" : 
-			[
-				{
-					"subscriptType" : 4
-				}
-			],
-			"typeId" : "net.drinkingtea.nostalgia.gfx.TileSheet.SubSheet;5"
-		},
-		{
-			"fieldName" : "pixels",
-			"subscriptLevels" : 1,
-			"subscriptStack" : 
-			[
-				{
-					"subscriptType" : 4
-				}
-			],
-			"typeId" : "B.uint8;0"
-		}
-	],
-	"primitiveType" : 5,
-	"typeName" : "net.drinkingtea.nostalgia.gfx.TileSheet.SubSheet",
-	"typeVersion" : 5
-}

sample_project/.nostalgia/type_descriptors/net.drinkingtea.nostalgia.gfx.TileSheet;5

@@ -1,24 +0,0 @@
-O1;net.drinkingtea.ox.TypeDescriptor;1;{
-	"fieldList" : 
-	[
-		{
-			"fieldName" : "bpp",
-			"typeId" : "B.int8;0"
-		},
-		{
-			"fieldName" : "idIt",
-			"typeId" : "B.int32;0"
-		},
-		{
-			"fieldName" : "defaultPalette",
-			"typeId" : "net.drinkingtea.ox.BasicString#8#;1"
-		},
-		{
-			"fieldName" : "subsheet",
-			"typeId" : "net.drinkingtea.nostalgia.gfx.TileSheet.SubSheet;5"
-		}
-	],
-	"primitiveType" : 5,
-	"typeName" : "net.drinkingtea.nostalgia.gfx.TileSheet",
-	"typeVersion" : 5
-}

sample_project/Palettes/Dirt.npal

@@ -1,28 +1 @@
-K1;0f75977f-1c52-45f8-9793-52ea2dc200a0;O1;net.drinkingtea.nostalgia.gfx.Palette;5;{
+K1;0f75977f-1c52-45f8-9793-52ea2dc200a0;M2;net.drinkingtea.nostalgia.core.Palette;1;
<03><><07><>
-	"colorNames" : 
-	[
-		"Color 1",
-		"Color 2"
-	],
-	"pages" : 
-	[
-		{
-			"colors" : 
-			[
-				{
-					"a" : 1,
-					"b" : 31,
-					"g" : 31,
-					"r" : 31
-				},
-				{
-					"a" : 1,
-					"b" : 22,
-					"g" : 22,
-					"r" : 22
-				}
-			],
-			"name" : "Page 1"
-		}
-	]
-}

sample_project/Palettes/Logo.npal

@@ -1,36 +1 @@
-K1;c79f21e2-f74f-4ad9-90ed-32b0ef7da6ed;O1;net.drinkingtea.nostalgia.gfx.Palette;5;{
+K1;c79f21e2-f74f-4ad9-90ed-32b0ef7da6ed;M2;net.drinkingtea.nostalgia.core.Palette;1;

P<>{<03><>C<>
-	"colorNames" : 
-	[
-		"Color 1",
-		"Color 2",
-		"Color 3",
-		"Color 4"
-	],
-	"pages" : 
-	[
-		{
-			"colors" : 
-			[
-				{
-					"b" : 5
-				},
-				{
-					"b" : 22,
-					"g" : 22,
-					"r" : 22
-				},
-				{
-					"b" : 27,
-					"g" : 27,
-					"r" : 27
-				},
-				{
-					"b" : 20,
-					"g" : 8,
-					"r" : 8
-				}
-			],
-			"name" : "Page 1"
-		}
-	]
-}

sample_project/TileSheets/Chester.nts

@@ -1,352 +0,0 @@
-K1;5667c759-7ba1-470a-8860-72f0720dc58c;O1;net.drinkingtea.nostalgia.gfx.TileSheet;5;{
-	"bpp" : 4,
-	"defaultPalette" : "uuid://14fc3dd8-42ff-4bf9-81f1-a010cc5ac251",
-	"idIt" : 7,
-	"subsheet" : 
-	{
-		"columns" : -1,
-		"name" : "Root",
-		"rows" : -1,
-		"subsheets" : 
-		[
-			{
-				"columns" : 1,
-				"id" : 5,
-				"name" : "Blank",
-				"pixels" : 
-				[
-					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,
-					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,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0
-				],
-				"rows" : 1
-			},
-			{
-				"columns" : 2,
-				"id" : 6,
-				"name" : "Dirt",
-				"pixels" : 
-				[
-					1,
-					1,
-					1,
-					1,
-					1,
-					1,
-					1,
-					1,
-					1,
-					1,
-					2,
-					1,
-					1,
-					1,
-					1,
-					1,
-					1,
-					1,
-					1,
-					1,
-					1,
-					1,
-					1,
-					1,
-					1,
-					1,
-					1,
-					1,
-					1,
-					1,
-					1,
-					1,
-					1,
-					1,
-					1,
-					1,
-					1,
-					1,
-					1,
-					1,
-					1,
-					1,
-					1,
-					1,
-					1,
-					2,
-					1,
-					1,
-					1,
-					2,
-					1,
-					1,
-					1,
-					1,
-					1,
-					1,
-					1,
-					1,
-					1,
-					1,
-					1,
-					1,
-					1,
-					1,
-					1,
-					1,
-					1,
-					1,
-					1,
-					1,
-					1,
-					1,
-					1,
-					1,
-					1,
-					1,
-					1,
-					1,
-					1,
-					1,
-					1,
-					1,
-					1,
-					2,
-					1,
-					1,
-					1,
-					1,
-					1,
-					1,
-					1,
-					1,
-					1,
-					1,
-					1,
-					1,
-					1,
-					1,
-					1,
-					1,
-					1,
-					1,
-					1,
-					1,
-					1,
-					1,
-					1,
-					1,
-					1,
-					1,
-					1,
-					1,
-					1,
-					2,
-					1,
-					1,
-					1,
-					1,
-					1,
-					1,
-					1,
-					1,
-					1,
-					1,
-					1,
-					1,
-					1,
-					1,
-					1,
-					1,
-					1,
-					1,
-					1,
-					1,
-					1,
-					1,
-					1,
-					1,
-					1,
-					1,
-					1,
-					2,
-					1,
-					1,
-					1,
-					1,
-					1,
-					1,
-					1,
-					1,
-					1,
-					1,
-					1,
-					1,
-					1,
-					1,
-					1,
-					1,
-					1,
-					1,
-					1,
-					1,
-					1,
-					1,
-					1,
-					1,
-					1,
-					1,
-					1,
-					1,
-					1,
-					1,
-					1,
-					1,
-					1,
-					1,
-					1,
-					1,
-					1,
-					2,
-					1,
-					1,
-					1,
-					1,
-					1,
-					1,
-					1,
-					1,
-					1,
-					1,
-					1,
-					1,
-					1,
-					1,
-					1,
-					1,
-					1,
-					1,
-					1,
-					1,
-					1,
-					1,
-					1,
-					1,
-					1,
-					1,
-					2,
-					1,
-					1,
-					1,
-					1,
-					1,
-					1,
-					1,
-					1,
-					1,
-					1,
-					1,
-					2,
-					1,
-					1,
-					1,
-					1,
-					1,
-					1,
-					1,
-					1,
-					1,
-					1,
-					1,
-					1,
-					1,
-					1,
-					1,
-					1,
-					1,
-					1,
-					1,
-					1,
-					1,
-					1,
-					1,
-					1,
-					1,
-					1,
-					1,
-					2,
-					1,
-					1,
-					1,
-					1,
-					1,
-					1,
-					1,
-					1,
-					1
-				],
-				"rows" : 2
-			}
-		]
-	}
-}

sample_project/TileSheets/Logo.nts

@@ -1,591 +0,0 @@
-K1;896a7d25-9dc2-46a0-b4da-c6923b6da01b;O1;net.drinkingtea.nostalgia.gfx.TileSheet;5;{
-	"bpp" : 4,
-	"defaultPalette" : "uuid://c79f21e2-f74f-4ad9-90ed-32b0ef7da6ed",
-	"idIt" : 2,
-	"subsheet" : 
-	{
-		"columns" : 3,
-		"id" : 1,
-		"name" : "Root",
-		"pixels" : 
-		[
-			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,
-			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,
-			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,
-			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,
-			1,
-			0,
-			0,
-			0,
-			1,
-			0,
-			0,
-			0,
-			0,
-			1,
-			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,
-			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,
-			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,
-			0,
-			0,
-			0,
-			1,
-			0,
-			0,
-			0,
-			0,
-			0,
-			0,
-			0,
-			1,
-			0,
-			0,
-			0,
-			0,
-			0,
-			0,
-			0,
-			1,
-			0,
-			0,
-			0,
-			0,
-			0,
-			0,
-			0,
-			1,
-			0,
-			0,
-			0,
-			0,
-			0,
-			0,
-			0,
-			1,
-			0,
-			0,
-			0,
-			0,
-			0,
-			0,
-			0,
-			1,
-			0,
-			0,
-			0,
-			0,
-			0,
-			0,
-			0,
-			1,
-			0,
-			0,
-			1,
-			0,
-			0,
-			0,
-			1,
-			0,
-			1,
-			1,
-			1,
-			1,
-			1,
-			1,
-			1,
-			1,
-			1,
-			1,
-			1,
-			1,
-			1,
-			1,
-			1,
-			1,
-			1,
-			0,
-			0,
-			0,
-			0,
-			0,
-			0,
-			1,
-			1,
-			0,
-			0,
-			0,
-			0,
-			0,
-			0,
-			1,
-			1,
-			1,
-			1,
-			0,
-			0,
-			1,
-			1,
-			1,
-			1,
-			1,
-			1,
-			0,
-			0,
-			1,
-			1,
-			1,
-			1,
-			1,
-			1,
-			0,
-			0,
-			1,
-			1,
-			1,
-			0,
-			0,
-			0,
-			0,
-			0,
-			0,
-			0,
-			0,
-			1,
-			0,
-			0,
-			0,
-			0,
-			0,
-			0,
-			0,
-			1,
-			1,
-			0,
-			0,
-			0,
-			0,
-			0,
-			0,
-			1,
-			1,
-			1,
-			0,
-			0,
-			0,
-			0,
-			0,
-			1,
-			0,
-			1,
-			1,
-			0,
-			0,
-			0,
-			0,
-			1,
-			0,
-			0,
-			1,
-			0,
-			0,
-			0,
-			0,
-			1,
-			0,
-			0,
-			1,
-			0,
-			0,
-			0,
-			0,
-			1,
-			0,
-			0,
-			1,
-			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,
-			1,
-			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,
-			1,
-			1,
-			1,
-			0,
-			0,
-			1,
-			1,
-			1,
-			1,
-			1,
-			1,
-			0,
-			0,
-			1,
-			1,
-			1,
-			1,
-			1,
-			1,
-			0,
-			0,
-			1,
-			1,
-			1,
-			1,
-			1,
-			1,
-			1,
-			1,
-			1,
-			1,
-			1,
-			1,
-			1,
-			1,
-			1,
-			1,
-			1,
-			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,
-			1,
-			0,
-			0,
-			1,
-			0,
-			0,
-			0,
-			0,
-			1,
-			0,
-			1,
-			1,
-			0,
-			0,
-			0,
-			0,
-			1,
-			1,
-			1,
-			0,
-			0,
-			0,
-			0,
-			0,
-			1,
-			1,
-			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,
-			0,
-			0,
-			0,
-			0,
-			0
-		],
-		"rows" : 3
-	}
-}

sample_project/TileSheets/NS_Logo.nts

@@ -1,591 +0,0 @@
-K1;f551fb8b-0e9f-45fc-8106-b98b7fd18ff5;O1;net.drinkingtea.nostalgia.gfx.TileSheet;5;{
-	"bpp" : 4,
-	"defaultPalette" : "uuid://c79f21e2-f74f-4ad9-90ed-32b0ef7da6ed",
-	"idIt" : 2,
-	"subsheet" : 
-	{
-		"columns" : 3,
-		"id" : 1,
-		"name" : "Root",
-		"pixels" : 
-		[
-			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,
-			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,
-			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,
-			0,
-			0,
-			0,
-			1,
-			0,
-			0,
-			1,
-			0,
-			0,
-			0,
-			1,
-			0,
-			0,
-			0,
-			0,
-			1,
-			0,
-			0,
-			1,
-			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,
-			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,
-			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,
-			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,
-			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,
-			1,
-			0,
-			0,
-			0,
-			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,
-			0,
-			0,
-			0,
-			0,
-			0,
-			0,
-			0,
-			0,
-			0,
-			0,
-			3,
-			3,
-			3,
-			3,
-			0,
-			0,
-			0,
-			3,
-			3,
-			3,
-			2,
-			3,
-			3,
-			0,
-			0,
-			3,
-			3,
-			2,
-			3,
-			3,
-			3,
-			0,
-			0,
-			0,
-			3,
-			3,
-			3,
-			3,
-			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,
-			0,
-			0,
-			0,
-			1,
-			1,
-			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,
-			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,
-			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,
-			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,
-			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,
-			0,
-			0,
-			0,
-			1,
-			0,
-			0,
-			0,
-			0,
-			1,
-			0,
-			0,
-			1,
-			0,
-			0,
-			0,
-			0,
-			1,
-			0,
-			0,
-			0,
-			1,
-			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,
-			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,
-			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,
-			0,
-			0,
-			0,
-			0
-		],
-		"rows" : 3
-	}
-}

scripts/pkg-gba.py

@@ -28,11 +28,11 @@ project_name = sys.argv[2]
 bin = f'./build/{host_env}-{current_build}/bin/'
 project_bin = f'build/gba-release/bin/{project_name}.bin'
 project_gba = f'{project_name}.gba'
-project_manifest = f'{project_name.lower()}-manifest.json'
+project_manifest = f'{project_name}-manifest.json'
 
 shutil.copyfile(project_bin, project_gba)
 subprocess.run([
-    f'{bin}/{project_name.lower()}-pack',
+    f'{bin}/{project_name}-pack',
         '-src', project_dir,
         '-rom-bin', project_gba,
         '-manifest', project_manifest])

src/nostalgia/modules/CMakeLists.txt

@@ -1,7 +1,7 @@
 # module dir list
 
-add_subdirectory(gfx)
+add_subdirectory(core)
-add_subdirectory(sound)
+add_subdirectory(scene)
 
 # module libraries
 
@@ -13,8 +13,8 @@ add_library(
 target_link_libraries(
 	NostalgiaKeelModules PUBLIC
 		Keel
-		NostalgiaGfx-Keel
+		NostalgiaCore-Keel
-		NostalgiaSound-Keel
+		NostalgiaScene-Keel
 )
 install(
 	FILES
@@ -32,8 +32,8 @@ if(NOSTALGIA_BUILD_STUDIO)
 	target_link_libraries(
 		NostalgiaStudioModules PUBLIC
 			StudioAppLib
-			NostalgiaGfx-Studio-ImGui
+			NostalgiaCore-Studio-ImGui
-			NostalgiaSound-Studio-ImGui
+			NostalgiaScene-Studio
 	)
 	install(
 		 FILES

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

@@ -7,12 +7,12 @@
 #include <ox/std/math.hpp>
 #include <ox/std/types.hpp>
 
-namespace nostalgia::gfx {
+namespace nostalgia::core {
 
 using Color16 = uint16_t;
 
 /**
- * Nostalgia logically uses 16 bit colors, but must translate that to 32
+ * Nostalgia Core logically uses 16 bit colors, but must translate that to 32
  * bit colors in some implementations.
  */
 using Color32 = uint32_t;
@@ -154,7 +154,7 @@ static_assert(color16(16, 32, 8) == 9200);
 
 [[nodiscard]]
 constexpr Color16 applySelectionColor(Color16 const color) noexcept {
-	namespace core = nostalgia::gfx;
+	namespace core = nostalgia::core;
 	auto const r = core::red16(color) / 2;
 	auto const g = (core::green16(color) + 20) / 2;
 	auto const b = (core::blue16(color) + 31) / 2;

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

@@ -6,14 +6,13 @@
 
 #include <ox/std/stringliteral.hpp>
 
-namespace nostalgia::gfx {
+namespace nostalgia::core {
 
 constexpr auto TileWidth = 8;
 constexpr auto TileHeight = 8;
 constexpr auto PixelsPerTile = TileWidth * TileHeight;
 
 constexpr ox::StringLiteral FileExt_ng("ng");
-constexpr ox::StringLiteral FileExt_nts("nts");
 constexpr ox::StringLiteral FileExt_npal("npal");
 
 }

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

@@ -0,0 +1,33 @@
+/*
+ * Copyright 2016 - 2025 Gary Talent (gary@drinkingtea.net). All rights reserved.
+ */
+
+#pragma once
+
+#include <ox/fs/fs.hpp>
+#include <ox/model/desctypes.hpp>
+#include <ox/std/buffer.hpp>
+#include <ox/std/size.hpp>
+
+#include <turbine/context.hpp>
+
+#include "initparams.hpp"
+
+namespace nostalgia::core {
+
+class Context;
+
+struct ContextDeleter {
+	void operator()(Context *p) noexcept;
+};
+
+using ContextUPtr = ox::UPtr<Context, ContextDeleter>;
+
+ox::Result<ContextUPtr> init(turbine::Context &tctx, InitParams const&params = {}) noexcept;
+
+keel::Context &keelCtx(Context &ctx) noexcept;
+
+turbine::Context &turbineCtx(Context &ctx) noexcept;
+
+}
+

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

@@ -13,10 +13,10 @@
 #include "palette.hpp"
 #include "tilesheet.hpp"
 
-namespace nostalgia::gfx {
+namespace nostalgia::core {
 
 struct Sprite {
-	static constexpr auto TypeName = "net.drinkingtea.nostalgia.gfx.Sprite";
+	static constexpr auto TypeName = "net.drinkingtea.nostalgia.core.Sprite";
 	static constexpr auto TypeVersion = 1;
 	bool enabled = false;
 	int x = 0;
@@ -46,7 +46,7 @@ OX_MODEL_BEGIN(Sprite)
 OX_MODEL_END()
 
 struct BgTile {
-	static constexpr auto TypeName = "net.drinkingtea.nostalgia.gfx.BgTile";
+	static constexpr auto TypeName = "net.drinkingtea.nostalgia.core.BgTile";
 	static constexpr auto TypeVersion = 1;
 	unsigned tileIdx = 0;
 	unsigned palBank = 0;
@@ -62,7 +62,7 @@ OX_MODEL_BEGIN(BgTile)
 OX_MODEL_END()
 
 struct TileSheetSetEntrySection {
-	static constexpr auto TypeName = "net.drinkingtea.nostalgia.gfx.TileSheetSetEntrySection";
+	static constexpr auto TypeName = "net.drinkingtea.nostalgia.core.TileSheetSetEntrySection";
 	static constexpr auto TypeVersion = 1;
 	int32_t begin = 0;
 	int32_t tiles = 0;
@@ -78,7 +78,7 @@ OX_MODEL_BEGIN(TileSheetSetEntrySection)
 OX_MODEL_END()
 
 struct TileSheetSetEntry {
-	static constexpr auto TypeName = "net.drinkingtea.nostalgia.gfx.TileSheetSetEntry";
+	static constexpr auto TypeName = "net.drinkingtea.nostalgia.core.TileSheetSetEntry";
 	static constexpr auto TypeVersion = 1;
 	ox::FileAddress tilesheet;
 	ox::Vector<TileSheetSetEntrySection> sections;
@@ -90,7 +90,7 @@ OX_MODEL_BEGIN(TileSheetSetEntry)
 OX_MODEL_END()
 
 struct TileSheetSet {
-	static constexpr auto TypeName = "net.drinkingtea.nostalgia.gfx.TileSheetSet";
+	static constexpr auto TypeName = "net.drinkingtea.nostalgia.core.TileSheetSet";
 	static constexpr auto TypeVersion = 1;
 	static constexpr auto Preloadable = true;
 	int32_t bpp = 0;
@@ -102,6 +102,8 @@ OX_MODEL_BEGIN(TileSheetSet)
 	OX_MODEL_FIELD(entries)
 OX_MODEL_END()
 
+void addEntry(TileSheetSet &set, ox::FileAddress path, int32_t begin = 0, int32_t size = -1) noexcept;
+
 [[nodiscard]]
 int tileColumns(Context&) noexcept;
 
@@ -142,10 +144,6 @@ ox::Error loadBgTileSheet(
 		unsigned cbb,
 		TileSheetSet const&set) noexcept;
 
-void clearCbb(Context &ctx, unsigned cbb) noexcept;
-
-void clearCbbs(Context &ctx) noexcept;
-
 ox::Error loadBgTileSheet(
 		Context &ctx,
 		unsigned cbb,
@@ -242,15 +240,15 @@ void puts(Context &ctx, int column, int row, ox::StringViewCR str) noexcept;
 
 }
 
-namespace nostalgia::gfx::gl {
+namespace nostalgia::core::gl {
 
 constexpr ox::CStringView GlslVersion = "#version 330";
 
 [[nodiscard]]
 ox::Size drawSize(int scale = 5) noexcept;
 
-void draw(gfx::Context &ctx, ox::Size const&renderSz) noexcept;
+void draw(core::Context &ctx, ox::Size const&renderSz) noexcept;
 
-void draw(gfx::Context&, int scale = 5) noexcept;
+void draw(core::Context&, int scale = 5) noexcept;
 
 }

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

@@ -6,7 +6,7 @@
 
 #include <ox/std/types.hpp>
 
-namespace nostalgia::gfx {
+namespace nostalgia::core {
 
 struct InitParams {
 	bool glInstallDrawer = true;

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

@@ -6,7 +6,7 @@
 
 #include <keel/module.hpp>
 
-namespace nostalgia::gfx {
+namespace nostalgia::core {
 
 const keel::Module *keelModule() noexcept;
 

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

@@ -11,7 +11,7 @@
 
 #include "color.hpp"
 
-namespace nostalgia::gfx {
+namespace nostalgia::core {
 
 struct PaletteColorV1 {
     static constexpr auto TypeName = "net.drinkingtea.nostalgia.core.PaletteColor";
@@ -33,31 +33,7 @@ OX_MODEL_BEGIN(PaletteColorV1)
 	OX_MODEL_FIELD(a)
 OX_MODEL_END()
 
-
+using PaletteColor = PaletteColorV1;
-struct PaletteColorV2 {
-	static constexpr auto TypeName = "net.drinkingtea.nostalgia.gfx.PaletteColor";
-	static constexpr auto TypeVersion = 2;
-	uint8_t r{}, g{}, b{}, a{};
-	constexpr PaletteColorV2() noexcept = default;
-	constexpr PaletteColorV2(Color16 const c) noexcept:
-        r{red16(c)},
-        g{green16(c)},
-        b{blue16(c)},
-        a{alpha16(c)} {}
-	constexpr PaletteColorV2(uint8_t const r, uint8_t const g, uint8_t const b, uint8_t const a) noexcept:
-        r{r}, g{g}, b{b}, a{a} {}
-	constexpr operator Color16() const noexcept { return color16(r, g, b, a); }
-};
-
-OX_MODEL_BEGIN(PaletteColorV2)
-	OX_MODEL_FIELD(r)
-	OX_MODEL_FIELD(g)
-	OX_MODEL_FIELD(b)
-	OX_MODEL_FIELD(a)
-OX_MODEL_END()
-
-
-using PaletteColor = PaletteColorV2;
 
 
 struct PalettePageV1 {
@@ -82,31 +58,7 @@ OX_MODEL_BEGIN(PalettePageV1)
 	OX_MODEL_FIELD(colors)
 OX_MODEL_END()
 
-
+using PalettePage = PalettePageV1;
-struct PalettePageV2 {
-    static constexpr auto TypeName = "net.drinkingtea.nostalgia.gfx.Palette.PalettePage";
-    static constexpr auto TypeVersion = 2;
-    ox::String name;
-    ox::Vector<PaletteColorV2> colors;
-    constexpr PalettePageV2() noexcept = default;
-    constexpr PalettePageV2(ox::StringParam pName, ox::Vector<PaletteColorV2> pColors) noexcept:
-        name(std::move(pName)), colors(std::move(pColors)) {}
-    constexpr PalettePageV2(ox::StringParam pName, ox::Vector<Color16> const&pColors) noexcept:
-        name(std::move(pName)) {
-        colors.reserve(pColors.size());
-        for (auto const c : pColors) {
-            colors.emplace_back(c);
-        }
-    }
-};
-
-OX_MODEL_BEGIN(PalettePageV2)
-	OX_MODEL_FIELD(name)
-	OX_MODEL_FIELD(colors)
-OX_MODEL_END()
-
-
-using PalettePage = PalettePageV2;
 
 
 struct NostalgiaPalette {
@@ -214,41 +166,11 @@ constexpr ox::Error repair(PaletteV4 &p) noexcept {
 }
 
 
-struct PaletteV5 {
+using Palette = PaletteV4;
-	static constexpr auto TypeName = "net.drinkingtea.nostalgia.gfx.Palette";
-	static constexpr auto TypeVersion = 5;
-	static constexpr auto Preloadable = true;
-	ox::Vector<ox::String> colorNames;
-	ox::Vector<PalettePageV2> pages;
-};
-
-OX_MODEL_BEGIN(PaletteV5)
-	OX_MODEL_FIELD(colorNames)
-	OX_MODEL_FIELD(pages)
-OX_MODEL_END()
-
-[[nodiscard]]
-constexpr bool valid(PaletteV5 const&p) noexcept {
-	auto const colors = p.colorNames.size();
-	return ox::all_of(p.pages.begin(), p.pages.end(), [colors](PalettePageV2 const&page) {
-		return page.colors.size() == colors;
-	});
-}
-
-constexpr ox::Error repair(PaletteV5 &p) noexcept {
-	auto const colors = p.colorNames.size();
-	for (auto &page : p.pages) {
-		page.colors.resize(colors);
-	}
-	return {};
-}
-
-
-using Palette = PaletteV5;
 
 
 struct CompactPaletteV1 {
-	static constexpr auto TypeName = "net.drinkingtea.nostalgia.gfx.CompactPalette";
+	static constexpr auto TypeName = "net.drinkingtea.nostalgia.core.CompactPalette";
 	static constexpr auto TypeVersion = 1;
 	static constexpr auto Preloadable = true;
 	ox::Vector<ox::Vector<Color16>> pages{};
@@ -285,7 +207,7 @@ using CompactPalette = CompactPaletteV1;
 
 
 [[nodiscard]]
-constexpr Color16 color(Palette const&pal, size_t const page, size_t const idx) noexcept {
+constexpr Color16 color(Palette const&pal, size_t page, size_t idx) noexcept {
 	if (page < pal.pages.size() && idx < pal.pages[page].colors.size()) [[likely]] {
 		return pal.pages[page].colors[idx];
 	}
@@ -293,7 +215,7 @@ constexpr Color16 color(Palette const&pal, size_t const page, size_t const idx)
 }
 
 [[nodiscard]]
-constexpr Color16 color(CompactPalette const&pal, size_t const page, size_t const idx) noexcept {
+constexpr Color16 color(CompactPalette const&pal, size_t page, size_t idx) noexcept {
 	if (page < pal.pages.size() && idx < pal.pages[page].size()) [[likely]] {
 		return pal.pages[page][idx];
 	}
@@ -301,37 +223,37 @@ constexpr Color16 color(CompactPalette const&pal, size_t const page, size_t cons
 }
 
 [[nodiscard]]
-constexpr Color16 color(Palette const&pal, size_t const idx) noexcept {
+constexpr Color16 color(Palette const&pal, size_t idx) noexcept {
 	return color(pal, 0, idx);
 }
 
 [[nodiscard]]
-constexpr Color16 color(CompactPalette const&pal, size_t const idx) noexcept {
+constexpr Color16 color(CompactPalette const&pal, size_t idx) noexcept {
 	return color(pal, 0, idx);
 }
 
 [[nodiscard]]
-constexpr auto &colors(Palette &pal, size_t const page = 0) noexcept {
+constexpr auto &colors(Palette &pal, size_t page = 0) noexcept {
 	return pal.pages[page].colors;
 }
 
 [[nodiscard]]
-constexpr auto &colors(CompactPalette &pal, size_t const page = 0) noexcept {
+constexpr auto &colors(CompactPalette &pal, size_t page = 0) noexcept {
 	return pal.pages[page];
 }
 
 [[nodiscard]]
-constexpr auto &colors(Palette const&pal, size_t const page = 0) noexcept {
+constexpr auto &colors(Palette const&pal, size_t page = 0) noexcept {
 	return pal.pages[page];
 }
 
 [[nodiscard]]
-constexpr auto &colors(CompactPalette const&pal, size_t const page = 0) noexcept {
+constexpr auto &colors(CompactPalette const&pal, size_t page = 0) noexcept {
 	return pal.pages[page];
 }
 
 [[nodiscard]]
-constexpr size_t colorCnt(Palette const&pal, size_t const page = 0) noexcept {
+constexpr size_t colorCnt(Palette const&pal, size_t page = 0) noexcept {
 	if (page < pal.pages.size()) [[likely]] {
 		return pal.pages[page].colors.size();
 	}
@@ -339,7 +261,7 @@ constexpr size_t colorCnt(Palette const&pal, size_t const page = 0) noexcept {
 }
 
 [[nodiscard]]
-constexpr size_t colorCnt(CompactPalette const&pal, size_t const page = 0) noexcept {
+constexpr size_t colorCnt(CompactPalette const&pal, size_t page = 0) noexcept {
 	if (page < pal.pages.size()) [[likely]] {
 		return pal.pages[page].size();
 	}

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

@@ -8,7 +8,7 @@
 
 #include "consts.hpp"
 
-namespace nostalgia::gfx {
+namespace nostalgia::core {
 
 [[nodiscard]]
 constexpr std::size_t ptToIdx(int x, int y, int c, int scale = 1) noexcept {

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

@@ -6,7 +6,7 @@
 
 #include <studio/studio.hpp>
 
-namespace nostalgia::gfx {
+namespace nostalgia::core {
 
 const studio::Module *studioModule() noexcept;
 

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

@@ -5,16 +5,18 @@
 #pragma once
 
 #include <ox/fs/fs.hpp>
+#include <ox/std/array.hpp>
 #include <ox/std/point.hpp>
 #include <ox/std/size.hpp>
+#include <ox/std/span.hpp>
 #include <ox/std/types.hpp>
 #include <ox/model/def.hpp>
 
-#include <nostalgia/gfx/ptidxconv.hpp>
+#include <nostalgia/core/ptidxconv.hpp>
 
 #include "palette.hpp"
 
-namespace nostalgia::gfx {
+namespace nostalgia::core {
 
 // Predecessor to TileSheet, kept for backward compatibility
 struct TileSheetV1 {
@@ -35,7 +37,7 @@ constexpr bool valid(TileSheetV1 const&ts) noexcept {
 	return (ts.bpp == 4 || ts.bpp == 8) && ts.pixels.size() == bytes;
 }
 
-constexpr ox::Error repair(TileSheetV1 &ts, int const bpp) noexcept {
+constexpr ox::Error repair(TileSheetV1 &ts, int bpp) noexcept {
 	auto const bytes = static_cast<size_t>(ts.columns * ts.rows * PixelsPerTile) / (bpp == 4 ? 2 : 1);
 	ts.pixels.resize(bytes);
 	return {};
@@ -84,7 +86,7 @@ constexpr bool valid(TileSheetV2 const&ts) noexcept {
 	return (ts.bpp == 4 || ts.bpp == 8) && valid(ts.subsheet, ts.bpp);
 }
 
-constexpr void repair(TileSheetV2::SubSheet &ss, int const bpp) noexcept {
+constexpr void repair(TileSheetV2::SubSheet &ss, int bpp) noexcept {
 	auto const bytes = static_cast<size_t>(ss.columns * ss.rows * PixelsPerTile) / (bpp == 4 ? 2 : 1);
 	ss.pixels.resize(bytes);
 	for (auto &s : ss.subsheets) {
@@ -154,7 +156,7 @@ constexpr bool valid(TileSheetV3 const&ts) noexcept {
 	return (ts.bpp == 4 || ts.bpp == 8) && valid(ts.subsheet, ts.bpp);
 }
 
-constexpr void repair(TileSheetV3::SubSheet &ss, int const bpp) noexcept {
+constexpr void repair(TileSheetV3::SubSheet &ss, int bpp) noexcept {
 	auto const bytes = static_cast<size_t>(ss.columns * ss.rows * PixelsPerTile) / (bpp == 4 ? 2 : 1);
 	ss.pixels.resize(bytes);
 	for (auto &s : ss.subsheets) {
@@ -210,10 +212,6 @@ struct TileSheetV4 {
 				pixels(std::move(pPixels)) {
 		}
 
-		/**
-		 *
-		 * @return the dimensional size of the SubSheet (e.g. width * height)
-		 */
 		[[nodiscard]]
 		constexpr std::size_t size() const noexcept {
 			return static_cast<std::size_t>(columns) * static_cast<std::size_t>(rows);
@@ -248,7 +246,7 @@ constexpr bool valid(TileSheetV4 const&ts) noexcept {
 	return (ts.bpp == 4 || ts.bpp == 8) && valid(ts.subsheet, ts.bpp);
 }
 
-constexpr void repair(TileSheetV4::SubSheet &ss, int const bpp) noexcept {
+constexpr void repair(TileSheetV4::SubSheet &ss, int bpp) noexcept {
 	if (ss.subsheets.empty()) {
 		auto const bytes = static_cast<size_t>(ss.columns * ss.rows * PixelsPerTile) / (bpp == 4 ? 2 : 1);
 		ss.pixels.resize(bytes);
@@ -271,109 +269,7 @@ constexpr ox::Error repair(TileSheetV4 &ts) noexcept {
 }
 
 
-struct TileSheetV5 {
+using TileSheet = TileSheetV4;
-	using SubSheetIdx = ox::Vector<uint32_t, 4>;
-
-	struct SubSheet {
-		static constexpr auto TypeName = "net.drinkingtea.nostalgia.gfx.TileSheet.SubSheet";
-		static constexpr auto TypeVersion = 5;
-		SubSheetId id = 0;
-		ox::String name;
-		int columns = 0;
-		int rows = 0;
-		ox::Vector<SubSheet> subsheets;
-		ox::Vector<uint8_t> pixels;
-
-		constexpr SubSheet() noexcept = default;
-		SubSheet(
-				SubSheetId const pId,
-				ox::StringParam pName,
-				int const pColumns,
-				int const pRows) noexcept:
-				id(pId),
-				name(std::move(pName)),
-				columns(pColumns),
-				rows(pRows),
-				pixels(static_cast<std::size_t>(columns * rows * PixelsPerTile)) {
-		}
-		SubSheet(
-				SubSheetId const pId,
-				ox::StringParam pName,
-				int const pColumns,
-				int const pRows,
-				ox::Vector<uint8_t> pPixels) noexcept:
-				id(pId),
-				name(std::move(pName)),
-				columns(pColumns),
-				rows(pRows),
-				pixels(std::move(pPixels)) {
-		}
-
-		/**
-		 *
-		 * @return the dimensional size of the SubSheet (e.g. width * height)
-		 */
-		[[nodiscard]]
-		constexpr std::size_t size() const noexcept {
-			return static_cast<std::size_t>(columns) * static_cast<std::size_t>(rows);
-		}
-
-	};
-
-	static constexpr auto TypeName = "net.drinkingtea.nostalgia.gfx.TileSheet";
-	static constexpr auto TypeVersion = 5;
-	/**
-	 * bpp is unused for TileSheet, but it does get used in CompactTileSheet.
-	 * All pixel in TileSheet are 8 bpp, regardless of what the bpp field says.
-	 */
-	int8_t bpp = 4;
-	SubSheetId idIt = 0;
-	ox::String defaultPalette;
-	SubSheet subsheet{0, "Root", 1, 1};
-
-};
-
-[[nodiscard]]
-constexpr bool valid(TileSheetV5::SubSheet const&ss) noexcept {
-	if (ss.subsheets.empty()) {
-		return static_cast<size_t>(ss.columns * ss.rows * PixelsPerTile) == ss.pixels.size();
-	} else {
-		return ss.pixels.empty() && ox::all_of(ss.subsheets.begin(), ss.subsheets.end(),
-				[](TileSheetV5::SubSheet const&s) {
-			return valid(s);
-		});
-	}
-}
-
-[[nodiscard]]
-constexpr bool valid(TileSheetV5 const&ts) noexcept {
-	return (ts.bpp == 4 || ts.bpp == 8) && valid(ts.subsheet);
-}
-
-constexpr void repair(TileSheetV5::SubSheet &ss) noexcept {
-	if (ss.subsheets.empty()) {
-		auto const bytes = static_cast<size_t>(ss.columns * ss.rows * PixelsPerTile);
-		ss.pixels.resize(bytes);
-	} else {
-		ss.pixels.clear();
-		ss.columns = -1;
-		ss.rows = -1;
-	}
-	for (auto &s : ss.subsheets) {
-		repair(s);
-	}
-}
-
-constexpr ox::Error repair(TileSheetV5 &ts) noexcept {
-	if (ts.bpp != 4 && ts.bpp != 8) {
-		return ox::Error{1, "Unable to repair TileSheet"};
-	}
-	repair(ts.subsheet);
-	return {};
-}
-
-
-using TileSheet = TileSheetV5;
 
 [[nodiscard]]
 std::size_t idx(TileSheet::SubSheet const&ss, ox::Point const&pt) noexcept;
@@ -385,69 +281,100 @@ size_t getTileCnt(TileSheet const&ts) noexcept;
 TileSheet::SubSheet const*getSubsheet(TileSheet const&ts, SubSheetId id) noexcept;
 
 [[nodiscard]]
-ox::Optional<size_t> getTileIdx(TileSheet const&ts, SubSheetId id) noexcept;
+size_t getTileIdx(TileSheet const&ts, SubSheetId id) noexcept;
 
 [[nodiscard]]
-uint8_t getPixel(TileSheet::SubSheet const&ss, std::size_t idx) noexcept;
+uint8_t getPixel4Bpp(TileSheet::SubSheet const&ss, std::size_t idx) noexcept;
 
 [[nodiscard]]
-uint8_t getPixel(TileSheet::SubSheet const&ss, ox::Point const&pt) noexcept;
+uint8_t getPixel8Bpp(TileSheet::SubSheet const&ss, std::size_t idx) noexcept;
 
-void setPixel(TileSheet::SubSheet &ss, ox::Point const&pt, uint8_t palIdx) noexcept;
+[[nodiscard]]
+uint8_t getPixel(TileSheet::SubSheet const&ss, int8_t pBpp, std::size_t idx) noexcept;
 
-ox::Error setPixelCount(TileSheet::SubSheet &ss, std::size_t cnt) noexcept;
+[[nodiscard]]
+uint8_t getPixel4Bpp(TileSheet::SubSheet const&ss, ox::Point const&pt) noexcept;
 
-void flipX(TileSheet::SubSheet &ss, ox::Point const &a, ox::Point const &b) noexcept;
+[[nodiscard]]
+uint8_t getPixel8Bpp(TileSheet::SubSheet const&ss, ox::Point const&pt) noexcept;
 
-void flipY(TileSheet::SubSheet &ss, ox::Point const &a, ox::Point const &b) noexcept;
+[[nodiscard]]
+uint8_t getPixel(TileSheet::SubSheet const&ss, int8_t pBpp, ox::Point const&pt) noexcept;
+
+constexpr void walkPixels(TileSheet::SubSheet const&ss, int8_t pBpp, auto callback) noexcept {
+	if (pBpp == 4) {
+		const auto pixelCnt = ox::min<std::size_t>(
+				static_cast<std::size_t>(ss.columns * ss.rows * PixelsPerTile) / 2,
+				ss.pixels.size());
+		//oxAssert(pixels.size() == pixelCnt, "Pixel count does not match rows and columns");
+		for (std::size_t i = 0; i < pixelCnt; ++i) {
+			const auto colorIdx1 = static_cast<uint8_t>(ss.pixels[i] & 0xF);
+			const auto colorIdx2 = static_cast<uint8_t>(ss.pixels[i] >> 4);
+			callback(i * 2 + 0, colorIdx1);
+			callback(i * 2 + 1, colorIdx2);
+		}
+	} else {
+		const auto pixelCnt = ox::min<std::size_t>(
+				static_cast<std::size_t>(ss.columns * ss.rows * PixelsPerTile),
+				ss.pixels.size());
+		for (std::size_t i = 0; i < pixelCnt; ++i) {
+			const auto p = ss.pixels[i];
+			callback(i, p);
+		}
+	}
+}
+
+void setPixel(TileSheet::SubSheet &ss, int8_t pBpp, uint64_t idx, uint8_t palIdx) noexcept;
+
+void setPixel(TileSheet::SubSheet &ss, int8_t pBpp, ox::Point const&pt, uint8_t palIdx) noexcept;
+
+ox::Error setPixelCount(TileSheet::SubSheet &ss, int8_t pBpp, std::size_t cnt) noexcept;
 
 /**
  * Gets a count of the pixels in this sheet, and not that of its children.
+ * @param pBpp bits per pixel, need for knowing how to count the pixels
  * @return a count of the pixels in this sheet
  */
 [[nodiscard]]
-unsigned pixelCnt(TileSheet::SubSheet const&ss) noexcept;
+unsigned pixelCnt(TileSheet::SubSheet const&ss, int8_t pBpp) noexcept;
 
 /**
  *
  * @param ss
+ * @param pBpp
  * @param sz size of Subsheet in tiles (not pixels)
  */
-ox::Error resizeSubsheet(TileSheet::SubSheet &ss, ox::Size const&sz) noexcept;
+ox::Error resizeSubsheet(TileSheet::SubSheet &ss, int8_t pBpp, ox::Size const&sz) noexcept;
 
 /**
  * validateSubSheetIdx takes a SubSheetIdx and moves the index to the
  * preceding or parent sheet if the current corresponding sheet does
  * not exist.
- * @param ts
  * @param idx SubSheetIdx to validate and correct
  * @return a valid version of idx
  */
 [[nodiscard]]
 TileSheet::SubSheetIdx validateSubSheetIdx(TileSheet const&ts, TileSheet::SubSheetIdx idx) noexcept;
 
+[[nodiscard]]
+TileSheet::SubSheet const&getSubSheet(
+		TileSheet::SubSheetIdx const&idx,
+		std::size_t idxIt,
+		TileSheet::SubSheet const&pSubsheet) noexcept;
+
 [[nodiscard]]
 TileSheet::SubSheet &getSubSheet(
-		ox::SpanView<uint32_t> const&idx,
+		TileSheet::SubSheetIdx const&idx,
 		std::size_t idxIt,
 		TileSheet::SubSheet &pSubsheet) noexcept;
 
-#if defined(__GNUC__) && __GNUC__ >= 13
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wdangling-reference"
-#endif
 [[nodiscard]]
-TileSheet::SubSheet const&getSubSheet(TileSheet const&ts, ox::SpanView<uint32_t> const &idx) noexcept;
+TileSheet::SubSheet const&getSubSheet(TileSheet const&ts, TileSheet::SubSheetIdx const&idx) noexcept;
 
 [[nodiscard]]
-TileSheet::SubSheet &getSubSheet(TileSheet &ts, ox::SpanView<uint32_t> const &idx) noexcept;
+TileSheet::SubSheet &getSubSheet(TileSheet &ts, TileSheet::SubSheetIdx const&idx) noexcept;
-#if defined(__GNUC__) && __GNUC__ >= 13
-#pragma GCC diagnostic pop
-#endif
 
-ox::Error addSubSheet(TileSheet &ts, TileSheet::SubSheetIdx const &idx) noexcept;
+ox::Error addSubSheet(TileSheet &ts, TileSheet::SubSheetIdx const&idx) noexcept;
-
-ox::Error insertSubSheet(TileSheet &ts, ox::SpanView<uint32_t> const &idx, TileSheet::SubSheet ss) noexcept;
 
 ox::Error rmSubSheet(
 		TileSheet &ts,
@@ -458,7 +385,13 @@ ox::Error rmSubSheet(
 ox::Error rmSubSheet(TileSheet &ts, TileSheet::SubSheetIdx const&idx) noexcept;
 
 [[nodiscard]]
-uint8_t getPixel(
+uint8_t getPixel4Bpp(
+		TileSheet const&ts,
+		ox::Point const&pt,
+		TileSheet::SubSheetIdx const&subsheetIdx) noexcept;
+
+[[nodiscard]]
+uint8_t getPixel8Bpp(
 		TileSheet const&ts,
 		ox::Point const&pt,
 		TileSheet::SubSheetIdx const&subsheetIdx) noexcept;
@@ -467,8 +400,6 @@ ox::Result<SubSheetId> getIdFor(TileSheet const&ts, ox::StringViewCR path) noexc
 
 ox::Result<unsigned> getTileOffset(TileSheet const&ts, ox::StringViewCR pNamePath) noexcept;
 
-ox::Result<uint32_t> getTileOffset(TileSheet const&ts, SubSheetId pId) noexcept;
-
 ox::Result<ox::StringView> getNameFor(TileSheet::SubSheet const&ss, SubSheetId pId) noexcept;
 
 ox::Result<ox::StringView> getNameFor(TileSheet const&ts, SubSheetId pId) noexcept;
@@ -478,7 +409,7 @@ ox::Vector<uint8_t> pixels(TileSheet &ts) noexcept;
 
 
 struct CompactTileSheetV1 {
-	static constexpr auto TypeName = "net.drinkingtea.nostalgia.gfx.CompactTileSheet";
+	static constexpr auto TypeName = "net.drinkingtea.nostalgia.core.CompactTileSheet";
 	static constexpr auto TypeVersion = 1;
 	static constexpr auto Preloadable = true;
 	int8_t bpp = 0;
@@ -568,22 +499,6 @@ OX_MODEL_BEGIN(TileSheetV4)
 	OX_MODEL_FIELD(subsheet)
 OX_MODEL_END()
 
-OX_MODEL_BEGIN(TileSheetV5::SubSheet)
-	OX_MODEL_FIELD(id)
-	OX_MODEL_FIELD(name)
-	OX_MODEL_FIELD(rows)
-	OX_MODEL_FIELD(columns)
-	OX_MODEL_FIELD(subsheets)
-	OX_MODEL_FIELD(pixels)
-OX_MODEL_END()
-
-OX_MODEL_BEGIN(TileSheetV5)
-	OX_MODEL_FIELD(bpp)
-	OX_MODEL_FIELD(idIt)
-	OX_MODEL_FIELD(defaultPalette)
-	OX_MODEL_FIELD(subsheet)
-OX_MODEL_END()
-
 OX_MODEL_BEGIN(CompactTileSheetV1)
 	OX_MODEL_FIELD(bpp)
 	OX_MODEL_FIELD(defaultPalette)

src/nostalgia/modules/core/src/CMakeLists.txt

@@ -1,5 +1,5 @@
 add_library(
-	NostalgiaGfx
+	NostalgiaCore
 		gfx.cpp
 		tilesheet.cpp
 )
@@ -10,12 +10,12 @@ if(NOT BUILDCORE_TARGET STREQUAL "gba")
 endif()
 
 target_include_directories(
-	NostalgiaGfx PUBLIC
+	NostalgiaCore PUBLIC
 		../include
 )
 
 target_link_libraries(
-	NostalgiaGfx PUBLIC
+	NostalgiaCore PUBLIC
 		Turbine
 )
 
@@ -26,7 +26,7 @@ endif()
 
 install(
 	TARGETS
-		NostalgiaGfx
+		NostalgiaCore
 	DESTINATION
 		LIBRARY DESTINATION lib
 		ARCHIVE DESTINATION lib

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

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

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

@@ -4,14 +4,14 @@
 
 #include <turbine/turbine.hpp>
 
-#include <nostalgia/gfx/gfx.hpp>
+#include <nostalgia/core/gfx.hpp>
 
 #include "context.hpp"
 
-namespace nostalgia::gfx {
+namespace nostalgia::core {
 
-void safeDelete(Context *ctx) noexcept {
+void ContextDeleter::operator()(Context *p) noexcept {
-	delete ctx;
+	ox::safeDelete(p);
 }
 
 Context::Context(turbine::Context &tctx) noexcept: turbineCtx(tctx) {
@@ -19,10 +19,10 @@ 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 {
+ox::Result<ContextUPtr> 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));
+	return ContextUPtr(std::move(ctx));
 }
 
 keel::Context &keelCtx(Context &ctx) noexcept {
@@ -33,4 +33,4 @@ turbine::Context &turbineCtx(Context &ctx) noexcept {
 	return ctx.turbineCtx;
 }
 
-}
+}

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

@@ -4,9 +4,9 @@
 
 #pragma once
 
-#include <nostalgia/gfx/context.hpp>
+#include <nostalgia/core/context.hpp>
 
-namespace nostalgia::gfx {
+namespace nostalgia::core {
 
 struct BgCbbData {
 	unsigned bpp = 4;

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

@@ -11,15 +11,15 @@
 
 #include <keel/keel.hpp>
 
-#include <nostalgia/gfx/context.hpp>
+#include <nostalgia/core/context.hpp>
-#include <nostalgia/gfx/gfx.hpp>
+#include <nostalgia/core/gfx.hpp>
-#include <nostalgia/gfx/tilesheet.hpp>
+#include <nostalgia/core/tilesheet.hpp>
 
 #include "context.hpp"
 
 OX_ALLOW_UNSAFE_BUFFERS_BEGIN
 
-namespace nostalgia::gfx {
+namespace nostalgia::core {
 
 static constexpr auto SpriteCount = 128;
 
@@ -63,19 +63,6 @@ ox::Error loadSpritePalette(
 	return {};
 }
 
-void clearCbb(Context&, unsigned const cbb) noexcept {
-	for (auto &v : MEM_BG_TILES[cbb]) {
-		v = 0;
-	}
-}
-
-void clearCbbs(Context &ctx) noexcept {
-	clearCbb(ctx, 0);
-	clearCbb(ctx, 1);
-	clearCbb(ctx, 2);
-	clearCbb(ctx, 3);
-}
-
 static ox::Error loadTileSheetSet(
 		Context &ctx,
 		ox::Span<uint16_t> tileMapTargetMem,
@@ -112,10 +99,10 @@ ox::Error loadBgTileSheet(
 		size_t const tileCnt) noexcept {
 	size_t const bppMod = ts.bpp == 4;
 	size_t const bytesPerTile = PixelsPerTile >> bppMod;
-	auto const cnt = (tileCnt * bytesPerTile) / 2;
+	auto const pixCnt = tileCnt * bytesPerTile;
 	auto const srcPxIdx = srcTileIdx * bytesPerTile;
 	auto const dstPxIdx = (dstTileIdx * bytesPerTile) / 2;
-	for (size_t i = 0; i < cnt; ++i) {
+	for (size_t i = 0; i < pixCnt; ++i) {
 		auto const srcIdx = srcPxIdx + i * 2;
 		auto const p1 = static_cast<uint16_t>(ts.pixels[srcIdx]);
 		auto const p2 = static_cast<uint16_t>(ts.pixels[srcIdx + 1]);

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

@@ -4,8 +4,8 @@
 
 #pragma once
 
-#include <nostalgia/gfx/context.hpp>
+#include <nostalgia/core/context.hpp>
 
-namespace nostalgia::gfx {
+namespace nostalgia::core {
 ox::Error initGfx(Context &ctx, InitParams const&) noexcept;
 }

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

@@ -4,7 +4,6 @@
 
 
 #include <ox/std/def.hpp>
-#include <ox/std/realstd.hpp>
 
 #include <keel/media.hpp>
 #include <turbine/turbine.hpp>
@@ -12,7 +11,7 @@
 #include <teagba/addresses.hpp>
 #include <teagba/bios.hpp>
 
-#include <nostalgia/gfx/core.hpp>
+#include <nostalgia/core/core.hpp>
 
 #include "gfx.hpp"
 
@@ -22,7 +21,7 @@
 
 namespace ox {
 
-using namespace nostalgia::gfx;
+using namespace nostalgia::core;
 
 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
@@ -49,10 +48,12 @@ OX_ALLOW_UNSAFE_BUFFERS_END
 		oxErrf("\tError Message:\t{}\n", err.msg);
 	}
 	oxErrf("\tError Code:\t{}\n", static_cast<ErrorCode>(err));
-	if (err.src.file_name() != nullptr) {
+	if (err.file != nullptr) {
-		oxErrf("\tError Location:\t{}:{}\n", err.src.file_name(), err.src.line());
+		oxErrf("\tError Location:\t{}:{}\n", err.file, err.line);
 	}
-	abort();
+	// disable all interrupt handling and IntrWait on no interrupts
+	REG_IE = 0;
+	teagba::intrwait(0, 0);
 }
 
 }

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

@@ -3,9 +3,9 @@
  */
 
 #include <keel/media.hpp>
-#include <nostalgia/gfx/gfx.hpp>
+#include <nostalgia/core/gfx.hpp>
 
-namespace nostalgia::gfx {
+namespace nostalgia::core {
 
 constexpr auto GbaTileColumns = 32;
 constexpr auto GbaTileRows = 32;

src/nostalgia/modules/core/src/keel/CMakeLists.txt

@@ -1,18 +1,18 @@
 add_library(
-	NostalgiaGfx-Keel
+	NostalgiaCore-Keel
 		keelmodule.cpp
 		typeconv.cpp
 )
 
 target_link_libraries(
-	NostalgiaGfx-Keel PUBLIC
+	NostalgiaCore-Keel PUBLIC
 		Keel
-		NostalgiaGfx
+		NostalgiaCore
 )
 
 install(
 	TARGETS
-		NostalgiaGfx-Keel
+		NostalgiaCore-Keel
 	DESTINATION
 		LIBRARY DESTINATION lib
 		ARCHIVE DESTINATION lib

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

@@ -4,14 +4,15 @@
 
 #include <ox/model/model.hpp>
 
+#include <keel/asset.hpp>
 #include <keel/module.hpp>
 
-#include <nostalgia/gfx/palette.hpp>
+#include <nostalgia/core/palette.hpp>
-#include <nostalgia/gfx/tilesheet.hpp>
+#include <nostalgia/core/tilesheet.hpp>
 
 #include "typeconv.hpp"
 
-namespace nostalgia::gfx {
+namespace nostalgia::core {
 
 static class: public keel::Module {
 	private:
@@ -19,18 +20,16 @@ static class: public keel::Module {
 		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 {
-			return ox::String{"net.drinkingtea.nostalgia.gfx"};
+			return ox::String("net.drinkingtea.nostalgia.core");
 		}
 
 		[[nodiscard]]
@@ -40,13 +39,11 @@ static class: public keel::Module {
 				keel::generateTypeDesc<TileSheetV2>,
 				keel::generateTypeDesc<TileSheetV3>,
 				keel::generateTypeDesc<TileSheetV4>,
-				keel::generateTypeDesc<TileSheetV5>,
 				keel::generateTypeDesc<CompactTileSheetV1>,
 				keel::generateTypeDesc<PaletteV1>,
 				keel::generateTypeDesc<PaletteV2>,
 				keel::generateTypeDesc<PaletteV3>,
 				keel::generateTypeDesc<PaletteV4>,
-				keel::generateTypeDesc<PaletteV5>,
 				keel::generateTypeDesc<CompactPaletteV1>,
 			};
 		}
@@ -58,12 +55,10 @@ static class: public keel::Module {
 				&m_paletteV1ToPaletteV2Converter,
 				&m_paletteV2ToPaletteV3Converter,
 				&m_paletteV3ToPaletteV4Converter,
-				&m_paletteV4ToPaletteV5Converter,
 				&m_paletteToCompactPaletteConverter,
 				&m_tileSheetV1ToTileSheetV2Converter,
 				&m_tileSheetV2ToTileSheetV3Converter,
 				&m_tileSheetV3ToTileSheetV4Converter,
-				&m_tileSheetV4ToTileSheetV5Converter,
 				&m_tileSheetToCompactTileSheetConverter,
 			};
 		}
@@ -72,25 +67,23 @@ static class: public keel::Module {
 		ox::Vector<keel::PackTransform> packTransforms() const noexcept final {
 			return {
 				// convert tilesheets to CompactTileSheets
-				[](keel::Context &ctx, ox::Buffer &buff, ox::StringViewCR typeId) -> ox::Result<bool> {
+				[](keel::Context &ctx, ox::Buffer &buff, ox::StringView typeId) -> ox::Result<bool> {
 					if (typeId == ox::ModelTypeId_v<TileSheetV1> ||
 					    typeId == ox::ModelTypeId_v<TileSheetV2> ||
 					    typeId == ox::ModelTypeId_v<TileSheetV3> ||
-					    typeId == ox::ModelTypeId_v<TileSheetV4> ||
+					    typeId == ox::ModelTypeId_v<TileSheetV4>) {
-					    typeId == ox::ModelTypeId_v<TileSheetV5>) {
 						OX_RETURN_ERROR(keel::convertBuffToBuff<CompactTileSheet>(
 								ctx, buff, ox::ClawFormat::Metal).moveTo(buff));
 						return true;
 					}
 					return false;
 				},
-				[](keel::Context &ctx, ox::Buffer &buff, ox::StringViewCR typeId) -> ox::Result<bool> {
+				[](keel::Context &ctx, ox::Buffer &buff, ox::StringView typeId) -> ox::Result<bool> {
 					if (typeId == ox::ModelTypeId_v<NostalgiaPalette> ||
 					    typeId == ox::ModelTypeId_v<PaletteV1> ||
 					    typeId == ox::ModelTypeId_v<PaletteV2> ||
 					    typeId == ox::ModelTypeId_v<PaletteV3> ||
-					    typeId == ox::ModelTypeId_v<PaletteV4> ||
+					    typeId == ox::ModelTypeId_v<PaletteV4>) {
-					    typeId == ox::ModelTypeId_v<PaletteV5>) {
 						OX_RETURN_ERROR(keel::convertBuffToBuff<CompactPalette>(
 								ctx, buff, ox::ClawFormat::Metal).moveTo(buff));
 						return true;
@@ -99,7 +92,6 @@ static class: public keel::Module {
 				},
 			};
 		}
-
 } const mod;
 
 keel::Module const*keelModule() noexcept {

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

@@ -4,7 +4,7 @@
 
 #include "typeconv.hpp"
 
-namespace nostalgia::gfx {
+namespace nostalgia::core {
 
 ox::Error NostalgiaPaletteToPaletteV1Converter::convert(
 		keel::Context&,
@@ -52,26 +52,6 @@ ox::Error PaletteV3ToPaletteV4Converter::convert(
 	return {};
 }
 
-ox::Error PaletteV4ToPaletteV5Converter::convert(
-		keel::Context&,
-		PaletteV4 &src,
-		PaletteV5 &dst) const noexcept {
-	dst.colorNames = std::move(src.colorNames);
-	dst.pages.reserve(src.pages.size());
-	for (auto &s : src.pages) {
-		ox::Vector<PaletteColorV2> colors;
-		colors.reserve(s.colors.size());
-		for (auto const&c : s.colors) {
-			colors.emplace_back(c.r, c.g, c.b, c.a);
-		}
-		dst.pages.emplace_back(PalettePageV2{
-			std::move(s.name),
-			std::move(colors),
-		});
-	}
-	return {};
-}
-
 ox::Error PaletteToCompactPaletteConverter::convert(
 		keel::Context&,
 		Palette &src,
@@ -153,50 +133,12 @@ ox::Error TileSheetV3ToTileSheetV4Converter::convert(
 	return {};
 }
 
-
-void TileSheetV4ToTileSheetV5Converter::convertSubsheet(
-		int const bpp,
-		TileSheetV4::SubSheet &src,
-		TileSheetV5::SubSheet &dst) noexcept {
-	dst.id      = src.id;
-	dst.name    = std::move(src.name);
-	dst.columns = src.columns;
-	dst.rows    = src.rows;
-	if (bpp == 4) {
-		dst.pixels.reserve(2 * src.pixels.size());
-		dst.pixels.resize(0);
-		for (auto const p : src.pixels) {
-			dst.pixels.emplace_back(static_cast<uint8_t>(p & 0xf));
-			dst.pixels.emplace_back(static_cast<uint8_t>(p >> 4));
-		}
-		oxAssert(dst.pixels.size() == src.pixels.size() * 2, "mismatch");
-	} else {
-		dst.pixels = std::move(src.pixels);
-	}
-	dst.subsheets.resize(src.subsheets.size());
-	for (auto i = 0u; i < src.subsheets.size(); ++i) {
-		convertSubsheet(bpp, src.subsheets[i], dst.subsheets[i]);
-	}
-}
-
-ox::Error TileSheetV4ToTileSheetV5Converter::convert(
-		keel::Context&,
-		TileSheetV4 &src,
-		TileSheetV5 &dst) const noexcept {
-	dst.bpp            = src.bpp;
-	dst.idIt           = src.idIt;
-	OX_RETURN_ERROR(src.defaultPalette.getPath().moveTo(dst.defaultPalette));
-	convertSubsheet(dst.bpp, src.subsheet, dst.subsheet);
-	return {};
-}
-
-
 ox::Error TileSheetToCompactTileSheetConverter::convert(
 		keel::Context&,
 		TileSheet &src,
 		CompactTileSheet &dst) const noexcept {
 	dst.bpp            = src.bpp;
-	dst.defaultPalette = ox::FileAddress{src.defaultPalette};
+	dst.defaultPalette = std::move(src.defaultPalette);
 	dst.pixels         = pixels(src);
 	return {};
 }

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

@@ -8,11 +8,11 @@
 
 #include <keel/typeconv.hpp>
 
-#include <nostalgia/gfx/context.hpp>
+#include <nostalgia/core/context.hpp>
-#include <nostalgia/gfx/palette.hpp>
+#include <nostalgia/core/palette.hpp>
-#include <nostalgia/gfx/tilesheet.hpp>
+#include <nostalgia/core/tilesheet.hpp>
 
-namespace nostalgia::gfx {
+namespace nostalgia::core {
 
 // Type converters
 
@@ -21,19 +21,15 @@ class NostalgiaPaletteToPaletteV1Converter: public keel::Converter<NostalgiaPale
 };
 
 class PaletteV1ToPaletteV2Converter: public keel::Converter<PaletteV1, PaletteV2> {
-	ox::Error convert(keel::Context&, PaletteV1 &src, PaletteV2 &dst) const noexcept final;
+		ox::Error convert(keel::Context&, PaletteV1 &src, PaletteV2 &dst) const noexcept final;
 };
 
 class PaletteV2ToPaletteV3Converter: public keel::Converter<PaletteV2, PaletteV3> {
-	ox::Error convert(keel::Context&, PaletteV2 &src, PaletteV3 &dst) const noexcept final;
+		ox::Error convert(keel::Context&, PaletteV2 &src, PaletteV3 &dst) const noexcept final;
 };
 
 class PaletteV3ToPaletteV4Converter: public keel::Converter<PaletteV3, PaletteV4> {
-	ox::Error convert(keel::Context&, PaletteV3 &src, PaletteV4 &dst) const noexcept final;
+		ox::Error convert(keel::Context&, PaletteV3 &src, PaletteV4 &dst) const noexcept final;
-};
-
-class PaletteV4ToPaletteV5Converter: public keel::Converter<PaletteV4, PaletteV5> {
-	ox::Error convert(keel::Context&, PaletteV4 &src, PaletteV5 &dst) const noexcept final;
 };
 
 class PaletteToCompactPaletteConverter: public keel::Converter<Palette, CompactPalette> {
@@ -60,14 +56,6 @@ class TileSheetV3ToTileSheetV4Converter: public keel::Converter<TileSheetV3, Til
 	ox::Error convert(keel::Context&, TileSheetV3 &src, TileSheetV4 &dst) const noexcept final;
 };
 
-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;
-};
-
 class TileSheetToCompactTileSheetConverter: public keel::Converter<TileSheet, CompactTileSheet> {
 	ox::Error convert(keel::Context&, TileSheet &src, CompactTileSheet &dst) const noexcept final;
 };

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

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

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

@@ -5,10 +5,10 @@
 #include "context.hpp"
 #include "gfx.hpp"
 
-namespace nostalgia::gfx {
+namespace nostalgia::core {
 
-void safeDelete(Context *ctx) noexcept {
+void ContextDeleter::operator()(Context *p) noexcept {
-	delete ctx;
+	ox::safeDelete(p);
 }
 
 Context::Context(turbine::Context &tctx, InitParams const&params) noexcept:
@@ -23,10 +23,10 @@ Context::~Context() noexcept {
 	shutdownGfx(*this);
 }
 
-ox::Result<ox::UPtr<Context>> init(turbine::Context &tctx, InitParams const&params) noexcept {
+ox::Result<ContextUPtr> 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());
+	return ContextUPtr(ctx.release());
 }
 
 keel::Context &keelCtx(Context &ctx) noexcept {

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

@@ -8,12 +8,12 @@
 
 #include <glutils/glutils.hpp>
 
-#include <nostalgia/gfx/gfx.hpp>
+#include <nostalgia/core/gfx.hpp>
-#include <nostalgia/gfx/context.hpp>
+#include <nostalgia/core/context.hpp>
 
 #include "gfx.hpp"
 
-namespace nostalgia::gfx {
+namespace nostalgia::core {
 
 class Context {
 

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

@@ -10,15 +10,15 @@
 
 #include <glutils/glutils.hpp>
 
-#include <nostalgia/gfx/context.hpp>
+#include <nostalgia/core/context.hpp>
-#include <nostalgia/gfx/gfx.hpp>
+#include <nostalgia/core/gfx.hpp>
-#include <nostalgia/gfx/palette.hpp>
+#include <nostalgia/core/palette.hpp>
-#include <nostalgia/gfx/tilesheet.hpp>
+#include <nostalgia/core/tilesheet.hpp>
 
 #include "context.hpp"
 #include "gfx.hpp"
 
-namespace nostalgia::gfx {
+namespace nostalgia::core {
 
 namespace renderer {
 
@@ -28,7 +28,7 @@ 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));
+	core::gl::draw(m_ctx, turbine::getScreenSize(tctx));
 }
 
 static constexpr ox::CStringView bgvshadTmpl = R"glsl(
@@ -111,15 +111,15 @@ static constexpr auto bgVertexRow(uint_t x, uint_t y) noexcept {
 }
 
 static void setSpriteBufferObject(
-		uint_t const vi,
+		uint_t vi,
-		float const enabled,
+		float enabled,
 		float x,
 		float y,
-		uint_t const textureRow,
+		uint_t textureRow,
-		uint_t const flipX,
+		uint_t flipX,
-		uint_t const priority,
+		uint_t priority,
-		ox::Span<float> const vbo,
+		float *vbo,
-		ox::Span<GLuint> const ebo) noexcept {
+		GLuint *ebo) noexcept {
 	// don't worry, this memcpy gets optimized to something much more ideal
 	constexpr float xmod = 0.1f;
 	constexpr float ymod = 0.1f;
@@ -138,25 +138,25 @@ static void setSpriteBufferObject(
 	    enabled, x + xmod, y + ymod, prif, R, textureRowf + 0, // top right
 	    enabled,        x, y + ymod, prif, L, textureRowf + 0, // top left
 	};
-	ox::spancpy<float>(vbo, vertices);
+	memcpy(vbo, vertices.data(), sizeof(vertices));
 	ox::Array<GLuint, SpriteVertexEboLength> const elms {
-		vi + 0, vi + 1, vi + 2,
+			vi + 0, vi + 1, vi + 2,
-		vi + 2, vi + 3, vi + 0,
+			vi + 2, vi + 3, vi + 0,
 	};
-	ox::spancpy<GLuint>(ebo, elms);
+	memcpy(ebo, elms.data(), sizeof(elms));
 }
 
 static void setTileBufferObject(
-		uint_t const vi,
+		uint_t vi,
 		float x,
 		float y,
-		float const textureTileIdx,
+		float textureTileIdx,
-		float const priority,
+		float priority,
-		float const palOffset,
+		float palOffset,
-		bool const flipX,
+		bool flipX,
-		bool const flipY,
+		bool flipY,
-		ox::Span<float> const vbo,
+		float *vbo,
-		ox::Span<GLuint> const ebo) noexcept {
+		GLuint *ebo) noexcept {
 	// don't worry, this memcpy gets optimized to something much more ideal
 	constexpr float ymod = 0.1f;
 	constexpr float xmod = 0.1f;
@@ -170,35 +170,24 @@ static void setTileBufferObject(
 	float const T = flipY ? 1 : 0;
 	float const B = flipY ? 0 : 1;
 	ox::Array<float, BgVertexVboLength> const vertices {
-		       x,        y, prif, L, B, textureTileIdx, palOffset, // bottom left
+			       x,        y, prif, L, B, textureTileIdx, palOffset, // bottom left
-		x + xmod,        y, prif, R, B, textureTileIdx, palOffset, // bottom right
+			x + xmod,        y, prif, R, B, textureTileIdx, palOffset, // bottom right
-		x + xmod, y + ymod, prif, R, T, textureTileIdx, palOffset, // top right
+			x + xmod, y + ymod, prif, R, T, textureTileIdx, palOffset, // top right
-		       x, y + ymod, prif, L, T, textureTileIdx, palOffset, // top left
+			       x, y + ymod, prif, L, T, textureTileIdx, palOffset, // top left
 	};
-	ox::spancpy<float>(vbo, vertices);
+	memcpy(vbo, vertices.data(), sizeof(vertices));
 	ox::Array<GLuint, BgVertexEboLength> const elms {
-		vi + 0, vi + 1, vi + 2,
+			vi + 0, vi + 1, vi + 2,
-		vi + 2, vi + 3, vi + 0,
+			vi + 2, vi + 3, vi + 0,
 	};
-	ox::spancpy<GLuint>(ebo, elms);
+	memcpy(ebo, elms.data(), sizeof(elms));
 }
 
 static void initSpriteBufferObjects(Context &ctx, glutils::BufferSet &bs) noexcept {
 	for (auto i = 0u; i < ctx.spriteCount; ++i) {
-		auto const vbo = ox::Span{bs.vertices}
+		auto vbo = &bs.vertices[i * static_cast<std::size_t>(SpriteVertexVboLength)];
-			+ i * static_cast<std::size_t>(SpriteVertexVboLength);
+		auto ebo = &bs.elements[i * static_cast<std::size_t>(SpriteVertexEboLength)];
-		auto const ebo = ox::Span{bs.elements}
+		setSpriteBufferObject(i * static_cast<uint_t>(SpriteVertexVboRows) * ctx.blocksPerSprite, 0, 0, 0, 0, false, 0, vbo, ebo);
-			+ i * static_cast<std::size_t>(SpriteVertexEboLength);
-		setSpriteBufferObject(
-			i * static_cast<uint_t>(SpriteVertexVboRows) * ctx.blocksPerSprite,
-			0,
-			0,
-			0,
-			0,
-			false,
-			0,
-			vbo,
-			ebo);
 	}
 }
 
@@ -206,10 +195,8 @@ static void initBackgroundBufferObjects(glutils::BufferSet &bs) noexcept {
 	for (auto x = 0u; x < TileColumns; ++x) {
 		for (auto y = 0u; y < TileRows; ++y) {
 			const auto i = bgVertexRow(x, y);
-			auto const vbo = ox::Span{bs.vertices}
+			auto vbo = &bs.vertices[i * static_cast<std::size_t>(BgVertexVboLength)];
-				+ i * static_cast<std::size_t>(BgVertexVboLength);
+			auto ebo = &bs.elements[i * static_cast<std::size_t>(BgVertexEboLength)];
-			auto const ebo = ox::Span{bs.elements}
-				+ i * static_cast<std::size_t>(BgVertexEboLength);
 			setTileBufferObject(
 				static_cast<uint_t>(i * BgVertexVboRows),
 				static_cast<float>(x),
@@ -434,8 +421,8 @@ static void setSprite(
 		auto const eboIdx = eboBase + renderer::SpriteVertexEboLength * i;
 		oxAssert(vboIdx < ctx.spriteBlocks.vertices.size(), "vbo overflow");
 		oxAssert(eboIdx < ctx.spriteBlocks.elements.size(), "ebo overflow");
-		auto const vbo = ox::Span{ctx.spriteBlocks.vertices} + vboIdx;
+		auto const vbo = &ctx.spriteBlocks.vertices[vboIdx];
-		auto const ebo = ox::Span{ctx.spriteBlocks.elements} + eboIdx;
+		auto const ebo = &ctx.spriteBlocks.elements[eboIdx];
 		renderer::setSpriteBufferObject(
 				static_cast<uint_t>(vboIdx),
 				enabled,
@@ -449,7 +436,7 @@ static void setSprite(
 		++i;
 	};
 	if (!s.flipX) {
-		for (auto yIt = 0u; yIt < dim.y; ++yIt) {
+		for (auto yIt = 0; yIt < static_cast<int>(dim.y); ++yIt) {
 			for (auto xIt = 0u; xIt < dim.x; ++xIt) {
 				set(static_cast<int>(xIt), static_cast<int>(yIt), s.enabled);
 			}
@@ -569,7 +556,7 @@ static void copyPixels(
 		CompactTileSheet const&ts,
 		ox::Span<uint32_t> dst,
 		size_t const srcPxIdx,
-		size_t const pxlCnt) noexcept {
+		size_t pxlCnt) noexcept {
 	size_t idx{};
 	if (ts.bpp == 4) {
 		for (size_t i = 0; i < pxlCnt; i += 2) {
@@ -586,18 +573,6 @@ static void copyPixels(
 	}
 }
 
-void clearCbb(Context &ctx, unsigned const cbb) noexcept {
-	for (auto &v : ctx.cbbs[cbb].pixels) {
-		v = 0;
-	}
-}
-
-void clearCbbs(Context &ctx) noexcept {
-	for (unsigned i = 0 ; i < ctx.cbbs.size(); ++i) {
-		clearCbb(ctx, i);
-	}
-}
-
 ox::Error loadBgTileSheet(
 		Context &ctx,
 		unsigned const cbb,
@@ -650,7 +625,7 @@ ox::Error loadSpriteTileSheet(
 		CompactTileSheet const&ts,
 		bool loadDefaultPalette) noexcept {
 	OX_REQUIRE(tsd, normalizeTileSheet(ts));
-	oxTracef("nostalgia.gfx.gl", "loadSpriteTexture: { w: {}, h: {} }", tsd.width, tsd.height);
+	oxTracef("nostalgia.core.gfx.gl", "loadSpriteTexture: { w: {}, h: {} }", tsd.width, tsd.height);
 	ctx.spriteBlocks.tex = renderer::createTexture(tsd.width, tsd.height, tsd.pixels.data());
 	if (loadDefaultPalette) {
 		OX_RETURN_ERROR(loadSpritePalette(ctx, ts.defaultPalette));
@@ -673,7 +648,7 @@ void setBgTile(
 		int row,
 		BgTile const&tile) noexcept {
 	oxTracef(
-			"nostalgia.gfx.setBgTile",
+			"nostalgia.core.gfx.setBgTile",
 			"bgIdx: {}, column: {}, row: {}, tile: {}, palBank: {}",
 			bgIdx, column, row, tile.tileIdx, tile.palBank);
 	const auto z = static_cast<uint_t>(bgIdx);
@@ -681,8 +656,8 @@ void setBgTile(
 	const auto x = static_cast<uint_t>(column);
 	const auto i = renderer::bgVertexRow(x, y);
 	auto &cbb = ctx.cbbs[z];
-	const auto vbo = ox::Span{cbb.vertices} + i * renderer::BgVertexVboLength;
+	const auto vbo = &cbb.vertices[i * renderer::BgVertexVboLength];
-	const auto ebo = ox::Span{cbb.elements} + i * renderer::BgVertexEboLength;
+	const auto ebo = &cbb.elements[i * renderer::BgVertexEboLength];
 	auto &bg = ctx.backgrounds[bgIdx];
 	renderer::setTileBufferObject(
 			static_cast<uint_t>(i * renderer::BgVertexVboRows),
@@ -768,7 +743,7 @@ ox::Size drawSize(int scale) noexcept {
 	return {240 * scale, 160 * scale};
 }
 
-void draw(gfx::Context &ctx, ox::Size const&renderSz) noexcept {
+void draw(core::Context &ctx, ox::Size const&renderSz) noexcept {
 	glViewport(0, 0, renderSz.width, renderSz.height);
 	glEnable(GL_DEPTH_TEST);
 	glEnable(GL_BLEND);
@@ -783,7 +758,7 @@ void draw(gfx::Context &ctx, ox::Size const&renderSz) noexcept {
 	glDisable(GL_BLEND);
 }
 
-void draw(gfx::Context &ctx, int scale) noexcept {
+void draw(core::Context &ctx, int scale) noexcept {
 	draw(ctx, drawSize(scale));
 }
 

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

@@ -10,9 +10,9 @@
 
 #include <glutils/glutils.hpp>
 
-#include <nostalgia/gfx/context.hpp>
+#include <nostalgia/core/context.hpp>
 
-namespace nostalgia::gfx::renderer {
+namespace nostalgia::core::renderer {
 
 constexpr uint64_t TileRows = 128;
 constexpr uint64_t TileColumns = 128;
@@ -59,7 +59,7 @@ class Drawer: public turbine::gl::Drawer {
 
 }
 
-namespace nostalgia::gfx {
+namespace nostalgia::core {
 ox::Error initGfx(Context &ctx, InitParams const&) noexcept;
 void shutdownGfx(Context &ctx) noexcept;
 }

src/nostalgia/modules/core/src/studio/CMakeLists.txt

@@ -0,0 +1,30 @@
+add_library(NostalgiaCore-Studio)
+
+add_library(
+	NostalgiaCore-Studio-ImGui
+		studiomodule.cpp
+		tilesheeteditor/tilesheeteditor-imgui.cpp
+)
+
+target_link_libraries(
+	NostalgiaCore-Studio PUBLIC
+		NostalgiaCore
+		Studio
+)
+
+target_link_libraries(
+	NostalgiaCore-Studio-ImGui PUBLIC
+		NostalgiaCore-Studio
+		Studio
+)
+
+install(
+	TARGETS
+		NostalgiaCore-Studio-ImGui
+		NostalgiaCore-Studio
+	LIBRARY DESTINATION
+		${NOSTALGIA_DIST_MODULE}
+)
+
+add_subdirectory(paletteeditor)
+add_subdirectory(tilesheeteditor)