griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

OpenGL: finish area action zone todo

Browse Source 
Replace outlined circle (24 vertices) with a point sprite (1 vertex).

Replace one todo with another todo.
This commit is contained in:
Mike Erwin
2016-12-13 15:43:13 -05:00
parent 3b98b44223
commit 0fa887ae35
1 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
source/blender/editors/screen/area.c
View File

@@ -58,6 +58,7 @@
#include "ED_space_api.h"
#include "GPU_immediate.h"
#include "GPU_draw.h"
#include "BIF_gl.h"
#include "BIF_glutil.h"
@@ -299,25 +300,28 @@ static void region_draw_azone_icon(AZone *az)
VertexFormat* format = immVertexFormat();
unsigned pos = add_attrib(format, "pos", GL_FLOAT, 2, KEEP_FLOAT);
immBindBuiltinProgram(GPU_SHADER_2D_UNIFORM_COLOR);
/* outlined circle */
GPU_enable_program_point_size(); /* TODO: make a fixed-size shader to avoid this */
immBindBuiltinProgram(GPU_SHADER_2D_POINT_UNIFORM_SIZE_UNIFORM_COLOR_OUTLINE_SMOOTH);
immUniform4f("color", 1.0f, 1.0f, 1.0f, 0.8f);
imm_draw_filled_circle(pos, midx, midy, 4.25f, 12);
/* TODO(merwin): replace this --^ with one round point once shader is ready */
glEnable(GL_LINE_SMOOTH);
immUniform4f("color", 0.2f, 0.2f, 0.2f, 0.9f);
imm_draw_lined_circle(pos, midx, midy, 4.25f, 12);
glDisable(GL_LINE_SMOOTH);
immUniform4f("outlineColor", 0.2f, 0.2f, 0.2f, 0.9f);
immUniform1f("outlineWidth", 1.0f);
immUniform1f("size", 9.5f);
immBegin(GL_POINTS, 1);
immVertex2f(pos, midx, midy);
immEnd();
immUnbindProgram();
GPU_disable_program_point_size();
/* + */
immBindBuiltinProgram(GPU_SHADER_2D_UNIFORM_COLOR);
immUniform4f("color", 0.2f, 0.2f, 0.2f, 0.9f);
immBegin(GL_LINES, 4);
immVertex2f(pos, midx, midy - 2);
immVertex2f(pos, midx, midy + 3);
immVertex2f(pos, midx - 2, midy);
immVertex2f(pos, midx + 3, midy);
immEnd();
immUnbindProgram();
}