From 77c7b9080638f7a06014eeee732f7bbec50313fc Mon Sep 17 00:00:00 2001 From: Tipragot Date: Thu, 26 Oct 2023 19:21:24 +0200 Subject: [PATCH 1/2] Chargement des texture dans les sous dossiers --- src/engine/plugins/render.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/engine/plugins/render.py b/src/engine/plugins/render.py index 7bb01f5..7d7f0f9 100644 --- a/src/engine/plugins/render.py +++ b/src/engine/plugins/render.py @@ -4,7 +4,7 @@ Définis un plugin permettant d'afficher des choses a l'écran. from engine import * from engine.math import Vec2 -import pygame, os +import pygame, glob from engine.plugins.pygame import Display @@ -84,10 +84,12 @@ class TextureManager: def __init__(self, display: Display) -> None: self._textures: dict[str, pygame.Surface] = {} - for file in os.listdir("textures"): - self._textures[file] = pygame.image.load(f"textures/{file}").convert( + for file in glob.iglob("textures/**/*.png", recursive=True): + self._textures[file] = pygame.image.load(file).convert_alpha( display._surface ) + for file in glob.iglob("textures/**/*.jpg", recursive=True): + self._textures[file] = pygame.image.load(file).convert(display._surface) error_texture = pygame.Surface((256, 256)) error_texture.fill((0, 0, 0)) pygame.draw.rect(error_texture, (255, 0, 255), (0, 0, 128, 128)) -- 2.43.4 From 4c923cb1c2dda4fdc119b25eb1043b1412bef602 Mon Sep 17 00:00:00 2001 From: Tipragot Date: Thu, 26 Oct 2023 20:10:37 +0200 Subject: [PATCH 2/2] =?UTF-8?q?R=C3=A9glage=20du=20nom=20des=20textures?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/engine/plugins/render.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/engine/plugins/render.py b/src/engine/plugins/render.py index 7d7f0f9..f24cbcf 100644 --- a/src/engine/plugins/render.py +++ b/src/engine/plugins/render.py @@ -85,11 +85,11 @@ class TextureManager: def __init__(self, display: Display) -> None: self._textures: dict[str, pygame.Surface] = {} for file in glob.iglob("textures/**/*.png", recursive=True): - self._textures[file] = pygame.image.load(file).convert_alpha( + self._textures[file[9:]] = pygame.image.load(file).convert_alpha( display._surface ) for file in glob.iglob("textures/**/*.jpg", recursive=True): - self._textures[file] = pygame.image.load(file).convert(display._surface) + self._textures[file[9:]] = pygame.image.load(file).convert(display._surface) error_texture = pygame.Surface((256, 256)) error_texture.fill((0, 0, 0)) pygame.draw.rect(error_texture, (255, 0, 255), (0, 0, 128, 128)) -- 2.43.4