blender
/
blender
136
426
Fork 613
Code Issues 6.3k Pull Requests 782 Projects 19 Wiki Activity

UI: Shadowed Text for GN Viewer Node Attribute and Bone Names #116528

Merged
Harley Acheson merged 11 commits from Julian-Plak/blender:readable-att-text into main 2024-01-31 19:21:59 +01:00
Conversation 10 Commits 11 Files Changed 4 +18 -3
3 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 3391bd932e - Show all commits

2
source/blender/draw/engines/overlay/overlay_viewer_text.cc
View File

@ -84,7 +84,7 @@ static void add_values_to_text_cache(const GVArray &values,
}
DRW_text_cache_add(
dt, position, numstr, numstr_len, 0, 0, DRW_TEXT_CACHE_GLOBALSPACE, col, true);
dt, position, numstr, numstr_len, 0, 0, DRW_TEXT_CACHE_GLOBALSPACE, col, true, true);
}
});
}

16
source/blender/draw/intern/draw_manager_text.cc
View File

@ -56,6 +56,7 @@ struct ViewCachedString {
short flag;
int str_len;
bool shadow;
bool align_center;
/* str is allocated past the end */
char str[0];
@ -86,7 +87,8 @@ void DRW_text_cache_add(DRWTextStore *dt,
short yoffs,
short flag,
const uchar col[4],
bool shadow)
bool shadow,
bool align_center)
{
int alloc_len;
ViewCachedString *vos;
@ -109,6 +111,7 @@ void DRW_text_cache_add(DRWTextStore *dt,
vos->flag = flag;
vos->str_len = str_len;
vos->shadow = shadow;
vos->align_center = align_center;
/* allocate past the end */
if (flag & DRW_TEXT_CACHE_STRING_PTR) {
@ -146,6 +149,17 @@ static void drw_text_cache_draw_ex(DRWTextStore *dt, ARegion *region)
col_pack_prev = vos->col.pack;
}
/* Use the string and the font_id to calculate the width of the string, then
* offset x to align text to vertex. */
if (vos->align_center) {
short offset = BLF_width(
font_id,
(vos->flag & DRW_TEXT_CACHE_STRING_PTR) ? *((const char **)vos->str) : vos->str,
vos->str_len);
vos->xoffs += -offset / 2;
}
BLF_position(
font_id, float(vos->sco[0] + vos->xoffs), float(vos->sco[1] + vos->yoffs), 2.0f);

3
source/blender/draw/intern/draw_manager_text.hh
View File

@ -27,7 +27,8 @@ void DRW_text_cache_add(DRWTextStore *dt,
short yoffs,
short flag,
const uchar col[4],
bool shadow = false);
bool shadow = false,
bool align_center = false);
void DRW_text_cache_draw(DRWTextStore *dt, ARegion *region, View3D *v3d);