Format Debug info

Reviewed-on: #26

.gitignore

@@ -160,3 +160,9 @@ cython_debug/
 #  option (not recommended) you can uncomment the following to ignore the entire idea folder.
 .idea/
 
+# DEBUG OST
+assets/OST/Hyrule Field - The Legend of Zelda Ocarina of Time.mp3
+assets/OST/Lost Woods - The Legend of Zelda Ocarina of Time.mp3
+assets/OST/Title Theme - The Legend of Zelda Ocarina of Time.mp3
+assets/OST/Vampire Killer.mp3
+assets/sounds/Vampire Killer.mp3

src/engine/camera.py

@@ -2,10 +2,12 @@ from src.engine.entity import Entity
 
 
 class Camera:
-    def __init__(self):
+    def __init__(self, DEBUG_MODE: bool, zoom: float):
+        self.DEBUG_MODE = DEBUG_MODE
+        
         self.x = 0
         self.y = 0
-        self.zoom = 1.75
+        self.zoom = zoom
 
         # Décalage lors du mouvement du joueur
         self.player_moving_offset = 100
@@ -19,9 +21,12 @@ class Camera:
 
         self.followed_entity: Entity | None = None
 
-    def update(self, delta: float):
+    def update(self, delta: float, zoom: float):
         """Met à jour la caméra. Permet, par exemple, de faire le scrolling."""
 
+        if not self.DEBUG_MODE:
+            self.zoom = zoom
+
         # Si on suit une entité, on met à jour les coordonnées de suivi
         if self.followed_entity is not None:
             self.target_x = (self.followed_entity.x + self.followed_entity.mouvements[0] *

src/engine/engine.py

@@ -11,6 +11,7 @@ from src.engine.menu_manager import MenuManager
 from src.engine.renderer import Renderer
 from src.engine.enums import GameState
 from src.engine.sound_manager import SoundManager
+from src.engine.settings_manager import SettingsManager
 import pygame
 
 
@@ -29,41 +30,88 @@ 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()
-        self.camera = Camera()
+        self.camera = Camera(self.DEBUG_MODE, self.settings_manager.get_zoom())
         self.entity_manager = EntityManager(self.map_manager)
         self.boss_fight_manager = BossFightManager(self)
         self.event_sheduler = EventSheduler(self)
         self.dialogs_manager = DialogsManager(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.get_sound_global_master_volume(),
+                                  self.settings_manager.get_sound_master_volume())
+        
+        self.global_latency = 0
+        self.last_latency = []
+        self.latency_precision = self.settings_manager.latency_precision
 
     def loop(self):
         """Fonction à lancer au début du programme et qui va lancer les updates dans une boucle.
         Attend jusqu'à la fin du jeu."""
         self.running = True
 
-        delta = 1.  # Le delta est le temps depuis la dernière image
-        last_time = time.time_ns()/10E8
-        while self.running:
-            self.update(delta)
 
-            new_time = time.time_ns()/10E8
+        # Initialisation ddes valeurs de delta et de last_time
+        delta = 1.  # Le delta est le temps depuis la dernière image
+        last_time = time.time()
+        
+        while self.running:
+            refresh_rate = self.settings_manager.get_refresh_rate()
+            if refresh_rate == -1: # Pas de limite, vers l'infini et l'au-delà !!!
+
+                self.update(delta)
+                new_time = time.time()
+                delta = new_time - last_time
+                last_time = new_time
+
+            else:
+                while time.time() < last_time + 1 / refresh_rate - self.global_latency:
+                    pass
+
+                new_time = time.time()
                 delta = new_time-last_time
                 last_time = new_time
 
+
+                self.update(delta)
+                
+                new_refresh_rate = self.settings_manager.get_refresh_rate()
+                if refresh_rate != new_refresh_rate:
+                    refresh_rate = new_refresh_rate
+                    self.global_latency = 0
+                    self.last_latency = []
+
+                latency = 0
+                latency = delta - 1/refresh_rate
+                
+                if not latency > self.global_latency * 100 or self.global_latency == 0: # Impossible que le jeu prenne autant de retard, on skip cette latence dans le calcul, l'utilisateur a surement cliquer hors de la fenêtre
+                    if len(self.last_latency) < self.latency_precision:
+                        self.last_latency.append(latency)
+                    else:
+                        self.last_latency.pop(0)
+                        self.last_latency.append(latency)
+
+                    n = 0
+                    for i in self.last_latency:
+                        n += i
+
+                    self.global_latency = n/len(self.last_latency)
+
     def update(self, delta: float):
         """Fonction qui regroupe toutes les updates des composants. Elle permet de mettre à jour le jeu quand on
         l'appelle."""
-        self.camera.update(delta)
+        self.camera.update(delta, self.settings_manager.get_zoom())
         self.entity_manager.update(delta)
         self.renderer.update(delta)
         self.event_handler.update(delta)
         self.event_sheduler.update()
         self.dialogs_manager.update(delta)
-        self.sound_manager.update(delta)
+        self.sound_manager.update(delta, self.settings_manager.get_music_master_volume(), 
+                                  self.settings_manager.get_sound_global_master_volume(),
+                                  self.settings_manager.get_sound_master_volume())
 
     def stop(self):
         """Arrête le programme."""

src/engine/entity_manager.py

@@ -29,7 +29,7 @@ class EntityManager:
     def update(self, delta: float):
         """Met à jour toutes les entités enregistrées."""
         for entity_name in list(self.entities.keys()):
-            entity = self.entities[entity_name]
+            entity: Entity = self.entities[entity_name]
             entity.update(delta)
             if entity.life_points == 0:
                 self.entities.pop(entity_name)

src/engine/event_handler.py

@@ -227,7 +227,6 @@ class EventHandler:
                           f"Y = {self.engine.entity_manager.get_by_name('player').y}")
 
                 if K_x in self.key_pressed:
-                    self.engine.camera.target_zoom *= 1.01
+                    self.engine.settings_manager.zoom *= 1.01
                 if K_c in self.key_pressed:
-                    self.engine.camera.target_zoom *= 0.99
-
+                    self.engine.settings_manager.zoom *= 0.99

src/engine/renderer.py

@@ -17,11 +17,13 @@ class Renderer:
 
     def __init__(self, core: 'engine.Engine'):
         self.engine = core
+        self.fullscreen_size = display.Info().current_w, display.Info().current_h
         self.timer = 0 # Timer local
         self.window_type = RESIZABLE
-        self.window_size = (display.Info().current_w, display.Info().current_h) if self.window_type == FULLSCREEN else (
+        self.window_size = self.fullscreen_size if self.window_type == FULLSCREEN else (
         600, 600)
         self.window = display.set_mode(self.window_size, self.window_type)
+
         self.tiles = []
         self.tile_size = 0
         self.animations: dict[str: Anim] = {}
@@ -175,11 +177,11 @@ class Renderer:
             self.window.blit(font.SysFont("Arial", 20).render(f"FPS: {round(1/delta if delta else 1)}, Game Status: {'Paused' if self.engine.entity_manager.paused else 'Playing'}", True, (255, 0, 0)),
                              (0, 0))
             player = self.engine.entity_manager.get_by_name('player')
-            self.window.blit(font.SysFont("Arial", 20).render(f"X: {round(player.x, 2)} Y:{round(player.y, 2)}",
+            self.window.blit(font.SysFont("Arial", 20).render(f"X: {round(player.x, 2):.2f} Y:{round(player.y, 2):.2f}",
                                                               True, (255, 0, 0)), (0, 30))
-            self.window.blit(font.SysFont("Arial", 20).render(f"Zoom: {round(self.engine.camera.zoom, 2)}",
+            self.window.blit(font.SysFont("Arial", 20).render(f"Zoom: {round(self.engine.settings_manager.get_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():.3f}s, Index: {self.engine.sound_manager.music_current_index}, Paused: {self.engine.sound_manager.music_is_paused}",
                                                               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))
@@ -660,3 +662,11 @@ class Renderer:
         self.fadein_pause = pause_world
         self.fadein_fade_callback = callback
         self.engine.entity_manager.pause()
+    
+
+    def set_display(self, window_type: FULLSCREEN | RESIZABLE, size: tuple[int, int] = None):
+        self.window_type = window_type
+        self.window_size = self.fullscreen_size if self.window_type == FULLSCREEN else (
+        size[0], size[1])
+        self.window = display.set_mode(self.window_size, self.window_type)
+        display.flip()

src/engine/settings_manager.py

@@ -0,0 +1,27 @@
+class SettingsManager:
+    def __init__(self, default_master_volume: float, default_zoom: float) -> None:
+        self.refresh_rate = 30
+        self.latency_precision = 100 # Nombre de valeurs de latence stocké (Pour faire la moyenne)
+        self.master_volume = default_master_volume
+        self.sound_master_volume = 100
+        self.music_master_volume = 100
+        self.sound_global_master_volume = 100
+
+        self.zoom = default_zoom
+    
+    def get_refresh_rate(self):
+        return self.refresh_rate
+        
+    def get_zoom(self):
+        return self.zoom
+    
+    def get_music_master_volume(self):
+        return round(self.master_volume / 100 * self.music_master_volume, 3)
+    
+    def get_sound_global_master_volume(self):
+        return round(self.master_volume / 100 * self.sound_global_master_volume, 3)
+    
+    def get_sound_master_volume(self):
+        return round(self.master_volume / 100 * self.sound_master_volume, 3)
+
+

src/engine/sound_manager.py

@@ -1,52 +1,121 @@
-from pygame import mixer
+from src.engine.entity import Entity
+from random import randint
+from pygame import mixer, error
+from math import sqrt
+from time import time
 
 class SoundManager:
-    def __init__(self, music_base_volume: float):
-        self.__tick = 0 # Compteur de la valeur d'un tick sur 1 (Utilisé pour le comptage de tick)
+    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(100)
 
         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]}
         
 
-    def update(self, delta: float):
+        self.sound_hears_anchor = None
+
+
+    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: list[mixer.Sound, float, float] = 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: list[mixer.Sound, float, list[float, float], float] = 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():
+            try:
+                if not mixer.music.get_busy() or self.music_next_request:
+                    if self.music_next_request:
+                        self.music_next_request = False
+                        mixer.music.fadeout(1)
 
                     if len(self.music_playlist) == 0:
                         pass
                     elif self.music_current_song == "":
                         self.__music_play(self.music_playlist[0])
                     else:
+                        if self.music_current_song in self.music_playlist:
                             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
+
+                            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])
+
+            except error:
+                pass
+
 
     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):
         """Met en pause la musique, la musique reprendra à la fin de la musique moin la tolérance (en pourcentage)"""
@@ -61,14 +130,12 @@ class SoundManager:
         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)
+            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 +159,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()

src/main.py

@@ -5,7 +5,7 @@ from src.engine.animation import Anim
 from src.engine.engine import Engine
 from src.engine.enums import GameState
 from src.engine.menu_manager import Menu, Label, Button
-
+from pygame.locals import RESIZABLE, FULLSCREEN
 
 class Game(Engine):
     def __init__(self):
@@ -29,6 +29,9 @@ class Game(Engine):
 
         self.event_handler.register_button_area((0, 0, 0.1, 0.1), lambda : print("salut"), 0)
 
+        self.sound_manager.music_add_to_playlist(".\\assets\\OST\\Main Title (Y'as pas de boss la donc jpp le mettre pour un fight).mp3")
+        self.sound_manager.music_start_playlist()
+
         self.setup_main_menu()
 
     def start_game(self):
@@ -39,6 +42,10 @@ class Game(Engine):
         self.renderer.fadeout(1, (0, 0, 0), 100, True, self.start_game)
         self.menu_manager.hide()
 
+        self.sound_manager.music_remove_from_playlist(".\\assets\\OST\\Main Title (Y'as pas de boss la donc jpp le mettre pour un fight).mp3")
+        self.sound_manager.music_add_to_playlist(".\\assets\\OST\\Bruit de foret pour yannis.mp3")
+        self.sound_manager.music_next()
+
     def setup_main_menu(self):
         """Crée les éléments du menu principal."""
         menu = Menu()
@@ -51,12 +58,20 @@ class Game(Engine):
         slider_hover_image = pygame.image.load("assets/textures/GUI/slider_cursor_2.png").convert_alpha()
         slider_rail_image = pygame.image.load("assets/textures/GUI/slider_rail_1.png").convert_alpha()
 
-        menu.add_widget(Button(0.5, 0.3, "play", 0.08, (0, 0, 0), self.play_button_callback, btn_base_image, btn_hover_image, "play_button", True, 0))
+        menu.add_widget(Button(0.5, 0.3, "Play", 0.08, (0, 0, 0), self.play_button_callback, btn_base_image, btn_hover_image, "play_button", True, 0))
 
         self.menu_manager.register_menu(menu, "main")
 
         self.menu_manager.show("main")
     
+    def setup_settings_menu(self):
+        """Crée les éléments du menu de paramètre"""
+        menu = Menu()
+        menu.add_widget(Label(0, 0.3, "Paramètres", 0.05, (192,192,192), True, 0))
+
+        #base_image = pygame.image.load("assets\\textures\\GUI\\setting_menu.png")
+        #hover_image = pygame.image.load("assets\\textures\\GUI\\setting_menu_hovered.png")
+
     def create_player_entity(self):
         """Crée une entité joueur."""
         anim = Anim(0.5)