Skip to content

feat: Non-renderframe-synced keysound/updates #836

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

Open
phu54321 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

feat: Non-renderframe-synced keysound/updates #836

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
43 changes: 29 additions & 14 deletions src/bms/player/beatoraja/MainController.java
View file
Open in desktop
Copy link
Copy Markdown
Author

@phu54321 phu54321 Jul 24, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

for anybody wondering why we're also calling timer.update(); on render(), it is possible that the input polling thread somehow magically fails to acquire timerLock for prolonged time. So we want every entity acquiring the timer lock to update the timer ASAP.

Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@
import java.nio.file.Path;
import java.nio.file.Paths;
import java.util.*;
import java.util.concurrent.locks.Lock;
import java.util.concurrent.locks.ReentrantLock;
import java.util.logging.Logger;

import org.lwjgl.input.Mouse;
Expand Down Expand Up @@ -77,6 +79,7 @@ public class MainController {
private MainState current;

private TimerManager timer;
private Lock timerLock;

private Config config;
private PlayerConfig player;
Expand Down Expand Up @@ -192,6 +195,7 @@ public MainController(Path f, Config config, PlayerConfig player, BMSPlayerMode
}

timer = new TimerManager();
timerLock = new ReentrantLock();
sound = new SystemSoundManager(this);

if(config.isUseDiscordRPC()) {
Expand Down Expand Up @@ -361,6 +365,13 @@ public void create() {
if (time != now) {
time = now;
input.poll();
if (timerLock.tryLock()) {
try {
timer.update();
} finally {
timerLock.unlock();
}
}
} else {
try {
Thread.sleep(0, 500000);
Expand Down Expand Up @@ -410,22 +421,26 @@ public void create() {

public void render() {
// input.poll();
timer.update();

Gdx.gl.glClear(GL20.GL_COLOR_BUFFER_BIT);
timerLock.lock();
try {
timer.update();
Gdx.gl.glClear(GL20.GL_COLOR_BUFFER_BIT);

current.render();
sprite.begin();
if (current.getSkin() != null) {
current.getSkin().updateCustomObjects(current);
current.getSkin().drawAllObjects(sprite, current);
}
sprite.end();
current.render();
sprite.begin();
if (current.getSkin() != null) {
current.getSkin().updateCustomObjects(current);
current.getSkin().drawAllObjects(sprite, current);
}
sprite.end();

final Stage stage = current.getStage();
if (stage != null) {
stage.act(Math.min(Gdx.graphics.getDeltaTime(), 1 / 30f));
stage.draw();
final Stage stage = current.getStage();
if (stage != null) {
stage.act(Math.min(Gdx.graphics.getDeltaTime(), 1 / 30f));
stage.draw();
}
} finally {
timerLock.unlock();
}

// show fps
Expand Down