Started debuging sound settings

src/engine/animation.py

@@ -1,7 +1,6 @@
 # Classe animation adaptée depuis ESG Engine :
 # https://github.com/yannis300307/ESG_Engine/blob/main/ESG_Engine/client/animation.py
 import os
-
 import pygame
 
 

src/engine/engine.py

@@ -38,7 +38,7 @@ 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.sound_manager = SoundManager()
 
     def loop(self):
         """Fonction à lancer au début du programme et qui va lancer les updates dans une boucle.
@@ -57,7 +57,7 @@ class Engine:
         self.event_handler.update()
         self.event_sheduler.update()
         self.dialogs_manager.update(0.016666666)
-        self.sound_manager.update(1/60)
+        self.sound_manager.update(1/60, 100, 100, 100)
 
     def stop(self):
         """Arrête le programme."""

src/engine/renderer.py

@@ -124,7 +124,7 @@ class Renderer:
                                                               True, (255, 0, 0)), (0, 30))
             self.window.blit(font.SysFont("Arial", 20).render(f"Zoom: {round(self.engine.camera.zoom, 2)}",
                                                               True, (255, 0, 0)), (0, 60))
-            self.window.blit(font.SysFont("Arial", 20).render(f"Volume: {self.engine.sound_manager.music_get_volume()}, Pos: {self.engine.sound_manager.music_get_current_song_pos()}s, Index: {self.engine.sound_manager.music_current_index}, Paused: {self.engine.sound_manager.music_is_paused}",
+            self.window.blit(font.SysFont("Arial", 20).render(f"Volume: {self.engine.sound_manager.music_get_volume()}, Pos: {self.engine.sound_manager.music_get_current_song_pos()}s, Index: {self.engine.sound_manager.music_current_index}, Paused: {self.engine.sound_manager.music_is_paused}, Shuffled: {self.engine.sound_manager.music_shuffle_playlist}",
                                                               True, (255, 0, 0)), (0, 90))
             self.window.blit(font.SysFont("Arial", 20).render(f"Track: {self.engine.sound_manager.music_current_song}",
                                                               True, (255, 0, 0)), (0, 120))

src/engine/sound_manager.py

@@ -1,54 +1,145 @@
+from src.engine.entity import Entity
+from random import randint
 from pygame import mixer
+from math import sqrt
+from time import time
 
 class SoundManager:
-    def __init__(self, music_base_volume: float):
+    def __init__(self):
-        self.__tick = 0 # Compteur de la valeur d'un tick sur 1 (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.time = 0 # Temps local a la class (en s)
+        
+        self.music_master_volume = 60
+        self.sound_global_master_volume = 100
+        self.sound_master_volume = 100
 
         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(self.music_master_volume)
 
         self.music_before_pause_pos = 0
         self.music_before_pause_song = ""
         self.music_is_paused = False
-
         self.music_pos_delay = 0
 
-        self.music_set_volume(music_base_volume)
+        self.sound_currently_playing: dict[float: list[mixer.Sound, float, list[float, float], float]] = {} # Format {unique_id : [Sound, max_volume, [pos_x, pos_y], stop_at]}
+
+        self.sound_loaded: dict[str: mixer.Sound] = {}# Format : {name: mixer.Sound}
+        self.sound_global_currently_playing: dict[float: list[mixer.Sound, float, float]] = {} # Format {unique_id: [Sound, volume, stop_at]}
+        
+
+        self.sound_hears_anchor = None
 
 
-    def update(self, delta: float):
+        self.do1 = True
+        self.do2 = True
+        self.do3 = True
+        self.do4 = True
+        self.music_add_to_playlist(".\\assets\\OST\\Vampire Killer.mp3")
+        self.music_add_to_playlist(".\\assets\\OST\\Hyrule Field - The Legend of Zelda Ocarina of Time.mp3")
+        self.music_add_to_playlist(".\\assets\\OST\\Lost Woods - The Legend of Zelda Ocarina of Time.mp3")
+        self.music_add_to_playlist(".\\assets\\OST\\Title Theme - The Legend of Zelda Ocarina of Time.mp3")
+        self.music_start_playlist()
+
+    def update(self, delta: float, music_master_volume: float, sound_global_master_volume: float, sound_master_volume: float):
         self.__tick += delta
         self.tick = int(self.__tick / delta)
         self.time = self.tick * delta
 
+        self.music_master_volume = music_master_volume
+        self.sound_global_master_volume = sound_global_master_volume
+        self.sound_master_volume = sound_master_volume
+
+
+        if self.sound_hears_anchor: # Update la position des "Oreilles" du joueur (Ou de l'entité séléctionné comme ancre pour les oreilles)
+            self.sound_hears_x = self.sound_hears_anchor.x
+            self.sound_hears_y = self.sound_hears_anchor.y
+
+        for key in self.sound_global_currently_playing.keys(): # Son globaux
+            sound_container = self.sound_global_currently_playing[key]
+            if sound_container[2] > self.time:
+                self.sound_global_currently_playing.pop(key)
+            else:
+                sound_container[0].set_volume(round(sound_global_master_volume / 100 * sound_container[1] / 100, 3))
+
+        for key in self.sound_currently_playing.keys(): # Son locaux
+            sound_container = self.sound_currently_playing[key]
+            if sound_container[3] > self.time: # Timeout des sons
+                self.sound_currently_playing.pop(key)
+
+            else: # Gère le volume en fonction de la position
+                sound = sound_container[0]
+                max_volume = sound_container[1]
+                pos_x, pos_y = sound_container[2]
+                sound.set_volume(max(0, int((round(sound_master_volume / 100 * max_volume / 100, 3)) - sqrt((pos_x - self.sound_hears_x) ** 2 + (pos_y - self.sound_hears_y) ** 2))) / (round(sound_master_volume / 100 * max_volume / 100, 3)))
+
         if self.music_play_playlist and not self.music_is_paused: # Musique de fond
             if not mixer.music.get_busy():
-                
                 if len(self.music_playlist) == 0:
                     pass
+
                 elif self.music_current_song == "":
                     self.__music_play(self.music_playlist[0])
-                else:
-                    just_played_index = self.music_playlist.index(self.music_current_song)
-                    if len(self.music_playlist) - 1 <= just_played_index: # Dernier son de la playlist / la playlist a rétréci entre temps
-                        self.music_current_index = 0
-                        self.__music_play(self.music_playlist[0]) # Recommence depuis le début de la playlist
-                    else:
-                        self.music_current_index = just_played_index + 1
-                        self.__music_play(self.music_playlist[self.music_current_index]) # Joue la musique suivante dans la playlist
 
+                else:
+                    if self.music_current_song in self.music_playlist:
+                        just_played_index = self.music_playlist.index(self.music_current_song)
+
+                        if self.music_shuffle_playlist and len(self.music_playlist) != 1:
+                            while True:
+                                new_index = randint(0, len(self.music_playlist) - 1)
+                                if new_index != just_played_index:
+                                    break
+
+                            self.music_current_index = new_index
+                            self.__music_play(self.music_playlist[new_index])
+
+                        elif len(self.music_playlist) - 1 <= just_played_index: # Dernier son de la playlist / la playlist a rétréci entre temps
+                            self.music_current_index = 0
+                            self.__music_play(self.music_playlist[0]) # Recommence depuis le début de la playlist
+
+                        else:
+                            self.music_current_index = just_played_index + 1
+                            self.__music_play(self.music_playlist[self.music_current_index]) # Joue la musique suivante dans la playlist
+
+                    else: # Song removed from playlist, no idea what was the index, starting again from start or from random index if playlist_shuffle = True
+                        new_index = randint(0, len(self.music_playlist) - 1)
+                        self.music_current_index = new_index
+                        self.__music_play(self.music_playlist[new_index])
+
+        if self.music_next_request:
+            self.music_next_request = False
+            mixer.music.fadeout(1)
+
+        if self.do1 and self.time > 5:
+            self.music_playlist_set_shuffle(False)
+            self.do1 = False
+
+        if self.do2 and self.time > 15:
+            self.music_next()
+            self.do2 = False
+
+        if self.do3 and self.time > 25:
+            self.music_pause()
+            self.do3 = False
+
+        if self.do4 and self.time > 35:
+            self.music_next()
+            self.do4 = False
 
     def music_get_volume(self):
         return mixer.music.get_volume() * 100
 
     def music_set_volume(self, new_volume: float):
         """Définit le nouveau volume de la musique"""
-        mixer.music.set_volume((round(new_volume / 100, 3)))
+        mixer.music.set_volume((round(self.music_master_volume / 100 * new_volume / 100, 3)))
     
-    def music_pause(self, fade_s: float, restart_tolerance: float = 33):
+    def music_pause(self, fade_s: float = 0, restart_tolerance: float = 33):
         """Met en pause la musique, la musique reprendra à la fin de la musique moin la tolérance (en pourcentage)"""
         self.music_is_paused = True
         self.music_before_pause_pos = self.music_get_current_song_pos() + fade_s * restart_tolerance / 100 # Récupère la position a laquelle le son doit reprendre lors du .resume()
@@ -56,19 +147,17 @@ class SoundManager:
         
         mixer.music.fadeout(fade_s * 1000)
 
-    def music_resume(self, fade_s: float):
+    def music_resume(self, fade_s: float = 0):
         self.__music_play(self.music_before_pause_song, fade_s, self.music_before_pause_pos)
         self.music_before_pause_pos = 0
         self.music_before_pause_song = ""
 
-
     def music_get_current_song_pos(self):
         if mixer.music.get_busy():
             return round(mixer.music.get_pos() /1000 + self.music_pos_delay, 3)
         else:
             return round(self.music_before_pause_pos, 3)
     
-
     def __music_play(self, song: str, fade_s: float = 0, start_at: float = 0):
         mixer.music.unload()
         mixer.music.load(song)
@@ -92,3 +181,65 @@ class SoundManager:
     
     def music_stop_playlist(self):
         self.music_play_playlist = False
+    
+    def music_playlist_set_shuffle(self, shuffle: bool):
+        self.music_shuffle_playlist = shuffle
+
+    def music_next(self):
+        self.music_next_request = True
+
+    def sound_link_hears(self, entity: Entity):
+        self.sound_hears_anchor = entity
+    
+    def create_unique_id(self):
+        return time()*10e99999
+
+    def sound_load(self, file_path: str, name: str):
+        self.sound_loaded[name] = mixer.Sound(file_path)
+    
+    def sound_play(self, name: str, max_volume: float, pos_x: float, pos_y: float):
+        sound = self.sound_loaded[name]
+        stop_at = stop_at = self.time + sound.get_length()
+        unique_id = self.create_unique_id()
+
+        self.sound_currently_playing[unique_id] = [sound, max_volume, [pos_x, pos_y], stop_at] # Format {unique_id : [Sound, max_volume, [pos_x, pos_y], stop_at]
+        return unique_id
+    
+    def sound_stop(self, name: str, unique_id: float = None, all: bool = False):
+        if all:
+            for key in self.sound_currently_playing.keys():
+                self.sound_currently_playing.pop(key)[0].stop()
+
+        elif unique_id:
+            sound_container = self.sound_currently_playing.get(unique_id, None)
+            if sound_container:
+                self.sound_currently_playing.pop(unique_id)[0].stop()
+        else:
+            for key in self.sound_currently_playing.keys():
+                if self.sound_loaded[name] == self.sound_currently_playing[key][0]:
+                    self.sound_currently_playing.pop(key)[0].stop()
+
+    def sound_global_play(self, name: str, volume: float):
+        """Joue un son avec le même son dans tout le monde"""
+        sound = self.sound_loaded[name]
+
+        stop_at = self.time + sound.get_length()
+        unique_id = self.create_unique_id()
+
+        self.sound_global_currently_playing[unique_id] = [sound, volume, stop_at]
+        sound.play()
+        return unique_id
+    
+    def sound_global_stop(self, name: str, unique_id: float = None, all: bool = False):
+        if all:
+            for key in self.sound_global_currently_playing.keys():
+                self.sound_global_currently_playing.pop(key)[0].stop()
+
+        elif unique_id:
+            sound_container = self.sound_global_currently_playing.get(unique_id, None)
+            if sound_container:
+                self.sound_global_currently_playing.pop(unique_id)[0].stop()
+        else:
+            for key in self.sound_global_currently_playing.keys():
+                if self.sound_loaded[name] == self.sound_global_currently_playing[key][0]:
+                    self.sound_global_currently_playing.pop(key)[0].stop()