blender
/
blender
134
398
Fork 580
Code Issues 6.3k Pull Requests 758 Projects 19 Wiki Activity

GPU_immediate_util: missed last commit

This commit is contained in:
Campbell Barton 2017-04-05 18:53:34 +10:00
parent a4fac21fc5
commit 2f700b8280
13 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
source/blender/editors/gpencil/gpencil_brush.c
View File

@ -970,11 +970,11 @@ static void gp_brush_drawcursor(bContext *C, int x, int y, void *UNUSED(customda
/* Inner Ring: Light color for action of the brush */
/* TODO: toggle between add and remove? */
immUniformColor4ub(255, 255, 255, 200);
imm_draw_lined_circle(pos, x, y, brush->size, 40);
imm_draw_circle_wire(pos, x, y, brush->size, 40);
/* Outer Ring: Dark color for contrast on light backgrounds (e.g. gray on white) */
immUniformColor3ub(30, 30, 30);
imm_draw_lined_circle(pos, x, y, brush->size + 1, 40);
imm_draw_circle_wire(pos, x, y, brush->size + 1, 40);
immUnbindProgram();

2
source/blender/editors/gpencil/gpencil_paint.c
View File

@ -1858,7 +1858,7 @@ static void gpencil_draw_eraser(bContext *UNUSED(C), int x, int y, void *p_ptr)
setlinestyle(6); /* TODO: handle line stipple in shader */
immUniformColor4ub(255, 100, 100, 200);
imm_draw_lined_circle(pos, x, y, p->radius, 40);
imm_draw_circle_wire(pos, x, y, p->radius, 40);
immUnbindProgram();

2
source/blender/editors/interface/interface_draw.c
View File

@ -1478,7 +1478,7 @@ void ui_draw_but_UNITVEC(uiBut *but, uiWidgetColors *wcol, const rcti *rect)
glEnable(GL_BLEND);
glEnable(GL_LINE_SMOOTH);
imm_draw_lined_circle(pos, 0.0f, 0.0f, 1.0f, 32);
imm_draw_circle_wire(pos, 0.0f, 0.0f, 1.0f, 32);
glDisable(GL_BLEND);
glDisable(GL_LINE_SMOOTH);

8
source/blender/editors/interface/interface_widgets.c
View File

@ -2274,7 +2274,7 @@ static void ui_hsv_cursor(float x, float y)
glEnable(GL_BLEND);
glEnable(GL_LINE_SMOOTH);
immUniformColor3f(0.0f, 0.0f, 0.0f);
imm_draw_lined_circle(pos, x, y, 3.0f * U.pixelsize, 12);
imm_draw_circle_wire(pos, x, y, 3.0f * U.pixelsize, 12);
glDisable(GL_BLEND);
glDisable(GL_LINE_SMOOTH);
@ -2394,7 +2394,7 @@ static void ui_draw_but_HSVCIRCLE(uiBut *but, uiWidgetColors *wcol, const rcti *
glEnable(GL_LINE_SMOOTH);
immUniformColor3ubv((unsigned char *)wcol->outline);
imm_draw_lined_circle(pos, centx, centy, radius, tot);
imm_draw_circle_wire(pos, centx, centy, radius, tot);
immUnbindProgram();
@ -4165,8 +4165,8 @@ void ui_draw_pie_center(uiBlock *block)
immBindBuiltinProgram(GPU_SHADER_2D_UNIFORM_COLOR);
immUniformColor4ubv((unsigned char *)btheme->tui.wcol_pie_menu.outline);
imm_draw_lined_circle(pos, 0.0f, 0.0f, pie_radius_internal, subd);
imm_draw_lined_circle(pos, 0.0f, 0.0f, pie_radius_external, subd);
imm_draw_circle_wire(pos, 0.0f, 0.0f, pie_radius_internal, subd);
imm_draw_circle_wire(pos, 0.0f, 0.0f, pie_radius_external, subd);
immUnbindProgram();

2
source/blender/editors/physics/particle_edit.c
View File

@ -2719,7 +2719,7 @@ static void brush_drawcursor(bContext *C, int x, int y, void *UNUSED(customdata)
glEnable(GL_LINE_SMOOTH);
glEnable(GL_BLEND);
imm_draw_lined_circle(pos, (float)x, (float)y, pe_brush_size_get(scene, brush), 40);
imm_draw_circle_wire(pos, (float)x, (float)y, pe_brush_size_get(scene, brush), 40);
glDisable(GL_BLEND);
glDisable(GL_LINE_SMOOTH);

2
source/blender/editors/screen/screendump.c
View File

@ -465,7 +465,7 @@ static void screencast_draw_cursor(bContext *UNUSED(C), int x, int y, void *UNUS
imm_draw_circle_fill(pos, (float)x, (float)y, 20, 40);
immUniformColor4ub(255, 255, 255, 128);
imm_draw_lined_circle(pos, (float)x, (float)y, 20, 40);
imm_draw_circle_wire(pos, (float)x, (float)y, 20, 40);
immUnbindProgram();

4
source/blender/editors/sculpt_paint/paint_cursor.c
View File

@ -1133,11 +1133,11 @@ static void paint_draw_cursor(bContext *C, int x, int y, void *UNUSED(unused))
/* draw brush outline */
if (ups->stroke_active && BKE_brush_use_size_pressure(scene, brush)) {
/* inner at full alpha */
imm_draw_lined_circle(pos, translation[0], translation[1], final_radius * ups->size_pressure_value, 40);
imm_draw_circle_wire(pos, translation[0], translation[1], final_radius * ups->size_pressure_value, 40);
/* outer at half alpha */
immUniformColor3fvAlpha(outline_col, outline_alpha * 0.5f);
}
imm_draw_lined_circle(pos, translation[0], translation[1], final_radius, 40);
imm_draw_circle_wire(pos, translation[0], translation[1], final_radius, 40);
immUnbindProgram();

2
source/blender/editors/sculpt_paint/sculpt_uv.c
View File

@ -218,7 +218,7 @@ static void brush_drawcursor_uvsculpt(bContext *C, int x, int y, void *UNUSED(cu
glEnable(GL_LINE_SMOOTH);
glEnable(GL_BLEND);
imm_draw_lined_circle(pos, (float)x, (float)y, size, 40);
imm_draw_circle_wire(pos, (float)x, (float)y, size, 40);
glDisable(GL_BLEND);
glDisable(GL_LINE_SMOOTH);

2
source/blender/editors/space_clip/clip_graph_draw.c
View File

@ -122,7 +122,7 @@ static void tracking_segment_knot_cb(void *userdata, MovieTrackingTrack *track,
gpuTranslate2f(scene_framenr, val);
gpuScale2f(1.0f / data->xscale * data->hsize, 1.0f / data->yscale * data->hsize);
imm_draw_lined_circle(data->pos, 0, 0, 0.7, 8);
imm_draw_circle_wire(data->pos, 0, 0, 0.7, 8);
gpuPopMatrix();
}

2
source/blender/editors/space_view3d/view3d_ruler.c
View File

@ -710,7 +710,7 @@ static void ruler_info_draw_pixel(const struct bContext *C, ARegion *ar, void *a
immBindBuiltinProgram(GPU_SHADER_2D_UNIFORM_COLOR);
imm_cpack(color_act);
imm_draw_lined_circle(pos, co_ss[0], co_ss[1], size * U.pixelsize, 32);
imm_draw_circle_wire(pos, co_ss[0], co_ss[1], size * U.pixelsize, 32);
immUnbindProgram();
}

2
source/blender/gpu/GPU_immediate_util.h
View File

@ -29,7 +29,7 @@
void imm_cpack(unsigned int x);
void imm_draw_lined_circle(unsigned pos, float x, float y, float radius, int nsegments);
void imm_draw_circle_wire(unsigned pos, float x, float y, float radius, int nsegments);
void imm_draw_circle_fill(unsigned pos, float x, float y, float radius, int nsegments);
/* use this version when VertexFormat has a vec3 position */

2
source/blender/gpu/intern/gpu_immediate_util.c
View File

@ -65,7 +65,7 @@ static void imm_draw_circle(PrimitiveType prim_type, unsigned pos, float x, floa
* \param radius The circle's radius.
* \param nsegments The number of segments to use in drawing (more = smoother).
*/
void imm_draw_lined_circle(unsigned pos, float x, float y, float rad, int nsegments)
void imm_draw_circle_wire(unsigned pos, float x, float y, float rad, int nsegments)
{
imm_draw_circle(PRIM_LINE_LOOP, pos, x, y, rad, nsegments);
}

6
source/blender/windowmanager/intern/wm_operators.c
View File

@ -3228,10 +3228,10 @@ static void radial_control_paint_cursor(bContext *C, int x, int y, void *customd
}
/* draw circles on top */
imm_draw_lined_circle(pos, 0.0f, 0.0f, r1, 40);
imm_draw_lined_circle(pos, 0.0f, 0.0f, r2, 40);
imm_draw_circle_wire(pos, 0.0f, 0.0f, r1, 40);
imm_draw_circle_wire(pos, 0.0f, 0.0f, r2, 40);
if (rmin > 0.0f)
imm_draw_lined_circle(pos, 0.0, 0.0f, rmin, 40);
imm_draw_circle_wire(pos, 0.0, 0.0f, rmin, 40);
immUnbindProgram();
BLF_size(fontid, 1.5 * fstyle_points * U.pixelsize, U.dpi);