ENSEEIHT/projet-programmation-orientee-objet
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

correction bug volume musiques

Browse source
This commit is contained in:
heurtet 2021-05-14 15:15:02 +02:00
parent 82f8eeb13c
commit 625ddf1ce9
5 changed files with 12 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
core/src/sagittarius/view/CreditScreen.java
View file

@ -21,6 +21,7 @@ public class CreditScreen extends BaseScreen {
SagittariusGame.music.stop();
SagittariusGame.music = Gdx.audio.newMusic(Gdx.files.internal("core/assets/sounds/music/credit_music.mp3"));
SagittariusGame.music.setLooping(true);
SagittariusGame.music.setVolume(SagittariusGame.musicVolume);
SagittariusGame.music.play();
}

1
core/src/sagittarius/view/GameScreen.java
View file

@ -53,6 +53,7 @@ public class GameScreen extends BaseScreen implements InputProcessor {
SagittariusGame.music.stop();
SagittariusGame.music = Gdx.audio.newMusic(Gdx.files.internal("core/assets/sounds/music/game_music.mp3"));
SagittariusGame.music.setLooping(true);
SagittariusGame.music.setVolume(SagittariusGame.musicVolume);
SagittariusGame.music.play();
}

4
core/src/sagittarius/view/ResumeScreen.java
View file

@ -28,6 +28,7 @@ public class ResumeScreen extends BaseScreen {
SagittariusGame.music.stop();
SagittariusGame.music = Gdx.audio.newMusic(Gdx.files.internal("core/assets/sounds/music/resumeMenu_music.mp3"));
SagittariusGame.music.setLooping(true);
SagittariusGame.music.setVolume(SagittariusGame.musicVolume);
SagittariusGame.music.play();
}
Gdx.input.setInputProcessor(uiStage);
@ -59,6 +60,7 @@ public class ResumeScreen extends BaseScreen {
super.tap(event, x, y, count, button);
SagittariusGame.music.setVolume(Float.parseFloat(musicVolume.getTextField().getText()));
SagittariusGame.musicVolume = Float.parseFloat(musicVolume.getTextField().getText());
SagittariusGame.soundsVolume = Float.parseFloat(musicSounds.getTextField().getText());
// Deactivate music or not
@ -67,6 +69,7 @@ public class ResumeScreen extends BaseScreen {
SagittariusGame.disableMusic = true;
}
else if (!disableMusic.isChecked() && ! SagittariusGame.music.isPlaying()){
SagittariusGame.music.setVolume(SagittariusGame.musicVolume);
SagittariusGame.music.play();
SagittariusGame.disableMusic = false;
}
@ -94,6 +97,7 @@ public class ResumeScreen extends BaseScreen {
SagittariusGame.music.stop();
SagittariusGame.music = Gdx.audio.newMusic(Gdx.files.internal("core/assets/sounds/music/game_music.mp3"));
SagittariusGame.music.setLooping(true);
SagittariusGame.music.setVolume(SagittariusGame.musicVolume);
SagittariusGame.music.play();
}
SagittariusGame.setActiveScreen( gameScreen );

3
core/src/sagittarius/view/SettingsScreen.java
View file

@ -21,6 +21,7 @@ public class SettingsScreen extends BaseScreen {
SagittariusGame.music.stop();
SagittariusGame.music = Gdx.audio.newMusic(Gdx.files.internal("core/assets/sounds/music/resumeMenu_music.mp3"));
SagittariusGame.music.setLooping(true);
SagittariusGame.music.setVolume(SagittariusGame.musicVolume);
SagittariusGame.music.play();
}
@ -62,6 +63,7 @@ public class SettingsScreen extends BaseScreen {
SagittariusGame.G = Float.parseFloat(gConstField.getTextField().getText());
SagittariusGame.music.setVolume(Float.parseFloat(musicVolume.getTextField().getText()));
SagittariusGame.musicVolume= Float.parseFloat(musicVolume.getTextField().getText());
SagittariusGame.soundsVolume = Float.parseFloat(musicSounds.getTextField().getText());
SagittariusGame.debugMode = debugModeBox.isChecked();
@ -73,6 +75,7 @@ public class SettingsScreen extends BaseScreen {
else if (!disableMusic.isChecked() && ! SagittariusGame.music.isPlaying()){
SagittariusGame.music = Gdx.audio.newMusic(Gdx.files.internal("core/assets/sounds/music/resumeMenu_music.mp3"));
SagittariusGame.music.setVolume(SagittariusGame.musicVolume);
SagittariusGame.music.play();
SagittariusGame.disableMusic = false;
}

3
core/src/sagittarius/view/StartScreen.java
View file

@ -21,12 +21,15 @@ public class StartScreen extends BaseScreen {
SagittariusGame.music.stop();
SagittariusGame.music = Gdx.audio.newMusic(Gdx.files.internal("core/assets/sounds/music/mainMenu_music.mp3"));
SagittariusGame.music.setLooping(true);
SagittariusGame.music.setVolume(SagittariusGame.musicVolume);
SagittariusGame.music.play();
}
else {
SagittariusGame.music = Gdx.audio.newMusic(Gdx.files.internal("core/assets/sounds/music/mainMenu_music.mp3"));
SagittariusGame.music.setLooping(true);
SagittariusGame.music.setVolume(SagittariusGame.musicVolume);
SagittariusGame.music.play();
}