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

fix drawing file column dividers (T51189)

Browse Source 
Problem was an edge case where vertex_ct logic and draw logic disagreed on how many dividers to draw.

Fix: copy draw logic to earlier vertex_ct

I also skip any drawing or setup if vertex_ct = 0, and set color attribute only for each line's provoking vertex. Small optimizations but these things add up.
This commit is contained in:
Mike Erwin
2017-04-12 14:16:43 -04:00
parent 2871bad8ea
commit c080702e73
1 changed files with 43 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

78
source/blender/editors/space_file/file_draw.c
View File

@@ -477,46 +477,54 @@ static void draw_background(FileLayout *layout, View2D *v2d)
static void draw_dividers(FileLayout *layout, View2D *v2d) static void draw_dividers(FileLayout *layout, View2D *v2d)
{ {
const int step = (layout->tile_w + 2 * layout->tile_border_x);
int v1[2], v2[2];
int sx;
unsigned int vertex_ct = 0;
unsigned char col_hi[3], col_lo[3];
VertexFormat *format = immVertexFormat();
unsigned int pos = VertexFormat_add_attrib(format, "pos", COMP_I32, 2, CONVERT_INT_TO_FLOAT);
unsigned int color = VertexFormat_add_attrib(format, "color", COMP_U8, 3, NORMALIZE_INT_TO_FLOAT);
vertex_ct = (v2d->cur.xmax - v2d->tot.xmin) / step + 1; /* paint at least 1 divider */
vertex_ct *= 4; /* vertex_count = 2 points per divider * 2 lines per divider */
UI_GetThemeColorShade3ubv(TH_BACK, 30, col_hi);
UI_GetThemeColorShade3ubv(TH_BACK, -30, col_lo);
v1[1] = v2d->cur.ymax - layout->tile_border_y;
v2[1] = v2d->cur.ymin;
immBindBuiltinProgram(GPU_SHADER_2D_FLAT_COLOR);
immBegin(PRIM_LINES, vertex_ct);
/* vertical column dividers */ /* vertical column dividers */
sx = (int)v2d->tot.xmin;
const int step = (layout->tile_w + 2 * layout->tile_border_x);
unsigned int vertex_ct = 0;
int sx = (int)v2d->tot.xmin;
while (sx < v2d->cur.xmax) { while (sx < v2d->cur.xmax) {
sx += step; sx += step;
vertex_ct += 4; /* vertex_count = 2 points per line * 2 lines per divider */
v1[0] = v2[0] = sx;
immAttrib3ubv(color, col_lo);
immVertex2iv(pos, v1);
immVertex2iv(pos, v2);
v1[0] = v2[0] = sx + 1;
immAttrib3ubv(color, col_hi);
immVertex2iv(pos, v1);
immVertex2iv(pos, v2);
} }
immEnd(); if (vertex_ct > 0) {
immUnbindProgram(); int v1[2], v2[2];
unsigned char col_hi[3], col_lo[3];
UI_GetThemeColorShade3ubv(TH_BACK, 30, col_hi);
UI_GetThemeColorShade3ubv(TH_BACK, -30, col_lo);
v1[1] = v2d->cur.ymax - layout->tile_border_y;
v2[1] = v2d->cur.ymin;
VertexFormat *format = immVertexFormat();
unsigned int pos = VertexFormat_add_attrib(format, "pos", COMP_I32, 2, CONVERT_INT_TO_FLOAT);
unsigned int color = VertexFormat_add_attrib(format, "color", COMP_U8, 3, NORMALIZE_INT_TO_FLOAT);
immBindBuiltinProgram(GPU_SHADER_2D_FLAT_COLOR);
immBegin(PRIM_LINES, vertex_ct);
sx = (int)v2d->tot.xmin;
while (sx < v2d->cur.xmax) {
sx += step;
v1[0] = v2[0] = sx;
immSkipAttrib(color);
immVertex2iv(pos, v1);
immAttrib3ubv(color, col_lo);
immVertex2iv(pos, v2);
v1[0] = v2[0] = sx + 1;
immSkipAttrib(color);
immVertex2iv(pos, v1);
immAttrib3ubv(color, col_hi);
immVertex2iv(pos, v2);
}
immEnd();
immUnbindProgram();
}
} }
void file_draw_list(const bContext *C, ARegion *ar) void file_draw_list(const bContext *C, ARegion *ar)