[#22470] bpy.Image.gl_load/free()
authorCampbell Barton <ideasman42@gmail.com>
Thu, 3 Jun 2010 16:26:04 +0000 (16:26 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Thu, 3 Jun 2010 16:26:04 +0000 (16:26 +0000)
patch from Dan Eicher (dna)

source/blender/makesrna/intern/rna_image.c
source/blender/makesrna/intern/rna_image_api.c

index c9b25bf47a64913db059ae7858f0676984cbd11c..7d8248b58ed024682a3d589d8f658b4f471294d4 100644 (file)
@@ -432,6 +432,12 @@ static void rna_def_image(BlenderRNA *brna)
        RNA_def_property_ui_text(prop, "Clamp Y", "Disable texture repeating vertically");
        RNA_def_property_update(prop, NC_IMAGE|ND_DISPLAY, NULL);
 
+       prop= RNA_def_property(srna, "bindcode", PROP_INT, PROP_UNSIGNED);
+       RNA_def_property_int_sdna(prop, NULL, "bindcode");
+       RNA_def_property_clear_flag(prop, PROP_EDITABLE);
+       RNA_def_property_ui_text(prop, "Bindcode", "OpenGL bindcode");
+       RNA_def_property_update(prop, NC_IMAGE|ND_DISPLAY, NULL);
+
        /*
           Image.has_data and Image.depth are temporary,
           Update import_obj.py when they are replaced (Arystan)
index aa2ed58623e4c1e8e1c7e466cccd659fd443d3c7..e5fb130a7b7ff73431769eaa1b995eed3b4be5ba 100644 (file)
@@ -33,6 +33,8 @@
 
 #include "RNA_define.h"
 
+#include "BIF_gl.h"
+
 #ifdef RNA_RUNTIME
 
 #include "BKE_image.h"
@@ -127,30 +129,43 @@ static void rna_Image_update(Image *image, ReportList *reports)
        IMB_rect_from_float(ibuf);
 }
 
-static void rna_Image_gl_load(Image *image, ReportList *reports)
+static int rna_Image_gl_load(Image *image, ReportList *reports, int filter, int mag)
 {
        ImBuf *ibuf;
        unsigned int *bind = &image->bindcode;
+       int error = GL_NO_ERROR;
 
        if(*bind)
-               return;
+               return error;
 
        ibuf= BKE_image_get_ibuf(image, NULL);
 
-       if(ibuf == NULL || ibuf->rect == NULL) {
+       if(ibuf == NULL || ibuf->rect == NULL ) {
                BKE_reportf(reports, RPT_ERROR, "Image \"%s\" does not have any image data", image->id.name+2);
-               return;
+               return (int)GL_INVALID_OPERATION;
        }
 
        /* could be made into a function? */
-       glGenTextures( 1, ( GLuint * ) bind );
-       glBindTexture( GL_TEXTURE_2D, *bind );
-
-       gluBuild2DMipmaps(GL_TEXTURE_2D, GL_RGBA, ibuf->x, ibuf->y, GL_RGBA, GL_UNSIGNED_BYTE, ibuf->rect);
-       glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR_MIPMAP_NEAREST);
-       glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
-       glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
-       glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, ibuf->x, ibuf->y, 0, GL_RGBA, GL_UNSIGNED_BYTE, ibuf->rect);
+       glGenTextures(1, (GLuint*)bind);
+       glBindTexture(GL_TEXTURE_2D, *bind);
+
+       if (filter != GL_NEAREST && filter != GL_LINEAR)
+               error = (int)gluBuild2DMipmaps(GL_TEXTURE_2D, GL_RGBA, ibuf->x, ibuf->y, GL_RGBA, GL_UNSIGNED_INT, ibuf->rect);
+
+       if (!error) {
+               glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, (GLint)filter);
+               glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, (GLint)mag);
+               glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
+               glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, ibuf->x, ibuf->y, 0, GL_RGBA, GL_UNSIGNED_INT, ibuf->rect); 
+               error = (int)glGetError();
+       }
+
+       if (error) {
+               glDeleteTextures(1, (GLuint*)bind);
+               image->bindcode = 0;
+       }
+
+       return error;
 }
 
 static void rna_Image_gl_free(Image *image)
@@ -189,6 +204,11 @@ void RNA_api_image(StructRNA *srna)
        func= RNA_def_function(srna, "gl_load", "rna_Image_gl_load");
        RNA_def_function_ui_description(func, "Load the image into OpenGL graphics memory");
        RNA_def_function_flag(func, FUNC_USE_REPORTS);
+       parm= RNA_def_int(func, "filter", GL_LINEAR_MIPMAP_NEAREST, -INT_MAX, INT_MAX, "Filter", "The texture minifying function", -INT_MAX, INT_MAX);
+       parm= RNA_def_int(func, "mag", GL_LINEAR, -INT_MAX, INT_MAX, "Magnification", "The texture magnification function", -INT_MAX, INT_MAX);
+       /* return value */
+       parm= RNA_def_int(func, "error", 0, -INT_MAX, INT_MAX, "Error", "OpenGL error value", -INT_MAX, INT_MAX);
+       RNA_def_function_return(func, parm);
 
        func= RNA_def_function(srna, "gl_free", "rna_Image_gl_free");
        RNA_def_function_ui_description(func, "Free the image from OpenGL graphics memory");