From 636e006e508237b265cd89b9f1da982d1df17c9b Mon Sep 17 00:00:00 2001 From: yannis300307 Date: Wed, 10 Jan 2024 15:57:46 +0100 Subject: [PATCH 01/32] =?UTF-8?q?D=C3=A9but=20de=20support=20de=20zones=20?= =?UTF-8?q?slider=20dans=20l'event=20handler?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/engine/event_handler.py | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/src/engine/event_handler.py b/src/engine/event_handler.py index 1568ed0..6e78fe3 100644 --- a/src/engine/event_handler.py +++ b/src/engine/event_handler.py @@ -5,6 +5,7 @@ from pygame import event, display from pygame.locals import * import src.engine.engine as engine +from src.engine.menu_manager import Slider class EventHandler: @@ -15,6 +16,7 @@ class EventHandler: self.key_pressed = [] self.buttons_area = [] self.hovered_area = [] + self.sliders_area = [] @staticmethod def get_click_collision(rect: tuple[float | int, float | int, float | int, float | int], point: tuple[int, int], @@ -56,6 +58,14 @@ class EventHandler: self.buttons_area = cleared_list + def register_slider_area(self, rect: list[float | int, float | int, float | int, float | int], + is_window_relative: int = -1): + """Enregistre une zone comme une zone déplaçable à l'écran.""" + assert isinstance(rect, list) # utilisé pour empêcher les tuples + + self.sliders_area.append([rect, is_window_relative, False]) + # Le premier booléen correspond à l'état de suivi de la souris + def update(self): """Vérifie s'il y a de nouvelles interactions et les traites.""" @@ -74,6 +84,14 @@ class EventHandler: for area in self.buttons_area: if self.get_click_collision(area[0], e.pos, area[2]): area[1]() + + for area in self.sliders_area: + if self.get_click_collision(area[0], e.pos, area[1]): + area[2] = True + elif e.type == MOUSEBUTTONUP: + for area in self.sliders_area: + area[2] = False + elif e.type == MOUSEMOTION: for area in self.buttons_area: if area[4] is not None: @@ -86,6 +104,11 @@ class EventHandler: area[4](False) self.hovered_area.remove(area) + for area in self.sliders_area: + if area[2]: + area[0][0] = e.pos[0] + area[0][1] = e.pos[1] + if self.engine.entity_manager.player_entity_name: if K_RIGHT in self.key_pressed: self.engine.entity_manager.move_player_controls(1, 0) From 1b829aaf26a91956d3f95750808b0cc1daf5b4c3 Mon Sep 17 00:00:00 2001 From: yannis300307 Date: Wed, 10 Jan 2024 15:58:14 +0100 Subject: [PATCH 02/32] Ajout d'une classe temporaire slider --- src/engine/menu_manager.py | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/src/engine/menu_manager.py b/src/engine/menu_manager.py index e972a35..8b48d99 100644 --- a/src/engine/menu_manager.py +++ b/src/engine/menu_manager.py @@ -24,6 +24,31 @@ class Label(Widget): self.color = color +class Slider(Widget): + """Un widget pouvant être glissé pour récupérer une valeur.""" + + def __init__(self, x: int | float, y: int | float, + base_image: pygame.Surface, + hover_image: pygame.Surface, + is_window_relative: int = -1, + area_name: str = "menu_slider"): + super().__init__(x, y, is_window_relative) + self.base_image = base_image + self.hover_image = hover_image + self.area_name = area_name + self.hovered = False + self.follow_mouse = False + self.value = 0. + self.width = 100 + + def set_hover_state(self, state: bool): + """Modifie la valeur du hover.""" + self.hovered = state + + def set_mouse_pos(self, x: int): + self.value = (x-self.x)/self.width + + class Button(Widget): """Un widget de bouton.""" def __init__(self, x: int | float, y: int | float, text: str, size: int | float, color: tuple[int, int, int], From 8ab8eaba2463263f6d17af652aff4a5ffb5d84c3 Mon Sep 17 00:00:00 2001 From: yannis300307 Date: Wed, 10 Jan 2024 16:04:00 +0100 Subject: [PATCH 03/32] =?UTF-8?q?D=C3=A9but=20de=20rendu=20d=C3=A9bug=20de?= =?UTF-8?q?s=20sliders?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/engine/renderer.py | 43 ++++++++++++++++++++++++++++++++++++++++-- src/main.py | 5 ++++- 2 files changed, 45 insertions(+), 3 deletions(-) diff --git a/src/engine/renderer.py b/src/engine/renderer.py index 4a3389e..5268df3 100644 --- a/src/engine/renderer.py +++ b/src/engine/renderer.py @@ -7,7 +7,7 @@ from pygame.locals import RESIZABLE, SRCALPHA, FULLSCREEN import src.engine.engine as engine from src.engine.animation import Anim from src.engine.enums import GameState -from src.engine.menu_manager import Label, Button +from src.engine.menu_manager import Label, Button, Slider class Renderer: @@ -129,9 +129,10 @@ class Renderer: self.window.blit(font.SysFont("Arial", 20).render(f"Track: {self.engine.sound_manager.music_current_song}", True, (255, 0, 0)), (0, 120)) + window_size = display.get_window_size() + # On rend maintenant toutes les zones de détection de la fenêtre for area in self.engine.event_handler.buttons_area: - window_size = display.get_window_size() if area[2] == 0: draw.rect(self.window, (255, 255, 0), (area[0][0] * window_size[0], area[0][1] * window_size[0], @@ -148,6 +149,24 @@ class Renderer: draw.rect(self.window, (255, 255, 0), area[0], width=1) + for area in self.engine.event_handler.sliders_area: + print(area) + if area[1] == 0: + draw.rect(self.window, (0, 255, 20), + (area[0][0] * window_size[0], area[0][1] * window_size[0], + area[0][2] * window_size[0], area[0][3] * window_size[0]), width=1) + elif area[1] == 1: + draw.rect(self.window, (0, 255, 20), + (area[0][0] * window_size[1], area[0][1] * window_size[1], + area[0][2] * window_size[1], area[0][3] * window_size[1]), width=1) + elif area[1] == 2: + draw.rect(self.window, (0, 255, 20), + (area[0][0] * window_size[0], area[0][1] * window_size[1], + area[0][2] * window_size[0], area[0][3] * window_size[1]), width=1) + else: + draw.rect(self.window, (0, 255, 20), + area[0], width=1) + # Rendu présent dans tous les types de jeu self.render_dialogs_box() @@ -236,6 +255,26 @@ class Renderer: self.window.blit(btn_image, (x, y)) self.window.blit(rendered_text, (x, y)) + elif isinstance(widget, Slider): + if widget.hovered: + btn_image = widget.hover_image + else: + btn_image = widget.base_image + + if widget.is_window_relative == 0: + btn_image = transform.scale(btn_image, (btn_image.get_width()*window_size[0]/self.window_size[0], + btn_image.get_height()*window_size[0]/self.window_size[0])) + elif widget.is_window_relative == 1: + btn_image = transform.scale(btn_image, (btn_image.get_width()*window_size[1]/self.window_size[1], + btn_image.get_height()*window_size[1]/self.window_size[1])) + elif widget.is_window_relative == 2: + btn_image = transform.scale(btn_image, (btn_image.get_width()*window_size[0]/self.window_size[0], + btn_image.get_height()*window_size[1]/self.window_size[1])) + + # On affiche l'image du boutton + + self.window.blit(btn_image, (x+widget.value*widget.width, y)) + def render_dialogs_box(self): """Rend la boite de dialogue lorsqu'un dialogue est lancé.""" diff --git a/src/main.py b/src/main.py index 24ccfbd..35b7dc8 100644 --- a/src/main.py +++ b/src/main.py @@ -4,7 +4,7 @@ from src.custom_AI import WolfAI 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 src.engine.menu_manager import Menu, Label, Button, Slider class Game(Engine): @@ -44,8 +44,11 @@ class Game(Engine): hover_image = pygame.image.load("assets/textures/GUI/button_2.png").convert_alpha() menu.add_widget(Button(0.5, 0.3, "play", 0.08, (0, 0, 0), self.start_game, base_image, hover_image, True, 0)) + menu.add_widget(Slider(40, 200, base_image, hover_image)) self.menu_manager.register_menu(menu, "main") + self.event_handler.register_slider_area([10, 10, 50, 50]) + self.menu_manager.show("main") def create_player_entity(self): From 163f1f0901ac57697405915b80fc613c3854f11a Mon Sep 17 00:00:00 2001 From: yannis300307 Date: Wed, 10 Jan 2024 20:39:11 +0100 Subject: [PATCH 04/32] =?UTF-8?q?Ajout=20d'une=20boite=20de=20limite=20de?= =?UTF-8?q?=20d=C3=A9placement=20pour=20les=20sliders=20area?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/engine/event_handler.py | 26 ++++++++++++++++++++------ src/engine/renderer.py | 12 +++++++++++- src/main.py | 2 +- 3 files changed, 32 insertions(+), 8 deletions(-) diff --git a/src/engine/event_handler.py b/src/engine/event_handler.py index 6e78fe3..c07d46f 100644 --- a/src/engine/event_handler.py +++ b/src/engine/event_handler.py @@ -58,12 +58,13 @@ class EventHandler: self.buttons_area = cleared_list - def register_slider_area(self, rect: list[float | int, float | int, float | int, float | int], + def register_slider_area(self, size: tuple[float | int, float | int], + motion_rect: tuple[float | int, float | int, float | int, float | int], + motion_axes: tuple[bool, bool], is_window_relative: int = -1): """Enregistre une zone comme une zone déplaçable à l'écran.""" - assert isinstance(rect, list) # utilisé pour empêcher les tuples - - self.sliders_area.append([rect, is_window_relative, False]) + self.sliders_area.append([[motion_axes[0], motion_axes[1]]+list(size), is_window_relative, False, (0, 0), motion_axes, motion_rect]) + print(self.sliders_area[0]) # Le premier booléen correspond à l'état de suivi de la souris def update(self): @@ -88,6 +89,7 @@ class EventHandler: for area in self.sliders_area: if self.get_click_collision(area[0], e.pos, area[1]): area[2] = True + area[3] = (e.pos[0] - area[0][0], e.pos[1] - area[0][1]) # add support for responsibility elif e.type == MOUSEBUTTONUP: for area in self.sliders_area: area[2] = False @@ -106,8 +108,20 @@ class EventHandler: for area in self.sliders_area: if area[2]: - area[0][0] = e.pos[0] - area[0][1] = e.pos[1] + if area[4][0]: + area[0][0] = e.pos[0]-area[3][0] + if area[4][1]: + area[0][1] = e.pos[1]-area[3][1] + + if area[0][0]+area[0][2]/2 < area[5][0]: + area[0][0] = area[5][0]-area[0][2]/2 + if area[0][0]+area[0][2]/2 > area[5][0]+area[5][2]: + area[0][0] = area[5][0]+area[5][2]-area[0][2]/2 + + if area[0][1]+area[0][3]/2 < area[5][1]: + area[0][1] = area[5][1]-area[0][3]/2 + if area[0][1]+area[0][3]/2 > area[5][1]+area[5][3]: + area[0][1] = area[5][1]+area[5][3]-area[0][3]/2 if self.engine.entity_manager.player_entity_name: if K_RIGHT in self.key_pressed: diff --git a/src/engine/renderer.py b/src/engine/renderer.py index 5268df3..fcc6a4f 100644 --- a/src/engine/renderer.py +++ b/src/engine/renderer.py @@ -150,22 +150,32 @@ class Renderer: area[0], width=1) for area in self.engine.event_handler.sliders_area: - print(area) if area[1] == 0: draw.rect(self.window, (0, 255, 20), (area[0][0] * window_size[0], area[0][1] * window_size[0], area[0][2] * window_size[0], area[0][3] * window_size[0]), width=1) + draw.rect(self.window, (0, 255, 200), + (area[5][0] * window_size[0], area[5][1] * window_size[0], + area[5][2] * window_size[0], area[5][3] * window_size[0]), width=1) elif area[1] == 1: draw.rect(self.window, (0, 255, 20), (area[0][0] * window_size[1], area[0][1] * window_size[1], area[0][2] * window_size[1], area[0][3] * window_size[1]), width=1) + draw.rect(self.window, (0, 255, 200), + (area[5][0] * window_size[1], area[5][1] * window_size[1], + area[5][2] * window_size[1], area[5][3] * window_size[1]), width=1) elif area[1] == 2: draw.rect(self.window, (0, 255, 20), (area[0][0] * window_size[0], area[0][1] * window_size[1], area[0][2] * window_size[0], area[0][3] * window_size[1]), width=1) + draw.rect(self.window, (0, 255, 200), + (area[5][0] * window_size[0], area[5][1] * window_size[1], + area[5][2] * window_size[0], area[5][3] * window_size[1]), width=1) else: draw.rect(self.window, (0, 255, 20), area[0], width=1) + draw.rect(self.window, (0, 255, 200), + area[5], width=1) # Rendu présent dans tous les types de jeu self.render_dialogs_box() diff --git a/src/main.py b/src/main.py index 35b7dc8..215334d 100644 --- a/src/main.py +++ b/src/main.py @@ -47,7 +47,7 @@ class Game(Engine): menu.add_widget(Slider(40, 200, base_image, hover_image)) self.menu_manager.register_menu(menu, "main") - self.event_handler.register_slider_area([10, 10, 50, 50]) + self.event_handler.register_slider_area((50, 50), (50, 300, 200, 200), (True, True)) self.menu_manager.show("main") From 38a9da9463fc7590c03cdd3eea3ff7f2f7bb8a5a Mon Sep 17 00:00:00 2001 From: yannis300307 Date: Wed, 10 Jan 2024 20:54:39 +0100 Subject: [PATCH 05/32] Centrage des sliders --- src/engine/event_handler.py | 22 ++++++++++++---------- src/engine/renderer.py | 8 +++++++- 2 files changed, 19 insertions(+), 11 deletions(-) diff --git a/src/engine/event_handler.py b/src/engine/event_handler.py index c07d46f..98a8465 100644 --- a/src/engine/event_handler.py +++ b/src/engine/event_handler.py @@ -63,7 +63,7 @@ class EventHandler: motion_axes: tuple[bool, bool], is_window_relative: int = -1): """Enregistre une zone comme une zone déplaçable à l'écran.""" - self.sliders_area.append([[motion_axes[0], motion_axes[1]]+list(size), is_window_relative, False, (0, 0), motion_axes, motion_rect]) + self.sliders_area.append([[motion_rect[0], motion_rect[1], *size], is_window_relative, False, (0, 0), motion_axes, motion_rect]) print(self.sliders_area[0]) # Le premier booléen correspond à l'état de suivi de la souris @@ -87,7 +87,9 @@ class EventHandler: area[1]() for area in self.sliders_area: - if self.get_click_collision(area[0], e.pos, area[1]): + if self.get_click_collision( + (area[0][0]-area[0][2]//2, area[0][1]-area[0][3]//2, area[0][2], area[0][3]), + e.pos, area[1]): area[2] = True area[3] = (e.pos[0] - area[0][0], e.pos[1] - area[0][1]) # add support for responsibility elif e.type == MOUSEBUTTONUP: @@ -113,15 +115,15 @@ class EventHandler: if area[4][1]: area[0][1] = e.pos[1]-area[3][1] - if area[0][0]+area[0][2]/2 < area[5][0]: - area[0][0] = area[5][0]-area[0][2]/2 - if area[0][0]+area[0][2]/2 > area[5][0]+area[5][2]: - area[0][0] = area[5][0]+area[5][2]-area[0][2]/2 + if area[0][0] < area[5][0]: + area[0][0] = area[5][0] + if area[0][0] > area[5][0]+area[5][2]: + area[0][0] = area[5][0]+area[5][2] - if area[0][1]+area[0][3]/2 < area[5][1]: - area[0][1] = area[5][1]-area[0][3]/2 - if area[0][1]+area[0][3]/2 > area[5][1]+area[5][3]: - area[0][1] = area[5][1]+area[5][3]-area[0][3]/2 + if area[0][1] < area[5][1]: + area[0][1] = area[5][1] + if area[0][1] > area[5][1]+area[5][3]: + area[0][1] = area[5][1]+area[5][3] if self.engine.entity_manager.player_entity_name: if K_RIGHT in self.key_pressed: diff --git a/src/engine/renderer.py b/src/engine/renderer.py index fcc6a4f..9f9f1d9 100644 --- a/src/engine/renderer.py +++ b/src/engine/renderer.py @@ -173,9 +173,15 @@ class Renderer: area[5][2] * window_size[0], area[5][3] * window_size[1]), width=1) else: draw.rect(self.window, (0, 255, 20), - area[0], width=1) + (area[0][0]-area[0][2]//2, area[0][1]-area[0][3]//2, area[0][2], area[0][3]), width=1) draw.rect(self.window, (0, 255, 200), area[5], width=1) + draw.line(self.window, (255, 0, 0), + (area[0][0]-2, area[0][1]), + (area[0][0]+2, area[0][1])) + draw.line(self.window, (255, 0, 0), + (area[0][0], area[0][1]-2), + (area[0][0], area[0][1]+2)) # Rendu présent dans tous les types de jeu self.render_dialogs_box() From 691a4f569fef8e48793dcaa9e0ba7c1f477052f9 Mon Sep 17 00:00:00 2001 From: yannis300307 Date: Wed, 10 Jan 2024 21:12:33 +0100 Subject: [PATCH 06/32] =?UTF-8?q?D=C3=A9but=20de=20responsibility?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/engine/event_handler.py | 33 +++++++++++++++++++++++++++++---- 1 file changed, 29 insertions(+), 4 deletions(-) diff --git a/src/engine/event_handler.py b/src/engine/event_handler.py index 98a8465..5bd56e6 100644 --- a/src/engine/event_handler.py +++ b/src/engine/event_handler.py @@ -1,6 +1,7 @@ import math from types import FunctionType +import pygame.display from pygame import event, display from pygame.locals import * @@ -70,6 +71,8 @@ class EventHandler: def update(self): """Vérifie s'il y a de nouvelles interactions et les traites.""" + window_size = pygame.display.get_window_size() + # Récupère les événements for e in event.get(): if e.type == QUIT: @@ -91,7 +94,14 @@ class EventHandler: (area[0][0]-area[0][2]//2, area[0][1]-area[0][3]//2, area[0][2], area[0][3]), e.pos, area[1]): area[2] = True - area[3] = (e.pos[0] - area[0][0], e.pos[1] - area[0][1]) # add support for responsibility + if area[1] == 0: + area[3] = (e.pos[0]/window_size[0] - area[0][0], e.pos[1]/window_size[0] - area[0][1]) + elif area[1] == 1: + area[3] = (e.pos[0]/window_size[1] - area[0][0], e.pos[1]/window_size[1] - area[0][1]) + elif area[1] == 2: + area[3] = (e.pos[0]/window_size[0] - area[0][0], e.pos[1]/window_size[1] - area[0][1]) + else: + area[3] = (e.pos[0] - area[0][0], e.pos[1] - area[0][1]) elif e.type == MOUSEBUTTONUP: for area in self.sliders_area: area[2] = False @@ -110,11 +120,26 @@ class EventHandler: for area in self.sliders_area: if area[2]: + print(area) if area[4][0]: - area[0][0] = e.pos[0]-area[3][0] + if area[1] == 0: + area[0][0] = e.pos[0]/window_size[0]-area[3][0] + elif area[1] == 1: + area[0][0] = e.pos[0]/window_size[1]-area[3][0] + elif area[1] == 2: + area[0][0] = e.pos[0]/window_size[0]-area[3][0] + else: + area[0][0] = e.pos[0] - area[3][0] if area[4][1]: - area[0][1] = e.pos[1]-area[3][1] - + if area[1] == 0: + area[0][1] = e.pos[1]/window_size[0]-area[3][1] + elif area[1] == 1: + area[0][1] = e.pos[1]/window_size[1]-area[3][1] + elif area[1] == 2: + area[0][1] = e.pos[1]/window_size[1]-area[3][1] + else: + area[0][1] = e.pos[1]-area[3][1] + if area[0][0] < area[5][0]: area[0][0] = area[5][0] if area[0][0] > area[5][0]+area[5][2]: From c31766cc0cf59209f90dfdb7004a0ce073782cda Mon Sep 17 00:00:00 2001 From: yannis300307 Date: Wed, 10 Jan 2024 21:12:53 +0100 Subject: [PATCH 07/32] Code exemple responsibility --- src/main.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main.py b/src/main.py index 215334d..4c24979 100644 --- a/src/main.py +++ b/src/main.py @@ -47,7 +47,7 @@ class Game(Engine): menu.add_widget(Slider(40, 200, base_image, hover_image)) self.menu_manager.register_menu(menu, "main") - self.event_handler.register_slider_area((50, 50), (50, 300, 200, 200), (True, True)) + self.event_handler.register_slider_area((0.1, 0.1), (0.1, 0.1, 0.3, 0.3), (True, True), 0) self.menu_manager.show("main") From 197a4ae7dc2ab00161e42e04e50ed48702baa681 Mon Sep 17 00:00:00 2001 From: adastram Date: Thu, 11 Jan 2024 08:55:04 +0100 Subject: [PATCH 08/32] Prevented Player from moving when dialog is occuring --- src/engine/event_handler.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/engine/event_handler.py b/src/engine/event_handler.py index 1568ed0..08cc424 100644 --- a/src/engine/event_handler.py +++ b/src/engine/event_handler.py @@ -74,6 +74,7 @@ class EventHandler: for area in self.buttons_area: if self.get_click_collision(area[0], e.pos, area[2]): area[1]() + elif e.type == MOUSEMOTION: for area in self.buttons_area: if area[4] is not None: @@ -87,13 +88,13 @@ class EventHandler: self.hovered_area.remove(area) if self.engine.entity_manager.player_entity_name: - if K_RIGHT in self.key_pressed: + if K_RIGHT in self.key_pressed and not self.engine.dialogs_manager.reading_dialog: self.engine.entity_manager.move_player_controls(1, 0) - if K_LEFT in self.key_pressed: + if K_LEFT in self.key_pressed and not self.engine.dialogs_manager.reading_dialog: self.engine.entity_manager.move_player_controls(-1, 0) - if K_UP in self.key_pressed: + if K_UP in self.key_pressed and not self.engine.dialogs_manager.reading_dialog: self.engine.entity_manager.move_player_controls(0, -1) - if K_DOWN in self.key_pressed: + if K_DOWN in self.key_pressed and not self.engine.dialogs_manager.reading_dialog: self.engine.entity_manager.move_player_controls(0, 1) if K_SPACE in self.key_pressed: From e2a97c65fdbbbb8f21278f2cd37355f655a5f251 Mon Sep 17 00:00:00 2001 From: adastram Date: Thu, 11 Jan 2024 09:51:29 +0100 Subject: [PATCH 09/32] Added .lock() and .unlock() entity functions (Prevent them from moving) --- src/engine/entity.py | 64 +++++++++++++++++++++++++------------------- 1 file changed, 37 insertions(+), 27 deletions(-) diff --git a/src/engine/entity.py b/src/engine/entity.py index 392a884..56bf8a0 100644 --- a/src/engine/entity.py +++ b/src/engine/entity.py @@ -11,6 +11,8 @@ class Entity: self.x = 8 self.y = 8 + self.locked = False + self.direction = 0 # 0 : tourné vers la droite (ou sens par défaut), 1 : tourné vers la gauche (ou retourné) # Variables utilisées pour détecter les mouvements @@ -131,38 +133,46 @@ class Entity: y = y/initial_speed*self.max_speed # On simule le mouvement. Si on ne rencontre pas de collision, on applique le mouvement - if not self.get_collisions(self.x + x, self.y, map_manager): - self.x += x - else: - # Si on a une collision, on avance pixel par pixel jusqu'à atteindre la collision - i = 0 - if x > 0: - while not self.get_collisions(self.x + i, self.y, map_manager): - i += 1 - i -= 1 + if not self.locked: # Si l'entité n'est pas verrouillée on applique le movement + if not self.get_collisions(self.x + x, self.y, map_manager): + self.x += x else: - while not self.get_collisions(self.x + i, self.y, map_manager): + # Si on a une collision, on avance pixel par pixel jusqu'à atteindre la collision + i = 0 + if x > 0: + while not self.get_collisions(self.x + i, self.y, map_manager): + i += 1 i -= 1 - i += 1 - - self.x += i - - # On répète le procédé avec l'ordonnée - if not self.get_collisions(self.x, self.y + y, map_manager): - self.y += y - else: - i = 0 - if y > 0: - while not self.get_collisions(self.x, self.y + i, map_manager): + else: + while not self.get_collisions(self.x + i, self.y, map_manager): + i -= 1 i += 1 - i -= 1 - else: - while not self.get_collisions(self.x, self.y + i, map_manager): - i -= 1 - i += 1 - self.y += i + self.x += i + + # On répète le procédé avec l'ordonnée + if not self.get_collisions(self.x, self.y + y, map_manager): + self.y += y + else: + i = 0 + if y > 0: + while not self.get_collisions(self.x, self.y + i, map_manager): + i += 1 + i -= 1 + else: + while not self.get_collisions(self.x, self.y + i, map_manager): + i -= 1 + i += 1 + + self.y += i def link_animation(self, name: str): """Met à jour l'animation en cours de l'entité.""" self.animation_name = name + + + def lock(self): + self.locked = True + + def unlock(self): + self.locked = False \ No newline at end of file From afb2e2386fec74b29f98753fd9c6b32ccdbc5c61 Mon Sep 17 00:00:00 2001 From: adastram Date: Thu, 11 Jan 2024 09:52:04 +0100 Subject: [PATCH 10/32] Removed print when next dialog is called --- src/engine/dialogs_manager.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/engine/dialogs_manager.py b/src/engine/dialogs_manager.py index 0faec80..377f482 100644 --- a/src/engine/dialogs_manager.py +++ b/src/engine/dialogs_manager.py @@ -31,8 +31,6 @@ class DialogsManager: else: self.next_dialog() - print("next") - def next_dialog(self): """Passe au dialogue suivant. Appelle le callback si le dialogue est fini.""" self.current_dialog_id += 1 From 83d51f3e5ed16f235c8b7c4708c49e02ff2a1dcb Mon Sep 17 00:00:00 2001 From: adastram Date: Thu, 11 Jan 2024 09:53:44 +0100 Subject: [PATCH 11/32] Added .pause() and .resume() functions (Pause the game logic (Entites moving and damage) and lock player (Player movements doesn't seems to be affected by the pause of the update loop)) --- src/engine/entity_manager.py | 41 ++++++++++++++++++++++++------------ 1 file changed, 28 insertions(+), 13 deletions(-) diff --git a/src/engine/entity_manager.py b/src/engine/entity_manager.py index 72e59a6..45fa572 100644 --- a/src/engine/entity_manager.py +++ b/src/engine/entity_manager.py @@ -8,6 +8,7 @@ class EntityManager: self.entities: dict[str:Entity] = {} self.player_entity_name = "" self.map_manager = map_manager + self.paused = False def register_entity(self, name: str) -> Entity: """Crée une entité et l'enregistre dans un dictionnaire.""" @@ -26,21 +27,22 @@ 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.update(delta) - if entity.life_points == 0: - self.entities.pop(entity_name) + if not self.paused: + for entity_name in list(self.entities.keys()): + entity = self.entities[entity_name] + entity.update(delta) + if entity.life_points == 0: + self.entities.pop(entity_name) - if entity.brain is not None: - entity.brain.update(delta) + if entity.brain is not None: + entity.brain.update(delta) - if self.player_entity_name: - player: Entity = self.get_by_name(self.player_entity_name) - if player.mouvements[0] != 0. or player.mouvements[1] != 0.: - player.link_animation("player_walking") - else: - player.link_animation("player_none") + if self.player_entity_name: + player: Entity = self.get_by_name(self.player_entity_name) + if player.mouvements[0] != 0. or player.mouvements[1] != 0.: + player.link_animation("player_walking") + else: + player.link_animation("player_none") def get_all_entities(self) -> list[Entity]: """Donne la liste de toutes les entités enregistrées.""" @@ -49,3 +51,16 @@ class EntityManager: def get_by_name(self, name: str) -> Entity: """Donne l'entité avec le nom donné.""" return self.entities[name] + + def pause(self): + self.paused = True + player: Entity = self.get_by_name(self.player_entity_name) + if not player.locked: + player.lock() + + + def resume(self): + self.paused = False + player: Entity = self.get_by_name(self.player_entity_name) + if player.locked: + player.unlock() \ No newline at end of file From ddb27bfd5a752d2c1c0b69a9ef58f1d5ab77b649 Mon Sep 17 00:00:00 2001 From: adastram Date: Thu, 11 Jan 2024 09:54:12 +0100 Subject: [PATCH 12/32] Added sync between dialogs and game pause --- src/engine/event_handler.py | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/src/engine/event_handler.py b/src/engine/event_handler.py index 08cc424..54756d5 100644 --- a/src/engine/event_handler.py +++ b/src/engine/event_handler.py @@ -88,13 +88,13 @@ class EventHandler: self.hovered_area.remove(area) if self.engine.entity_manager.player_entity_name: - if K_RIGHT in self.key_pressed and not self.engine.dialogs_manager.reading_dialog: + if K_RIGHT in self.key_pressed: self.engine.entity_manager.move_player_controls(1, 0) - if K_LEFT in self.key_pressed and not self.engine.dialogs_manager.reading_dialog: + if K_LEFT in self.key_pressed: self.engine.entity_manager.move_player_controls(-1, 0) - if K_UP in self.key_pressed and not self.engine.dialogs_manager.reading_dialog: + if K_UP in self.key_pressed: self.engine.entity_manager.move_player_controls(0, -1) - if K_DOWN in self.key_pressed and not self.engine.dialogs_manager.reading_dialog: + if K_DOWN in self.key_pressed: self.engine.entity_manager.move_player_controls(0, 1) if K_SPACE in self.key_pressed: @@ -116,3 +116,11 @@ class EventHandler: self.engine.camera.target_zoom *= 1.01 if K_c in self.key_pressed: self.engine.camera.target_zoom *= 0.99 + + if self.engine.dialogs_manager.reading_dialog: + if not self.engine.entity_manager.paused: + self.engine.entity_manager.pause() + else: + if self.engine.entity_manager.paused: + self.engine.entity_manager.resume() + From 15565c671203b6638556cc4cddb3efbe54b2ac54 Mon Sep 17 00:00:00 2001 From: adastram Date: Thu, 11 Jan 2024 09:55:24 +0100 Subject: [PATCH 13/32] Added Game satuts display in debug --- src/engine/renderer.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/engine/renderer.py b/src/engine/renderer.py index 4a3389e..5a75ac8 100644 --- a/src/engine/renderer.py +++ b/src/engine/renderer.py @@ -117,7 +117,7 @@ class Renderer: # Conteur de FPS en mode DEBUG if self.engine.DEBUG_MODE: - self.window.blit(font.SysFont("Arial", 20).render(f"FPS: {round(self.engine.clock.get_fps())}", True, (255, 0, 0)), + self.window.blit(font.SysFont("Arial", 20).render(f"FPS: {round(self.engine.clock.get_fps())}, 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)}", From 1f8444bc0bb597030b57a0c0e5a7ab8393306020 Mon Sep 17 00:00:00 2001 From: adastram Date: Thu, 11 Jan 2024 10:29:43 +0100 Subject: [PATCH 14/32] Edited .pause() function to lock all unlocked entity instead of blocking update function, and .resume() to unlock only non-locked entity before pause --- src/engine/entity_manager.py | 44 ++++++++++++++++++++---------------- 1 file changed, 24 insertions(+), 20 deletions(-) diff --git a/src/engine/entity_manager.py b/src/engine/entity_manager.py index 45fa572..b4016dc 100644 --- a/src/engine/entity_manager.py +++ b/src/engine/entity_manager.py @@ -8,6 +8,7 @@ class EntityManager: self.entities: dict[str:Entity] = {} self.player_entity_name = "" self.map_manager = map_manager + self.locked_before_pause: list[Entity] = [] self.paused = False def register_entity(self, name: str) -> Entity: @@ -27,22 +28,21 @@ class EntityManager: def update(self, delta: float): """Met à jour toutes les entités enregistrées.""" - if not self.paused: - for entity_name in list(self.entities.keys()): - entity = self.entities[entity_name] - entity.update(delta) - if entity.life_points == 0: - self.entities.pop(entity_name) + for entity_name in list(self.entities.keys()): + entity = self.entities[entity_name] + entity.update(delta) + if entity.life_points == 0: + self.entities.pop(entity_name) - if entity.brain is not None: - entity.brain.update(delta) + if entity.brain is not None: + entity.brain.update(delta) - if self.player_entity_name: - player: Entity = self.get_by_name(self.player_entity_name) - if player.mouvements[0] != 0. or player.mouvements[1] != 0.: - player.link_animation("player_walking") - else: - player.link_animation("player_none") + if self.player_entity_name: + player: Entity = self.get_by_name(self.player_entity_name) + if player.mouvements[0] != 0. or player.mouvements[1] != 0.: + player.link_animation("player_walking") + else: + player.link_animation("player_none") def get_all_entities(self) -> list[Entity]: """Donne la liste de toutes les entités enregistrées.""" @@ -53,14 +53,18 @@ class EntityManager: return self.entities[name] def pause(self): + for e in self.get_all_entities(): + if e.locked: + self.locked_before_pause.append(e) + else: + e.lock() self.paused = True - player: Entity = self.get_by_name(self.player_entity_name) - if not player.locked: - player.lock() def resume(self): + for e in self.get_all_entities(): + if not e in self.locked_before_pause: + e.unlock() + self.paused = False - player: Entity = self.get_by_name(self.player_entity_name) - if player.locked: - player.unlock() \ No newline at end of file + self.locked_before_pause = [] \ No newline at end of file From e8343160d4905b899637bdf83a2e9674813441ab Mon Sep 17 00:00:00 2001 From: adastram Date: Thu, 11 Jan 2024 10:30:34 +0100 Subject: [PATCH 15/32] Edited lock to block all interraction including animation instead of just the movements --- src/engine/entity.py | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/src/engine/entity.py b/src/engine/entity.py index 56bf8a0..12f94e5 100644 --- a/src/engine/entity.py +++ b/src/engine/entity.py @@ -119,21 +119,23 @@ class Entity: def move(self, x: float, y: float, map_manager: MapManager): """Fait bouger l'entité en tenant compte des collisions.""" - # On vérifie le sens du mouvement pour changer self.direction - if x > 0: - self.direction = 0 - elif x < 0: - self.direction = 1 - # On ne met pas de else car si x = 0, on ne change pas de direction + if not self.locked: # Si l'entité n'est pas verrouillée on calcul le mouvement + + # On vérifie le sens du mouvement pour changer self.direction + if x > 0: + self.direction = 0 + elif x < 0: + self.direction = 1 + # On ne met pas de else car si x = 0, on ne change pas de direction - # On normalise la vitesse - initial_speed = math.sqrt(x**2+y**2) + # On normalise la vitesse + initial_speed = math.sqrt(x**2+y**2) - x = x/initial_speed*self.max_speed - y = y/initial_speed*self.max_speed + x = x/initial_speed*self.max_speed + y = y/initial_speed*self.max_speed - # On simule le mouvement. Si on ne rencontre pas de collision, on applique le mouvement - if not self.locked: # Si l'entité n'est pas verrouillée on applique le movement + # On simule le mouvement. Si on ne rencontre pas de collision, on applique le mouvement + if not self.get_collisions(self.x + x, self.y, map_manager): self.x += x else: From 8cbe1a3727cd7ad2e3401065ce1fc50d65f473b7 Mon Sep 17 00:00:00 2001 From: adastram Date: Thu, 11 Jan 2024 10:41:57 +0100 Subject: [PATCH 16/32] Edited default zoom value --- src/engine/camera.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/engine/camera.py b/src/engine/camera.py index 9be655f..3c992b3 100644 --- a/src/engine/camera.py +++ b/src/engine/camera.py @@ -5,7 +5,7 @@ class Camera: def __init__(self): self.x = 0 self.y = 0 - self.zoom = 1. + self.zoom = 1.75 # Décalage lors du mouvement du joueur self.player_moving_offset = 100 From 9e400598a3205c3c5ad3f9f553dc0513ccd878f8 Mon Sep 17 00:00:00 2001 From: adastram Date: Thu, 11 Jan 2024 10:42:26 +0100 Subject: [PATCH 17/32] Imported whole engine and moved pause() handling from event_handler --- src/engine/dialogs_manager.py | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/src/engine/dialogs_manager.py b/src/engine/dialogs_manager.py index 377f482..85c9e73 100644 --- a/src/engine/dialogs_manager.py +++ b/src/engine/dialogs_manager.py @@ -1,14 +1,13 @@ import json from types import FunctionType -from src.engine.event_handler import EventHandler +from src.engine.engine import Engine class DialogsManager: """Classe qui gère la lecture des dialogues.""" - def __init__(self, event_handler: EventHandler): - self.event_handler = event_handler - + def __init__(self, engine: 'Engine'): + self.engine = engine self.current_dialogs = [] self.current_dialog_id = -1 self.dialogs = {} @@ -41,7 +40,8 @@ class DialogsManager: self.current_dialog_id = -1 self.writing_dialog = False self.reading_dialog = False - self.event_handler.remove_button_area("next_dialog") + self.engine.entity_manager.resume() + self.engine.event_handler.remove_button_area("next_dialog") if self.dialogue_finished_callback is not None: self.dialogue_finished_callback() @@ -50,7 +50,9 @@ class DialogsManager: # Si un dialogue n'est pas déja lancé, on lance le dialogue au nom donné if not self.reading_dialog: - self.event_handler.register_button_area((0, 0, 1, 1), self.next_signal, "next_dialog", 2) + self.engine.entity_manager.pause() + + self.engine.event_handler.register_button_area((0, 0, 1, 1), self.next_signal, "next_dialog", 2) self.current_dialogs = self.dialogs[name] self.current_dialog_id = 0 From f5c1f8bc6394b586daeba38c82a28630e567b1a3 Mon Sep 17 00:00:00 2001 From: adastram Date: Thu, 11 Jan 2024 10:42:42 +0100 Subject: [PATCH 18/32] Moved pause to dialogs_manager --- src/engine/event_handler.py | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/src/engine/event_handler.py b/src/engine/event_handler.py index 54756d5..c2408f0 100644 --- a/src/engine/event_handler.py +++ b/src/engine/event_handler.py @@ -112,15 +112,8 @@ class EventHandler: print(f"Player pos: X = {self.engine.entity_manager.get_by_name('player').x} " 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 - if K_c in self.key_pressed: - self.engine.camera.target_zoom *= 0.99 - - if self.engine.dialogs_manager.reading_dialog: - if not self.engine.entity_manager.paused: - self.engine.entity_manager.pause() - else: - if self.engine.entity_manager.paused: - self.engine.entity_manager.resume() + if K_x in self.key_pressed: + self.engine.camera.target_zoom *= 1.01 + if K_c in self.key_pressed: + self.engine.camera.target_zoom *= 0.99 From ce14e45e8f07c9e5573c094cc943a2fbdb5b4613 Mon Sep 17 00:00:00 2001 From: adastram Date: Thu, 11 Jan 2024 10:50:54 +0100 Subject: [PATCH 19/32] Fixed engine import --- src/engine/dialogs_manager.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/engine/dialogs_manager.py b/src/engine/dialogs_manager.py index 85c9e73..f32d605 100644 --- a/src/engine/dialogs_manager.py +++ b/src/engine/dialogs_manager.py @@ -1,12 +1,10 @@ import json from types import FunctionType - -from src.engine.engine import Engine - +import src.engine.engine as engine class DialogsManager: """Classe qui gère la lecture des dialogues.""" - def __init__(self, engine: 'Engine'): + def __init__(self, engine: 'engine.Engine'): self.engine = engine self.current_dialogs = [] self.current_dialog_id = -1 From 67fef0b82ecaf40706eedcbbd5edab6afab34ca3 Mon Sep 17 00:00:00 2001 From: adastram Date: Thu, 11 Jan 2024 10:51:14 +0100 Subject: [PATCH 20/32] Edited dialogs_manager import --- src/engine/engine.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/engine/engine.py b/src/engine/engine.py index 0abcc69..1aa6c61 100644 --- a/src/engine/engine.py +++ b/src/engine/engine.py @@ -36,7 +36,7 @@ class Engine: self.entity_manager = EntityManager(self.map_manager) self.boss_fight_manager = BossFightManager(self) self.event_sheduler = EventSheduler(self) - self.dialogs_manager = DialogsManager(self.event_handler) + self.dialogs_manager = DialogsManager(self) self.menu_manager = MenuManager(self) self.sound_manager = SoundManager(60) From daa7ca46d41647935f8acf0c07864076f0304b8b Mon Sep 17 00:00:00 2001 From: adastram Date: Thu, 11 Jan 2024 10:58:56 +0100 Subject: [PATCH 21/32] Added doc string --- src/engine/entity.py | 6 ++++-- src/engine/entity_manager.py | 4 +++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/src/engine/entity.py b/src/engine/entity.py index 12f94e5..9b7e571 100644 --- a/src/engine/entity.py +++ b/src/engine/entity.py @@ -11,7 +11,7 @@ class Entity: self.x = 8 self.y = 8 - self.locked = False + self.locked = False # Variable définissant si l'entité est bloqué ou non (.lock() et .unlock()) self.direction = 0 # 0 : tourné vers la droite (ou sens par défaut), 1 : tourné vers la gauche (ou retourné) @@ -169,12 +169,14 @@ class Entity: self.y += i def link_animation(self, name: str): - """Met à jour l'animation en cours de l'entité.""" + """Met à jour l'animation en cours de l'entitée.""" self.animation_name = name def lock(self): + """Bloque tout les mouvements de l'entitée""" self.locked = True def unlock(self): + """Débloque tout les mouvements de l'entitée""" self.locked = False \ No newline at end of file diff --git a/src/engine/entity_manager.py b/src/engine/entity_manager.py index b4016dc..6b45414 100644 --- a/src/engine/entity_manager.py +++ b/src/engine/entity_manager.py @@ -34,7 +34,7 @@ class EntityManager: if entity.life_points == 0: self.entities.pop(entity_name) - if entity.brain is not None: + if entity.brain is not None and not self.paused: entity.brain.update(delta) if self.player_entity_name: @@ -53,6 +53,7 @@ class EntityManager: return self.entities[name] def pause(self): + """Met en pause tout les mouvements de toutes les entitées""" for e in self.get_all_entities(): if e.locked: self.locked_before_pause.append(e) @@ -62,6 +63,7 @@ class EntityManager: def resume(self): + """Reprend les mouvement de toutes les entitées qui n'étaient pas lock avant l'appel de .pause()""" for e in self.get_all_entities(): if not e in self.locked_before_pause: e.unlock() From cfb82a5ee7462f44d01a445ebe357cae5befc68f Mon Sep 17 00:00:00 2001 From: yannis300307 Date: Thu, 11 Jan 2024 17:45:23 +0100 Subject: [PATCH 22/32] Ajout de la responsibility des sliders --- src/engine/event_handler.py | 4 +--- src/engine/renderer.py | 24 +++++++++++++++++++++--- src/main.py | 2 +- 3 files changed, 23 insertions(+), 7 deletions(-) diff --git a/src/engine/event_handler.py b/src/engine/event_handler.py index 5bd56e6..a8b489d 100644 --- a/src/engine/event_handler.py +++ b/src/engine/event_handler.py @@ -65,7 +65,6 @@ class EventHandler: is_window_relative: int = -1): """Enregistre une zone comme une zone déplaçable à l'écran.""" self.sliders_area.append([[motion_rect[0], motion_rect[1], *size], is_window_relative, False, (0, 0), motion_axes, motion_rect]) - print(self.sliders_area[0]) # Le premier booléen correspond à l'état de suivi de la souris def update(self): @@ -91,7 +90,7 @@ class EventHandler: for area in self.sliders_area: if self.get_click_collision( - (area[0][0]-area[0][2]//2, area[0][1]-area[0][3]//2, area[0][2], area[0][3]), + (area[0][0]-area[0][2]/2, area[0][1]-area[0][3]/2, area[0][2], area[0][3]), e.pos, area[1]): area[2] = True if area[1] == 0: @@ -120,7 +119,6 @@ class EventHandler: for area in self.sliders_area: if area[2]: - print(area) if area[4][0]: if area[1] == 0: area[0][0] = e.pos[0]/window_size[0]-area[3][0] diff --git a/src/engine/renderer.py b/src/engine/renderer.py index 9f9f1d9..84b1a72 100644 --- a/src/engine/renderer.py +++ b/src/engine/renderer.py @@ -152,25 +152,43 @@ class Renderer: for area in self.engine.event_handler.sliders_area: if area[1] == 0: draw.rect(self.window, (0, 255, 20), - (area[0][0] * window_size[0], area[0][1] * window_size[0], + ((area[0][0]-area[0][2]/2) * window_size[0], (area[0][1]-area[0][3]/2) * window_size[0], area[0][2] * window_size[0], area[0][3] * window_size[0]), width=1) draw.rect(self.window, (0, 255, 200), (area[5][0] * window_size[0], area[5][1] * window_size[0], area[5][2] * window_size[0], area[5][3] * window_size[0]), width=1) + draw.line(self.window, (255, 0, 0), + (area[0][0] * window_size[0] - 2, area[0][1] * window_size[0]), + (area[0][0] * window_size[0] + 2, area[0][1] * window_size[0])) + draw.line(self.window, (255, 0, 0), + (area[0][0] * window_size[0], area[0][1] * window_size[0] - 2), + (area[0][0] * window_size[0], area[0][1] * window_size[0] + 2)) elif area[1] == 1: draw.rect(self.window, (0, 255, 20), - (area[0][0] * window_size[1], area[0][1] * window_size[1], + ((area[0][0]-area[0][2]/2) * window_size[1], (area[0][1]-area[0][3]/2) * window_size[1], area[0][2] * window_size[1], area[0][3] * window_size[1]), width=1) draw.rect(self.window, (0, 255, 200), (area[5][0] * window_size[1], area[5][1] * window_size[1], area[5][2] * window_size[1], area[5][3] * window_size[1]), width=1) + draw.line(self.window, (255, 0, 0), + (area[0][0] * window_size[1] - 2, area[0][1] * window_size[1]), + (area[0][0] * window_size[1] + 2, area[0][1] * window_size[1])) + draw.line(self.window, (255, 0, 0), + (area[0][0] * window_size[1], area[0][1] * window_size[1] - 2), + (area[0][0] * window_size[1], area[0][1] * window_size[1] + 2)) elif area[1] == 2: draw.rect(self.window, (0, 255, 20), - (area[0][0] * window_size[0], area[0][1] * window_size[1], + ((area[0][0]-area[0][2]/2) * window_size[0], (area[0][1]-area[0][3]/2) * window_size[1], area[0][2] * window_size[0], area[0][3] * window_size[1]), width=1) draw.rect(self.window, (0, 255, 200), (area[5][0] * window_size[0], area[5][1] * window_size[1], area[5][2] * window_size[0], area[5][3] * window_size[1]), width=1) + draw.line(self.window, (255, 0, 0), + (area[0][0]*window_size[0] - 2, area[0][1]*window_size[1]), + (area[0][0]*window_size[0] + 2, area[0][1]*window_size[1])) + draw.line(self.window, (255, 0, 0), + (area[0][0]*window_size[0], area[0][1]*window_size[1] - 2), + (area[0][0]*window_size[0], area[0][1]*window_size[1] + 2)) else: draw.rect(self.window, (0, 255, 20), (area[0][0]-area[0][2]//2, area[0][1]-area[0][3]//2, area[0][2], area[0][3]), width=1) diff --git a/src/main.py b/src/main.py index 4c24979..71a0604 100644 --- a/src/main.py +++ b/src/main.py @@ -47,7 +47,7 @@ class Game(Engine): menu.add_widget(Slider(40, 200, base_image, hover_image)) self.menu_manager.register_menu(menu, "main") - self.event_handler.register_slider_area((0.1, 0.1), (0.1, 0.1, 0.3, 0.3), (True, True), 0) + self.event_handler.register_slider_area((0.1, 0.1), (0.2, 0.4, 0.3, 0.3), (True, True), 1) self.menu_manager.show("main") From d5674c7e635ddb32c155ad1a366a0ec09d85f60e Mon Sep 17 00:00:00 2001 From: yannis300307 Date: Thu, 11 Jan 2024 20:42:36 +0100 Subject: [PATCH 23/32] =?UTF-8?q?D=C3=A9but=20d'implementation=20des=20cal?= =?UTF-8?q?lbacks=20de=20sliders?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/engine/event_handler.py | 33 +++++++++++++++++++++++++-------- src/main.py | 2 +- 2 files changed, 26 insertions(+), 9 deletions(-) diff --git a/src/engine/event_handler.py b/src/engine/event_handler.py index a8b489d..03194e1 100644 --- a/src/engine/event_handler.py +++ b/src/engine/event_handler.py @@ -16,7 +16,8 @@ class EventHandler: self.engine = core self.key_pressed = [] self.buttons_area = [] - self.hovered_area = [] + self.hovered_buttons_area = [] + self.hovered_sliders_area = [] self.sliders_area = [] @staticmethod @@ -43,7 +44,7 @@ class EventHandler: callback: FunctionType | classmethod | staticmethod, name: str, is_window_relative: int = -1, hover_callback: FunctionType | classmethod | staticmethod = None): - """Enregistre une zone comme bouton. La fonction donnée sera donc executé lorsque la zone sur la fenêtre + """Enregistre une zone comme bouton. La fonction donnée sera donc executée lorsque la zone sur la fenêtre sera cliqué. is_window_relative doit être 0 pour que le rect soit multipliée par la largeur de la fenêtre et 1 pour qu'elle soit multipliée par la hauteur""" self.buttons_area.append((rect, callback, is_window_relative, name, hover_callback)) @@ -62,11 +63,21 @@ class EventHandler: def register_slider_area(self, size: tuple[float | int, float | int], motion_rect: tuple[float | int, float | int, float | int, float | int], motion_axes: tuple[bool, bool], - is_window_relative: int = -1): + is_window_relative: int = -1, + clicked_callback: FunctionType | classmethod | staticmethod = None, + released_callback: FunctionType | classmethod | staticmethod = None, + hover_callback: FunctionType | classmethod | staticmethod = None): """Enregistre une zone comme une zone déplaçable à l'écran.""" - self.sliders_area.append([[motion_rect[0], motion_rect[1], *size], is_window_relative, False, (0, 0), motion_axes, motion_rect]) + self.sliders_area.append([[motion_rect[0], motion_rect[1], *size], is_window_relative, False, (0, 0), + motion_axes, motion_rect, clicked_callback, released_callback, hover_callback]) # Le premier booléen correspond à l'état de suivi de la souris + @staticmethod + def get_slider_area_values(slider: list): + """Donne la valeur de la zone de slider donnée.""" + return round((slider[0][0]-slider[5][0])/slider[5][2], 5), round((slider[0][1]-slider[5][1])/slider[5][3], 5) + + def update(self): """Vérifie s'il y a de nouvelles interactions et les traites.""" @@ -101,21 +112,27 @@ class EventHandler: area[3] = (e.pos[0]/window_size[0] - area[0][0], e.pos[1]/window_size[1] - area[0][1]) else: area[3] = (e.pos[0] - area[0][0], e.pos[1] - area[0][1]) + + if area[6] is not None: + area[6](self.get_slider_area_values(area)) + elif e.type == MOUSEBUTTONUP: for area in self.sliders_area: area[2] = False + if area[7] is not None: + area[7](self.get_slider_area_values(area)) elif e.type == MOUSEMOTION: for area in self.buttons_area: if area[4] is not None: if self.get_click_collision(area[0], e.pos, area[2]): - if area not in self.hovered_area: + if area not in self.hovered_buttons_area: area[4](True) - self.hovered_area.append(area) + self.hovered_buttons_area.append(area) else: - if area in self.hovered_area: + if area in self.hovered_buttons_area: area[4](False) - self.hovered_area.remove(area) + self.hovered_buttons_area.remove(area) for area in self.sliders_area: if area[2]: diff --git a/src/main.py b/src/main.py index 71a0604..692549e 100644 --- a/src/main.py +++ b/src/main.py @@ -47,7 +47,7 @@ class Game(Engine): menu.add_widget(Slider(40, 200, base_image, hover_image)) self.menu_manager.register_menu(menu, "main") - self.event_handler.register_slider_area((0.1, 0.1), (0.2, 0.4, 0.3, 0.3), (True, True), 1) + self.event_handler.register_slider_area((0.1, 0.1), (0.2, 0.4, 0.3, 0.3), (True, True), 1, clicked_callback=print,released_callback=print) self.menu_manager.show("main") From 93b7e95dca4b2c2fcffcf6ab30d27bc3a02f1713 Mon Sep 17 00:00:00 2001 From: yannis300307 Date: Fri, 12 Jan 2024 14:31:57 +0100 Subject: [PATCH 24/32] =?UTF-8?q?Fix=20du=20callback=20du=20slider=20qui?= =?UTF-8?q?=20est=20appel=C3=A9=20m=C3=AAme=20si=20le=20slider=20n'=C3=A9t?= =?UTF-8?q?ait=20pas=20tenu?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/engine/event_handler.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/engine/event_handler.py b/src/engine/event_handler.py index 03194e1..cb1cfbd 100644 --- a/src/engine/event_handler.py +++ b/src/engine/event_handler.py @@ -118,9 +118,10 @@ class EventHandler: elif e.type == MOUSEBUTTONUP: for area in self.sliders_area: - area[2] = False - if area[7] is not None: - area[7](self.get_slider_area_values(area)) + if area[2]: + area[2] = False + if area[7] is not None: + area[7](self.get_slider_area_values(area)) elif e.type == MOUSEMOTION: for area in self.buttons_area: From 37cdffc8e30575e8fcf0fe78eccb8eac3fa83962 Mon Sep 17 00:00:00 2001 From: yannis300307 Date: Fri, 12 Jan 2024 17:17:02 +0100 Subject: [PATCH 25/32] Ajout du callback du hover --- src/engine/event_handler.py | 11 +++++++++++ src/main.py | 2 +- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/src/engine/event_handler.py b/src/engine/event_handler.py index cb1cfbd..5423fbc 100644 --- a/src/engine/event_handler.py +++ b/src/engine/event_handler.py @@ -165,6 +165,17 @@ class EventHandler: area[0][1] = area[5][1] if area[0][1] > area[5][1]+area[5][3]: area[0][1] = area[5][1]+area[5][3] + if area[8] is not None: + if self.get_click_collision( + (area[0][0] - area[0][2] / 2, area[0][1] - area[0][3] / 2, area[0][2], area[0][3]), + e.pos, area[1]): + if area not in self.hovered_sliders_area: + area[8](True) + self.hovered_sliders_area.append(area) + else: + if area in self.hovered_sliders_area: + area[8](False) + self.hovered_sliders_area.remove(area) if self.engine.entity_manager.player_entity_name: if K_RIGHT in self.key_pressed: diff --git a/src/main.py b/src/main.py index 692549e..002b14d 100644 --- a/src/main.py +++ b/src/main.py @@ -47,7 +47,7 @@ class Game(Engine): menu.add_widget(Slider(40, 200, base_image, hover_image)) self.menu_manager.register_menu(menu, "main") - self.event_handler.register_slider_area((0.1, 0.1), (0.2, 0.4, 0.3, 0.3), (True, True), 1, clicked_callback=print,released_callback=print) + self.event_handler.register_slider_area((0.1, 0.1), (0.2, 0.4, 0.3, 0.3), (True, True), 1, clicked_callback=print, released_callback=print, hover_callback=print) self.menu_manager.show("main") From 4128f32d2655650490edb9f6184e8039d4622cb4 Mon Sep 17 00:00:00 2001 From: yannis300307 Date: Fri, 12 Jan 2024 18:16:47 +0100 Subject: [PATCH 26/32] =?UTF-8?q?Ajout=20du=20rendu=20et=20d=C3=A9but=20d'?= =?UTF-8?q?implementation=20des=20sliders?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/engine/event_handler.py | 7 ++++++- src/engine/menu_manager.py | 40 +++++++++++++++++++++++-------------- src/engine/renderer.py | 24 ++++++++++++---------- src/main.py | 4 +--- 4 files changed, 45 insertions(+), 30 deletions(-) diff --git a/src/engine/event_handler.py b/src/engine/event_handler.py index 5423fbc..4f4068a 100644 --- a/src/engine/event_handler.py +++ b/src/engine/event_handler.py @@ -66,10 +66,12 @@ class EventHandler: is_window_relative: int = -1, clicked_callback: FunctionType | classmethod | staticmethod = None, released_callback: FunctionType | classmethod | staticmethod = None, + motion_callback: FunctionType | classmethod | staticmethod = None, hover_callback: FunctionType | classmethod | staticmethod = None): """Enregistre une zone comme une zone déplaçable à l'écran.""" self.sliders_area.append([[motion_rect[0], motion_rect[1], *size], is_window_relative, False, (0, 0), - motion_axes, motion_rect, clicked_callback, released_callback, hover_callback]) + motion_axes, motion_rect, + clicked_callback, released_callback, hover_callback, motion_callback]) # Le premier booléen correspond à l'état de suivi de la souris @staticmethod @@ -165,6 +167,9 @@ class EventHandler: area[0][1] = area[5][1] if area[0][1] > area[5][1]+area[5][3]: area[0][1] = area[5][1]+area[5][3] + + if area[9] is not None: + area[9](self.get_slider_area_values(area)) if area[8] is not None: if self.get_click_collision( (area[0][0] - area[0][2] / 2, area[0][1] - area[0][3] / 2, area[0][2], area[0][3]), diff --git a/src/engine/menu_manager.py b/src/engine/menu_manager.py index 8b48d99..885cfaf 100644 --- a/src/engine/menu_manager.py +++ b/src/engine/menu_manager.py @@ -27,26 +27,30 @@ class Label(Widget): class Slider(Widget): """Un widget pouvant être glissé pour récupérer une valeur.""" - def __init__(self, x: int | float, y: int | float, + def __init__(self, cursor_size: tuple[int | float, int | float], + area_rect: tuple[int | float, int | float], + width: int | float, base_image: pygame.Surface, hover_image: pygame.Surface, is_window_relative: int = -1, area_name: str = "menu_slider"): - super().__init__(x, y, is_window_relative) + super().__init__(area_rect[0], area_rect[1], is_window_relative) self.base_image = base_image self.hover_image = hover_image self.area_name = area_name self.hovered = False self.follow_mouse = False + self.cursor_size = cursor_size self.value = 0. - self.width = 100 + self.width = width def set_hover_state(self, state: bool): """Modifie la valeur du hover.""" self.hovered = state - def set_mouse_pos(self, x: int): - self.value = (x-self.x)/self.width + def set_value(self, values: tuple[float, float]): + """Appelée lorsque la valeur du slider est modifiée.""" + self.value = values[0] class Button(Widget): @@ -98,18 +102,24 @@ class MenuManager: self.active_menu = self.menus[name] # On itère dans tous les bouttons pour leur ajouter une interaction - for btn in self.active_menu.widgets: - if isinstance(btn, Button): - width = btn.base_image.get_width() / self.engine.renderer.window_size[0] - height = btn.base_image.get_height() / self.engine.renderer.window_size[1] - area_x = btn.x - area_y = btn.y - if btn.centered: + for widget in self.active_menu.widgets: + if isinstance(widget, Button): + width = widget.base_image.get_width() / self.engine.renderer.window_size[0] + height = widget.base_image.get_height() / self.engine.renderer.window_size[1] + area_x = widget.x + area_y = widget.y + if widget.centered: area_x -= width / 2 area_y -= height / 2 - self.engine.event_handler.register_button_area((area_x, area_y, width, height), btn.callback, - btn.area_name, - btn.is_window_relative, btn.set_hover_state) + self.engine.event_handler.register_button_area((area_x, area_y, width, height), widget.callback, + widget.area_name, + widget.is_window_relative, widget.set_hover_state) + elif isinstance(widget, Slider): + self.engine.event_handler.register_slider_area(widget.cursor_size, + (widget.x, widget.y, widget.width, 1), (True, False), + widget.is_window_relative, + hover_callback=widget.set_hover_state, + motion_callback=widget.set_value) def hide(self): """Affiche le menu actuelement à l'écran.""" diff --git a/src/engine/renderer.py b/src/engine/renderer.py index 84b1a72..3703eb1 100644 --- a/src/engine/renderer.py +++ b/src/engine/renderer.py @@ -291,23 +291,25 @@ class Renderer: self.window.blit(rendered_text, (x, y)) elif isinstance(widget, Slider): if widget.hovered: - btn_image = widget.hover_image + slider_image = widget.hover_image else: - btn_image = widget.base_image + slider_image = widget.base_image if widget.is_window_relative == 0: - btn_image = transform.scale(btn_image, (btn_image.get_width()*window_size[0]/self.window_size[0], - btn_image.get_height()*window_size[0]/self.window_size[0])) + slider_image = transform.scale(slider_image, + (slider_image.get_width()*window_size[0]/self.window_size[0], + slider_image.get_height()*window_size[0]/self.window_size[0])) elif widget.is_window_relative == 1: - btn_image = transform.scale(btn_image, (btn_image.get_width()*window_size[1]/self.window_size[1], - btn_image.get_height()*window_size[1]/self.window_size[1])) + slider_image = transform.scale(slider_image, + (slider_image.get_width()*window_size[1]/self.window_size[1], + slider_image.get_height()*window_size[1]/self.window_size[1])) elif widget.is_window_relative == 2: - btn_image = transform.scale(btn_image, (btn_image.get_width()*window_size[0]/self.window_size[0], - btn_image.get_height()*window_size[1]/self.window_size[1])) + slider_image = transform.scale(slider_image, + (slider_image.get_width()*window_size[0]/self.window_size[0], + slider_image.get_height()*window_size[1]/self.window_size[1])) - # On affiche l'image du boutton - - self.window.blit(btn_image, (x+widget.value*widget.width, y)) + self.window.blit(slider_image, (x+widget.value*widget.width-slider_image.get_width()//2, + y-slider_image.get_height()//2)) def render_dialogs_box(self): diff --git a/src/main.py b/src/main.py index 002b14d..372ec48 100644 --- a/src/main.py +++ b/src/main.py @@ -44,11 +44,9 @@ class Game(Engine): hover_image = pygame.image.load("assets/textures/GUI/button_2.png").convert_alpha() menu.add_widget(Button(0.5, 0.3, "play", 0.08, (0, 0, 0), self.start_game, base_image, hover_image, True, 0)) - menu.add_widget(Slider(40, 200, base_image, hover_image)) + menu.add_widget(Slider((50, 50), (100, 300), 100, base_image, hover_image)) self.menu_manager.register_menu(menu, "main") - self.event_handler.register_slider_area((0.1, 0.1), (0.2, 0.4, 0.3, 0.3), (True, True), 1, clicked_callback=print, released_callback=print, hover_callback=print) - self.menu_manager.show("main") def create_player_entity(self): From 582060814e5bc652d33910faa5fde1d2cfd45d4e Mon Sep 17 00:00:00 2001 From: yannis300307 Date: Fri, 12 Jan 2024 18:42:06 +0100 Subject: [PATCH 27/32] Ajout du rendu du rail du slider --- assets/textures/GUI/slider_cursor_1.png | Bin 0 -> 1043 bytes assets/textures/GUI/slider_cursor_2.png | Bin 0 -> 1094 bytes assets/textures/GUI/slider_rail_1.png | Bin 0 -> 1689 bytes src/engine/event_handler.py | 14 +++++++++++++- src/engine/menu_manager.py | 3 +++ src/engine/renderer.py | 3 ++- src/main.py | 12 ++++++++---- 7 files changed, 26 insertions(+), 6 deletions(-) create mode 100644 assets/textures/GUI/slider_cursor_1.png create mode 100644 assets/textures/GUI/slider_cursor_2.png create mode 100644 assets/textures/GUI/slider_rail_1.png diff --git a/assets/textures/GUI/slider_cursor_1.png b/assets/textures/GUI/slider_cursor_1.png new file mode 100644 index 0000000000000000000000000000000000000000..bd5477fd3da152f8e5ccba86062dd5809faf1f99 GIT binary patch literal 1043 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBugD~Uq{1qt-49qJ$T^vIy;@-|a?Jw*obG*HY-M5FGFLW_) zgz3ftqj?4&8Q32`=3AKii$BApk@?-Tn8! z7H7`9KkZt==F4~eKb?GY>Ft{{>#a9$KJ7C-bFRrA#`XlZWe+%KG`wBHRDW=O0qee& z^AGqdUVJ&A^Tcz{gx_4x6i(M@#I(mRDBEQ4TlACH-}Jsi>;b3msLCHo-k>_^gX|Tf zl8fIzsN`^k{gb|8R1|sbB-f#TyBYL@X9IXwzh8{K8d@L zFjIhK{r>&&y4Ah?3%IJQ-*WGJ{P=O)#)v7GTc-!De3H63ax0%{R5^Rx{>JUQIy*Vn z2dzAzd5HhCm8Ip%YpyBv0oT(kPh8~tQeQb;Yd`zxIj5gqvFfahaFu!CZUJ@h!vt!^LxV?zG&R_lPy)-IYHJwem_AzIhwHG)AxbWy!5o^DFxO3u;zv zeo(t__wML#cT^{O%-Fcm@aATTB!(Xz*#{l{mK)gE=tPT2vNfFlEGF}?l#7{}c~fd( zoAX1XEpcgY-n`jTTk(6pgS|k=bS~xt=MFIaZO9Nrt?=b!g3dl#r70t{T%h*sl{9mm|PFU+1bYm(00#?))C zlIQ#x* z&NZ9r-${gr?`@d=cP~SMQ2j5>^aMUWzFGI~-P`8B`ss&h$~JsOV&dYw?;_GlOGE8= zpBV4qVxE3xLhuG*ao>%1=ePMDRH$i*a?|_8X%_p__J)j{v##^>l-c=}4^wovFX;Ad znqHHTe_u;Rz2LzIu`G4&$ubW&uDMnl=RDu>jzr&l%d`hh-QFK`Z1`^fE$f`B>tuKC m^UA*0^X57I`{bK+M!q9d;*zUe!e?McX7F_Nb6Mw<&;$U+D%iFF literal 0 HcmV?d00001 diff --git a/assets/textures/GUI/slider_cursor_2.png b/assets/textures/GUI/slider_cursor_2.png new file mode 100644 index 0000000000000000000000000000000000000000..1cb79992a4f01fcd22a332ad719bc976c28bd792 GIT binary patch literal 1094 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBugD~Uq{1qt-49vGZT^vIy;@-~o_Yet`IX*wk!?Sf+M4%$; zwp)pshYqVf)7{h;w`eNgQKc)H{rC2kTyfZ->h&0Q;JOZ@Hsw==KQ^MpX47Kh8- zx4&yYhn1J5m&Hbxq}{K1@VGjkZ}acpduN(&{#2d1sKD>wX#&6XrX7B(!dQRs z{RiVYP5lqeBTC8+zn&mJsbt6b1c6W1;;r5VQc<-tCignVt&C37-^0Jw@12@*fxJ$K z)eoVlxfgo(HMJ*-g>@@5_a9=j+_Z4fBBzkh(3Ka@ZQ8O$W!m)VS5Hi{*uznOYNC=c z>lL`s~eEj^Lc^}EX!S(-?;0Ygw_dlcE zuJbVSvoI;i@O6Ls^tSF%Zl8;iVpVmutBKUvsU7SemR&SeZ&>|TcyV^y!S7$bbR0Y8 zR(j;-ktD;5ckj;C=6pNhJePCfMgdv|9i=f-W@mi4VG=BR6ZA8h_P_v)+% zw(qB%zQ;BHyn0mh&S#ND?e!Jhb6O(bpP%!0;zYsYdKI%Kjyr_Sg9ozoevW_43Qa0?$;l^yG8z^G$+eX70Bfi)Me zPl{A~F!|#BhOOIm>~%%O#KnP5@-b$-laSCP8tUxqob{wmqT6@s4H01lZ#Uz_y}I6K z?)Vwa6nXskan_Wh8o~#W2FAvV-QFq7 z^*^6gD_LB%@r!#!RNtk9+Peo1G^|*;GSK}Fqxi=FjTH0W@e18b!-K*PXz@tL8rv}X zKUt>TXgpuJ;!s5R4bRYS;j~uM=Jcl;ykXIwgJ#X1EqwOu*+pw~is!c)KUj3O+D@qR z3D-ZtJ=rCj%Xr+F-y zb{0*!wM;Ya;hI_h6x}Nmgzh=4*3HQKqHDv&-L#$ATq1Jr1z)=s*8Dj>&$*r`A9(e| zZ`$vsb%z!m_}(J@fpyC-1ND=#>;J5)PKev~$>#B+6R~P{G7j>(9)DOjqiXpLJ&8B@ qC+2^?bLZ^bw~Hqj@Aqu^!MsJy67{+m}bme7ACR(n%7b+_;yagso3L>C_6U$p77@|utODfGYJ87YKN5ulc z@HzxpWtVNa@`fmBF0#vPULY;=+PX|f`y=+@_de%2=Q;0(_nhavmk78(qs>;E0RVsz zIw&Aar=vQs2Ag!#e3lE-i5@d75D92k?$GMY*EGKnKLDVkc+2PbjXM9$@gOo205Ipe-Cs6VUk z6~=pN?GyTlZh6npEM~pSbajkn#1dvpMI}1tNpr?bFKf|sr*yyi=$J{`otHzB5{09G zXInmXgGEI}v&3cYNL5yBNd&ENkn)Ysnrmy#O3sc?382cdz*3_J8I7!(g!KUlE3}<3 zM*x2NQ7NpIqHsXoD#Eyhy1@i~sy=?>p4cW3g?rDnKYR-9t*z>Chcss!ZAHbA)g&U>$#GbO$DuuMaYajLkxMpI6QSh>J zzw<$lWdxDq2QKHLULm=t$^QW%GTNYsyq#_hsU_!bdw%m;j;CoQGc_m>I?#o%uH_N= z?1HH}Wrn+~b$p~lz0dshdr2J=?_EP4dy>J(BwToEUCC^0Y~UusOW1>}V#0WLy7Kau zxHOgV1HVh>#JbY$`R{yKDhN21-lad(%=5Z`A0H2&d7w+i#e2iX(N)G;Lx4Lx8rmL8$vPiDWpMlt{VTZ-YQ-eHRW*q+5*Ih}T`H6;D#prLoxmX(a& zFpr1BSGuE`Vi&b8qP|NfyQA2cRdb)!_j_8lvOnAg!8ii9J}HYU3>A;MNu6D$pCRu} zY;Y_f$#Pxc(6hlAa~2;e#84wHQq?IlTnbWekUd@4hS1!S&|!PiF3Sv7+l>sgU^#S+4O zw#B|ygJhACgYUy+#$+;|%oX-5ATCWf2%O!YL+B_cvk?AF`8LeoB@Ybg$t_S4k7}?o zmEx=pUPis~+)qphVQrf@4-qb3VF=VbVk)OYQ4ziB0NtErN zlCI5ThqgseuZ$-1^TV|N6w4=HQ1Zxfjrn!2@}@b`^@2>ul>4U}7x_hZP@_Z{c(`K? z#(jq43frJWd|g|{n-7kv(GT*cRM@Xc;3LJa?)r1AJW|G0GswrGt+gOxvlr$3&)gNJ z&!u{+*bq*CcCttm3?bsngMBq_JdKp_^2Q-Ea~#kz6w&QsHaN<&2Vc&{qhe{xV=NB` f@83^Z(&g)Vt6eZ(TgeTU?wtV8C|p20GVc7peEcbI literal 0 HcmV?d00001 diff --git a/src/engine/event_handler.py b/src/engine/event_handler.py index 4f4068a..df4b2ac 100644 --- a/src/engine/event_handler.py +++ b/src/engine/event_handler.py @@ -63,6 +63,7 @@ class EventHandler: def register_slider_area(self, size: tuple[float | int, float | int], motion_rect: tuple[float | int, float | int, float | int, float | int], motion_axes: tuple[bool, bool], + name: str, is_window_relative: int = -1, clicked_callback: FunctionType | classmethod | staticmethod = None, released_callback: FunctionType | classmethod | staticmethod = None, @@ -71,9 +72,20 @@ class EventHandler: """Enregistre une zone comme une zone déplaçable à l'écran.""" self.sliders_area.append([[motion_rect[0], motion_rect[1], *size], is_window_relative, False, (0, 0), motion_axes, motion_rect, - clicked_callback, released_callback, hover_callback, motion_callback]) + clicked_callback, released_callback, hover_callback, motion_callback, name]) # Le premier booléen correspond à l'état de suivi de la souris + def remove_slider_area(self, name: str): + """Supprime les sliders aux noms donnés.""" + + # On itère dans toute la liste et on ne garde que les éléments ne portant pas le nom cherché + cleared_list = [] + for area in self.sliders_area: + if area[10] != name: + cleared_list.append(area) + + self.sliders_area = cleared_list + @staticmethod def get_slider_area_values(slider: list): """Donne la valeur de la zone de slider donnée.""" diff --git a/src/engine/menu_manager.py b/src/engine/menu_manager.py index 885cfaf..7006d9d 100644 --- a/src/engine/menu_manager.py +++ b/src/engine/menu_manager.py @@ -32,11 +32,13 @@ class Slider(Widget): width: int | float, base_image: pygame.Surface, hover_image: pygame.Surface, + rail_image: pygame.Surface, is_window_relative: int = -1, area_name: str = "menu_slider"): super().__init__(area_rect[0], area_rect[1], is_window_relative) self.base_image = base_image self.hover_image = hover_image + self.rail_image = rail_image self.area_name = area_name self.hovered = False self.follow_mouse = False @@ -117,6 +119,7 @@ class MenuManager: elif isinstance(widget, Slider): self.engine.event_handler.register_slider_area(widget.cursor_size, (widget.x, widget.y, widget.width, 1), (True, False), + widget.area_name, widget.is_window_relative, hover_callback=widget.set_hover_state, motion_callback=widget.set_value) diff --git a/src/engine/renderer.py b/src/engine/renderer.py index 3703eb1..c1cadf8 100644 --- a/src/engine/renderer.py +++ b/src/engine/renderer.py @@ -308,10 +308,11 @@ class Renderer: (slider_image.get_width()*window_size[0]/self.window_size[0], slider_image.get_height()*window_size[1]/self.window_size[1])) + self.window.blit(widget.rail_image, (x+(widget.width-widget.rail_image.get_width()) // 2, + y - widget.rail_image.get_height() // 2)) self.window.blit(slider_image, (x+widget.value*widget.width-slider_image.get_width()//2, y-slider_image.get_height()//2)) - def render_dialogs_box(self): """Rend la boite de dialogue lorsqu'un dialogue est lancé.""" diff --git a/src/main.py b/src/main.py index 372ec48..c7b89b9 100644 --- a/src/main.py +++ b/src/main.py @@ -40,11 +40,15 @@ class Game(Engine): menu = Menu() menu.add_widget(Label(0.5, 0.1, "The Forest's Secret", 0.1, (0, 0, 0), True, 0)) - base_image = pygame.image.load("assets/textures/GUI/button_1.png").convert_alpha() - hover_image = pygame.image.load("assets/textures/GUI/button_2.png").convert_alpha() + btn_base_image = pygame.image.load("assets/textures/GUI/button_1.png").convert_alpha() + btn_hover_image = pygame.image.load("assets/textures/GUI/button_2.png").convert_alpha() - menu.add_widget(Button(0.5, 0.3, "play", 0.08, (0, 0, 0), self.start_game, base_image, hover_image, True, 0)) - menu.add_widget(Slider((50, 50), (100, 300), 100, base_image, hover_image)) + slider_base_image = pygame.image.load("assets/textures/GUI/slider_cursor_1.png").convert_alpha() + 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.start_game, btn_base_image, btn_hover_image, True, 0)) + menu.add_widget(Slider((50, 50), (100, 300), 136, slider_base_image, slider_hover_image, slider_rail_image)) self.menu_manager.register_menu(menu, "main") self.menu_manager.show("main") From aff8f60b67de29a1774885315c437fc69e3cfd96 Mon Sep 17 00:00:00 2001 From: yannis300307 Date: Fri, 12 Jan 2024 18:42:29 +0100 Subject: [PATCH 28/32] Ajout de la suppression des area sliders --- src/engine/menu_manager.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/engine/menu_manager.py b/src/engine/menu_manager.py index 7006d9d..02ec17d 100644 --- a/src/engine/menu_manager.py +++ b/src/engine/menu_manager.py @@ -127,7 +127,9 @@ class MenuManager: def hide(self): """Affiche le menu actuelement à l'écran.""" # On itère dans tous les bouttons pour retirer l'interaction - for btn in self.active_menu.widgets: - if isinstance(btn, Button): - self.engine.event_handler.remove_button_area(btn.area_name) + for widget in self.active_menu.widgets: + if isinstance(widget, Button): + self.engine.event_handler.remove_button_area(widget.area_name) + if isinstance(widget, Slider): + self.engine.event_handler.remove_slider_area(widget.area_name) self.active_menu = None From f157d33f16e78c415174ac452ae360e4fb2a39c5 Mon Sep 17 00:00:00 2001 From: yannis300307 Date: Fri, 12 Jan 2024 22:36:27 +0100 Subject: [PATCH 29/32] Ajout du callback lors du changement de la valeur --- src/engine/menu_manager.py | 38 +++++++++++++++++++++++++++++++------- src/main.py | 4 ++-- 2 files changed, 33 insertions(+), 9 deletions(-) diff --git a/src/engine/menu_manager.py b/src/engine/menu_manager.py index 02ec17d..7c63987 100644 --- a/src/engine/menu_manager.py +++ b/src/engine/menu_manager.py @@ -7,17 +7,18 @@ import src.engine.engine class Widget: """Classe parente des widgets de menu.""" - def __init__(self, x, y, is_window_relative): + def __init__(self, x, y, is_window_relative, widget_name): self.x = x self.y = y self.is_window_relative = is_window_relative + self.widget_name = widget_name class Label(Widget): """Un widget de texte.""" def __init__(self, x: int | float, y: int | float, text: str, size: int | float, color: tuple[int, int, int], - centered: bool = False, is_window_relative: int = -1): - super().__init__(x, y, is_window_relative) + widget_name: str, centered: bool = False, is_window_relative: int = -1): + super().__init__(x, y, is_window_relative, widget_name) self.text = text self.size = size self.centered = centered @@ -33,13 +34,16 @@ class Slider(Widget): base_image: pygame.Surface, hover_image: pygame.Surface, rail_image: pygame.Surface, + widget_name: str, + value_changed_callback: FunctionType | classmethod | staticmethod | None = None, is_window_relative: int = -1, area_name: str = "menu_slider"): - super().__init__(area_rect[0], area_rect[1], is_window_relative) + super().__init__(area_rect[0], area_rect[1], is_window_relative, widget_name) self.base_image = base_image self.hover_image = hover_image self.rail_image = rail_image self.area_name = area_name + self.value_changed_callback = value_changed_callback self.hovered = False self.follow_mouse = False self.cursor_size = cursor_size @@ -52,16 +56,25 @@ class Slider(Widget): def set_value(self, values: tuple[float, float]): """Appelée lorsque la valeur du slider est modifiée.""" - self.value = values[0] + new_value = values[0] + + if new_value != self.value: + self.value = new_value + if self.value_changed_callback is not None: + self.value_changed_callback(self.value) + + def get_value(self): + """Retourne la valeur entre 0.0 et 1.0 du slider.""" + return self.value class Button(Widget): """Un widget de bouton.""" def __init__(self, x: int | float, y: int | float, text: str, size: int | float, color: tuple[int, int, int], callback: FunctionType | classmethod | staticmethod, base_image: pygame.Surface, - hover_image: pygame.Surface, centered: bool = False, is_window_relative: int = -1, + hover_image: pygame.Surface, widget_name: str, centered: bool = False, is_window_relative: int = -1, area_name: str = "menu_button"): - super().__init__(x, y, is_window_relative) + super().__init__(x, y, is_window_relative, widget_name) self.text = text self.size = size self.color = color @@ -99,6 +112,17 @@ class MenuManager: """Ajoute le menu donné au manager de menu avec le nom donné.""" self.menus[name] = menu + def get_widgets_at_name(self, menu_name: str, widget_name: str): + """Donne le widget au nom donné dans le menu au nom donné.""" + menu = self.menus[menu_name] + + found_sliders = [] + for widget in menu.widgets: + if widget.widget_name == widget_name: + found_sliders.append(widget) + + return found_sliders + def show(self, name: str): """Affiche le menu au nom donné.""" self.active_menu = self.menus[name] diff --git a/src/main.py b/src/main.py index c7b89b9..c979574 100644 --- a/src/main.py +++ b/src/main.py @@ -47,8 +47,8 @@ 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.start_game, btn_base_image, btn_hover_image, True, 0)) - menu.add_widget(Slider((50, 50), (100, 300), 136, slider_base_image, slider_hover_image, slider_rail_image)) + menu.add_widget(Button(0.5, 0.3, "play", 0.08, (0, 0, 0), self.start_game, btn_base_image, btn_hover_image, "play_button", True, 0)) + menu.add_widget(Slider((50, 50), (100, 300), 136, slider_base_image, slider_hover_image, slider_rail_image, "test_slider", value_changed_callback=print)) self.menu_manager.register_menu(menu, "main") self.menu_manager.show("main") From c9ef08e2bc5a0091c93bfea9f0fe952c8a878586 Mon Sep 17 00:00:00 2001 From: yannis300307 Date: Fri, 12 Jan 2024 23:09:20 +0100 Subject: [PATCH 30/32] =?UTF-8?q?Fix=20du=20m=C3=A9ga=20rectangle=20en=20d?= =?UTF-8?q?ebug=20en=20mode=20responsible=20du=20slider?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/engine/event_handler.py | 10 +++++++++- src/engine/menu_manager.py | 2 +- src/engine/renderer.py | 23 ++++++++++++++++++++--- src/main.py | 4 ++-- 4 files changed, 32 insertions(+), 7 deletions(-) diff --git a/src/engine/event_handler.py b/src/engine/event_handler.py index df4b2ac..f00892c 100644 --- a/src/engine/event_handler.py +++ b/src/engine/event_handler.py @@ -89,7 +89,15 @@ class EventHandler: @staticmethod def get_slider_area_values(slider: list): """Donne la valeur de la zone de slider donnée.""" - return round((slider[0][0]-slider[5][0])/slider[5][2], 5), round((slider[0][1]-slider[5][1])/slider[5][3], 5) + if slider[5][2]: + x_value = round((slider[0][0]-slider[5][0])/slider[5][2], 5) + else: + x_value = -1 + if slider[5][3]: + y_value = round((slider[0][1]-slider[5][1])/slider[5][3], 5) + else: + y_value = -1 + return x_value, y_value def update(self): diff --git a/src/engine/menu_manager.py b/src/engine/menu_manager.py index 7c63987..b5463ef 100644 --- a/src/engine/menu_manager.py +++ b/src/engine/menu_manager.py @@ -142,7 +142,7 @@ class MenuManager: widget.is_window_relative, widget.set_hover_state) elif isinstance(widget, Slider): self.engine.event_handler.register_slider_area(widget.cursor_size, - (widget.x, widget.y, widget.width, 1), (True, False), + (widget.x, widget.y, widget.width, 0), (True, False), widget.area_name, widget.is_window_relative, hover_callback=widget.set_hover_state, diff --git a/src/engine/renderer.py b/src/engine/renderer.py index c1cadf8..31fe89d 100644 --- a/src/engine/renderer.py +++ b/src/engine/renderer.py @@ -295,22 +295,39 @@ class Renderer: else: slider_image = widget.base_image + rail_image = widget.rail_image + if widget.is_window_relative == 0: slider_image = transform.scale(slider_image, (slider_image.get_width()*window_size[0]/self.window_size[0], slider_image.get_height()*window_size[0]/self.window_size[0])) + rail_image = transform.scale(rail_image, + (rail_image.get_width() * window_size[0] / self.window_size[0], + rail_image.get_height() * window_size[0] / self.window_size[ + 0])) + width = widget.width*window_size[0] elif widget.is_window_relative == 1: slider_image = transform.scale(slider_image, (slider_image.get_width()*window_size[1]/self.window_size[1], slider_image.get_height()*window_size[1]/self.window_size[1])) + rail_image = transform.scale(rail_image, + (rail_image.get_width() * window_size[1] / self.window_size[1], + rail_image.get_height() * window_size[1] / self.window_size[ + 1])) + width = widget.width * window_size[1] elif widget.is_window_relative == 2: slider_image = transform.scale(slider_image, (slider_image.get_width()*window_size[0]/self.window_size[0], slider_image.get_height()*window_size[1]/self.window_size[1])) + rail_image = transform.scale(rail_image, + (rail_image.get_width() * window_size[0] / self.window_size[0], + rail_image.get_height() * window_size[1] / self.window_size[ + 1])) + width = widget.width * min(window_size[0], window_size[1]) - self.window.blit(widget.rail_image, (x+(widget.width-widget.rail_image.get_width()) // 2, - y - widget.rail_image.get_height() // 2)) - self.window.blit(slider_image, (x+widget.value*widget.width-slider_image.get_width()//2, + self.window.blit(rail_image, (x+(width-rail_image.get_width()) // 2, + y - rail_image.get_height() // 2)) + self.window.blit(slider_image, (x+widget.value*width-slider_image.get_width()//2, y-slider_image.get_height()//2)) def render_dialogs_box(self): diff --git a/src/main.py b/src/main.py index c979574..bb5b4e6 100644 --- a/src/main.py +++ b/src/main.py @@ -38,7 +38,7 @@ class Game(Engine): def setup_main_menu(self): """Crée les éléments du menu principal.""" menu = Menu() - menu.add_widget(Label(0.5, 0.1, "The Forest's Secret", 0.1, (0, 0, 0), True, 0)) + menu.add_widget(Label(0.5, 0.1, "The Forest's Secret", 0.1, (0, 0, 0), "game_title", True, 0)) btn_base_image = pygame.image.load("assets/textures/GUI/button_1.png").convert_alpha() btn_hover_image = pygame.image.load("assets/textures/GUI/button_2.png").convert_alpha() @@ -48,7 +48,7 @@ class Game(Engine): 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.start_game, btn_base_image, btn_hover_image, "play_button", True, 0)) - menu.add_widget(Slider((50, 50), (100, 300), 136, slider_base_image, slider_hover_image, slider_rail_image, "test_slider", value_changed_callback=print)) + menu.add_widget(Slider((0.1, 0.1), (0.2, 0.2), 0.2255, slider_base_image, slider_hover_image, slider_rail_image, "test_slider", value_changed_callback=print, is_window_relative=0)) self.menu_manager.register_menu(menu, "main") self.menu_manager.show("main") From 0464804b81f8dcec918965878158e4a3de55ae46 Mon Sep 17 00:00:00 2001 From: yannis300307 Date: Fri, 12 Jan 2024 23:10:02 +0100 Subject: [PATCH 31/32] Suppression du code de test --- src/main.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main.py b/src/main.py index bb5b4e6..3231e25 100644 --- a/src/main.py +++ b/src/main.py @@ -48,7 +48,7 @@ class Game(Engine): 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.start_game, btn_base_image, btn_hover_image, "play_button", True, 0)) - menu.add_widget(Slider((0.1, 0.1), (0.2, 0.2), 0.2255, slider_base_image, slider_hover_image, slider_rail_image, "test_slider", value_changed_callback=print, is_window_relative=0)) + self.menu_manager.register_menu(menu, "main") self.menu_manager.show("main") From 1644df548145835a8bd7a5eb91143f5bd9cdf466 Mon Sep 17 00:00:00 2001 From: yannis300307 Date: Fri, 12 Jan 2024 23:14:47 +0100 Subject: [PATCH 32/32] Petit nettoyage --- src/engine/event_handler.py | 1 - src/main.py | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/src/engine/event_handler.py b/src/engine/event_handler.py index f00892c..0a72685 100644 --- a/src/engine/event_handler.py +++ b/src/engine/event_handler.py @@ -6,7 +6,6 @@ from pygame import event, display from pygame.locals import * import src.engine.engine as engine -from src.engine.menu_manager import Slider class EventHandler: diff --git a/src/main.py b/src/main.py index 3231e25..33e0a31 100644 --- a/src/main.py +++ b/src/main.py @@ -4,7 +4,7 @@ from src.custom_AI import WolfAI 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, Slider +from src.engine.menu_manager import Menu, Label, Button class Game(Engine):