blender
/
blender
129
398
Fork 572
Code Issues 6.2k Pull Requests 744 Projects 19 Wiki Activity

OpenGL: draw image render info with new imm mode (part 1) 

Part of T49043

This was the last use of glaDrawBorderCorners.

Plenty more to do in this file, I'll keep working on it...
This commit is contained in:
Mike Erwin 2017-03-03 17:53:53 -05:00
parent af1635eeb0
commit 0215b3e957
1 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
source/blender/editors/space_image/image_draw.c
View File

@ -88,7 +88,6 @@ static void draw_render_info(const bContext *C,
float zoomx,
float zoomy)
{
RenderResult *rr;
Render *re = RE_GetRender(scene->id.name);
RenderData *rd = RE_engine_get_render_data(re);
Scene *stats_scene = ED_render_job_get_scene(C);
@ -96,7 +95,7 @@ static void draw_render_info(const bContext *C,
stats_scene = CTX_data_scene(C);
}
rr = BKE_image_acquire_renderresult(stats_scene, ima);
RenderResult *rr = BKE_image_acquire_renderresult(stats_scene, ima);
if (rr && rr->text) {
float fill_color[4] = {0.0f, 0.0f, 0.0f, 0.25f};
@ -108,15 +107,11 @@ static void draw_render_info(const bContext *C,
if (re) {
int total_tiles;
bool need_free_tiles;
rcti *tiles;
tiles = RE_engine_get_current_tiles(re, &total_tiles, &need_free_tiles);
rcti *tiles = RE_engine_get_current_tiles(re, &total_tiles, &need_free_tiles);
if (total_tiles) {
int i, x, y;
rcti *tile;
/* find window pixel coordinates of origin */
int x, y;
UI_view2d_view_to_region(&ar->v2d, 0.0f, 0.0f, &x, &y);
glPushMatrix();
@ -124,18 +119,25 @@ static void draw_render_info(const bContext *C,
glScalef(zoomx, zoomy, 1.0f);
if (rd->mode & R_BORDER) {
glTranslatef((int)(-rd->border.xmin * rd->xsch * rd->size / 100.0f),
(int)(-rd->border.ymin * rd->ysch * rd->size / 100.0f),
/* TODO: round or floor instead of casting to int */
glTranslatef((int)(-rd->border.xmin * rd->xsch * rd->size * 0.01f),
(int)(-rd->border.ymin * rd->ysch * rd->size * 0.01f),
0.0f);
}
UI_ThemeColor(TH_FACE_SELECT);
unsigned int pos = add_attrib(immVertexFormat(), "pos", COMP_F32, 2, KEEP_FLOAT);
immBindBuiltinProgram(GPU_SHADER_2D_UNIFORM_COLOR);
immUniformThemeColor(TH_FACE_SELECT);
glLineWidth(1.0f);
for (i = 0, tile = tiles; i < total_tiles; i++, tile++) {
glaDrawBorderCorners(tile, zoomx, zoomy);
rcti *tile = tiles;
for (int i = 0; i < total_tiles; i++, tile++) {
immDrawBorderCorners(pos, tile, zoomx, zoomy);
}
immUnbindProgram();
if (need_free_tiles) {
MEM_freeN(tiles);
}