[nostalgia] Update release notes

deps/glutils/include/glutils/glutils.hpp

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

deps/glutils/src/glutils.cpp

@@ -46,9 +46,9 @@ template struct GLObject<deleteVertexArray>;
 template struct GLObject<deleteProgram>;
 template struct GLObject<deleteShader>;
 
-FrameBuffer const *FrameBufferBind::s_activeFb = nullptr;
+const FrameBuffer *FrameBufferBind::s_activeFb = nullptr;
 
-FrameBufferBind::FrameBufferBind(FrameBuffer const &fb) noexcept: m_restoreFb(s_activeFb) {
+FrameBufferBind::FrameBufferBind(const FrameBuffer &fb) noexcept: m_restoreFb(s_activeFb) {
 	s_activeFb = &fb;
 	glBindFramebuffer(GL_FRAMEBUFFER, fb);
 	glViewport(0, 0, fb.width, fb.height);
@@ -64,15 +64,15 @@ FrameBufferBind::~FrameBufferBind() noexcept {
 	}
 }
 
-void bind(FrameBuffer const &fb) noexcept {
+void bind(const FrameBuffer &fb) noexcept {
 	glBindFramebuffer(GL_FRAMEBUFFER, fb);
 	glViewport(0, 0, fb.width, fb.height);
 }
 
 
 static ox::Result<GLShader> buildShader(
-		GLuint const shaderType,
+		GLuint shaderType,
-		GLchar const *src,
+		const GLchar *src,
 		ox::StringViewCR shaderName) noexcept {
 	GLShader shader(glCreateShader(shaderType));
 	glShaderSource(shader, 1, &src, nullptr);
@@ -162,30 +162,16 @@ FrameBuffer generateFrameBuffer(int width, int height) noexcept {
 	// color texture
 	glGenTextures(1, &fb.color.id);
 	glBindTexture(GL_TEXTURE_2D, fb.color);
-	glTexImage2D(
+	glTexImage2D(GL_TEXTURE_2D, 0, GL_RGB, width, height, 0, GL_RGB, GL_UNSIGNED_BYTE, nullptr);
-		GL_TEXTURE_2D,
-		0,
-		GL_RGB,
-		width,
-		height,
-		0,
-		GL_RGB,
-		GL_UNSIGNED_BYTE,
-		nullptr);
 	glGenerateMipmap(GL_TEXTURE_2D);
 	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR_MIPMAP_LINEAR);
 	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR_MIPMAP_LINEAR);
-	glFramebufferTexture2D(
+	glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, fb.color, 0);
-		GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, fb.color, 0);
 	// depth texture
 	glGenRenderbuffers(1, &fb.depth.id);
 	glBindRenderbuffer(GL_RENDERBUFFER, fb.depth);
 	glRenderbufferStorage(GL_RENDERBUFFER, GL_DEPTH24_STENCIL8, width, height);
-	glFramebufferRenderbuffer(
+	glFramebufferRenderbuffer(GL_FRAMEBUFFER, GL_DEPTH_STENCIL_ATTACHMENT, GL_RENDERBUFFER, fb.depth);
-		GL_FRAMEBUFFER,
-		GL_DEPTH_STENCIL_ATTACHMENT,
-		GL_RENDERBUFFER,
-		fb.depth);
 	// verify FBO
 	oxAssert(glCheckFramebufferStatus(GL_FRAMEBUFFER) == GL_FRAMEBUFFER_COMPLETE, "Frame Buffer is incomplete");
 	// restore primary FB
@@ -203,16 +189,7 @@ void resizeFrameBuffer(FrameBuffer &fb, int width, int height) noexcept {
 	glBindFramebuffer(GL_FRAMEBUFFER, fb);
 	// color texture
 	glBindTexture(GL_TEXTURE_2D, fb.color);
-	glTexImage2D(
+	glTexImage2D(GL_TEXTURE_2D, 0, GL_RGB, width, height, 0, GL_RGB, GL_UNSIGNED_BYTE, nullptr);
-		GL_TEXTURE_2D,
-		0,
-		GL_RGB,
-		width,
-		height,
-		0,
-		GL_RGB,
-		GL_UNSIGNED_BYTE,
-		nullptr);
 	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
 	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
 	// depth texture
@@ -224,7 +201,7 @@ void resizeFrameBuffer(FrameBuffer &fb, int width, int height) noexcept {
 	glBindRenderbuffer(GL_RENDERBUFFER, 0);
 }
 
-void resizeInitFrameBuffer(FrameBuffer &fb, int const width, int const height) noexcept {
+void resizeInitFrameBuffer(FrameBuffer &fb, int width, int height) noexcept {
 	if (!fb) {
 		fb = generateFrameBuffer(width, height);
 		return;
@@ -237,13 +214,13 @@ void resizeInitFrameBuffer(FrameBuffer &fb, ox::Size const &sz) noexcept {
 }
 
 void sendVbo(BufferSet const&bs) noexcept {
-	auto const bufferSize = static_cast<GLsizeiptr>(sizeof(decltype(bs.vertices)::value_type) * bs.vertices.size());
+	const auto bufferSize = static_cast<GLsizeiptr>(sizeof(decltype(bs.vertices)::value_type) * bs.vertices.size());
 	glBindBuffer(GL_ARRAY_BUFFER, bs.vbo);
 	glBufferData(GL_ARRAY_BUFFER, bufferSize, bs.vertices.data(), GL_DYNAMIC_DRAW);
 }
 
 void sendEbo(BufferSet const&bs) noexcept {
-	auto const bufferSize = static_cast<GLsizeiptr>(sizeof(decltype(bs.elements)::value_type) * bs.elements.size());
+	const auto bufferSize = static_cast<GLsizeiptr>(sizeof(decltype(bs.elements)::value_type) * bs.elements.size());
 	glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, bs.ebo);
 	glBufferData(GL_ELEMENT_ARRAY_BUFFER, bufferSize, bs.elements.data(), GL_STATIC_DRAW);
 }

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

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

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

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

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

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

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

@@ -206,7 +206,7 @@ Error PassThroughFS::writeFileInode(uint64_t, const void*, uint64_t, FileType) n
 }
 
 std::string_view PassThroughFS::stripSlash(StringView path) noexcept {
-	for (auto i = 0u; i < path.size() && path[0] == '/'; i++) {
+	for (auto i = 0u; i < path.len() && path[0] == '/'; i++) {
 		path = substr(path, 1);
 	}
 	return {path.data(), path.bytes()};

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

@@ -74,7 +74,7 @@ Error PathIterator::get(StringView &fileName) {
 	if (size && fileName[size - 1] == '/') {
 		fileName = ox::substr(m_path, start, start + size - 1);
 	}
-	oxAssert(fileName[fileName.size()-1] != '/', "name ends in /");
+	oxAssert(fileName[fileName.len()-1] != '/', "name ends in /");
 	return {};
 }
 
@@ -104,11 +104,11 @@ Error PathIterator::next(StringView &fileName) {
 		}
 		fileName = ox::substr(m_path, start, start + size);
 		// truncate trailing /
-		while (fileName.size() && fileName[fileName.size() - 1] == '/') {
+		while (fileName.len() && fileName[fileName.len() - 1] == '/') {
 			fileName = ox::substr(m_path, start, start + size);
 		}
 		m_iterator += size;
-		oxAssert(fileName.size() == 0 || fileName[fileName.size()-1] != '/', "name ends in /");
+		oxAssert(fileName.len() == 0 || fileName[fileName.len()-1] != '/', "name ends in /");
 	}
 	return retval;
 }

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

@@ -59,7 +59,7 @@ const std::map<ox::StringView, std::function<ox::Error(ox::StringView)>> tests =
 			"PathIterator::next1",
 			[](ox::StringView) {
 				auto constexpr path = ox::StringLiteral("/usr/share/charset.gbag");
-				ox::PathIterator it(path.c_str(), path.size());
+				ox::PathIterator it(path.c_str(), path.len());
 				ox::StringView buff;
 				oxAssert(it.next(buff) == 0 && buff == "usr", "PathIterator shows wrong next");
 				oxAssert(it.next(buff) == 0 && buff == "share", "PathIterator shows wrong next");
@@ -84,7 +84,7 @@ const std::map<ox::StringView, std::function<ox::Error(ox::StringView)>> tests =
 			"PathIterator::next3",
 			[](ox::StringView) {
 				auto const path = ox::String("/");
-				ox::PathIterator it(path.c_str(), path.size());
+				ox::PathIterator it(path.c_str(), path.len());
 				ox::StringView buff;
 				oxAssert(it.next(buff) == 0 && buff == "\0", "PathIterator shows wrong next");
 				return ox::Error(0);
@@ -106,7 +106,7 @@ const std::map<ox::StringView, std::function<ox::Error(ox::StringView)>> tests =
 			"PathIterator::next5",
 			[](ox::StringView) {
 				auto const path = ox::String("usr/share/");
-				ox::PathIterator it(path.c_str(), path.size());
+				ox::PathIterator it(path.c_str(), path.len());
 				ox::StringView buff;
 				oxAssert(it.next(buff) == 0 && buff == "usr", "PathIterator shows wrong next");
 				oxAssert(it.next(buff) == 0 && buff == "share", "PathIterator shows wrong next");
@@ -117,10 +117,10 @@ const std::map<ox::StringView, std::function<ox::Error(ox::StringView)>> tests =
 			"PathIterator::dirPath",
 			[] (ox::StringView) {
 				auto constexpr path = ox::StringLiteral("/usr/share/charset.gbag");
-				ox::PathIterator it(path.c_str(), path.size());
+				ox::PathIterator it(path.c_str(), path.len());
-				auto buff = static_cast<char*>(ox_alloca(path.size() + 1));
+				auto buff = static_cast<char*>(ox_alloca(path.len() + 1));
 				OX_ALLOW_UNSAFE_BUFFERS_BEGIN
-				oxAssert(it.dirPath(buff, path.size()) == 0 && ox::strcmp(buff, "/usr/share/") == 0, "PathIterator shows incorrect dir path");
+				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);
 			}

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

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

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

@@ -191,12 +191,12 @@ template<Writer_c Writer>
 template<std::size_t SmallStringSize>
 constexpr Error MetalClawWriter<Writer>::field(const char*, const BasicString<SmallStringSize> *val) noexcept {
 	bool fieldSet = false;
-	if (val->size() && (!m_unionIdx.has_value() || *m_unionIdx == m_field)) {
+	if (val->len() && (!m_unionIdx.has_value() || *m_unionIdx == m_field)) {
 		// write the length
-		const auto strLen = mc::encodeInteger(val->size());
+		const auto strLen = mc::encodeInteger(val->len());
 		OX_RETURN_ERROR(m_writer.write(reinterpret_cast<const char*>(strLen.data.data()), strLen.length));
 		// write the string
-		OX_RETURN_ERROR(m_writer.write(val->c_str(), static_cast<std::size_t>(val->size())));
+		OX_RETURN_ERROR(m_writer.write(val->c_str(), static_cast<std::size_t>(val->len())));
 		fieldSet = true;
 	}
 	OX_RETURN_ERROR(m_fieldPresence.set(static_cast<std::size_t>(m_field), fieldSet));
@@ -207,7 +207,7 @@ constexpr Error MetalClawWriter<Writer>::field(const char*, const BasicString<Sm
 template<Writer_c Writer>
 template<std::size_t L>
 constexpr Error MetalClawWriter<Writer>::field(const char *name, const IString<L> *val) noexcept {
-	return fieldCString(name, val->data(), val->size());
+	return fieldCString(name, val->data(), val->len());
 }
 
 template<Writer_c Writer>
@@ -339,7 +339,7 @@ constexpr Error MetalClawWriter<Writer>::field(const char*, const HashMap<String
 		OX_RETURN_ERROR(handler.setTypeInfo("Map", 0, {}, len * 2));
 		// this loop body needs to be in a lambda because of the potential alloca call
 		constexpr auto loopBody = [](auto &handler, auto const&key, auto const&val) -> ox::Error {
-			const auto keyLen = key.size();
+			const auto keyLen = key.len();
 			auto wkey = ox_malloca(keyLen + 1, char, 0);
 			memcpy(wkey.get(), key.c_str(), keyLen + 1);
 			OX_RETURN_ERROR(handler.fieldCString("", wkey.get(), keyLen));

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

@@ -43,7 +43,7 @@ static constexpr auto buildTypeId(
 		for (const auto &p : typeParams) {
 			tp += p + ",";
 		}
-		tp.resize(tp.size() - 1);
+		tp.resize(tp.len() - 1);
 		tp += "#";
 	}
 	return ox::sfmt("{}{};{}", name, tp, version);

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

@@ -144,7 +144,7 @@ template<typename T, typename Str = const char*>
 [[nodiscard]]
 consteval auto requireModelTypeName() noexcept {
 	constexpr auto name = getModelTypeName<T, Str>();
-	static_assert(ox::StringView{name}.size(), "Type lacks required TypeName");
+	static_assert(ox::StringView{name}.len(), "Type lacks required TypeName");
 	return name;
 }
 
@@ -159,7 +159,7 @@ constexpr auto ModelTypeId_v = [] {
 	constexpr auto name = ModelTypeName_v<T, ox::StringView>;
 	constexpr auto version = ModelTypeVersion_v<T>;
 	constexpr auto versionStr = ox::sfmt<ox::IString<19>>("{}", version);
-	return ox::sfmt<ox::IString<name.size() + versionStr.size() + 1>>("{};{}", name, versionStr);
+	return ox::sfmt<ox::IString<name.len() + versionStr.len() + 1>>("{};{}", name, versionStr);
 }();
 
 }

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

@@ -307,7 +307,7 @@ Result<T> readOC(BufferView buff) noexcept {
 
 template<typename T>
 Result<T> readOC(ox::StringView json) noexcept {
-	return readOC<T>(ox::BufferView{json.data(), json.size()});
+	return readOC<T>(ox::BufferView{json.data(), json.len()});
 }
 
 }

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

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

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

@@ -138,7 +138,7 @@ class OrganicClawWriter {
 
 		template<std::size_t L>
 		Error field(char const*key, IString<L> const*val) noexcept {
-			if (targetValid() && val->size()) {
+			if (targetValid() && val->len()) {
 				value(key) = val->c_str();
 			}
 			++m_fieldIt;
@@ -147,7 +147,7 @@ class OrganicClawWriter {
 
 		template<std::size_t L>
 		Error field(char const*key, BasicString<L> const*val) noexcept {
-			if (targetValid() && val->size()) {
+			if (targetValid() && val->len()) {
 				value(key) = val->c_str();
 			}
 			++m_fieldIt;

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

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

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

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

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

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

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

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

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

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

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

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

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

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

deps/ox/src/ox/std/new.hpp

@@ -30,49 +30,11 @@ constexpr void *operator new(std::size_t, void *addr) noexcept {
 constexpr void *operator new[](std::size_t, void *addr) noexcept {
 	return addr;
 }
-
-namespace std {
-
-template<typename T>
-[[nodiscard]]
-constexpr T* launder(T* __p) noexcept {
-	return __builtin_launder(__p);
-}
-
-template<typename T, typename... Args, bool noex>
-void launder(T(*)(Args...) noexcept(noex)) = delete;
-template<typename T, typename... Args, bool noex>
-void launder(T(*)(Args......) noexcept(noex)) = delete;
-void launder(void*) = delete;
-void launder(void const*) = delete;
-void launder(volatile void*) = delete;
-void launder(volatile void const*) = delete;
-
-}
 #endif
 
 
 namespace ox {
 
-/**
- * Aliases type T in size and alignment to allow allocating space for a T
- * without running the constructor.
- */
-template<typename T, std::size_t sz = sizeof(T)>
-struct alignas(alignof(T)) AllocAlias {
-	char buff[sz];
-	constexpr AllocAlias() noexcept = default;
-	[[nodiscard]]
-	auto data() noexcept {
-		return reinterpret_cast<T*>(this);
-	}
-	[[nodiscard]]
-	auto data() const noexcept {
-		return reinterpret_cast<T const*>(this);
-	}
-};
-
-
 template<typename T, typename U = T, typename ...Args>
 [[nodiscard]]
 constexpr U *make(Args &&...args) noexcept {

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

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

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

@@ -163,24 +163,6 @@ class Span {
 			return *this;
 		}
 
-		constexpr Span operator++(int) noexcept {
-			++m_items;
-			--m_size;
-			if (!m_size) [[unlikely]] {
-				m_items = nullptr;
-			}
-			return *this;
-		}
-
-		constexpr Span operator++() noexcept {
-			++m_items;
-			--m_size;
-			if (!m_size) [[unlikely]] {
-				m_items = nullptr;
-			}
-			return *this;
-		}
-
 		[[nodiscard]]
 		constexpr auto data() const noexcept {
 			return m_items;

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

@@ -139,7 +139,7 @@ class BasicString {
 
 		constexpr BasicString &operator+=(Integer_c auto i) noexcept;
 
-		constexpr BasicString &operator+=(StringViewCR src) noexcept;
+		constexpr BasicString &operator+=(StringView src) noexcept;
 
 		constexpr BasicString &operator+=(BasicString const&src) noexcept;
 
@@ -176,7 +176,7 @@ class BasicString {
 		constexpr char &operator[](std::size_t i) noexcept;
 
 		constexpr Error append(const char *str, std::size_t strLen) noexcept {
-			auto currentLen = size();
+			auto currentLen = len();
 			m_buff.resize(m_buff.size() + strLen);
 			ox::listcpy(&m_buff[currentLen], str, strLen);
 			// make sure last element is a null terminator
@@ -185,8 +185,8 @@ class BasicString {
 			return {};
 		}
 
-		constexpr Error append(StringViewCR sv) noexcept {
+		constexpr Error append(ox::StringView sv) noexcept {
-			return append(sv.data(), sv.size());
+			return append(sv.data(), sv.len());
 		}
 
 		[[nodiscard]]
@@ -237,7 +237,7 @@ class BasicString {
 		 * Returns the number of characters in this string.
 		 */
 		[[nodiscard]]
-		constexpr std::size_t size() const noexcept;
+		constexpr std::size_t len() const noexcept;
 
 		/**
 		 * Returns the number of bytes used for this string.
@@ -277,7 +277,7 @@ constexpr BasicString<SmallStringSize_v>::BasicString(const char *str, std::size
 
 template<std::size_t SmallStringSize_v>
 constexpr BasicString<SmallStringSize_v>::BasicString(StringLiteral const&str) noexcept:
-	BasicString(StringView{str.data(), str.size()}) {
+	BasicString(StringView{str.data(), str.len()}) {
 }
 
 template<std::size_t SmallStringSize_v>
@@ -376,7 +376,7 @@ constexpr BasicString<SmallStringSize_v> &BasicString<SmallStringSize_v>::operat
 }
 
 template<std::size_t SmallStringSize_v>
-constexpr BasicString<SmallStringSize_v> &BasicString<SmallStringSize_v>::operator+=(StringViewCR s) noexcept {
+constexpr BasicString<SmallStringSize_v> &BasicString<SmallStringSize_v>::operator+=(StringView s) noexcept {
 	std::size_t strLen = s.bytes();
 	std::ignore = append(s.data(), strLen);
 	return *this;
@@ -384,14 +384,14 @@ constexpr BasicString<SmallStringSize_v> &BasicString<SmallStringSize_v>::operat
 
 template<std::size_t SmallStringSize_v>
 constexpr BasicString<SmallStringSize_v> &BasicString<SmallStringSize_v>::operator+=(BasicString const&src) noexcept {
-	std::ignore = append(src.c_str(), src.size());
+	std::ignore = append(src.c_str(), src.len());
 	return *this;
 }
 
 template<std::size_t SmallStringSize_v>
 constexpr BasicString<SmallStringSize_v> BasicString<SmallStringSize_v>::operator+(const char *str) const noexcept {
 	const std::size_t strLen = ox::strlen(str);
-	const auto currentLen = size();
+	const auto currentLen = len();
 	BasicString<SmallStringSize_v> cpy;
 	cpy.m_buff.resize(m_buff.size() + strLen);
 	ox::listcpy(&cpy.m_buff[0], m_buff.data(), currentLen);
@@ -420,8 +420,8 @@ constexpr BasicString<SmallStringSize_v> BasicString<SmallStringSize_v>::operato
 
 template<std::size_t SmallStringSize_v>
 constexpr BasicString<SmallStringSize_v> BasicString<SmallStringSize_v>::operator+(StringViewCR src) const noexcept {
-	const std::size_t strLen = src.size();
+	const std::size_t strLen = src.len();
-	const auto currentLen = size();
+	const auto currentLen = len();
 	BasicString<SmallStringSize_v> cpy(currentLen + strLen);
 	cpy.m_buff.resize(m_buff.size() + strLen);
 	ox::listcpy(&cpy.m_buff[0], m_buff.data(), currentLen);
@@ -432,8 +432,8 @@ constexpr BasicString<SmallStringSize_v> BasicString<SmallStringSize_v>::operato
 
 template<std::size_t SmallStringSize_v>
 constexpr BasicString<SmallStringSize_v> BasicString<SmallStringSize_v>::operator+(BasicString const&src) const noexcept {
-	const std::size_t strLen = src.size();
+	const std::size_t strLen = src.len();
-	const auto currentLen = size();
+	const auto currentLen = len();
 	BasicString<SmallStringSize_v> cpy(currentLen + strLen);
 	cpy.m_buff.resize(m_buff.size() + strLen);
 	ox::listcpy(&cpy.m_buff[0], m_buff.data(), currentLen);
@@ -456,7 +456,7 @@ constexpr bool BasicString<SmallStringSize_v>::operator==(const char *other) con
 
 template<std::size_t SmallStringSize_v>
 constexpr bool BasicString<SmallStringSize_v>::operator==(OxString_c auto const&other) const noexcept {
-	return StringView(*this) == StringView(other);
+	return ox::StringView(*this) == ox::StringView(other);
 }
 
 template<std::size_t SmallStringSize_v>
@@ -521,7 +521,7 @@ constexpr std::size_t BasicString<SmallStringSize_v>::bytes() const noexcept {
 }
 
 template<std::size_t SmallStringSize_v>
-constexpr std::size_t BasicString<SmallStringSize_v>::size() const noexcept {
+constexpr std::size_t BasicString<SmallStringSize_v>::len() const noexcept {
 	return m_buff.size() - 1;
 }
 
@@ -548,28 +548,28 @@ using StringCR = String const&;
 
 
 [[nodiscard]]
-constexpr String toString(StringViewCR sv) noexcept {
+constexpr ox::String toString(ox::StringViewCR sv) noexcept {
 	return ox::String(sv);
 }
 
 
 template<typename PlatSpec, std::size_t SmallStringSize_v>
 [[nodiscard]]
-constexpr auto sizeOf(BasicString<SmallStringSize_v> const*) noexcept {
+constexpr auto sizeOf(const ox::BasicString<SmallStringSize_v>*) noexcept {
 	VectorMemMap<PlatSpec> v{.smallVecSize = SmallStringSize_v};
 	return sizeOf<PlatSpec>(&v);
 }
 
 template<typename PlatSpec, std::size_t SmallStringSize_v>
 [[nodiscard]]
-constexpr auto alignOf(BasicString<SmallStringSize_v> const&) noexcept {
+constexpr auto alignOf(const ox::BasicString<SmallStringSize_v>&) noexcept {
 	VectorMemMap<PlatSpec> v{.smallVecSize = SmallStringSize_v};
 	return alignOf<PlatSpec>(&v);
 }
 
 template<size_t sz>
-struct MaybeView<BasicString<sz>> {
+struct MaybeView<ox::BasicString<sz>> {
-	using type = StringView;
+	using type = ox::StringView;
 };
 
 }

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

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

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

@@ -8,7 +8,6 @@
 
 #pragma once
 
-#include "cstringview.hpp"
 #include "string.hpp"
 
 namespace ox {

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

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

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

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

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

@@ -183,7 +183,7 @@ OX_CLANG_NOWARN_END
 			s = "asdf";
 			oxAssert(s == "asdf", "String assign broken");
 			oxAssert(s != "aoeu", "String assign broken");
-			oxAssert(s.size() == 4, "String assign broken");
+			oxAssert(s.len() == 4, "String assign broken");
 			return ox::Error(0);
 		}
 	},

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

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

deps/ox/src/ox/std/types.hpp

@@ -63,6 +63,25 @@ namespace ox {
 
 using CString = char const*;
 
+/**
+ * Aliases type T in size and alignment to allow allocating space for a T
+ * without running the constructor.
+ */
+template<typename T, std::size_t sz = sizeof(T)>
+struct alignas(alignof(T)) AllocAlias {
+	char buff[sz];
+	constexpr AllocAlias() noexcept = default;
+	[[nodiscard]]
+	auto data() noexcept {
+		return reinterpret_cast<T*>(this);
+	}
+	[[nodiscard]]
+	auto data() const noexcept {
+		return reinterpret_cast<const T*>(this);
+	}
+};
+
+
 template<std::size_t sz>
 struct SignedType {
 };

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

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

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

@@ -34,10 +34,10 @@ struct VectorAllocator {
 		ox::Array<AllocAlias<T>, Size> m_data = {};
 	protected:
 		constexpr VectorAllocator() noexcept = default;
-		constexpr VectorAllocator(VectorAllocator const&) noexcept = default;
+		constexpr VectorAllocator(const VectorAllocator&) noexcept = default;
 		constexpr VectorAllocator(VectorAllocator&&) noexcept = default;
 
-		constexpr void allocate(T **items, std::size_t const cap) noexcept {
+		constexpr void allocate(T **items, std::size_t cap) noexcept {
 			// small vector optimization cannot be done it constexpr, but it doesn't really matter in constexpr
 			if (std::is_constant_evaluated() || cap > Size) {
 				*items = Allocator{}.allocate(cap);
@@ -49,31 +49,45 @@ struct VectorAllocator {
 		constexpr void moveConstructItemsFrom(
 				T **items,
 				VectorAllocator *src,
-				std::size_t const count,
+				const std::size_t count,
-				std::size_t const cap) noexcept {
+				const std::size_t cap) noexcept {
 			// this totally idiotic redundant check (&& count <= Size) is required to address a bug in devkitARM,
 			// try removing it later
 			if (!std::is_constant_evaluated()) {
 				if (cap <= m_data.size() && count <= m_data.size()) {
 					for (auto i = 0u; i < count; ++i) {
-						auto const srcItem = std::launder(reinterpret_cast<T*>(&src->m_data[i]));
+						const auto dstItem = reinterpret_cast<T *>(&m_data[i]);
-						new (&m_data[i]) T(std::move(*srcItem));
+						const auto srcItem = reinterpret_cast<T *>(&src->m_data[i]);
+						std::construct_at<T>(dstItem, std::move(*srcItem));
 					}
-					if (count) {
-						*items = std::launder(reinterpret_cast<T*>(m_data.data()));
-					} else {
 					*items = reinterpret_cast<T*>(m_data.data());
 				}
 			}
 		}
+
+		constexpr void moveItemsFrom(
+				T **items,
+				VectorAllocator *src,
+				const std::size_t count,
+				const std::size_t cap) noexcept {
+			// this totally idiotic redundant check (&& count <= Size) is required to address a bug in devkitARM,
+			// try removing it later
+			if (!std::is_constant_evaluated()) {
+				if (cap <= m_data.size() && count <= m_data.size()) {
+					for (std::size_t i = 0; i < count; ++i) {
+						const auto dstItem = reinterpret_cast<T *>(&m_data[i]);
+						const auto srcItem = reinterpret_cast<T *>(&src->m_data[i]);
+						*dstItem = std::move(*srcItem);
+					}
+					*items = reinterpret_cast<T*>(m_data.data());
+				}
+			}
 		}
 
-		constexpr void deallocate(T *const items, std::size_t const cap) noexcept {
+		constexpr void deallocate(T *items, std::size_t cap) noexcept {
 			// small vector optimization cannot be done it constexpr, but it doesn't really matter in constexpr
 			if (std::is_constant_evaluated()) {
-				if (items) {
 				Allocator{}.deallocate(items, cap);
-				}
 			} else {
 				if (items && static_cast<void*>(items) != static_cast<void*>(m_data.data())) {
 					Allocator{}.deallocate(items, cap);
@@ -87,10 +101,10 @@ template<typename T, typename Allocator>
 struct VectorAllocator<T, Allocator, 0> {
 	protected:
 		constexpr VectorAllocator() noexcept = default;
-		constexpr VectorAllocator(VectorAllocator const&) noexcept = default;
+		constexpr VectorAllocator(const VectorAllocator&) noexcept = default;
 		constexpr VectorAllocator(VectorAllocator&&) noexcept = default;
 
-		constexpr void allocate(T **items, std::size_t const cap) noexcept {
+		constexpr void allocate(T **items, std::size_t cap) noexcept {
 			*items = Allocator{}.allocate(cap);
 		}
 
@@ -98,15 +112,15 @@ struct VectorAllocator<T, Allocator, 0> {
 		constexpr void moveConstructItemsFrom(
 				T**,
 				VectorAllocator*,
-				std::size_t const,
+				const std::size_t,
-				std::size_t const) noexcept {
+				const std::size_t) noexcept {
 		}
 
 		[[maybe_unused]]
-		constexpr void moveItemsFrom(T**, VectorAllocator*, std::size_t const, std::size_t const) noexcept {
+		constexpr void moveItemsFrom(T**, VectorAllocator*, const std::size_t, const std::size_t) noexcept {
 		}
 
-		constexpr void deallocate(T *const items, std::size_t const cap) noexcept {
+		constexpr void deallocate(T *items, std::size_t cap) noexcept {
 			if (items) {
 				Allocator{}.deallocate(items, cap);
 			}
@@ -405,7 +419,7 @@ constexpr Vector<T, SmallVectorSize, Allocator> &Vector<T, SmallVectorSize, Allo
 		m_size = other.m_size;
 		m_cap = other.m_cap;
 		m_items = other.m_items;
-		this->moveConstructItemsFrom(&m_items, &other, m_size, m_cap);
+		this->moveItemsFrom(&m_items, &other, m_size, m_cap);
 		other.m_size = 0;
 		other.m_cap = 0;
 		other.m_items = nullptr;

deps/teagba/include/teagba/addresses.hpp

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

deps/teagba/include/teagba/gfx.hpp

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

deps/teagba/src/cstartup.cpp

@@ -26,7 +26,7 @@ extern void (*__preinit_array_end[]) (void);
 extern void (*__init_array_start[]) (void);
 extern void (*__init_array_end[]) (void);
 
-int main(int argc, char const **argv);
+int main(int argc, const char **argv);
 
 extern "C" {
 
@@ -50,7 +50,7 @@ void __libc_init_array() {
 }
 
 int c_start() {
-	char const *args[2] = {"", "rom.oxfs"};
+	const char *args[2] = {"", "rom.oxfs"};
 	ox::heapmgr::initHeap(HEAP_BEGIN, HEAP_END);
 	mgba::initConsole();
 #pragma GCC diagnostic push

deps/teagba/src/gfx.cpp

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

release-notes.md

@@ -1,9 +1,3 @@
-# d2025.07.0
-
-* Add sub-command for exporting TileSheets as PNG files.
-* Add 'Reload Project' menu item under File.
-* Fix opening a project to mark an unopenable file as closed in the config file on startup.
-
 # d2025.06.0
 
 * Add ability to remember recent projects in config

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

@@ -19,10 +19,10 @@ using Color32 = uint32_t;
 
 [[nodiscard]]
 constexpr Color32 toColor32(Color16 nc) noexcept {
-	auto const r = static_cast<Color32>(((nc & 0b0000000000011111) >> 0) * 8);
+	const auto r = static_cast<Color32>(((nc & 0b0000000000011111) >> 0) * 8);
-	auto const g = static_cast<Color32>(((nc & 0b0000001111100000) >> 5) * 8);
+	const auto g = static_cast<Color32>(((nc & 0b0000001111100000) >> 5) * 8);
-	auto const b = static_cast<Color32>(((nc & 0b0111110000000000) >> 10) * 8);
+	const auto b = static_cast<Color32>(((nc & 0b0111110000000000) >> 10) * 8);
-	auto const a = static_cast<Color32>(255);
+	const auto a = static_cast<Color32>(255);
 	return r | (g << 8) | (b << 16) | (a << 24);
 }
 

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

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

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

@@ -114,10 +114,10 @@ struct InitParams {
 ox::Result<ox::UPtr<Context>> init(turbine::Context &tctx, InitParams const&params = {}) noexcept;
 
 [[nodiscard]]
-int tileColumns(Context const&) noexcept;
+int tileColumns(Context&) noexcept;
 
 [[nodiscard]]
-int tileRows(Context const&) noexcept;
+int tileRows(Context&) noexcept;
 
 ox::Error loadBgPalette(
 		Context &ctx,
@@ -238,10 +238,6 @@ void setBgCbb(Context &ctx, unsigned bgIdx, unsigned cbbIdx) noexcept;
 
 void setBgPriority(Context &ctx, uint_t bgIdx, uint_t priority) noexcept;
 
-void setBgOffset(Context &ctx, uint16_t bg, int16_t x, int16_t y) noexcept;
-
-void scrollBgOffset(Context &ctx, uint16_t bg, int16_t x, int16_t y) noexcept;
-
 void hideSprite(Context &ctx, unsigned) noexcept;
 
 void showSprite(Context &ctx, unsigned) noexcept;
@@ -264,8 +260,8 @@ constexpr ox::CStringView GlslVersion = "#version 330";
 [[nodiscard]]
 ox::Size drawSize(int scale = 5) noexcept;
 
-void draw(Context &ctx, ox::Size const &renderSz) noexcept;
+void draw(gfx::Context &ctx, ox::Size const&renderSz) noexcept;
 
-void draw(Context&, int scale = 5) noexcept;
+void draw(gfx::Context&, int scale = 5) noexcept;
 
 }

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

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

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

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

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

@@ -428,14 +428,6 @@ TileSheet::SubSheetIdx validateSubSheetIdx(TileSheet const &ts, TileSheet::SubSh
 
 ox::Result<TileSheet::SubSheetIdx> getSubSheetIdx(TileSheet const &ts, SubSheetId pId) noexcept;
 
-ox::Result<TileSheet::SubSheet*> getSubSheet(
-		ox::SpanView<ox::StringView> const &idx,
-		TileSheet &ts) noexcept;
-
-ox::Result<TileSheet::SubSheet const*> getSubSheet(
-		ox::SpanView<ox::StringView> const &idx,
-		TileSheet const &ts) noexcept;
-
 [[nodiscard]]
 TileSheet::SubSheet &getSubSheet(
 		ox::SpanView<uint32_t> const&idx,
@@ -481,8 +473,6 @@ ox::Result<uint32_t> getTileOffset(TileSheet const &ts, SubSheetId pId) noexcept
 
 ox::Result<ox::StringView> getNameFor(TileSheet::SubSheet const&ss, SubSheetId pId) noexcept;
 
-ox::Result<ox::StringView> getNameFor(TileSheet &ts, SubSheetId pId) noexcept;
-
 ox::Result<ox::StringView> getNameFor(TileSheet const&ts, SubSheetId pId) noexcept;
 
 [[nodiscard]]

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

@@ -35,6 +35,11 @@ class Context {
 		Context(Context const&&other) noexcept = delete;
 		virtual ~Context() noexcept = default;
 
+		[[nodiscard]]
+		ox::MemFS const&rom() const noexcept {
+			return static_cast<ox::MemFS const&>(*turbine::rom(turbineCtx));
+		}
+
 };
 
 void safeDelete(Context *ctx) noexcept {
@@ -76,7 +81,7 @@ ox::Error loadBgPalette(
 	if (palette.pages.empty()) {
 		return {};
 	}
-	auto const paletteMem = ox::Span{MEM_BG_PALETTE} + palBank * 16;
+	auto const paletteMem = MEM_BG_PALETTE + palBank * 16;
 	for (auto i = 0u; i < colorCnt(palette, page); ++i) {
 		paletteMem[i] = color(palette, page, i);
 	}
@@ -90,8 +95,9 @@ ox::Error loadSpritePalette(
 	if (palette.pages.empty()) {
 		return {};
 	}
+	auto const paletteMem = MEM_SPRITE_PALETTE;
 	for (auto i = 0u; i < colorCnt(palette, page); ++i) {
-		MEM_SPRITE_PALETTE[i] = color(palette, page, i);
+		paletteMem[i] = color(palette, page, i);
 	}
 	return {};
 }
@@ -169,8 +175,8 @@ ox::Error loadBgTileSheet(
 		unsigned const cbb,
 		CompactTileSheet const&ts,
 		ox::Optional<unsigned> const&paletteBank) noexcept {
-	auto const cnt = ts.pixels.size() >> (ts.bpp == 4);
+	auto const cnt = (ts.pixels.size() * PixelsPerTile) / (1 + (ts.bpp == 4));
-	for (size_t i{}; i < cnt; ++i) {
+	for (size_t i = 0; i < cnt; ++i) {
 		auto const srcIdx = i * 2;
 		auto const p1 = static_cast<uint16_t>(ts.pixels[srcIdx]);
 		auto const p2 = static_cast<uint16_t>(ts.pixels[srcIdx + 1]);
@@ -218,11 +224,10 @@ ox::Error loadSpriteTileSheet(
 		Context &ctx,
 		CompactTileSheet const&ts,
 		bool const loadDefaultPalette) noexcept {
-	for (size_t i{}; i < ts.pixels.size(); i += 2) {
+	for (size_t i = 0; i < ts.pixels.size(); i += 2) {
-		MEM_SPRITE_TILES[i >> 1] =
+		uint16_t v = ts.pixels[i];
-			static_cast<uint16_t>(
+		v |= static_cast<uint16_t>(ts.pixels[i + 1] << 8);
-				ts.pixels[i] |
+		MEM_SPRITE_TILES[i] = v;
-				(static_cast<uint16_t>(ts.pixels[i + 1]) << 8));
 	}
 	if (loadDefaultPalette && ts.defaultPalette) {
 		OX_RETURN_ERROR(loadSpritePalette(ctx, ts.defaultPalette));
@@ -235,17 +240,13 @@ ox::Error loadSpriteTileSheet(
 		Context &ctx,
 		TileSheetSet const&set) noexcept {
 	auto const bpp = static_cast<unsigned>(set.bpp);
-	OX_RETURN_ERROR(loadTileSheetSet(ctx, MEM_SPRITE_TILES, set));
+	OX_RETURN_ERROR(loadTileSheetSet(ctx, {MEM_SPRITE_TILES, 32 * ox::units::KB}, set));
 	setSpritesBpp(bpp);
 	return {};
 }
 
 void setBgTile(
-	Context &ctx,
+	Context &ctx, uint_t const bgIdx, int const column, int const row, BgTile const&tile) noexcept {
-	uint_t const bgIdx,
-	int const column,
-	int const row,
-	BgTile const &tile) noexcept {
 	auto const tileIdx = static_cast<std::size_t>(row * tileColumns(ctx) + column);
 	// see Tonc 9.3
 	MEM_BG_MAP[bgIdx][tileIdx] =
@@ -274,7 +275,7 @@ bool bgStatus(Context&, unsigned const bg) noexcept {
 
 void setBgStatus(Context&, unsigned const bg, bool const status) noexcept {
 	constexpr auto Bg0Status = 8;
-	auto const mask = static_cast<uint32_t>(status) << (Bg0Status + bg);
+	const auto mask = static_cast<uint32_t>(status) << (Bg0Status + bg);
 	REG_DISPCTL = REG_DISPCTL | ((REG_DISPCTL & ~mask) | mask);
 }
 
@@ -285,7 +286,7 @@ void setBgBpp(Context&, unsigned const bgIdx, unsigned const bpp) noexcept {
 
 void setBgCbb(Context &ctx, unsigned const bgIdx, unsigned const cbbIdx) noexcept {
 	auto &bgCtl = regBgCtl(bgIdx);
-	auto const &cbbData = ctx.cbbData[cbbIdx];
+	const auto &cbbData = ctx.cbbData[cbbIdx];
 	teagba::bgSetBpp(bgCtl, cbbData.bpp);
 	teagba::bgSetCbb(bgCtl, cbbIdx);
 }
@@ -295,14 +296,6 @@ void setBgPriority(Context&, uint_t const bgIdx, uint_t const priority) noexcept
 	bgCtl = (bgCtl & 0b1111'1111'1111'1100u) | (priority & 0b11);
 }
 
-void setBgOffset(Context&, uint16_t const bg, int16_t const x, int16_t const y) noexcept {
-	teagba::setBgOffset(bg, x, y);
-}
-
-void scrollBgOffset(Context&, uint16_t const bg, int16_t const x, int16_t const y) noexcept {
-	teagba::scrollBgOffset(bg, x, y);
-}
-
 void hideSprite(Context&, unsigned const idx) noexcept {
 	//oxAssert(g_spriteUpdates < config::GbaSpriteBufferLen, "Sprite update buffer overflow");
 	teagba::addSpriteUpdate({
@@ -348,13 +341,13 @@ uint_t spriteCount(Context const &) noexcept {
 
 namespace ox {
 
-void panic(char const *file, int line, char const *panicMsg, ox::Error const &err) noexcept {
+void panic(const char *file, int line, const char *panicMsg, ox::Error const&err) noexcept {
 	using namespace nostalgia::gfx;
 	// reset heap to make sure we have enough memory to allocate context data
 	OX_ALLOW_UNSAFE_BUFFERS_BEGIN
-	auto const heapBegin = reinterpret_cast<char*>(MEM_EWRAM.data());
+	const auto heapBegin = reinterpret_cast<char*>(MEM_EWRAM_BEGIN);
-	auto const heapSz = MEM_EWRAM.size() / 2;
+	const auto heapSz = (MEM_EWRAM_END - MEM_EWRAM_BEGIN) / 2;
-	auto const heapEnd = reinterpret_cast<char*>(MEM_EWRAM.data() + heapSz);
+	const auto heapEnd = reinterpret_cast<char*>(MEM_EWRAM_BEGIN + heapSz);
 	ox::heapmgr::initHeap(heapBegin, heapEnd);
 	OX_ALLOW_UNSAFE_BUFFERS_END
 	auto tctx = turbine::init(keel::loadRomFs("").unwrap(), "Nostalgia").unwrap();

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

@@ -287,7 +287,7 @@ static void initSpriteBufferObjects(Context const &ctx, glutils::BufferSet &bs)
 static void initBackgroundBufferObjects(glutils::BufferSet &bs) noexcept {
 	for (auto x = 0u; x < TileColumns; ++x) {
 		for (auto y = 0u; y < TileRows; ++y) {
-			auto const i = bgVertexRow(x, y);
+			const auto i = bgVertexRow(x, y);
 			auto const vbo = ox::Span{bs.vertices}
 				+ i * static_cast<std::size_t>(BgVertexVboLength);
 			auto const ebo = ox::Span{bs.elements}
@@ -428,19 +428,19 @@ static void drawBackgrounds(
 		ox::Size const&renderSz) noexcept {
 	// load background shader and its uniforms
 	glUseProgram(ctx.bgShader);
-	auto const uniformSrcImgSz = glGetUniformLocation(ctx.bgShader, "fSrcImgSz");
+	const auto uniformSrcImgSz = glGetUniformLocation(ctx.bgShader, "fSrcImgSz");
-	auto const uniformXScale = static_cast<GLint>(glGetUniformLocation(ctx.bgShader, "vXScale"));
+	const auto uniformXScale = static_cast<GLint>(glGetUniformLocation(ctx.bgShader, "vXScale"));
-	auto const uniformTileHeight = static_cast<GLint>(glGetUniformLocation(ctx.bgShader, "vTileHeight"));
+	const auto uniformTileHeight = static_cast<GLint>(glGetUniformLocation(ctx.bgShader, "vTileHeight"));
-	auto const uniformBgIdx = static_cast<GLint>(glGetUniformLocation(ctx.bgShader, "vBgIdx"));
+	const auto uniformBgIdx = static_cast<GLint>(glGetUniformLocation(ctx.bgShader, "vBgIdx"));
-	auto const [wi, hi] = renderSz;
+	const auto [wi, hi] = renderSz;
-	auto const wf = static_cast<float>(wi);
+	const auto wf = static_cast<float>(wi);
-	auto const hf = static_cast<float>(hi);
+	const auto hf = static_cast<float>(hi);
 	glUniform1f(uniformXScale, hf / wf);
 	auto bgIdx = 0.f;
-	for (auto const &bg : ctx.backgrounds) {
+	for (const auto &bg : ctx.backgrounds) {
 		if (bg.enabled) {
 			auto &cbb = ctx.cbbs[bg.cbbIdx];
-			auto const tileRows = cbb.tex.height / (TileHeight * Scale);
+			const auto tileRows = cbb.tex.height / (TileHeight * Scale);
 			glUniform1f(uniformTileHeight, 1.0f / static_cast<float>(tileRows));
 			glUniform2f(
 					uniformSrcImgSz,
@@ -456,11 +456,11 @@ static void drawBackgrounds(
 static void drawSprites(Context &ctx, ox::Size const&renderSz) noexcept {
 	glUseProgram(ctx.spriteShader);
 	auto &sb = ctx.spriteBlocks;
-	auto const uniformXScale = glGetUniformLocation(ctx.bgShader, "vXScale");
+	const auto uniformXScale = glGetUniformLocation(ctx.bgShader, "vXScale");
-	auto const uniformTileHeight = glGetUniformLocation(ctx.spriteShader, "vTileHeight");
+	const auto uniformTileHeight = glGetUniformLocation(ctx.spriteShader, "vTileHeight");
-	auto const [wi, hi] = renderSz;
+	const auto [wi, hi] = renderSz;
-	auto const wf = static_cast<float>(wi);
+	const auto wf = static_cast<float>(wi);
-	auto const hf = static_cast<float>(hi);
+	const auto hf = static_cast<float>(hi);
 	glUniform1f(uniformXScale, hf / wf);
 	// update vbo
 	glBindVertexArray(sb.vao);
@@ -469,7 +469,7 @@ static void drawSprites(Context &ctx, ox::Size const &renderSz) noexcept {
 		glutils::sendVbo(sb);
 	}
 	// set vTileHeight uniform
-	auto const tileRows = sb.tex.height / (TileHeight * Scale);
+	const auto tileRows = sb.tex.height / (TileHeight * Scale);
 	glUniform1f(uniformTileHeight, 1.0f / static_cast<float>(tileRows));
 	// draw
 	glBindTexture(GL_TEXTURE_2D, sb.tex);
@@ -493,7 +493,7 @@ static void loadPalette(
 	// make first color transparent
 	palette[palOffset + 3] = 0;
 	glUseProgram(shaderPgrm);
-	auto const uniformPalette = static_cast<GLint>(glGetUniformLocation(shaderPgrm, "fPalette"));
+	const auto uniformPalette = static_cast<GLint>(glGetUniformLocation(shaderPgrm, "fPalette"));
 	glUniform4fv(uniformPalette, ColorCnt, palette.data());
 }
 
@@ -526,12 +526,12 @@ static void setSprite(
 	auto const uY = static_cast<int>(s.y + 8) % 255 - 8;
 	oxAssert(1 < ctx.spriteBlocks.vertices.size(), "vbo overflow");
 	oxAssert(1 < ctx.spriteBlocks.elements.size(), "ebo overflow");
-	auto const spriteVboSz = ctx.blocksPerSprite * renderer::SpriteVertexVboLength;
+	const auto spriteVboSz = ctx.blocksPerSprite * renderer::SpriteVertexVboLength;
-	auto const spriteEboSz = ctx.blocksPerSprite * renderer::SpriteVertexEboLength;
+	const auto spriteEboSz = ctx.blocksPerSprite * renderer::SpriteVertexEboLength;
 	auto const vboBase = spriteVboSz * idx;
 	auto const eboBase = spriteEboSz * idx;
 	auto i = 0u;
-	auto const set = [&](int xIt, int yIt, bool enabled) {
+	const auto set = [&](int xIt, int yIt, bool enabled) {
 		auto const fX = static_cast<float>(uX + xIt * 8) / 8;
 		auto const fY = static_cast<float>(uY + yIt * 8) / 8;
 		auto const vboIdx = vboBase + renderer::SpriteVertexVboLength * i;
@@ -576,10 +576,10 @@ static void setSprite(
 
 ox::Result<ox::UPtr<Context>> init(turbine::Context &tctx, InitParams const&params) noexcept {
 	auto ctx = ox::make_unique<Context>(tctx, params);
-	auto const bgVshad = ox::sfmt(renderer::bgvshadTmpl, gl::GlslVersion);
+	const auto bgVshad = ox::sfmt(renderer::bgvshadTmpl, gl::GlslVersion);
-	auto const bgFshad = ox::sfmt(renderer::bgfshadTmpl, gl::GlslVersion);
+	const auto bgFshad = ox::sfmt(renderer::bgfshadTmpl, gl::GlslVersion);
-	auto const spriteVshad = ox::sfmt(renderer::spritevshadTmpl, gl::GlslVersion);
+	const auto spriteVshad = ox::sfmt(renderer::spritevshadTmpl, gl::GlslVersion);
-	auto const spriteFshad = ox::sfmt(renderer::spritefshadTmpl, gl::GlslVersion);
+	const auto spriteFshad = ox::sfmt(renderer::spritefshadTmpl, gl::GlslVersion);
 	OX_RETURN_ERROR(glutils::buildShaderProgram(bgVshad, bgFshad).moveTo(ctx->bgShader));
 	OX_RETURN_ERROR(
 			glutils::buildShaderProgram(spriteVshad, spriteFshad).moveTo(ctx->spriteShader));
@@ -603,12 +603,12 @@ struct TileSheetData {
 	}
 };
 
-static ox::Result<TileSheetData> normalizeTileSheet
+static ox::Result<TileSheetData> normalizeTileSheet(
-		(CompactTileSheet const &ts) noexcept {
+		CompactTileSheet const&ts) noexcept {
 	const uint_t bytesPerTile = ts.bpp == 8 ? PixelsPerTile : PixelsPerTile / 2;
-	auto const tiles = ts.pixels.size() / bytesPerTile;
+	const auto tiles = ts.pixels.size() / bytesPerTile;
 	constexpr int width = 8;
-	int const height = 8 * static_cast<int>(tiles);
+	const int height = 8 * static_cast<int>(tiles);
 	ox::Vector<uint32_t> pixels;
 	if (bytesPerTile == 64) { // 8 BPP
 		pixels.resize(ts.pixels.size());
@@ -779,13 +779,13 @@ void setBgTile(
 			"nostalgia.gfx.setBgTile",
 			"bgIdx: {}, column: {}, row: {}, tile: {}, palBank: {}",
 			bgIdx, column, row, tile.tileIdx, tile.palBank);
-	auto const z = static_cast<uint_t>(bgIdx);
+	const auto z = static_cast<uint_t>(bgIdx);
-	auto const y = static_cast<uint_t>(row);
+	const auto y = static_cast<uint_t>(row);
-	auto const x = static_cast<uint_t>(column);
+	const auto x = static_cast<uint_t>(column);
-	auto const i = renderer::bgVertexRow(x, y);
+	const auto i = renderer::bgVertexRow(x, y);
 	auto &cbb = ctx.cbbs[z];
-	auto const vbo = ox::Span{cbb.vertices} + i * renderer::BgVertexVboLength;
+	const auto vbo = ox::Span{cbb.vertices} + i * renderer::BgVertexVboLength;
-	auto const ebo = ox::Span{cbb.elements} + i * renderer::BgVertexEboLength;
+	const auto ebo = ox::Span{cbb.elements} + i * renderer::BgVertexEboLength;
 	auto &bg = ctx.backgrounds[bgIdx];
 	renderer::setTileBufferObject(
 			static_cast<uint_t>(i * renderer::BgVertexVboRows),

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

@@ -10,11 +10,11 @@ namespace nostalgia::gfx {
 constexpr auto GbaTileColumns = 32;
 constexpr auto GbaTileRows = 32;
 
-int tileColumns(Context const&) noexcept {
+int tileColumns(Context&) noexcept {
 	return GbaTileColumns;
 }
 
-int tileRows(Context const&) noexcept {
+int tileRows(Context&) noexcept {
 	return GbaTileRows;
 }
 
@@ -249,7 +249,7 @@ void setBgTile(
 }
 
 ox::Error initConsole(Context &ctx) noexcept {
-	constexpr ox::FileAddress TilesheetAddr = ox::StringLiteral("/TileSheets/Charset.nts");
+	constexpr ox::FileAddress TilesheetAddr = ox::StringLiteral("/TileSheets/Charset.ng");
 	constexpr ox::FileAddress PaletteAddr = ox::StringLiteral("/Palettes/Charset.npal");
 	setBgStatus(ctx, 0b0001);
 	setBgCbb(ctx, 0, 0);

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

@@ -8,6 +8,7 @@
 
 #include <keel/typeconv.hpp>
 
+#include <nostalgia/gfx/context.hpp>
 #include <nostalgia/gfx/palette.hpp>
 #include <nostalgia/gfx/tilesheet.hpp>
 

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

@@ -26,4 +26,3 @@ install(
 
 add_subdirectory(paletteeditor)
 add_subdirectory(tilesheeteditor)
-add_subdirectory(subcommands)

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

@@ -72,7 +72,7 @@ PaletteEditorImGui::PaletteEditorImGui(studio::Context &sctx, ox::StringParam pa
 		Editor(sctx, std::move(path)),
 		m_sctx(sctx),
 		m_tctx(sctx.tctx),
-		m_pal(m_sctx.project->loadObj<Palette>(itemPath()).unwrapThrow()) {
+		m_pal(*keel::readObj<Palette>(keelCtx(m_tctx), itemPath()).unwrapThrow()) {
 	undoStack()->changeTriggered.connect(this, &PaletteEditorImGui::handleCommand);
 	m_pageRenameDlg.inputSubmitted.connect(this, &PaletteEditorImGui::renamePage);
 }

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

@@ -8,25 +8,10 @@
 
 #include "paletteeditor/paletteeditor-imgui.hpp"
 #include "tilesheeteditor/tilesheeteditor-imgui.hpp"
-#include "subcommands/export-tilesheet/export-tilesheet.hpp"
 
 namespace nostalgia::gfx {
 
-static struct: studio::Module {
+static class: public studio::Module {
-
-	ox::String id() const noexcept final {
-		return ox::String{"net.drinkingtea.nostalgia.gfx"};
-	}
-
-	ox::Vector<studio::Command> commands() const final {
-		return {
-			{
-				"export-tilesheet",
-				cmdExportTilesheet,
-			}
-		};
-	}
-
 	ox::Vector<studio::EditorMaker> editors(studio::Context &ctx) const noexcept final {
 		return {
 			studio::editorMaker<TileSheetEditorImGui>(ctx, {FileExt_ng, FileExt_nts}),
@@ -43,10 +28,9 @@ static struct: studio::Module {
 		}, ox::ClawFormat::Organic));
 		return out;
 	}
-
 } const mod;
 
-studio::Module const *studioModule() noexcept {
+const studio::Module *studioModule() noexcept {
 	return &mod;
 }
 

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

@@ -1,10 +0,0 @@
-
-target_sources(
-	NostalgiaGfx-Studio PRIVATE
-        export-tilesheet/export-tilesheet.cpp
-)
-
-target_link_libraries(
-	NostalgiaGfx-Studio PUBLIC
-		OxClArgs
-)

src/nostalgia/modules/gfx/src/studio/subcommands/export-tilesheet/export-tilesheet.cpp

@@ -1,161 +0,0 @@
-/*
- * Copyright 2016 - 2025 Gary Talent (gary@drinkingtea.net). All rights reserved.
- */
-
-#include <lodepng.h>
-
-#include <ox/clargs/clargs.hpp>
-#include <ox/std/trace.hpp>
-
-#include <studio/project.hpp>
-
-#include <nostalgia/gfx/palette.hpp>
-#include <nostalgia/gfx/tilesheet.hpp>
-
-#include "export-tilesheet.hpp"
-
-#include "nostalgia/gfx/tilesheet.hpp"
-#include "studio/context.hpp"
-
-
-namespace nostalgia::gfx {
-
-static ox::Vector<uint32_t> normalizePixelSizes(
-		ox::Vector<uint8_t> const &inPixels) noexcept {
-	ox::Vector<uint32_t> outPixels;
-	outPixels.reserve(inPixels.size());
-	outPixels.resize(inPixels.size());
-	for (size_t i{}; i < inPixels.size(); ++i) {
-		outPixels[i] = inPixels[i];
-	}
-	return outPixels;
-}
-
-static ox::Vector<uint32_t> normalizePixelArrangement(
-		ox::Vector<uint32_t> const &inPixels,
-		int const cols,
-		int const scale) {
-	auto const scalePt = ox::Point{scale, scale};
-	auto const width = cols * TileWidth;
-	auto const height = static_cast<int>(inPixels.size()) / width;
-	auto const dstWidth = width * scale;
-	ox::Vector<uint32_t> outPixels(static_cast<size_t>((width * scale) * (height * scale)));
-	for (size_t dstIdx{}; dstIdx < outPixels.size(); ++dstIdx) {
-		auto const dstPt = ox::Point{
-			static_cast<int>(dstIdx) % dstWidth,
-			static_cast<int>(dstIdx) / dstWidth};
-		auto const srcPt = dstPt / scalePt;
-		auto const srcIdx = ptToIdx(srcPt, cols);
-		outPixels[dstIdx] = inPixels[srcIdx];
-	}
-	return outPixels;
-}
-
-static ox::Error toPngFile(
-		ox::CStringViewCR path,
-		ox::Vector<uint32_t> &&pixels,
-		Palette const &pal,
-		size_t const page,
-		unsigned const width,
-		unsigned const height) noexcept {
-	for (auto &c : pixels) {
-		c = color32(color(pal, page, c)) | static_cast<Color32>(0XFF << 24);
-	}
-	constexpr auto fmt = LCT_RGBA;
-	return ox::Error(static_cast<ox::ErrorCode>(
-			lodepng_encode_file(
-					path.c_str(),
-					reinterpret_cast<uint8_t const*>(pixels.data()),
-					width,
-					height,
-					fmt,
-					8)));
-}
-
-ox::Error exportSubsheetToPng(
-	TileSheet::SubSheet const &s,
-	Palette const &pal,
-	size_t const palPage,
-	ox::CStringViewCR dstPath,
-	int const scale) noexcept {
-	// subsheet to png
-	auto const width = s.columns * TileWidth;
-	auto const height = s.rows * TileHeight;
-	auto const err = toPngFile(
-			dstPath,
-			normalizePixelArrangement(
-				normalizePixelSizes(s.pixels),
-				s.columns,
-				scale),
-			pal,
-			palPage,
-			static_cast<unsigned>(width * scale),
-			static_cast<unsigned>(height * scale));
-	if (err) {
-		oxErrorf("TileSheet export failed: {}", toStr(err));
-		return ox::Error{7, "TileSheet export failed"};
-	}
-	return {};
-}
-
-ox::Error exportSubsheetToPng(
-	TileSheet const &src,
-	Palette const &pal,
-	ox::StringViewCR subsheetPath,
-	size_t const palPage,
-	ox::CStringViewCR dstPath,
-	int const scale) noexcept {
-	// subsheet to png
-	auto const [s, ssErr] = getSubSheet(
-		ox::split(subsheetPath, '.'), src);
-	if (ssErr) {
-		return ox::Error{6, "failed to find SubSheet"};
-	}
-	return exportSubsheetToPng(
-		*s,
-		pal,
-		palPage,
-		dstPath,
-		scale);
-}
-
-ox::Error cmdExportTilesheet(studio::Project &project, ox::SpanView<ox::CString> const args) noexcept {
-	// parse args
-	ox::ClArgs const clargs{args};
-	bool showUsage = true;
-	OX_DEFER [&showUsage] {
-		if (showUsage) {
-			oxErr("usage: export-tilesheet "
-				"-src-path <path> "
-				"-dst-path <path> "
-				"[-pal-path <path>] "
-				"[-subsheet-path <path>] "
-				"[-scale <int>]\n");
-		}
-	};
-	if (args.empty()) {
-		return {};
-	}
-	OX_REQUIRE(srcPath, clargs.getString("src-path").transformError(1, "no src path specified"));
-	OX_REQUIRE(dstPath, clargs.getString("dst-path").transformError(2, "no dst path specified"));
-	auto const palPath = clargs.getString("pal-path", "");
-	auto const subsheetPath = clargs.getString("subsheet-path").or_value(ox::String{"Root"});
-	auto const palPage = static_cast<size_t>(clargs.getInt("pal-page", 0));
-	auto const scale = clargs.getInt("scale", 1);
-	showUsage = false;
-	// load objects
-	auto &kctx = project.kctx();
-	OX_REQUIRE(ts, keel::readObj<TileSheet>(kctx, srcPath).transformError(4, "could not load TileSheet"));
-	OX_REQUIRE(pal, keel::readObj<Palette>(kctx, palPath.size() ? palPath : ts->defaultPalette)
-		.transformError(5, "could not load Palette"));
-	// export to the destination file
-	return exportSubsheetToPng(
-		*ts,
-		*pal,
-		subsheetPath,
-		palPage,
-		dstPath,
-		scale);
-}
-
-}

src/nostalgia/modules/gfx/src/studio/subcommands/export-tilesheet/export-tilesheet.hpp

@@ -1,28 +0,0 @@
-/*
- * Copyright 2016 - 2025 Gary Talent (gary@drinkingtea.net). All rights reserved.
- */
-
-#pragma once
-
-#include <ox/std/error.hpp>
-
-namespace nostalgia::gfx {
-
-ox::Error exportSubsheetToPng(
-	TileSheet::SubSheet const &s,
-	Palette const &pal,
-	size_t palPage,
-	ox::CStringViewCR dstPath,
-	int scale) noexcept;
-
-ox::Error exportSubsheetToPng(
-	TileSheet const &src,
-	Palette const &pal,
-	ox::StringViewCR subsheetPath,
-	size_t palPage,
-	ox::CStringViewCR dstPath,
-	int scale) noexcept;
-
-ox::Error cmdExportTilesheet(studio::Project& project, ox::SpanView<ox::CString> args) noexcept;
-
-}

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

@@ -48,7 +48,7 @@ CutPasteCommand::CutPasteCommand(
 
 ox::Error CutPasteCommand::redo() noexcept {
 	auto &subsheet = getSubSheet(m_img, m_subSheetIdx);
-	for (auto const &c : m_changes) {
+	for (const auto &c : m_changes) {
 		subsheet.pixels[c.idx] = static_cast<uint8_t>(c.newPalIdx);
 	}
 	return {};
@@ -56,7 +56,7 @@ ox::Error CutPasteCommand::redo() noexcept {
 
 ox::Error CutPasteCommand::undo() noexcept {
 	auto &subsheet = getSubSheet(m_img, m_subSheetIdx);
-	for (auto const &c : m_changes) {
+	for (const auto &c : m_changes) {
 		subsheet.pixels[c.idx] = static_cast<uint8_t>(c.oldPalIdx);
 	}
 	return {};

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

@@ -9,9 +9,6 @@
 #include <keel/media.hpp>
 #include <studio/studio.hpp>
 
-#include <nostalgia/gfx/studio.hpp>
-
-#include "../subcommands/export-tilesheet/export-tilesheet.hpp"
 #include "tilesheeteditor-imgui.hpp"
 
 namespace nostalgia::gfx {
@@ -38,6 +35,58 @@ OX_MODEL_BEGIN(TileSheetEditorConfig)
 	OX_MODEL_FIELD_RENAME(activeSubsheet, active_subsheet)
 OX_MODEL_END()
 
+static ox::Vector<uint32_t> normalizePixelSizes(
+		ox::Vector<uint8_t> const &inPixels) noexcept {
+	ox::Vector<uint32_t> outPixels;
+	outPixels.reserve(inPixels.size());
+	outPixels.resize(inPixels.size());
+	for (std::size_t i = 0; i < inPixels.size(); ++i) {
+		outPixels[i] = inPixels[i];
+	}
+	return outPixels;
+}
+
+static ox::Vector<uint32_t> normalizePixelArrangement(
+		ox::Vector<uint32_t> const &inPixels,
+		int const cols,
+		int const scale) {
+	auto const scalePt = ox::Point{scale, scale};
+	auto const width = cols * TileWidth;
+	auto const height = static_cast<int>(inPixels.size()) / width;
+	auto const dstWidth = width * scale;
+	ox::Vector<uint32_t> outPixels(static_cast<size_t>((width * scale) * (height * scale)));
+	for (std::size_t dstIdx = 0; dstIdx < outPixels.size(); ++dstIdx) {
+		auto const dstPt = ox::Point{
+			static_cast<int>(dstIdx) % dstWidth,
+			static_cast<int>(dstIdx) / dstWidth};
+		auto const srcPt = dstPt / scalePt;
+		auto const srcIdx = ptToIdx(srcPt, cols);
+		outPixels[dstIdx] = inPixels[srcIdx];
+	}
+	return outPixels;
+}
+
+static ox::Error toPngFile(
+		ox::CStringViewCR path,
+		ox::Vector<uint32_t> &&pixels,
+		Palette const &pal,
+		size_t const page,
+		unsigned const width,
+		unsigned const height) noexcept {
+	for (auto &c : pixels) {
+		c = color32(color(pal, page, c)) | static_cast<Color32>(0XFF << 24);
+	}
+	constexpr auto fmt = LCT_RGBA;
+	return ox::Error(static_cast<ox::ErrorCode>(
+			lodepng_encode_file(
+					path.c_str(),
+					reinterpret_cast<uint8_t const*>(pixels.data()),
+					width,
+					height,
+					fmt,
+					8)));
+}
+
 TileSheetEditorImGui::TileSheetEditorImGui(studio::Context &sctx, ox::StringParam path):
 		Editor{sctx, std::move(path)},
 		m_sctx{sctx},
@@ -370,7 +419,21 @@ ox::Error TileSheetEditorImGui::exportSubsheetToPng(int const scale) const noexc
 	// subsheet to png
 	auto const &s = m_model.activeSubSheet();
 	auto const &pal = m_model.pal();
-	return gfx::exportSubsheetToPng(s, pal, m_model.palettePage(), path, scale);
+	auto const width = s.columns * TileWidth;
+	auto const height = s.rows * TileHeight;
+	auto pixels = normalizePixelSizes(s.pixels);
+	pixels = normalizePixelArrangement(pixels, s.columns, scale);
+	auto const err = toPngFile(
+			path,
+			std::move(pixels),
+			pal,
+			m_model.palettePage(),
+			static_cast<unsigned>(width * scale),
+			static_cast<unsigned>(height * scale));
+	if (err) {
+		oxErrorf("TileSheet export failed: {}", toStr(err));
+	}
+	return err;
 }
 
 void TileSheetEditorImGui::drawTileSheet(ox::Vec2 const &fbSize) noexcept {
@@ -513,10 +576,10 @@ void TileSheetEditorImGui::drawPaletteMenu() noexcept {
 						m_view.setPalIdx(i);
 					}
 					if (ImGui::IsItemHovered() && ImGui::IsMouseDoubleClicked(0)) {
-						navigateToPalette(
+						studio::navigateTo(
 							m_sctx,
 							m_model.palPath(),
-							i, m_model.palettePage());
+							ox::sfmt("{};{}", i, m_model.palettePage()));
 					}
 					// Column: color RGB
 					ImGui::TableNextColumn();

src/nostalgia/modules/gfx/src/studio/tilesheeteditor/tilesheeteditormodel.cpp

@@ -49,7 +49,7 @@ TileSheetEditorModel::TileSheetEditorModel(
 		m_sctx{sctx},
 		m_tctx{m_sctx.tctx},
 		m_path{std::move(path)},
-		m_img{m_sctx.project->loadObj<TileSheet>(m_path).unwrapThrow()},
+		m_img{*readObj<TileSheet>(keelCtx(m_tctx), m_path).unwrapThrow()},
 		// ignore failure to load palette
 		m_pal{readObj<Palette>(keelCtx(m_tctx), m_img.defaultPalette).value},
 		m_undoStack{undoStack} {

src/nostalgia/modules/gfx/src/studio/tilesheeteditor/tilesheeteditorview.cpp

@@ -92,7 +92,7 @@ void TileSheetEditorView::clickFill(ox::Vec2 const &paneSize, ox::Vec2 const &cl
 	m_model.fill(pt, static_cast<uint8_t>(m_palIdx));
 }
 
-void TileSheetEditorView::releaseMouseButton(TileSheetTool const tool) noexcept {
+void TileSheetEditorView::releaseMouseButton(TileSheetTool tool) noexcept {
 	switch (tool) {
 		case TileSheetTool::Draw:
 		case TileSheetTool::Fill:
@@ -135,7 +135,7 @@ void TileSheetEditorView::initView() noexcept {
 
 ox::Point TileSheetEditorView::clickPoint(ox::Vec2 const&paneSize, ox::Vec2 const&clickPos) const noexcept {
 	auto [x, y] = clickPos;
-	auto const pixDrawSz = m_pixelsDrawer.pixelSize(paneSize);
+	const auto pixDrawSz = m_pixelsDrawer.pixelSize(paneSize);
 	x /= paneSize.x;
 	y /= paneSize.y;
 	x += -m_scrollOffset.x / 2;

src/nostalgia/modules/gfx/src/studio/tilesheeteditor/tilesheetpixelgrid.hpp

@@ -73,8 +73,7 @@ class TileSheetGrid {
 		void update(ox::Vec2 const&paneSize, TileSheet::SubSheet const&subsheet) noexcept;
 
 	private:
-		static void setBufferObject(
+		static void setBufferObject(ox::Point pt1, ox::Point pt2, Color32 c, ox::Span<float> vbo, ox::Vec2 const&pixSize) noexcept;
-			ox::Point pt1, ox::Point pt2, Color32 c, ox::Span<float> vbo, ox::Vec2 const &pixSize) noexcept;
 
 		void setBufferObjects(ox::Vec2 const&paneSize, TileSheet::SubSheet const&subsheet) noexcept;
 

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

@@ -86,12 +86,12 @@ static void setPixel(
 	int const columns,
 	ox::Point const&pt,
 	uint8_t const palIdx) noexcept {
-	auto const idx = ptToIdx(pt, columns);
+	const auto idx = ptToIdx(pt, columns);
 	pixels[idx] = palIdx;
 }
 
 void setPixel(TileSheet::SubSheet &ss, ox::Point const&pt, uint8_t const palIdx) noexcept {
-	auto const idx = ptToIdx(pt, ss.columns);
+	const auto idx = ptToIdx(pt, ss.columns);
 	ss.pixels[idx] = palIdx;
 }
 
@@ -154,8 +154,8 @@ ox::Result<ox::StringView> getNameFor(TileSheet::SubSheet const &ss, SubSheetId
 	if (ss.id == pId) {
 		return ox::StringView(ss.name);
 	}
-	for (auto const &sub : ss.subsheets) {
+	for (const auto &sub : ss.subsheets) {
-		auto const [name, err] = getNameFor(sub, pId);
+		const auto [name, err] = getNameFor(sub, pId);
 		if (!err) {
 			return name;
 		}
@@ -211,47 +211,6 @@ ox::Result<TileSheet::SubSheetIdx> getSubSheetIdx(TileSheet const &ts, SubSheetI
 	return out;
 }
 
-
-template<typename SubSheet>
-static ox::Result<SubSheet*> getSubSheet(
-		ox::SpanView<ox::StringView> const &idx,
-		std::size_t const idxIt,
-		SubSheet &pSubSheet) noexcept {
-	if (idxIt == idx.size()) {
-		return &pSubSheet;
-	}
-	auto const &currentIdx = idx[idxIt];
-	auto const next = ox::find_if(
-		pSubSheet.subsheets.begin(),
-		pSubSheet.subsheets.end(),
-		[&currentIdx](TileSheet::SubSheet const &ss) {
-			return ss.name == currentIdx;
-		});
-	if (next == pSubSheet.subsheets.end()) {
-		return ox::Error{1, "SubSheet not found"};
-	}
-	return getSubSheet(idx, idxIt + 1, *next);
-}
-
-ox::Result<TileSheet::SubSheet const*> getSubSheet(
-		ox::SpanView<ox::StringView> const &idx,
-		TileSheet const &ts) noexcept {
-	if (!idx.empty() && idx[0] == ts.subsheet.name) {
-		return getSubSheet<TileSheet::SubSheet const>(idx, 1, ts.subsheet);
-	}
-	return ox::Error{1, "SubSheet not found"};
-}
-
-ox::Result<TileSheet::SubSheet*> getSubSheet(
-		ox::SpanView<ox::StringView> const &idx,
-		TileSheet &ts) noexcept {
-	if (!idx.empty() && idx[0] == ts.subsheet.name) {
-		return getSubSheet<TileSheet::SubSheet>(idx, 1, ts.subsheet);
-	}
-	return ox::Error{1, "SubSheet not found"};
-}
-
-
 #if defined(__GNUC__) && __GNUC__ >= 13
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wdangling-reference"
@@ -263,7 +222,7 @@ static TileSheet::SubSheet const &getSubSheet(
 	if (idxIt == idx.size()) {
 		return pSubsheet;
 	}
-	auto const currentIdx = idx[idxIt];
+	const auto currentIdx = idx[idxIt];
 	if (pSubsheet.subsheets.size() < currentIdx) {
 		return pSubsheet;
 	}
@@ -478,13 +437,13 @@ ox::Vector<uint32_t> resizeTileSheetData(
 	ox::Vector<uint32_t> dst;
 	auto dstWidth = srcSize.width * scale;
 	auto dstHeight = srcSize.height * scale;
-	auto const pixelCnt = dstWidth * dstHeight;
+	const auto pixelCnt = dstWidth * dstHeight;
 	dst.resize(static_cast<std::size_t>(pixelCnt));
 	for (auto i = 0; i < pixelCnt; ++i) {
-		auto const dstPt = idxToPt(i, 1, scale);
+		const auto dstPt = idxToPt(i, 1, scale);
-		auto const srcPt = dstPt / ox::Point{scale, scale};
+		const auto srcPt = dstPt / ox::Point{scale, scale};
-		auto const srcIdx = ptToIdx(srcPt, 1);
+		const auto srcIdx = ptToIdx(srcPt, 1);
-		auto const srcPixel = srcPixels[srcIdx];
+		const auto srcPixel = srcPixels[srcIdx];
 		dst[static_cast<std::size_t>(i)] = srcPixel;
 	}
 	return dst;

src/nostalgia/modules/gfx/test/tests.cpp

@@ -24,7 +24,7 @@ static std::map<ox::StringView, ox::Error(*)()> tests = {
 	},
 };
 
-int main(int argc, char const **argv) {
+int main(int argc, const char **argv) {
 	int retval = -1;
 	if (argc > 0) {
 		auto const args = ox::Span{argv, static_cast<size_t>(argc)};

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

@@ -10,10 +10,6 @@ namespace nostalgia::sound {
 
 static struct: studio::Module {
 
-	ox::String id() const noexcept final {
-		return ox::String{"net.drinkingtea.nostalgia.sound"};
-	}
-
 	ox::Vector<studio::EditorMaker> editors(studio::Context&) const noexcept final {
 		return {
 		};
@@ -26,7 +22,7 @@ static struct: studio::Module {
 
 } const mod;
 
-studio::Module const *studioModule() noexcept {
+const studio::Module *studioModule() noexcept {
 	return &mod;
 }
 

src/nostalgia/modules/sound/test/tests.cpp

@@ -11,7 +11,7 @@
 static std::map<ox::StringView, ox::Error(*)()> tests = {
 };
 
-int main(int argc, char const **argv) {
+int main(int argc, const char **argv) {
 	int retval = -1;
 	if (argc > 0) {
 		auto const args = ox::Span{argv, static_cast<size_t>(argc)};

src/nostalgia/player/app.cpp

@@ -38,7 +38,7 @@ static int testUpdateHandler(turbine::Context &tctx) noexcept {
 	spriteX += xmod;
 	spriteY += ymod;
 	constexpr ox::StringView sprites = "nostalgia";
-	for (unsigned i = 0; i < sprites.size(); ++i) {
+	for (unsigned i = 0; i < sprites.len(); ++i) {
 		auto const c = static_cast<unsigned>(sprites[i] - ('a' - 1));
 		gfx::setSprite(cctx, i, {
 			.enabled = true,

src/nostalgia/studio/CMakeLists.txt

@@ -15,7 +15,7 @@ target_link_libraries(
 
 target_compile_definitions(
 	NostalgiaStudio PUBLIC
-		OLYMPIC_APP_VERSION="dev build"
+		OLYMPIC_APP_VERSION="d2025.06.0"
 )
 
 install(

src/nostalgia/studio/Info.plist

@@ -18,7 +18,7 @@
 	<string>APPL</string>
 
 	<key>CFBundleVersion</key>
-	<string>dev build</string>
+	<string>d2025.06.0</string>
 
 	<key>LSMinimumSystemVersion</key>
 	<string>12.0.0</string>

src/olympic/CMakeLists.txt

@@ -19,9 +19,6 @@ else()
 endif()
 
 add_subdirectory(applib)
-#if(NOT APPLE)
-#    add_subdirectory(hull)
-#endif()
 add_subdirectory(keel)
 add_subdirectory(turbine)
 if(${OLYMPIC_BUILD_STUDIO})

src/olympic/applib/CMakeLists.txt

@@ -3,11 +3,6 @@ add_library(
     OlympicApplib INTERFACE
 )
 
-target_link_libraries(
-    OlympicApplib INTERFACE
-        OxLogConn
-)
-
 target_sources(
     OlympicApplib INTERFACE
         applib.cpp

src/olympic/applib/applib.cpp

@@ -55,7 +55,7 @@ void registerStudioModules() noexcept;
 #if defined(_WIN32) && OLYMPIC_GUI_APP
 int WinMain() {
 	auto const argc = __argc;
-	auto const argv = const_cast<char const**>(__argv);
+	auto const argv = const_cast<const char**>(__argv);
 #else
 int main(int const argc, char const **argv) {
 #endif

src/olympic/hull/CMakeLists.txt

@@ -1,12 +0,0 @@
-
-add_library(Hull)
-target_sources(
-    Hull PUBLIC
-        FILE_SET CXX_MODULES FILES
-            hull.cpp
-)
-
-target_link_libraries(
-	Hull PUBLIC
-		OxStd
-)

src/olympic/hull/hull.cpp

@@ -1,98 +0,0 @@
-/*
- * Copyright 2016 - 2025 Gary Talent (gary@drinkingtea.net). All rights reserved.
- */
-
-module;
-
-#include <ox/std/string.hpp>
-
-export module hull;
-
-namespace hull {
-
-export
-template<typename Str = ox::String, size_t SmallVecSz = 0>
-constexpr ox::Result<ox::Vector<Str, SmallVecSz>> parseCmd(ox::StringViewCR cmd) noexcept
-	requires(ox::is_same_v<Str, ox::String> || ox::is_same_v<Str, ox::StringView>) {
-	auto const tokens = split(cmd, ' ');
-	ox::Vector<Str, SmallVecSz> args;
-	char waitingFor{};
-	auto const handleString = [&waitingFor, &args](
-		ox::StringViewCR token,
-		char const delimiter) {
-		if (endsWith(token, delimiter)) {
-			args.emplace_back(substr(token, 1, token.size() - 1));
-		} else {
-			waitingFor = delimiter;
-			args.emplace_back(substr(token, 1));
-		}
-	};
-	for (auto const &token : tokens) {
-		if (waitingFor) {
-			if (endsWith(token, waitingFor)) {
-				waitingFor = 0;
-			}
-			auto &tgt = *args.back().value;
-			if constexpr (ox::is_same_v<Str, ox::String>) {
-				tgt += substr(token, 0, token.size() - 1);
-			} else {
-				tgt = {tgt.data(), tgt.size() + token.size() - 1};
-			}
-		} else if (beginsWith(token, '"')) {
-			handleString(token, '"');
-		} else if (beginsWith(token, '\'')) {
-			handleString(token, '\'');
-		} else {
-			args.emplace_back(token);
-		}
-	}
-	if (waitingFor) {
-		return ox::Error{1, "unterminated string"};
-	}
-	return args;
-}
-
-template<typename Str = ox::String>
-[[nodiscard]]
-static constexpr bool testParse(ox::StringViewCR cmd, std::initializer_list<ox::StringView> const &expected) noexcept {
-	auto const [args, err] = parseCmd<Str>(cmd);
-	static constexpr auto equals = [](auto const &a, auto const &b) {
-		if (a.size() != b.size()) {
-			return false;
-		}
-		for (auto i = 0u; i < a.size(); ++i) {
-			if (a[i] != b[i]) {
-				return false;
-			}
-		}
-		return true;
-	};
-	return !err && equals(args, ox::Vector(expected));
-}
-
-static_assert(testParse("echo asdf", {"echo", "asdf"}));
-static_assert(testParse<ox::String>("echo asdf", {"echo", "asdf"}));
-
-static_assert(testParse("echo \"asdf\"", {"echo", "asdf"}));
-static_assert(testParse<ox::String>("echo \"asdf\"", {"echo", "asdf"}));
-
-static_assert(testParse("echo 'asdf'", {"echo", "asdf"}));
-static_assert(testParse<ox::String>("echo 'asdf'", {"echo", "asdf"}));
-
-static_assert(testParse("echo 'asdf' aoue", {"echo", "asdf", "aoue"}));
-static_assert(testParse<ox::String>("echo 'asdf' aoue", {"echo", "asdf", "aoue"}));
-
-export class Prompt {
-
-	private:
-		ox::String m_cmd;
-		ox::String m_workingDir{"/"};
-		ox::Vector<ox::String> m_prevCmds;
-
-	public:
-
-	private:
-
-};
-
-}

src/olympic/keel/include/keel/asset.hpp

@@ -13,7 +13,7 @@ namespace keel {
 
 constexpr auto K1HdrSz = 40;
 
-ox::Result<ox::UUID> readUuidHeader(ox::BufferView const &buff) noexcept;
+ox::Result<ox::UUID> readUuidHeader(ox::BufferView buff) noexcept;
 
 ox::Result<ox::UUID> regenerateUuidHeader(ox::Buffer &buff) noexcept;
 
@@ -25,25 +25,26 @@ ox::Error writeUuidHeader(ox::Writer_c auto &writer, ox::UUID const &uuid) noexc
 
 template<typename T>
 ox::Result<T> readAsset(ox::BufferView buff) noexcept {
-	auto const err = readUuidHeader(buff).error;
+	std::size_t offset = 0;
+	const auto err = readUuidHeader(buff).error;
 	if (!err) {
-		buff += K1HdrSz; // the size of K1 headers
+		offset = K1HdrSz; // the size of K1 headers
 	}
-	auto out = ox::readClaw<T>(buff);
+	auto out = ox::readClaw<T>(buff + offset);
 	OX_RETURN_ERROR(out);
 	OX_RETURN_ERROR(ensureValid(out.value));
 	return out;
 }
 
-ox::Result<ox::ModelObject> readAsset(ox::TypeStore &ts, ox::BufferView const &buff) noexcept;
+ox::Result<ox::ModelObject> readAsset(ox::TypeStore &ts, ox::BufferView buff) noexcept;
 
 struct AssetHdr {
 	ox::UUID uuid;
 	ox::ClawHeader clawHdr;
 };
 
-ox::Result<ox::StringView> readAssetTypeId(ox::BufferView const &buff) noexcept;
+ox::Result<ox::StringView> readAssetTypeId(ox::BufferView buff) noexcept;
 
-ox::Result<AssetHdr> readAssetHeader(ox::BufferView const &buff) noexcept;
+ox::Result<AssetHdr> readAssetHeader(ox::BufferView buff) noexcept;
 
 }

src/olympic/keel/include/keel/assetmanager.hpp

@@ -64,13 +64,11 @@ class AssetContainer {
 
 	protected:
 		constexpr void incRefs() const noexcept {
-			oxAssert(m_references < ox::MaxValue<decltype(m_references)>, "reference count exceeds maximum");
 			++m_references;
 		}
 
 		constexpr void decRefs() const noexcept {
 			--m_references;
-			oxAssert(m_references >= 0, "negative references");
 		}
 
 		[[nodiscard]]
@@ -164,7 +162,6 @@ template<typename T>
 constexpr AssetRef<T>::AssetRef(AssetContainer<T> const*c) noexcept: m_ctr(c) {
 	if (m_ctr) {
 		m_ctr->updated.connect(this, &AssetRef::emitUpdated);
-		m_ctr->incRefs();
 	}
 }
 

src/olympic/keel/include/keel/media.hpp

@@ -147,7 +147,7 @@ template<typename T>
 ox::Result<AssetRef<T>> readObj(
 		Context &ctx,
 		ox::StringViewCR assetId,
-		[[maybe_unused]] bool const forceLoad = false) noexcept {
+		[[maybe_unused]] bool forceLoad = false) noexcept {
 #ifndef OX_BARE_METAL
 	return readObjFile<T>(ctx, assetId, forceLoad);
 #else
@@ -159,7 +159,7 @@ template<typename T>
 ox::Result<AssetRef<T>> readObj(
 		Context &ctx,
 		ox::FileAddress const&file,
-		[[maybe_unused]] bool const forceLoad = false) noexcept {
+		[[maybe_unused]] bool forceLoad = false) noexcept {
 #ifndef OX_BARE_METAL
 	OX_REQUIRE(assetId, file.getPath());
 	return readObj<T>(ctx, ox::StringView(assetId), forceLoad);
@@ -178,7 +178,7 @@ ox::Error writeObj(
 		Context &ctx,
 		ox::FileAddress const&file,
 		T const&obj,
-		ox::ClawFormat const fmt = ox::ClawFormat::Metal) noexcept {
+		ox::ClawFormat fmt = ox::ClawFormat::Metal) noexcept {
 	OX_REQUIRE(objBuff, ox::writeClaw(obj, fmt));
 	return ctx.rom->write(file, objBuff.data(), objBuff.size());
 }

src/olympic/keel/include/keel/typeconv.hpp

@@ -140,7 +140,7 @@ class ConverterFunc final: public BaseConverter {
 	private:
 		template<typename SrcType, typename DstType>
 		struct ParamPack {
-			using Src = ox::remove_const_t<SrcType>;
+			using Src = SrcType;
 			using Dst = DstType;
 		};
 
@@ -214,7 +214,7 @@ class Converter {
 		}
 		[[nodiscard]]
 		BaseConverter const &converter() const noexcept {
-			return *std::launder(m_buff.data());
+			return *m_buff.data();
 		}
 };
 

src/olympic/keel/include/keel/typestore.hpp

@@ -16,7 +16,7 @@ class TypeStore: public ox::TypeStore {
 		ox::String m_descPath;
 
 	public:
-		explicit TypeStore(ox::FileSystem &fs, ox::StringViewCR descPath) noexcept;
+		explicit TypeStore(ox::FileSystem &fs, ox::StringView descPath) noexcept;
 
 	protected:
 		ox::Result<ox::UPtr<ox::DescriptorType>> loadDescriptor(ox::StringView typeId) noexcept override;

src/olympic/keel/src/asset.cpp

@@ -6,7 +6,7 @@
 
 namespace keel {
 
-ox::Result<ox::UUID> readUuidHeader(ox::BufferView const &buff) noexcept {
+ox::Result<ox::UUID> readUuidHeader(ox::BufferView buff) noexcept {
 	if (buff.size() < K1HdrSz) [[unlikely]] {
 		return ox::Error{1, "Insufficient data to contain complete Keel header"};
 	}
@@ -27,31 +27,33 @@ ox::Result<ox::UUID> regenerateUuidHeader(ox::Buffer &buff) noexcept {
 	return id;
 }
 
-ox::Result<ox::ModelObject> readAsset(ox::TypeStore &ts, ox::BufferView const &buff) noexcept {
+ox::Result<ox::ModelObject> readAsset(ox::TypeStore &ts, ox::BufferView buff) noexcept {
 	std::size_t offset = 0;
 	if (!readUuidHeader(buff).error) {
 		offset = K1HdrSz;
 	}
-	return ox::readClaw(ts, buff + offset);
+	buff += offset;
+	return ox::readClaw(ts, buff);
 }
 
-ox::Result<ox::StringView> readAssetTypeId(ox::BufferView const &buff) noexcept {
+ox::Result<ox::StringView> readAssetTypeId(ox::BufferView const buff) noexcept {
-	auto const err = readUuidHeader(buff).error;
+	const auto err = readUuidHeader(buff).error;
-	auto const offset = err ? 0u : K1HdrSz;
+	const auto offset = err ? 0u : K1HdrSz;
 	if (offset >= buff.size()) [[unlikely]] {
 		return ox::Error(1, "Buffer too small for expected data");
 	}
 	return ox::readClawTypeId(buff + offset);
 }
 
-ox::Result<AssetHdr> readAssetHeader(ox::BufferView const &buff) noexcept {
+ox::Result<AssetHdr> readAssetHeader(ox::BufferView buff) noexcept {
 	ox::Result<AssetHdr> out;
-	auto const err = readUuidHeader(buff).moveTo(out.value.uuid);
+	const auto err = readUuidHeader(buff).moveTo(out.value.uuid);
-	auto const offset = err ? 0u : K1HdrSz;
+	const auto offset = err ? 0u : K1HdrSz;
 	if (offset >= buff.size()) [[unlikely]] {
 		return ox::Error(1, "Buffer too small for expected data");
 	}
-	OX_RETURN_ERROR(ox::readClawHeader(buff + offset).moveTo(out.value.clawHdr));
+	buff += offset;
+	OX_RETURN_ERROR(ox::readClawHeader(buff).moveTo(out.value.clawHdr));
 	return out;
 }
 

src/olympic/keel/src/media.cpp

@@ -59,7 +59,7 @@ static ox::Error buildUuidMap(Context &ctx, ox::StringViewCR path, DuplicateSet
 			auto const [uuid, err] = readUuidHeader(buff);
 			if (!err) {
 				// check for duplication
-				if (duplicates && ctx.uuidToPath[uuid.toString()].size()) {
+				if (duplicates && ctx.uuidToPath[uuid.toString()].len()) {
 					auto &dl = (*duplicates)[uuid];
 					if (dl.empty()) {
 						dl.emplace_back(ctx.uuidToPath[uuid.toString()]);
@@ -261,9 +261,6 @@ namespace keel {
 ox::Error setRomFs(Context &ctx, ox::UPtr<ox::FileSystem> &&fs, DuplicateSet &duplicateSet) noexcept {
 	ctx.rom = std::move(fs);
 	clearUuidMap(ctx);
-#ifndef OX_BARE_METAL
-	ctx.assetManager.gc();
-#endif
 	return buildUuidMap(ctx, &duplicateSet);
 }
 

src/olympic/keel/src/pack-applib.cpp

@@ -88,7 +88,7 @@ static ox::Error pack(
 	oxOutf("Final ROM buff size: {} bytes\n", romBuff.size());
 	OX_RETURN_ERROR(writeFileBuff(argRomBin, romBuff));
 	OX_REQUIRE(manifestJson, ox::writeOCString(manifest));
-	OX_RETURN_ERROR(writeFileBuff(argManifest, {manifestJson.data(), manifestJson.size()}));
+	OX_RETURN_ERROR(writeFileBuff(argManifest, {manifestJson.data(), manifestJson.len()}));
 	return {};
 }
 

src/olympic/keel/src/typeconv.cpp

@@ -49,7 +49,7 @@ static ox::Result<ox::UPtr<Wrap>> convert(
 		if (!subConverter.converter().dstMatches(dstTypeName, dstTypeVersion)) {
 			continue;
 		}
-		auto const [intermediate, chainErr] =
+		const auto [intermediate, chainErr] =
 			convert(ctx, converters, src, srcTypeName, srcTypeVersion,
 			        subConverter.converter().srcTypeName(), subConverter.converter().srcTypeVersion());
 		if (!chainErr) {

src/olympic/keel/src/typestore.cpp

@@ -6,7 +6,7 @@
 
 namespace keel {
 
-TypeStore::TypeStore(ox::FileSystem &fs, ox::StringViewCR descPath) noexcept:
+TypeStore::TypeStore(ox::FileSystem &fs, ox::StringView descPath) noexcept:
 	m_fs(fs),
 	m_descPath(descPath) {
 }

src/olympic/keel/test/tests.cpp

@@ -16,7 +16,7 @@ static std::map<ox::StringView, ox::Error(*)()> tests = {
 			constexpr ox::StringView uuidStr = "8d814442-f46e-4cc3-8edc-ca3c01cc86db";
 			constexpr ox::StringView hdr = "K1;8d814442-f46e-4cc3-8edc-ca3c01cc86db;";
 			OX_REQUIRE(uuid, ox::UUID::fromString(uuidStr));
-			ox::Array<char, hdr.size()> buff;
+			ox::Array<char, hdr.len()> buff;
 			ox::CharBuffWriter bw(buff);
 			OX_RETURN_ERROR(keel::writeUuidHeader(bw, uuid));
 			oxExpect(ox::StringView(buff.data(), buff.size()), hdr);
@@ -25,7 +25,7 @@ static std::map<ox::StringView, ox::Error(*)()> tests = {
 	},
 };
 
-int main(int const argc, char const **argv) {
+int main(int argc, const char **argv) {
 	int retval = -1;
 	if (argc > 0) {
 		auto const args = ox::Span{argv, static_cast<size_t>(argc)};

src/olympic/studio/applib/include/studioapp/studioapp.hpp

@@ -10,9 +10,6 @@
 
 namespace studio {
 
-[[nodiscard]]
-ox::Vector<Module const*> const &modules() noexcept;
-
 void registerModule(Module const*) noexcept;
 
 }

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

@@ -2,18 +2,15 @@
  * Copyright 2016 - 2025 Gary Talent (gary@drinkingtea.net). All rights reserved.
  */
 
-#include <complex>
 #include <ctime>
 
 #include <ox/logconn/logconn.hpp>
 #include <ox/std/trace.hpp>
 #include <ox/std/uuid.hpp>
-#include <keel/keel.hpp>
+#include <keel/media.hpp>
 #include <turbine/turbine.hpp>
 
 #include <studio/context.hpp>
-#include <studioapp/studioapp.hpp>
-
 #include "studioui.hpp"
 
 namespace studio {
@@ -43,7 +40,7 @@ static void mouseButtonEventHandler(turbine::Context &ctx, int const btn, bool c
 [[nodiscard]]
 ox::Vector<ox::SpanView<uint8_t>> WindowIcons() noexcept;
 
-static ox::Error runStudio(
+static ox::Error runApp(
 		ox::StringViewCR appName,
 		ox::StringViewCR projectDataDir,
 		ox::UPtr<ox::FileSystem> &&fs) noexcept {
@@ -64,50 +61,18 @@ static ox::Error runStudio(
 static ox::Error run(
 		ox::StringViewCR appName,
 		ox::StringViewCR projectDataDir,
-		ox::SpanView<ox::CString> const &args) {
+		ox::SpanView<const char*>) {
 	// seed UUID generator
 	auto const time = std::time(nullptr);
 	ox::UUID::seedGenerator({
 		static_cast<uint64_t>(time),
 		static_cast<uint64_t>(time << 1)
 	});
-	if (args.size() > 1 && ox::StringView{args[1]} == "cmd") {
-		if (args.size() < 5) {
-			return ox::Error{1, "insufficient arguments for sub-command"};
-		}
-		auto constexpr numCmdArgs = 5;
-		ox::StringView const projectDir = args[2];
-		ox::StringView const moduleId = args[3];
-		ox::StringView const subCmd = args[4];
-		for (auto const m : modules()) {
-			if (m->id() == moduleId) {
-				for (auto const &c : m->commands()) {
-					if (c.name == subCmd) {
-						auto kctx = keel::init(
-							ox::make_unique<ox::PassThroughFS>(projectDir),
-							c.name);
-						if (kctx.error) {
-							return ox::Error{2, "failed to load project directory"};
-						}
-						Project project{*kctx.value, projectDir, projectDataDir};
-						return c.func(
-							project,
-							args.size() > numCmdArgs ?
-								 args + numCmdArgs : ox::SpanView<ox::CString>{});
-					}
-				}
-				return ox::Error{1, "command not found"};
-			}
-		}
-		return ox::Error{1, "module not found"};
-	} else {
 	// run app
-		auto const err = runStudio(appName, projectDataDir, ox::UPtr<ox::FileSystem>{});
+	auto const err = runApp(appName, projectDataDir, ox::UPtr<ox::FileSystem>{});
 	oxAssert(err, "Something went wrong...");
 	return err;
 }
-	return {};
-}
 
 }
 

src/olympic/studio/applib/src/clawviewer.cpp

@@ -140,14 +140,14 @@ void ClawEditor::drawVar(ObjPath &path, ox::StringViewCR name, ox::ModelValue co
 
 void ClawEditor::drawTree(ObjPath &path, ox::ModelObject const&obj) noexcept {
 	using Str = ox::BasicString<100>;
-	for (auto const &c : obj) {
+	for (const auto &c : obj) {
 		ImGui::TableNextRow(0, 5);
 		auto pathStr = ox::join<Str>("##", path).unwrap();
 		auto lbl = ox::sfmt<Str>("{}##{}", c->name, pathStr);
-		auto const rowSelected = false;
+		const auto rowSelected = false;
-		auto const hasChildren = c->value.type() == ox::ModelValue::Type::Object
+		const auto hasChildren = c->value.type() == ox::ModelValue::Type::Object
 		                                || c->value.type() == ox::ModelValue::Type::Vector;
-		auto const flags = ImGuiTreeNodeFlags_SpanFullWidth
+		const auto flags = ImGuiTreeNodeFlags_SpanFullWidth
 		                   | ImGuiTreeNodeFlags_OpenOnArrow
 		                   | (hasChildren ? 0 : ImGuiTreeNodeFlags_Leaf)
 		                   | (rowSelected ? ImGuiTreeNodeFlags_Selected : 0);
@@ -158,7 +158,7 @@ void ClawEditor::drawTree(ObjPath &path, ox::ModelObject const &obj) noexcept {
 		//}
 		path.push_back(c->name);
 		if (c->value.type() == ox::ModelValue::Type::Object) {
-			auto const open = ImGui::TreeNodeEx(lbl.c_str(), flags);
+			const auto open = ImGui::TreeNodeEx(lbl.c_str(), flags);
 			ImGui::SameLine();
 			drawRow(c->value);
 			if (open) {

src/olympic/studio/applib/src/popups/newmenu.cpp

@@ -192,7 +192,7 @@ void NewMenu::drawLastPageButtons(Context &sctx) noexcept {
 }
 
 void NewMenu::finish(Context &sctx) noexcept {
-	if (m_itemName.size() == 0) {
+	if (m_itemName.len() == 0) {
 		oxLogError(ox::Error{1, "New file error: no file name"});
 		return;
 	}

src/olympic/studio/applib/src/popups/newproject.hpp

@@ -13,7 +13,7 @@
 
 namespace studio {
 
-class NewProject: public Popup {
+class NewProject: public studio::Popup {
 	public:
 		enum class Stage {
 			Closed,

src/olympic/studio/applib/src/projectexplorer.cpp

@@ -57,7 +57,7 @@ void ProjectExplorer::dirContextMenu(ox::StringViewCR path) const noexcept {
 		if (ImGui::MenuItem("Add Directory")) {
 			addDir.emit(path);
 		}
-		if (path.size() && ImGui::MenuItem("Delete")) {
+		if (path.len() && ImGui::MenuItem("Delete")) {
 			deleteItem.emit(path);
 		}
 		ImGui::EndPopup();

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

@@ -37,15 +37,11 @@ static bool shutdownHandler(turbine::Context &ctx) {
 namespace ig {
 extern bool s_mainWinHasFocus;
 }
-static ox::Vector<Module const*> g_modules;
+static ox::Vector<Module const*> modules;
-
-ox::Vector<Module const*> const &modules() noexcept {
-	return g_modules;
-}
 
 void registerModule(Module const*mod) noexcept {
 	if (mod) {
-		g_modules.emplace_back(mod);
+		modules.emplace_back(mod);
 	}
 }
 
@@ -250,9 +246,6 @@ void StudioUI::drawMenu() noexcept {
 			if (ImGui::MenuItem("Open Project...", STUDIO_CTRL "+O")) {
 				m_taskRunner.add(*ox::make<FileDialogManager>(this, &StudioUI::openProjectPath));
 			}
-			if (ImGui::MenuItem("Reload Project")) {
-				oxLogError(openProjectPath(m_project->projectPath()));
-			}
 			if (ImGui::BeginMenu("Recent Projects", m_recentProjects.size() > 1)) {
 				for (size_t i = 1; i < m_recentProjects.size(); ++i) {
 					auto const &p = m_recentProjects[i];
@@ -450,7 +443,7 @@ void StudioUI::loadModule(Module const &mod) noexcept {
 }
 
 void StudioUI::loadModules() noexcept {
-	for (auto const mod : g_modules) {
+	for (auto const mod : modules) {
 		loadModule(*mod);
 	}
 }
@@ -639,13 +632,11 @@ ox::Error StudioUI::createOpenProject(ox::StringViewCR path) noexcept {
 
 ox::Error StudioUI::openProjectPath(ox::StringParam path) noexcept {
 	OX_REQUIRE_M(fs, keel::loadRomFs(path.view()));
-	m_project.reset();
-	m_openFiles.clear();
-	m_editors.clear();
 	keel::DuplicateSet ds;
 	OX_RETURN_ERROR(keel::setRomFs(keelCtx(m_tctx), std::move(fs), ds));
 	if (ds.size()) {
-		ox::String msg{"Multiple files have the same UUID:\n"};
+		ox::String msg;
+		msg += "Multiple files have the same UUID:\n";
 		for (auto const &k : ds.keys()) {
 			msg += ox::sfmt("\n\t{}:\n", k.toString());
 			for (auto const &v : ds[k]) {
@@ -671,6 +662,8 @@ ox::Error StudioUI::openProjectPath(ox::StringParam path) noexcept {
 	m_project->dirDeleted.connect(this, &StudioUI::handleDeleteDir);
 	m_project->fileDeleted.connect(this, &StudioUI::handleDeleteFile);
 	m_project->fileMoved.connect(this, &StudioUI::handleMoveFile);
+	m_openFiles.clear();
+	m_editors.clear();
 	studio::editConfig<StudioConfig>(keelCtx(m_tctx), [&](StudioConfig &config) {
 		auto const pcIt = std::find_if(
 			config.projects.begin(), config.projects.end(),
@@ -681,18 +674,14 @@ ox::Error StudioUI::openProjectPath(ox::StringParam path) noexcept {
 			auto p = std::move(*pcIt);
 			std::ignore = config.projects.erase(pcIt);
 			auto &pc = *config.projects.emplace(0, std::move(p));
-			std::ignore = pc.openFiles.erase(
+			for (auto const &f: pc.openFiles) {
-				std::remove_if(
-					pc.openFiles.begin(), pc.openFiles.end(),
-					[&](ox::String const &f) {
 				auto const openFileErr = openFileActiveTab(f, pc.activeTabItemName == f);
 				if (openFileErr) {
 					oxErrorf("\nCould not open editor for file:\n\t{}\nReason:\n\t{}\n", f, toStr(openFileErr));
-							return true;
+					continue;
 				}
 				m_activeEditor = m_editors.back().value->get();
-						return false;
+			}
-					}));
 		} else {
 			config.projects.emplace(0, StudioConfig::ProjectConfig{
 				.projectPath = ox::String{m_project->projectPath()},

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

@@ -24,8 +24,6 @@ class FilePickerPopup {
 	public:
 		explicit FilePickerPopup(ox::StringParam name, keel::Context &kctx, ox::StringParam fileExt) noexcept;
 
-		explicit FilePickerPopup(ox::StringParam name, keel::Context &kctx, ox::SpanView<ox::StringLiteral> fileExts) noexcept;
-
 		explicit FilePickerPopup(ox::StringParam name, keel::Context &kctx, ox::Vector<ox::String> fileExts) noexcept;
 
 		void refresh() noexcept;

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

@@ -131,7 +131,7 @@ class ChildStackItem {
 class IDStackItem {
 	public:
 		explicit IDStackItem(int id) noexcept;
-		explicit IDStackItem(ox::CString const id) noexcept;
+		explicit IDStackItem(const char *id) noexcept;
 		explicit IDStackItem(ox::CStringViewCR id) noexcept;
 		~IDStackItem() noexcept;
 };
@@ -244,7 +244,7 @@ bool BeginPopup(turbine::Context &ctx, ox::CStringViewCR popupName, bool &show,
  * @return true if new value selected, false otherwise
  */
 bool ComboBox(
-		ox::CStringView const &lbl,
+		ox::CStringView lbl,
 		ox::SpanView<ox::CStringView> list,
 		size_t &selectedIdx) noexcept;
 
@@ -255,7 +255,7 @@ bool ComboBox(
  * @param selectedIdx
  * @return true if new value selected, false otherwise
  */
-bool ComboBox(ox::CStringView const &lbl, ox::Span<ox::String const> list, size_t &selectedIdx) noexcept;
+bool ComboBox(ox::CStringView lbl, ox::Span<const ox::String> list, size_t &selectedIdx) noexcept;
 
 /**
  *

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

@@ -23,34 +23,15 @@ struct EditorMaker {
 	Func make;
 };
 
-struct Command {
-	ox::String name;
-	std::function<ox::Error(Project&, ox::SpanView<ox::CString>)> func;
-	Command(
-		ox::StringParam name,
-		std::function<ox::Error(Project&, ox::SpanView<ox::CString>)> func) noexcept:
-		name(std::move(name)),
-		func(std::move(func)) {}
-};
-
 class Module {
 	public:
 		virtual ~Module() noexcept = default;
 
-		[[nodiscard]]
+		virtual ox::Vector<EditorMaker> editors(studio::Context &ctx) const;
-		virtual ox::String id() const noexcept = 0;
 
-		[[nodiscard]]
+		virtual ox::Vector<ox::UPtr<ItemMaker>> itemMakers(studio::Context&) const;
-		virtual ox::Vector<Command> commands() const;
 
-		[[nodiscard]]
+		virtual ox::Vector<ox::UPtr<ItemTemplate>> itemTemplates(studio::Context&) const;
-		virtual ox::Vector<EditorMaker> editors(Context &ctx) const;
-
-		[[nodiscard]]
-		virtual ox::Vector<ox::UPtr<ItemMaker>> itemMakers(Context&) const;
-
-		[[nodiscard]]
-		virtual ox::Vector<ox::UPtr<ItemTemplate>> itemTemplates(Context&) const;
 
 };
 

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

@@ -40,8 +40,8 @@ constexpr ox::Result<ox::StringView> fileExt(ox::StringViewCR path) noexcept {
 
 [[nodiscard]]
 constexpr ox::StringView parentDir(ox::StringView path) noexcept {
-	if (path.size() && path[path.size() - 1] == '/') {
+	if (path.len() && path[path.len() - 1] == '/') {
-		path = substr(path, 0, path.size() - 1);
+		path = substr(path, 0, path.len() - 1);
 	}
 	auto const extStart = ox::find(path.crbegin(), path.crend(), '/').offset();
 	return substr(path, 0, extStart);
@@ -59,7 +59,7 @@ class Project: public ox::SignalHandler {
 		ox::HashMap<ox::String, ox::Vector<ox::String>> m_fileExtFileMap;
 
 	public:
-		explicit Project(keel::Context &ctx, ox::StringParam path, ox::StringViewCR projectDataDir);
+		explicit Project(keel::Context &ctx, ox::String path, ox::StringViewCR projectDataDir);
 
 		ox::Error create() noexcept;
 
@@ -101,16 +101,6 @@ class Project: public ox::SignalHandler {
 
 		ox::Error deleteItem(ox::StringViewCR path) noexcept;
 
-		[[nodiscard]]
-		keel::Context &kctx() noexcept {
-			return m_kctx;
-		}
-
-		[[nodiscard]]
-		keel::Context const &kctx() const noexcept {
-			return m_kctx;
-		}
-
 		[[nodiscard]]
 		bool exists(ox::StringViewCR path) const noexcept;
 
@@ -189,10 +179,6 @@ ox::Result<T> Project::loadObj(ox::StringViewCR path) const noexcept {
 	if constexpr(ox::is_same_v<T, ox::ModelObject>) {
 		return keel::readAsset(m_typeStore, buff);
 	} else {
-		OX_REQUIRE(typeId, keel::readAssetTypeId(buff));
-		if (typeId != ox::ModelTypeId_v<T>) {
-			return keel::convert<T>(m_kctx, buff);
-		}
 		return keel::readAsset<T>(buff);
 	}
 }

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

@@ -28,7 +28,7 @@ struct Selection {
 	}
 };
 
-constexpr auto iterateSelection(Selection const &sel, auto const &cb) {
+constexpr auto iterateSelection(studio::Selection const&sel, auto const&cb) {
 	constexpr auto retErr = ox::is_same_v<decltype(cb(0, 0)), ox::Error>;
 	for (auto x = sel.a.x; x <= sel.b.x; ++x) {
 		for (auto y = sel.a.y; y <= sel.b.y; ++y) {
@@ -44,7 +44,7 @@ constexpr auto iterateSelection(Selection const &sel, auto const &cb) {
 	}
 };
 
-constexpr auto iterateSelectionRows(Selection const &sel, auto const &cb) {
+constexpr auto iterateSelectionRows(studio::Selection const&sel, auto const&cb) {
 	constexpr auto retErr = ox::is_same_v<decltype(cb(0, 0)), ox::Error>;
 	for (auto y = sel.a.y; y <= sel.b.y; ++y) {
 		for (auto x = sel.a.x; x <= sel.b.x; ++x) {

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

@@ -12,7 +12,7 @@ namespace studio {
 
 class NoChangesException: public ox::Exception {
 	public:
-		explicit NoChangesException(std::source_location sloc = std::source_location::current()):
+		inline NoChangesException(std::source_location sloc = std::source_location::current()):
 				ox::Exception(1, "Command makes no changes.", sloc) {}
 };
 

src/olympic/studio/modlib/src/context.cpp

@@ -8,18 +8,13 @@ namespace studio {
 
 void navigateTo(Context &ctx, ox::StringParam filePath, ox::StringParam navArgs) noexcept {
 	ox::String path = std::move(filePath);
-	if (keel::isUuidUrl(path)) {
+	if (beginsWith(path, "uuid://")) {
 		auto const [p, err] = keel::uuidUrlToPath(keelCtx(ctx), path);
 		if (err) {
 			return;
 		}
 		path = p;
 	}
-	//if (
-	//	auto const [np, err] = ctx.navStack.back();
-	//	!err && np->filePath == path && np->navArgs == navArgs.view()) {
-	//	return;
-	//}
 	ctx.navStack.resize(ctx.navIdx + 1);
 	ctx.navStack.emplace_back(ox::String{path}, ox::String{navArgs.view()});
 	try {
@@ -54,9 +49,8 @@ void navigateBack(Context &ctx) noexcept {
 }
 
 void navigateForward(Context &ctx) noexcept {
-	auto const nextIdx = ctx.navIdx + 1;
+	while (ctx.navIdx < ctx.navStack.size()) {
-	while (nextIdx < ctx.navStack.size()) {
+		auto const &n = ctx.navStack[ctx.navIdx];
-		auto const &n = ctx.navStack[nextIdx];
 		try {
 			ctx.navCallback(n.filePath, n.navArgs);
 		} catch (std::exception const &e) {
@@ -64,7 +58,7 @@ void navigateForward(Context &ctx) noexcept {
 			oxErrf("navigateForward failed: {}", e.what());
 		}
 		if (!ctx.project->exists(n.filePath)) {
-			std::ignore = ctx.navStack.erase(nextIdx);
+			std::ignore = ctx.navStack.erase(ctx.navIdx);
 			continue;
 		}
 		++ctx.navIdx;

src/olympic/studio/modlib/src/filedialog_nfd.cpp

@@ -13,10 +13,10 @@ namespace studio {
 
 FDFilterItem::FDFilterItem(ox::StringViewCR pName, ox::StringViewCR pSpec) noexcept {
 	OX_ALLOW_UNSAFE_BUFFERS_BEGIN
-	name.resize(pName.size() + 1);
+	name.resize(pName.len() + 1);
-	ox::strncpy(name.data(), pName.data(), pName.size());
+	ox::strncpy(name.data(), pName.data(), pName.len());
-	spec.resize(pSpec.size() + 1);
+	spec.resize(pSpec.len() + 1);
-	ox::strncpy(spec.data(), pSpec.data(), pSpec.size());
+	ox::strncpy(spec.data(), pSpec.data(), pSpec.len());
 	OX_ALLOW_UNSAFE_BUFFERS_END
 }
 

src/olympic/studio/modlib/src/filepickerpopup.cpp

@@ -26,22 +26,6 @@ FilePickerPopup::FilePickerPopup(
 	m_fileExts{std::move(fileExt)} {
 }
 
-FilePickerPopup::FilePickerPopup(
-	ox::StringParam name,
-	keel::Context &kctx,
-	ox::SpanView<ox::StringLiteral> fileExts) noexcept:
-	m_name{std::move(name)},
-	m_explorer{kctx},
-	m_fileExts{[fileExts] {
-		ox::Vector<ox::String> out;
-		out.reserve(fileExts.size());
-		for (auto &s : fileExts) {
-			out.emplace_back(s);
-		}
-		return out;
-	}()} {
-}
-
 FilePickerPopup::FilePickerPopup(
 	ox::StringParam name,
 	keel::Context &kctx,