Improve FPS display

Author: ShootMe

Components/LiveSplit.OriWotW.dll

@@ -1,5 +1,13 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <updates>
+    <update version="1.1.8">
+        <files>
+            <file path="Components/LiveSplit.OriWotW.dll" status="changed"/>
+        </files>
+        <changelog>
+            <change> Improved FPS display output </change>
+        </changelog>
+    </update>
     <update version="1.1.7">
         <files>
             <file path="Components/LiveSplit.OriWotW.dll" status="changed"/>

Components/Updates.xml

@@ -1,41 +1,88 @@
 using System.Diagnostics;
 namespace LiveSplit.OriWotW {
     public class FPSTimer {
-        private const long AveTimeTicks = 10000000;
-        private const long ShortTimeTicks = 1000000;
-        public float FPS = 0;
-        public float FPSShort = 0;
+        private TimeCalculation averageTime;
+        private TimeCalculation shortTime;
         private Stopwatch frameTimer;
         private int lastFrameCount = 0;
-        private int lastFrameShort = 0;
         private long lastTicks = 0;
-        private long lastTicksShort = 0;
-        public FPSTimer() {
+        private long updateDisplay;
+        private float cacheFPS;
+        public float FPS {
+            get {
+                if (updateDisplay > 2500000) {
+                    updateDisplay = 0;
+                    cacheFPS = averageTime.FPS;
+                }
+                return cacheFPS;
+            }
+        }
+        public float FPSShort { get { return shortTime.FPS; } }
+        public FPSTimer(int aveSamples, int shortSamples) {
             frameTimer = new Stopwatch();
             frameTimer.Start();
+            averageTime = new TimeCalculation(aveSamples);
+            shortTime = new TimeCalculation(shortSamples);
         }
         public void Reset() {
-            lastTicksShort = 0;
             lastTicks = 0;
             lastFrameCount = 0;
-            lastFrameShort = 0;
+            averageTime.Reset();
+            shortTime.Reset();
         }
         public void Update(int frameCount) {
             long ticks = frameTimer.ElapsedTicks;
-            if (ticks >= lastTicks) {
-                if (lastFrameCount > 0) {
-                    FPS = (float)((double)10000000 * (double)(frameCount - lastFrameCount) / (double)(ticks - lastTicks + AveTimeTicks));
-                }
-                lastFrameCount = frameCount;
-                lastTicks = ticks + AveTimeTicks;
+            long ticksDifference = ticks - lastTicks;
+            int frameDifference = frameCount - lastFrameCount;
+            if (lastFrameCount > 0) {
+                updateDisplay += ticksDifference;
+                averageTime.AddSample(ticksDifference, frameDifference);
+                shortTime.AddSample(ticksDifference, frameDifference);
             }
-            if (ticks >= lastTicksShort) {
-                if (lastFrameShort > 0) {
-                    FPSShort = (float)((double)10000000 * (double)(frameCount - lastFrameShort) / (double)(ticks - lastTicksShort + ShortTimeTicks));
-                }
-                lastFrameShort = frameCount;
-                lastTicksShort = ticks + ShortTimeTicks;
+            lastTicks = ticks;
+            lastFrameCount = frameCount;
+        }
+    }
+    public class TimeCalculation {
+        private TimeSlice[] samples;
+        private long totalTime;
+        private int totalFrames;
+        private int index;
+
+        public TimeCalculation(int sampleCount) {
+            samples = new TimeSlice[sampleCount];
+        }
+        public void Reset() {
+            totalTime = 0;
+            totalFrames = 0;
+            for (int i = 0; i < samples.Length; i++) {
+                samples[i] = default(TimeSlice);
+            }
+        }
+        public void AddSample(long ticks, int frames) {
+            TimeSlice slice = samples[index];
+            totalTime += ticks - slice.Ticks;
+            totalFrames += frames - slice.Frames;
+            slice.Ticks = ticks;
+            slice.Frames = frames;
+            samples[index++] = slice;
+            if (index >= samples.Length) {
+                index = 0;
             }
         }
+        public float FPS {
+            get { return (float)((double)10000000 * (double)totalFrames / (double)totalTime); }
+        }
+        public override string ToString() {
+            return FPS.ToString("0.0");
+        }
+    }
+    public struct TimeSlice {
+        public long Ticks;
+        public int Frames;
+
+        public override string ToString() {
+            return $"{Ticks}-{Frames}";
+        }
     }
 }

Memory/FPSTimer.cs

@@ -62,7 +62,7 @@ public partial class MemoryManager {
         public DateTime LastHooked { get; set; }
         private bool? noPausePatched = null;
         private bool? targetFrameRatePatched = null;
-        private FPSTimer fpsTimer = new FPSTimer();
+        private FPSTimer fpsTimer = new FPSTimer(200, 15);
 
         public MemoryManager() {
             LastHooked = DateTime.MinValue;

Memory/MemoryManager.cs

@@ -14,6 +14,6 @@
 [assembly: AssemblyCulture("")]
 [assembly: ComVisible(false)]
 [assembly: Guid("b3294e28-2bd4-4e39-92fa-e04a620c737f")]
-[assembly: AssemblyVersion("1.1.7.0")]
-[assembly: AssemblyFileVersion("1.1.7.0")]
+[assembly: AssemblyVersion("1.1.8.0")]
+[assembly: AssemblyFileVersion("1.1.8.0")]
 [assembly: ComponentFactory(typeof(Factory))]