From c79f1ab34545b2399b4709b92d8e031fc5696b8c Mon Sep 17 00:00:00 2001 From: CoCo_Sol Date: Sat, 28 Oct 2023 00:08:34 +0200 Subject: [PATCH] fix mypy... error --- src/engine/plugins/hover.py | 15 +++++++-------- src/main.py | 31 +++++++++++++++++-------------- 2 files changed, 24 insertions(+), 22 deletions(-) diff --git a/src/engine/plugins/hover.py b/src/engine/plugins/hover.py index 0b436f7..6256e1a 100644 --- a/src/engine/plugins/hover.py +++ b/src/engine/plugins/hover.py @@ -23,7 +23,6 @@ class HoverPlugin(Plugin): textures = world[TextureManager] mouse_pos = world[Mouse].position for entity in entities: - # Récupération de la position et de la taille de l'entité entity_pos: Vec2 = entity[Position] if Offset in entity: @@ -65,18 +64,18 @@ class Hover: Un composant qui marque une entitée comme etant survolée. """ + class Hoverable: """ Un composant qui marque une entitée comme pouvant etre survolée. """ - def __init__(self, - entry_callback: Callable[[World, Entity], None] = lambda _a,_b : (), - update_callback: Callable[[World, Entity], None] = lambda _a,_b : (), - exit_callback: Callable[[World, Entity], None] = lambda _a,_b : (), - ) -> None: - + def __init__( + self, + entry_callback: Callable[[World, Entity], None] = lambda _a, _b: None, + update_callback: Callable[[World, Entity], None] = lambda _a, _b: None, + exit_callback: Callable[[World, Entity], None] = lambda _a, _b: None, + ) -> None: self.update_callback = update_callback self.entry_callback = entry_callback self.exit_callback = exit_callback - diff --git a/src/main.py b/src/main.py index d77a5cb..92ad032 100644 --- a/src/main.py +++ b/src/main.py @@ -5,8 +5,8 @@ Ceci est un exemple de comment l'on peut utiliser le moteur du jeu. from engine import * from engine.math import Vec2 -from engine.plugins.animation import AnimatedSprite, AnimationPlugin -from engine.plugins.clickable import Clickable, ClickablePlugin +from engine.plugins.animation import AnimationPlugin +from engine.plugins.clickable import ClickablePlugin from engine.plugins.hover import HoverPlugin, Hoverable from engine.plugins.render import ( Order, @@ -16,7 +16,6 @@ from engine.plugins.render import ( ) from engine.plugins.timing import Delta, TimePlugin from engine.plugins.pygame import Display, Keyboard, PygamePlugin -from random import random # Initialisation @@ -38,23 +37,27 @@ def spawn_sprites(world: World) -> None: def new_button(position: Vec2, file_name: str) -> None: world.create_entity( - Position(position), - Order(0), - Texture( file_name+ ".png"), - Hoverable(entry_callback= lambda _world, entity: entity.set( - Texture(file_name+ "_hover.png"), + Position(position), + Order(0), + Texture(file_name + ".png"), + Hoverable( + entry_callback=lambda _world, entity: entity.set( + Texture(file_name + "_hover.png"), ), - exit_callback= lambda _world, entity: entity.set( - Texture( file_name+ ".png"), - )),) + exit_callback=lambda _world, entity: entity.set( + Texture(file_name + ".png"), + ), + ), + ) + for i in range(3): if i == 0: file_name = "button_classique" elif i == 1: - file_name = "button_histoire" - else: + file_name = "button_histoire" + else: file_name = "button_tricheur" - new_button(Vec2(Display.WIDTH/3*i, 20),file_name) + new_button(Vec2(Display.WIDTH / 3 * i, 20), file_name) # On ajoutant la tache