blender
/
blender
136
408
Fork 591
Code Issues 6.3k Pull Requests 775 Projects 19 Wiki Activity

#70267 Retopology Overlay #104599

Merged
Clément Foucault merged 30 commits from bonj/blender:retopology-overlay into main 2023-03-03 00:35:56 +01:00
Conversation 39 Commits 30 Files Changed 25 +10 -4
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit fbc35f68c4 - Show all commits

14
source/blender/draw/engines/overlay/overlay_edit_mesh.cc
View File

@ -62,7 +62,8 @@ void OVERLAY_edit_mesh_cache_init(OVERLAY_Data *vedata)
pd->edit_mesh.do_zbufclip;
RegionView3D *rv3d = draw_ctx->rv3d;
float retopology_bias = ((v3d->overlay.edit_flag & V3D_OVERLAY_EDIT_RETOPOLOGY) != 0) ?
bool show_retopology = (v3d->overlay.edit_flag & V3D_OVERLAY_EDIT_RETOPOLOGY) != 0;
float retopology_bias = (show_retopology) ?
((rv3d->is_persp) ?
bonj marked this conversation as resolved
Jeroen Bakker commented 2023-02-28 04:00:22 +01:00
Review
Copy Link

Just a small tweak.
Use max_ff(v3d->overlay.retopology_offset, FLT_EPSILON) and remove comment as this is then cleaner in the code.

Just a small tweak. Use `max_ff(v3d->overlay.retopology_offset, FLT_EPSILON)` and remove comment as this is then cleaner in the code.
Jorijn de Graaf commented 2023-02-28 04:22:46 +01:00
Review
Copy Link

Makes sense, I'll do that.

Makes sense, I'll do that.
(v3d->overlay.retopology_bias * v3d->clip_start) :
(v3d->overlay.retopology_bias / v3d->clip_end)) :
@ -106,12 +107,12 @@ void OVERLAY_edit_mesh_cache_init(OVERLAY_Data *vedata)
/* Run Twice for in-front passes. */
for (int i = 0; i < 2; i++) {
bonj marked this conversation as resolved
Clément Foucault commented 2023-02-26 17:57:10 +01:00
Review
Copy Link

Style: Prefer:

if (show_retopology) {
  /* Do not cull backfaces for retopology. This is because [insert explanation here] */
  state &= ~DRW_STATE_CULL_BACK;
}
Style: Prefer: ``` if (show_retopology) { /* Do not cull backfaces for retopology. This is because [insert explanation here] */ state &= ~DRW_STATE_CULL_BACK; }
Jorijn de Graaf commented 2023-02-27 00:31:17 +01:00
Review
Copy Link

Added an if block and explanation, as discussed in DMs.

Added an if block and explanation, as discussed in DMs.
/* Complementary Depth Pass */
state = DRW_STATE_WRITE_DEPTH | DRW_STATE_DEPTH_LESS_EQUAL | DRW_STATE_CULL_BACK;
state = DRW_STATE_WRITE_DEPTH | DRW_STATE_DEPTH_LESS_EQUAL |
((show_retopology) ? DRWState(0) : DRW_STATE_CULL_BACK);
DRW_PASS_CREATE(psl->edit_mesh_depth_ps[i], state | pd->clipping_state);
sh = OVERLAY_shader_depth_only();
grp = pd->edit_mesh_depth_grp[i] = DRW_shgroup_create(sh, psl->edit_mesh_depth_ps[i]);
DRW_shgroup_uniform_block(grp, "globalsBlock", G_draw.block_ubo);
DRW_shgroup_uniform_float_copy(grp, "retopologyBias", retopology_bias);
}
{
@ -290,7 +291,12 @@ void OVERLAY_edit_mesh_cache_populate(OVERLAY_Data *vedata, Object *ob)
}
}
if (show_retopology || (do_in_front && draw_as_solid)) {
if (show_retopology) {
Mesh *me = (Mesh *)ob->data;
geom = DRW_mesh_batch_cache_get_edit_triangles(me);
DRW_shgroup_call_no_cull(pd->edit_mesh_depth_grp[do_in_front], geom, ob);
}
else if (do_in_front && draw_as_solid) {
geom = DRW_cache_mesh_surface_get(ob);
DRW_shgroup_call_no_cull(pd->edit_mesh_depth_grp[do_in_front], geom, ob);
}