From 707947fa1d683ba2883c417070167af239ecace2 Mon Sep 17 00:00:00 2001 From: yannis300307 Date: Sat, 6 Jan 2024 19:34:17 +0100 Subject: [PATCH] =?UTF-8?q?Fix=20de=20la=20collision=20des=20boutons=20red?= =?UTF-8?q?imensionn=C3=A9s?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/engine/event_handler.py | 10 ++++------ src/main.py | 2 +- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/src/engine/event_handler.py b/src/engine/event_handler.py index 905db38..b04858d 100644 --- a/src/engine/event_handler.py +++ b/src/engine/event_handler.py @@ -22,14 +22,12 @@ class EventHandler: window_size = display.get_window_size() if is_window_relative == 0: - return (rect[0]*window_size[0] < point[0]*window_size[0] < rect[0]*window_size[0] + rect[2]*window_size[0] - and rect[1]*window_size[0] < point[1]*window_size[0] < rect[1]*window_size[0] + rect[3]*window_size[0]) + return (rect[0]*window_size[0] < point[0] < rect[0]*window_size[0] + rect[2]*window_size[0] + and rect[1]*window_size[0] < point[1] < rect[1]*window_size[0] + rect[3]*window_size[0]) elif is_window_relative == 1: - return (rect[0] * window_size[1] < point[0] * window_size[1] < rect[0] * window_size[1] + rect[2] * - window_size[1] - and rect[1] * window_size[1] < point[1] * window_size[1] < rect[1] * window_size[1] + rect[3] * - window_size[1]) + return (rect[0]*window_size[1] < point[0] < rect[0]*window_size[1] + rect[2]*window_size[1] and + rect[1]*window_size[1] < point[1] < rect[1]*window_size[1] + rect[3]*window_size[1]) return rect[0] < point[0] < rect[0] + rect[2] and rect[1] < point[1] < rect[1] + rect[3] diff --git a/src/main.py b/src/main.py index 91d4c9f..414b3a2 100644 --- a/src/main.py +++ b/src/main.py @@ -26,7 +26,7 @@ class Game(Engine): self.renderer.dialogs_box = pygame.image.load("assets/textures/GUI/dialogs_box.png").convert_alpha() - self.event_handler.register_button_area((0, 0, 20, 20), lambda : print("salut")) + self.event_handler.register_button_area((0, 0, 0.1, 0.1), lambda : print("salut"), 0) def create_player_entity(self): """Crée une entité joueur."""