# HG changeset patch # User Emmanuel Gil Peyrot # Date 1347015919 -7200 # Node ID 0537af9125a7854ee7618f40397aa1901d4e0cb8 # Parent b9aecdc6f72fdfad58d87f7d62d4b0da19afe315 Replace wildcard imports with normal ones. diff --git a/pytouhou/ui/gamerenderer.pyx b/pytouhou/ui/gamerenderer.pyx --- a/pytouhou/ui/gamerenderer.pyx +++ b/pytouhou/ui/gamerenderer.pyx @@ -15,7 +15,16 @@ from itertools import chain -from pyglet.gl import * +from pyglet.gl import (glClear, glMatrixMode, glLoadIdentity, glLoadMatrixf, + glDisable, glEnable, glFogi, glFogf, glFogfv, + glBlendFunc, glBindTexture, glVertexPointer, + glTexCoordPointer, glColorPointer, glDrawArrays, + GL_DEPTH_BUFFER_BIT, GL_PROJECTION, GL_MODELVIEW, + GL_FOG, GL_FOG_MODE, GL_LINEAR, GL_FOG_START, + GL_FOG_END, GL_FOG_COLOR, GL_DEPTH_TEST, GL_SRC_ALPHA, + GL_ONE_MINUS_SRC_ALPHA, GL_ONE, GL_TEXTURE_2D, + GL_UNSIGNED_BYTE, GL_FLOAT, GL_QUADS, + GL_COLOR_BUFFER_BIT, GLfloat) from pytouhou.utils.matrix import Matrix diff --git a/pytouhou/ui/renderer.pyx b/pytouhou/ui/renderer.pyx --- a/pytouhou/ui/renderer.pyx +++ b/pytouhou/ui/renderer.pyx @@ -20,7 +20,11 @@ import ctypes from struct import pack -from pyglet.gl import * +from pyglet.gl import (glVertexPointer, glTexCoordPointer, glColorPointer, + glBlendFunc, glBindTexture, glDrawElements, + GL_UNSIGNED_BYTE, GL_UNSIGNED_SHORT, GL_INT, GL_FLOAT, + GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, GL_ONE, + GL_TEXTURE_2D, GL_TRIANGLES) from .sprite cimport get_sprite_rendering_data from .texture cimport TextureManager diff --git a/pytouhou/ui/shader.py b/pytouhou/ui/shader.py --- a/pytouhou/ui/shader.py +++ b/pytouhou/ui/shader.py @@ -8,7 +8,17 @@ # Source: https://swiftcoder.wordpress.com/2008/12/19/simple-glsl-wrapper-for-pyglet/ # -from pyglet.gl import * +from pyglet.gl import (glCreateProgram, glCreateShader, GL_VERTEX_SHADER, + GL_FRAGMENT_SHADER, glShaderSource, glCompileShader, + glGetShaderiv, GL_COMPILE_STATUS, GL_INFO_LOG_LENGTH, + glGetShaderInfoLog, glAttachShader, glLinkProgram, + glGetProgramiv, GL_LINK_STATUS, glUseProgram, + glGetUniformLocation, glUniform1f, glUniform2f, + glUniform3f, glUniform4f, glUniform1i, glUniform2i, + glUniform3i, glUniform4i, glUniformMatrix4fv) + +from ctypes import (c_char, c_char_p, c_int, POINTER, byref, cast, + create_string_buffer) class GLSLException(Exception):