[keel,studio] Add support for New Item templates

[ox/std] Add UAnyPtr
[nostalgia/core/studio/tilesheeteditor] Fix subsheet and palette scrolling
2025-01-18 20:16:29 -06:00 · 2025-01-18 20:11:42 -06:00 · 2025-01-18 20:08:09 -06:00 · 2025-01-17 21:50:42 -06:00 · 2025-01-15 23:44:18 -06:00 · 2025-01-15 23:34:58 -06:00
372 changed files with 1574 additions and 846 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -6,7 +6,7 @@
 .mypy_cache
 .stfolder
 .stignore
-scripts/__pycache__
+util/scripts/__pycache__
 pyenv
 CMakeLists.txt.user
 ROM.oxfs
--- a/.liccor.yml
+++ b/.liccor.yml
@@ -2,4 +2,4 @@
 source:
 - src
 copyright_notice: |-
-  Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved.
+  Copyright 2016 - 2025 Gary Talent (gary@drinkingtea.net). All rights reserved.
--- a/3
+++ b/3
@@ -1,5 +1,6 @@
 BC_VAR_PROJECT_NAME=nostalgia
 BC_VAR_PROJECT_NAME_CAP=Nostalgia
+BC_VAR_DEVENV_ROOT=util
 BUILDCORE_PATH=deps/buildcore
 include ${BUILDCORE_PATH}/base.mk

@@ -13,7 +14,7 @@ endif

 .PHONY: pkg-gba
 pkg-gba: build
-	${BC_CMD_ENVRUN} ${BC_PY3} ./scripts/pkg-gba.py sample_project ${BC_VAR_PROJECT_NAME}
+	${BC_CMD_ENVRUN} ${BC_PY3} ./util/scripts/pkg-gba.py sample_project ${BC_VAR_PROJECT_NAME}

 .PHONY: run
 run: build
--- a/deps/gbabuildcore/base.cmake
+++ b/deps/gbabuildcore/base.cmake
@@ -1,8 +1,8 @@
 list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR}/cmake/modules)
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -nostdlib")
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -nostdinc++")
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-unwind-tables")
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-exceptions")
+#set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-unwind-tables")
+#set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-exceptions")
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-rtti")
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-strict-aliasing")
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mthumb-interwork")
--- a/deps/glad/CMakeLists.txt
+++ b/deps/glad/CMakeLists.txt
@@ -1,2 +1,11 @@
-add_library(glad OBJECT src/glad.c)
-target_include_directories(glad PUBLIC include)
+add_library(glad src/glad.c)
+
+target_include_directories(glad PUBLIC include)
+
+install(
+	TARGETS
+		glad
+	DESTINATION
+		LIBRARY DESTINATION lib
+		ARCHIVE DESTINATION lib
+)
--- a/deps/imgui/CMakeLists.txt
+++ b/deps/imgui/CMakeLists.txt
@@ -6,7 +6,7 @@ endif()
 # DrinkingTea: end

 add_library(
-	imgui OBJECT
+	imgui
 		imgui.cpp
 		imgui_demo.cpp
 		imgui_draw.cpp
@@ -19,4 +19,12 @@ add_library(
 target_include_directories(
 	imgui SYSTEM PUBLIC
 		.
-)
+)
+
+install(
+	TARGETS
+		imgui
+	DESTINATION
+		LIBRARY DESTINATION lib
+		ARCHIVE DESTINATION lib
+)
--- a/deps/ox/.liccor.yml
+++ b/deps/ox/.liccor.yml
@@ -2,7 +2,7 @@
 source:
 - src
 copyright_notice: |-
-  Copyright 2015 - 2024 gary@drinkingtea.net
+  Copyright 2015 - 2025 gary@drinkingtea.net

  This Source Code Form is subject to the terms of the Mozilla Public
  License, v. 2.0. If a copy of the MPL was not distributed with this
--- a/deps/ox/src/ox/clargs/clargs.cpp
+++ b/deps/ox/src/ox/clargs/clargs.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2024 gary@drinkingtea.net
+ * Copyright 2015 - 2025 gary@drinkingtea.net
 *
 * This Source Code Form is subject to the terms of the Mozilla Public
 * License, v. 2.0. If a copy of the MPL was not distributed with this
--- a/deps/ox/src/ox/clargs/clargs.hpp
+++ b/deps/ox/src/ox/clargs/clargs.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2024 gary@drinkingtea.net
+ * Copyright 2015 - 2025 gary@drinkingtea.net
 *
 * This Source Code Form is subject to the terms of the Mozilla Public
 * License, v. 2.0. If a copy of the MPL was not distributed with this
--- a/deps/ox/src/ox/claw/claw.hpp
+++ b/deps/ox/src/ox/claw/claw.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2024 gary@drinkingtea.net
+ * Copyright 2015 - 2025 gary@drinkingtea.net
 *
 * This Source Code Form is subject to the terms of the Mozilla Public
 * License, v. 2.0. If a copy of the MPL was not distributed with this
--- a/deps/ox/src/ox/claw/format.hpp
+++ b/deps/ox/src/ox/claw/format.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2024 gary@drinkingtea.net
+ * Copyright 2015 - 2025 gary@drinkingtea.net
 *
 * This Source Code Form is subject to the terms of the Mozilla Public
 * License, v. 2.0. If a copy of the MPL was not distributed with this
--- a/deps/ox/src/ox/claw/read.cpp
+++ b/deps/ox/src/ox/claw/read.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2024 gary@drinkingtea.net
+ * Copyright 2015 - 2025 gary@drinkingtea.net
 *
 * This Source Code Form is subject to the terms of the Mozilla Public
 * License, v. 2.0. If a copy of the MPL was not distributed with this
--- a/deps/ox/src/ox/claw/read.hpp
+++ b/deps/ox/src/ox/claw/read.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2024 gary@drinkingtea.net
+ * Copyright 2015 - 2025 gary@drinkingtea.net
 *
 * This Source Code Form is subject to the terms of the Mozilla Public
 * License, v. 2.0. If a copy of the MPL was not distributed with this
--- a/deps/ox/src/ox/claw/readclaw.cpp
+++ b/deps/ox/src/ox/claw/readclaw.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2024 gary@drinkingtea.net
+ * Copyright 2015 - 2025 gary@drinkingtea.net
 *
 * This Source Code Form is subject to the terms of the Mozilla Public
 * License, v. 2.0. If a copy of the MPL was not distributed with this
--- a/deps/ox/src/ox/claw/test/tests.cpp
+++ b/deps/ox/src/ox/claw/test/tests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2024 gary@drinkingtea.net
+ * Copyright 2015 - 2025 gary@drinkingtea.net
 *
 * This Source Code Form is subject to the terms of the Mozilla Public
 * License, v. 2.0. If a copy of the MPL was not distributed with this
--- a/deps/ox/src/ox/claw/write.cpp
+++ b/deps/ox/src/ox/claw/write.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2024 gary@drinkingtea.net
+ * Copyright 2015 - 2025 gary@drinkingtea.net
 *
 * This Source Code Form is subject to the terms of the Mozilla Public
 * License, v. 2.0. If a copy of the MPL was not distributed with this
--- a/deps/ox/src/ox/claw/write.hpp
+++ b/deps/ox/src/ox/claw/write.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2024 gary@drinkingtea.net
+ * Copyright 2015 - 2025 gary@drinkingtea.net
 *
 * This Source Code Form is subject to the terms of the Mozilla Public
 * License, v. 2.0. If a copy of the MPL was not distributed with this
--- a/deps/ox/src/ox/event/event.hpp
+++ b/deps/ox/src/ox/event/event.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2024 gary@drinkingtea.net
+ * Copyright 2015 - 2025 gary@drinkingtea.net
 *
 * This Source Code Form is subject to the terms of the Mozilla Public
 * License, v. 2.0. If a copy of the MPL was not distributed with this
--- a/deps/ox/src/ox/event/signal.cpp
+++ b/deps/ox/src/ox/event/signal.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2024 gary@drinkingtea.net
+ * Copyright 2015 - 2025 gary@drinkingtea.net
 *
 * This Source Code Form is subject to the terms of the Mozilla Public
 * License, v. 2.0. If a copy of the MPL was not distributed with this
--- a/deps/ox/src/ox/event/signal.hpp
+++ b/deps/ox/src/ox/event/signal.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2024 gary@drinkingtea.net
+ * Copyright 2015 - 2025 gary@drinkingtea.net
 *
 * This Source Code Form is subject to the terms of the Mozilla Public
 * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -215,7 +215,7 @@ Error Signal<Args...>::emitCheckError(Args... args) const noexcept {
 		}
 		return ox::Error(0);
 	} catch (const ox::Exception &ex) {
-		return ox::Error(ex.file, ex.line, ex.errCode, ex.msg);
+		return ox::Error(ex.errCode, ex.msg, ex.src);
 	}
 }

--- a/deps/ox/src/ox/event/test/tests.cpp
+++ b/deps/ox/src/ox/event/test/tests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2024 gary@drinkingtea.net
+ * Copyright 2015 - 2025 gary@drinkingtea.net
 *
 * This Source Code Form is subject to the terms of the Mozilla Public
 * License, v. 2.0. If a copy of the MPL was not distributed with this
--- a/deps/ox/src/ox/fs/filestore/filestoretemplate.cpp
+++ b/deps/ox/src/ox/fs/filestore/filestoretemplate.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2024 gary@drinkingtea.net
+ * Copyright 2015 - 2025 gary@drinkingtea.net
 *
 * This Source Code Form is subject to the terms of the Mozilla Public
 * License, v. 2.0. If a copy of the MPL was not distributed with this
--- a/deps/ox/src/ox/fs/filestore/filestoretemplate.hpp
+++ b/deps/ox/src/ox/fs/filestore/filestoretemplate.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2024 gary@drinkingtea.net
+ * Copyright 2015 - 2025 gary@drinkingtea.net
 *
 * This Source Code Form is subject to the terms of the Mozilla Public
 * License, v. 2.0. If a copy of the MPL was not distributed with this
--- a/deps/ox/src/ox/fs/filesystem/directory.cpp
+++ b/deps/ox/src/ox/fs/filesystem/directory.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2024 gary@drinkingtea.net
+ * Copyright 2015 - 2025 gary@drinkingtea.net
 *
 * This Source Code Form is subject to the terms of the Mozilla Public
 * License, v. 2.0. If a copy of the MPL was not distributed with this
--- a/deps/ox/src/ox/fs/filesystem/directory.hpp
+++ b/deps/ox/src/ox/fs/filesystem/directory.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2024 gary@drinkingtea.net
+ * Copyright 2015 - 2025 gary@drinkingtea.net
 *
 * This Source Code Form is subject to the terms of the Mozilla Public
 * License, v. 2.0. If a copy of the MPL was not distributed with this
--- a/deps/ox/src/ox/fs/filesystem/filelocation.cpp
+++ b/deps/ox/src/ox/fs/filesystem/filelocation.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2024 gary@drinkingtea.net
+ * Copyright 2015 - 2025 gary@drinkingtea.net
 *
 * This Source Code Form is subject to the terms of the Mozilla Public
 * License, v. 2.0. If a copy of the MPL was not distributed with this
--- a/deps/ox/src/ox/fs/filesystem/filelocation.hpp
+++ b/deps/ox/src/ox/fs/filesystem/filelocation.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2024 gary@drinkingtea.net
+ * Copyright 2015 - 2025 gary@drinkingtea.net
 *
 * This Source Code Form is subject to the terms of the Mozilla Public
 * License, v. 2.0. If a copy of the MPL was not distributed with this
--- a/deps/ox/src/ox/fs/filesystem/filesystem.cpp
+++ b/deps/ox/src/ox/fs/filesystem/filesystem.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2024 gary@drinkingtea.net
+ * Copyright 2015 - 2025 gary@drinkingtea.net
 *
 * This Source Code Form is subject to the terms of the Mozilla Public
 * License, v. 2.0. If a copy of the MPL was not distributed with this
--- a/deps/ox/src/ox/fs/filesystem/filesystem.hpp
+++ b/deps/ox/src/ox/fs/filesystem/filesystem.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2024 gary@drinkingtea.net
+ * Copyright 2015 - 2025 gary@drinkingtea.net
 *
 * This Source Code Form is subject to the terms of the Mozilla Public
 * License, v. 2.0. If a copy of the MPL was not distributed with this
--- a/deps/ox/src/ox/fs/filesystem/passthroughfs.cpp
+++ b/deps/ox/src/ox/fs/filesystem/passthroughfs.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2024 gary@drinkingtea.net
+ * Copyright 2015 - 2025 gary@drinkingtea.net
 *
 * This Source Code Form is subject to the terms of the Mozilla Public
 * License, v. 2.0. If a copy of the MPL was not distributed with this
--- a/deps/ox/src/ox/fs/filesystem/passthroughfs.hpp
+++ b/deps/ox/src/ox/fs/filesystem/passthroughfs.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2024 gary@drinkingtea.net
+ * Copyright 2015 - 2025 gary@drinkingtea.net
 *
 * This Source Code Form is subject to the terms of the Mozilla Public
 * License, v. 2.0. If a copy of the MPL was not distributed with this
--- a/deps/ox/src/ox/fs/filesystem/pathiterator.cpp
+++ b/deps/ox/src/ox/fs/filesystem/pathiterator.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2024 gary@drinkingtea.net
+ * Copyright 2015 - 2025 gary@drinkingtea.net
 *
 * This Source Code Form is subject to the terms of the Mozilla Public
 * License, v. 2.0. If a copy of the MPL was not distributed with this
--- a/deps/ox/src/ox/fs/filesystem/pathiterator.hpp
+++ b/deps/ox/src/ox/fs/filesystem/pathiterator.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2024 gary@drinkingtea.net
+ * Copyright 2015 - 2025 gary@drinkingtea.net
 *
 * This Source Code Form is subject to the terms of the Mozilla Public
 * License, v. 2.0. If a copy of the MPL was not distributed with this
--- a/deps/ox/src/ox/fs/filesystem/types.hpp
+++ b/deps/ox/src/ox/fs/filesystem/types.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2024 gary@drinkingtea.net
+ * Copyright 2015 - 2025 gary@drinkingtea.net
 *
 * This Source Code Form is subject to the terms of the Mozilla Public
 * License, v. 2.0. If a copy of the MPL was not distributed with this
--- a/deps/ox/src/ox/fs/fs.hpp
+++ b/deps/ox/src/ox/fs/fs.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2024 gary@drinkingtea.net
+ * Copyright 2015 - 2025 gary@drinkingtea.net
 *
 * This Source Code Form is subject to the terms of the Mozilla Public
 * License, v. 2.0. If a copy of the MPL was not distributed with this
--- a/deps/ox/src/ox/fs/ptrarith/nodebuffer.hpp
+++ b/deps/ox/src/ox/fs/ptrarith/nodebuffer.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2024 gary@drinkingtea.net
+ * Copyright 2015 - 2025 gary@drinkingtea.net
 *
 * This Source Code Form is subject to the terms of the Mozilla Public
 * License, v. 2.0. If a copy of the MPL was not distributed with this
--- a/deps/ox/src/ox/fs/ptrarith/ptr.hpp
+++ b/deps/ox/src/ox/fs/ptrarith/ptr.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2024 gary@drinkingtea.net
+ * Copyright 2015 - 2025 gary@drinkingtea.net
 *
 * This Source Code Form is subject to the terms of the Mozilla Public
 * License, v. 2.0. If a copy of the MPL was not distributed with this
--- a/deps/ox/src/ox/fs/test/tests.cpp
+++ b/deps/ox/src/ox/fs/test/tests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2024 gary@drinkingtea.net
+ * Copyright 2015 - 2025 gary@drinkingtea.net
 *
 * This Source Code Form is subject to the terms of the Mozilla Public
 * License, v. 2.0. If a copy of the MPL was not distributed with this
--- a/deps/ox/src/ox/fs/tool.cpp
+++ b/deps/ox/src/ox/fs/tool.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2024 gary@drinkingtea.net
+ * Copyright 2015 - 2025 gary@drinkingtea.net
 *
 * This Source Code Form is subject to the terms of the Mozilla Public
 * License, v. 2.0. If a copy of the MPL was not distributed with this
--- a/deps/ox/src/ox/logconn/circularbuff.hpp
+++ b/deps/ox/src/ox/logconn/circularbuff.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2024 gary@drinkingtea.net
+ * Copyright 2015 - 2025 gary@drinkingtea.net
 *
 * This Source Code Form is subject to the terms of the Mozilla Public
 * License, v. 2.0. If a copy of the MPL was not distributed with this
--- a/deps/ox/src/ox/logconn/def.hpp
+++ b/deps/ox/src/ox/logconn/def.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2024 gary@drinkingtea.net
+ * Copyright 2015 - 2025 gary@drinkingtea.net
 *
 * This Source Code Form is subject to the terms of the Mozilla Public
 * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -14,7 +14,7 @@
    { \
 		const auto loggerErr = (loggerName).initConn(appName); \
 		if (loggerErr) { \
-			oxErrf("Could not connect to logger: {} ({}:{})\n", toStr(loggerErr), loggerErr.file, loggerErr.line); \
+			oxErrf("Could not connect to logger: {} ({}:{})\n", toStr(loggerErr), loggerErr.src.file_name(), loggerErr.src.line()); \
 		} else { \
 			ox::trace::setLogger(&(loggerName)); \
 		} \
--- a/deps/ox/src/ox/logconn/logconn.cpp
+++ b/deps/ox/src/ox/logconn/logconn.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2024 gary@drinkingtea.net
+ * Copyright 2015 - 2025 gary@drinkingtea.net
 *
 * This Source Code Form is subject to the terms of the Mozilla Public
 * License, v. 2.0. If a copy of the MPL was not distributed with this
--- a/deps/ox/src/ox/logconn/logconn.hpp
+++ b/deps/ox/src/ox/logconn/logconn.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2024 gary@drinkingtea.net
+ * Copyright 2015 - 2025 gary@drinkingtea.net
 *
 * This Source Code Form is subject to the terms of the Mozilla Public
 * License, v. 2.0. If a copy of the MPL was not distributed with this
--- a/deps/ox/src/ox/mc/err.hpp
+++ b/deps/ox/src/ox/mc/err.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2024 gary@drinkingtea.net
+ * Copyright 2015 - 2025 gary@drinkingtea.net
 *
 * This Source Code Form is subject to the terms of the Mozilla Public
 * License, v. 2.0. If a copy of the MPL was not distributed with this
--- a/deps/ox/src/ox/mc/intops.hpp
+++ b/deps/ox/src/ox/mc/intops.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2024 gary@drinkingtea.net
+ * Copyright 2015 - 2025 gary@drinkingtea.net
 *
 * This Source Code Form is subject to the terms of the Mozilla Public
 * License, v. 2.0. If a copy of the MPL was not distributed with this
--- a/deps/ox/src/ox/mc/mc.hpp
+++ b/deps/ox/src/ox/mc/mc.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2024 gary@drinkingtea.net
+ * Copyright 2015 - 2025 gary@drinkingtea.net
 *
 * This Source Code Form is subject to the terms of the Mozilla Public
 * License, v. 2.0. If a copy of the MPL was not distributed with this
--- a/deps/ox/src/ox/mc/presenceindicator.cpp
+++ b/deps/ox/src/ox/mc/presenceindicator.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2024 gary@drinkingtea.net
+ * Copyright 2015 - 2025 gary@drinkingtea.net
 *
 * This Source Code Form is subject to the terms of the Mozilla Public
 * License, v. 2.0. If a copy of the MPL was not distributed with this
--- a/deps/ox/src/ox/mc/presenceindicator.hpp
+++ b/deps/ox/src/ox/mc/presenceindicator.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2024 gary@drinkingtea.net
+ * Copyright 2015 - 2025 gary@drinkingtea.net
 *
 * This Source Code Form is subject to the terms of the Mozilla Public
 * License, v. 2.0. If a copy of the MPL was not distributed with this
--- a/deps/ox/src/ox/mc/read.cpp
+++ b/deps/ox/src/ox/mc/read.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2024 gary@drinkingtea.net
+ * Copyright 2015 - 2025 gary@drinkingtea.net
 *
 * This Source Code Form is subject to the terms of the Mozilla Public
 * License, v. 2.0. If a copy of the MPL was not distributed with this
--- a/deps/ox/src/ox/mc/read.hpp
+++ b/deps/ox/src/ox/mc/read.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2024 gary@drinkingtea.net
+ * Copyright 2015 - 2025 gary@drinkingtea.net
 *
 * This Source Code Form is subject to the terms of the Mozilla Public
 * License, v. 2.0. If a copy of the MPL was not distributed with this
--- a/deps/ox/src/ox/mc/test/tests.cpp
+++ b/deps/ox/src/ox/mc/test/tests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2024 gary@drinkingtea.net
+ * Copyright 2015 - 2025 gary@drinkingtea.net
 *
 * This Source Code Form is subject to the terms of the Mozilla Public
 * License, v. 2.0. If a copy of the MPL was not distributed with this
--- a/deps/ox/src/ox/mc/types.hpp
+++ b/deps/ox/src/ox/mc/types.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2024 gary@drinkingtea.net
+ * Copyright 2015 - 2025 gary@drinkingtea.net
 *
 * This Source Code Form is subject to the terms of the Mozilla Public
 * License, v. 2.0. If a copy of the MPL was not distributed with this
--- a/deps/ox/src/ox/mc/write.cpp
+++ b/deps/ox/src/ox/mc/write.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2024 gary@drinkingtea.net
+ * Copyright 2015 - 2025 gary@drinkingtea.net
 *
 * This Source Code Form is subject to the terms of the Mozilla Public
 * License, v. 2.0. If a copy of the MPL was not distributed with this
--- a/deps/ox/src/ox/mc/write.hpp
+++ b/deps/ox/src/ox/mc/write.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2024 gary@drinkingtea.net
+ * Copyright 2015 - 2025 gary@drinkingtea.net
 *
 * This Source Code Form is subject to the terms of the Mozilla Public
 * License, v. 2.0. If a copy of the MPL was not distributed with this
--- a/deps/ox/src/ox/model/def.hpp
+++ b/deps/ox/src/ox/model/def.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2024 gary@drinkingtea.net
+ * Copyright 2015 - 2025 gary@drinkingtea.net
 *
 * This Source Code Form is subject to the terms of the Mozilla Public
 * License, v. 2.0. If a copy of the MPL was not distributed with this
--- a/deps/ox/src/ox/model/descread.hpp
+++ b/deps/ox/src/ox/model/descread.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2024 gary@drinkingtea.net
+ * Copyright 2015 - 2025 gary@drinkingtea.net
 *
 * This Source Code Form is subject to the terms of the Mozilla Public
 * License, v. 2.0. If a copy of the MPL was not distributed with this
--- a/deps/ox/src/ox/model/desctypes.cpp
+++ b/deps/ox/src/ox/model/desctypes.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2024 gary@drinkingtea.net
+ * Copyright 2015 - 2025 gary@drinkingtea.net
 *
 * This Source Code Form is subject to the terms of the Mozilla Public
 * License, v. 2.0. If a copy of the MPL was not distributed with this
--- a/deps/ox/src/ox/model/desctypes.hpp
+++ b/deps/ox/src/ox/model/desctypes.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2024 gary@drinkingtea.net
+ * Copyright 2015 - 2025 gary@drinkingtea.net
 *
 * This Source Code Form is subject to the terms of the Mozilla Public
 * License, v. 2.0. If a copy of the MPL was not distributed with this
--- a/deps/ox/src/ox/model/descwrite.cpp
+++ b/deps/ox/src/ox/model/descwrite.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2024 gary@drinkingtea.net
+ * Copyright 2015 - 2025 gary@drinkingtea.net
 *
 * This Source Code Form is subject to the terms of the Mozilla Public
 * License, v. 2.0. If a copy of the MPL was not distributed with this
--- a/deps/ox/src/ox/model/descwrite.hpp
+++ b/deps/ox/src/ox/model/descwrite.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2024 gary@drinkingtea.net
+ * Copyright 2015 - 2025 gary@drinkingtea.net
 *
 * This Source Code Form is subject to the terms of the Mozilla Public
 * License, v. 2.0. If a copy of the MPL was not distributed with this
--- a/deps/ox/src/ox/model/fieldcounter.hpp
+++ b/deps/ox/src/ox/model/fieldcounter.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2024 gary@drinkingtea.net
+ * Copyright 2015 - 2025 gary@drinkingtea.net
 *
 * This Source Code Form is subject to the terms of the Mozilla Public
 * License, v. 2.0. If a copy of the MPL was not distributed with this
--- a/deps/ox/src/ox/model/metadata.hpp
+++ b/deps/ox/src/ox/model/metadata.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2024 gary@drinkingtea.net
+ * Copyright 2015 - 2025 gary@drinkingtea.net
 *
 * This Source Code Form is subject to the terms of the Mozilla Public
 * License, v. 2.0. If a copy of the MPL was not distributed with this
--- a/deps/ox/src/ox/model/model.hpp
+++ b/deps/ox/src/ox/model/model.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2024 gary@drinkingtea.net
+ * Copyright 2015 - 2025 gary@drinkingtea.net
 *
 * This Source Code Form is subject to the terms of the Mozilla Public
 * License, v. 2.0. If a copy of the MPL was not distributed with this
--- a/deps/ox/src/ox/model/modelhandleradaptor.hpp
+++ b/deps/ox/src/ox/model/modelhandleradaptor.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2024 gary@drinkingtea.net
+ * Copyright 2015 - 2025 gary@drinkingtea.net
 *
 * This Source Code Form is subject to the terms of the Mozilla Public
 * License, v. 2.0. If a copy of the MPL was not distributed with this
--- a/deps/ox/src/ox/model/modelops.hpp
+++ b/deps/ox/src/ox/model/modelops.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2024 gary@drinkingtea.net
+ * Copyright 2015 - 2025 gary@drinkingtea.net
 *
 * This Source Code Form is subject to the terms of the Mozilla Public
 * License, v. 2.0. If a copy of the MPL was not distributed with this
--- a/deps/ox/src/ox/model/modelvalue.cpp
+++ b/deps/ox/src/ox/model/modelvalue.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2024 gary@drinkingtea.net
+ * Copyright 2015 - 2025 gary@drinkingtea.net
 *
 * This Source Code Form is subject to the terms of the Mozilla Public
 * License, v. 2.0. If a copy of the MPL was not distributed with this
--- a/deps/ox/src/ox/model/modelvalue.hpp
+++ b/deps/ox/src/ox/model/modelvalue.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2024 gary@drinkingtea.net
+ * Copyright 2015 - 2025 gary@drinkingtea.net
 *
 * This Source Code Form is subject to the terms of the Mozilla Public
 * License, v. 2.0. If a copy of the MPL was not distributed with this
--- a/deps/ox/src/ox/model/optype.hpp
+++ b/deps/ox/src/ox/model/optype.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2024 gary@drinkingtea.net
+ * Copyright 2015 - 2025 gary@drinkingtea.net
 *
 * This Source Code Form is subject to the terms of the Mozilla Public
 * License, v. 2.0. If a copy of the MPL was not distributed with this
--- a/deps/ox/src/ox/model/test/tests.cpp
+++ b/deps/ox/src/ox/model/test/tests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2024 gary@drinkingtea.net
+ * Copyright 2015 - 2025 gary@drinkingtea.net
 *
 * This Source Code Form is subject to the terms of the Mozilla Public
 * License, v. 2.0. If a copy of the MPL was not distributed with this
--- a/deps/ox/src/ox/model/typenamecatcher.hpp
+++ b/deps/ox/src/ox/model/typenamecatcher.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2024 gary@drinkingtea.net
+ * Copyright 2015 - 2025 gary@drinkingtea.net
 *
 * This Source Code Form is subject to the terms of the Mozilla Public
 * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -140,16 +140,16 @@ constexpr Str getModelTypeName() noexcept {
 	return out;
 }

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

 template<typename T, typename Str = const char*>
-constexpr auto ModelTypeName_v = getModelTypeName<T, Str>();
+constexpr auto ModelTypeName_v = requireModelTypeName<T, Str>();

 template<typename T, typename Str = const char*>
 constexpr auto ModelTypeVersion_v = requireModelTypeVersion<T>();
--- a/deps/ox/src/ox/model/types.hpp
+++ b/deps/ox/src/ox/model/types.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2024 gary@drinkingtea.net
+ * Copyright 2015 - 2025 gary@drinkingtea.net
 *
 * This Source Code Form is subject to the terms of the Mozilla Public
 * License, v. 2.0. If a copy of the MPL was not distributed with this
--- a/deps/ox/src/ox/model/typestore.hpp
+++ b/deps/ox/src/ox/model/typestore.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2024 gary@drinkingtea.net
+ * Copyright 2015 - 2025 gary@drinkingtea.net
 *
 * This Source Code Form is subject to the terms of the Mozilla Public
 * License, v. 2.0. If a copy of the MPL was not distributed with this
--- a/deps/ox/src/ox/model/walk.hpp
+++ b/deps/ox/src/ox/model/walk.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2024 gary@drinkingtea.net
+ * Copyright 2015 - 2025 gary@drinkingtea.net
 *
 * This Source Code Form is subject to the terms of the Mozilla Public
 * License, v. 2.0. If a copy of the MPL was not distributed with this
--- a/deps/ox/src/ox/oc/oc.hpp
+++ b/deps/ox/src/ox/oc/oc.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2024 gary@drinkingtea.net
+ * Copyright 2015 - 2025 gary@drinkingtea.net
 *
 * This Source Code Form is subject to the terms of the Mozilla Public
 * License, v. 2.0. If a copy of the MPL was not distributed with this
--- a/deps/ox/src/ox/oc/read.cpp
+++ b/deps/ox/src/ox/oc/read.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2024 gary@drinkingtea.net
+ * Copyright 2015 - 2025 gary@drinkingtea.net
 *
 * This Source Code Form is subject to the terms of the Mozilla Public
 * License, v. 2.0. If a copy of the MPL was not distributed with this
--- a/deps/ox/src/ox/oc/read.hpp
+++ b/deps/ox/src/ox/oc/read.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2024 gary@drinkingtea.net
+ * Copyright 2015 - 2025 gary@drinkingtea.net
 *
 * This Source Code Form is subject to the terms of the Mozilla Public
 * License, v. 2.0. If a copy of the MPL was not distributed with this
--- a/deps/ox/src/ox/oc/test/tests.cpp
+++ b/deps/ox/src/ox/oc/test/tests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2024 gary@drinkingtea.net
+ * Copyright 2015 - 2025 gary@drinkingtea.net
 *
 * This Source Code Form is subject to the terms of the Mozilla Public
 * License, v. 2.0. If a copy of the MPL was not distributed with this
--- a/deps/ox/src/ox/oc/write.cpp
+++ b/deps/ox/src/ox/oc/write.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2024 gary@drinkingtea.net
+ * Copyright 2015 - 2025 gary@drinkingtea.net
 *
 * This Source Code Form is subject to the terms of the Mozilla Public
 * License, v. 2.0. If a copy of the MPL was not distributed with this
--- a/deps/ox/src/ox/oc/write.hpp
+++ b/deps/ox/src/ox/oc/write.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2024 gary@drinkingtea.net
+ * Copyright 2015 - 2025 gary@drinkingtea.net
 *
 * This Source Code Form is subject to the terms of the Mozilla Public
 * License, v. 2.0. If a copy of the MPL was not distributed with this
--- a/deps/ox/src/ox/preloader/alignmentcatcher.hpp
+++ b/deps/ox/src/ox/preloader/alignmentcatcher.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2024 gary@drinkingtea.net
+ * Copyright 2015 - 2025 gary@drinkingtea.net
 *
 * This Source Code Form is subject to the terms of the Mozilla Public
 * License, v. 2.0. If a copy of the MPL was not distributed with this
--- a/deps/ox/src/ox/preloader/platspecs.hpp
+++ b/deps/ox/src/ox/preloader/platspecs.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2024 gary@drinkingtea.net
+ * Copyright 2015 - 2025 gary@drinkingtea.net
 *
 * This Source Code Form is subject to the terms of the Mozilla Public
 * License, v. 2.0. If a copy of the MPL was not distributed with this
--- a/deps/ox/src/ox/preloader/preloader.cpp
+++ b/deps/ox/src/ox/preloader/preloader.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2024 gary@drinkingtea.net
+ * Copyright 2015 - 2025 gary@drinkingtea.net
 *
 * This Source Code Form is subject to the terms of the Mozilla Public
 * License, v. 2.0. If a copy of the MPL was not distributed with this
--- a/deps/ox/src/ox/preloader/preloader.hpp
+++ b/deps/ox/src/ox/preloader/preloader.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2024 gary@drinkingtea.net
+ * Copyright 2015 - 2025 gary@drinkingtea.net
 *
 * This Source Code Form is subject to the terms of the Mozilla Public
 * License, v. 2.0. If a copy of the MPL was not distributed with this
--- a/deps/ox/src/ox/preloader/sizecatcher.hpp
+++ b/deps/ox/src/ox/preloader/sizecatcher.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2024 gary@drinkingtea.net
+ * Copyright 2015 - 2025 gary@drinkingtea.net
 *
 * This Source Code Form is subject to the terms of the Mozilla Public
 * License, v. 2.0. If a copy of the MPL was not distributed with this
--- a/deps/ox/src/ox/preloader/unionsizecatcher.hpp
+++ b/deps/ox/src/ox/preloader/unionsizecatcher.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2024 gary@drinkingtea.net
+ * Copyright 2015 - 2025 gary@drinkingtea.net
 *
 * This Source Code Form is subject to the terms of the Mozilla Public
 * License, v. 2.0. If a copy of the MPL was not distributed with this
--- a/deps/ox/src/ox/std/CMakeLists.txt
+++ b/deps/ox/src/ox/std/CMakeLists.txt
@@ -109,6 +109,7 @@ install(
 		error.hpp
 		fmt.hpp
 		hardware.hpp
+		hash.hpp
 		hashmap.hpp
 		heapmgr.hpp
 		ignore.hpp
--- a/deps/ox/src/ox/std/algorithm.hpp
+++ b/deps/ox/src/ox/std/algorithm.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2024 gary@drinkingtea.net
+ * Copyright 2015 - 2025 gary@drinkingtea.net
 *
 * This Source Code Form is subject to the terms of the Mozilla Public
 * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -9,13 +9,25 @@
 #pragma once

 #include "def.hpp"
+#include "error.hpp"

 OX_CLANG_NOWARN_BEGIN(-Wunsafe-buffer-usage)

 namespace ox {

 template<typename It, typename T>
-constexpr It find(It begin, It end, const T &value) {
+constexpr ox::Result<size_t> findIdx(It begin, It end, T const&value) {
+	auto it = begin;
+	for (; it != end; ++it) {
+		if (*it == value) {
+			return it.offset();
+		}
+	}
+	return ox::Error{1, "item not found"};
+}
+
+template<typename It, typename T>
+constexpr It find(It begin, It end, T const&value) {
 	for (; begin != end; ++begin) {
 		if (*begin == value) {
 			return begin;
--- a/deps/ox/src/ox/std/anyptr.hpp
+++ b/deps/ox/src/ox/std/anyptr.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2024 gary@drinkingtea.net
+ * Copyright 2015 - 2025 gary@drinkingtea.net
 *
 * This Source Code Form is subject to the terms of the Mozilla Public
 * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -15,16 +15,20 @@

 namespace ox {

-class AnyPtr {
+namespace detail {
+
+template<bool unique>
+class AnyPtrT {
 	private:
 		struct WrapBase {
 			virtual constexpr ~WrapBase() = default;
 			virtual constexpr WrapBase *copyTo(ox::Span<char> s) noexcept = 0;
 			virtual constexpr operator bool() const noexcept = 0;
+			virtual void free() noexcept = 0;
 		};

 		template<typename T>
-		struct Wrap: public WrapBase {
+		struct Wrap final: WrapBase {
 			T *data{};
 			constexpr Wrap(T *pData) noexcept: data(pData) {
 			}
@@ -39,16 +43,20 @@ class AnyPtr {
 			constexpr operator bool() const noexcept override {
 				return data != nullptr;
 			}
+			constexpr void free() noexcept override {
+				ox::safeDelete(data);
+				data = {};
+			}
 		};

 		WrapBase *m_wrapPtr{};
 		ox::Array<char, sizeof(Wrap<void*>)> m_wrapData;

 	public:
-		constexpr AnyPtr() noexcept = default;
+		constexpr AnyPtrT() noexcept = default;

 		template<typename T>
-		constexpr AnyPtr(T *ptr) noexcept {
+		constexpr AnyPtrT(T *ptr) noexcept {
 			if (std::is_constant_evaluated()) {
 				m_wrapPtr = new Wrap(ptr);
 			} else {
@@ -56,22 +64,39 @@ class AnyPtr {
 			}
 		}

-		constexpr AnyPtr(AnyPtr const&other) noexcept {
+		constexpr AnyPtrT(AnyPtrT const&other) noexcept {
 			if (other) {
 				m_wrapPtr = other.m_wrapPtr->copyTo(m_wrapData);
 			}
 		}

-		constexpr ~AnyPtr() noexcept {
+		constexpr AnyPtrT(AnyPtrT &&other) noexcept {
+			if (other) {
+				m_wrapPtr = other.m_wrapPtr->copyTo(m_wrapData);
+				if (std::is_constant_evaluated()) {
+					ox::safeDelete(m_wrapPtr);
+				}
+				other.m_wrapPtr = {};
+			}
+		}
+
+		constexpr ~AnyPtrT() noexcept {
+			if constexpr(unique) {
+				free();
+			}
 			if (std::is_constant_evaluated()) {
 				ox::safeDelete(m_wrapPtr);
 			}
 		}

 		template<typename T>
-		constexpr AnyPtr &operator=(T *ptr) noexcept {
-			if (std::is_constant_evaluated()) {
+		constexpr AnyPtrT &operator=(T *ptr) noexcept {
+			if constexpr(unique) {
+				free();
+			} else if (std::is_constant_evaluated()) {
 				ox::safeDelete(m_wrapPtr);
+			}
+			if (std::is_constant_evaluated()) {
 				m_wrapPtr = new Wrap(ptr);
 			} else {
 				m_wrapPtr = new(m_wrapData.data()) Wrap(ptr);
@@ -79,10 +104,14 @@ class AnyPtr {
 			return *this;
 		}

-		constexpr AnyPtr &operator=(AnyPtr const&ptr) noexcept {
+		constexpr AnyPtrT &operator=(AnyPtrT const&ptr) noexcept {
 			if (this != &ptr) {
-				if (ptr) {
+				if constexpr(unique) {
+					free();
+				} else if (std::is_constant_evaluated()) {
 					ox::safeDelete(m_wrapPtr);
+				}
+				if (ptr) {
 					m_wrapPtr = ptr.m_wrapPtr->copyTo(m_wrapData);
 				} else {
 					m_wrapPtr = nullptr;
@@ -91,10 +120,40 @@ class AnyPtr {
 			return *this;
 		}

+		constexpr AnyPtrT &operator=(AnyPtrT &&ptr) noexcept {
+			if (this != &ptr) {
+				if constexpr(unique) {
+					free();
+				} else if (std::is_constant_evaluated()) {
+					ox::safeDelete(m_wrapPtr);
+				}
+				if (ptr) {
+					m_wrapPtr = ptr.m_wrapPtr->copyTo(m_wrapData);
+					if (std::is_constant_evaluated()) {
+						ox::safeDelete(ptr.m_wrapPtr);
+						ptr.m_wrapPtr = nullptr;
+					}
+				} else {
+					m_wrapPtr = nullptr;
+				}
+			}
+			return *this;
+		}
+
 		constexpr operator bool() const noexcept {
 			return m_wrapPtr && *m_wrapPtr;
 		}

+		constexpr void free() noexcept {
+			if (m_wrapPtr) {
+				m_wrapPtr->free();
+			}
+			if (std::is_constant_evaluated()) {
+				ox::safeDelete(m_wrapPtr);
+			}
+			m_wrapPtr = nullptr;
+		}
+
 		template<typename T>
 		[[nodiscard]]
 		constexpr T *get() const noexcept {
@@ -104,6 +163,12 @@ class AnyPtr {
 			return dynamic_cast<Wrap<T>*>(m_wrapPtr)->data;
 #endif
 		}
+
 };

+}
+
+using AnyPtr = detail::AnyPtrT<false>;
+using UAnyPtr = detail::AnyPtrT<true>;
+
 }
--- a/deps/ox/src/ox/std/array.hpp
+++ b/deps/ox/src/ox/std/array.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2024 gary@drinkingtea.net
+ * Copyright 2015 - 2025 gary@drinkingtea.net
 *
 * This Source Code Form is subject to the terms of the Mozilla Public
 * License, v. 2.0. If a copy of the MPL was not distributed with this
--- a/deps/ox/src/ox/std/assert.cpp
+++ b/deps/ox/src/ox/std/assert.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2024 gary@drinkingtea.net
+ * Copyright 2015 - 2025 gary@drinkingtea.net
 *
 * This Source Code Form is subject to the terms of the Mozilla Public
 * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -7,6 +7,7 @@
 */

 #include "fmt.hpp"
+#include "realstd.hpp"
 #include "stacktrace.hpp"
 #include "trace.hpp"

@@ -14,14 +15,14 @@

 namespace ox {

-void panic(StringViewCR file, int line, StringViewCR panicMsg, const Error &err) noexcept {
+void panic(StringViewCR file, int const line, StringViewCR panicMsg, Error const&err) noexcept {
 	oxErrf("\033[31;1;1mPANIC:\033[0m [{}:{}]: {}\n", file, line, panicMsg);
 	if (err.msg) {
 		oxErrf("\tError Message:\t{}\n", err.msg);
 	}
 	oxErrf("\tError Code:\t{}\n", static_cast<ErrorCode>(err));
-	if (err.file != nullptr) {
-		oxErrf("\tError Location:\t{}:{}\n", err.file, err.line);
+	if (err.src.file_name() != nullptr) {
+		oxErrf("\tError Location:\t{}:{}\n", err.src.file_name(), err.src.line());
 	}
 #ifdef OX_USE_STDLIB
 	printStackTrace(2);
@@ -32,16 +33,19 @@ void panic(StringViewCR file, int line, StringViewCR panicMsg, const Error &err)
 #endif
 }

-void panic(const char *file, int line, const char *panicMsg, const Error &err) noexcept {
+void panic(const char *file, int const line, char const*panicMsg, Error const&err) noexcept {
 	panic(StringView{file}, line, StringView{panicMsg}, err);
 }

-void assertFailFuncRuntime(StringViewCR file, int line, StringViewCR assertTxt, StringViewCR msg) noexcept {
+void assertFailFuncRuntime(
+	StringViewCR file,
+	int const line,
+	StringViewCR assertTxt,
+	StringViewCR msg) noexcept {
 #ifdef OX_USE_STDLIB
-	auto output = sfmt("\n\033[31;1;1mASSERT FAILURE:\033[0m [{}:{}]: {}\n", file, line, msg);
-	output += genStackTrace(2);
-	oxTracef("assert", "Failed assert: {} ({}) [{}:{}]", msg, assertTxt, file, line);
-	std::abort();
+	auto const st = genStackTrace(2);
+	oxTracef("assert", "Failed assert: {} ({}) [{}:{}]:\n{}", msg, assertTxt, file, line, st);
+	abort();
 #else
 	oxErrf("\n\033[31;1;1mASSERT FAILURE:\033[0m [{}:{}]: {}\n", file, line, msg);
 	oxTracef("assert", "Failed assert: {} ({}) [{}:{}]", msg, assertTxt, file, line);
@@ -49,20 +53,25 @@ void assertFailFuncRuntime(StringViewCR file, int line, StringViewCR assertTxt,
 #endif
 }

-void assertFailFuncRuntime(StringViewCR file, int line, [[maybe_unused]] const Error &err, StringViewCR, StringViewCR assertMsg) noexcept {
+void assertFailFuncRuntime(
+	StringViewCR file,
+	int const line,
+	[[maybe_unused]] Error const&err,
+	StringViewCR,
+	StringViewCR assertMsg) noexcept {
 #if defined(OX_USE_STDLIB)
 	auto msg = sfmt("\n\033[31;1;1mASSERT FAILURE:\033[0m [{}:{}]: {}\n", file, line, assertMsg);
 	if (err.msg) {
 		msg += sfmt("\tError Message:\t{}\n", err.msg);
 	}
 	msg += sfmt("\tError Code:\t{}\n", static_cast<ErrorCode>(err));
-	if (err.file != nullptr) {
-		msg += sfmt("\tError Location:\t{}:{}\n", err.file, err.line);
+	if (err.src.file_name() != nullptr) {
+		msg += sfmt("\tError Location:\t{}:{}\n", err.src.file_name(), err.src.line());
 	}
 	msg += genStackTrace(2);
 	oxErr(msg);
 	oxTracef("assert", "Failed assert: {} [{}:{}]", assertMsg, file, line);
-	std::abort();
+	abort();
 #else
 	constexprPanic(file, line, assertMsg);
 #endif
--- a/deps/ox/src/ox/std/assert.hpp
+++ b/deps/ox/src/ox/std/assert.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2024 gary@drinkingtea.net
+ * Copyright 2015 - 2025 gary@drinkingtea.net
 *
 * This Source Code Form is subject to the terms of the Mozilla Public
 * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -22,9 +22,15 @@

 namespace ox {

-void panic(StringViewCR file, int line, StringViewCR panicMsg, const Error &err = ox::Error(0)) noexcept;
+[[noreturn]]
+void panic(StringViewCR file, int line, StringViewCR panicMsg, Error const&err = {}) noexcept;

-constexpr void constexprPanic(StringViewCR file, int line, StringViewCR panicMsg, const Error &err = ox::Error(0)) noexcept {
+[[noreturn]]
+constexpr void constexprPanic(
+	StringViewCR file,
+	int const line,
+	StringViewCR panicMsg,
+	Error const&err = {}) noexcept {
 	if (!std::is_constant_evaluated()) {
 		panic(file, line, panicMsg, err);
 	} else {
@@ -32,10 +38,24 @@ constexpr void constexprPanic(StringViewCR file, int line, StringViewCR panicMsg
 	}
 }

-void assertFailFuncRuntime(StringViewCR file, int line, StringViewCR assertTxt, StringViewCR msg) noexcept;
-void assertFailFuncRuntime(StringViewCR file, int line, const Error &err, StringViewCR, StringViewCR assertMsg) noexcept;
+void assertFailFuncRuntime(
+	StringViewCR file,
+	int line,
+	StringViewCR assertTxt,
+	StringViewCR msg) noexcept;
+void assertFailFuncRuntime(
+	StringViewCR file,
+	int line,
+	Error const&err,
+	StringViewCR,
+	StringViewCR assertMsg) noexcept;

-constexpr void assertFunc(StringViewCR file, int line, bool pass, [[maybe_unused]]StringViewCR assertTxt, [[maybe_unused]]StringViewCR msg) noexcept {
+constexpr void assertFunc(
+	StringViewCR file,
+	int const line,
+	bool const pass,
+	[[maybe_unused]]StringViewCR assertTxt,
+	[[maybe_unused]]StringViewCR msg) noexcept {
 	if (!pass) {
 		if (!std::is_constant_evaluated()) {
 			assertFailFuncRuntime(file, line, assertTxt, msg);
@@ -45,7 +65,12 @@ constexpr void assertFunc(StringViewCR file, int line, bool pass, [[maybe_unused
 	}
 }

-constexpr void assertFunc(StringViewCR file, int line, const Error &err, StringViewCR, StringViewCR assertMsg) noexcept {
+constexpr void assertFunc(
+	StringViewCR file,
+	int const line,
+	Error const&err,
+	StringViewCR,
+	StringViewCR assertMsg) noexcept {
 	if (err) {
 		if (!std::is_constant_evaluated()) {
 			assertFailFuncRuntime(file, line, err, {}, assertMsg);
@@ -55,7 +80,11 @@ constexpr void assertFunc(StringViewCR file, int line, const Error &err, StringV
 	}
 }

-constexpr void expect(StringViewCR file, int line, const auto &actual, const auto &expected) noexcept {
+constexpr void expect(
+	StringViewCR file,
+	int const line,
+	auto const&actual,
+	auto const&expected) noexcept {
 	if (actual != expected) {
 		 if (!std::is_constant_evaluated()) {
 #if defined(OX_USE_STDLIB)
--- a/deps/ox/src/ox/std/basestringview.hpp
+++ b/deps/ox/src/ox/std/basestringview.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2024 gary@drinkingtea.net
+ * Copyright 2015 - 2025 gary@drinkingtea.net
 *
 * This Source Code Form is subject to the terms of the Mozilla Public
 * License, v. 2.0. If a copy of the MPL was not distributed with this
--- a/deps/ox/src/ox/std/bit.cpp
+++ b/deps/ox/src/ox/std/bit.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2024 gary@drinkingtea.net
+ * Copyright 2015 - 2025 gary@drinkingtea.net
 *
 * This Source Code Form is subject to the terms of the Mozilla Public
 * License, v. 2.0. If a copy of the MPL was not distributed with this
--- a/deps/ox/src/ox/std/bit.hpp
+++ b/deps/ox/src/ox/std/bit.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2024 gary@drinkingtea.net
+ * Copyright 2015 - 2025 gary@drinkingtea.net
 *
 * This Source Code Form is subject to the terms of the Mozilla Public
 * License, v. 2.0. If a copy of the MPL was not distributed with this
--- a/deps/ox/src/ox/std/bounds.hpp
+++ b/deps/ox/src/ox/std/bounds.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2024 gary@drinkingtea.net
+ * Copyright 2015 - 2025 gary@drinkingtea.net
 *
 * This Source Code Form is subject to the terms of the Mozilla Public
 * License, v. 2.0. If a copy of the MPL was not distributed with this
--- a/deps/ox/src/ox/std/buffer.cpp
+++ b/deps/ox/src/ox/std/buffer.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2024 gary@drinkingtea.net
+ * Copyright 2015 - 2025 gary@drinkingtea.net
 *
 * This Source Code Form is subject to the terms of the Mozilla Public
 * License, v. 2.0. If a copy of the MPL was not distributed with this
--- a/deps/ox/src/ox/std/buffer.hpp
+++ b/deps/ox/src/ox/std/buffer.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2024 gary@drinkingtea.net
+ * Copyright 2015 - 2025 gary@drinkingtea.net
 *
 * This Source Code Form is subject to the terms of the Mozilla Public
 * License, v. 2.0. If a copy of the MPL was not distributed with this
--- a/deps/ox/src/ox/std/buildinfo.cpp
+++ b/deps/ox/src/ox/std/buildinfo.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2024 gary@drinkingtea.net
+ * Copyright 2015 - 2025 gary@drinkingtea.net
 *
 * This Source Code Form is subject to the terms of the Mozilla Public
 * License, v. 2.0. If a copy of the MPL was not distributed with this
--- a/deps/ox/src/ox/std/buildinfo.hpp
+++ b/deps/ox/src/ox/std/buildinfo.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2024 gary@drinkingtea.net
+ * Copyright 2015 - 2025 gary@drinkingtea.net
 *
 * This Source Code Form is subject to the terms of the Mozilla Public
 * License, v. 2.0. If a copy of the MPL was not distributed with this
--- a/deps/ox/src/ox/std/byteswap.cpp
+++ b/deps/ox/src/ox/std/byteswap.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2024 gary@drinkingtea.net
+ * Copyright 2015 - 2025 gary@drinkingtea.net
 *
 * This Source Code Form is subject to the terms of the Mozilla Public
 * License, v. 2.0. If a copy of the MPL was not distributed with this
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Gary Talent	92e9d9cbfc	[keel,studio] Add support for New Item templates Some checks failed Build / build (push) Failing after 1m3s Details	2025-01-18 20:16:29 -06:00
Gary Talent	b29b9a9b3a	[ox/std] Add UAnyPtr	2025-01-18 20:11:42 -06:00
Gary Talent	721f844214	[nostalgia/core/studio/tilesheeteditor] Fix subsheet and palette scrolling	2025-01-18 20:08:09 -06:00
Gary Talent	a3d6a58cc8	[nostalgia/core/studio] Fix library cpp file ownership All checks were successful Build / build (push) Successful in 3m10s Details	2025-01-17 21:50:42 -06:00
Gary Talent	e598e7fe27	[nostalgia,keel] Add ability to types Obj to Obj All checks were successful Build / build (push) Successful in 3m10s Details	2025-01-15 23:44:18 -06:00
Gary Talent	ba9e720f9f	[ox/model] Fix ModelTypeName_v to use requireModelTypeName	2025-01-15 23:34:58 -06:00
Gary Talent	8e816a261f	[nostalgia/core/studio] Cleanup, fix possible TileSheet fill tool failure All checks were successful Build / build (push) Successful in 3m11s Details	2025-01-14 23:06:12 -06:00
Gary Talent	5b9929ab3d	[keel] Add detail to preload logging	2025-01-14 21:20:13 -06:00
Gary Talent	ceb54b3f1b	[nostalgia/core/opengl] Cleanup	2025-01-14 21:18:22 -06:00
Gary Talent	8764444758	[nostalgia/core] Add clearCbb functions All checks were successful Build / build (push) Successful in 3m12s Details	2025-01-14 21:13:42 -06:00
Gary Talent	ce9a0b1fdb	[nostalgia/core/opengl] Cleanup memcpys	2025-01-14 21:13:10 -06:00
Gary Talent	f7a468ea1e	[ox/std] Add spancpy	2025-01-14 21:10:18 -06:00
Gary Talent	861d177a27	[studio] Cleanup All checks were successful Build / build (push) Successful in 3m12s Details	2025-01-13 22:58:39 -06:00
Gary Talent	3936756b36	[nostalgia/developer-handbook] Update error handling to reflect the enablement of exceptions for GBA build	2025-01-13 22:53:12 -06:00
Gary Talent	3e78ec3fe5	[studio] Cleanup	2025-01-13 22:40:08 -06:00
Gary Talent	3c3d53b40c	[studio] Ensure Editor tabs do first draw immediately, fix shift key being missed with tab shortcuts All checks were successful Build / build (push) Successful in 3m14s Details	2025-01-13 22:29:48 -06:00
Gary Talent	151d7c5736	[nostalgia/core/gba] Fix partial tilesheet loading overrun All checks were successful Build / build (push) Successful in 3m11s Details	2025-01-13 22:03:36 -06:00
Gary Talent	4e4d8d2c3f	[nostalgia/core/gba] Make panic use standard abort call	2025-01-13 21:37:29 -06:00
Gary Talent	03d1fd2857	[ox/std] Add and integrate standard abort call	2025-01-13 20:39:21 -06:00
Gary Talent	6701decc91	[gbabuildcore] Enable exceptions	2025-01-13 20:18:28 -06:00
Gary Talent	6cff526647	[teagba] Add symbols needed for enabling exceptions	2025-01-13 20:17:10 -06:00
Gary Talent	dd50bd0249	[studio] Remap toggle explorer keyboard shortcut, add Ctrl+1-0 mappings for jumping between tabs All checks were successful Build / build (push) Successful in 3m17s Details	2025-01-13 01:14:57 -06:00
Gary Talent	55a1660242	[nostalgia/core] Fix TileSheet validation/repair to ensure pixels gets cleared if there are subsheets All checks were successful Build / build (push) Successful in 3m10s Details	2025-01-12 16:06:24 -06:00
Gary Talent	ed365dfef5	[studio] Fix new project menu to return an appropriately sized string for name	2025-01-12 15:04:31 -06:00
Gary Talent	23a09e4a13	[nostalgia/core/studio] Fix SubSheet editor to return an appropriately sized string	2025-01-12 14:55:50 -06:00
Gary Talent	b69e7ebb98	[nostalgia/core/studio/tilesheeteditor] Fix select all not to go beyond end All checks were successful Build / build (push) Successful in 3m10s Details	2025-01-11 16:21:10 -06:00
Gary Talent	418d6e3f22	[nostalgia/core/studio] Fix crash that occurs when a non-leaf node subsheet is selected All checks were successful Build / build (push) Successful in 3m11s Details	2025-01-11 16:06:48 -06:00
Gary Talent	c44d8678cb	[nostalgia/core/studio] Fix tile insert to correct input when inserting past the last tile All checks were successful Build / build (push) Successful in 3m11s Details	2025-01-11 15:38:11 -06:00
Gary Talent	eb4cd7106d	[nostalgia/core/studio] Fix tile insert to work on last tile All checks were successful Build / build (push) Successful in 3m9s Details	2025-01-11 15:23:57 -06:00
Gary Talent	d259770f32	Merge commit '4ea4a61d542777a270c4e2c283e0e986fc9eec9c' All checks were successful Build / build (push) Successful in 3m9s Details	2025-01-11 12:32:00 -06:00
Gary Talent	80bad608f7	[keel] Fix reloadAsset	2025-01-11 03:39:38 -06:00
Gary Talent	2bce9a2baf	[ox/std] Add non-const SmallMap::pairs	2025-01-11 03:37:27 -06:00
Gary Talent	791b7746f3	[nostalgia] Update liccor file All checks were successful Build / build (push) Successful in 3m18s Details	2025-01-08 23:13:14 -06:00
Gary Talent	842e3587fd	[nostalgia] Update .gitignore for new location of scripts dir	2025-01-08 23:13:02 -06:00
Gary Talent	318e79004b	[ox] Update liccor file	2025-01-08 23:12:28 -06:00
Gary Talent	9f338a7429	[ox] Run liccor All checks were successful Build / build (push) Successful in 3m18s Details	2025-01-08 23:03:05 -06:00
Gary Talent	645e48af7b	[nostalgia,olympic] Run liccor	2025-01-08 23:02:08 -06:00
Gary Talent	ef92c8df13	[nostalgia] Make pkg-gba.py force lower case for pack tool All checks were successful Build / build (push) Successful in 3m9s Details	2025-01-08 22:01:27 -06:00
Gary Talent	849d50be8e	[nostalgia/core] Make getTileIdx return an Optional	2025-01-08 21:34:01 -06:00
Gary Talent	845092f114	[turbine] Make common turbine.cpp file private to its target	2025-01-08 21:33:23 -06:00
Gary Talent	75819a1797	[ox/std] Add SmallMap::values()	2025-01-08 21:31:46 -06:00
Gary Talent	d66da85753	[ox/std] SmallMap fixes, add findIdx function	2025-01-07 20:59:04 -06:00
Gary Talent	98ddb08abd	[nostalgia] Cleanup All checks were successful Build / build (push) Successful in 3m18s Details	2025-01-05 20:55:49 -06:00
Gary Talent	8d1701b0bb	[turbine/glfw] Ensure window opens with a standard mandatory refresh period All checks were successful Build / build (push) Successful in 3m19s Details	2025-01-04 23:49:04 -06:00
Gary Talent	1048e522fd	[imgui] Make ImGui not an object lib	2025-01-04 23:42:43 -06:00
Gary Talent	ee59da4aa3	[glad] Make glad not an object lib	2025-01-04 23:42:43 -06:00
Gary Talent	1ba64cb5d8	Merge commit '07610a5af2aaaac9cfcdcf8359b33f7df40d46cd' All checks were successful Build / build (push) Successful in 3m15s Details	2025-01-04 01:29:09 -06:00
Gary Talent	462bebf6dd	[nostalgia/core] Cleanup unused function declaration	2025-01-04 01:26:02 -06:00
Gary Talent	e3f84c4e75	[studio] Make first tab not draw before selected tab when window opens	2025-01-04 01:12:48 -06:00
Gary Talent	6837a0556d	[keel] Make AssetManager take StringViewCR for assetId All checks were successful Build / build (push) Successful in 3m16s Details	2025-01-04 01:11:05 -06:00
Gary Talent	ede2c8ca37	[keel] Make AssetTypeManager(Loader) move loader All checks were successful Build / build (push) Successful in 3m23s Details	2025-01-04 01:05:04 -06:00
Gary Talent	f50367f7d5	[ox/std] Add hash.hpp to install All checks were successful Build / build (push) Successful in 3m31s Details	2025-01-03 00:26:10 -06:00
Gary Talent	e758e03d2b	[nostalgia,olympic] Update for ox::Error changes All checks were successful Build / build (push) Successful in 3m20s Details	2025-01-01 23:43:32 -06:00
Gary Talent	835e3270ce	[ox] Make Error use std::source_location	2025-01-01 23:42:46 -06:00
Gary Talent	480dd5ece4	[ox/std] Cleanup All checks were successful Build / build (push) Successful in 3m25s Details	2025-01-01 22:57:20 -06:00
Gary Talent	dba6bb5800	[ox/std] Make Vector(initializer_list) use list size as capacity All checks were successful Build / build (push) Successful in 3m55s Details	2025-01-01 22:37:28 -06:00
Gary Talent	40a456e54a	[ox/std] Add Vector::shrink_to_fit	2025-01-01 22:32:57 -06:00
Gary Talent	bf5be00c12	Merge commit 'dc96270ca5e882e41f6b657be14a20e8bd2ad501' All checks were successful Build / build (push) Successful in 3m14s Details	2024-12-21 20:13:20 -06:00
Gary Talent	dc7c2559d6	[studio] Make selection tracker not go below 0	2024-12-21 20:06:48 -06:00