Make more classes constructible from hook context

danielkrupinski · Dec 27, 2024 · a5175ad · a5175ad
1 parent 3cbced1
commit a5175ad
Show file tree

Hide file tree

Showing 12 changed files with 47 additions and 57 deletions.
diff --git a/Source/FeatureHelpers/RenderingHookEntityLoop.h b/Source/FeatureHelpers/RenderingHookEntityLoop.h
@@ -8,9 +8,8 @@
 template <typename HookContext>
 class RenderingHookEntityLoop {
 public:
-    explicit RenderingHookEntityLoop(HookContext& hookContext, PlayerInfoInWorld<HookContext>& playerInformationThroughWalls) noexcept
+    explicit RenderingHookEntityLoop(HookContext& hookContext) noexcept
         : hookContext{hookContext}
-        , playerInformationThroughWalls{playerInformationThroughWalls}
     {
     }
 
@@ -29,7 +28,7 @@ class RenderingHookEntityLoop {
 
         if (entityTypeInfo.template is<cs2::C_CSPlayerPawn>()) {
             auto&& playerPawn = hookContext.template make<PlayerPawn>(static_cast<cs2::C_CSPlayerPawn*>(&entity));
-            playerInformationThroughWalls.drawPlayerInformation(playerPawn);
+            hookContext.template make<PlayerInfoInWorld>().drawPlayerInformation(playerPawn);
         }
 
         if (entityTypeInfo.isModelEntity())
@@ -38,5 +37,4 @@ class RenderingHookEntityLoop {
     }
 
     HookContext& hookContext;
-    PlayerInfoInWorld<HookContext>& playerInformationThroughWalls;
 };
diff --git a/Source/Features/Hud/DefusingAlert/DefusingAlert.h b/Source/Features/Hud/DefusingAlert/DefusingAlert.h
@@ -1,10 +1,15 @@
 #pragma once
 
-template <typename Context>
+#include <utility>
+
+#include "DefusingAlertContext.h"
+
+template <typename HookContext, typename Context = DefusingAlertContext<HookContext>>
 class DefusingAlert {
 public:
-    explicit DefusingAlert(Context context) noexcept
-        : context{context}
+    template <typename... Args>
+    DefusingAlert(Args&&... args) noexcept
+        : context{std::forward<Args>(args)...}
     {
     }
 

diff --git a/Source/Features/Hud/DefusingAlert/DefusingAlertContext.h b/Source/Features/Hud/DefusingAlert/DefusingAlertContext.h
@@ -10,19 +10,18 @@
 template <typename HookContext>
 class DefusingAlertContext {
 public:
-    DefusingAlertContext(HookContext& context, DefusingAlertState& state) noexcept
+    DefusingAlertContext(HookContext& context) noexcept
         : context{context}
-        , _state{state}
     {
     }
 
     [[nodiscard]] decltype(auto) defusingAlertContainerPanel() const noexcept
     {
-        if (auto&& panel = uiEngine().getPanelFromHandle(_state.defusingAlertContainerPanelHandle))
+        if (auto&& panel = uiEngine().getPanelFromHandle(state().defusingAlertContainerPanelHandle))
             return utils::lvalue<decltype(panel)>(panel);
 
         updatePanelHandles();
-        return uiEngine().getPanelFromHandle(_state.defusingAlertContainerPanelHandle);
+        return uiEngine().getPanelFromHandle(state().defusingAlertContainerPanelHandle);
     }
 
     [[nodiscard]] auto defusingAlertCondition() const noexcept
@@ -48,12 +47,12 @@ class DefusingAlertContext {
 
     [[nodiscard]] DefusingAlertState& state() const noexcept
     {
-        return _state;
+        return context.featuresStates().hudFeaturesStates.defusingAlertState;
     }
 
     [[nodiscard]] auto defusingCountdownTextPanel() const noexcept
     {
-        return DefusingCountdownTextPanel{uiEngine().getPanelFromHandle(_state.defusingTimerPanelHandle).clientPanel().template as<PanoramaLabel>()};
+        return DefusingCountdownTextPanel{uiEngine().getPanelFromHandle(state().defusingTimerPanelHandle).clientPanel().template as<PanoramaLabel>()};
     }
 
 private:
@@ -64,7 +63,7 @@ class DefusingAlertContext {
 
     void updatePanelHandles() const noexcept
     {
-        if (uiEngine().getPanelFromHandle(_state.defusingTimerPanelHandle))
+        if (uiEngine().getPanelFromHandle(state().defusingTimerPanelHandle))
             return;
 
         auto&& hudTeamCounter = context.hud().hudTeamCounter();
@@ -100,10 +99,9 @@ class DefusingAlertContext {
             return;
 
         defusingAlertContainer.setVisible(false);
-        _state.defusingAlertContainerPanelHandle = defusingAlertContainer.getHandle();
-        _state.defusingTimerPanelHandle = defusingTimer.getHandle();
+        state().defusingAlertContainerPanelHandle = defusingAlertContainer.getHandle();
+        state().defusingTimerPanelHandle = defusingTimer.getHandle();
     }
 
     HookContext& context;
-    DefusingAlertState& _state;
 };
diff --git a/Source/Features/Hud/HudFeatures.h b/Source/Features/Hud/HudFeatures.h
@@ -28,24 +28,14 @@ struct HudFeatures {
         return BombTimerToggle{BombTimerContext{hookContext}};
     }
 
-    [[nodiscard]] auto defusingAlert() const noexcept
-    {
-        return DefusingAlert{DefusingAlertContext{hookContext, states.defusingAlertState}};
-    }
-
     [[nodiscard]] auto defusingAlertToggle() const noexcept
     {
-        return DefusingAlertToggle{DefusingAlertContext{hookContext, states.defusingAlertState}};
-    }
-
-    [[nodiscard]] auto killfeedPreserver() const noexcept
-    {
-        return KillfeedPreserver{KillfeedPreserverContext{states.killfeedPreserverState, hookContext}};
+        return DefusingAlertToggle{DefusingAlertContext{hookContext}};
     }
 
     [[nodiscard]] auto killfeedPreserveToggle() const noexcept
     {
-        return KillfeedPreserveToggle{KillfeedPreserverContext{states.killfeedPreserverState, hookContext}};
+        return KillfeedPreserveToggle{KillfeedPreserverContext{hookContext}};
     }
 
     [[nodiscard]] decltype(auto) postRoundTimerToggle() const noexcept

diff --git a/Source/Features/Hud/KillfeedPreserver/KillfeedPreserver.h b/Source/Features/Hud/KillfeedPreserver/KillfeedPreserver.h
@@ -1,10 +1,13 @@
 #pragma once
 
-template <typename Context>
+#include "KillfeedPreserverContext.h"
+
+template <typename HookContext, typename Context = KillfeedPreserverContext<HookContext>>
 class KillfeedPreserver {
 public:
-    explicit KillfeedPreserver(Context context) noexcept
-        : context{context}
+    template <typename... Args>
+    KillfeedPreserver(Args&&... args) noexcept
+        : context{std::forward<Args>(args)...}
     {
     }
 

diff --git a/Source/Features/Hud/KillfeedPreserver/KillfeedPreserverContext.h b/Source/Features/Hud/KillfeedPreserver/KillfeedPreserverContext.h
@@ -2,16 +2,16 @@
 
 #include "KillfeedPreserverState.h"
 
-template <typename Context>
+template <typename HookContext>
 struct KillfeedPreserverContext {
-    KillfeedPreserverContext(KillfeedPreserverState& state, Context& context) noexcept
-        : _state{state}, _context{context}
+    KillfeedPreserverContext(HookContext& hookContext) noexcept
+        : hookContext{hookContext}
     {
     }
 
     [[nodiscard]] decltype(auto) deathNotices() const noexcept
     {
-        return _context.hud().deathNotices();
+        return hookContext.hud().deathNotices();
     }
 
     [[nodiscard]] auto preserveDeathNotice() const noexcept
@@ -25,10 +25,9 @@ struct KillfeedPreserverContext {
 
     [[nodiscard]] auto& state() const noexcept
     {
-        return _state;
+        return hookContext.featuresStates().hudFeaturesStates.killfeedPreserverState;
     }
 
 private:
-    KillfeedPreserverState& _state;
-    Context& _context;
+    HookContext& hookContext;
 };
diff --git a/Source/GlobalContext/GlobalContext.h b/Source/GlobalContext/GlobalContext.h
@@ -94,14 +94,11 @@ class GlobalContext {
         soundWatcher.update();
         fullContext().features(dependencies).soundFeatures().runOnViewMatrixUpdate();
 
-        auto&& playerInfoInWorld = dependencies.make<PlayerInfoInWorld>();
-        RenderingHookEntityLoop{dependencies, playerInfoInWorld}.run();
+        dependencies.make<RenderingHookEntityLoop>().run();
         dependencies.make<GlowSceneObjects>().removeUnreferencedObjects();
-
-        fullContext().features(dependencies).hudFeatures().defusingAlert().run();
-        fullContext().features(dependencies).hudFeatures().killfeedPreserver().run();
-        BombStatusPanelManager{BombStatusPanelManagerContext{dependencies}}.run();
-
+        dependencies.make<DefusingAlert>().run();
+        dependencies.make<KillfeedPreserver>().run();
+        dependencies.make<BombStatusPanelManager>().run();
         dependencies.make<InWorldPanels>().hideUnusedPanels();
 
         UnloadFlag unloadFlag;

diff --git a/Source/Hud/BombStatus/BombStatusPanelManager.h b/Source/Hud/BombStatus/BombStatusPanelManager.h
@@ -1,12 +1,16 @@
 #pragma once
 
+#include <utility>
+
+#include "BombStatusPanelManagerContext.h"
 #include <Common/Visibility.h>
 
-template <typename Context>
+template <typename HookContext, typename Context = BombStatusPanelManagerContext<HookContext>>
 class BombStatusPanelManager {
 public:
-    explicit BombStatusPanelManager(Context context) noexcept
-        : context{context}
+    template <typename... Args>
+    BombStatusPanelManager(Args&&... args) noexcept
+        : context{std::forward<Args>(args)...}
     {
     }
 

diff --git a/Tests/FeatureTests/HudFeaturesTests/DefusingAlertTests/DefusingAlertTests.h b/Tests/FeatureTests/HudFeaturesTests/DefusingAlertTests/DefusingAlertTests.h
@@ -29,7 +29,7 @@ class DefusingAlertTest : public testing::Test {
     testing::StrictMock<MockDefusingAlertCondition> mockDefusingAlertCondition;
     testing::StrictMock<MockDefusingAlertPanel> mockDefusingAlertPanel;
 
-    DefusingAlert<MockDefusingAlertContext&> defusingAlert{mockDefusingAlertContext};
+    DefusingAlert<MockHookContext, MockDefusingAlertContext&> defusingAlert{mockDefusingAlertContext};
 };
 
 TEST_F(DefusingAlertTest, DoesNotRunIfShouldNotRun) {

diff --git a/Tests/FeatureTests/HudFeaturesTests/KillfeedPreserverTests/KillfeedPreserverContextTests.h b/Tests/FeatureTests/HudFeaturesTests/KillfeedPreserverTests/KillfeedPreserverContextTests.h
@@ -17,13 +17,9 @@ class KillfeedPreserverContextTest : public testing::Test {
     testing::StrictMock<MockDeathNotices> mockDeathNotices;
 
     KillfeedPreserverState state;
-    KillfeedPreserverContext<MockHookContext&> killfeedPreserverContext{state, mockHookContext};
+    KillfeedPreserverContext<MockHookContext&> killfeedPreserverContext{mockHookContext};
 };
 
-TEST_F(KillfeedPreserverContextTest, StateCanBeAccessed) {
-    EXPECT_THAT(killfeedPreserverContext.state(), testing::Ref(state));
-}
-
 TEST_F(KillfeedPreserverContextTest, DeathNoticesCanBeAccessed) {
     EXPECT_CALL(mockHookContext, hud()).WillOnce(testing::ReturnRef(mockHud));
     EXPECT_CALL(mockHud, deathNotices()).WillOnce(testing::ReturnRef(mockDeathNotices));

diff --git a/Tests/FeatureTests/HudFeaturesTests/KillfeedPreserverTests/KillfeedPreserverTests.h b/Tests/FeatureTests/HudFeaturesTests/KillfeedPreserverTests/KillfeedPreserverTests.h
@@ -18,7 +18,7 @@ class KillfeedPreserverTest : public testing::Test {
     testing::StrictMock<MockKillfeedPreserverContext> mockContext;
     testing::StrictMock<MockDeathNotices> mockDeathNotices;
 
-    KillfeedPreserver<MockKillfeedPreserverContext&> killfeedPreserver{mockContext};
+    KillfeedPreserver<MockHookContext, MockKillfeedPreserverContext&> killfeedPreserver{mockContext};
     KillfeedPreserverState state;
     std::function<void(MockDeathNotice&)> preserveDeathNoticeFunctor;
 };

diff --git a/Tests/HudTests/BombStatusTests/BombStatusPanelManagerTests.h b/Tests/HudTests/BombStatusTests/BombStatusPanelManagerTests.h
@@ -24,7 +24,7 @@ class BombStatusPanelManagerTest : public testing::Test {
     testing::StrictMock<MockBombTimer> mockBombTimer;
     testing::StrictMock<MockBombStatusPanel> mockBombStatusPanel;
 
-    BombStatusPanelManager<MockBombStatusPanelManagerContext&> bombStatusPanelManager{mockContext};
+    BombStatusPanelManager<MockHookContext, MockBombStatusPanelManagerContext&> bombStatusPanelManager{mockContext};
 };
 
 TEST_F(BombStatusPanelManagerTest, BombStatusPanelAndBombTimerAreHiddenWhenPostRoundTimerIsVisible) {