Mercurial > touhou
changeset 205:ee6dfd14a785
Rename pytouhou.opengl to pytouhou.ui, makes much more sense that way.
| author | Thibaut Girka <thib@sitedethib.com> |
|---|---|
| date | Tue, 01 Nov 2011 13:50:33 +0100 |
| parents | 88361534c77e |
| children | eca53abdfeab |
| files | eclviewer.py pytouhou/__init__.py pytouhou/opengl/__init__.py pytouhou/opengl/background.py pytouhou/opengl/gamerenderer.pyx pytouhou/opengl/gamerunner.py pytouhou/opengl/sprite.pxd pytouhou/opengl/sprite.pyx pytouhou/opengl/texture.py pytouhou/ui/__init__.py pytouhou/ui/background.py pytouhou/ui/gamerenderer.pyx pytouhou/ui/gamerunner.py pytouhou/ui/sprite.pxd pytouhou/ui/sprite.pyx pytouhou/ui/texture.py |
| diffstat | 9 files changed, 7 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/eclviewer.py +++ b/eclviewer.py @@ -21,7 +21,7 @@ pyximport.install() from pytouhou.resource.loader import Loader from pytouhou.game.background import Background -from pytouhou.opengl.gamerunner import GameRunner +from pytouhou.ui.gamerunner import GameRunner from pytouhou.games.eosd import EoSDGame from pytouhou.game.player import PlayerState from pytouhou.formats.t6rp import T6RP
--- a/pytouhou/__init__.py +++ b/pytouhou/__init__.py @@ -8,6 +8,7 @@ formats -- file formats handling game -- game logic games -- game-specific classes resource -- resource loading +ui -- user interface related classes utils -- various helpers and non Touhou-specific functions vm -- virtual machines for enemies, etc. """
rename from pytouhou/opengl/background.py rename to pytouhou/ui/background.py --- a/pytouhou/opengl/background.py +++ b/pytouhou/ui/background.py @@ -17,7 +17,7 @@ from struct import pack from itertools import chain -from pytouhou.opengl.sprite import get_sprite_rendering_data +from .sprite import get_sprite_rendering_data def get_background_rendering_data(background): #TODO
rename from pytouhou/opengl/gamerenderer.pyx rename to pytouhou/ui/gamerenderer.pyx --- a/pytouhou/opengl/gamerenderer.pyx +++ b/pytouhou/ui/gamerenderer.pyx @@ -21,9 +21,9 @@ from itertools import chain from pyglet.gl import * -from pytouhou.opengl.texture import TextureManager -from pytouhou.opengl.sprite cimport get_sprite_rendering_data -from pytouhou.opengl.background import get_background_rendering_data +from .texture import TextureManager +from .sprite cimport get_sprite_rendering_data +from .background import get_background_rendering_data MAX_ELEMENTS = 10000
rename from pytouhou/opengl/gamerunner.py rename to pytouhou/ui/gamerunner.py --- a/pytouhou/opengl/gamerunner.py +++ b/pytouhou/ui/gamerunner.py @@ -23,7 +23,7 @@ from pyglet.gl import (glMatrixMode, glL GL_PERSPECTIVE_CORRECTION_HINT, GL_FOG_HINT, GL_NICEST, GL_COLOR_ARRAY, GL_VERTEX_ARRAY, GL_TEXTURE_COORD_ARRAY) -from pytouhou.opengl.gamerenderer import GameRenderer +from .gamerenderer import GameRenderer class GameRunner(pyglet.window.Window, GameRenderer):