Changeset bfad34229eccba8d964a27a0fb3a2084c612a7b9 for palette/trunk/palette/gl/texture.py

Timestamp:

09/24/08 06:28:06 (4 years ago)

Author:

flupke <flupke@…>

Children:

1b0cdd33d70957213349cfa0cae373c7350c73a5

Parents:

206d95c9b3331ad20b32a8ff1c5e9666a2029a28

git-committer:

flupke <flupke@…> (09/24/08 06:28:06)

Message:

palette:

• corrigé l'init de GLUT pour que la fenêtre soit créée avec la taille spécifiée dans le plugin
• les classes pour utilisers les FBO fonctionnent
• fait un test d'encodage d'animation en moiré

git-svn-id:  http://kawa.selfip.org/svn/projects@503 532e76a9-45ae-c241-9c6d-8309ac6440cd

File:

• palette/trunk/palette/gl/texture.py (modified) (1 diff)

palette/trunk/palette/gl/texture.py

@@ -1 +1 @@
 from OpenGL.GL import *
-from OpenGL import GL
-
-
-texture_types = {}
-for i in range(1, 4):
-    texture_types[i] = getattr(GL, "GL_TEXTURE_%iD" % i)
-    
+import Image
 
 
 class Texture(object):
-    def __init__(self, size, type):
-        self.texture_id = glGenTextures(1)
-        glBindTexture(type, self.texture_id)
-        glTexImage2D(type, 0, GL_RGB, size[0], size[1], 0, GL_RGB,
-            GL_UNSIGNED_BYTE, 0)
-        glTexParameteri(type, GL_TEXTURE_MAG_FILTER, GL_LINEAR)
-        glTexParameteri(type, GL_TEXTURE_MIN_FILTER, GL_LINEAR)
-        
+    teximage_func = None
+    target = None
+
+    def __init__(self, size, min_filter=GL_LINEAR, mag_filter=GL_LINEAR):
+        self.texture_id = glGenTextures(1)
+        glBindTexture(self.target, self.texture_id)
+        glTexParameteri(self.target, GL_TEXTURE_MAG_FILTER, mag_filter)
+        glTexParameteri(self.target, GL_TEXTURE_MIN_FILTER, min_filter)
+        teximage_args = [self.target, 0, GL_RGB] + list(size) + [0, GL_RGB,
+                GL_UNSIGNED_BYTE, None]
+        self.teximage_func(*teximage_args)
+
+    def bind(self):
+        glBindTexture(self.target, self.texture_id)        
+        
     def __del__(self):
-        super(Texture, self).__del__()
-        glDeleteTextures(1, self.texture_id)
+        glDeleteTextures([self.texture_id])
         
         
 class Texture3D(Texture):
-    def __init__(self, size, min_filter=GL_LINEAR, mag_filter=GL_LINEAR):
-        super(Texture3D, self).__init__(size, GL_TEXTURE_3D, min_filter,
-            mag_filter)
+    teximage_func = glTexImage3D
+    target = GL_TEXTURE_3D
+
                     
 class Texture2D(Texture):
-    def __init__(self, size, min_filter=GL_LINEAR, mag_filter=GL_LINEAR):
-        super(Texture2D, self).__init__(size, GL_TEXTURE_2D, min_filter, 
-            mag_filter)
-            
+    teximage_func = glTexImage2D
+    target = GL_TEXTURE_2D
+
+
 class Texture1D(Texture):
-    def __init__(self, size, min_filter=GL_LINEAR, mag_filter=GL_LINEAR):
-        super(Texture1D, self).__init__(size, GL_TEXTURE_1D, min_filter,
-            mag_filter)
+    teximage_func = glTexImage1D
+    target = GL_TEXTURE_1D