Move entity-related classes to Entity directory

danielkrupinski · Nov 26, 2024 · cb9ca5e · cb9ca5e
1 parent 815aa4f
commit cb9ca5e
Show file tree

Hide file tree

Showing 20 changed files with 72 additions and 70 deletions.
diff --git a/Source/GameClasses/BaseEntity.h → Source/Entities/BaseEntity.h b/Source/GameClasses/BaseEntity.h → Source/Entities/BaseEntity.h
@@ -4,7 +4,7 @@
 #include <CS2/Constants/SceneObjectAttributeNames.h>
 #include <OutlineGlow/GlowSceneObjects.h>
 
-#include "GameSceneNode.h"
+#include <GameClasses/GameSceneNode.h>
 #include "RenderComponent.h"
 
 template <typename HookContext>

diff --git a/Source/GameClasses/BaseModelEntity.h → Source/Entities/BaseModelEntity.h b/Source/GameClasses/BaseModelEntity.h → Source/Entities/BaseModelEntity.h
diff --git a/Source/GameClasses/BaseWeapon.h → Source/Entities/BaseWeapon.h b/Source/GameClasses/BaseWeapon.h → Source/Entities/BaseWeapon.h
diff --git a/Source/GameClasses/C4.h → Source/Entities/C4.h b/Source/GameClasses/C4.h → Source/Entities/C4.h
diff --git a/Source/GameClasses/GameRules.h → Source/Entities/GameRules.h b/Source/GameClasses/GameRules.h → Source/Entities/GameRules.h
diff --git a/Source/GameClasses/GlowProperty.h → Source/Entities/GlowProperty.h b/Source/GameClasses/GlowProperty.h → Source/Entities/GlowProperty.h
diff --git a/Source/GameClasses/HostageServices.h → Source/Entities/HostageServices.h b/Source/GameClasses/HostageServices.h → Source/Entities/HostageServices.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <CS2/Classes/CCSPlayer_HostageServices.h>
-#include "EntitySystem.h"
+#include <GameClasses/EntitySystem.h>
 
 template <typename HookContext>
 class HostageServices {

diff --git a/Source/GameClasses/PlantedC4.h → Source/Entities/PlantedC4.h b/Source/GameClasses/PlantedC4.h → Source/Entities/PlantedC4.h
diff --git a/Source/GameClasses/PlayerController.h → Source/Entities/PlayerController.h b/Source/GameClasses/PlayerController.h → Source/Entities/PlayerController.h
@@ -2,8 +2,8 @@
 
 #include <CS2/Classes/Entities/CCSPlayerController.h>
 #include <FeatureHelpers/TeamNumber.h>
+#include <GameClasses/EntitySystem.h>
 #include "PlayerPawn.h"
-#include "EntitySystem.h"
 
 template <typename HookContext>
 class PlayerController {

diff --git a/Source/GameClasses/PlayerPawn.h → Source/Entities/PlayerPawn.h b/Source/GameClasses/PlayerPawn.h → Source/Entities/PlayerPawn.h
@@ -6,12 +6,12 @@
 #include <CS2/Constants/EntityHandle.h>
 #include <FeatureHelpers/LifeState.h>
 #include <FeatureHelpers/TeamNumber.h>
+#include <GameClasses/GameSceneNode.h>
 #include <Utils/ColorUtils.h>
 
 #include "BaseEntity.h"
 #include "BaseModelEntity.h"
 #include "C4.h"
-#include "GameSceneNode.h"
 #include "HostageServices.h"
 #include "PlayerWeapons.h"
 #include "WeaponServices.h"

diff --git a/Source/GameClasses/PlayerWeapons.h → Source/Entities/PlayerWeapons.h b/Source/GameClasses/PlayerWeapons.h → Source/Entities/PlayerWeapons.h
@@ -2,9 +2,9 @@
 
 #include <CS2/Classes/CUtlVector.h>
 #include <CS2/Classes/EntitySystem/CEntityHandle.h>
+#include <GameClasses/EntitySystem.h>
 
 #include "BaseEntity.h"
-#include "EntitySystem.h"
 
 class EntityFromHandleFinder;
 

diff --git a/Source/GameClasses/RenderComponent.h → Source/Entities/RenderComponent.h b/Source/GameClasses/RenderComponent.h → Source/Entities/RenderComponent.h
@@ -1,8 +1,7 @@
 #pragma once
 
 #include <CS2/Classes/CRenderComponent.h>
-
-#include "SceneObjectUpdaters.h"
+#include <GameClasses/SceneObjectUpdaters.h>
 
 template <typename HookContext>
 class RenderComponent {

diff --git a/Source/GameClasses/SmokeGrenadeProjectile.h → Source/Entities/SmokeGrenadeProjectile.h b/Source/GameClasses/SmokeGrenadeProjectile.h → Source/Entities/SmokeGrenadeProjectile.h
diff --git a/Source/GameClasses/WeaponServices.h → Source/Entities/WeaponServices.h b/Source/GameClasses/WeaponServices.h → Source/Entities/WeaponServices.h
diff --git a/.../Visuals/OutlineGlow/GrenadeProjectileOutlineGlow/GrenadeProjectileOutlineGlowCondition.h b/.../Visuals/OutlineGlow/GrenadeProjectileOutlineGlow/GrenadeProjectileOutlineGlowCondition.h
@@ -2,8 +2,8 @@
 
 #include <utility>
 
+#include <Entities/SmokeGrenadeProjectile.h>
 #include <FeatureHelpers/EntityClassifier.h>
-#include <GameClasses/SmokeGrenadeProjectile.h>
 
 template <typename Context>
 class GrenadeProjectileOutlineGlowCondition {

diff --git a/Source/Features/Visuals/OutlineGlow/OutlineGlowContext.h b/Source/Features/Visuals/OutlineGlow/OutlineGlowContext.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include <GameClasses/PlayerPawn.h>
-#include <GameClasses/PlantedC4.h>
+#include <Entities/PlayerPawn.h>
+#include <Entities/PlantedC4.h>
 #include <OutlineGlow/GlowSceneObjects.h>
 
 #include "DefuseKitOutlineGlow/DefuseKitOutlineGlow.h"

diff --git a/Source/Features/Visuals/PlayerInfoInWorld/PlayerInfoInWorld.h b/Source/Features/Visuals/PlayerInfoInWorld/PlayerInfoInWorld.h
@@ -5,14 +5,14 @@
 #include <CS2/Classes/Entities/C_CSPlayerPawn.h>
 #include <CS2/Classes/Entities/CCSPlayerController.h>
 #include <CS2/Constants/ColorConstants.h>
+#include <Entities/PlayerPawn.h>
 #include <FeatureHelpers/HudInWorldPanels.h>
 #include <FeatureHelpers/LifeState.h>
 #include <FeatureHelpers/PanoramaTransformations.h>
 #include <FeatureHelpers/FeatureToggle.h>
 #include <FeatureHelpers/TeamNumber.h>
 #include <GameClasses/PanoramaLabel.h>
 #include <GameClasses/PanoramaImagePanel.h>
-#include <GameClasses/PlayerPawn.h>
 #include <Hooks/ViewRenderHook.h>
 #include <Utils/ColorUtils.h>
 #include <Utils/CString.h>

diff --git a/Source/HookDependencies/HookDependencies.h b/Source/HookDependencies/HookDependencies.h
@@ -2,15 +2,15 @@
 
 #include "HookDependenciesBuilder.h"
 #include "HookDependenciesMask.h"
+#include <Entities/GameRules.h>
+#include <Entities/PlantedC4.h>
+#include <Entities/PlayerController.h>
 #include <FeatureHelpers/ConVarAccessor.h>
 #include <GameClasses/FileSystem.h>
 #include <GameClasses/Hud/Hud.h>
 #include <GameClasses/Hud/HudContext.h>
 #include <GameClasses/PanelFactory.h>
-#include <GameClasses/PlantedC4.h>
-#include <GameClasses/PlayerController.h>
 #include <GameClasses/GlobalVars.h>
-#include <GameClasses/GameRules.h>
 #include <Helpers/PanoramaTransformFactory.h>
 
 struct BombStatusPanelState;

diff --git a/Source/Osiris.vcxproj b/Source/Osiris.vcxproj
@@ -89,6 +89,20 @@
     <ClInclude Include="CS2\Panorama\StyleProperties.h" />
     <ClInclude Include="CS2\Panorama\Transform3D.h" />
     <ClInclude Include="Endpoints.h" />
+    <ClInclude Include="Entities\BaseEntity.h" />
+    <ClInclude Include="Entities\BaseModelEntity.h" />
+    <ClInclude Include="Entities\BaseWeapon.h" />
+    <ClInclude Include="Entities\C4.h" />
+    <ClInclude Include="Entities\GameRules.h" />
+    <ClInclude Include="Entities\GlowProperty.h" />
+    <ClInclude Include="Entities\HostageServices.h" />
+    <ClInclude Include="Entities\PlantedC4.h" />
+    <ClInclude Include="Entities\PlayerController.h" />
+    <ClInclude Include="Entities\PlayerPawn.h" />
+    <ClInclude Include="Entities\PlayerWeapons.h" />
+    <ClInclude Include="Entities\RenderComponent.h" />
+    <ClInclude Include="Entities\SmokeGrenadeProjectile.h" />
+    <ClInclude Include="Entities\WeaponServices.h" />
     <ClInclude Include="FeatureHelpers\ClipSpaceCoordinates.h" />
     <ClInclude Include="FeatureHelpers\ConVarAccessor.h" />
     <ClInclude Include="FeatureHelpers\ConVarFinder.h" />
@@ -252,20 +266,12 @@
     <ClInclude Include="Features\Visuals\VisualFeatures.h" />
     <ClInclude Include="Features\Visuals\VisualFeaturesStates.h" />
     <ClInclude Include="FileUtils\FileSlice.h" />
-    <ClInclude Include="GameClasses\BaseEntity.h" />
-    <ClInclude Include="GameClasses\BaseModelEntity.h" />
-    <ClInclude Include="GameClasses\BaseWeapon.h" />
-    <ClInclude Include="GameClasses\C4.h" />
     <ClInclude Include="GameClasses\ClientPanel.h" />
     <ClInclude Include="GameClasses\EntitySystem.h" />
     <ClInclude Include="GameClasses\GameSceneNode.h" />
-    <ClInclude Include="GameClasses\GlowProperty.h" />
-    <ClInclude Include="GameClasses\HostageServices.h" />
     <ClInclude Include="GameClasses\Hud\HudContext.h" />
-    <ClInclude Include="GameClasses\PlayerController.h" />
     <ClInclude Include="GameClasses\FileNameSymbolTable.h" />
     <ClInclude Include="GameClasses\FileSystem.h" />
-    <ClInclude Include="GameClasses\GameRules.h" />
     <ClInclude Include="GameClasses\GlobalVars.h" />
     <ClInclude Include="GameClasses\Hud\DeathNotice.h" />
     <ClInclude Include="GameClasses\Hud\DeathNoticeContext.h" />
@@ -287,17 +293,11 @@
     <ClInclude Include="GameClasses\PanoramaUiPanelContext.h" />
     <ClInclude Include="GameClasses\PanoramaUiPanelIterator.h" />
     <ClInclude Include="GameClasses\PanoramaUiPanelMethodInvoker.h" />
-    <ClInclude Include="GameClasses\PlantedC4.h" />
-    <ClInclude Include="GameClasses\PlayerPawn.h" />
-    <ClInclude Include="GameClasses\PlayerWeapons.h" />
-    <ClInclude Include="GameClasses\RenderComponent.h" />
     <ClInclude Include="GameClasses\SceneObject.h" />
     <ClInclude Include="GameClasses\SceneObjectUpdater.h" />
     <ClInclude Include="GameClasses\SceneObjectUpdaters.h" />
     <ClInclude Include="GameClasses\SceneSystem.h" />
-    <ClInclude Include="GameClasses\SmokeGrenadeProjectile.h" />
     <ClInclude Include="GameClasses\TopLevelWindow.h" />
-    <ClInclude Include="GameClasses\WeaponServices.h" />
     <ClInclude Include="GameDependencies\ConVars.h" />
     <ClInclude Include="GameDependencies\ConVarsBase.h" />
     <ClInclude Include="GameDependencies\EntitiesVMTs.h" />

diff --git a/Source/Osiris.vcxproj.filters b/Source/Osiris.vcxproj.filters
@@ -196,6 +196,9 @@
     <Filter Include="Features\Visuals\ModelGlow">
       <UniqueIdentifier>{47384024-831e-4229-8068-9acea325ff0f}</UniqueIdentifier>
     </Filter>
+    <Filter Include="Entities">
+      <UniqueIdentifier>{86690f48-0082-46a5-82f7-9fcc1ea24af0}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="CS2\Classes\C_CSGameRules.h">
@@ -252,9 +255,6 @@
     <ClInclude Include="GameClasses\PanoramaUiPanel.h">
       <Filter>GameClasses</Filter>
     </ClInclude>
-    <ClInclude Include="GameClasses\PlantedC4.h">
-      <Filter>GameClasses</Filter>
-    </ClInclude>
     <ClInclude Include="Helpers\Bits.h">
       <Filter>Helpers</Filter>
     </ClInclude>
@@ -992,9 +992,6 @@
     <ClInclude Include="Features\Hud\HudFeaturesStates.h">
       <Filter>Features\Hud</Filter>
     </ClInclude>
-    <ClInclude Include="GameClasses\GameRules.h">
-      <Filter>GameClasses</Filter>
-    </ClInclude>
     <ClInclude Include="GameClasses\GlobalVars.h">
       <Filter>GameClasses</Filter>
     </ClInclude>
@@ -1058,9 +1055,6 @@
     <ClInclude Include="GameClasses\PanelMarginParams.h">
       <Filter>GameClasses</Filter>
     </ClInclude>
-    <ClInclude Include="GameClasses\PlayerController.h">
-      <Filter>GameClasses</Filter>
-    </ClInclude>
     <ClInclude Include="GameClasses\Hud\HudContext.h">
       <Filter>GameClasses\Hud</Filter>
     </ClInclude>
@@ -1163,9 +1157,6 @@
     <ClInclude Include="UI\Panorama\PanoramaGuiUnloadHandler.h">
       <Filter>UI\Panorama</Filter>
     </ClInclude>
-    <ClInclude Include="GameClasses\PlayerPawn.h">
-      <Filter>GameClasses</Filter>
-    </ClInclude>
     <ClInclude Include="OutlineGlow\GlowSceneObject.h">
       <Filter>OutlineGlow</Filter>
     </ClInclude>
@@ -1181,9 +1172,6 @@
     <ClInclude Include="GameClasses\SceneSystem.h">
       <Filter>GameClasses</Filter>
     </ClInclude>
-    <ClInclude Include="GameClasses\RenderComponent.h">
-      <Filter>GameClasses</Filter>
-    </ClInclude>
     <ClInclude Include="MemoryPatterns\Windows\RenderComponentPatternsWindows.h">
       <Filter>MemoryPatterns\Windows</Filter>
     </ClInclude>
@@ -1202,9 +1190,6 @@
     <ClInclude Include="CS2\Classes\SceneObjectUpdaterHandle_t.h">
       <Filter>CS2\Classes</Filter>
     </ClInclude>
-    <ClInclude Include="GameClasses\BaseEntity.h">
-      <Filter>GameClasses</Filter>
-    </ClInclude>
     <ClInclude Include="GameClasses\SceneObjectUpdater.h">
       <Filter>GameClasses</Filter>
     </ClInclude>
@@ -1226,9 +1211,6 @@
     <ClInclude Include="OutlineGlow\GlowSceneObjectContext.h">
       <Filter>OutlineGlow</Filter>
     </ClInclude>
-    <ClInclude Include="GameClasses\PlayerWeapons.h">
-      <Filter>GameClasses</Filter>
-    </ClInclude>
     <ClInclude Include="Utils\Optional.h">
       <Filter>Utils</Filter>
     </ClInclude>
@@ -1340,9 +1322,6 @@
     <ClInclude Include="MemoryPatterns\Windows\SmokeGrenadeProjectilePatternsWindows.h">
       <Filter>MemoryPatterns\Windows</Filter>
     </ClInclude>
-    <ClInclude Include="GameClasses\SmokeGrenadeProjectile.h">
-      <Filter>GameClasses</Filter>
-    </ClInclude>
     <ClInclude Include="Features\Visuals\OutlineGlow\GrenadeProjectileOutlineGlow\GrenadeProjectileOutlineGlowCondition.h">
       <Filter>Features\Visuals\OutlineGlow\GrenadeProjectileOutlineGlow</Filter>
     </ClInclude>
@@ -1376,12 +1355,6 @@
     <ClInclude Include="CS2\Constants\StylePropertyTypeNames.h">
       <Filter>CS2\Constants</Filter>
     </ClInclude>
-    <ClInclude Include="GameClasses\WeaponServices.h">
-      <Filter>GameClasses</Filter>
-    </ClInclude>
-    <ClInclude Include="GameClasses\BaseWeapon.h">
-      <Filter>GameClasses</Filter>
-    </ClInclude>
     <ClInclude Include="Features\Visuals\OutlineGlow\TickingBombOutlineGlow\TickingBombOutlineGlow.h">
       <Filter>Features\Visuals\OutlineGlow\TickingBombOutlineGlow</Filter>
     </ClInclude>
@@ -1484,12 +1457,6 @@
     <ClInclude Include="Features\Visuals\PlayerInfoInWorld\PlayerInfoPanelTypes.h">
       <Filter>Features\Visuals\PlayerInfoInWorld</Filter>
     </ClInclude>
-    <ClInclude Include="GameClasses\HostageServices.h">
-      <Filter>GameClasses</Filter>
-    </ClInclude>
-    <ClInclude Include="GameClasses\C4.h">
-      <Filter>GameClasses</Filter>
-    </ClInclude>
     <ClInclude Include="MemoryPatterns\PatternTypes\ClientPatternTypes.h">
       <Filter>MemoryPatterns\PatternTypes</Filter>
     </ClInclude>
@@ -1640,12 +1607,6 @@
     <ClInclude Include="MemoryPatterns\PatternTypes\GlowPropertyPatternTypes.h">
       <Filter>MemoryPatterns\PatternTypes</Filter>
     </ClInclude>
-    <ClInclude Include="GameClasses\BaseModelEntity.h">
-      <Filter>GameClasses</Filter>
-    </ClInclude>
-    <ClInclude Include="GameClasses\GlowProperty.h">
-      <Filter>GameClasses</Filter>
-    </ClInclude>
     <ClInclude Include="Features\Visuals\PlayerInfoInWorld\PlayerWeaponIcon\ActiveWeaponIcon\ActiveWeaponIconPanelParams.h">
       <Filter>Features\Visuals\PlayerInfoInWorld\PlayerWeaponIcon\ActiveWeaponIcon</Filter>
     </ClInclude>
@@ -1685,6 +1646,48 @@
     <ClInclude Include="Features\Visuals\ModelGlow\ModelGlowToggle.h">
       <Filter>Features\Visuals\ModelGlow</Filter>
     </ClInclude>
+    <ClInclude Include="Entities\BaseEntity.h">
+      <Filter>Entities</Filter>
+    </ClInclude>
+    <ClInclude Include="Entities\BaseModelEntity.h">
+      <Filter>Entities</Filter>
+    </ClInclude>
+    <ClInclude Include="Entities\BaseWeapon.h">
+      <Filter>Entities</Filter>
+    </ClInclude>
+    <ClInclude Include="Entities\C4.h">
+      <Filter>Entities</Filter>
+    </ClInclude>
+    <ClInclude Include="Entities\GameRules.h">
+      <Filter>Entities</Filter>
+    </ClInclude>
+    <ClInclude Include="Entities\GlowProperty.h">
+      <Filter>Entities</Filter>
+    </ClInclude>
+    <ClInclude Include="Entities\HostageServices.h">
+      <Filter>Entities</Filter>
+    </ClInclude>
+    <ClInclude Include="Entities\PlantedC4.h">
+      <Filter>Entities</Filter>
+    </ClInclude>
+    <ClInclude Include="Entities\PlayerController.h">
+      <Filter>Entities</Filter>
+    </ClInclude>
+    <ClInclude Include="Entities\PlayerPawn.h">
+      <Filter>Entities</Filter>
+    </ClInclude>
+    <ClInclude Include="Entities\PlayerWeapons.h">
+      <Filter>Entities</Filter>
+    </ClInclude>
+    <ClInclude Include="Entities\RenderComponent.h">
+      <Filter>Entities</Filter>
+    </ClInclude>
+    <ClInclude Include="Entities\SmokeGrenadeProjectile.h">
+      <Filter>Entities</Filter>
+    </ClInclude>
+    <ClInclude Include="Entities\WeaponServices.h">
+      <Filter>Entities</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <None Include="UI\Panorama\CreateGUI.js">