[nostalgia/studio] Update version to d2024.12.1

.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,49 +1,35 @@
 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_CAP}
+	${BC_CMD_ENVRUN} ${BC_PY3} ./scripts/pkg-gba.py sample_project ${BC_VAR_PROJECT_NAME}
 
-.PHONY: pkg-mac
-pkg-mac: install
-	${BC_CMD_ENVRUN} ${BC_PY3} ./util/scripts/pkg-dmg.py
-
-.PHONY: generate-studio-rsrc
-generate-studio-rsrc:
-	${BC_CMD_ENVRUN} ${BC_PY3} ./util/scripts/file-to-cpp.py --rsrc src/olympic/studio/applib/src/rsrc.json
-	${BC_CMD_ENVRUN} ${BC_PY3} ./util/scripts/file-to-cpp.py --rsrc src/nostalgia/studio/rsrc.json
-
-.PHONY: build-player
-build-player:
-	${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_CAP}.gba
+	${MGBA} ${BC_VAR_PROJECT_NAME}.gba
 .PHONY: debug
 debug: build
-	${BC_CMD_HOST_DEBUGGER} ${PROJECT_PLAYER} sample_project
+	${BC_CMD_HOST_DEBUGGER} ./build/${BC_VAR_CURRENT_BUILD}/bin/${BC_VAR_PROJECT_NAME} sample_project
 .PHONY: debug-studio
 debug-studio: build
-	${BC_CMD_HOST_DEBUGGER} ${PROJECT_STUDIO}
+	${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/pybb.py

@@ -11,7 +11,6 @@
 # "Python Busy Box" - adds cross-platform equivalents to Unix commands that
 #                     don't translate well to that other operating system
 
-import multiprocessing
 import os
 import platform
 import shutil
@@ -58,11 +57,7 @@ def cmake_build(base_path: str, target: Optional[str]) -> int:
         path = os.path.join(base_path, d)
         if not os.path.isdir(path):
             continue
-        args = ['cmake', '--build', path, f'-j{multiprocessing.cpu_count()}']
+        args = ['cmake', '--build', path]
-        if path.endswith('release'):
-            args.append('--config=release')
-        elif path.endswith('debug'):
-            args.append('--config=debug')
         if target is not None:
             args.extend(['--target', target])
         err = subprocess.run(args).returncode

deps/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)
-
-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
@@ -20,11 +20,3 @@ 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/clargs/clargs.cpp

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

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

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

deps/ox/src/ox/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/filestore/filestoretemplate.hpp

@@ -433,14 +433,14 @@ Error FileStoreTemplate<size_t>::resize() {
 template<typename size_t>
 Error FileStoreTemplate<size_t>::resize(std::size_t size, void *newBuff) {
 	if (m_buffer->size() > size) {
-		return ox::Error{1, "new buffer is too small for existing data"};
+		return ox::Error(1);
 	}
 	m_buffSize = static_cast<size_t>(size);
 	if (newBuff) {
-		m_buffer = static_cast<Buffer*>(newBuff);
+		m_buffer = reinterpret_cast<Buffer*>(newBuff);
 		OX_RETURN_ERROR(m_buffer->setSize(static_cast<size_t>(size)));
 	}
-	return {};
+	return ox::Error(0);
 }
 
 template<typename size_t>

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

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

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

@@ -24,6 +24,9 @@ enum class FileAddressType: int8_t {
 	Inode,
 };
 
+template<typename T>
+constexpr Error model(T *h, CommonPtrWith<class FileAddress> auto *fa) noexcept;
+
 class FileAddress {
 
 	template<typename T>

deps/ox/src/ox/fs/filesystem/filesystem.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

@@ -20,7 +20,7 @@
 namespace ox {
 
 namespace detail {
-inline void fsBuffFree(char *buff) noexcept {
+static inline void fsBuffFree(char *buff) noexcept {
 	safeDelete(buff);
 }
 }
@@ -41,45 +41,25 @@ 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;
 
-		Error read(StringViewCR path, void *buffer, std::size_t buffSize) noexcept {
+		inline Error read(StringViewCR path, void *buffer, std::size_t buffSize) noexcept {
 			return readFilePath(path, buffer, buffSize);
 		}
 
-		Error read(uint64_t inode, void *buffer, std::size_t buffSize) noexcept {
+		inline Error read(uint64_t inode, void *buffer, std::size_t buffSize) noexcept {
 			return readFileInode(inode, buffer, buffSize);
 		}
 
-		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 buff
-		 * @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;
 
@@ -101,36 +81,36 @@ class FileSystem {
 
 		Error write(const FileAddress &addr, const void *buffer, uint64_t size, FileType fileType = FileType::NormalFile) noexcept;
 
-		Error write(StringViewCR path, const void *buffer, uint64_t size, FileType fileType) noexcept {
+		inline Error write(StringViewCR path, const void *buffer, uint64_t size, FileType fileType) noexcept {
 			return writeFilePath(path, buffer, size, fileType);
 		}
 
-		Error write(uint64_t inode, const void *buffer, uint64_t size, FileType fileType) noexcept {
+		inline Error write(uint64_t inode, const void *buffer, uint64_t size, FileType fileType) noexcept {
 			return writeFileInode(inode, buffer, size, fileType);
 		}
 
-		Result<FileStat> stat(uint64_t inode) const noexcept {
+		inline Result<FileStat> stat(uint64_t inode) const noexcept {
 			return statInode(inode);
 		}
 
-		Result<FileStat> stat(StringViewCR path) const noexcept {
+		inline Result<FileStat> stat(StringViewCR path) const noexcept {
 			return statPath(path);
 		}
 
 		Result<FileStat> stat(const FileAddress &addr) const noexcept;
 
 		[[nodiscard]]
-		bool exists(uint64_t inode) const noexcept {
+		inline bool exists(uint64_t inode) const noexcept {
 			return statInode(inode).ok();
 		}
 
 		[[nodiscard]]
-		bool exists(ox::StringView path) const noexcept {
+		inline bool exists(ox::StringView path) const noexcept {
 			return statPath(path).ok();
 		}
 
 		[[nodiscard]]
-		bool exists(FileAddress const&addr) const noexcept {
+		inline bool exists(FileAddress const&addr) const noexcept {
 			return stat(addr).ok();
 		}
 
@@ -160,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;
 
@@ -177,11 +152,11 @@ class MemFS: public FileSystem {
 	public:
 		Result<const char*> directAccess(const FileAddress &addr) const noexcept;
 
-		Result<const char*> directAccess(StringViewCR path) const noexcept {
+		inline Result<const char*> directAccess(StringViewCR path) const noexcept {
 			return directAccessPath(path);
 		}
 
-		Result<const char*> directAccess(uint64_t inode) const noexcept {
+		inline Result<const char*> directAccess(uint64_t inode) const noexcept {
 			return directAccessInode(inode);
 		}
 
@@ -234,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;
@@ -246,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.
 		 */
@@ -384,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);
@@ -438,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();
@@ -468,7 +433,7 @@ Error FileSystemTemplate<FileStore, Directory>::writeFilePath(
 
 template<typename FileStore, typename Directory>
 Error FileSystemTemplate<FileStore, Directory>::writeFileInode(uint64_t inode, const void *buffer, uint64_t size, FileType fileType) noexcept {
-	oxTrace("ox.fs.FileSystemTemplate.writeFileInode", ox::intToStr(inode));
+	oxTrace("ox.fs.FileSystemTemplate.writeFileInode", ox::itoa(inode));
 	return m_fs.write(inode, buffer, static_cast<size_t>(size), static_cast<uint8_t>(fileType));
 }
 

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

@@ -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/fs/test/tests.cpp

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

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

@@ -57,9 +57,7 @@ static ox::Error runRead(ox::FileSystem *fs, ox::Span<const char*> args) noexcep
 		return ox::Error(1);
 	}
 	OX_REQUIRE(buff, fs->read(ox::StringView(args[1])));
-	OX_ALLOW_UNSAFE_BUFFERS_BEGIN
 	std::ignore = fwrite(buff.data(), sizeof(decltype(buff)::value_type), buff.size(), stdout);
-	OX_ALLOW_UNSAFE_BUFFERS_END
 	return ox::Error(0);
 }
 

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/mc/intops.hpp

@@ -71,9 +71,7 @@ constexpr McInt encodeInteger(I pInput) noexcept {
 	// move input to uint64_t to allow consistent bit manipulation, and to avoid
 	// overflow concerns
 	uint64_t val = 0;
-	OX_ALLOW_UNSAFE_BUFFERS_BEGIN
 	ox::memcpy(&val, &input, sizeof(input));
-	OX_ALLOW_UNSAFE_BUFFERS_END
 	if (val) {
 		// bits needed to represent number factoring in space possibly
 		// needed for signed bit
@@ -96,9 +94,7 @@ constexpr McInt encodeInteger(I pInput) noexcept {
 		}
 		if (bytes == 9) {
 			out.data[0] = bytesIndicator;
-			OX_ALLOW_UNSAFE_BUFFERS_BEGIN
 			ox::memcpy(&out.data[1], &leVal, 8);
-			OX_ALLOW_UNSAFE_BUFFERS_END
 			if (inputNegative) {
 				out.data[1] |= 0b1000'0000;
 			}
@@ -108,9 +104,7 @@ constexpr McInt encodeInteger(I pInput) noexcept {
 			auto intermediate =
 				static_cast<uint64_t>(leVal.raw() | (negBit << (valBits - 1))) << bytes |
 				static_cast<uint64_t>(bytesIndicator);
-			OX_ALLOW_UNSAFE_BUFFERS_BEGIN
 			ox::memcpy(&out.data[0], &intermediate, sizeof(intermediate));
-			OX_ALLOW_UNSAFE_BUFFERS_END
 		}
 		out.length = bytes;
 	}
@@ -166,9 +160,7 @@ constexpr Result<I> decodeInteger(Reader_c auto&rdr, std::size_t *bytesRead) noe
 			 ox::Array<uint32_t, 2> d = {};
 			 //d[0] = decoded & 0xffff'ffff;
 			 //d[1] = decoded >> 32;
-		 	OX_ALLOW_UNSAFE_BUFFERS_BEGIN
 			 ox::memcpy(&d[0], &decoded, sizeof(decoded));
-		 	OX_ALLOW_UNSAFE_BUFFERS_END
 			 auto bit = negBit;
 			 for (; bit < ox::min<std::size_t>(Bits<I>, 32); ++bit) {
 				 d[0] |= 1 << bit;
@@ -183,9 +175,7 @@ constexpr Result<I> decodeInteger(Reader_c auto&rdr, std::size_t *bytesRead) noe
 				 d[0] = d[1];
 				 d[1] = d0Tmp;
 			 }
-		 	OX_ALLOW_UNSAFE_BUFFERS_BEGIN
 			 ox::memcpy(&out, &d[0], sizeof(out));
-			OX_ALLOW_UNSAFE_BUFFERS_END
 			 return out;
 		 }
 	}

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

@@ -214,12 +214,7 @@ template<Writer_c Writer>
 constexpr Error MetalClawWriter<Writer>::fieldCString(const char*, const char *const*val, std::size_t) noexcept {
 	bool fieldSet = false;
 	if (!m_unionIdx.has_value() || *m_unionIdx == m_field) {
-		OX_ALLOW_UNSAFE_BUFFERS_BEGIN
-		// this strlen is tolerated because sometimes 0 gets passed to
-		// the size param, which is a lie
-		// this code should be cleaned up at some point...
 		const auto strLen = *val ? ox::strlen(*val) : 0;
-		OX_ALLOW_UNSAFE_BUFFERS_END
 		// write the length
 		const auto strLenBuff = mc::encodeInteger(strLen);
 		OX_RETURN_ERROR(m_writer.write(reinterpret_cast<const char*>(strLenBuff.data.data()), strLenBuff.length));

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

@@ -997,7 +997,7 @@ constexpr ModelValue::ModelValue(const ModelValue &other) noexcept {
 		case Type::SignedInteger16:
 		case Type::SignedInteger32:
 		case Type::SignedInteger64:
-			m_data = other.m_data;
+			ox::memcpy(&m_data, &other.m_data, sizeof(m_data));
 			break;
 		case Type::String:
 			m_data.str = new String(other.get<String>());
@@ -1030,8 +1030,8 @@ constexpr ModelValue::ModelValue(ModelValue &&other) noexcept {
 		case Type::SignedInteger16:
 		case Type::SignedInteger32:
 		case Type::SignedInteger64:
-			m_data = other.m_data;
+			ox::memcpy(&m_data, &other.m_data, sizeof(m_data));
-			other.m_data.ui64 = 0;
+			ox::memset(&other.m_data, 0, sizeof(m_data));
 			break;
 		case Type::String:
 			m_data.str = other.m_data.str;
@@ -1223,7 +1223,7 @@ constexpr ModelValue &ModelValue::operator=(const ModelValue &other) noexcept {
 		case Type::SignedInteger16:
 		case Type::SignedInteger32:
 		case Type::SignedInteger64:
-			m_data = other.m_data;
+			ox::memcpy(&m_data, &other.m_data, sizeof(m_data));
 			break;
 		case Type::String:
 			m_data.str = new String(other.get<String>());
@@ -1261,8 +1261,8 @@ constexpr ModelValue &ModelValue::operator=(ModelValue &&other) noexcept {
 		case Type::SignedInteger16:
 		case Type::SignedInteger32:
 		case Type::SignedInteger64:
-			m_data = other.m_data;
+			ox::memcpy(&m_data, &other.m_data, sizeof(m_data));
-			other.m_data = {};
+			ox::memset(&other.m_data, 0, sizeof(m_data));
 			break;
 		case Type::String:
 			m_data.str = other.m_data.str;

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

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

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

@@ -15,7 +15,7 @@ namespace ox {
 
 OrganicClawReader::OrganicClawReader(const uint8_t *buff, std::size_t buffSize) {
 	auto json = reinterpret_cast<const char*>(buff);
-	auto jsonLen = ox::strnlen_s(json, buffSize);
+	auto jsonLen = ox::strnlen(json, buffSize);
 	Json::CharReaderBuilder parserBuilder;
 	auto parser = std::unique_ptr<Json::CharReader>(parserBuilder.newCharReader());
 	if (!parser->parse(json, json + jsonLen, &m_json, nullptr)) {

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

@@ -8,11 +8,7 @@
 
 #pragma once
 
-#include <ox/std/def.hpp>
-
-OX_ALLOW_UNSAFE_BUFFERS_BEGIN
 #include <json/json.h>
-OX_ALLOW_UNSAFE_BUFFERS_END
 
 #include <ox/model/fieldcounter.hpp>
 #include <ox/model/modelhandleradaptor.hpp>
@@ -148,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");
 				}
@@ -180,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/oc/write.hpp

@@ -8,11 +8,7 @@
 
 #pragma once
 
-#include <ox/std/def.hpp>
-
-OX_ALLOW_UNSAFE_BUFFERS_BEGIN
 #include <json/json.h>
-OX_ALLOW_UNSAFE_BUFFERS_END
 
 #include <ox/model/fieldcounter.hpp>
 #include <ox/model/modelhandleradaptor.hpp>
@@ -262,9 +258,7 @@ Result<ox::Buffer> writeOC(const auto &val) noexcept {
 	const auto str = Json::writeString(jsonBuilder, writer.m_json);
 	Result<Buffer> buff;
 	buff.value.resize(str.size() + 1);
-	OX_ALLOW_UNSAFE_BUFFERS_BEGIN
 	memcpy(buff.value.data(), str.data(), str.size() + 1);
-	OX_ALLOW_UNSAFE_BUFFERS_END
 	return buff;
 }
 
@@ -276,9 +270,7 @@ Result<ox::String> writeOCString(const auto &val) noexcept {
 	const auto str = Json::writeString(jsonBuilder, writer.m_json);
 	Result<ox::String> buff;
 	buff.value.resize(str.size());
-	OX_ALLOW_UNSAFE_BUFFERS_BEGIN
 	memcpy(buff.value.data(), str.data(), str.size() + 1);
-	OX_ALLOW_UNSAFE_BUFFERS_END
 	return buff;
 }
 

deps/ox/src/ox/std/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/cstrops.hpp

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

deps/ox/src/ox/std/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);
 	}
-	}
 	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/istring.hpp

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

deps/ox/src/ox/std/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

@@ -13,12 +13,3 @@
 #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

@@ -8,17 +8,13 @@
 
 #pragma once
 
-#if __has_include(<array>)
-#include <array>
-#endif
-
 #include "array.hpp"
 #include "bit.hpp"
 #include "def.hpp"
 #include "iterator.hpp"
 #include "vector.hpp"
 
-OX_ALLOW_UNSAFE_BUFFERS_BEGIN
+OX_CLANG_NOWARN_BEGIN(-Wunsafe-buffer-usage)
 
 namespace ox {
 
@@ -39,20 +35,6 @@ class Span {
 
 		constexpr Span() noexcept = default;
 
-#if __has_include(<array>)
-		template<std::size_t sz>
-		constexpr Span(std::array<T, sz> &a) noexcept:
-			m_items(a.data()),
-			m_size(a.size()) {
-		}
-
-		template<std::size_t sz>
-		constexpr Span(std::array<ox::remove_const_t<T>, sz> const&a) noexcept:
-			m_items(a.data()),
-			m_size(a.size()) {
-		}
-#endif
-
 		template<std::size_t sz>
 		constexpr Span(ox::Array<T, sz> &a) noexcept:
 			m_items(a.data()),
@@ -147,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;
@@ -186,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

@@ -28,7 +28,7 @@ OX_CLANG_NOWARN_BEGIN(-Wunsafe-buffer-usage)
 namespace ox {
 
 template<typename Integer>
-constexpr ox::IString<21> intToStr(Integer v) noexcept;
+constexpr ox::IString<21> itoa(Integer v) noexcept;
 
 template<std::size_t SmallStringSize_v>
 class BasicString {
@@ -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;
 
@@ -213,22 +213,22 @@ class BasicString {
 
 		[[nodiscard]]
 		constexpr const char *c_str() const noexcept {
-			return m_buff.data();
+			return static_cast<const char*>(m_buff.data());
 		}
 
 		[[nodiscard]]
-		constexpr explicit operator const char*() const {
+		inline explicit operator const char*() const {
 			return c_str();
 		}
 
 #if __has_include(<string>)
 		[[nodiscard]]
-		std::string toStdString() const {
+		inline std::string toStdString() const {
 			return c_str();
 		}
 
 		[[nodiscard]]
-		explicit operator std::string() const {
+		inline explicit operator std::string() const {
 			return c_str();
 		}
 #endif
@@ -317,13 +317,13 @@ constexpr BasicString<SmallStringSize_v> &BasicString<SmallStringSize_v>::operat
 
 template<std::size_t SmallStringSize_v>
 constexpr BasicString<SmallStringSize_v> &BasicString<SmallStringSize_v>::operator=(int64_t i) noexcept {
-	set(ox::intToStr(i));
+	set(ox::itoa(i));
 	return *this;
 }
 
 template<std::size_t SmallStringSize_v>
 constexpr BasicString<SmallStringSize_v> &BasicString<SmallStringSize_v>::operator=(uint64_t i) noexcept {
-	set(ox::intToStr(i));
+	set(ox::itoa(i));
 	return *this;
 }
 
@@ -371,7 +371,7 @@ constexpr BasicString<SmallStringSize_v> &BasicString<SmallStringSize_v>::operat
 
 template<std::size_t SmallStringSize_v>
 constexpr BasicString<SmallStringSize_v> &BasicString<SmallStringSize_v>::operator+=(Integer_c auto i) noexcept {
-	auto const str = ox::intToStr(i);
+	auto const str = ox::itoa(i);
 	return this->operator+=(str.c_str());
 }
 
@@ -392,7 +392,7 @@ template<std::size_t SmallStringSize_v>
 constexpr BasicString<SmallStringSize_v> BasicString<SmallStringSize_v>::operator+(const char *str) const noexcept {
 	const std::size_t strLen = ox::strlen(str);
 	const auto currentLen = len();
-	BasicString<SmallStringSize_v> cpy;
+	BasicString<SmallStringSize_v> cpy(currentLen + strLen);
 	cpy.m_buff.resize(m_buff.size() + strLen);
 	ox::listcpy(&cpy.m_buff[0], m_buff.data(), currentLen);
 	ox::listcpy(&cpy.m_buff[currentLen], str, strLen);
@@ -414,7 +414,7 @@ constexpr BasicString<SmallStringSize_v> BasicString<SmallStringSize_v>::operato
 
 template<std::size_t SmallStringSize_v>
 constexpr BasicString<SmallStringSize_v> BasicString<SmallStringSize_v>::operator+(Integer_c auto i) const noexcept {
-	auto const str = ox::intToStr(i);
+	auto const str = ox::itoa(i);
 	return *this + str;
 }
 
@@ -425,8 +425,7 @@ constexpr BasicString<SmallStringSize_v> BasicString<SmallStringSize_v>::operato
 	BasicString<SmallStringSize_v> cpy(currentLen + strLen);
 	cpy.m_buff.resize(m_buff.size() + strLen);
 	ox::listcpy(&cpy.m_buff[0], m_buff.data(), currentLen);
-	ox::listcpy(&cpy.m_buff[currentLen], src.data(), strLen);
+	ox::listcpy(&cpy.m_buff[currentLen], src.data(), strLen + 1);
-	cpy.m_buff[cpy.m_buff.size() - 1] = 0;
 	return cpy;
 }
 
@@ -437,8 +436,7 @@ constexpr BasicString<SmallStringSize_v> BasicString<SmallStringSize_v>::operato
 	BasicString<SmallStringSize_v> cpy(currentLen + strLen);
 	cpy.m_buff.resize(m_buff.size() + strLen);
 	ox::listcpy(&cpy.m_buff[0], m_buff.data(), currentLen);
-	ox::listcpy(&cpy.m_buff[currentLen], src.data(), strLen);
+	ox::listcpy(&cpy.m_buff[currentLen], src.data(), strLen + 1);
-	cpy.m_buff[cpy.m_buff.size() - 1] = 0;
 	return cpy;
 }
 
@@ -490,7 +488,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/stringliteral.hpp

@@ -32,9 +32,7 @@ class StringLiteral: public detail::BaseStringView {
 
 		constexpr explicit StringLiteral(const char *str, std::size_t len) noexcept: BaseStringView(str, len) {}
 
-		OX_ALLOW_UNSAFE_BUFFERS_BEGIN
 		constexpr explicit StringLiteral(char const *str) noexcept: StringLiteral(str, ox::strlen(str)) {}
-		OX_ALLOW_UNSAFE_BUFFERS_END
 
 		constexpr StringLiteral &operator=(StringLiteral const&other) noexcept {
 			if (&other != this) {

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

@@ -100,8 +100,7 @@ constexpr auto toStdStringView(StringViewCR sv) noexcept {
 #endif
 
 
-constexpr ox::Result<int> strToInt(ox::StringViewCR str) noexcept {
+constexpr ox::Result<int> atoi(ox::StringViewCR str) noexcept {
-	OX_ALLOW_UNSAFE_BUFFERS_BEGIN
 	int total = 0;
 	int multiplier = 1;
 	for (auto i = static_cast<int64_t>(str.len()) - 1; i != -1; --i) {
@@ -114,7 +113,6 @@ constexpr ox::Result<int> strToInt(ox::StringViewCR str) noexcept {
 		}
 	}
 	return total;
-	OX_ALLOW_UNSAFE_BUFFERS_END
 }
 
 

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

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

deps/ox/src/ox/std/test/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

@@ -145,7 +145,6 @@ OX_CLANG_NOWARN_END
 			return ox::Error{};
 		}
 	},
-	OX_ALLOW_UNSAFE_BUFFERS_BEGIN
 	{
 		"ABCDEFG != HIJKLMN",
 		[]() {
@@ -170,7 +169,6 @@ OX_CLANG_NOWARN_END
 			return ox::Error(ox::memcmp("ABCDEFGHI", "ABCDEFG", 7) != 0);
 		}
 	},
-	OX_ALLOW_UNSAFE_BUFFERS_END
 	{
 		"IString",
 		[]() {
@@ -239,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",
 		[] {
@@ -292,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);
 		}
 	},
 	{
@@ -330,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/tracehook.cpp

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

deps/ox/src/ox/std/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/uuid.hpp

@@ -105,10 +105,6 @@ class UUID {
 		ox::Array<uint8_t, 16> m_value{};
 
 	public:
-
-		static constexpr auto TypeName = "net.drinkingtea.ox.UUID";
-		static constexpr auto TypeVersion = 1;
-
 		static void seedGenerator(const RandomSeed &seed) noexcept;
 
 		static ox::Result<UUID> generate() noexcept;

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

@@ -311,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,51 +0,0 @@
-# d2025.05.1
-
-* TileSheetEditor: Fix overrun errors when switching subsheets, clear selection
-  on switch (261e324acd)
-* Fix new build error that occurs in MSVC (26d5048e6720c4c2d52508a6ee44c67dd9fe3ee5)
-
-# d2025.05.0
-
-* Add app icon for both window and file
-* Change application font to Roboto Medium
-* Closing application will now confirm with user if any files have unsaved
-  changes.
-* UUID duplicates will now be reported when opening a project
-* Deleting a directory now closes files in that directory
-* Delete key now initiates deletion of selected directory
-* Remove ability to re-order tabs. There were bugs associated with that.
-* TileSheetEditor: Fix selection clearing in to work when clicking outside
-  image.
-* TileSheetEditor: Fix Delete Tile functionality, which was completely broken
-* PaletteEditor: Fix color number key range in. Previously, pressing A caused
-  the editor to jump to the last color.
-* PaletteEditor: page rename will now take effect upon pressing enter if the
-  text input has focus
-
-# d2025.02.1
-
-* Fix closing tab with unsaved changes (a44c5acc4b)
-
-# d2025.02.0
-
-* Rename core namespace to gfx.
-* Add PaletteV5 to accommodate namespace change.
-* 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/Palettes/SC9K_Logo.npal

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

sample_project/TileSheets/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
-	}
-}

sample_project/TileSheets/NS_Logo16.nts

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

sample_project/TileSheets/SC9K_Logo.nts

@@ -1,269 +0,0 @@
-K1;40f7b4ac-7f90-409e-80e0-64b59b594a63;O1;net.drinkingtea.nostalgia.gfx.TileSheet;5;{
-	"bpp" : 4,
-	"defaultPalette" : "uuid://3d1a77ec-265f-4905-2061-4f1003ee2189",
-	"subsheet" : 
-	{
-		"columns" : 2,
-		"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,
-			2,
-			2,
-			0,
-			0,
-			0,
-			0,
-			0,
-			2,
-			0,
-			0,
-			2,
-			0,
-			0,
-			0,
-			0,
-			2,
-			0,
-			0,
-			2,
-			0,
-			0,
-			0,
-			0,
-			0,
-			2,
-			2,
-			2,
-			0,
-			0,
-			0,
-			0,
-			0,
-			0,
-			0,
-			0,
-			0,
-			0,
-			0,
-			0,
-			0,
-			0,
-			0,
-			0,
-			0,
-			0,
-			0,
-			0,
-			0,
-			0,
-			0,
-			0,
-			0,
-			0,
-			0,
-			0,
-			0,
-			0,
-			0,
-			0,
-			0,
-			0,
-			0,
-			2,
-			0,
-			0,
-			0,
-			2,
-			0,
-			0,
-			0,
-			2,
-			0,
-			0,
-			2,
-			0,
-			0,
-			0,
-			0,
-			2,
-			0,
-			2,
-			0,
-			0,
-			0,
-			0,
-			0,
-			2,
-			2,
-			0,
-			0,
-			0,
-			0,
-			0,
-			0,
-			0,
-			0,
-			0,
-			0,
-			2,
-			0,
-			0,
-			0,
-			0,
-			0,
-			0,
-			2,
-			0,
-			0,
-			0,
-			0,
-			0,
-			0,
-			2,
-			0,
-			0,
-			0,
-			0,
-			0,
-			0,
-			0,
-			0,
-			0,
-			0,
-			0,
-			0,
-			0,
-			0,
-			0,
-			0,
-			0,
-			0,
-			0,
-			0,
-			0,
-			0,
-			0,
-			0,
-			0,
-			0,
-			0,
-			0,
-			0,
-			0,
-			0,
-			0,
-			0,
-			0,
-			0,
-			0,
-			0,
-			0,
-			0,
-			0,
-			0,
-			0,
-			0,
-			0,
-			0,
-			2,
-			0,
-			2,
-			0,
-			0,
-			0,
-			0,
-			0,
-			2,
-			0,
-			0,
-			2,
-			0,
-			0,
-			0,
-			0,
-			2,
-			0,
-			0,
-			0,
-			2,
-			0,
-			0,
-			0,
-			0,
-			0,
-			0,
-			0,
-			0,
-			0,
-			0,
-			0,
-			0,
-			0,
-			0,
-			0,
-			0,
-			0,
-			0,
-			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" : 2
-	}
-}

scripts/pkg-gba.py

@@ -17,10 +17,6 @@ os = platform.system().lower()
 arch = platform.machine()
 host_env = f'{os}-{arch}'
 
-def run(args: list[str]):
-    if subprocess.run(args).returncode != 0:
-        sys.exit(1)
-
 # get current build type
 with open(".current_build", "r") as f:
     current_build = f.readlines()[0]
@@ -32,12 +28,12 @@ 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)
-run([
+subprocess.run([
-    f'{bin}/{project_name.lower()}-pack',
+    f'{bin}/{project_name}-pack',
         '-src', project_dir,
         '-rom-bin', project_gba,
         '-manifest', project_manifest])
-run(['gbafix', project_gba])
+subprocess.run(['gbafix', project_gba])

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,
@@ -238,19 +236,19 @@ uint_t spriteCount(Context &ctx) noexcept;
 
 ox::Error initConsole(Context &ctx) noexcept;
 
-void consoleWrite(Context &ctx, int column, int row, ox::StringViewCR str) noexcept;
+void puts(Context &ctx, int column, int row, ox::StringViewCR str) noexcept;
 
 }
 
-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;
 
 }