Mercurial > touhou
diff pytouhou/opengl/texture.py @ 97:ac2e5e1c2c3c
Refactor \o/
author | Thibaut Girka <thib@sitedethib.com> |
---|---|
date | Sun, 04 Sep 2011 23:50:00 +0200 |
parents | fc0294c745b6 |
children | fad7b44cebf2 |
line wrap: on
line diff
--- a/pytouhou/opengl/texture.py +++ b/pytouhou/opengl/texture.py @@ -23,8 +23,8 @@ from OpenGL.GLU import * class TextureManager(object): - def __init__(self, archive=None): - self.archive = archive + def __init__(self, loader=None): + self.loader = loader self.textures = {} def __getitem__(self, key): @@ -44,18 +44,14 @@ class TextureManager(object): texture = self[key] - def set_archive(self, archive): - self.archive = archive - - def load_texture(self, key): first_name, secondary_name = key - image_file = BytesIO(self.archive.extract(os.path.basename(first_name))) + image_file = self.loader.get_file(os.path.basename(first_name)) textureSurface = pygame.image.load(image_file).convert_alpha() if secondary_name: - alpha_image_file = BytesIO(self.archive.extract(os.path.basename(secondary_name))) + alpha_image_file = self.loader.get_file(os.path.basename(secondary_name)) alphaSurface = pygame.image.load(alpha_image_file) assert textureSurface.get_size() == alphaSurface.get_size() for x in range(alphaSurface.get_width()):