From eb6131cacf81da388ea60f0a254a6b7bdc658526 Mon Sep 17 00:00:00 2001
From: lax1dude <cgiacun@gmail.com>
Date: Wed, 11 Dec 2024 21:32:51 -0800
Subject: [PATCH] Better sync
---
.../eaglercraft/glemu/EaglerAdapterGL30.java | 30 +++++++++++--------
1 file changed, 18 insertions(+), 12 deletions(-)
diff --git a/src/main/java/net/lax1dude/eaglercraft/glemu/EaglerAdapterGL30.java b/src/main/java/net/lax1dude/eaglercraft/glemu/EaglerAdapterGL30.java
index b4e57c3..f65037d 100644
--- a/src/main/java/net/lax1dude/eaglercraft/glemu/EaglerAdapterGL30.java
+++ b/src/main/java/net/lax1dude/eaglercraft/glemu/EaglerAdapterGL30.java
@@ -1614,26 +1614,32 @@ public class EaglerAdapterGL30 extends EaglerAdapterImpl2 {
}
public static boolean sync(int limitFramerate, long[] timerPtr) {
- boolean limitFPS = limitFramerate > 0 && limitFramerate < 1000;
+ boolean limitFPS = limitFramerate > 0 && limitFramerate <= 1000;
boolean blocked = false;
if(limitFPS) {
+ long frameMillis = (1000l / limitFramerate);
if(timerPtr[0] == 0l) {
- timerPtr[0] = steadyTimeMillis();
+ timerPtr[0] = steadyTimeMillis() + frameMillis;
}else {
long millis = steadyTimeMillis();
- long frameMillis = (1000l / limitFramerate);
- long frameTime = millis - timerPtr[0];
- if(frameTime > 2000l || frameTime < 0l) {
- frameTime = frameMillis;
- timerPtr[0] = millis;
- }else {
- timerPtr[0] += frameMillis;
- }
- if(frameTime >= 0l && frameTime < frameMillis) {
- sleep((int)(frameMillis - frameTime));
+ long remaining = timerPtr[0] - millis;
+ if(remaining > 0) {
+ if(isWebGL) {
+ immediateContinue(); // cannot stack setTimeouts, or it will throttle
+ millis = steadyTimeMillis();
+ remaining = timerPtr[0] - millis;
+ if(remaining > 0) {
+ sleep((int)remaining);
+ }
+ }else {
+ sleep((int)remaining);
+ }
blocked = true;
}
+ if((timerPtr[0] += frameMillis) < millis) {
+ timerPtr[0] = millis;
+ }
}
}else {
timerPtr[0] = 0l;