diff options
author | Campbell Barton <ideasman42@gmail.com> | 2010-03-06 15:02:27 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2010-03-06 15:02:27 +0300 |
commit | 1687a0b21eea478af3487c43ad26c2df0fe9f7ac (patch) | |
tree | 28b32827df0ccdad2fb879bbf6ad53de001a578e /source | |
parent | e3c10b9d08f20c68d1883b58e5be5de3c3867f2a (diff) |
RNA/Py API from 2.4x
Image functions: reload(), update(), gl_load(), gl_free()
Diffstat (limited to 'source')
-rw-r--r-- | source/blender/makesrna/intern/rna_image_api.c | 76 |
1 files changed, 73 insertions, 3 deletions
diff --git a/source/blender/makesrna/intern/rna_image_api.c b/source/blender/makesrna/intern/rna_image_api.c index 533d954871c..f2dbc7ef23f 100644 --- a/source/blender/makesrna/intern/rna_image_api.c +++ b/source/blender/makesrna/intern/rna_image_api.c @@ -43,6 +43,9 @@ #include "IMB_imbuf.h" +#include "BIF_gl.h" +#include "GPU_draw.h" + #include "DNA_image_types.h" #include "DNA_scene_types.h" @@ -98,6 +101,57 @@ static void rna_Image_save(Image *image, ReportList *reports) } } +static void rna_Image_reload(Image *image) +{ + BKE_image_signal(image, NULL, IMA_SIGNAL_RELOAD); +} + +static void rna_Image_update(Image *image, ReportList *reports) +{ + ImBuf *ibuf= BKE_image_get_ibuf(image, NULL); + + if(ibuf == NULL) { + BKE_reportf(reports, RPT_ERROR, "Image \"%s\" does not have any image data", image->id.name+2); + return; + } + + IMB_rect_from_float(ibuf); +} + +static void rna_Image_gl_load(Image *image, ReportList *reports) +{ + ImBuf *ibuf; + unsigned int *bind = &image->bindcode; + + if(*bind) + return; + + ibuf= BKE_image_get_ibuf(image, 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; + } + + /* 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); +} + +static void rna_Image_gl_free(Image *image) +{ + GPU_free_image(image); + + /* remove the nocollect flag, image is available for garbage collection again */ + image->flag &= ~IMA_NOCOLLECT; +} + #else void RNA_api_image(StructRNA *srna) @@ -106,15 +160,31 @@ void RNA_api_image(StructRNA *srna) PropertyRNA *parm; func= RNA_def_function(srna, "save_render", "rna_Image_save_render"); - RNA_def_function_ui_description(func, "Save image to a specific path using a scenes render settings."); + RNA_def_function_ui_description(func, "Save image to a specific path using a scenes render settings"); RNA_def_function_flag(func, FUNC_USE_CONTEXT|FUNC_USE_REPORTS); parm= RNA_def_string(func, "path", "", 0, "", "Save path."); RNA_def_property_flag(parm, PROP_REQUIRED); - parm= RNA_def_pointer(func, "scene", "Scene", "", "Scene to take image parameters from."); + parm= RNA_def_pointer(func, "scene", "Scene", "", "Scene to take image parameters from"); func= RNA_def_function(srna, "save", "rna_Image_save"); - RNA_def_function_ui_description(func, "Save image to its source path."); + RNA_def_function_ui_description(func, "Save image to its source path"); + RNA_def_function_flag(func, FUNC_USE_REPORTS); + + func= RNA_def_function(srna, "reload", "rna_Image_reload"); + RNA_def_function_ui_description(func, "Reload the image from its source path"); + + func= RNA_def_function(srna, "update", "rna_Image_update"); + RNA_def_function_ui_description(func, "Update the display image from the floating point buffer"); RNA_def_function_flag(func, FUNC_USE_REPORTS); + + 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); + + func= RNA_def_function(srna, "gl_free", "rna_Image_gl_free"); + RNA_def_function_ui_description(func, "Free the image from OpenGL graphics memory"); + + /* TODO, pack/unpack, maybe should be generic functions? */ } #endif |