quantum/punyverse
1
0
Fork 0
mirror of https://github.com/quantum5/punyverse.git synced 2025-04-24 13:11:57 -04:00
Code Issues Packages Projects Releases Wiki Activity

The author of the texture code, I mean the original, should know better how glTexImage2D works, because the GL documentation says otherwise.

Browse source
This commit is contained in:
Quantum 2013-10-26 12:40:06 -04:00
parent d26c7dd536
commit 2cc82a2724
1 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
punyverse/texture.py
View file

@ -188,14 +188,13 @@ def load_texture(file):
print print
mode = GL_RGBA if 'A' in raw.format else GL_RGB mode = GL_RGBA if 'A' in raw.format else GL_RGB
mode2 = mode
# Flip from BGR to RGB # Flip from BGR to RGB
# I hate you too, Pyglet... # I hate you too, Pyglet...
# REGULAR EXPRESSIONS ARE NOT MEANT TO PARSE BINARY DATA!!! # REGULAR EXPRESSIONS ARE NOT MEANT TO PARSE BINARY DATA!!!
#texture = raw.get_data('RGBA', width * 4) if safe else raw.data[::-1] if 'BGR' in raw.format else raw.data #texture = raw.get_data('RGBA', width * 4) if safe else raw.data[::-1] if 'BGR' in raw.format else raw.data
if raw.format in ('BGR', 'BGRA'): if raw.format in ('BGR', 'BGRA'):
if bgra: if bgra:
mode2 = {GL_RGBA: GL_BGRA, GL_RGB: GL_BGR}[mode] mode = {GL_RGBA: GL_BGRA, GL_RGB: GL_BGR}[mode]
texture = raw.data texture = raw.data
else: else:
texture = bgr_to_rgb(raw.data, width, height, 'A' in raw.format) texture = bgr_to_rgb(raw.data, width, height, 'A' in raw.format)
@ -213,7 +212,7 @@ def load_texture(file):
filter = GL_NEAREST if badcard else GL_LINEAR filter = GL_NEAREST if badcard else GL_LINEAR
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, filter) glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, filter)
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, filter) glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, filter)
gluBuild2DMipmaps(GL_TEXTURE_2D, len(raw.format), width, height, mode2, GL_UNSIGNED_BYTE, texture) gluBuild2DMipmaps(GL_TEXTURE_2D, len(raw.format), width, height, mode, GL_UNSIGNED_BYTE, texture)
cache[file] = id cache[file] = id