Make methods of pattern classes non-static

danielkrupinski · Dec 22, 2023 · ffaaa8b · ffaaa8b
1 parent bfea58c
commit ffaaa8b
Show file tree

Hide file tree

Showing 71 changed files with 383 additions and 210 deletions.
diff --git a/Source/FeatureHelpers/FeatureHelpers.h b/Source/FeatureHelpers/FeatureHelpers.h
@@ -16,8 +16,16 @@
 #include "WorldToClipSpaceConverter.h"
 
 struct FeatureHelpers {
-    explicit FeatureHelpers(const VmtFinder& panoramaVmtFinder) noexcept
-        : stylePropertiesVMTs{panoramaVmtFinder}
+    explicit FeatureHelpers(const ClientPatterns& clientPatterns, const PanelStylePatterns& panelStylePatterns, const VmtFinder& panoramaVmtFinder) noexcept
+        : hudProvider{clientPatterns}
+        , globalVarsProvider{clientPatterns}
+        , transformFactory{clientPatterns}
+        , worldtoClipSpaceConverter{clientPatterns}
+        , plantedC4Provider{clientPatterns}
+        , viewToProjectionMatrix{clientPatterns}
+        , sniperScopeBlurRemover{clientPatterns}
+        , stylePropertiesVMTs{panoramaVmtFinder}
+        , stylePropertiesSymbols{StylePropertySymbolMap{panelStylePatterns.stylePropertiesSymbols()}}
     {
     }
 
@@ -50,5 +58,5 @@ struct FeatureHelpers {
     ViewToProjectionMatrix viewToProjectionMatrix;
     SniperScopeBlurRemover sniperScopeBlurRemover;
     StylePropertiesVMTs stylePropertiesVMTs;
-    StylePropertiesSymbols stylePropertiesSymbols{StylePropertySymbolMap{PanelStylePatterns::stylePropertiesSymbols()}};
+    StylePropertiesSymbols stylePropertiesSymbols;
 };
diff --git a/Source/FeatureHelpers/GlobalVarsProvider.h b/Source/FeatureHelpers/GlobalVarsProvider.h
@@ -6,6 +6,11 @@
 #include <MemoryPatterns/ClientPatterns.h>
 
 struct GlobalVarsProvider {
+    explicit GlobalVarsProvider(const ClientPatterns& clientPatterns) noexcept
+        : globalVars{clientPatterns.globalVars()}
+    {
+    }
+
     [[nodiscard]] explicit operator bool() const noexcept
     {
         return globalVars != nullptr;
@@ -18,5 +23,5 @@ struct GlobalVarsProvider {
     }
 
 private:
-    cs2::GlobalVars** globalVars{ ClientPatterns::globalVars() };
-};
+    cs2::GlobalVars** globalVars;
+};
diff --git a/Source/FeatureHelpers/Sound/SoundWatcherImpl.h b/Source/FeatureHelpers/Sound/SoundWatcherImpl.h
@@ -25,6 +25,12 @@
 template <typename... Sounds>
 class SoundWatcherImpl {
 public:
+    explicit SoundWatcherImpl(const FileSystemPatterns& fileSystemPatterns, const SoundSystemPatterns& soundSystemPatterns) noexcept
+        : soundChannels{soundSystemPatterns.soundChannels()}
+        , fileSystem{fileSystemPatterns.fileSystem()}
+    {
+    }
+
     template <typename Sound>
     void startWatching() noexcept
     {
@@ -140,8 +146,8 @@ class SoundWatcherImpl {
         return utils::typeIndex<Sound, std::tuple<Sounds...>>();
     }
 
-    cs2::SoundChannels** soundChannels{ SoundSystemPatterns::soundChannels() };
-    cs2::CBaseFileSystem** fileSystem{ FileSystemPatterns::fileSystem() };
+    cs2::SoundChannels** soundChannels;
+    cs2::CBaseFileSystem** fileSystem;
 
     TypeBitFlags<Sounds...> soundsToWatch;
     std::array<WatchedSounds, sizeof...(Sounds)> watchedSounds;

diff --git a/Source/FeatureHelpers/ViewToProjectionMatrix.h b/Source/FeatureHelpers/ViewToProjectionMatrix.h
@@ -5,6 +5,11 @@
 #include <MemoryPatterns/ClientPatterns.h>
 
 struct ViewToProjectionMatrix {
+    explicit ViewToProjectionMatrix(const ClientPatterns& clientPatterns) noexcept
+        : viewToProjectionMatrix{clientPatterns.viewToProjectionMatrix()}
+    {
+    }
+
     [[nodiscard]] float getFovScale() const noexcept
     {
         if (viewToProjectionMatrix)
@@ -13,5 +18,5 @@ struct ViewToProjectionMatrix {
     }
 
 private:
-    const cs2::VMatrix* viewToProjectionMatrix{ClientPatterns::viewToProjectionMatrix()};
+    const cs2::VMatrix* viewToProjectionMatrix;
 };
diff --git a/Source/FeatureHelpers/Visuals/SniperScopeBlurRemover.h b/Source/FeatureHelpers/Visuals/SniperScopeBlurRemover.h
@@ -11,6 +11,12 @@
 
 class SniperScopeBlurRemover {
 public:
+    explicit SniperScopeBlurRemover(const ClientPatterns& clientPatterns) noexcept
+        : getWorldSessionInClientMode{clientPatterns.getWorldSessionInClientMode()}
+        , clientMode{clientPatterns.clientMode()}
+    {
+    }
+
     void incrementReferenceCount(LoopModeGameHook& loopModeGameHook) noexcept
     {
         assert(referenceCount < (std::numeric_limits<std::size_t>::max)());
@@ -42,7 +48,7 @@ class SniperScopeBlurRemover {
         return referenceCount > 0;
     }
 
-    ReturnAddress getWorldSessionInClientMode{ClientPatterns::getWorldSessionInClientMode()};
-    ClientMode clientMode{ClientPatterns::clientMode()};
+    ReturnAddress getWorldSessionInClientMode;
+    ClientMode clientMode;
     std::size_t referenceCount{0};
 };
diff --git a/Source/FeatureHelpers/WorldToClipSpaceConverter.h b/Source/FeatureHelpers/WorldToClipSpaceConverter.h
@@ -8,6 +8,11 @@
 #include <MemoryPatterns/ClientPatterns.h>
 
 struct WorldToClipSpaceConverter {
+    explicit WorldToClipSpaceConverter(const ClientPatterns& clientPatterns) noexcept
+        : worldToProjectionMatrix{clientPatterns.worldToProjectionMatrix()}
+    {
+    }
+
     [[nodiscard]] explicit operator bool() const noexcept
     {
         return worldToProjectionMatrix != nullptr;
@@ -27,5 +32,5 @@ struct WorldToClipSpaceConverter {
     }
 
 private:
-    const cs2::VMatrix* worldToProjectionMatrix{ ClientPatterns::worldToProjectionMatrix() };
+    const cs2::VMatrix* worldToProjectionMatrix;
 };
diff --git a/Source/Features/Features.h b/Source/Features/Features.h
@@ -9,9 +9,10 @@
 class SniperScopeBlurRemover;
 
 struct Features {
-    Features(SniperScopeBlurRemover& sniperScopeBlurRemover, LoopModeGameHook& loopModeGameHook, ViewRenderHook& viewRenderHook, SoundWatcher& soundWatcher) noexcept
-        : visuals{sniperScopeBlurRemover, loopModeGameHook }
-        , soundFeatures{ viewRenderHook, soundWatcher }
+    Features(const ClientPatterns& clientPatterns, SniperScopeBlurRemover& sniperScopeBlurRemover, LoopModeGameHook& loopModeGameHook, ViewRenderHook& viewRenderHook, SoundWatcher& soundWatcher) noexcept
+        : hudFeatures{clientPatterns}
+        , visuals{clientPatterns, sniperScopeBlurRemover, loopModeGameHook}
+        , soundFeatures{viewRenderHook, soundWatcher}
     {
     }
 

diff --git a/Source/Features/Hud/HudFeatures.h b/Source/Features/Hud/HudFeatures.h
@@ -5,6 +5,11 @@
 #include "KillfeedPreserver.h"
 
 struct HudFeatures {
+    explicit HudFeatures(const ClientPatterns& clientPatterns) noexcept
+        : killfeedPreserver{clientPatterns}
+    {
+    }
+
     BombTimer bombTimer;
     DefusingAlert defusingAlert;
     KillfeedPreserver killfeedPreserver;

diff --git a/Source/Features/Hud/KillfeedPreserver.h b/Source/Features/Hud/KillfeedPreserver.h
@@ -12,6 +12,11 @@
 
 class KillfeedPreserver : public TogglableFeature<KillfeedPreserver> {
 public:
+    explicit KillfeedPreserver(const ClientPatterns& clientPatterns) noexcept
+        : gameRules{clientPatterns.gameRules()}
+    {
+    }
+
     void run(const KillfeedPreserverHelpers& params) noexcept
     {
         if (!isEnabled())
@@ -80,7 +85,7 @@ class KillfeedPreserver : public TogglableFeature<KillfeedPreserver> {
 
     friend TogglableFeature;
 
-    cs2::C_CSGameRules** gameRules{ ClientPatterns::gameRules() };
+    cs2::C_CSGameRules** gameRules;
 
     cs2::CPanoramaSymbol deathNoticeKillerSymbol{ -1 };
     cs2::CPanoramaSymbol spawnTimeSymbol{ -1 };

diff --git a/Source/Features/Visuals/ScopeOverlayRemover/HudScopePanels.h b/Source/Features/Visuals/ScopeOverlayRemover/HudScopePanels.h
@@ -5,6 +5,11 @@
 #include <Helpers/PanoramaPanelPointer.h>
 
 struct HudScopePanels {
+    explicit HudScopePanels(const ClientPatterns& clientPatterns) noexcept
+        : mainMenu{clientPatterns.mainMenuPanel()->uiPanel}
+    {
+    }
+
     void updatePanelPointers(HudProvider hudProvider) noexcept
     {
         if (!shouldUpdatePanelPointers())
@@ -38,7 +43,7 @@ struct HudScopePanels {
         return mainMenu.findChildInLayoutFile(cs2::HudScope);
     }
 
-    PanoramaUiPanel mainMenu{ ClientPatterns::mainMenuPanel()->uiPanel };
+    PanoramaUiPanel mainMenu;
     PanoramaPanelPointer scopeCirclePointer;
     PanoramaPanelPointer scopeDustPointer;
 };
diff --git a/Source/Features/Visuals/ScopeOverlayRemover/ScopeOverlayRemover.h b/Source/Features/Visuals/ScopeOverlayRemover/ScopeOverlayRemover.h
@@ -15,9 +15,11 @@
 
 class ScopeOverlayRemover : public TogglableFeature<ScopeOverlayRemover> {
 public:
-    ScopeOverlayRemover(LoopModeGameHook& loopModeGameHook, SniperScopeBlurRemover& sniperScopeBlurRemover) noexcept
-        : loopModeGameHook{loopModeGameHook}
+    ScopeOverlayRemover(const ClientPatterns& clientPatterns, LoopModeGameHook& loopModeGameHook, SniperScopeBlurRemover& sniperScopeBlurRemover) noexcept
+        : hudScope{clientPatterns.hudScope()}
+        , loopModeGameHook{loopModeGameHook}
         , sniperScopeBlurRemover{sniperScopeBlurRemover}
+        , hudScopePanels{clientPatterns}
     {
     }
 
@@ -65,7 +67,7 @@ class ScopeOverlayRemover : public TogglableFeature<ScopeOverlayRemover> {
         hudScopePanels.setPanelsVisible(true);
     }
 
-    cs2::CPanel2D** hudScope{ ClientPatterns::hudScope() };
+    cs2::CPanel2D** hudScope;
     LoopModeGameHook& loopModeGameHook;
     SniperScopeBlurRemover& sniperScopeBlurRemover;
     HudScopePanels hudScopePanels;

diff --git a/Source/Features/Visuals/VisualFeatures.h b/Source/Features/Visuals/VisualFeatures.h
@@ -7,8 +7,8 @@ class LoopModeGameHook;
 class SniperScopeBlurRemover;
 
 struct VisualFeatures {
-    VisualFeatures(SniperScopeBlurRemover& sniperScopeBlurRemover, LoopModeGameHook& loopModeGameHook) noexcept
-        : scopeOverlayRemover{loopModeGameHook, sniperScopeBlurRemover}
+    VisualFeatures(const ClientPatterns& clientPatterns, SniperScopeBlurRemover& sniperScopeBlurRemover, LoopModeGameHook& loopModeGameHook) noexcept
+        : scopeOverlayRemover{clientPatterns, loopModeGameHook, sniperScopeBlurRemover}
         , sniperScopeBlurRemoval{loopModeGameHook, sniperScopeBlurRemover}
     {
     }

diff --git a/Source/GameClasses/Implementation/ClientModeImpl.h b/Source/GameClasses/Implementation/ClientModeImpl.h
@@ -4,8 +4,14 @@
 #include <MemoryPatterns/ClientModePatterns.h>
 
 struct ClientModeImpl {
+    explicit ClientModeImpl(const ClientModePatterns& clientModePatterns) noexcept
+        : zoomedSniperEffectWeight{clientModePatterns.zoomedSniperEffectWeightOffset()}
+        , zoomedMovingSniperEffectWeight{clientModePatterns.zoomedMovingSniperEffectWeightOffset()}
+    {
+    }
+
     [[nodiscard]] static const ClientModeImpl& instance() noexcept;
 
-    ZoomedSniperEffectWeightOffset zoomedSniperEffectWeight{ ClientModePatterns::zoomedSniperEffectWeightOffset() };
-    ZoomedMovingSniperEffectWeightOffset zoomedMovingSniperEffectWeight{ ClientModePatterns::zoomedMovingSniperEffectWeightOffset() };
+    ZoomedSniperEffectWeightOffset zoomedSniperEffectWeight;
+    ZoomedMovingSniperEffectWeightOffset zoomedMovingSniperEffectWeight;
 };
diff --git a/Source/GameClasses/Implementation/FileSystemImpl.h b/Source/GameClasses/Implementation/FileSystemImpl.h
@@ -3,7 +3,12 @@
 #include <MemoryPatterns/FileSystemPatterns.h>
 
 struct FileSystemImpl {
+    explicit FileSystemImpl(const FileSystemPatterns& fileSystemPatterns) noexcept
+        : fileNamesOffset{fileSystemPatterns.fileNamesOffset()}
+    {
+    }
+
     [[nodiscard]] static const FileSystemImpl& instance() noexcept;
 
-    FileNamesOffset fileNamesOffset{ FileSystemPatterns::fileNamesOffset() };
+    FileNamesOffset fileNamesOffset;
 };
diff --git a/Source/GameClasses/Implementation/GameClassImplementations.h b/Source/GameClasses/Implementation/GameClassImplementations.h
@@ -16,9 +16,31 @@
 #include <Platform/VmtFinder.h>
 
 struct GameClassImplementations {
-    explicit GameClassImplementations(Tier0Dll tier0Dll) noexcept
-        : fileNameSymbolTable{tier0Dll}
-        , memAlloc{tier0Dll}
+    GameClassImplementations(const ClientModePatterns& clientModePatterns,
+                             const ClientPatterns& clientPatterns,
+                             const FileSystemPatterns& fileSystemPatterns,
+                             const GameRulesPatterns& gameRulesPatterns,
+                             const MemAllocPatterns& memAllocPatterns,
+                             const PanelPatterns& panelPatterns,
+                             const PanelStylePatterns& panelStylePatterns,
+                             const PanoramaImagePanelPatterns& panoramaImagePanelPatterns,
+                             const PanoramaLabelPatterns& panoramaLabelPatterns,
+                             const PanoramaUiEnginePatterns& panoramaUiEnginePatterns,
+                             const PanoramaUiPanelPatterns& panoramaUiPanelPatterns,
+                             const PlantedC4Patterns& plantedC4Patterns,
+                             Tier0Dll tier0Dll) noexcept
+        : clientMode{clientModePatterns}
+        , fileNameSymbolTable{tier0Dll}
+        , fileSystem{fileSystemPatterns}
+        , gameRules{gameRulesPatterns}
+        , memAlloc{tier0Dll, memAllocPatterns}
+        , panel{panelPatterns}
+        , panelStyle{panelStylePatterns}
+        , imagePanel{panoramaImagePanelPatterns}
+        , panoramaLabel{panoramaLabelPatterns}
+        , uiEngine{clientPatterns, panoramaUiEnginePatterns}
+        , panoramaUiPanelOffsets{panoramaUiPanelPatterns}
+        , plantedC4{plantedC4Patterns}
     {
     }
 

diff --git a/Source/GameClasses/Implementation/GameRulesImpl.h b/Source/GameClasses/Implementation/GameRulesImpl.h
@@ -3,7 +3,12 @@
 #include <MemoryPatterns/GameRulesPatterns.h>
 
 struct GameRulesImpl {
+    explicit GameRulesImpl(const GameRulesPatterns& gameRulesPatterns) noexcept
+        : roundStartTimeOffset{gameRulesPatterns.roundStartTimeOffset()}
+    {
+    }
+
     [[nodiscard]] static const GameRulesImpl& instance() noexcept;
 
-    RoundStartTimeOffset roundStartTimeOffset{ GameRulesPatterns::roundStartTimeOffset() };
+    RoundStartTimeOffset roundStartTimeOffset;
 };
diff --git a/Source/GameClasses/Implementation/MemAllocImpl.h b/Source/GameClasses/Implementation/MemAllocImpl.h
@@ -9,13 +9,14 @@
 #include <Utils/FieldOffset.h>
 
 struct MemAllocImpl {
-    explicit MemAllocImpl(Tier0Dll tier0Dll) noexcept
-        : thisptr{ tier0Dll.memAlloc() }
+    MemAllocImpl(Tier0Dll tier0Dll, const MemAllocPatterns& memAllocPatterns) noexcept
+        : thisptr{tier0Dll.memAlloc()}
+        , alloc{memAllocPatterns.allocOffset()}
     {
     }
 
     [[nodiscard]] static const MemAllocImpl& instance() noexcept;
 
     cs2::IMemAlloc** thisptr;
-    FieldOffset<const void, cs2::IMemAlloc::Alloc*, std::int8_t> alloc{ MemAllocPatterns::allocOffset() };
+    FieldOffset<const void, cs2::IMemAlloc::Alloc*, std::int8_t> alloc;
 };
diff --git a/Source/GameClasses/Implementation/PanelImpl.h b/Source/GameClasses/Implementation/PanelImpl.h
@@ -3,7 +3,12 @@
 #include <MemoryPatterns/PanelPatterns.h>
 
 struct PanelImpl {
+    explicit PanelImpl(const PanelPatterns& panelPatterns) noexcept
+        : create{panelPatterns.create()}
+    {
+    }
+
     [[nodiscard]] static const PanelImpl& instance() noexcept;
 
-    cs2::CPanel2D::Create* create{ PanelPatterns::create() };
+    cs2::CPanel2D::Create* create;
 };
diff --git a/Source/GameClasses/Implementation/PanelStyleImpl.h b/Source/GameClasses/Implementation/PanelStyleImpl.h
@@ -3,7 +3,12 @@
 #include <MemoryPatterns/PanelStylePatterns.h>
 
 struct PanelStyleImpl {
+    explicit PanelStyleImpl(const PanelStylePatterns& panelStylePatterns) noexcept
+        : setProperty{panelStylePatterns.setProperty()}
+    {
+    }
+
     [[nodiscard]] static const PanelStyleImpl& instance() noexcept;
 
-    cs2::CPanelStyle::SetProperty* setProperty{PanelStylePatterns::setProperty()};
+    cs2::CPanelStyle::SetProperty* setProperty;
 };
diff --git a/Source/GameClasses/Implementation/PanoramaImagePanelImpl.h b/Source/GameClasses/Implementation/PanoramaImagePanelImpl.h
@@ -4,7 +4,12 @@
 #include <MemoryPatterns/PanoramaImagePanelPatterns.h>
 
 struct PanoramaImagePanelImpl {
+    explicit PanoramaImagePanelImpl(const PanoramaImagePanelPatterns& panoramaImagePanelPatterns) noexcept
+        : setImage{panoramaImagePanelPatterns.setImage()}
+    {
+    }
+
     [[nodiscard]] static const PanoramaImagePanelImpl& instance() noexcept;
 
-    cs2::CImagePanel::setImage setImage{ PanoramaImagePanelPatterns::setImage() };
+    cs2::CImagePanel::setImage setImage;
 };
diff --git a/Source/GameClasses/Implementation/PanoramaLabelImpl.h b/Source/GameClasses/Implementation/PanoramaLabelImpl.h
@@ -3,7 +3,12 @@
 #include <MemoryPatterns/PanoramaLabelPatterns.h>
 
 struct PanoramaLabelImpl {
+    explicit PanoramaLabelImpl(const PanoramaLabelPatterns& panoramaLabelPatterns) noexcept
+        : setTextInternal{panoramaLabelPatterns.setTextInternal()}
+    {
+    }
+
     [[nodiscard]] static const PanoramaLabelImpl& instance() noexcept;
 
-    cs2::CLabel::setTextInternal setTextInternal{ PanoramaLabelPatterns::setTextInternal() };
+    cs2::CLabel::setTextInternal setTextInternal;
 };