diff --git a/src/engine/camera.py b/src/engine/camera.py index 7850bad..672d7a9 100644 --- a/src/engine/camera.py +++ b/src/engine/camera.py @@ -3,6 +3,8 @@ from src.engine.entity import Entity class Camera: def __init__(self, DEBUG_MODE: bool, zoom: float): + self.DEBUG_MODE = DEBUG_MODE + self.x = 0 self.y = 0 self.zoom = zoom diff --git a/src/engine/engine.py b/src/engine/engine.py index cdb7d78..cde31fa 100644 --- a/src/engine/engine.py +++ b/src/engine/engine.py @@ -30,6 +30,7 @@ class Engine: self.running = False # Composants du moteur de jeu + self.settings_manager = SettingsManager(60, 1.75) # DOIT ABSOLUMENT ETRE EN PREMIER (Sinon les autres composants qui nécessite les settings crash) self.renderer = Renderer(self) self.event_handler = EventHandler(self) self.map_manager = MapManager() @@ -39,8 +40,10 @@ class Engine: self.event_sheduler = EventSheduler(self) self.dialogs_manager = DialogsManager(self.event_handler) self.menu_manager = MenuManager(self) - self.sound_manager = SoundManager(60) - self.settings_manager = SettingsManager(60, 1.75) + self.sound_manager = SoundManager(self.settings_manager.get_music_master_volume(), + self.settings_manager.get_sound_global_master_volume(), + self.settings_manager.get_sound_master_volume()) + def loop(self): """Fonction à lancer au début du programme et qui va lancer les updates dans une boucle. diff --git a/src/engine/sound_manager.py b/src/engine/sound_manager.py index 2f86468..db28590 100644 --- a/src/engine/sound_manager.py +++ b/src/engine/sound_manager.py @@ -5,18 +5,22 @@ from math import sqrt from time import time class SoundManager: - def __init__(self, music_base_volume: float): + def __init__(self, music_master_volume: float, sound_global_master_volume: float, sound_master_volume: float): self.__tick = 0 # Compteur de la valeur d'un tick (Utilisé pour le comptage de tick) self.tick = 0 # Compteur de tick self.time = 0 # Temps local a la class (en s) + self.music_master_volume = music_master_volume + self.sound_global_master_volume = sound_global_master_volume + self.sound_master_volume = sound_master_volume + self.music_playlist = [] self.music_current_song = "" self.music_play_playlist = False self.music_current_index = 0 self.music_shuffle_playlist = True self.music_next_request = False - self.music_set_volume(music_base_volume) + self.music_set_volume(music_master_volume) self.music_before_pause_pos = 0 self.music_before_pause_song = ""