Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

OpenGL: refactor ui_panel_category_draw_tab

Browse Source 
changes:
- exact vertex count
- take bool (filled vs outline) instead of GLenum

This function has some flexibility that is not currently used. I left that in.
This commit is contained in:
Mike Erwin
2017-04-06 19:37:50 -04:00
parent f69678482c
commit 115a889bd7
1 changed files with 20 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
source/blender/editors/interface/interface_panel.c
View File

@@ -1555,11 +1555,11 @@ void UI_panel_category_clear_all(ARegion *ar)
/* based on UI_draw_roundbox, check on making a version which allows us to skip some sides */ /* based on UI_draw_roundbox, check on making a version which allows us to skip some sides */
static void ui_panel_category_draw_tab( static void ui_panel_category_draw_tab(
int mode, float minx, float miny, float maxx, float maxy, float rad, bool filled, float minx, float miny, float maxx, float maxy, float rad,
int roundboxtype, int roundboxtype,
const bool use_highlight, const bool use_shadow, bool use_highlight, bool use_shadow,
const unsigned char highlight_fade[3], const unsigned char highlight_fade[3],
const unsigned char col[3]) const unsigned char col[3])
{ {
float vec[4][2] = { float vec[4][2] = {
{0.195, 0.02}, {0.195, 0.02},
@@ -1577,9 +1577,22 @@ static void ui_panel_category_draw_tab(
mul_v2_fl(vec[a], rad); mul_v2_fl(vec[a], rad);
} }
unsigned int vert_ct = 0;
if (use_highlight) {
vert_ct += (roundboxtype & UI_CNR_TOP_RIGHT) ? 6 : 1;
vert_ct += (roundboxtype & UI_CNR_TOP_LEFT) ? 6 : 1;
}
if (use_highlight && !use_shadow) {
vert_ct++;
}
else {
vert_ct += (roundboxtype & UI_CNR_BOTTOM_RIGHT) ? 6 : 1;
vert_ct += (roundboxtype & UI_CNR_BOTTOM_LEFT) ? 6 : 1;
}
immBindBuiltinProgram(GPU_SHADER_2D_SMOOTH_COLOR); immBindBuiltinProgram(GPU_SHADER_2D_SMOOTH_COLOR);
immBeginAtMost(mode, 24); immBegin(filled ? PRIM_TRIANGLE_FAN : PRIM_LINE_STRIP, vert_ct);
immAttrib3ubv(color, col); immAttrib3ubv(color, col);
@@ -1632,7 +1645,6 @@ static void ui_panel_category_draw_tab(
} }
/* corner right-bottom */ /* corner right-bottom */
if (roundboxtype & UI_CNR_BOTTOM_RIGHT) { if (roundboxtype & UI_CNR_BOTTOM_RIGHT) {
immVertex2f(pos, maxx - rad, miny); immVertex2f(pos, maxx - rad, miny);
for (a = 0; a < 4; a++) { for (a = 0; a < 4; a++) {
@@ -1810,16 +1822,16 @@ void UI_panel_category_draw_all(ARegion *ar, const char *category_id_active)
if (is_active) if (is_active)
#endif #endif
{ {
ui_panel_category_draw_tab(GL_TRIANGLE_FAN, rct->xmin, rct->ymin, rct->xmax, rct->ymax, ui_panel_category_draw_tab(true, rct->xmin, rct->ymin, rct->xmax, rct->ymax,
tab_curve_radius - px, roundboxtype, true, true, NULL, tab_curve_radius - px, roundboxtype, true, true, NULL,
is_active ? theme_col_tab_active : theme_col_tab_inactive); is_active ? theme_col_tab_active : theme_col_tab_inactive);
/* tab outline */ /* tab outline */
ui_panel_category_draw_tab(GL_LINE_STRIP, rct->xmin - px, rct->ymin - px, rct->xmax - px, rct->ymax + px, ui_panel_category_draw_tab(false, rct->xmin - px, rct->ymin - px, rct->xmax - px, rct->ymax + px,
tab_curve_radius, roundboxtype, true, true, NULL, theme_col_tab_outline); tab_curve_radius, roundboxtype, true, true, NULL, theme_col_tab_outline);
/* tab highlight (3d look) */ /* tab highlight (3d look) */
ui_panel_category_draw_tab(GL_LINE_STRIP, rct->xmin, rct->ymin, rct->xmax, rct->ymax, ui_panel_category_draw_tab(false, rct->xmin, rct->ymin, rct->xmax, rct->ymax,
tab_curve_radius, roundboxtype, true, false, tab_curve_radius, roundboxtype, true, false,
is_active ? theme_col_back : theme_col_tab_inactive, is_active ? theme_col_back : theme_col_tab_inactive,
is_active ? theme_col_tab_highlight : theme_col_tab_highlight_inactive); is_active ? theme_col_tab_highlight : theme_col_tab_highlight_inactive);