Started debugging sound control
This commit is contained in:
parent
ec12e2dc17
commit
9effb87332
|
@ -3,6 +3,8 @@ from src.engine.entity import Entity
|
||||||
|
|
||||||
class Camera:
|
class Camera:
|
||||||
def __init__(self, DEBUG_MODE: bool, zoom: float):
|
def __init__(self, DEBUG_MODE: bool, zoom: float):
|
||||||
|
self.DEBUG_MODE = DEBUG_MODE
|
||||||
|
|
||||||
self.x = 0
|
self.x = 0
|
||||||
self.y = 0
|
self.y = 0
|
||||||
self.zoom = zoom
|
self.zoom = zoom
|
||||||
|
|
|
@ -30,6 +30,7 @@ class Engine:
|
||||||
self.running = False
|
self.running = False
|
||||||
|
|
||||||
# Composants du moteur de jeu
|
# 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.renderer = Renderer(self)
|
||||||
self.event_handler = EventHandler(self)
|
self.event_handler = EventHandler(self)
|
||||||
self.map_manager = MapManager()
|
self.map_manager = MapManager()
|
||||||
|
@ -39,8 +40,10 @@ class Engine:
|
||||||
self.event_sheduler = EventSheduler(self)
|
self.event_sheduler = EventSheduler(self)
|
||||||
self.dialogs_manager = DialogsManager(self.event_handler)
|
self.dialogs_manager = DialogsManager(self.event_handler)
|
||||||
self.menu_manager = MenuManager(self)
|
self.menu_manager = MenuManager(self)
|
||||||
self.sound_manager = SoundManager(60)
|
self.sound_manager = SoundManager(self.settings_manager.get_music_master_volume(),
|
||||||
self.settings_manager = SettingsManager(60, 1.75)
|
self.settings_manager.get_sound_global_master_volume(),
|
||||||
|
self.settings_manager.get_sound_master_volume())
|
||||||
|
|
||||||
|
|
||||||
def loop(self):
|
def loop(self):
|
||||||
"""Fonction à lancer au début du programme et qui va lancer les updates dans une boucle.
|
"""Fonction à lancer au début du programme et qui va lancer les updates dans une boucle.
|
||||||
|
|
|
@ -5,18 +5,22 @@ from math import sqrt
|
||||||
from time import time
|
from time import time
|
||||||
|
|
||||||
class SoundManager:
|
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 la valeur d'un tick (Utilisé pour le comptage de tick)
|
||||||
self.tick = 0 # Compteur de tick
|
self.tick = 0 # Compteur de tick
|
||||||
self.time = 0 # Temps local a la class (en s)
|
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_playlist = []
|
||||||
self.music_current_song = ""
|
self.music_current_song = ""
|
||||||
self.music_play_playlist = False
|
self.music_play_playlist = False
|
||||||
self.music_current_index = 0
|
self.music_current_index = 0
|
||||||
self.music_shuffle_playlist = True
|
self.music_shuffle_playlist = True
|
||||||
self.music_next_request = False
|
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_pos = 0
|
||||||
self.music_before_pause_song = ""
|
self.music_before_pause_song = ""
|
||||||
|
|
Loading…
Reference in a new issue