MirrorDimension/ocelot-desktop
1
0
Fork 0
mirror of https://gitlab.com/cc-ru/ocelot/ocelot-desktop.git synced 2025-12-20 02:59:19 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix FPS counter "frame" skip

Browse Source
This commit is contained in:
UnicornFreedom 2025-08-22 17:17:01 +02:00
parent b03078ff27
commit 667a74519a
No known key found for this signature in database
GPG Key ID: B4ED0DB6B940024F
2 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/scala/ocelot/desktop/OcelotDesktop.scala
View File

@ -55,7 +55,7 @@ object OcelotDesktop extends LoggingConfiguration with Logging {
def emulationPaused_=(paused: Boolean): Unit = { def emulationPaused_=(paused: Boolean): Unit = {
_emulationPaused = paused _emulationPaused = paused
// avoid sudden jumps of TPS counter after a pause // avoid sudden jumps of TPS counter after a pause
if (!paused) tpsCounter.skipFrame() if (!paused) tpsCounter.skipSecond()
} }
private val TickerIntervalHistorySize = 5 private val TickerIntervalHistorySize = 5

16
src/main/scala/ocelot/desktop/util/FPSCalculator.scala
View File

@ -9,29 +9,31 @@ class FPSCalculator {
def fps: Float = _fps def fps: Float = _fps
private var _skipFrame = false private var _skipSecond = false
/** /**
* Next tick will not count towards the overall statistics. * Current second will not count towards the overall statistics.
* (In case the measurements were corrupted or distorted somehow.)
*/ */
def skipFrame(): Unit = _skipFrame = true def skipSecond(): Unit = _skipSecond = true
var dt: Float = 0 var dt: Float = 0
def tick(): Unit = { def tick(): Unit = {
val currentTime = System.currentTimeMillis() val currentTime = System.currentTimeMillis()
if (!_skipFrame) {
dt = (currentTime - prevFrameTime) / 1000f dt = (currentTime - prevFrameTime) / 1000f
numFrames += 1 numFrames += 1
if (currentTime - prevTime > 1000) { if (currentTime - prevTime > 1000) {
val delta = currentTime - prevTime val delta = currentTime - prevTime
prevTime = currentTime prevTime = currentTime
_fps = numFrames.asInstanceOf[Float] / delta * 1000f if (!_skipSecond) {
numFrames = 0 _fps = numFrames.toFloat / delta * 1000.0f
} else {
_skipSecond = false
} }
numFrames = 0
} }
prevFrameTime = currentTime prevFrameTime = currentTime