AstralTransRocketries/mcedit2
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

check bool(GL.glGenerateMipmap) xxxx don't use it at all, generate mips w/numpy

Browse Source
This commit is contained in:
David Vierra 2015-01-04 18:13:56 -10:00
parent 3806d4b59f
commit fb85782308
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/mcedit2/rendering/textureatlas.py
View File

@ -125,6 +125,8 @@ class TextureAtlas(object):
maxSize = self.overrideMaxSize maxSize = self.overrideMaxSize
maxLOD = min(4, self._maxLOD) maxLOD = min(4, self._maxLOD)
if not bool(GL.glGenerateMipmap):
maxLOD = 0
if maxLOD: if maxLOD:
borderSize = 1 << (maxLOD - 1) borderSize = 1 << (maxLOD - 1)
else: else:
@ -188,7 +190,11 @@ class TextureAtlas(object):
GL.GL_UNSIGNED_BYTE, self.textureData.ravel()) GL.GL_UNSIGNED_BYTE, self.textureData.ravel())
if self.overrideMaxSize is None: if self.overrideMaxSize is None:
self._terrainTexture = glutils.Texture(_load, minFilter=GL.GL_NEAREST_MIPMAP_LINEAR, maxLOD=maxLOD) if maxLOD:
minFilter = GL.GL_NEAREST_MIPMAP_LINEAR
else:
minFilter = None
self._terrainTexture = glutils.Texture(_load, minFilter=minFilter, maxLOD=maxLOD)
self._terrainTexture.load() self._terrainTexture.load()
else: else:
self._terrainTexture = object() self._terrainTexture = object()

5
src/mcedit2/util/glutils.py
View File

@ -222,8 +222,9 @@ class Texture(object):
GL.GL_NEAREST_MIPMAP_LINEAR, GL.GL_NEAREST_MIPMAP_LINEAR,
GL.GL_NEAREST_MIPMAP_NEAREST): GL.GL_NEAREST_MIPMAP_NEAREST):
GL.glTexParameter(GL.GL_TEXTURE_2D, GL.GL_TEXTURE_MAX_LOD, self.maxLOD) if bool(GL.glGenerateMipmap):
GL.glGenerateMipmap(GL.GL_TEXTURE_2D) GL.glTexParameter(GL.GL_TEXTURE_2D, GL.GL_TEXTURE_MAX_LOD, self.maxLOD)
GL.glGenerateMipmap(GL.GL_TEXTURE_2D)
def dispose(self): def dispose(self):
if self._texID is not None: if self._texID is not None: