[PROJECT] Update clang-format include formatting

.clang-format

@@ -9,4 +9,24 @@ SpaceInEmptyBraces: Never
 PointerAlignment: Left
 QualifierAlignment: Custom
 QualifierOrder: [inline, static, type, const, volatile]
+IncludeBlocks: Regroup
+IncludeCategories:
+  - Regex:           ^"\.\./.*\.hpp"$
+    Priority:        0
+    SortPriority:    0
+  - Regex:           ^"OpenSHC/.*func\.hpp"$
+    Priority:        1
+    SortPriority:    1
+  - Regex:           ^"OpenSHC/Globals/.*"$
+    Priority:        2
+    SortPriority:    3
+  - Regex:           ^"OpenSHC/.*"$
+    Priority:        1
+    SortPriority:    2
+  - Regex:           ^".*"$
+    Priority:        3
+    SortPriority:    4
+  - Regex:           .*
+    Priority:        3
+    SortPriority:    5
 ...

src/OpenSHC/AI/AICState/setFoodBuyPlan.cpp

@@ -1,6 +1,8 @@
-#include "OpenSHC/AI/AICState.hpp"
+#include "../AICState.func.hpp"
+
 #include "OpenSHC/AI/AITypeA.hpp"
 #include "OpenSHC/Game/Resources/ResourceType.hpp"
+
 #include "OpenSHC/Globals/DAT_AICState.hpp"
 #include "OpenSHC/Globals/DAT_GameState.hpp"
 

src/OpenSHC/AI/AIVState/setupAIVMetadata.cpp

@@ -1,5 +1,7 @@
+#include "../AIVState.func.hpp"
+
 #include "OpenSHC/AI/AICState.func.hpp"
-#include "OpenSHC/AI/AIVState.hpp"
+
 #include "OpenSHC/Globals/DAT_AICState.hpp"
 #include "OpenSHC/Globals/DAT_GameState.hpp"
 

src/OpenSHC/Audio/mss/SoundSystem/deactivateSoundFromMenuFuncUnk.cpp

@@ -1,4 +1,4 @@
-#include "OpenSHC/Audio/MSS/SoundSystem.func.hpp"
+#include "../SoundSystem.func.hpp"
 
 namespace OpenSHC {
 namespace Audio {

src/OpenSHC/Audio/mss/SoundSystem/endSoundStreamsUnk.cpp

@@ -1,6 +1,4 @@
-#include "OpenSHC/Audio/MSS/SoundSystem.hpp"
-
-#include "OpenSHC/Audio/MSS/SoundSystem.func.hpp"
+#include "../SoundSystem.func.hpp"
 
 #include "OpenSHC/Audio/MSS/enums/SHC_SoundStream.hpp"
 

src/OpenSHC/Audio/mss/SoundSystem/getAndUpdateSampleStatus.cpp

@@ -1,4 +1,4 @@
-#include "OpenSHC/Audio/MSS/SoundSystem.func.hpp"
+#include "../SoundSystem.func.hpp"
 
 namespace OpenSHC {
 namespace Audio {

src/OpenSHC/Audio/mss/SoundSystem/isSampleOrStreamPlaying.cpp

@@ -1,4 +1,4 @@
-#include "OpenSHC/Audio/MSS/SoundSystem.hpp"
+#include "../SoundSystem.func.hpp"
 
 namespace OpenSHC {
 namespace Audio {

src/OpenSHC/Audio/mss/SoundSystem/meth_0x424700.cpp

@@ -1,6 +1,4 @@
-#include "OpenSHC/Audio/MSS/SoundSystem.hpp"
-
-#include "OpenSHC/Audio/MSS/SoundSystem.func.hpp"
+#include "../SoundSystem.func.hpp"
 
 #include "OpenSHC/Audio/MSS/enums/SHC_SoundStream.hpp"
 

src/OpenSHC/Audio/mss/SoundSystem/setStreamAndSampleVolumeUnk.cpp

@@ -1,4 +1,4 @@
-#include "OpenSHC/Audio/mss/SoundSystem.func.hpp"
+#include "../SoundSystem.func.hpp"
 
 namespace OpenSHC {
 namespace Audio {

src/OpenSHC/Audio/mss/SoundSystem/setVolumeUnk.cpp

@@ -1,4 +1,4 @@
-#include "OpenSHC/Audio/MSS/SoundSystem.func.hpp"
+#include "../SoundSystem.func.hpp"
 
 namespace OpenSHC {
 namespace Audio {

src/OpenSHC/Audio/mss/SoundSystem/setupSampleForNextSound.cpp

@@ -1,4 +1,4 @@
-#include "OpenSHC/Audio/MSS/SoundSystem.func.hpp"
+#include "../SoundSystem.func.hpp"
 
 namespace OpenSHC {
 namespace Audio {

src/OpenSHC/Random/RNG/Constructor_RNG.cpp

@@ -1,5 +1,4 @@
-#include "OpenSHC/Random/RNG.func.hpp"
-#include "OpenSHC/Random/RNG.hpp"
+#include "../RNG.func.hpp"
 
 namespace OpenSHC {
 namespace Random {

src/OpenSHC/Random/RNG/nextRandomNumber1.cpp

@@ -1,5 +1,5 @@
 
-#include "OpenSHC/Random/RNG.hpp"
+#include "../RNG.func.hpp"
 
 namespace OpenSHC {
 namespace Random {

src/OpenSHC/Random/RNG/nextRandomNumber2.cpp

@@ -1,5 +1,5 @@
 
-#include "OpenSHC/Random/RNG.hpp"
+#include "../RNG.func.hpp"
 
 namespace OpenSHC {
 namespace Random {

src/OpenSHC/Random/RNG/populateRNG1040.cpp

@@ -1,7 +1,7 @@
+#include "../RNG.func.hpp"
+
 #include "OpenSHC/Global.func.hpp"
 #include "OpenSHC/OS.func.hpp"
-#include "OpenSHC/Random/RNG.func.hpp"
-#include "OpenSHC/Random/RNG.hpp"
 
 namespace OpenSHC {
 namespace Random {

src/OpenSHC/Random/RNG/setTimeBasedSeed.cpp

@@ -1,6 +1,7 @@
+#include "../RNG.func.hpp"
+
 #include "OpenSHC/OS.func.hpp"
-#include "OpenSHC/Random/RNG.func.hpp"
-#include "OpenSHC/Random/RNG.hpp"
+
 #include <time.h>
 
 namespace OpenSHC {

src/core/Resolver.cpp

@@ -1,6 +1,5 @@
 
 #include "ucp3.h"
-
 #include <sstream>
 
 // TODO?: When in doubt regarding the transition to full exe: Add other logging system.

src/precomp/FunctionResolver.h

@@ -8,9 +8,7 @@
 // TODO: Maybe change naming convention to not run into these issues
 
 #include "TypeUtility.h"
-
 #include "ucp3.h"
-
 #include <ios>
 #include <iostream>
 #include <sstream>