From af9631fd803179febc5c7cb34bb5c66660183935 Mon Sep 17 00:00:00 2001
From: Spartan322 <Megacake1234@gmail.com>
Date: Sun, 9 Aug 2026 14:44:02 -0400
Subject: [PATCH] Move position Vector classes to `core/object`

---
 src/openvic-simulation/{types => core/object}/Vector.cpp  | 0
 src/openvic-simulation/{types => core/object}/Vector.hpp  | 0
 src/openvic-simulation/{types => core/object}/VectorN.inc | 0
 src/openvic-simulation/dataloader/NodeTools.cpp           | 2 +-
 src/openvic-simulation/dataloader/NodeTools.hpp           | 2 +-
 src/openvic-simulation/interface/GFXObject.hpp            | 2 +-
 src/openvic-simulation/map/MapDefinition.cpp              | 2 +-
 src/openvic-simulation/map/MapDefinition.hpp              | 2 +-
 src/openvic-simulation/map/ProvinceDefinition.hpp         | 2 +-
 src/openvic-simulation/pathfinding/PointMap.cpp           | 2 +-
 src/openvic-simulation/pathfinding/PointMap.hpp           | 2 +-
 tests/src/{types => core/object}/Vector.hpp               | 4 ++--
 tests/src/{types => core/object}/Vector2.cpp              | 6 +++---
 tests/src/{types => core/object}/Vector3.cpp              | 6 +++---
 tests/src/{types => core/object}/Vector4.cpp              | 6 +++---
 tests/src/pathfinding/AStarPathing.cpp                    | 2 +-
 tests/src/pathfinding/FringePathing.cpp                   | 2 +-
 tests/src/pathfinding/Pathing.hpp                         | 2 +-
 tests/src/types/Approx.hpp                                | 4 ++--
 19 files changed, 24 insertions(+), 24 deletions(-)
 rename src/openvic-simulation/{types => core/object}/Vector.cpp (100%)
 rename src/openvic-simulation/{types => core/object}/Vector.hpp (100%)
 rename src/openvic-simulation/{types => core/object}/VectorN.inc (100%)
 rename tests/src/{types => core/object}/Vector.hpp (97%)
 rename tests/src/{types => core/object}/Vector2.cpp (98%)
 rename tests/src/{types => core/object}/Vector3.cpp (98%)
 rename tests/src/{types => core/object}/Vector4.cpp (98%)

diff --git a/src/openvic-simulation/types/Vector.cpp b/src/openvic-simulation/core/object/Vector.cpp
similarity index 100%
rename from src/openvic-simulation/types/Vector.cpp
rename to src/openvic-simulation/core/object/Vector.cpp
diff --git a/src/openvic-simulation/types/Vector.hpp b/src/openvic-simulation/core/object/Vector.hpp
similarity index 100%
rename from src/openvic-simulation/types/Vector.hpp
rename to src/openvic-simulation/core/object/Vector.hpp
diff --git a/src/openvic-simulation/types/VectorN.inc b/src/openvic-simulation/core/object/VectorN.inc
similarity index 100%
rename from src/openvic-simulation/types/VectorN.inc
rename to src/openvic-simulation/core/object/VectorN.inc
diff --git a/src/openvic-simulation/dataloader/NodeTools.cpp b/src/openvic-simulation/dataloader/NodeTools.cpp
index a2ae665fc..a758f1cc2 100644
--- a/src/openvic-simulation/dataloader/NodeTools.cpp
+++ b/src/openvic-simulation/dataloader/NodeTools.cpp
@@ -15,10 +15,10 @@
 #include <range/v3/iterator/operations.hpp>
 #include <range/v3/view/enumerate.hpp>
 
+#include "openvic-simulation/core/object/Vector.hpp"
 #include "openvic-simulation/core/ui/TextFormat.hpp"
 #include "openvic-simulation/types/Colour.hpp"
 #include "openvic-simulation/types/fixed_point/String.hpp"
-#include "openvic-simulation/types/Vector.hpp"
 #include "openvic-simulation/utility/Getters.hpp"
 
 using namespace OpenVic;
diff --git a/src/openvic-simulation/dataloader/NodeTools.hpp b/src/openvic-simulation/dataloader/NodeTools.hpp
index e075dd7ef..961372580 100644
--- a/src/openvic-simulation/dataloader/NodeTools.hpp
+++ b/src/openvic-simulation/dataloader/NodeTools.hpp
@@ -20,6 +20,7 @@
 #include "openvic-simulation/core/FormatValidate.hpp"
 #include "openvic-simulation/core/memory/String.hpp"
 #include "openvic-simulation/core/memory/Vector.hpp"
+#include "openvic-simulation/core/object/Vector.hpp"
 #include "openvic-simulation/core/stl/MutableIterator.hpp"
 #include "openvic-simulation/core/string/Utility.hpp"
 #include "openvic-simulation/core/template/Concepts.hpp"
@@ -28,7 +29,6 @@
 #include "openvic-simulation/types/Date.hpp"
 #include "openvic-simulation/types/IndexedFlatMap.hpp"
 #include "openvic-simulation/types/OrderedContainers.hpp"
-#include "openvic-simulation/types/Vector.hpp"
 
 #define MOV(...) static_cast<std::remove_reference_t<decltype(__VA_ARGS__)>&&>(__VA_ARGS__)
 #define FWD(...) static_cast<decltype(__VA_ARGS__)>(__VA_ARGS__)
diff --git a/src/openvic-simulation/interface/GFXObject.hpp b/src/openvic-simulation/interface/GFXObject.hpp
index 3f3aa0aba..842bdb4cd 100644
--- a/src/openvic-simulation/interface/GFXObject.hpp
+++ b/src/openvic-simulation/interface/GFXObject.hpp
@@ -3,9 +3,9 @@
 #include <cstdint>
 
 #include "openvic-simulation/core/memory/Vector.hpp"
+#include "openvic-simulation/core/object/Vector.hpp"
 #include "openvic-simulation/core/ui/TextFormat.hpp"
 #include "openvic-simulation/interface/LoadBase.hpp"
-#include "openvic-simulation/types/Vector.hpp"
 
 namespace OpenVic::GFX {
 
diff --git a/src/openvic-simulation/map/MapDefinition.cpp b/src/openvic-simulation/map/MapDefinition.cpp
index 2dc8db7ae..bedbf3aa7 100644
--- a/src/openvic-simulation/map/MapDefinition.cpp
+++ b/src/openvic-simulation/map/MapDefinition.cpp
@@ -18,6 +18,7 @@
 
 #include "openvic-simulation/core/FormatValidate.hpp"
 #include "openvic-simulation/core/io/BMP.hpp"
+#include "openvic-simulation/core/object/Vector.hpp"
 #include "openvic-simulation/core/stl/containers/TypedSpan.hpp"
 #include "openvic-simulation/core/string/CharConv.hpp"
 #include "openvic-simulation/core/Typedefs.hpp"
@@ -28,7 +29,6 @@
 #include "openvic-simulation/types/fixed_point/FixedPoint.hpp"
 #include "openvic-simulation/types/fixed_point/Math.hpp"
 #include "openvic-simulation/types/OrderedContainersMath.hpp"
-#include "openvic-simulation/types/Vector.hpp"
 #include "openvic-simulation/utility/Logger.hpp"
 
 using namespace OpenVic;
diff --git a/src/openvic-simulation/map/MapDefinition.hpp b/src/openvic-simulation/map/MapDefinition.hpp
index a2aa45f95..ccdf4d08d 100644
--- a/src/openvic-simulation/map/MapDefinition.hpp
+++ b/src/openvic-simulation/map/MapDefinition.hpp
@@ -9,6 +9,7 @@
 
 #include "openvic-simulation/core/io/BMP.hpp"
 #include "openvic-simulation/core/memory/Vector.hpp"
+#include "openvic-simulation/core/object/Vector.hpp"
 #include "openvic-simulation/map/ProvinceDefinition.hpp"
 #include "openvic-simulation/map/Region.hpp"
 #include "openvic-simulation/map/TerrainType.hpp"
@@ -16,7 +17,6 @@
 #include "openvic-simulation/types/Colour.hpp"
 #include "openvic-simulation/types/IdentifierRegistry.hpp"
 #include "openvic-simulation/types/OrderedContainers.hpp"
-#include "openvic-simulation/types/Vector.hpp"
 
 namespace OpenVic {
 	struct BuildingTypeManager;
diff --git a/src/openvic-simulation/map/ProvinceDefinition.hpp b/src/openvic-simulation/map/ProvinceDefinition.hpp
index 29c991c0b..5f9880952 100644
--- a/src/openvic-simulation/map/ProvinceDefinition.hpp
+++ b/src/openvic-simulation/map/ProvinceDefinition.hpp
@@ -6,6 +6,7 @@
 #include <type_safe/strong_typedef.hpp>
 
 #include "openvic-simulation/core/memory/Vector.hpp"
+#include "openvic-simulation/core/object/Vector.hpp"
 #include "openvic-simulation/dataloader/NodeTools.hpp"
 #include "openvic-simulation/types/fixed_point/FixedPoint.hpp"
 #include "openvic-simulation/types/fixed_point/FixedPointMap.hpp"
@@ -13,7 +14,6 @@
 #include "openvic-simulation/types/HasIndex.hpp"
 #include "openvic-simulation/types/OrderedContainers.hpp"
 #include "openvic-simulation/types/TypedIndices.hpp"
-#include "openvic-simulation/types/Vector.hpp"
 
 namespace OpenVic {
 
diff --git a/src/openvic-simulation/pathfinding/PointMap.cpp b/src/openvic-simulation/pathfinding/PointMap.cpp
index fcabbcd40..b4f2e5bb6 100644
--- a/src/openvic-simulation/pathfinding/PointMap.cpp
+++ b/src/openvic-simulation/pathfinding/PointMap.cpp
@@ -12,9 +12,9 @@
 
 #include "openvic-simulation/core/error/ErrorMacros.hpp"
 #include "openvic-simulation/core/memory/Formatting.hpp"
+#include "openvic-simulation/core/object/Vector.hpp"
 #include "openvic-simulation/core/Typedefs.hpp"
 #include "openvic-simulation/types/fixed_point/FixedPoint.hpp"
-#include "openvic-simulation/types/Vector.hpp"
 
 using namespace OpenVic;
 
diff --git a/src/openvic-simulation/pathfinding/PointMap.hpp b/src/openvic-simulation/pathfinding/PointMap.hpp
index b4fee3665..4213fdcb0 100644
--- a/src/openvic-simulation/pathfinding/PointMap.hpp
+++ b/src/openvic-simulation/pathfinding/PointMap.hpp
@@ -10,10 +10,10 @@
 #include <tsl/ordered_set.h>
 
 #include "openvic-simulation/core/Hash.hpp"
+#include "openvic-simulation/core/object/Vector.hpp"
 #include "openvic-simulation/core/template/EnumBitfield.hpp"
 #include "openvic-simulation/types/fixed_point/FixedPoint.hpp"
 #include "openvic-simulation/types/Signal.hpp"
-#include "openvic-simulation/types/Vector.hpp"
 
 namespace OpenVic {
 	struct PointMap {
diff --git a/tests/src/types/Vector.hpp b/tests/src/core/object/Vector.hpp
similarity index 97%
rename from tests/src/types/Vector.hpp
rename to tests/src/core/object/Vector.hpp
index 9c23bf5db..a519b8dec 100644
--- a/tests/src/types/Vector.hpp
+++ b/tests/src/core/object/Vector.hpp
@@ -1,9 +1,9 @@
 #pragma once
 
-#include "openvic-simulation/types/Vector.hpp"
+#include "openvic-simulation/core/object/Vector.hpp"
 #include "openvic-simulation/types/fixed_point/FixedPoint.hpp"
 
-#include "Numeric.hpp"
+#include "types/Numeric.hpp"
 #include <snitch/snitch_string.hpp>
 #include <snitch/snitch_string_utility.hpp>
 
diff --git a/tests/src/types/Vector2.cpp b/tests/src/core/object/Vector2.cpp
similarity index 98%
rename from tests/src/types/Vector2.cpp
rename to tests/src/core/object/Vector2.cpp
index 727f51844..ba2da45d2 100644
--- a/tests/src/types/Vector2.cpp
+++ b/tests/src/core/object/Vector2.cpp
@@ -1,13 +1,13 @@
 #include <cmath>
 #include <cstdlib>
 
-#include "openvic-simulation/types/Vector.hpp"
+#include "openvic-simulation/core/object/Vector.hpp"
 #include "openvic-simulation/types/fixed_point/FixedPoint.hpp"
 #include "openvic-simulation/types/fixed_point/Math.hpp"
 
-#include "Approx.hpp"
 #include "Helper.hpp" // IWYU pragma: keep
-#include "Numeric.hpp"
+#include "types/Approx.hpp"
+#include "types/Numeric.hpp"
 #include "Vector.hpp"
 #include <snitch/snitch_macros_check.hpp>
 #include <snitch/snitch_macros_constexpr.hpp>
diff --git a/tests/src/types/Vector3.cpp b/tests/src/core/object/Vector3.cpp
similarity index 98%
rename from tests/src/types/Vector3.cpp
rename to tests/src/core/object/Vector3.cpp
index b6c4c1d9f..a7fd32f50 100644
--- a/tests/src/types/Vector3.cpp
+++ b/tests/src/core/object/Vector3.cpp
@@ -1,13 +1,13 @@
 #include <cmath>
 #include <cstdlib>
 
-#include "openvic-simulation/types/Vector.hpp"
+#include "openvic-simulation/core/object/Vector.hpp"
 #include "openvic-simulation/types/fixed_point/FixedPoint.hpp"
 #include "openvic-simulation/types/fixed_point/Math.hpp"
 
-#include "Approx.hpp"
 #include "Helper.hpp" // IWYU pragma: keep
-#include "Numeric.hpp"
+#include "types/Approx.hpp"
+#include "types/Numeric.hpp"
 #include "Vector.hpp"
 #include <snitch/snitch_macros_check.hpp>
 #include <snitch/snitch_macros_constexpr.hpp>
diff --git a/tests/src/types/Vector4.cpp b/tests/src/core/object/Vector4.cpp
similarity index 98%
rename from tests/src/types/Vector4.cpp
rename to tests/src/core/object/Vector4.cpp
index e5715d87f..b7e26233f 100644
--- a/tests/src/types/Vector4.cpp
+++ b/tests/src/core/object/Vector4.cpp
@@ -1,13 +1,13 @@
 #include <cmath>
 #include <cstdlib>
 
-#include "openvic-simulation/types/Vector.hpp"
+#include "openvic-simulation/core/object/Vector.hpp"
 #include "openvic-simulation/types/fixed_point/FixedPoint.hpp"
 #include "openvic-simulation/types/fixed_point/Math.hpp"
 
-#include "Approx.hpp"
 #include "Helper.hpp" // IWYU pragma: keep
-#include "Numeric.hpp"
+#include "types/Approx.hpp"
+#include "types/Numeric.hpp"
 #include <snitch/snitch_macros_check.hpp>
 #include <snitch/snitch_macros_constexpr.hpp>
 #include <snitch/snitch_macros_misc.hpp>
diff --git a/tests/src/pathfinding/AStarPathing.cpp b/tests/src/pathfinding/AStarPathing.cpp
index 0873e2a07..07e5fb4c1 100644
--- a/tests/src/pathfinding/AStarPathing.cpp
+++ b/tests/src/pathfinding/AStarPathing.cpp
@@ -1,7 +1,7 @@
 #include "openvic-simulation/pathfinding/AStarPathing.hpp"
 
+#include "openvic-simulation/core/object/Vector.hpp"
 #include "openvic-simulation/pathfinding/PointMap.hpp"
-#include "openvic-simulation/types/Vector.hpp"
 #include "openvic-simulation/types/fixed_point/FixedPoint.hpp"
 
 #include "Helper.hpp"
diff --git a/tests/src/pathfinding/FringePathing.cpp b/tests/src/pathfinding/FringePathing.cpp
index 11d22cce0..8ee448e31 100644
--- a/tests/src/pathfinding/FringePathing.cpp
+++ b/tests/src/pathfinding/FringePathing.cpp
@@ -1,7 +1,7 @@
 #include "openvic-simulation/pathfinding/FringePathing.hpp"
 
+#include "openvic-simulation/core/object/Vector.hpp"
 #include "openvic-simulation/pathfinding/PointMap.hpp"
-#include "openvic-simulation/types/Vector.hpp"
 #include "openvic-simulation/types/fixed_point/FixedPoint.hpp"
 
 #include "Helper.hpp"
diff --git a/tests/src/pathfinding/Pathing.hpp b/tests/src/pathfinding/Pathing.hpp
index 4504289d1..d71958bf8 100644
--- a/tests/src/pathfinding/Pathing.hpp
+++ b/tests/src/pathfinding/Pathing.hpp
@@ -5,8 +5,8 @@
 #include <fmt/core.h>
 
 #include "openvic-simulation/core/memory/Vector.hpp"
+#include "openvic-simulation/core/object/Vector.hpp"
 #include "openvic-simulation/pathfinding/PointMap.hpp"
-#include "openvic-simulation/types/Vector.hpp"
 
 #include "Helper.hpp"
 #include <snitch/snitch_macros_misc.hpp>
diff --git a/tests/src/types/Approx.hpp b/tests/src/types/Approx.hpp
index 738330bc3..15cd50a22 100644
--- a/tests/src/types/Approx.hpp
+++ b/tests/src/types/Approx.hpp
@@ -5,10 +5,10 @@
 #include <cstdlib>
 #include <limits>
 
-#include "openvic-simulation/types/Vector.hpp"
 #include "openvic-simulation/core/Math.hpp"
+#include "openvic-simulation/core/object/Vector.hpp"
 
-#include "Vector.hpp" // IWYU pragma: keep
+#include "core/object/Vector.hpp" // IWYU pragma: keep
 #include <snitch/snitch_string.hpp>
 #include <snitch/snitch_string_utility.hpp>