mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-01-28 00:19:57 +07:00
Code Issues Packages Projects Releases Wiki Activity

Fixed slowdown when FPS got lower than TPS

Browse Source
This commit is contained in:
Anuken 2018-07-05 15:40:31 -04:00
parent 5e66dfcc36
commit 23188df276
1 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
core/src/io/anuke/mindustry/core/ThreadHandler.java
View File

@ -17,7 +17,8 @@ public class ThreadHandler {
private final Array<Runnable> toRun = new Array<>();
private final ThreadProvider impl;
private float delta = 1f;
private long frame = 0;
private float smoothDelta = 1f;
private long frame = 0, lastDeltaUpdate;
private float framesSinceUpdate;
private boolean enabled;
@ -29,7 +30,7 @@ public class ThreadHandler {
Timers.setDeltaProvider(() -> {
float result = impl.isOnThread() ? delta : Gdx.graphics.getDeltaTime()*60f;
return Math.min(Float.isNaN(result) ? 1f : result, 12f);
return Math.min(Float.isNaN(result) ? 1f : result, 15f);
});
}
@ -62,7 +63,7 @@ public class ThreadHandler {
}
public int getTPS(){
return (int)(60/delta);
return (int)(60/smoothDelta);
}
public long getFrameID(){
@ -138,8 +139,6 @@ public class ThreadHandler {
long elapsed = TimeUtils.nanosToMillis(TimeUtils.timeSinceNanos(time));
long target = (long) ((1000) / 60f);
delta = Math.max(elapsed, target) / 1000f * 60f;
if (elapsed < target) {
impl.sleep(target - elapsed);
}
@ -151,6 +150,14 @@ public class ThreadHandler {
rendered = false;
}
long actuallyElapsed = TimeUtils.nanosToMillis(TimeUtils.timeSinceNanos(time));
delta = Math.max(actuallyElapsed, target) / 1000f * 60f;
if(TimeUtils.timeSinceMillis(lastDeltaUpdate) > 1000){
lastDeltaUpdate = TimeUtils.millis();
smoothDelta = delta;
}
frame ++;
framesSinceUpdate = 0;
}