Make player model glow preview animation speed independent of framerate

danielkrupinski · Jan 24, 2025 · 8e5a280 · 8e5a280
1 parent ddec7ed
commit 8e5a280
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 4 deletions.
diff --git a/Source/CS2/Classes/GlobalVars.h b/Source/CS2/Classes/GlobalVars.h
@@ -6,7 +6,8 @@ namespace cs2
 {
 
 struct GlobalVars {
-    PAD(52); // FIXME: get offset to curtime dynamically
+    PAD(48); // FIXME: get offsets to frametime and curtime dynamically
+    float frametime;
     float curtime;
 };
 

diff --git a/Source/Features/Visuals/ModelGlow/Preview/PlayerModelGlowPreview.h b/Source/Features/Visuals/ModelGlow/Preview/PlayerModelGlowPreview.h
@@ -71,11 +71,12 @@ class PlayerModelGlowPreview {
 private:
     void updateAnimationProgress() const noexcept
     {
-        constexpr auto kFrameTime{1 / 60.0f}; // todo: get real frametime from globalVars
+        constexpr auto kDefaultFrameTime{1 / 60.0f};
+        const auto frameTime = hookContext.globalVars().frametime().valueOr(kDefaultFrameTime);
 
         using namespace player_model_glow_preview_params;
-        if (kFrameTime < kAnimationCycleDuration - state().animationProgress)
-            state().animationProgress += kFrameTime;
+        if (frameTime < kAnimationCycleDuration - state().animationProgress)
+            state().animationProgress += frameTime;
         else
             state().animationProgress = 0.0f;
     }

diff --git a/Source/GameClasses/GlobalVars.h b/Source/GameClasses/GlobalVars.h
@@ -11,5 +11,12 @@ struct GlobalVars {
         return {};
     }
 
+    [[nodiscard]] Optional<float> frametime() const noexcept
+    {
+        if (globalVars)
+            return globalVars->frametime;
+        return {};
+    }
+
     cs2::GlobalVars* globalVars;
 };