stef_buwalda/pism
1
0
Fork 0
mirror of https://github.com/2OOP/pism.git synced 2026-02-04 10:54:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/AudioDisplay' into AudioDisplay

Browse Source
This commit is contained in:
lieght
2025-10-16 00:57:01 +02:00
parent 3784cd790e f44c3932dc
commit abc173a1ee
14 changed files with 156 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

70
app/src/main/java/org/toop/app/view/displays/SongDisplay.java
View File

@@ -3,64 +3,84 @@ package org.toop.app.view.displays;
import javafx.application.Platform;
import javafx.scene.control.ProgressBar;
import javafx.scene.layout.VBox;
import org.toop.app.App;
import org.toop.app.view.View;
import org.toop.framework.audio.AudioEventListener;
import org.toop.framework.resource.ResourceManager;
import org.toop.framework.resource.resources.MusicAsset;
import org.toop.local.AppContext;
import javafx.scene.paint.Color;
import org.toop.framework.audio.events.AudioEvents;
import org.toop.framework.eventbus.EventFlow;
import javafx.geometry.Pos;
import javafx.scene.control.Button;
import javafx.scene.text.Text;
import org.toop.framework.audio.MusicManager;
import java.util.ArrayList;
import java.util.List;
public class SongDisplay extends VBox {
private final Text songTitle;
private final ProgressBar progressBar;
private final Text progressText;
private MusicManager<MusicAsset> manager;
public SongDisplay() {
new EventFlow()
.listen(this::updateTheSong);
//TODO ADD NICER CSS
setAlignment(Pos.CENTER);
getStyleClass().add("song-display");
// TODO ADD GOOD SONG TITLES WITH ARTISTS DISPLAYED
songTitle = new Text("song playing");
songTitle.setFill(Color.WHITE);
songTitle.getStyleClass().add("song-title");
progressBar = new ProgressBar(0);
progressBar.getStyleClass().add("progress-bar");
progressText = new Text("THIS IS AN EXAMPLE CUZ BAS DIDNT DECIDE TO MAKE EVENTS");
progressText = new Text("0:00/0:00");
progressText.setFill(Color.WHITE);
progressText.getStyleClass().add("progress-text");
getChildren().addAll(songTitle, progressBar, progressText);
//TODO ADD SKIP BUTTON
setMusicManager();
getChildren().addAll(songTitle, progressBar, progressText);
}
public void updateTheSong(String title, double progress) {
songTitle.setText(title);
private void updateTheSong(AudioEvents.PlayingMusic event) {
Platform.runLater(() -> {
String text = event.name();
text = text.substring(0, text.length() - 4);
songTitle.setText(text);
double currentPos = event.currentPosition();
double duration = event.duration();
if (currentPos / duration > 0.05) {
double progress = currentPos / duration;
progressBar.setProgress(progress);
}
public String getPlayingSong() {
return manager.getCurrentTrack().getName();
else if (currentPos / duration < 0.05) {
progressBar.setProgress(0.05);
}
progressText.setText(getTimeString(event.currentPosition(), event.duration()));
});
}
public void setMusicManager() {
List<MusicAsset> tracks = ResourceManager.getAllOfTypeAndRemoveWrapper(MusicAsset.class);
this.manager = new MusicManager<>(tracks);
private String getTimeString(long position, long duration) {
long positionMinutes = position / 60;
long durationMinutes = duration / 60;
long positionSeconds = position % 60;
long durationSeconds = duration % 60;
String positionSecondsStr = String.valueOf(positionSeconds);
String durationSecondsStr = String.valueOf(durationSeconds);
String song = getPlayingSong();
Platform.runLater(() -> songTitle.setText(song));
if (positionSeconds < 10) {
positionSecondsStr = "0" + positionSeconds;
}
if (durationSeconds < 10) {
durationSecondsStr = "0" + durationSeconds;
}
String time = positionMinutes + ":" + positionSecondsStr + " / " + durationMinutes + ":" + durationSecondsStr;
return time;
}
}

9
app/src/main/java/org/toop/app/view/views/ChallengeView.java
View File

@@ -4,6 +4,7 @@ import org.toop.app.GameInformation;
import org.toop.app.Server;
import org.toop.app.view.View;
import org.toop.app.view.ViewStack;
import org.toop.app.view.displays.SongDisplay;
import org.toop.local.AppContext;
import javafx.geometry.Pos;
@@ -95,6 +96,14 @@ public final class ChallengeView extends View {
nodes.add(vbox(computerDifficultyText, computerDifficultySlider));
}
final SongDisplay songdisplay = new SongDisplay();
add(Pos.BOTTOM_RIGHT,
fit(vboxFill(
songdisplay
)));
add(Pos.CENTER,
fit(hboxFill(
vboxFill(

9
app/src/main/java/org/toop/app/view/views/CreditsView.java
View File

@@ -3,6 +3,7 @@ package org.toop.app.view.views;
import org.toop.app.App;
import org.toop.app.view.View;
import org.toop.app.view.ViewStack;
import org.toop.app.view.displays.SongDisplay;
import org.toop.local.AppContext;
import javafx.animation.KeyFrame;
@@ -46,6 +47,14 @@ public final class CreditsView extends View {
final Text openglHeader = header();
openglHeader.setText(AppContext.getString("opengl") + ": Omar");
final SongDisplay songdisplay = new SongDisplay();
add(Pos.BOTTOM_RIGHT,
fit(vboxFill(
songdisplay
)));
add(Pos.CENTER,
fit("credits-fit", vboxFill("credits-container", "credits-container",
vbox("credits-spacer-top", ""),

9
app/src/main/java/org/toop/app/view/views/GameView.java
View File

@@ -2,6 +2,7 @@ package org.toop.app.view.views;
import org.toop.app.view.View;
import org.toop.app.view.ViewStack;
import org.toop.app.view.displays.SongDisplay;
import org.toop.local.AppContext;
import javafx.geometry.Pos;
@@ -85,6 +86,14 @@ public final class GameView extends View {
forfeitButton = null;
}
final SongDisplay songdisplay = new SongDisplay();
add(Pos.BOTTOM_RIGHT,
fit(vboxFill(
songdisplay
)));
if (onMessage != null) {
chatListView = new ListView<Text>();

9
app/src/main/java/org/toop/app/view/views/LocalMultiplayerView.java
View File

@@ -5,6 +5,7 @@ import org.toop.app.game.ReversiGame;
import org.toop.app.game.TicTacToeGame;
import org.toop.app.view.View;
import org.toop.app.view.ViewStack;
import org.toop.app.view.displays.SongDisplay;
import org.toop.local.AppContext;
import javafx.geometry.Pos;
@@ -48,6 +49,14 @@ public final class LocalMultiplayerView extends View {
}
});
final SongDisplay songdisplay = new SongDisplay();
add(Pos.BOTTOM_RIGHT,
fit(vboxFill(
songdisplay
)));
add(Pos.CENTER,
fit(vboxFill(
hbox(

9
app/src/main/java/org/toop/app/view/views/LocalView.java
View File

@@ -3,6 +3,7 @@ package org.toop.app.view.views;
import org.toop.app.GameInformation;
import org.toop.app.view.View;
import org.toop.app.view.ViewStack;
import org.toop.app.view.displays.SongDisplay;
import org.toop.local.AppContext;
import javafx.geometry.Pos;
@@ -34,6 +35,14 @@ public final class LocalView extends View {
backButton.setText(AppContext.getString("back"));
backButton.setOnAction(_ -> { ViewStack.push(new MainView()); });
final SongDisplay songdisplay = new SongDisplay();
add(Pos.BOTTOM_RIGHT,
fit(vboxFill(
songdisplay
)));
add(Pos.BOTTOM_LEFT,
vboxFill(
backButton

1
app/src/main/java/org/toop/app/view/views/MainView.java
View File

@@ -37,7 +37,6 @@ public final class MainView extends View {
final SongDisplay songdisplay = new SongDisplay();
add(Pos.BOTTOM_RIGHT,
fit(vboxFill(
songdisplay

8
app/src/main/java/org/toop/app/view/views/OnlineView.java
View File

@@ -3,6 +3,7 @@ package org.toop.app.view.views;
import org.toop.app.Server;
import org.toop.app.view.View;
import org.toop.app.view.ViewStack;
import org.toop.app.view.displays.SongDisplay;
import org.toop.local.AppContext;
import javafx.geometry.Pos;
@@ -44,6 +45,13 @@ public class OnlineView extends View {
new Server(serverIPInput.getText(), serverPortInput.getText(), playerNameInput.getText());
});
final SongDisplay songdisplay = new SongDisplay();
add(Pos.BOTTOM_RIGHT,
fit(vboxFill(
songdisplay
)));
add(Pos.CENTER,
fit(vboxFill(
serverInformationHeader,

9
app/src/main/java/org/toop/app/view/views/OptionsView.java
View File

@@ -3,6 +3,7 @@ package org.toop.app.view.views;
import org.toop.app.App;
import org.toop.app.view.View;
import org.toop.app.view.ViewStack;
import org.toop.app.view.displays.SongDisplay;
import org.toop.framework.audio.VolumeControl;
import org.toop.framework.audio.events.AudioEvents;
import org.toop.framework.eventbus.EventFlow;
@@ -99,6 +100,14 @@ public final class OptionsView extends View {
backButton.setText(AppContext.getString("back"));
backButton.setOnAction(_ -> { ViewStack.pop(); });
final SongDisplay songdisplay = new SongDisplay();
add(Pos.BOTTOM_RIGHT,
fit(vboxFill(
songdisplay
)));
add(Pos.BOTTOM_LEFT,
vboxFill(
backButton

9
app/src/main/java/org/toop/app/view/views/ServerView.java
View File

@@ -2,6 +2,7 @@ package org.toop.app.view.views;
import org.toop.app.view.View;
import org.toop.app.view.ViewStack;
import org.toop.app.view.displays.SongDisplay;
import org.toop.local.AppContext;
import javafx.application.Platform;
@@ -53,6 +54,14 @@ public final class ServerView extends View {
listView = new ListView<Button>();
final SongDisplay songdisplay = new SongDisplay();
add(Pos.BOTTOM_RIGHT,
fit(vboxFill(
songdisplay
)));
add(Pos.CENTER,
fit(vboxFill(
vbox(

28
app/src/main/resources/assets/style/dark.css
View File

@@ -12,6 +12,34 @@
-fx-effect: dropshadow(gaussian, #224455cc, 8, 0, 0, 2);
}
.song-display {
-fx-background-color: rgba(30, 60, 30, 0.85);
-fx-background-radius: 10px;
-fx-padding: 8 12 8 12;
-fx-spacing: 6px;
-fx-alignment: center;
-fx-effect: dropshadow(gaussian, rgba(0, 0, 0, 0.5), 6, 0.5, 0, 2);
-fx-min-width: 220px;
-fx-max-width: 260px;
-fx-text-fill: white;
}
.song-title {
-fx-font-size: 14px;
-fx-font-weight: bold;
-fx-text-fill: white;
}
.progress-bar {
-fx-pref-width: 150px;
-fx-accent: red;
}
.progress-text {
-fx-font-size: 11px;
-fx-text-fill: white;
}
.button {
-fx-background-color: linear-gradient(to bottom, #1f5e20, #2e7d2e);
-fx-background-radius: 8;

9
app/src/main/resources/assets/style/high-contrast.css
View File

@@ -21,6 +21,7 @@
-fx-effect: dropshadow(gaussian, rgba(0, 0, 0, 0.5), 6, 0.5, 0, 2);
-fx-min-width: 220px;
-fx-max-width: 260px;
-fx-text-fill: white;
}
.song-title {
@@ -30,17 +31,15 @@
}
.progress-bar {
-fx-pref-width: 200px;
-fx-pref-height: 6px;
-fx-accent: #ff4d4d;
-fx-background-color: rgba(255, 255, 255, 0.15);
-fx-background-radius: 4px;
-fx-pref-width: 150px;
-fx-accent: red;
}
.progress-text {
-fx-font-size: 11px;
-fx-text-fill: white;
}
.button {
-fx-background-color: linear-gradient(to bottom, #1b7a1b, #2da32d);
-fx-background-radius: 8;

13
app/src/main/resources/assets/style/light.css
View File

@@ -13,7 +13,7 @@
}
.song-display {
-fx-background-color: rgba(20, 20, 20, 0.75);
-fx-background-color: rgba(30, 60, 30, 0.85);
-fx-background-radius: 10px;
-fx-padding: 8 12 8 12;
-fx-spacing: 6px;
@@ -21,6 +21,7 @@
-fx-effect: dropshadow(gaussian, rgba(0, 0, 0, 0.5), 6, 0.5, 0, 2);
-fx-min-width: 220px;
-fx-max-width: 260px;
-fx-text-fill: white;
}
.song-title {
@@ -30,17 +31,15 @@
}
.progress-bar {
-fx-pref-width: 200px;
-fx-pref-height: 6px;
-fx-accent: #4dd0e1; /* bright cyan progress color */
-fx-background-color: rgba(255, 255, 255, 0.15);
-fx-background-radius: 4px;
-fx-pref-width: 150px;
-fx-accent: red;
}
.progress-text {
-fx-font-size: 11px;
-fx-text-fill: #cccccc;
-fx-text-fill: white;
}
.button {
-fx-background-color: linear-gradient(to bottom, #7ac27a, #90d090);
-fx-background-radius: 8;

1
framework/src/main/java/org/toop/framework/audio/events/AudioEvents.java
View File

@@ -18,6 +18,7 @@ public class AudioEvents extends EventsBase {
/** Start background music. */
public record StartBackgroundMusic() implements GenericEvent {}
/** Gives back the name of the song, the position its currently at (in seconds) and how long it takes (in seconds) */
public record PlayingMusic(String name, long currentPosition, long duration) implements GenericEvent {}
/** Change volume, choose type with {@link VolumeControl}. */