archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Getting rid of setlinestyle: ed_util's pos-to-mouse dashed line.

Browse Source
This commit is contained in:
Bastien Montagne
2017-04-29 19:40:32 +02:00
parent b1b8ce0bbf
commit c5fd6acfce
1 changed files with 22 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
source/blender/editors/util/ed_util.c
View File

@@ -318,21 +318,35 @@ void ED_region_draw_mouse_line_cb(const bContext *C, ARegion *ar, void *arg_info
const float mval_dst[2] = {win->eventstate->x - ar->winrct.xmin, const float mval_dst[2] = {win->eventstate->x - ar->winrct.xmin,
win->eventstate->y - ar->winrct.ymin}; win->eventstate->y - ar->winrct.ymin};
setlinestyle(3);
VertexFormat *format = immVertexFormat(); VertexFormat *format = immVertexFormat();
unsigned int pos = VertexFormat_add_attrib(format, "pos", COMP_F32, 2, KEEP_FLOAT); uint shdr_dashed_pos = VertexFormat_add_attrib(format, "pos", COMP_F32, 2, KEEP_FLOAT);
uint shdr_dashed_origin = VertexFormat_add_attrib(format, "line_origin", COMP_F32, 2, KEEP_FLOAT);
float color1[4];
immBindBuiltinProgram(GPU_SHADER_2D_UNIFORM_COLOR); glEnable(GL_BLEND);
immUniformThemeColor(TH_VIEW_OVERLAY); glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
immBindBuiltinProgram(GPU_SHADER_2D_LINE_DASHED_COLOR);
float viewport_size[4];
glGetFloatv(GL_VIEWPORT, viewport_size);
immUniform2f("viewport_size", viewport_size[2] / UI_DPI_FAC, viewport_size[3] / UI_DPI_FAC);
UI_GetThemeColor4fv(TH_VIEW_OVERLAY, color1);
immUniform4fv("color1", color1);
immUniform4f("color2", 0.0f, 0.0f, 0.0f, 0.0f);
immUniform1f("dash_width", 6.0f);
immUniform1f("dash_width_on", 3.0f);
immBegin(PRIM_LINES, 2); immBegin(PRIM_LINES, 2);
immVertex2fv(pos, mval_dst); immAttrib2fv(shdr_dashed_origin, mval_src);
immVertex2fv(pos, mval_src); immVertex2fv(shdr_dashed_pos, mval_src);
immVertex2fv(shdr_dashed_pos, mval_dst);
immEnd(); immEnd();
immUnbindProgram(); immUnbindProgram();
setlinestyle(0); glDisable(GL_BLEND);
} }
/** /**