From e291906aad1b191c49a6dd3947876fe9b61e4435 Mon Sep 17 00:00:00 2001 From: Jaromil Date: Tue, 2 Dec 2008 01:59:23 +0100 Subject: [PATCH] small fixes, still some probs... --- scripts/python/pygame/lesson_freej00.py | 2 +- scripts/python/pygame/lesson_freej01.py | 2 +- scripts/python/pygame/lesson_freej02.py | 6 +++--- scripts/python/pygame/lesson_freej03.py | 4 ++-- scripts/python/pygame/lesson_freej04.py | 4 ++-- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/scripts/python/pygame/lesson_freej00.py b/scripts/python/pygame/lesson_freej00.py index 5ae08cc5..baa78907 100644 --- a/scripts/python/pygame/lesson_freej00.py +++ b/scripts/python/pygame/lesson_freej00.py @@ -51,7 +51,7 @@ def load_textures(): glBindTexture(GL_TEXTURE_2D, textures[0]) # create texture with freej layer size glTexImage2D( GL_TEXTURE_2D, 0, GL_RGBA, layer.geo.w, layer.geo.h, 0, - GL_RGBA, GL_UNSIGNED_BYTE, "" ); + GL_RGBA, GL_UNSIGNED_BYTE, None ); glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST) glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST) diff --git a/scripts/python/pygame/lesson_freej01.py b/scripts/python/pygame/lesson_freej01.py index 05a2df96..270c683d 100644 --- a/scripts/python/pygame/lesson_freej01.py +++ b/scripts/python/pygame/lesson_freej01.py @@ -51,7 +51,7 @@ def load_textures(): glBindTexture(GL_TEXTURE_2D, textures[0]) # create texture with freej layer size glTexImage2D( GL_TEXTURE_2D, 0, GL_RGBA, layer.geo.w, layer.geo.h, 0, - GL_RGBA, GL_UNSIGNED_BYTE, "" ); + GL_RGBA, GL_UNSIGNED_BYTE, None ); glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST) glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST) diff --git a/scripts/python/pygame/lesson_freej02.py b/scripts/python/pygame/lesson_freej02.py index e0b2caf2..cedf58d5 100644 --- a/scripts/python/pygame/lesson_freej02.py +++ b/scripts/python/pygame/lesson_freej02.py @@ -57,8 +57,8 @@ def init(): def load_textures(): - # nehe texture - texturefile = os.path.join('data','nehe.bmp') + # here set image file + texturefile = os.path.join('..','..','..','doc','ipernav.png') textureSurface = pygame.image.load(texturefile) textureData = pygame.image.tostring(textureSurface, "RGBX", 1) @@ -71,7 +71,7 @@ def load_textures(): # freej texture glBindTexture(GL_TEXTURE_2D, textures[1]) glTexImage2D( GL_TEXTURE_2D, 0, GL_RGBA, layer.geo.w, layer.geo.h, 0, - GL_RGBA, GL_UNSIGNED_BYTE, "" ); + GL_RGBA, GL_UNSIGNED_BYTE, None ); glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST) glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST) diff --git a/scripts/python/pygame/lesson_freej03.py b/scripts/python/pygame/lesson_freej03.py index 16f544a2..4533186b 100644 --- a/scripts/python/pygame/lesson_freej03.py +++ b/scripts/python/pygame/lesson_freej03.py @@ -67,8 +67,8 @@ def init(): def load_textures(): - # nehe texture - texturefile = os.path.join('data','nehe.bmp') + # here set image file + texturefile = os.path.join('..','..','..','doc','ipernav.png') textureSurface = pygame.image.load(texturefile) textureData = pygame.image.tostring(textureSurface, "RGBX", 1) diff --git a/scripts/python/pygame/lesson_freej04.py b/scripts/python/pygame/lesson_freej04.py index 4083844c..46fbe39c 100644 --- a/scripts/python/pygame/lesson_freej04.py +++ b/scripts/python/pygame/lesson_freej04.py @@ -78,7 +78,7 @@ def init(): def load_textures(): global textures # nehe texture - texturefile = os.path.join('data','flower.png') + texturefile = os.path.join('..','..','..','doc','ipernav.png') textureSurface = pygame.image.load(texturefile) textureData = pygame.image.tostring(textureSurface, "RGBX", 1) @@ -95,7 +95,7 @@ def load_textures(): glBindTexture(GL_TEXTURE_2D, textures[idx]) lay = layers[idx] glTexImage2D( GL_TEXTURE_2D, 0, GL_RGBA, lay.geo.w, lay.geo.h, 0, - GL_RGBA, GL_UNSIGNED_BYTE, "" ); + GL_RGBA, GL_UNSIGNED_BYTE, None ); glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR) glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR)