most unused arg warnings corrected.
[blender.git] / source / blender / editors / interface / interface_icons.c
index c6fafce0ffda6966479d9f0ccf049f38d66c042c..6d1a72fcd1a3af9446daccc9ce2026a0d9ce343b 100644 (file)
 #include "BLI_blenlib.h"
 #include "BLI_storage_types.h"
 
-#include "DNA_screen_types.h"
-#include "DNA_userdef_types.h"
 #include "DNA_brush_types.h"
+#include "DNA_object_types.h"
+#include "DNA_screen_types.h"
+
+#include "RNA_access.h"
+#include "RNA_enum_types.h"
 
 #include "BKE_context.h"
 #include "BKE_global.h"
-#include "BKE_image.h"
 #include "BKE_icons.h"
 #include "BKE_utildefines.h"
 
@@ -329,7 +331,7 @@ static void vicon_editmode_hlt_draw(int x, int y, int w, int h, float alpha)
        viconutil_draw_points(pts, 3, 1);
 }
 
-static void vicon_editmode_dehlt_draw(int x, int y, int w, int h, float alpha)
+static void vicon_editmode_dehlt_draw(int x, int y, int w, int h, float UNUSED(alpha))
 {
        GLint pts[3][2];
 
@@ -344,7 +346,7 @@ static void vicon_editmode_dehlt_draw(int x, int y, int w, int h, float alpha)
        viconutil_draw_points(pts, 3, 1);
 }
 
-static void vicon_disclosure_tri_right_draw(int x, int y, int w, int h, float alpha)
+static void vicon_disclosure_tri_right_draw(int x, int y, int w, int UNUSED(h), float alpha)
 {
        GLint pts[3][2];
        int cx = x+w/2;
@@ -369,7 +371,7 @@ static void vicon_disclosure_tri_right_draw(int x, int y, int w, int h, float al
        viconutil_draw_lineloop_smooth(pts, 3);
 }
 
-static void vicon_small_tri_right_draw(int x, int y, int w, int h, float alpha)
+static void vicon_small_tri_right_draw(int x, int y, int w, int UNUSED(h), float alpha)
 {
        GLint pts[3][2];
        int cx = x+w/2-4;
@@ -391,7 +393,7 @@ static void vicon_small_tri_right_draw(int x, int y, int w, int h, float alpha)
        glShadeModel(GL_FLAT);
 }
 
-static void vicon_disclosure_tri_down_draw(int x, int y, int w, int h, float alpha)
+static void vicon_disclosure_tri_down_draw(int x, int y, int w, int UNUSED(h), float alpha)
 {
        GLint pts[3][2];
        int cx = x+w/2;
@@ -416,7 +418,7 @@ static void vicon_disclosure_tri_down_draw(int x, int y, int w, int h, float alp
        viconutil_draw_lineloop_smooth(pts, 3);
 }
 
-static void vicon_move_up_draw(int x, int y, int w, int h, float alpha)
+static void vicon_move_up_draw(int x, int y, int w, int h, float UNUSED(alpha))
 {
        int d=-2;
 
@@ -434,7 +436,7 @@ static void vicon_move_up_draw(int x, int y, int w, int h, float alpha)
        glDisable(GL_LINE_SMOOTH);
 }
 
-static void vicon_move_down_draw(int x, int y, int w, int h, float alpha)
+static void vicon_move_down_draw(int x, int y, int w, int h, float UNUSED(alpha))
 {
        int d=2;
 
@@ -452,6 +454,51 @@ static void vicon_move_down_draw(int x, int y, int w, int h, float alpha)
        glDisable(GL_LINE_SMOOTH);
 }
 
+static void init_brush_icons()
+{
+
+#define INIT_BRUSH_ICON(icon_id, name)                                      \
+       bbuf = IMB_ibImageFromMemory((unsigned char*)datatoc_ ##name## _png, \
+                                    datatoc_ ##name## _png_size, IB_rect);  \
+       def_internal_icon(bbuf, icon_id, 0, 0, w, ICON_TYPE_BUFFER);         \
+       IMB_freeImBuf(bbuf);
+       // end INIT_BRUSH_ICON
+
+       ImBuf *bbuf;
+       const int w = 96;
+
+       INIT_BRUSH_ICON(ICON_BRUSH_ADD, add);
+       INIT_BRUSH_ICON(ICON_BRUSH_BLOB, blob);
+       INIT_BRUSH_ICON(ICON_BRUSH_BLUR, blur);
+       INIT_BRUSH_ICON(ICON_BRUSH_CLAY, clay);
+       INIT_BRUSH_ICON(ICON_BRUSH_CLONE, clone);
+       INIT_BRUSH_ICON(ICON_BRUSH_CREASE, crease);
+       INIT_BRUSH_ICON(ICON_BRUSH_DARKEN, darken);
+       INIT_BRUSH_ICON(ICON_BRUSH_SCULPT_DRAW, draw);
+       INIT_BRUSH_ICON(ICON_BRUSH_FILL, fill);
+       INIT_BRUSH_ICON(ICON_BRUSH_FLATTEN, flatten);
+       INIT_BRUSH_ICON(ICON_BRUSH_GRAB, grab);
+       INIT_BRUSH_ICON(ICON_BRUSH_INFLATE, inflate);
+       INIT_BRUSH_ICON(ICON_BRUSH_LAYER, layer);
+       INIT_BRUSH_ICON(ICON_BRUSH_LIGHTEN, lighten);
+       INIT_BRUSH_ICON(ICON_BRUSH_MIX, mix);
+       INIT_BRUSH_ICON(ICON_BRUSH_MULTIPLY, multiply);
+       INIT_BRUSH_ICON(ICON_BRUSH_NUDGE, nudge);
+       INIT_BRUSH_ICON(ICON_BRUSH_PINCH, pinch);
+       INIT_BRUSH_ICON(ICON_BRUSH_SCRAPE, scrape);
+       INIT_BRUSH_ICON(ICON_BRUSH_SMEAR, smear);
+       INIT_BRUSH_ICON(ICON_BRUSH_SMOOTH, smooth);
+       INIT_BRUSH_ICON(ICON_BRUSH_SNAKE_HOOK, snake_hook);
+       INIT_BRUSH_ICON(ICON_BRUSH_SOFTEN, soften);
+       INIT_BRUSH_ICON(ICON_BRUSH_SUBTRACT, subtract);
+       INIT_BRUSH_ICON(ICON_BRUSH_TEXDRAW, texdraw);
+       INIT_BRUSH_ICON(ICON_BRUSH_THUMB, thumb);
+       INIT_BRUSH_ICON(ICON_BRUSH_ROTATE, twist);
+       INIT_BRUSH_ICON(ICON_BRUSH_VERTEXDRAW, vertexdraw);
+
+#undef INIT_BRUSH_ICON
+}
+
 static void init_internal_icons()
 {
        bTheme *btheme= U.themes.first;
@@ -575,20 +622,30 @@ static void init_iconfile_list(struct ListBase *list)
                        char *filename = dir[i].relname;
                        
                        if(BLI_testextensie(filename, ".png")) {
-                       
+
                                /* check to see if the image is the right size, continue if not */
                                /* copying strings here should go ok, assuming that we never get back
                                   a complete path to file longer than 256 chars */
                                sprintf(iconfilestr, "%s/%s", icondirstr, filename);
-                               if(BLI_exists(iconfilestr)) bbuf = IMB_loadiffname(iconfilestr, IB_rect);
-                               
-                               ifilex = bbuf->x;
-                               ifiley = bbuf->y;
-                               IMB_freeImBuf(bbuf);
+                               if(BLI_exists(iconfilestr))
+                                       bbuf= IMB_loadiffname(iconfilestr, IB_rect);
+                               else
+                                       bbuf= NULL;
+
+
+                               if(bbuf) {
+                                       ifilex = bbuf->x;
+                                       ifiley = bbuf->y;
+                                       IMB_freeImBuf(bbuf);
+                               }
+                               else {
+                                       ifilex= ifiley= 0;
+                               }
                                
+                               /* bad size or failed to load */
                                if ((ifilex != ICON_IMAGE_W) || (ifiley != ICON_IMAGE_H))
                                        continue;
-                       
+
                                /* found a potential icon file, so make an entry for it in the cache list */
                                ifile = MEM_callocN(sizeof(IconFile), "IconFile");
                                
@@ -739,6 +796,7 @@ void UI_icons_init(int first_dyn_id)
        init_iconfile_list(&iconfilelist);
        BKE_icons_init(first_dyn_id);
        init_internal_icons();
+       init_brush_icons();
 }
 
 /* Render size for preview images at level miplevel */
@@ -785,7 +843,7 @@ static void icon_set_image(bContext *C, ID *id, PreviewImage* prv_img, int miple
                prv_img->w[miplevel], prv_img->h[miplevel]);
 }
 
-static void icon_draw_rect(float x, float y, int w, int h, float aspect, int rw, int rh, unsigned int *rect, float alpha, float *rgb)
+static void icon_draw_rect(float x, float y, int w, int h, float UNUSED(aspect), int rw, int rh, unsigned int *rect, float alpha, float *rgb, short is_preview)
 {
        /* modulate color */
        if(alpha != 1.0f)
@@ -796,11 +854,12 @@ static void icon_draw_rect(float x, float y, int w, int h, float aspect, int rw,
                glPixelTransferf(GL_GREEN_SCALE, rgb[1]);
                glPixelTransferf(GL_BLUE_SCALE, rgb[2]);
        }
-
-       /* position */
-       glRasterPos2f(x, y);
-       // XXX ui_rasterpos_safe(x, y, aspect);
        
+       if(is_preview == 0) {
+               /* position */
+               glRasterPos2f(x,y);
+       }
+
        /* draw */
        if((w<1 || h<1)) {
                // XXX - TODO 2.5 verify whether this case can happen
@@ -817,18 +876,30 @@ static void icon_draw_rect(float x, float y, int w, int h, float aspect, int rw,
                        ImBuf *ima;
 
                        /* first allocate imbuf for scaling and copy preview into it */
-                       ima = IMB_allocImBuf(rw, rh, 32, IB_rect, 0);
+                       ima = IMB_allocImBuf(rw, rh, 32, IB_rect);
                        memcpy(ima->rect, rect, rw*rh*sizeof(unsigned int));    
                        
                        /* scale it */
                        IMB_scaleImBuf(ima, w, h);
-                       glDrawPixels(w, h, GL_RGBA, GL_UNSIGNED_BYTE, ima->rect);
-                       
+
+                       if(is_preview) {
+                               glaDrawPixelsSafe(x, y, w, h, w, GL_RGBA, GL_UNSIGNED_BYTE, ima->rect);
+                       }
+                       else {
+                               glDrawPixels(w, h, GL_RGBA, GL_UNSIGNED_BYTE, ima->rect);
+                       }
+
                        IMB_freeImBuf(ima);
                }
        }
-       else
-               glDrawPixels(w, h, GL_RGBA, GL_UNSIGNED_BYTE, rect);
+       else {
+               if(is_preview) {
+                       glaDrawPixelsSafe(x, y, w, h, w, GL_RGBA, GL_UNSIGNED_BYTE, rect);
+               }
+               else {
+                       glDrawPixels(w, h, GL_RGBA, GL_UNSIGNED_BYTE, rect);
+               }
+       }
 
        /* restore color */
        if(alpha != 0.0f)
@@ -841,7 +912,7 @@ static void icon_draw_rect(float x, float y, int w, int h, float aspect, int rw,
        }
 }
 
-static void icon_draw_texture(float x, float y, float w, float h, int ix, int iy, int iw, int ih, float alpha, float *rgb)
+static void icon_draw_texture(float x, float y, float w, float h, int ix, int iy, int UNUSED(iw), int ih, float alpha, float *rgb)
 {
        float x1, x2, y1, y2;
 
@@ -884,7 +955,7 @@ static int preview_size(int miplevel)
        return 0;
 }
 
-static void icon_draw_size(float x, float y, int icon_id, float aspect, float alpha, float *rgb, int miplevel, int draw_size, int nocreate)
+static void icon_draw_size(float x, float y, int icon_id, float aspect, float alpha, float *rgb, int miplevel, int draw_size, int UNUSED(nocreate), int is_preview)
 {
        Icon *icon = NULL;
        DrawInfo *di = NULL;
@@ -927,7 +998,7 @@ static void icon_draw_size(float x, float y, int icon_id, float aspect, float al
 
                if(!iimg->rect) return; /* something has gone wrong! */
 
-               icon_draw_rect(x, y, w, h, aspect, iimg->w, iimg->h, iimg->rect, alpha, rgb);
+               icon_draw_rect(x, y, w, h, aspect, iimg->w, iimg->h, iimg->rect, alpha, rgb, is_preview);
        }
        else if(di->type == ICON_TYPE_PREVIEW) {
                PreviewImage* pi = BKE_previewimg_get((ID*)icon->obj); 
@@ -938,7 +1009,7 @@ static void icon_draw_size(float x, float y, int icon_id, float aspect, float al
                        
                        /* preview images use premul alpha ... */
                        glBlendFunc(GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
-                       icon_draw_rect(x, y, w, h, aspect, pi->w[miplevel], pi->h[miplevel], pi->rect[miplevel], 1.0f, NULL);
+                       icon_draw_rect(x, y, w, h, aspect, pi->w[miplevel], pi->h[miplevel], pi->rect[miplevel], 1.0f, NULL, is_preview);
                        glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
                }
        }
@@ -962,6 +1033,43 @@ void ui_id_icon_render(bContext *C, ID *id, int preview)
        }
 }
 
+static int ui_id_brush_get_icon(bContext *C, ID *id, int preview)
+{
+       Brush *br = (Brush*)id;
+
+       if(br->flag & BRUSH_CUSTOM_ICON) {
+               BKE_icon_getid(id);
+               ui_id_icon_render(C, id, preview);
+       }
+       else if(!id->icon_id) {
+               /* no icon found, reset it */
+               
+               /* this is not nice, should probably make
+                  brushes be strictly in one paint mode only
+                  to avoid this kind of thing */
+               Object *ob = CTX_data_active_object(C);
+               EnumPropertyItem *items;
+               int tool;
+               
+               if(ob && (ob->mode & OB_MODE_SCULPT)) {
+                       items = brush_sculpt_tool_items;
+                       tool = br->sculpt_tool;
+               }
+               else if(ob && (ob->mode & (OB_MODE_VERTEX_PAINT|OB_MODE_WEIGHT_PAINT))) {
+                       items = brush_vertexpaint_tool_items;
+                       tool = br->vertexpaint_tool;
+               }
+               else {
+                       items = brush_imagepaint_tool_items;
+                       tool = br->imagepaint_tool;
+               }
+
+               RNA_enum_icon_from_value(items, tool, &id->icon_id);
+       }
+
+       return id->icon_id;
+}
+
 int ui_id_icon_get(bContext *C, ID *id, int preview)
 {
        int iconid= 0;
@@ -969,6 +1077,9 @@ int ui_id_icon_get(bContext *C, ID *id, int preview)
        /* icon */
        switch(GS(id->name))
        {
+               case ID_BR:
+                       iconid= ui_id_brush_get_icon(C, id, preview);
+                       break;
                case ID_MA: /* fall through */
                case ID_TE: /* fall through */
                case ID_IM: /* fall through */
@@ -978,16 +1089,6 @@ int ui_id_icon_get(bContext *C, ID *id, int preview)
                        /* checks if not exists, or changed */
                        ui_id_icon_render(C, id, preview);
                        break;
-               case ID_BR:
-                       { /* use the image in the brush as the icon */
-                         /* XXX redundancy here can be reduced be rewriting this switch as an if */
-                               ID* ima_id = (ID*)get_brush_icon((Brush*)id);
-                               id = ima_id ? ima_id : id;
-                               iconid= BKE_icon_getid(id);
-                               /* checks if not exists, or changed */
-                               ui_id_icon_render(C, id, preview);
-                       }
-                       break;
                default:
                        break;
        }
@@ -998,7 +1099,7 @@ int ui_id_icon_get(bContext *C, ID *id, int preview)
 static void icon_draw_mipmap(float x, float y, int icon_id, float aspect, float alpha, int miplevel, int nocreate)
 {
        int draw_size = preview_size(miplevel);
-       icon_draw_size(x, y, icon_id, aspect, alpha, NULL, miplevel, draw_size, nocreate);
+       icon_draw_size(x, y, icon_id, aspect, alpha, NULL, miplevel, draw_size, nocreate, FALSE);
 }
 
 void UI_icon_draw_aspect(float x, float y, int icon_id, float aspect, float alpha)
@@ -1009,7 +1110,7 @@ void UI_icon_draw_aspect(float x, float y, int icon_id, float aspect, float alph
 void UI_icon_draw_aspect_color(float x, float y, int icon_id, float aspect, float *rgb)
 {
        int draw_size = preview_size(PREVIEW_MIPMAP_ZERO);
-       icon_draw_size(x, y, icon_id, aspect, 1.0f, rgb, PREVIEW_MIPMAP_ZERO, draw_size, 0);
+       icon_draw_size(x, y, icon_id, aspect, 1.0f, rgb, PREVIEW_MIPMAP_ZERO, draw_size, FALSE, FALSE);
 }
 
 void UI_icon_draw(float x, float y, int icon_id)
@@ -1019,7 +1120,7 @@ void UI_icon_draw(float x, float y, int icon_id)
 
 void UI_icon_draw_size(float x, float y, int size, int icon_id, float alpha)
 {
-       icon_draw_size(x, y, icon_id, 1.0f, alpha, NULL, 0, size, 1);
+       icon_draw_size(x, y, icon_id, 1.0f, alpha, NULL, PREVIEW_MIPMAP_ZERO, size, TRUE, FALSE);
 }
 
 void UI_icon_draw_preview(float x, float y, int icon_id)
@@ -1034,6 +1135,6 @@ void UI_icon_draw_preview_aspect(float x, float y, int icon_id, float aspect)
 
 void UI_icon_draw_preview_aspect_size(float x, float y, int icon_id, float aspect, int size)
 {
-       icon_draw_size(x, y, icon_id, aspect, 1.0f, NULL, PREVIEW_MIPMAP_LARGE, size, 0);
+       icon_draw_size(x, y, icon_id, aspect, 1.0f, NULL, PREVIEW_MIPMAP_LARGE, size, FALSE, TRUE);
 }