blender
/
blender
136
407
Fork 591
Code Issues 6.3k Pull Requests 776 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 +46 -15
4 changed files with 46 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
source/blender/draw/engines/overlay/overlay_armature.cc
View File

@ -1953,7 +1953,8 @@ static void draw_bone_name(const ArmatureDrawContext *ctx,
10,
0,
DRW_TEXT_CACHE_GLOBALSPACE | DRW_TEXT_CACHE_STRING_PTR,
color);
color,
true);
}
/** \} */

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

@ -35,7 +35,7 @@ static void add_values_to_text_cache(const GVArray &values,
DRWTextStore *dt = DRW_text_cache_ensure();
uchar col[4];
UI_GetThemeColor4ubv(TH_DRAWEXTRA_FACEANG, col);
UI_GetThemeColor4ubv(TH_TEXT_HI, col);
bke::attribute_math::convert_to_static_type(values.type(), [&](auto dummy) {
using T = decltype(dummy);
@ -83,7 +83,8 @@ static void add_values_to_text_cache(const GVArray &values,
BLI_assert_unreachable();
}
DRW_text_cache_add(dt, position, numstr, numstr_len, 0, 0, DRW_TEXT_CACHE_GLOBALSPACE, col);
DRW_text_cache_add(
dt, position, numstr, numstr_len, 0, 0, DRW_TEXT_CACHE_GLOBALSPACE, col, true, true);
}
});
}

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

@ -55,6 +55,8 @@ struct ViewCachedString {
short xoffs, yoffs;
short flag;
int str_len;
bool shadow;
bool align_center;
/* str is allocated past the end */
char str[0];
@ -84,7 +86,9 @@ void DRW_text_cache_add(DRWTextStore *dt,
short xoffs,
short yoffs,
short flag,
const uchar col[4])
const uchar col[4],
const bool shadow,
const bool align_center)
{
int alloc_len;
ViewCachedString *vos;
@ -106,6 +110,8 @@ void DRW_text_cache_add(DRWTextStore *dt,
vos->yoffs = yoffs;
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) {
@ -129,11 +135,8 @@ static void drw_text_cache_draw_ex(DRWTextStore *dt, ARegion *region)
GPU_matrix_push();
GPU_matrix_identity_set();
const int font_id = BLF_default();
const uiStyle *style = UI_style_get();
BLF_size(font_id, style->widget.points * UI_SCALE_FAC);
BLF_default_size(UI_style_get()->widgetlabel.points);
const int font_id = BLF_set_default();
BLI_memiter_iter_init(dt->cache_strings, &it);
while ((vos = static_cast<ViewCachedString *>(BLI_memiter_iter_step(&it)))) {
@ -143,11 +146,35 @@ static void drw_text_cache_draw_ex(DRWTextStore *dt, ARegion *region)
col_pack_prev = vos->col.pack;
}
BLF_position(
font_id, float(vos->sco[0] + vos->xoffs), float(vos->sco[1] + vos->yoffs), 2.0f);
BLF_draw(font_id,
(vos->flag & DRW_TEXT_CACHE_STRING_PTR) ? *((const char **)vos->str) : vos->str,
vos->str_len);
if (vos->align_center) {
/* Measure the size of the string, then offset to align to the vertex. */
float width, height;
BLF_width_and_height(font_id,
(vos->flag & DRW_TEXT_CACHE_STRING_PTR) ? *((const char **)vos->str) :
vos->str,
vos->str_len,
&width,
&height);
vos->xoffs -= short(width / 2.0f);
vos->yoffs -= short(height / 2.0f);
}
if (vos->shadow) {
BLF_draw_default_shadowed(
float(vos->sco[0] + vos->xoffs),
float(vos->sco[1] + vos->yoffs),
2.0f,
(vos->flag & DRW_TEXT_CACHE_STRING_PTR) ? *((const char **)vos->str) : vos->str,
vos->str_len);
}
else {
BLF_draw_default(float(vos->sco[0] + vos->xoffs),
float(vos->sco[1] + vos->yoffs),
2.0f,
(vos->flag & DRW_TEXT_CACHE_STRING_PTR) ? *((const char **)vos->str) :
vos->str,
vos->str_len);
}
}
}

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

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