Move generic utility types and functions to a util directory

MHeasell · Mar 29, 2023 · e95167b · e95167b
1 parent 4aafdf7
commit e95167b
Show file tree

Hide file tree

Showing 73 changed files with 85 additions and 85 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -255,7 +255,6 @@ set(SOURCE_FILES
     src/rwe/ImGuiContext.h
     src/rwe/InGameSoundsInfo.cpp
     src/rwe/InGameSoundsInfo.h
-    src/rwe/Index.h
     src/rwe/LoadingNetworkService.cpp
     src/rwe/LoadingNetworkService.h
     src/rwe/LoadingScene.cpp
@@ -274,10 +273,6 @@ set(SOURCE_FILES
     src/rwe/MeshService.h
     src/rwe/MovementClassCollisionService.cpp
     src/rwe/MovementClassCollisionService.h
-    src/rwe/OpaqueField.h
-    src/rwe/OpaqueId.h
-    src/rwe/OpaqueId_io.h
-    src/rwe/OpaqueUnit.h
     src/rwe/Particle.cpp
     src/rwe/Particle.h
     src/rwe/PathMapping.cpp
@@ -292,7 +287,6 @@ set(SOURCE_FILES
     src/rwe/RadiansAngle.h
     src/rwe/RenderService.cpp
     src/rwe/RenderService.h
-    src/rwe/Result.h
     src/rwe/SceneContext.h
     src/rwe/SceneTime.cpp
     src/rwe/SceneTime.h
@@ -301,7 +295,6 @@ set(SOURCE_FILES
     src/rwe/SelectionMesh.h
     src/rwe/ShaderService.cpp
     src/rwe/ShaderService.h
-    src/rwe/SharedHandle.h
     src/rwe/SideData.cpp
     src/rwe/SideData.h
     src/rwe/SoundClass.cpp
@@ -310,7 +303,6 @@ set(SOURCE_FILES
     src/rwe/TextureService.h
     src/rwe/UiRenderService.cpp
     src/rwe/UiRenderService.h
-    src/rwe/UniqueHandle.h
     src/rwe/UnitDatabase.cpp
     src/rwe/UnitDatabase.h
     src/rwe/UnitPieceMeshInfo.cpp
@@ -433,7 +425,6 @@ set(SOURCE_FILES
     src/rwe/io_utils.h
     src/rwe/ip_util.cpp
     src/rwe/ip_util.h
-    src/rwe/match.h
     src/rwe/math/Matrix4f.h
     src/rwe/math/Matrix4x.h
     src/rwe/math/Vector2f.h
@@ -589,6 +580,15 @@ set(SOURCE_FILES
     src/rwe/ui/events.h
     src/rwe/util.cpp
     src/rwe/util.h
+    src/rwe/util/Index.h
+    src/rwe/util/OpaqueField.h
+    src/rwe/util/OpaqueId.h
+    src/rwe/util/OpaqueId_io.h
+    src/rwe/util/OpaqueUnit.h
+    src/rwe/util/Result.h
+    src/rwe/util/SharedHandle.h
+    src/rwe/util/UniqueHandle.h
+    src/rwe/util/match.h
     src/rwe/vertex_height.cpp
     src/rwe/vertex_height.h
     src/rwe/vfs/AbstractVirtualFileSystem.h
@@ -780,7 +780,6 @@ endif()
 set(TEST_FILES
     src/rwe/BoxTreeSplit.test.cpp
     src/rwe/GameHash_util.test.cpp
-    src/rwe/Result.test.cpp
     src/rwe/SideData.test.cpp
     src/rwe/Viewport.test.cpp
     src/rwe/cob/cob_util.test.cpp
@@ -819,6 +818,7 @@ set(TEST_FILES
     src/rwe/sim/UnitState_util.test.cpp
     src/rwe/sim/util.test.cpp
     src/rwe/util.test.cpp
+    src/rwe/util/Result.test.cpp
     )
 
 add_executable(rwe_test src/test.cpp ${TEST_FILES})

diff --git a/src/cob_test.cpp b/src/cob_test.cpp
@@ -1,11 +1,11 @@
 #include <fstream>
 #include <iomanip>
 #include <iostream>
-#include <rwe/Index.h>
 #include <rwe/cob/CobOpCode.h>
 #include <rwe/io/_3do/_3do.h>
 #include <rwe/io/cob/Cob.h>
 #include <rwe/optional_io.h>
+#include <rwe/util/Index.h>
 #include <vector>
 
 namespace rwe

diff --git a/src/hpi_test.cpp b/src/hpi_test.cpp
@@ -3,7 +3,7 @@
 #include <iostream>
 #include <memory>
 #include <rwe/io/hpi/HpiArchive.h>
-#include <rwe/match.h>
+#include <rwe/util/match.h>
 #include <string>
 
 namespace fs = boost::filesystem;

diff --git a/src/main.cpp b/src/main.cpp
@@ -10,7 +10,6 @@
 #include <rwe/MainMenuScene.h>
 #include <rwe/PathMapping.h>
 #include <rwe/PlayerColorIndex.h>
-#include <rwe/Result.h>
 #include <rwe/SceneContext.h>
 #include <rwe/SdlContextManager.h>
 #include <rwe/ShaderService.h>
@@ -27,6 +26,7 @@
 #include <rwe/sim/Metal.h>
 #include <rwe/ui/UiFactory.h>
 #include <rwe/util.h>
+#include <rwe/util/Result.h>
 #include <rwe/vfs/CompositeVirtualFileSystem.h>
 #include <spdlog/spdlog.h>
 

diff --git a/src/rwe/GameHash.h b/src/rwe/GameHash.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <cstdint>
-#include <rwe/OpaqueId.h>
+#include <rwe/util/OpaqueId.h>
 
 namespace rwe
 {

diff --git a/src/rwe/GameHash_util.h b/src/rwe/GameHash_util.h
@@ -2,8 +2,8 @@
 
 #include <cstdint>
 #include <rwe/GameHash.h>
-#include <rwe/match.h>
 #include <rwe/sim/GameSimulation.h>
+#include <rwe/util/match.h>
 
 namespace rwe
 {

diff --git a/src/rwe/GameHash_util.test.cpp b/src/rwe/GameHash_util.test.cpp
@@ -1,6 +1,6 @@
 #include <catch2/catch.hpp>
 #include <rwe/GameHash_util.h>
-#include <rwe/OpaqueId_io.h>
+#include <rwe/util/OpaqueId_io.h>
 
 namespace rwe
 {

diff --git a/src/rwe/GameNetworkService.cpp b/src/rwe/GameNetworkService.cpp
@@ -1,12 +1,12 @@
 #include "GameNetworkService.h"
 #include <boost/range/adaptors.hpp>
 #include <rwe/GameHash.h>
-#include <rwe/Index.h>
-#include <rwe/OpaqueId_io.h>
 #include <rwe/network_util.h>
 #include <rwe/proto/serialization.h>
 #include <rwe/range_util.h>
 #include <rwe/sim/SimTicksPerSecond.h>
+#include <rwe/util/Index.h>
+#include <rwe/util/OpaqueId_io.h>
 #include <spdlog/spdlog.h>
 #include <thread>
 

diff --git a/src/rwe/GameNetworkService.h b/src/rwe/GameNetworkService.h
@@ -8,13 +8,13 @@
 #include <network.pb.h>
 #include <random>
 #include <rwe/GameHash.h>
-#include <rwe/OpaqueId.h>
-#include <rwe/OpaqueUnit.h>
 #include <rwe/PlayerCommand.h>
 #include <rwe/PlayerCommandService.h>
 #include <rwe/rwe_time.h>
 #include <rwe/sim/GameTime.h>
 #include <rwe/sim/PlayerId.h>
+#include <rwe/util/OpaqueId.h>
+#include <rwe/util/OpaqueUnit.h>
 
 namespace rwe
 {

diff --git a/src/rwe/GameScene.cpp b/src/rwe/GameScene.cpp
@@ -5,18 +5,18 @@
 #include <functional>
 #include <rwe/CroppedViewport.h>
 #include <rwe/GameScene_util.h>
-#include <rwe/Index.h>
 #include <rwe/Mesh.h>
 #include <rwe/camera_util.h>
 #include <rwe/dump_util.h>
 #include <rwe/io/featuretdf/FeatureTdf.h>
-#include <rwe/match.h>
 #include <rwe/matrix_util.h>
 #include <rwe/resource_io.h>
 #include <rwe/sim/SimTicksPerSecond.h>
 #include <rwe/sim/UnitBehaviorService.h>
 #include <rwe/sim/cob.h>
 #include <rwe/ui/UiStagedButton.h>
+#include <rwe/util/Index.h>
+#include <rwe/util/match.h>
 #include <spdlog/spdlog.h>
 
 namespace rwe

diff --git a/src/rwe/GameScene_util.cpp b/src/rwe/GameScene_util.cpp
@@ -2,7 +2,7 @@
 
 #include <algorithm>
 #include <boost/algorithm/string/predicate.hpp>
-#include <rwe/Index.h>
+#include <rwe/util/Index.h>
 
 namespace rwe
 {

diff --git a/src/rwe/LoadingNetworkService.cpp b/src/rwe/LoadingNetworkService.cpp
@@ -1,7 +1,7 @@
 #include "LoadingNetworkService.h"
 #include <algorithm>
-#include <rwe/Index.h>
 #include <rwe/network_util.h>
+#include <rwe/util/Index.h>
 #include <spdlog/spdlog.h>
 
 namespace rwe

diff --git a/src/rwe/LoadingScene.cpp b/src/rwe/LoadingScene.cpp
@@ -2,7 +2,6 @@
 #include <boost/interprocess/streams/bufferstream.hpp>
 #include <rwe/FeatureMediaInfo.h>
 #include <rwe/GameNetworkService.h>
-#include <rwe/Index.h>
 #include <rwe/MapTerrainGraphics.h>
 #include <rwe/atlas_util.h>
 #include <rwe/collections/SimpleVectorMap.h>
@@ -16,6 +15,7 @@
 #include <rwe/pathfinding/PathFindingService.h>
 #include <rwe/sim/FeatureDefinitionId.h>
 #include <rwe/ui/UiLabel.h>
+#include <rwe/util/Index.h>
 
 namespace rwe
 {

diff --git a/src/rwe/MainMenuScene.cpp b/src/rwe/MainMenuScene.cpp
@@ -1,5 +1,4 @@
 #include "MainMenuScene.h"
-#include <rwe/Index.h>
 #include <rwe/LoadingScene.h>
 #include <rwe/MainMenuModel.h>
 #include <rwe/camera_util.h>
@@ -9,6 +8,7 @@
 #include <rwe/io/tdf/tdf.h>
 #include <rwe/resource_io.h>
 #include <rwe/ui/UiSurface.h>
+#include <rwe/util/Index.h>
 
 namespace rwe
 {

diff --git a/src/rwe/Particle.cpp b/src/rwe/Particle.cpp
@@ -1,5 +1,5 @@
 #include "Particle.h"
-#include <rwe/match.h>
+#include <rwe/util/match.h>
 
 namespace rwe
 {

diff --git a/src/rwe/PlayerColorIndex.h b/src/rwe/PlayerColorIndex.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <rwe/OpaqueId.h>
+#include <rwe/util/OpaqueId.h>
 
 namespace rwe
 {

diff --git a/src/rwe/RadiansAngle.h b/src/rwe/RadiansAngle.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <rwe/OpaqueId.h>
+#include <rwe/util/OpaqueId.h>
 
 namespace rwe
 {

diff --git a/src/rwe/SceneTime.h b/src/rwe/SceneTime.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <rwe/OpaqueUnit.h>
+#include <rwe/util/OpaqueUnit.h>
 
 namespace rwe
 {

diff --git a/src/rwe/atlas_util.cpp b/src/rwe/atlas_util.cpp
@@ -1,9 +1,9 @@
 #include "atlas_util.h"
 #include <boost/interprocess/streams/bufferstream.hpp>
 #include <rwe/BoxTreeSplit.h>
-#include <rwe/Index.h>
 #include <rwe/io/gaf/GafArchive.h>
-#include <rwe/match.h>
+#include <rwe/util/Index.h>
+#include <rwe/util/match.h>
 
 namespace rwe
 {

diff --git a/src/rwe/cob/CobAngle.h b/src/rwe/cob/CobAngle.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include <rwe/OpaqueUnit.h>
 #include <rwe/sim/SimAngle.h>
+#include <rwe/util/OpaqueUnit.h>
 
 namespace rwe
 {

diff --git a/src/rwe/cob/CobAngularSpeed.h b/src/rwe/cob/CobAngularSpeed.h
@@ -1,8 +1,8 @@
 #pragma once
 
 #include <cstdint>
-#include <rwe/OpaqueId.h>
 #include <rwe/sim/SimScalar.h>
+#include <rwe/util/OpaqueId.h>
 
 namespace rwe
 {

diff --git a/src/rwe/cob/CobPosition.h b/src/rwe/cob/CobPosition.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <rwe/OpaqueId.h>
+#include <rwe/util/OpaqueId.h>
 
 namespace rwe
 {

diff --git a/src/rwe/cob/CobSleepDuration.h b/src/rwe/cob/CobSleepDuration.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <rwe/OpaqueId.h>
+#include <rwe/util/OpaqueId.h>
 
 namespace rwe
 {

diff --git a/src/rwe/cob/CobSpeed.h b/src/rwe/cob/CobSpeed.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <rwe/OpaqueId.h>
+#include <rwe/util/OpaqueId.h>
 
 namespace rwe
 {

diff --git a/src/rwe/cob/CobTime.h b/src/rwe/cob/CobTime.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <rwe/OpaqueUnit.h>
+#include <rwe/util/OpaqueUnit.h>
 
 namespace rwe
 {

diff --git a/src/rwe/collections/SimpleVectorMap.h b/src/rwe/collections/SimpleVectorMap.h
@@ -2,7 +2,7 @@
 
 #include <deque>
 #include <optional>
-#include <rwe/OpaqueId.h>
+#include <rwe/util/OpaqueId.h>
 #include <utility>
 
 namespace rwe

diff --git a/src/rwe/collections/VectorMap.h b/src/rwe/collections/VectorMap.h
@@ -4,8 +4,8 @@
 #include <deque>
 #include <functional>
 #include <optional>
-#include <rwe/OpaqueId.h>
-#include <rwe/match.h>
+#include <rwe/util/OpaqueId.h>
+#include <rwe/util/match.h>
 #include <stdexcept>
 #include <utility>
 #include <variant>

diff --git a/src/rwe/collections/VectorMap.test.cpp b/src/rwe/collections/VectorMap.test.cpp
@@ -1,11 +1,11 @@
 #include <catch2/catch.hpp>
 #include <rapidcheck.h>
 #include <rapidcheck/catch.h>
-#include <rwe/OpaqueId.h>
-#include <rwe/OpaqueId_io.h>
 #include <rwe/collections/VectorMap.h>
 #include <rwe/optional_io.h>
 #include <rwe/rc_gen_optional.h>
+#include <rwe/util/OpaqueId.h>
+#include <rwe/util/OpaqueId_io.h>
 
 namespace rwe
 {

diff --git a/src/rwe/dump_util.h b/src/rwe/dump_util.h
@@ -2,8 +2,8 @@
 
 #include <cstdint>
 #include <nlohmann/json.hpp>
-#include <rwe/OpaqueId.h>
 #include <rwe/sim/GameSimulation.h>
+#include <rwe/util/OpaqueId.h>
 #include <string>
 #include <utility>
 

diff --git a/src/rwe/grid/Grid.h b/src/rwe/grid/Grid.h
@@ -4,8 +4,8 @@
 #include <cassert>
 #include <functional>
 #include <optional>
-#include <rwe/Index.h>
 #include <rwe/grid/DiscreteRect.h>
+#include <rwe/util/Index.h>
 #include <stdexcept>
 #include <vector>