From e95167b20755e5f9e64c673039fabaae92667dd5 Mon Sep 17 00:00:00 2001 From: Michael Heasell Date: Wed, 29 Mar 2023 23:14:25 +0100 Subject: [PATCH] Move generic utility types and functions to a util directory --- CMakeLists.txt | 20 ++++++++++---------- src/cob_test.cpp | 2 +- src/hpi_test.cpp | 2 +- src/main.cpp | 2 +- src/rwe/GameHash.h | 2 +- src/rwe/GameHash_util.h | 2 +- src/rwe/GameHash_util.test.cpp | 2 +- src/rwe/GameNetworkService.cpp | 4 ++-- src/rwe/GameNetworkService.h | 4 ++-- src/rwe/GameScene.cpp | 4 ++-- src/rwe/GameScene_util.cpp | 2 +- src/rwe/LoadingNetworkService.cpp | 2 +- src/rwe/LoadingScene.cpp | 2 +- src/rwe/MainMenuScene.cpp | 2 +- src/rwe/Particle.cpp | 2 +- src/rwe/PlayerColorIndex.h | 2 +- src/rwe/RadiansAngle.h | 2 +- src/rwe/SceneTime.h | 2 +- src/rwe/atlas_util.cpp | 4 ++-- src/rwe/cob/CobAngle.h | 2 +- src/rwe/cob/CobAngularSpeed.h | 2 +- src/rwe/cob/CobPosition.h | 2 +- src/rwe/cob/CobSleepDuration.h | 2 +- src/rwe/cob/CobSpeed.h | 2 +- src/rwe/cob/CobTime.h | 2 +- src/rwe/collections/SimpleVectorMap.h | 2 +- src/rwe/collections/VectorMap.h | 4 ++-- src/rwe/collections/VectorMap.test.cpp | 4 ++-- src/rwe/dump_util.h | 2 +- src/rwe/grid/Grid.h | 2 +- src/rwe/io/fbi/FbiAnglePerTick.h | 2 +- src/rwe/io/fbi/FbiDistancePerTick.h | 2 +- src/rwe/io/fbi/FbiDistancePerTickSquared.h | 2 +- src/rwe/io/fbi/io.cpp | 2 +- src/rwe/io/hpi/HpiArchive.cpp | 2 +- src/rwe/io/ota/ota.test.cpp | 2 +- src/rwe/render/FrameBufferHandle.h | 2 +- src/rwe/render/GlIdentifier.h | 2 +- src/rwe/render/RenderBufferHandle.h | 2 +- src/rwe/render/ShaderHandle.h | 2 +- src/rwe/render/ShaderProgramHandle.h | 2 +- src/rwe/render/TextureArrayHandle.h | 2 +- src/rwe/render/TextureHandle.h | 2 +- src/rwe/render/UniformLocation.h | 2 +- src/rwe/render/VaoHandle.h | 2 +- src/rwe/render/VboHandle.h | 2 +- src/rwe/sim/Energy.h | 2 +- src/rwe/sim/FeatureDefinitionId.h | 2 +- src/rwe/sim/FeatureId.h | 2 +- src/rwe/sim/GameSimulation.cpp | 4 ++-- src/rwe/sim/GameTime.h | 2 +- src/rwe/sim/Metal.h | 2 +- src/rwe/sim/MovementClassId.h | 2 +- src/rwe/sim/PlayerId.h | 2 +- src/rwe/sim/ProjectileId.h | 2 +- src/rwe/sim/SimAngle.h | 2 +- src/rwe/sim/SimAngle.test.cpp | 2 +- src/rwe/sim/SimScalar.h | 2 +- src/rwe/sim/UnitBehaviorService.cpp | 4 ++-- src/rwe/sim/UnitId.h | 2 +- src/rwe/sim/UnitModelDefinition.cpp | 2 +- src/rwe/sim/UnitState.cpp | 2 +- src/rwe/ui/UiFactory.cpp | 2 +- src/rwe/{ => util}/Index.h | 0 src/rwe/{ => util}/OpaqueField.h | 2 +- src/rwe/{ => util}/OpaqueId.h | 0 src/rwe/{ => util}/OpaqueId_io.h | 2 +- src/rwe/{ => util}/OpaqueUnit.h | 2 +- src/rwe/{ => util}/Result.h | 0 src/rwe/{ => util}/Result.test.cpp | 2 +- src/rwe/{ => util}/SharedHandle.h | 2 +- src/rwe/{ => util}/UniqueHandle.h | 0 src/rwe/{ => util}/match.h | 0 73 files changed, 85 insertions(+), 85 deletions(-) rename src/rwe/{ => util}/Index.h (100%) rename src/rwe/{ => util}/OpaqueField.h (98%) rename src/rwe/{ => util}/OpaqueId.h (100%) rename src/rwe/{ => util}/OpaqueId_io.h (92%) rename src/rwe/{ => util}/OpaqueUnit.h (98%) rename src/rwe/{ => util}/Result.h (100%) rename src/rwe/{ => util}/Result.test.cpp (95%) rename src/rwe/{ => util}/SharedHandle.h (98%) rename src/rwe/{ => util}/UniqueHandle.h (100%) rename src/rwe/{ => util}/match.h (100%) diff --git a/CMakeLists.txt b/CMakeLists.txt index f62f97a91..3b27cf1cd 100644 --- 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 index d0acb43ff..ea6c3ddfd 100644 --- a/src/cob_test.cpp +++ b/src/cob_test.cpp @@ -1,11 +1,11 @@ #include #include #include -#include #include #include #include #include +#include #include namespace rwe diff --git a/src/hpi_test.cpp b/src/hpi_test.cpp index 00cd40d08..0f2292d7f 100644 --- a/src/hpi_test.cpp +++ b/src/hpi_test.cpp @@ -3,7 +3,7 @@ #include #include #include -#include +#include #include namespace fs = boost::filesystem; diff --git a/src/main.cpp b/src/main.cpp index 0fe2eb580..67d22767e 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -10,7 +10,6 @@ #include #include #include -#include #include #include #include @@ -27,6 +26,7 @@ #include #include #include +#include #include #include diff --git a/src/rwe/GameHash.h b/src/rwe/GameHash.h index fe73f4eb1..80621581f 100644 --- a/src/rwe/GameHash.h +++ b/src/rwe/GameHash.h @@ -1,7 +1,7 @@ #pragma once #include -#include +#include namespace rwe { diff --git a/src/rwe/GameHash_util.h b/src/rwe/GameHash_util.h index a96bafef0..8cd7e8d8b 100644 --- a/src/rwe/GameHash_util.h +++ b/src/rwe/GameHash_util.h @@ -2,8 +2,8 @@ #include #include -#include #include +#include namespace rwe { diff --git a/src/rwe/GameHash_util.test.cpp b/src/rwe/GameHash_util.test.cpp index af2b18c98..6be4e4342 100644 --- a/src/rwe/GameHash_util.test.cpp +++ b/src/rwe/GameHash_util.test.cpp @@ -1,6 +1,6 @@ #include #include -#include +#include namespace rwe { diff --git a/src/rwe/GameNetworkService.cpp b/src/rwe/GameNetworkService.cpp index d7058dd24..92bb05f5b 100644 --- a/src/rwe/GameNetworkService.cpp +++ b/src/rwe/GameNetworkService.cpp @@ -1,12 +1,12 @@ #include "GameNetworkService.h" #include #include -#include -#include #include #include #include #include +#include +#include #include #include diff --git a/src/rwe/GameNetworkService.h b/src/rwe/GameNetworkService.h index 1286afe6c..b3b131220 100644 --- a/src/rwe/GameNetworkService.h +++ b/src/rwe/GameNetworkService.h @@ -8,13 +8,13 @@ #include #include #include -#include -#include #include #include #include #include #include +#include +#include namespace rwe { diff --git a/src/rwe/GameScene.cpp b/src/rwe/GameScene.cpp index fb1d26ad2..83d246166 100644 --- a/src/rwe/GameScene.cpp +++ b/src/rwe/GameScene.cpp @@ -5,18 +5,18 @@ #include #include #include -#include #include #include #include #include -#include #include #include #include #include #include #include +#include +#include #include namespace rwe diff --git a/src/rwe/GameScene_util.cpp b/src/rwe/GameScene_util.cpp index 6835a8ecf..03ff81872 100644 --- a/src/rwe/GameScene_util.cpp +++ b/src/rwe/GameScene_util.cpp @@ -2,7 +2,7 @@ #include #include -#include +#include namespace rwe { diff --git a/src/rwe/LoadingNetworkService.cpp b/src/rwe/LoadingNetworkService.cpp index bd9584bcf..02021fd0a 100644 --- a/src/rwe/LoadingNetworkService.cpp +++ b/src/rwe/LoadingNetworkService.cpp @@ -1,7 +1,7 @@ #include "LoadingNetworkService.h" #include -#include #include +#include #include namespace rwe diff --git a/src/rwe/LoadingScene.cpp b/src/rwe/LoadingScene.cpp index 55dd371f3..5abd973ba 100644 --- a/src/rwe/LoadingScene.cpp +++ b/src/rwe/LoadingScene.cpp @@ -2,7 +2,6 @@ #include #include #include -#include #include #include #include @@ -16,6 +15,7 @@ #include #include #include +#include namespace rwe { diff --git a/src/rwe/MainMenuScene.cpp b/src/rwe/MainMenuScene.cpp index f0a91e7ed..6ade2cd58 100644 --- a/src/rwe/MainMenuScene.cpp +++ b/src/rwe/MainMenuScene.cpp @@ -1,5 +1,4 @@ #include "MainMenuScene.h" -#include #include #include #include @@ -9,6 +8,7 @@ #include #include #include +#include namespace rwe { diff --git a/src/rwe/Particle.cpp b/src/rwe/Particle.cpp index c7c5451d6..6a50761ee 100644 --- a/src/rwe/Particle.cpp +++ b/src/rwe/Particle.cpp @@ -1,5 +1,5 @@ #include "Particle.h" -#include +#include namespace rwe { diff --git a/src/rwe/PlayerColorIndex.h b/src/rwe/PlayerColorIndex.h index 21cc23f53..974122271 100644 --- a/src/rwe/PlayerColorIndex.h +++ b/src/rwe/PlayerColorIndex.h @@ -1,6 +1,6 @@ #pragma once -#include +#include namespace rwe { diff --git a/src/rwe/RadiansAngle.h b/src/rwe/RadiansAngle.h index 1299360fd..0c7d0e8ec 100644 --- a/src/rwe/RadiansAngle.h +++ b/src/rwe/RadiansAngle.h @@ -1,6 +1,6 @@ #pragma once -#include +#include namespace rwe { diff --git a/src/rwe/SceneTime.h b/src/rwe/SceneTime.h index 621ec0a8e..42b0b694c 100644 --- a/src/rwe/SceneTime.h +++ b/src/rwe/SceneTime.h @@ -1,6 +1,6 @@ #pragma once -#include +#include namespace rwe { diff --git a/src/rwe/atlas_util.cpp b/src/rwe/atlas_util.cpp index dcc0c370e..07d8a9d0d 100644 --- a/src/rwe/atlas_util.cpp +++ b/src/rwe/atlas_util.cpp @@ -1,9 +1,9 @@ #include "atlas_util.h" #include #include -#include #include -#include +#include +#include namespace rwe { diff --git a/src/rwe/cob/CobAngle.h b/src/rwe/cob/CobAngle.h index 67abbe6cc..3ae5de75c 100644 --- a/src/rwe/cob/CobAngle.h +++ b/src/rwe/cob/CobAngle.h @@ -1,7 +1,7 @@ #pragma once -#include #include +#include namespace rwe { diff --git a/src/rwe/cob/CobAngularSpeed.h b/src/rwe/cob/CobAngularSpeed.h index c2a2274bc..3842199a9 100644 --- a/src/rwe/cob/CobAngularSpeed.h +++ b/src/rwe/cob/CobAngularSpeed.h @@ -1,8 +1,8 @@ #pragma once #include -#include #include +#include namespace rwe { diff --git a/src/rwe/cob/CobPosition.h b/src/rwe/cob/CobPosition.h index e4dacec4a..03f61ba5f 100644 --- a/src/rwe/cob/CobPosition.h +++ b/src/rwe/cob/CobPosition.h @@ -1,6 +1,6 @@ #pragma once -#include +#include namespace rwe { diff --git a/src/rwe/cob/CobSleepDuration.h b/src/rwe/cob/CobSleepDuration.h index b42c5dc9e..f76cbcd2c 100644 --- a/src/rwe/cob/CobSleepDuration.h +++ b/src/rwe/cob/CobSleepDuration.h @@ -1,6 +1,6 @@ #pragma once -#include +#include namespace rwe { diff --git a/src/rwe/cob/CobSpeed.h b/src/rwe/cob/CobSpeed.h index 0ae8b4847..3b5ab2756 100644 --- a/src/rwe/cob/CobSpeed.h +++ b/src/rwe/cob/CobSpeed.h @@ -1,6 +1,6 @@ #pragma once -#include +#include namespace rwe { diff --git a/src/rwe/cob/CobTime.h b/src/rwe/cob/CobTime.h index 4953a263c..e4c247dfa 100644 --- a/src/rwe/cob/CobTime.h +++ b/src/rwe/cob/CobTime.h @@ -1,6 +1,6 @@ #pragma once -#include +#include namespace rwe { diff --git a/src/rwe/collections/SimpleVectorMap.h b/src/rwe/collections/SimpleVectorMap.h index 899d6931b..63722e0ed 100644 --- a/src/rwe/collections/SimpleVectorMap.h +++ b/src/rwe/collections/SimpleVectorMap.h @@ -2,7 +2,7 @@ #include #include -#include +#include #include namespace rwe diff --git a/src/rwe/collections/VectorMap.h b/src/rwe/collections/VectorMap.h index b015c2b6f..08523907d 100644 --- a/src/rwe/collections/VectorMap.h +++ b/src/rwe/collections/VectorMap.h @@ -4,8 +4,8 @@ #include #include #include -#include -#include +#include +#include #include #include #include diff --git a/src/rwe/collections/VectorMap.test.cpp b/src/rwe/collections/VectorMap.test.cpp index 481f10263..a6fdf14ab 100644 --- a/src/rwe/collections/VectorMap.test.cpp +++ b/src/rwe/collections/VectorMap.test.cpp @@ -1,11 +1,11 @@ #include #include #include -#include -#include #include #include #include +#include +#include namespace rwe { diff --git a/src/rwe/dump_util.h b/src/rwe/dump_util.h index c2f6e591f..25d522da4 100644 --- a/src/rwe/dump_util.h +++ b/src/rwe/dump_util.h @@ -2,8 +2,8 @@ #include #include -#include #include +#include #include #include diff --git a/src/rwe/grid/Grid.h b/src/rwe/grid/Grid.h index 4eb9723ec..016aa76c1 100644 --- a/src/rwe/grid/Grid.h +++ b/src/rwe/grid/Grid.h @@ -4,8 +4,8 @@ #include #include #include -#include #include +#include #include #include diff --git a/src/rwe/io/fbi/FbiAnglePerTick.h b/src/rwe/io/fbi/FbiAnglePerTick.h index 255cf0efc..dd1e864fd 100644 --- a/src/rwe/io/fbi/FbiAnglePerTick.h +++ b/src/rwe/io/fbi/FbiAnglePerTick.h @@ -1,8 +1,8 @@ #pragma once #include -#include #include +#include namespace rwe { diff --git a/src/rwe/io/fbi/FbiDistancePerTick.h b/src/rwe/io/fbi/FbiDistancePerTick.h index 5723dce71..a347a19e9 100644 --- a/src/rwe/io/fbi/FbiDistancePerTick.h +++ b/src/rwe/io/fbi/FbiDistancePerTick.h @@ -1,7 +1,7 @@ #pragma once -#include #include +#include namespace rwe { diff --git a/src/rwe/io/fbi/FbiDistancePerTickSquared.h b/src/rwe/io/fbi/FbiDistancePerTickSquared.h index 19f8fa84c..046246618 100644 --- a/src/rwe/io/fbi/FbiDistancePerTickSquared.h +++ b/src/rwe/io/fbi/FbiDistancePerTickSquared.h @@ -1,6 +1,6 @@ #pragma once -#include +#include namespace rwe { diff --git a/src/rwe/io/fbi/io.cpp b/src/rwe/io/fbi/io.cpp index 333d3df22..11ae2bcbc 100644 --- a/src/rwe/io/fbi/io.cpp +++ b/src/rwe/io/fbi/io.cpp @@ -1,5 +1,5 @@ #include "io.h" -#include +#include namespace rwe { diff --git a/src/rwe/io/hpi/HpiArchive.cpp b/src/rwe/io/hpi/HpiArchive.cpp index dbd650981..8acb61851 100644 --- a/src/rwe/io/hpi/HpiArchive.cpp +++ b/src/rwe/io/hpi/HpiArchive.cpp @@ -4,8 +4,8 @@ #include #include #include -#include #include +#include namespace rwe { diff --git a/src/rwe/io/ota/ota.test.cpp b/src/rwe/io/ota/ota.test.cpp index 4fdf0d3f8..9c6be8dc7 100644 --- a/src/rwe/io/ota/ota.test.cpp +++ b/src/rwe/io/ota/ota.test.cpp @@ -1,8 +1,8 @@ #include -#include #include #include +#include namespace rwe { diff --git a/src/rwe/render/FrameBufferHandle.h b/src/rwe/render/FrameBufferHandle.h index e8bfb4f27..ba1a888d1 100644 --- a/src/rwe/render/FrameBufferHandle.h +++ b/src/rwe/render/FrameBufferHandle.h @@ -1,8 +1,8 @@ #pragma once #include -#include #include +#include namespace rwe { diff --git a/src/rwe/render/GlIdentifier.h b/src/rwe/render/GlIdentifier.h index 59bf30a29..c678f20f3 100644 --- a/src/rwe/render/GlIdentifier.h +++ b/src/rwe/render/GlIdentifier.h @@ -2,7 +2,7 @@ #include #include -#include +#include namespace rwe { diff --git a/src/rwe/render/RenderBufferHandle.h b/src/rwe/render/RenderBufferHandle.h index 56fff737f..590c393ee 100644 --- a/src/rwe/render/RenderBufferHandle.h +++ b/src/rwe/render/RenderBufferHandle.h @@ -1,8 +1,8 @@ #pragma once #include -#include #include +#include namespace rwe { diff --git a/src/rwe/render/ShaderHandle.h b/src/rwe/render/ShaderHandle.h index a4b8a7bff..2fab2bf8a 100644 --- a/src/rwe/render/ShaderHandle.h +++ b/src/rwe/render/ShaderHandle.h @@ -1,8 +1,8 @@ #pragma once #include -#include #include +#include namespace rwe { diff --git a/src/rwe/render/ShaderProgramHandle.h b/src/rwe/render/ShaderProgramHandle.h index 53824bbf5..86eb0ce11 100644 --- a/src/rwe/render/ShaderProgramHandle.h +++ b/src/rwe/render/ShaderProgramHandle.h @@ -1,8 +1,8 @@ #pragma once #include -#include #include +#include namespace rwe { diff --git a/src/rwe/render/TextureArrayHandle.h b/src/rwe/render/TextureArrayHandle.h index ff181d281..99080ef1c 100644 --- a/src/rwe/render/TextureArrayHandle.h +++ b/src/rwe/render/TextureArrayHandle.h @@ -1,8 +1,8 @@ #pragma once #include -#include #include +#include namespace rwe { diff --git a/src/rwe/render/TextureHandle.h b/src/rwe/render/TextureHandle.h index f2c5b556a..f74c20a00 100644 --- a/src/rwe/render/TextureHandle.h +++ b/src/rwe/render/TextureHandle.h @@ -1,8 +1,8 @@ #pragma once #include -#include #include +#include namespace rwe { diff --git a/src/rwe/render/UniformLocation.h b/src/rwe/render/UniformLocation.h index f6e991752..aa8fc4500 100644 --- a/src/rwe/render/UniformLocation.h +++ b/src/rwe/render/UniformLocation.h @@ -1,7 +1,7 @@ #pragma once #include -#include +#include namespace rwe { diff --git a/src/rwe/render/VaoHandle.h b/src/rwe/render/VaoHandle.h index 19df3d59d..f750248e0 100644 --- a/src/rwe/render/VaoHandle.h +++ b/src/rwe/render/VaoHandle.h @@ -1,8 +1,8 @@ #pragma once #include -#include #include +#include namespace rwe { diff --git a/src/rwe/render/VboHandle.h b/src/rwe/render/VboHandle.h index 153716f75..c9fc1d3ec 100644 --- a/src/rwe/render/VboHandle.h +++ b/src/rwe/render/VboHandle.h @@ -1,8 +1,8 @@ #pragma once #include -#include #include +#include namespace rwe { diff --git a/src/rwe/sim/Energy.h b/src/rwe/sim/Energy.h index 9b7f2e591..8e8096081 100644 --- a/src/rwe/sim/Energy.h +++ b/src/rwe/sim/Energy.h @@ -1,6 +1,6 @@ #pragma once -#include +#include namespace rwe { diff --git a/src/rwe/sim/FeatureDefinitionId.h b/src/rwe/sim/FeatureDefinitionId.h index b38a43440..718aabb67 100644 --- a/src/rwe/sim/FeatureDefinitionId.h +++ b/src/rwe/sim/FeatureDefinitionId.h @@ -1,6 +1,6 @@ #pragma once -#include +#include namespace rwe { diff --git a/src/rwe/sim/FeatureId.h b/src/rwe/sim/FeatureId.h index c5cbdfcb6..0c4b137ca 100644 --- a/src/rwe/sim/FeatureId.h +++ b/src/rwe/sim/FeatureId.h @@ -1,6 +1,6 @@ #pragma once -#include +#include namespace rwe { diff --git a/src/rwe/sim/GameSimulation.cpp b/src/rwe/sim/GameSimulation.cpp index a2564740e..9953e8206 100644 --- a/src/rwe/sim/GameSimulation.cpp +++ b/src/rwe/sim/GameSimulation.cpp @@ -1,14 +1,14 @@ #include "GameSimulation.h" #include -#include #include -#include #include #include #include #include #include #include +#include +#include #include #include diff --git a/src/rwe/sim/GameTime.h b/src/rwe/sim/GameTime.h index 6de5e4426..dfcce6d1a 100644 --- a/src/rwe/sim/GameTime.h +++ b/src/rwe/sim/GameTime.h @@ -1,7 +1,7 @@ #pragma once -#include #include +#include namespace rwe { diff --git a/src/rwe/sim/Metal.h b/src/rwe/sim/Metal.h index 669066508..9dc663985 100644 --- a/src/rwe/sim/Metal.h +++ b/src/rwe/sim/Metal.h @@ -1,6 +1,6 @@ #pragma once -#include +#include namespace rwe { diff --git a/src/rwe/sim/MovementClassId.h b/src/rwe/sim/MovementClassId.h index b0ead799a..d9853e897 100644 --- a/src/rwe/sim/MovementClassId.h +++ b/src/rwe/sim/MovementClassId.h @@ -1,6 +1,6 @@ #pragma once -#include +#include namespace rwe { diff --git a/src/rwe/sim/PlayerId.h b/src/rwe/sim/PlayerId.h index 44f7b28d8..37646876a 100644 --- a/src/rwe/sim/PlayerId.h +++ b/src/rwe/sim/PlayerId.h @@ -1,6 +1,6 @@ #pragma once -#include +#include namespace rwe { diff --git a/src/rwe/sim/ProjectileId.h b/src/rwe/sim/ProjectileId.h index 7251f7ee7..faa0a2686 100644 --- a/src/rwe/sim/ProjectileId.h +++ b/src/rwe/sim/ProjectileId.h @@ -1,6 +1,6 @@ #pragma once -#include +#include namespace rwe { diff --git a/src/rwe/sim/SimAngle.h b/src/rwe/sim/SimAngle.h index 6dd9b298b..55b916554 100644 --- a/src/rwe/sim/SimAngle.h +++ b/src/rwe/sim/SimAngle.h @@ -2,9 +2,9 @@ #include #include -#include #include #include +#include namespace rwe { diff --git a/src/rwe/sim/SimAngle.test.cpp b/src/rwe/sim/SimAngle.test.cpp index c544c9e11..b86cb6332 100644 --- a/src/rwe/sim/SimAngle.test.cpp +++ b/src/rwe/sim/SimAngle.test.cpp @@ -1,8 +1,8 @@ #include #include -#include #include #include +#include namespace rc { diff --git a/src/rwe/sim/SimScalar.h b/src/rwe/sim/SimScalar.h index ffcb55a40..9e0854bcc 100644 --- a/src/rwe/sim/SimScalar.h +++ b/src/rwe/sim/SimScalar.h @@ -1,6 +1,6 @@ #pragma once -#include +#include namespace rwe { diff --git a/src/rwe/sim/UnitBehaviorService.cpp b/src/rwe/sim/UnitBehaviorService.cpp index 1a90151d3..3a88762f4 100644 --- a/src/rwe/sim/UnitBehaviorService.cpp +++ b/src/rwe/sim/UnitBehaviorService.cpp @@ -1,11 +1,11 @@ #include "UnitBehaviorService.h" -#include #include -#include #include #include #include #include +#include +#include namespace rwe { diff --git a/src/rwe/sim/UnitId.h b/src/rwe/sim/UnitId.h index fea86a5ea..d1ad1505b 100644 --- a/src/rwe/sim/UnitId.h +++ b/src/rwe/sim/UnitId.h @@ -1,6 +1,6 @@ #pragma once -#include +#include namespace rwe { diff --git a/src/rwe/sim/UnitModelDefinition.cpp b/src/rwe/sim/UnitModelDefinition.cpp index afedba839..a10e08a39 100644 --- a/src/rwe/sim/UnitModelDefinition.cpp +++ b/src/rwe/sim/UnitModelDefinition.cpp @@ -1,6 +1,6 @@ #include "UnitModelDefinition.h" -#include #include +#include namespace rwe { diff --git a/src/rwe/sim/UnitState.cpp b/src/rwe/sim/UnitState.cpp index aa6b3669d..ae1d7b536 100644 --- a/src/rwe/sim/UnitState.cpp +++ b/src/rwe/sim/UnitState.cpp @@ -1,10 +1,10 @@ #include "UnitState.h" #include -#include #include #include #include #include +#include namespace rwe { diff --git a/src/rwe/ui/UiFactory.cpp b/src/rwe/ui/UiFactory.cpp index 461e825b7..00a9122b2 100644 --- a/src/rwe/ui/UiFactory.cpp +++ b/src/rwe/ui/UiFactory.cpp @@ -1,6 +1,6 @@ #include "UiFactory.h" -#include #include +#include #include #include diff --git a/src/rwe/Index.h b/src/rwe/util/Index.h similarity index 100% rename from src/rwe/Index.h rename to src/rwe/util/Index.h diff --git a/src/rwe/OpaqueField.h b/src/rwe/util/OpaqueField.h similarity index 98% rename from src/rwe/OpaqueField.h rename to src/rwe/util/OpaqueField.h index 05b75ebf5..7330e450b 100644 --- a/src/rwe/OpaqueField.h +++ b/src/rwe/util/OpaqueField.h @@ -1,6 +1,6 @@ #pragma once -#include +#include namespace rwe { diff --git a/src/rwe/OpaqueId.h b/src/rwe/util/OpaqueId.h similarity index 100% rename from src/rwe/OpaqueId.h rename to src/rwe/util/OpaqueId.h diff --git a/src/rwe/OpaqueId_io.h b/src/rwe/util/OpaqueId_io.h similarity index 92% rename from src/rwe/OpaqueId_io.h rename to src/rwe/util/OpaqueId_io.h index 19e218467..596e76899 100644 --- a/src/rwe/OpaqueId_io.h +++ b/src/rwe/util/OpaqueId_io.h @@ -1,7 +1,7 @@ #pragma once #include -#include +#include namespace rwe { diff --git a/src/rwe/OpaqueUnit.h b/src/rwe/util/OpaqueUnit.h similarity index 98% rename from src/rwe/OpaqueUnit.h rename to src/rwe/util/OpaqueUnit.h index 3301585d9..9d52e63d0 100644 --- a/src/rwe/OpaqueUnit.h +++ b/src/rwe/util/OpaqueUnit.h @@ -1,6 +1,6 @@ #pragma once -#include +#include namespace rwe { diff --git a/src/rwe/Result.h b/src/rwe/util/Result.h similarity index 100% rename from src/rwe/Result.h rename to src/rwe/util/Result.h diff --git a/src/rwe/Result.test.cpp b/src/rwe/util/Result.test.cpp similarity index 95% rename from src/rwe/Result.test.cpp rename to src/rwe/util/Result.test.cpp index 0959cc28e..1e228fa6c 100644 --- a/src/rwe/Result.test.cpp +++ b/src/rwe/util/Result.test.cpp @@ -1,5 +1,5 @@ #include -#include +#include #include diff --git a/src/rwe/SharedHandle.h b/src/rwe/util/SharedHandle.h similarity index 98% rename from src/rwe/SharedHandle.h rename to src/rwe/util/SharedHandle.h index 2459b89a7..5f1a385a3 100644 --- a/src/rwe/SharedHandle.h +++ b/src/rwe/util/SharedHandle.h @@ -1,7 +1,7 @@ #pragma once #include -#include +#include namespace rwe { diff --git a/src/rwe/UniqueHandle.h b/src/rwe/util/UniqueHandle.h similarity index 100% rename from src/rwe/UniqueHandle.h rename to src/rwe/util/UniqueHandle.h diff --git a/src/rwe/match.h b/src/rwe/util/match.h similarity index 100% rename from src/rwe/match.h rename to src/rwe/util/match.h