Implement outline glow for dropped bomb

Source/CS2/Classes/Entities/WeaponEntities.h

@@ -154,4 +154,8 @@ struct C_DecoyGrenade : C_CSWeaponBase {
     static constexpr auto kMangledTypeName{WIN64_LINUX(".?AVC_DecoyGrenade@@", "14C_DecoyGrenade")};
 };
 
+struct C_C4 : C_CSWeaponBase {
+    static constexpr auto kMangledTypeName{WIN64_LINUX(".?AVC_C4@@", "4C_C4")};
+};
+
 }

Source/Features/Visuals/OutlineGlow/DroppedBombOutlineGlow/DroppedBombOutlineGlow.h

@@ -0,0 +1,32 @@
+#pragma once
+
+#include <utility>
+
+#include "DroppedBombOutlineGlowContext.h"
+#include "DroppedBombOutlineGlowParams.h"
+
+template <typename Context>
+class DroppedBombOutlineGlow {
+public:
+    template <typename... Args>
+    DroppedBombOutlineGlow(Args&&... args) noexcept
+        : context{std::forward<Args>(args)...}
+    {
+    }
+
+    void applyGlowToBomb(auto&& bomb) const noexcept
+    {
+        auto&& condition = context.condition();
+        if (!condition.shouldRun() || !condition.shouldGlowBomb(bomb))
+            return;
+
+        using namespace dropped_bomb_outline_glow_params;
+        bomb.applyGlowRecursively(kColor);
+    }
+
+private:
+    Context context;
+};
+
+template <typename HookContext>
+DroppedBombOutlineGlow(HookContext&) -> DroppedBombOutlineGlow<DroppedBombOutlineGlowContext<HookContext>>;

Source/Features/Visuals/OutlineGlow/DroppedBombOutlineGlow/DroppedBombOutlineGlowCondition.h

@@ -0,0 +1,26 @@
+#pragma once
+
+#include <utility>
+
+template <typename Context>
+class DroppedBombOutlineGlowCondition {
+public:
+    template <typename... Args>
+    DroppedBombOutlineGlowCondition(Args&&... args) noexcept
+        : context{std::forward<Args>(args)...}
+    {
+    }
+
+    [[nodiscard]] bool shouldRun() const noexcept
+    {
+        return context.state().enabled;
+    }
+
+    [[nodiscard]] bool shouldGlowBomb(auto&& bomb) const noexcept
+    {
+        return !bomb.hasOwner().valueOr(true);
+    }
+
+private:
+    Context context;
+};

Source/Features/Visuals/OutlineGlow/DroppedBombOutlineGlow/DroppedBombOutlineGlowContext.h

@@ -0,0 +1,25 @@
+#pragma once
+
+#include "DroppedBombOutlineGlowCondition.h"
+
+template <typename HookContext>
+class DroppedBombOutlineGlowContext {
+public:
+    explicit DroppedBombOutlineGlowContext(HookContext& hookContext) noexcept
+        : hookContext{hookContext}
+    {
+    }
+
+    [[nodiscard]] auto& state() const noexcept
+    {
+        return hookContext.featuresStates().visualFeaturesStates.droppedBombOutlineGlowState;
+    }
+
+    [[nodiscard]] decltype(auto) condition() const noexcept
+    {
+        return hookContext.template make<DroppedBombOutlineGlowCondition<DroppedBombOutlineGlowContext>>();
+    }
+
+private:
+    HookContext& hookContext;
+};

Source/Features/Visuals/OutlineGlow/DroppedBombOutlineGlow/DroppedBombOutlineGlowParams.h

@@ -0,0 +1,8 @@
+#pragma once
+
+#include <CS2/Classes/Color.h>
+
+namespace dropped_bomb_outline_glow_params
+{
+    constexpr cs2::Color kColor{255, 255, 128, 102};
+}

Source/Features/Visuals/OutlineGlow/DroppedBombOutlineGlow/DroppedBombOutlineGlowState.h

@@ -0,0 +1,5 @@
+#pragma once
+
+struct DroppedBombOutlineGlowState {
+    bool enabled{true};
+};

Source/Features/Visuals/OutlineGlow/DroppedBombOutlineGlow/DroppedBombOutlineGlowToggle.h

@@ -0,0 +1,27 @@
+#pragma once
+
+#include <utility>
+
+#include <FeatureHelpers/FeatureToggle.h>
+#include "DroppedBombOutlineGlowContext.h"
+
+template <typename Context>
+class DroppedBombOutlineGlowToggle : public FeatureToggle<DroppedBombOutlineGlowToggle<Context>> {
+public:
+    template <typename... Args>
+    DroppedBombOutlineGlowToggle(Args&&... args) noexcept
+        : context{std::forward<Args>(args)...}
+    {
+    }
+
+    [[nodiscard]] auto& enabledVariable(typename DroppedBombOutlineGlowToggle::ToggleMethod) const noexcept
+    {
+        return context.state().enabled;
+    }
+
+private:
+    Context context;
+};
+
+template <typename HookContext>
+DroppedBombOutlineGlowToggle(HookContext&) -> DroppedBombOutlineGlowToggle<DroppedBombOutlineGlowContext<HookContext>>;

Source/Features/Visuals/OutlineGlow/OutlineGlow.h

@@ -21,6 +21,8 @@ class OutlineGlow {
             context.applyGlowToPlayer(entity);
         else if (entityTypeInfo.typeIndex == utils::typeIndex<cs2::CBaseAnimGraph, KnownEntityTypes>())
             context.applyGlowToDefuseKit(entity);
+        else if (entityTypeInfo.is<cs2::C_C4>())
+            context.applyGlowToBomb(entity);
         else if (entityTypeInfo.isGrenadeProjectile())
             context.applyGlowToGrenadeProjectile(entityTypeInfo, entity);
         else if (entityTypeInfo.isWeapon())

Source/Features/Visuals/OutlineGlow/OutlineGlowContext.h

@@ -4,6 +4,7 @@
 #include <OutlineGlow/GlowSceneObjects.h>
 
 #include "DefuseKitOutlineGlow/DefuseKitOutlineGlow.h"
+#include "DroppedBombOutlineGlow/DroppedBombOutlineGlow.h"
 #include "GrenadeProjectileOutlineGlow/GrenadeProjectileOutlineGlow.h"
 #include "PlayerOutlineGlow/PlayerOutlineGlow.h"
 #include "WeaponOutlineGlow/WeaponOutlineGlow.h"
@@ -40,6 +41,11 @@ class OutlineGlowContext {
     {
         hookContext.template make<GrenadeProjectileOutlineGlow>().applyGlowToGrenadeProjectile(entityTypeInfo, hookContext.template make<BaseEntity>(static_cast<cs2::C_BaseCSGrenadeProjectile*>(&entity)));
     }
+
+    void applyGlowToBomb(auto& entity) const noexcept
+    {
+        hookContext.template make<DroppedBombOutlineGlow>().applyGlowToBomb(hookContext.template make<BaseEntity>(static_cast<cs2::C_C4*>(&entity)));
+    }
 
     [[nodiscard]] auto& viewRenderHook() const noexcept
     {

Source/Features/Visuals/VisualFeatures.h

@@ -3,6 +3,7 @@
 #include <FeatureHelpers/FeatureHelpers.h>
 #include "PlayerInformationThroughWalls/PlayerInformationThroughWalls.h"
 #include "OutlineGlow/DefuseKitOutlineGlow/DefuseKitOutlineGlowToggle.h"
+#include "OutlineGlow/DroppedBombOutlineGlow/DroppedBombOutlineGlowToggle.h"
 #include "OutlineGlow/GrenadeProjectileOutlineGlow/GrenadeProjectileOutlineGlowToggle.h"
 #include "OutlineGlow/PlayerOutlineGlow/PlayerOutlineGlowToggle.h"
 #include "OutlineGlow/WeaponOutlineGlow/WeaponOutlineGlowToggle.h"
@@ -100,6 +101,11 @@ struct VisualFeatures {
         return hookContext.template make<GrenadeProjectileOutlineGlowToggle>();
     }
 
+    [[nodiscard]] decltype(auto) droppedBombOutlineGlowToggle() const noexcept
+    {
+        return hookContext.template make<DroppedBombOutlineGlowToggle>();
+    }
+
     HookContext& hookContext;
     VisualFeaturesStates& states;
     ViewRenderHook& viewRenderHook;

Source/Features/Visuals/VisualFeaturesStates.h

@@ -2,6 +2,7 @@
 
 #include "PlayerInformationThroughWalls/PlayerInformationThroughWallsState.h"
 #include "OutlineGlow/DefuseKitOutlineGlow/DefuseKitOutlineGlowState.h"
+#include "OutlineGlow/DroppedBombOutlineGlow/DroppedBombOutlineGlowState.h"
 #include "OutlineGlow/GrenadeProjectileOutlineGlow/GrenadeProjectileOutlineGlowState.h"
 #include "OutlineGlow/PlayerOutlineGlow/PlayerOutlineGlowState.h"
 #include "OutlineGlow/WeaponOutlineGlow/WeaponOutlineGlowState.h"
@@ -14,4 +15,5 @@ struct VisualFeaturesStates {
     WeaponOutlineGlowState weaponOutlineGlowState;
     DefuseKitOutlineGlowState defuseKitOutlineGlowState;
     GrenadeProjectileOutlineGlowState grenadeProjectileOutlineGlowState;
+    DroppedBombOutlineGlowState droppedBombOutlineGlowState;
 };

Source/GameDependencies/EntitiesVMTs.h

@@ -62,7 +62,9 @@ using KnownEntityTypes = std::tuple<
     cs2::C_HEGrenadeProjectile,
     cs2::C_SmokeGrenadeProjectile,
     cs2::C_MolotovProjectile,
-    cs2::C_FlashbangProjectile
+    cs2::C_FlashbangProjectile,
+
+    cs2::C_C4
 >;
 
 struct EntitiesVMTs {

Source/Osiris.vcxproj

@@ -169,6 +169,12 @@
     <ClInclude Include="Features\Visuals\OutlineGlow\DefuseKitOutlineGlow\DefuseKitOutlineGlowParams.h" />
     <ClInclude Include="Features\Visuals\OutlineGlow\DefuseKitOutlineGlow\DefuseKitOutlineGlowState.h" />
     <ClInclude Include="Features\Visuals\OutlineGlow\DefuseKitOutlineGlow\DefuseKitOutlineGlowToggle.h" />
+    <ClInclude Include="Features\Visuals\OutlineGlow\DroppedBombOutlineGlow\DroppedBombOutlineGlow.h" />
+    <ClInclude Include="Features\Visuals\OutlineGlow\DroppedBombOutlineGlow\DroppedBombOutlineGlowCondition.h" />
+    <ClInclude Include="Features\Visuals\OutlineGlow\DroppedBombOutlineGlow\DroppedBombOutlineGlowContext.h" />
+    <ClInclude Include="Features\Visuals\OutlineGlow\DroppedBombOutlineGlow\DroppedBombOutlineGlowParams.h" />
+    <ClInclude Include="Features\Visuals\OutlineGlow\DroppedBombOutlineGlow\DroppedBombOutlineGlowState.h" />
+    <ClInclude Include="Features\Visuals\OutlineGlow\DroppedBombOutlineGlow\DroppedBombOutlineGlowToggle.h" />
     <ClInclude Include="Features\Visuals\OutlineGlow\GrenadeProjectileOutlineGlow\GrenadeProjectileOutlineGlow.h" />
     <ClInclude Include="Features\Visuals\OutlineGlow\GrenadeProjectileOutlineGlow\GrenadeProjectileOutlineGlowCondition.h" />
     <ClInclude Include="Features\Visuals\OutlineGlow\GrenadeProjectileOutlineGlow\GrenadeProjectileOutlineGlowContext.h" />

Source/Osiris.vcxproj.filters

@@ -178,6 +178,9 @@
     <Filter Include="Features\Visuals\OutlineGlow\GrenadeProjectileOutlineGlow">
       <UniqueIdentifier>{88aa3de7-03b7-49bc-a280-76714e28a62a}</UniqueIdentifier>
     </Filter>
+    <Filter Include="Features\Visuals\OutlineGlow\DroppedBombOutlineGlow">
+      <UniqueIdentifier>{4cacd578-512d-4917-912c-c98f07a6d19b}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="CS2\Classes\C_CSGameRules.h">
@@ -1529,6 +1532,24 @@
     <ClInclude Include="Features\Visuals\OutlineGlow\GrenadeProjectileOutlineGlow\GrenadeProjectileOutlineGlowCondition.h">
       <Filter>Features\Visuals\OutlineGlow\GrenadeProjectileOutlineGlow</Filter>
     </ClInclude>
+    <ClInclude Include="Features\Visuals\OutlineGlow\DroppedBombOutlineGlow\DroppedBombOutlineGlow.h">
+      <Filter>Features\Visuals\OutlineGlow\DroppedBombOutlineGlow</Filter>
+    </ClInclude>
+    <ClInclude Include="Features\Visuals\OutlineGlow\DroppedBombOutlineGlow\DroppedBombOutlineGlowCondition.h">
+      <Filter>Features\Visuals\OutlineGlow\DroppedBombOutlineGlow</Filter>
+    </ClInclude>
+    <ClInclude Include="Features\Visuals\OutlineGlow\DroppedBombOutlineGlow\DroppedBombOutlineGlowContext.h">
+      <Filter>Features\Visuals\OutlineGlow\DroppedBombOutlineGlow</Filter>
+    </ClInclude>
+    <ClInclude Include="Features\Visuals\OutlineGlow\DroppedBombOutlineGlow\DroppedBombOutlineGlowParams.h">
+      <Filter>Features\Visuals\OutlineGlow\DroppedBombOutlineGlow</Filter>
+    </ClInclude>
+    <ClInclude Include="Features\Visuals\OutlineGlow\DroppedBombOutlineGlow\DroppedBombOutlineGlowState.h">
+      <Filter>Features\Visuals\OutlineGlow\DroppedBombOutlineGlow</Filter>
+    </ClInclude>
+    <ClInclude Include="Features\Visuals\OutlineGlow\DroppedBombOutlineGlow\DroppedBombOutlineGlowToggle.h">
+      <Filter>Features\Visuals\OutlineGlow\DroppedBombOutlineGlow</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <None Include="UI\Panorama\CreateGUI.js">

Source/UI/Panorama/CreateGUI.js

@@ -310,12 +310,15 @@ $.Osiris = (function () {
   var weaponOutlineGlow = createSection(outlineGlowTab, 'Weapon Outline Glow');
   createYesNoDropDown(weaponOutlineGlow, "Glow Weapons on Ground Nearby", 'visuals', 'weapon_outline_glow', 0);
 
-  var defuseKitOutlineGlow = createSection(outlineGlowTab, 'Defuse Kit Outline Glow');
-  createYesNoDropDown(defuseKitOutlineGlow, "Glow Defuse Kits on Ground Nearby", 'visuals', 'defuse_kit_outline_glow', 0);
-
   var grenadeProjectileOutlineGlow = createSection(outlineGlowTab, 'Grenade Projectile Outline Glow');
   createYesNoDropDown(grenadeProjectileOutlineGlow, "Glow Grenade Projectiles", 'visuals', 'grenade_proj_outline_glow', 0);
 
+  var bombOutlineGlow = createSection(outlineGlowTab, 'Bomb Outline Glow');
+  createYesNoDropDown(bombOutlineGlow, "Glow Dropped Bomb", 'visuals', 'dropped_bomb_outline_glow', 0);
+
+  var defuseKitOutlineGlow = createSection(outlineGlowTab, 'Defuse Kit Outline Glow');
+  createYesNoDropDown(defuseKitOutlineGlow, "Glow Defuse Kits on Ground Nearby", 'visuals', 'defuse_kit_outline_glow', 0);
+
   $.Osiris.navigateToSubTab('visuals', 'player_info');
 
   var sound = createTab('sound');

Source/UI/Panorama/SetCommandHandler.h

@@ -90,6 +90,8 @@ struct SetCommandHandler {
             handleTogglableFeature(features.visualFeatures().defuseKitOutlineGlowToggle());
         } else if (feature == "grenade_proj_outline_glow") {
             handleTogglableFeature(features.visualFeatures().grenadeProjectileOutlineGlowToggle());
+        } else if (feature == "dropped_bomb_outline_glow") {
+            handleTogglableFeature(features.visualFeatures().droppedBombOutlineGlowToggle());
         }
     }