Implement weapon reload sound visualization

danielkrupinski · Dec 6, 2023 · 0faa727 · 0faa727
1 parent 5d37b05
commit 0faa727
Show file tree

Hide file tree

Showing 8 changed files with 69 additions and 2 deletions.
diff --git a/Source/CS2/Constants/SoundNames.h b/Source/CS2/Constants/SoundNames.h
@@ -23,5 +23,7 @@ constexpr std::string_view kZoomSoundNamePart = "zoom";
 constexpr std::string_view kPlayerSuitSoundPrefix = "suit";
 constexpr std::string_view kBombBeepSoundsPrefix = "c4_beep";
 constexpr std::string_view kBombDefuseStartSoundName = "c4_disarmstart.vsnd";
+constexpr std::string_view kClipOutSoundSuffix = "clipout.vsnd";
+constexpr std::string_view kCoverUpSoundSuffix = "coverup.vsnd";
 
 }
diff --git a/Source/FeatureHelpers/HudInWorldPanelZOrder.h b/Source/FeatureHelpers/HudInWorldPanelZOrder.h
@@ -4,6 +4,7 @@ enum class HudInWorldPanelZOrder {
     Footstep,
     BombBeep,
     WeaponScope,
+    WeaponReload,
     BombPlant,
     BombDefuse
 };
diff --git a/Source/FeatureHelpers/Sound/SoundWatcher.h b/Source/FeatureHelpers/Sound/SoundWatcher.h
@@ -5,12 +5,14 @@
 #include "BombPlantSound.h"
 #include "FootstepSound.h"
 #include "SoundWatcherImpl.h"
+#include "WeaponReloadSound.h"
 #include "WeaponScopeSound.h"
 
 using SoundWatcher = SoundWatcherImpl<
     FootstepSound,
     BombPlantSound,
     BombBeepSound,
     BombDefuseSound,
-    WeaponScopeSound
+    WeaponScopeSound,
+    WeaponReloadSound
 >;
diff --git a/Source/FeatureHelpers/Sound/WeaponReloadSound.h b/Source/FeatureHelpers/Sound/WeaponReloadSound.h
@@ -0,0 +1,18 @@
+#pragma once
+
+#include <algorithm>
+#include <cassert>
+#include <string_view>
+
+#include <CS2/Constants/SoundNames.h>
+
+struct WeaponReloadSound {
+    static constexpr auto kFadeAwayStart = 1.8f;
+    static constexpr auto kFadeAwayDuration = 0.8f;
+    static constexpr auto kMinScale = 0.5f;
+
+    [[nodiscard]] static constexpr bool isSound(std::string_view soundName) noexcept
+    {
+        return soundName.starts_with(cs2::kWeaponSoundsPath) && (soundName.ends_with(cs2::kClipOutSoundSuffix) || soundName.ends_with(cs2::kCoverUpSoundSuffix));
+    }
+};
diff --git a/Source/Features/Sound/SoundFeatures.h b/Source/Features/Sound/SoundFeatures.h
@@ -4,6 +4,7 @@
 #include "BombDefuseVisualizer.h"
 #include "BombPlantVisualizer.h"
 #include "FootstepVisualizer.h"
+#include "WeaponReloadVisualizer.h"
 #include "WeaponScopeVisualizer.h"
 #include <Hooks/ViewRenderHook.h>
 
@@ -14,6 +15,7 @@ struct SoundFeatures {
         , bombBeepVisualizer{ viewRenderHook, soundWatcher }
         , bombDefuseVisualizer{ viewRenderHook, soundWatcher }
         , weaponScopeVisualizer{ viewRenderHook, soundWatcher }
+        , weaponReloadVisualizer{ viewRenderHook, soundWatcher }
     {
     }
 
@@ -24,11 +26,13 @@ struct SoundFeatures {
         bombBeepVisualizer.run(soundVisualizationHelpers);
         bombDefuseVisualizer.run(soundVisualizationHelpers);
         weaponScopeVisualizer.run(soundVisualizationHelpers);
+        weaponReloadVisualizer.run(soundVisualizationHelpers);
     }
 
     FootstepVisualizer footstepVisualizer;
     BombPlantVisualizer bombPlantVisualizer;
     BombBeepVisualizer bombBeepVisualizer;
     BombDefuseVisualizer bombDefuseVisualizer;
     WeaponScopeVisualizer weaponScopeVisualizer;
+    WeaponReloadVisualizer weaponReloadVisualizer;
 };
diff --git a/Source/Features/Sound/WeaponReloadVisualizer.h b/Source/Features/Sound/WeaponReloadVisualizer.h
@@ -0,0 +1,37 @@
+#pragma once
+
+#include <CS2/Classes/Panorama.h>
+#include <FeatureHelpers/HudInWorldPanelFactory.h>
+#include <FeatureHelpers/HudInWorldPanelZOrder.h>
+#include <FeatureHelpers/Sound/WeaponReloadSound.h>
+#include <FeatureHelpers/Sound/SoundVisualizationFeature.h>
+#include <GameClasses/PanoramaUiEngine.h>
+
+struct WeaponReloadPanels {
+    [[nodiscard]] static cs2::CPanel2D* createContainerPanel(const HudInWorldPanelFactory& inWorldFactory) noexcept
+    {
+        return inWorldFactory.createPanel("WeaponReloadContainer", HudInWorldPanelZOrder::WeaponReload);
+    }
+
+    static void createContentPanels(cs2::CUIPanel& containerPanel) noexcept
+    {
+        for (std::size_t i = 0; i < kMaxNumberOfPanels; ++i) {
+            PanoramaUiEngine::runScript(&containerPanel,
+                R"(
+(function() {
+var weaponReloadPanel = $.CreatePanel('Panel', $.GetContextPanel().FindChildInLayoutFile("WeaponReloadContainer"), '', {
+  style: 'width: 100px; height: 100px; x: -50px; y: -50px;'
+});
+
+$.CreatePanel('Image', weaponReloadPanel, '', {
+  src: "s2r://panorama/images/icons/ui/switch_teams_dead.svg",
+  style: "horizontal-align: center; vertical-align: center; img-shadow: 0px 0px 1px 3 #000000;"
+});
+})();)", "", 0);
+        }
+    }
+
+    static constexpr auto kMaxNumberOfPanels = 10;
+};
+
+using WeaponReloadVisualizer = SoundVisualizationFeature<WeaponReloadPanels, WeaponReloadSound>;
diff --git a/Source/UI/Panorama/CreateGUI.js b/Source/UI/Panorama/CreateGUI.js
@@ -213,8 +213,9 @@ $.Osiris = (function () {
   createYesNoDropDown(bombSoundVisualization, "Visualize Bomb Defuse", 'sound', 'visualize_bomb_defuse');
 
   var weaponSoundVisualization = createSection(sound, 'Weapon Sound Visualization');
-  $.CreatePanel('Panel', weaponSoundVisualization, '', { class: "horizontal-separator" });
   createYesNoDropDown(weaponSoundVisualization, "Visualize Weapon Scope Sound", 'sound', 'visualize_scope_sound');
+  $.CreatePanel('Panel', weaponSoundVisualization, '', { class: "horizontal-separator" });
+  createYesNoDropDown(weaponSoundVisualization, "Visualize Weapon Reload Sound", 'sound', 'visualize_reload_sound');
 
   $.Osiris.navigateToTab('hud');
 })();

diff --git a/Source/UI/Panorama/SetCommandHandler.h b/Source/UI/Panorama/SetCommandHandler.h
@@ -45,6 +45,8 @@ struct SetCommandHandler {
             handleTogglableFeature(features.soundFeatures.bombDefuseVisualizer);
         } else if (feature == "visualize_scope_sound") {
             handleTogglableFeature(features.soundFeatures.weaponScopeVisualizer);
+        } else if (feature == "visualize_reload_sound") {
+            handleTogglableFeature(features.soundFeatures.weaponReloadVisualizer);
         }
     }