Merge remote-tracking branch 'origin/master'

This commit is contained in:
Seraina 2022-05-14 17:21:47 +02:00
commit 2393fb68fe
4 changed files with 105 additions and 1 deletions

View File

@ -8,7 +8,7 @@ plugins {
javafx { javafx {
version = "11.0.2" version = "11.0.2"
modules = ['javafx.controls', 'javafx.fxml', 'javafx.base', 'javafx.graphics'] modules = ['javafx.controls', 'javafx.fxml', 'javafx.base', 'javafx.graphics', 'javafx.media']
} }
group 'ch.unibas.dmi.dbis' group 'ch.unibas.dmi.dbis'

View File

@ -0,0 +1,102 @@
package ch.unibas.dmi.dbis.cs108.multiplayer.client;
import java.io.File;
import java.net.URL;
import javafx.scene.media.*;
public class Sound {
static URL backgroundSoundsURL = Sound.class.getResource("sounds/tracknoise.wav");
static AudioClip backgroundSounds = new AudioClip(backgroundSoundsURL.toString());
static boolean playingBackgroundSounds = false;
static URL bellURL = Sound.class.getResource("sounds/bell.wav");
static AudioClip bell = new AudioClip(bellURL.toString());
static URL daynoisesURL = Sound.class.getResource("sounds/daynoises.wav");
static AudioClip daynoises = new AudioClip(daynoisesURL.toString());
static URL nightnoisesURL = Sound.class.getResource("sounds/nightnoises.wav");
static AudioClip nightnoises = new AudioClip(nightnoisesURL.toString());
static URL gameoverghostsURL = Sound.class.getResource("sounds/gameoverghosts.wav");
static AudioClip gameoverghosts = new AudioClip(gameoverghostsURL.toString());
static URL gameoverhumansURL = Sound.class.getResource("sounds/gameoverhumans.wav");
static AudioClip gameoverhumans = new AudioClip(gameoverhumansURL.toString());
static URL ghost01URL = Sound.class.getResource("sounds/ghost01.wav");
static AudioClip ghost01 = new AudioClip(ghost01URL.toString());
static URL ghost02URL = Sound.class.getResource("sounds/ghost02.wav");
static AudioClip ghost02 = new AudioClip(ghost02URL.toString());
static URL ghost03URL = Sound.class.getResource("sounds/ghost03.wav");
static AudioClip ghost03 = new AudioClip(ghost03URL.toString());
static URL ghost04URL = Sound.class.getResource("sounds/ghost04.wav");
static AudioClip ghost04 = new AudioClip(ghost04URL.toString());
static URL musicdayURL = Sound.class.getResource("sounds/music_day.wav");
static AudioClip musicday = new AudioClip(musicdayURL.toString());
static URL voteforghostURL = Sound.class.getResource("sounds/voteforghost.wav");
static AudioClip voteforghost = new AudioClip(voteforghostURL.toString());
static URL voteforhumanURL = Sound.class.getResource("sounds/voteforhuman.wav");
static AudioClip voteforhuman = new AudioClip(voteforhumanURL.toString());
public static void main(String[] args) throws Exception {
//startPlayingBackgroundSounds();
ghost();
while(true) {
}
}
public static void startPlayingBackgroundSounds() {
playingBackgroundSounds = true;
backgroundSounds.setCycleCount(AudioClip.INDEFINITE);
backgroundSounds.play();
}
public static void bell() {
bell.play();
}
public static void startDaynoises() {
daynoises.setCycleCount(AudioClip.INDEFINITE);
daynoises.play();
}
public static void stopDaynoises() {
daynoises.stop();
}
public static void ghost() {
double playbackspeed = (Math.random() / 5.0) + 0.9;
System.out.println(playbackspeed);
ghost01.play(0.5, 0.0, playbackspeed, 0.0, 5);
}
}

View File

@ -1,6 +1,7 @@
package ch.unibas.dmi.dbis.cs108.multiplayer.client.gui; package ch.unibas.dmi.dbis.cs108.multiplayer.client.gui;
import ch.unibas.dmi.dbis.cs108.BudaLogConfig; import ch.unibas.dmi.dbis.cs108.BudaLogConfig;
import ch.unibas.dmi.dbis.cs108.multiplayer.client.Sound;
import ch.unibas.dmi.dbis.cs108.multiplayer.client.gui.ChatApp; import ch.unibas.dmi.dbis.cs108.multiplayer.client.gui.ChatApp;
import javafx.application.Application; import javafx.application.Application;
import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.LogManager;
@ -42,6 +43,7 @@ public class GUI implements Runnable {
public void run() { public void run() {
LOGGER.info("here"); LOGGER.info("here");
//Application.launch(this.chatApp.getClass()); //Application.launch(this.chatApp.getClass());
Sound.startPlayingBackgroundSounds();
Application.launch(this.chatApp.getClass()); Application.launch(this.chatApp.getClass());
} }
} }