# HG changeset patch # User Thibaut Girka # Date 1320151833 -3600 # Node ID ee6dfd14a785f1d1d42dda03f58652039501a218 # Parent 88361534c77e848f936e2b8a08952d83378dc579 Rename pytouhou.opengl to pytouhou.ui, makes much more sense that way. diff --git a/eclviewer.py b/eclviewer.py --- 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 diff --git a/pytouhou/__init__.py b/pytouhou/__init__.py --- 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. """ diff --git a/pytouhou/opengl/__init__.py b/pytouhou/ui/__init__.py rename from pytouhou/opengl/__init__.py rename to pytouhou/ui/__init__.py diff --git a/pytouhou/opengl/background.py b/pytouhou/ui/background.py 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 diff --git a/pytouhou/opengl/gamerenderer.pyx b/pytouhou/ui/gamerenderer.pyx 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 diff --git a/pytouhou/opengl/gamerunner.py b/pytouhou/ui/gamerunner.py 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): diff --git a/pytouhou/opengl/sprite.pxd b/pytouhou/ui/sprite.pxd rename from pytouhou/opengl/sprite.pxd rename to pytouhou/ui/sprite.pxd diff --git a/pytouhou/opengl/sprite.pyx b/pytouhou/ui/sprite.pyx rename from pytouhou/opengl/sprite.pyx rename to pytouhou/ui/sprite.pyx diff --git a/pytouhou/opengl/texture.py b/pytouhou/ui/texture.py rename from pytouhou/opengl/texture.py rename to pytouhou/ui/texture.py