blender
/
blender
129
397
Fork 571
Code Issues 6.2k Pull Requests 754 Projects 19 Wiki Activity

Fix T75483: 3D Text selection obscures text 

This avoids logic op and having to draw on the render frame-buffer.
This commit is contained in:
Clément Foucault 2020-07-01 16:55:20 +10:00 committed by Campbell Barton
parent 9f634a195d
commit 6c7d0aebcb
Notes: blender-bot 2023-02-14 03:21:27 +01:00 
Referenced by issue #78912, Text object is invisible in viewport with "Fast Editing" option (fixed in 2.9x -- backport to LTS?)
Referenced by issue #75483, 3D Text Selection Obscures Text
2 changed files with 27 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
source/blender/draw/engines/overlay/overlay_edit_text.c
View File

@ -53,13 +53,22 @@ void OVERLAY_edit_text_cache_init(OVERLAY_Data *vedata)
DRW_shgroup_uniform_vec4_copy(grp, "color", G_draw.block.colorWire);
}
{
state = DRW_STATE_WRITE_COLOR | DRW_STATE_LOGIC_INVERT;
state = DRW_STATE_WRITE_COLOR | DRW_STATE_BLEND_ALPHA;
DRW_PASS_CREATE(psl->edit_text_overlay_ps, state | pd->clipping_state);
sh = OVERLAY_shader_uniform_color();
pd->edit_text_overlay_grp = grp = DRW_shgroup_create(sh, psl->edit_text_overlay_ps);
DRW_shgroup_uniform_vec4_copy(grp, "color", (float[4]){1.0f, 1.0f, 1.0f, 1.0f});
DRW_shgroup_uniform_vec4(grp, "color", pd->edit_text.overlay_color, 1);
state = DRW_STATE_WRITE_COLOR | DRW_STATE_BLEND_MUL | DRW_STATE_DEPTH_GREATER_EQUAL |
pd->clipping_state;
DRW_PASS_INSTANCE_CREATE(psl->edit_text_darken_ps, psl->edit_text_overlay_ps, state);
}
{
/* Create view which will render everything (hopefully) behind the text geometry. */
DRWView *default_view = (DRWView *)DRW_view_default_get();
pd->view_edit_text = DRW_view_create_with_zoffset(default_view, draw_ctx->rv3d, -5.0f);
}
}
@ -193,16 +202,24 @@ void OVERLAY_edit_text_cache_populate(OVERLAY_Data *vedata, Object *ob)
void OVERLAY_edit_text_draw(OVERLAY_Data *vedata)
{
OVERLAY_PrivateData *pd = vedata->stl->pd;
OVERLAY_PassList *psl = vedata->psl;
DefaultFramebufferList *dfbl = DRW_viewport_framebuffer_list_get();
OVERLAY_FramebufferList *fbl = vedata->fbl;
if (DRW_state_is_fbo()) {
/* Text overlay need final color for color inversion. */
GPU_framebuffer_bind(dfbl->default_fb);
GPU_framebuffer_bind(fbl->overlay_default_fb);
}
DRW_draw_pass(psl->edit_text_wire_ps[0]);
DRW_draw_pass(psl->edit_text_wire_ps[1]);
DRW_view_set_active(pd->view_edit_text);
/* Alpha blended. */
copy_v4_fl4(pd->edit_text.overlay_color, 0.8f, 0.8f, 0.8f, 0.5f);
DRW_draw_pass(psl->edit_text_overlay_ps);
/* Multiply previous result where depth test fail. */
copy_v4_fl4(pd->edit_text.overlay_color, 0.0f, 0.0f, 0.0f, 1.0f);
DRW_draw_pass(psl->edit_text_darken_ps);
}

5
source/blender/draw/engines/overlay/overlay_private.h
View File

@ -71,6 +71,7 @@ typedef struct OVERLAY_PassList {
DRWPass *edit_mesh_normals_ps;
DRWPass *edit_particle_ps;
DRWPass *edit_text_overlay_ps;
DRWPass *edit_text_darken_ps;
DRWPass *edit_text_wire_ps[2];
DRWPass *extra_ps[2];
DRWPass *extra_blend_ps;
@ -264,6 +265,7 @@ typedef struct OVERLAY_PrivateData {
DRWView *view_edit_faces_cage;
DRWView *view_edit_edges;
DRWView *view_edit_verts;
DRWView *view_edit_text;
DRWView *view_reference_images;
/** TODO get rid of this. */
@ -299,6 +301,9 @@ typedef struct OVERLAY_PrivateData {
bool show_handles;
int handle_display;
} edit_curve;
struct {
float overlay_color[4];
} edit_text;
struct {
int ghost_ob;
int edit_ob;