Upgraded main version in Render_Fade

This commit is contained in:
Adastram 2024-01-12 23:34:52 +01:00
commit bba73eeddd
12 changed files with 400 additions and 89 deletions

Binary file not shown.

After

Width:  |  Height:  |  Size: 1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.6 KiB

View file

@ -5,7 +5,7 @@ class Camera:
def __init__(self): def __init__(self):
self.x = 0 self.x = 0
self.y = 0 self.y = 0
self.zoom = 1. self.zoom = 1.75
# Décalage lors du mouvement du joueur # Décalage lors du mouvement du joueur
self.player_moving_offset = 100 self.player_moving_offset = 100

View file

@ -1,14 +1,11 @@
import json import json
from types import FunctionType from types import FunctionType
import src.engine.engine as engine
from src.engine.event_handler import EventHandler
class DialogsManager: class DialogsManager:
"""Classe qui gère la lecture des dialogues.""" """Classe qui gère la lecture des dialogues."""
def __init__(self, event_handler: EventHandler): def __init__(self, engine: 'engine.Engine'):
self.event_handler = event_handler self.engine = engine
self.current_dialogs = [] self.current_dialogs = []
self.current_dialog_id = -1 self.current_dialog_id = -1
self.dialogs = {} self.dialogs = {}
@ -31,8 +28,6 @@ class DialogsManager:
else: else:
self.next_dialog() self.next_dialog()
print("next")
def next_dialog(self): def next_dialog(self):
"""Passe au dialogue suivant. Appelle le callback si le dialogue est fini.""" """Passe au dialogue suivant. Appelle le callback si le dialogue est fini."""
self.current_dialog_id += 1 self.current_dialog_id += 1
@ -43,7 +38,8 @@ class DialogsManager:
self.current_dialog_id = -1 self.current_dialog_id = -1
self.writing_dialog = False self.writing_dialog = False
self.reading_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: if self.dialogue_finished_callback is not None:
self.dialogue_finished_callback() self.dialogue_finished_callback()
@ -52,7 +48,9 @@ class DialogsManager:
# Si un dialogue n'est pas déja lancé, on lance le dialogue au nom donné # Si un dialogue n'est pas déja lancé, on lance le dialogue au nom donné
if not self.reading_dialog: 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_dialogs = self.dialogs[name]
self.current_dialog_id = 0 self.current_dialog_id = 0

View file

@ -36,7 +36,7 @@ class Engine:
self.entity_manager = EntityManager(self.map_manager) self.entity_manager = EntityManager(self.map_manager)
self.boss_fight_manager = BossFightManager(self) self.boss_fight_manager = BossFightManager(self)
self.event_sheduler = EventSheduler(self) self.event_sheduler = EventSheduler(self)
self.dialogs_manager = DialogsManager(self.event_handler) self.dialogs_manager = DialogsManager(self)
self.menu_manager = MenuManager(self) self.menu_manager = MenuManager(self)
self.sound_manager = SoundManager(60) self.sound_manager = SoundManager(60)

View file

@ -11,6 +11,8 @@ class Entity:
self.x = 8 self.x = 8
self.y = 8 self.y = 8
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é) 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 # Variables utilisées pour détecter les mouvements
@ -117,52 +119,64 @@ class Entity:
def move(self, x: float, y: float, map_manager: MapManager): def move(self, x: float, y: float, map_manager: MapManager):
"""Fait bouger l'entité en tenant compte des collisions.""" """Fait bouger l'entité en tenant compte des collisions."""
# On vérifie le sens du mouvement pour changer self.direction if not self.locked: # Si l'entité n'est pas verrouillée on calcul le mouvement
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 # On vérifie le sens du mouvement pour changer self.direction
initial_speed = math.sqrt(x**2+y**2)
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.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: if x > 0:
while not self.get_collisions(self.x + i, self.y, map_manager): self.direction = 0
i += 1 elif x < 0:
i -= 1 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)
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.get_collisions(self.x + x, self.y, map_manager):
self.x += x
else: 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
i += 1 else:
while not self.get_collisions(self.x + i, self.y, map_manager):
self.x += i i -= 1
# 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
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): 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 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

View file

@ -8,6 +8,8 @@ class EntityManager:
self.entities: dict[str:Entity] = {} self.entities: dict[str:Entity] = {}
self.player_entity_name = "" self.player_entity_name = ""
self.map_manager = map_manager self.map_manager = map_manager
self.locked_before_pause: list[Entity] = []
self.paused = False
def register_entity(self, name: str) -> Entity: def register_entity(self, name: str) -> Entity:
"""Crée une entité et l'enregistre dans un dictionnaire.""" """Crée une entité et l'enregistre dans un dictionnaire."""
@ -32,7 +34,7 @@ class EntityManager:
if entity.life_points == 0: if entity.life_points == 0:
self.entities.pop(entity_name) 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) entity.brain.update(delta)
if self.player_entity_name: if self.player_entity_name:
@ -49,3 +51,22 @@ class EntityManager:
def get_by_name(self, name: str) -> Entity: def get_by_name(self, name: str) -> Entity:
"""Donne l'entité avec le nom donné.""" """Donne l'entité avec le nom donné."""
return self.entities[name] 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)
else:
e.lock()
self.paused = True
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()
self.paused = False
self.locked_before_pause = []

View file

@ -14,7 +14,9 @@ class EventHandler:
self.engine = core self.engine = core
self.key_pressed = [] self.key_pressed = []
self.buttons_area = [] self.buttons_area = []
self.hovered_area = [] self.hovered_buttons_area = []
self.hovered_sliders_area = []
self.sliders_area = []
@staticmethod @staticmethod
def get_click_collision(rect: tuple[float | int, float | int, float | int, float | int], point: tuple[int, int], def get_click_collision(rect: tuple[float | int, float | int, float | int, float | int], point: tuple[int, int],
@ -40,7 +42,7 @@ class EventHandler:
callback: FunctionType | classmethod | staticmethod, name: str, callback: FunctionType | classmethod | staticmethod, name: str,
is_window_relative: int = -1, is_window_relative: int = -1,
hover_callback: FunctionType | classmethod | staticmethod = None): 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 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""" pour qu'elle soit multipliée par la hauteur"""
self.buttons_area.append((rect, callback, is_window_relative, name, hover_callback)) self.buttons_area.append((rect, callback, is_window_relative, name, hover_callback))
@ -56,9 +58,51 @@ class EventHandler:
self.buttons_area = cleared_list self.buttons_area = cleared_list
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,
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_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."""
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): def update(self):
"""Vérifie s'il y a de nouvelles interactions et les traites.""" """Vérifie s'il y a de nouvelles interactions et les traites."""
window_size = display.get_window_size()
# Récupère les événements # Récupère les événements
for e in event.get(): for e in event.get():
if e.type == QUIT: if e.type == QUIT:
@ -74,17 +118,88 @@ class EventHandler:
for area in self.buttons_area: for area in self.buttons_area:
if self.get_click_collision(area[0], e.pos, area[2]): if self.get_click_collision(area[0], e.pos, area[2]):
area[1]() area[1]()
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]),
e.pos, area[1]):
area[2] = True
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])
if area[6] is not None:
area[6](self.get_slider_area_values(area))
elif e.type == MOUSEBUTTONUP:
for area in self.sliders_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: elif e.type == MOUSEMOTION:
for area in self.buttons_area: for area in self.buttons_area:
if area[4] is not None: if area[4] is not None:
if self.get_click_collision(area[0], e.pos, area[2]): 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) area[4](True)
self.hovered_area.append(area) self.hovered_buttons_area.append(area)
else: else:
if area in self.hovered_area: if area in self.hovered_buttons_area:
area[4](False) area[4](False)
self.hovered_area.remove(area) self.hovered_buttons_area.remove(area)
for area in self.sliders_area:
if area[2]:
if area[4][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]:
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]:
area[0][0] = area[5][0]+area[5][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 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]),
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 self.engine.entity_manager.player_entity_name:
if K_RIGHT in self.key_pressed: if K_RIGHT in self.key_pressed:
@ -111,7 +226,8 @@ class EventHandler:
print(f"Player pos: X = {self.engine.entity_manager.get_by_name('player').x} " 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}") f"Y = {self.engine.entity_manager.get_by_name('player').y}")
if K_x in self.key_pressed: if K_x in self.key_pressed:
self.engine.camera.target_zoom *= 1.01 self.engine.camera.target_zoom *= 1.01
if K_c in self.key_pressed: if K_c in self.key_pressed:
self.engine.camera.target_zoom *= 0.99 self.engine.camera.target_zoom *= 0.99

View file

@ -7,30 +7,74 @@ import src.engine.engine
class Widget: class Widget:
"""Classe parente des widgets de menu.""" """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.x = x
self.y = y self.y = y
self.is_window_relative = is_window_relative self.is_window_relative = is_window_relative
self.widget_name = widget_name
class Label(Widget): class Label(Widget):
"""Un widget de texte.""" """Un widget de texte."""
def __init__(self, x: int | float, y: int | float, text: str, size: int | float, color: tuple[int, int, int], 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): widget_name: str, centered: bool = False, is_window_relative: int = -1):
super().__init__(x, y, is_window_relative) super().__init__(x, y, is_window_relative, widget_name)
self.text = text self.text = text
self.size = size self.size = size
self.centered = centered self.centered = centered
self.color = color self.color = color
class Slider(Widget):
"""Un widget pouvant être glissé pour récupérer une valeur."""
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,
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, 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
self.value = 0.
self.width = width
def set_hover_state(self, state: bool):
"""Modifie la valeur du hover."""
self.hovered = state
def set_value(self, values: tuple[float, float]):
"""Appelée lorsque la valeur du slider est modifiée."""
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): class Button(Widget):
"""Un widget de bouton.""" """Un widget de bouton."""
def __init__(self, x: int | float, y: int | float, text: str, size: int | float, color: tuple[int, int, int], 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, 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"): 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.text = text
self.size = size self.size = size
self.color = color self.color = color
@ -68,28 +112,48 @@ class MenuManager:
"""Ajoute le menu donné au manager de menu avec le nom donné.""" """Ajoute le menu donné au manager de menu avec le nom donné."""
self.menus[name] = menu 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): def show(self, name: str):
"""Affiche le menu au nom donné.""" """Affiche le menu au nom donné."""
self.active_menu = self.menus[name] self.active_menu = self.menus[name]
# On itère dans tous les bouttons pour leur ajouter une interaction # On itère dans tous les bouttons pour leur ajouter une interaction
for btn in self.active_menu.widgets: for widget in self.active_menu.widgets:
if isinstance(btn, Button): if isinstance(widget, Button):
width = btn.base_image.get_width() / self.engine.renderer.window_size[0] width = widget.base_image.get_width() / self.engine.renderer.window_size[0]
height = btn.base_image.get_height() / self.engine.renderer.window_size[1] height = widget.base_image.get_height() / self.engine.renderer.window_size[1]
area_x = btn.x area_x = widget.x
area_y = btn.y area_y = widget.y
if btn.centered: if widget.centered:
area_x -= width / 2 area_x -= width / 2
area_y -= height / 2 area_y -= height / 2
self.engine.event_handler.register_button_area((area_x, area_y, width, height), btn.callback, self.engine.event_handler.register_button_area((area_x, area_y, width, height), widget.callback,
btn.area_name, widget.area_name,
btn.is_window_relative, btn.set_hover_state) 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, 0), (True, False),
widget.area_name,
widget.is_window_relative,
hover_callback=widget.set_hover_state,
motion_callback=widget.set_value)
def hide(self): def hide(self):
"""Cache le menu actuelement à l'écran.""" """Cache le menu actuelement à l'écran."""
# On itère dans tous les bouttons pour retirer l'interaction # On itère dans tous les bouttons pour retirer l'interaction
for elem in self.active_menu.widgets: for widget in self.active_menu.widgets:
if isinstance(elem, Button): if isinstance(widget, Button):
self.engine.event_handler.remove_button_area(elem.area_name) 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 self.active_menu = None

View file

@ -9,7 +9,7 @@ from pygame.locals import RESIZABLE, SRCALPHA, FULLSCREEN
import src.engine.engine as engine import src.engine.engine as engine
from src.engine.animation import Anim from src.engine.animation import Anim
from src.engine.enums import GameState 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: class Renderer:
@ -164,7 +164,7 @@ class Renderer:
# Conteur de FPS en mode DEBUG # Conteur de FPS en mode DEBUG
if self.engine.DEBUG_MODE: 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)) (0, 0))
player = self.engine.entity_manager.get_by_name('player') 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)} Y:{round(player.y, 2)}",
@ -176,9 +176,10 @@ class Renderer:
self.window.blit(font.SysFont("Arial", 20).render(f"Track: {self.engine.sound_manager.music_current_song}", self.window.blit(font.SysFont("Arial", 20).render(f"Track: {self.engine.sound_manager.music_current_song}",
True, (255, 0, 0)), (0, 120)) 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 # On rend maintenant toutes les zones de détection de la fenêtre
for area in self.engine.event_handler.buttons_area: for area in self.engine.event_handler.buttons_area:
window_size = display.get_window_size()
if area[2] == 0: if area[2] == 0:
draw.rect(self.window, (255, 255, 0), draw.rect(self.window, (255, 255, 0),
(area[0][0] * window_size[0], area[0][1] * window_size[0], (area[0][0] * window_size[0], area[0][1] * window_size[0],
@ -195,6 +196,58 @@ class Renderer:
draw.rect(self.window, (255, 255, 0), draw.rect(self.window, (255, 255, 0),
area[0], width=1) area[0], width=1)
for area in self.engine.event_handler.sliders_area:
if area[1] == 0:
draw.rect(self.window, (0, 255, 20),
((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]-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]-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)
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 # Rendu présent dans tous les types de jeu
self.render_dialogs_box() self.render_dialogs_box()
@ -283,6 +336,46 @@ class Renderer:
self.window.blit(btn_image, (x, y)) self.window.blit(btn_image, (x, y))
self.window.blit(rendered_text, (x, y)) self.window.blit(rendered_text, (x, y))
elif isinstance(widget, Slider):
if widget.hovered:
slider_image = widget.hover_image
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(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): def render_dialogs_box(self):
"""Rend la boite de dialogue lorsqu'un dialogue est lancé.""" """Rend la boite de dialogue lorsqu'un dialogue est lancé."""

View file

@ -42,12 +42,17 @@ class Game(Engine):
def setup_main_menu(self): def setup_main_menu(self):
"""Crée les éléments du menu principal.""" """Crée les éléments du menu principal."""
menu = Menu() 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))
base_image = pygame.image.load("assets/textures/GUI/button_1.png").convert_alpha() btn_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_hover_image = pygame.image.load("assets/textures/GUI/button_2.png").convert_alpha()
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.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, base_image, hover_image, True, 0))
self.menu_manager.register_menu(menu, "main") self.menu_manager.register_menu(menu, "main")
self.menu_manager.show("main") self.menu_manager.show("main")