Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

merg from dev for lots of fix and optimize #52

Merged
merged 24 commits into from
Dec 12, 2024
Merged

merg from dev for lots of fix and optimize #52

Changes from all commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
65e74a3
Merge pull request #26 from digitalgust/dev
digitalgust Dec 19, 2023
222bc9d
fix issue #29 #30 #31
digitalgust Jan 20, 2024
7ac0d22
Merge pull request #33 from digitalgust/dev
digitalgust Jan 23, 2024
d6c9b28
Merge pull request #34 from digitalgust/dev
digitalgust Jan 23, 2024
43eead0
Merge pull request #35 from digitalgust/dev
digitalgust Jan 30, 2024
dcee840
Merge pull request #36 from digitalgust/dev
digitalgust Jan 30, 2024
4366fdf
Merge pull request #38 from digitalgust/dev
digitalgust Feb 1, 2024
27a240c
Merge pull request #39 from digitalgust/dev
digitalgust Feb 5, 2024
53e96e3
Merge pull request #40 from digitalgust/dev
digitalgust Feb 6, 2024
1e770a4
Merge pull request #41 from digitalgust/dev
digitalgust Feb 21, 2024
99d9790
Merge pull request #42 from digitalgust/dev
digitalgust Feb 22, 2024
d15d0ed
fix jdwp deadlock
digitalgust Feb 24, 2024
4eb7684
update thread and optimize java threadsleep
digitalgust Feb 27, 2024
57f6073
update minijvm api
digitalgust Mar 1, 2024
e3eff13
fix gui layer
digitalgust Mar 2, 2024
b2ecfbe
Merge branch 'dev'
digitalgust Mar 3, 2024
b54ac17
fix win32 compile script
digitalgust Mar 3, 2024
bf01e07
Update GlfwCallBackImpl.java
digitalgust Mar 10, 2024
f87614e
从digitalgust/dev合并拉取请求#43
digitalgust Mar 26, 2024
1a241d1
Merge pull request #45 from digitalgust/dev
digitalgust May 15, 2024
2a19cc1
Merge pull request #46 from digitalgust/dev
digitalgust Jun 15, 2024
7821de1
Merge pull request #48 from digitalgust/dev
digitalgust Aug 27, 2024
d088d73
Merge pull request #49 from digitalgust/dev
digitalgust Sep 1, 2024
c3d9fbd
Merge pull request #50 from digitalgust/dev
digitalgust Oct 15, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions extlib/xgui/src/main/java/org/mini/glfw/GlfwCallBackImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
*/

import org.mini.apploader.AppLoader;
import org.mini.apploader.Sync;
import org.mini.glwrap.GLUtil;
import org.mini.gui.GCallBack;
import org.mini.gui.GForm;
Expand Down Expand Up @@ -179,10 +180,10 @@ public void mainLoop() {

cost = now - startAt;
//System.out.println(cost);
if (cost < 1000 / fpsExpect) {
Thread.sleep((long) (1000 / fpsExpect - cost));
}
// Sync.sync((int) fpsExpect);
// if (cost < 1000 / fpsExpect) {
// Thread.sleep((long) (1000 / fpsExpect - cost));
// }
Sync.sync((int) fpsExpect);
} catch (Exception ex) {
ex.printStackTrace();

Expand Down
Loading