Ryuk/Sudoku
3
1
Fork 0
Code Issues 8 Pull Requests Actions Projects Releases 1 Wiki Activity

Fixes #15 #36

Merged
Persson-dev merged 13 commits from multiplayer into master 2025-02-01 12:43:14 +00:00
Conversation 0 Commits 13 Files Changed 29 +33 -1
3 changed files with 33 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 6d96455ac4 - Show all commits

6
app/src/main/java/gui/menu/MultiPlayerDokuView.java
View File

@@ -2,6 +2,7 @@ package gui.menu;
import gui.widget.LeaderboardRenderer; import gui.widget.LeaderboardRenderer;
import gui.widget.SudokuRenderer; import gui.widget.SudokuRenderer;
import gui.widget.TimerRenderer;
import imgui.ImGui; import imgui.ImGui;
import network.client.Client; import network.client.Client;
import network.server.Server; import network.server.Server;
@@ -13,6 +14,8 @@ public class MultiPlayerDokuView extends BaseView{
private final Server server; private final Server server;
private final SudokuRenderer sudokuRenderer; private final SudokuRenderer sudokuRenderer;
private final LeaderboardRenderer leaderboardRenderer; private final LeaderboardRenderer leaderboardRenderer;
private final TimerRenderer timerRenderer;
private static final float GAME_DURATION = 10 * 60;
public MultiPlayerDokuView(StateMachine stateMachine, Client client, Server server) { public MultiPlayerDokuView(StateMachine stateMachine, Client client, Server server) {
super(stateMachine); super(stateMachine);
@@ -22,6 +25,8 @@ public class MultiPlayerDokuView extends BaseView{
this.leaderboardRenderer = new LeaderboardRenderer(client.getGame(), client.getPlayer()); this.leaderboardRenderer = new LeaderboardRenderer(client.getGame(), client.getPlayer());
this.sudokuRenderer.onCellChange.connect(this::onCellChange); this.sudokuRenderer.onCellChange.connect(this::onCellChange);
this.client.onDisconnect.connect(this::onDisconnect); this.client.onDisconnect.connect(this::onDisconnect);
// TODO: sync timer
this.timerRenderer = new TimerRenderer(GAME_DURATION);
} }
private void onCellChange(Cell cell) { private void onCellChange(Cell cell) {
@@ -36,6 +41,7 @@ public class MultiPlayerDokuView extends BaseView{
@Override @Override
public void render() { public void render() {
this.timerRenderer.render();
this.leaderboardRenderer.render(); this.leaderboardRenderer.render();
this.sudokuRenderer.render(); this.sudokuRenderer.render();
if (ImGui.button("Quitter")) { if (ImGui.button("Quitter")) {

1
app/src/main/java/gui/widget/LeaderboardRenderer.java
View File

@@ -54,7 +54,6 @@ public class LeaderboardRenderer {
} }
public void render() { public void render() {
ImGui.text("Placeholder for timer");
var displaySize = ImGui.getIO().getDisplaySize(); var displaySize = ImGui.getIO().getDisplaySize();
ImGui.setCursorPosX(displaySize.x / 2.0f - cellSize.x / 2.0f); ImGui.setCursorPosX(displaySize.x / 2.0f - cellSize.x / 2.0f);
ImGui.beginChild("Leaderboard", new ImVec2(cellSize.x + 15.0f, cellHeight * maxPlayersShowed)); ImGui.beginChild("Leaderboard", new ImVec2(cellSize.x + 15.0f, cellHeight * maxPlayersShowed));

27
app/src/main/java/gui/widget/TimerRenderer.java Normal file
View File

@@ -0,0 +1,27 @@
package gui.widget;
import imgui.ImGui;
public class TimerRenderer {
private float time;
private final float duration;
public TimerRenderer(float duration) {
this.time = 0;
this.duration = duration;
}
public void render() {
this.time += ImGui.getIO().getDeltaTime();
float remainingTime = this.duration - this.time;
int seconds = (int) remainingTime;
int minutes = seconds / 60;
seconds %= 60;
String text = minutes + ":" + seconds;
var textSize = ImGui.calcTextSize(text);
ImGui.setCursorPosX(ImGui.getIO().getDisplaySizeX() / 2.0f - textSize.x / 2.0f);
ImGui.text(text);
}
}