Merge pull request #88 from sourcehold/project/add-include-formatting

gynt · web-flow · commit c5ac9902df15 · 2026-05-25T10:12:37.000+02:00
[PROJECT] Update clang-format include formatting
diff --git a/.clang-format b/.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
 ...
diff --git a/src/OpenSHC/AI/AICState/setFoodBuyPlan.cpp b/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"
 
diff --git a/src/OpenSHC/AI/AIVState/setupAIVMetadata.cpp b/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"
 
diff --git a/src/OpenSHC/Audio/mss/SoundSystem/deactivateSoundFromMenuFuncUnk.cpp b/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 {
diff --git a/src/OpenSHC/Audio/mss/SoundSystem/endSoundStreamsUnk.cpp b/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"
 
diff --git a/src/OpenSHC/Audio/mss/SoundSystem/getAndUpdateSampleStatus.cpp b/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 {
diff --git a/src/OpenSHC/Audio/mss/SoundSystem/isSampleOrStreamPlaying.cpp b/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 {
diff --git a/src/OpenSHC/Audio/mss/SoundSystem/meth_0x424700.cpp b/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"
 
diff --git a/src/OpenSHC/Audio/mss/SoundSystem/setStreamAndSampleVolumeUnk.cpp b/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 {
diff --git a/src/OpenSHC/Audio/mss/SoundSystem/setVolumeUnk.cpp b/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 {
diff --git a/src/OpenSHC/Audio/mss/SoundSystem/setupSampleForNextSound.cpp b/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 {
diff --git a/src/OpenSHC/Random/RNG/Constructor_RNG.cpp b/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 {
diff --git a/src/OpenSHC/Random/RNG/nextRandomNumber1.cpp b/src/OpenSHC/Random/RNG/nextRandomNumber1.cpp
@@ -1,5 +1,5 @@
 
-#include "OpenSHC/Random/RNG.hpp"
+#include "../RNG.func.hpp"
 
 namespace OpenSHC {
 namespace Random {
diff --git a/src/OpenSHC/Random/RNG/nextRandomNumber2.cpp b/src/OpenSHC/Random/RNG/nextRandomNumber2.cpp
@@ -1,5 +1,5 @@
 
-#include "OpenSHC/Random/RNG.hpp"
+#include "../RNG.func.hpp"
 
 namespace OpenSHC {
 namespace Random {
diff --git a/src/OpenSHC/Random/RNG/populateRNG1040.cpp b/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 {
diff --git a/src/OpenSHC/Random/RNG/setTimeBasedSeed.cpp b/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 {
diff --git a/src/core/Resolver.cpp b/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.
diff --git a/src/precomp/FunctionResolver.h b/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>

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-#include "OpenSHC/Audio/MSS/SoundSystem.func.hpp"`
	`1`	`+#include "../SoundSystem.func.hpp"`
`2`	`2`
`3`	`3`	`namespace OpenSHC {`
`4`	`4`	`namespace Audio {`