griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Overlay-Next: Edit Mesh: Weight display

Browse Source 
Rel #102179

Pull Request: https://projects.blender.org/blender/blender/pulls/127566
This commit is contained in:
Clément FOUCAULT
2024-09-13 17:01:46 +02:00
committed by Clément Foucault
parent 1d3613e75c
commit ffb5226944
1 changed files with 29 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
source/blender/draw/engines/overlay/overlay_next_mesh.hh
View File

@@ -43,6 +43,7 @@ class Meshes {
PassSimple::Sub *vert_normals_ = nullptr;
PassSimple edit_mesh_analysis_ps_ = {"Mesh Analysis"};
PassSimple edit_mesh_weight_ps_ = {"Edit Weight"};
PassSimple edit_mesh_edges_ps_ = {"Edges"};
PassSimple edit_mesh_faces_ps_ = {"Faces"};
@@ -60,6 +61,7 @@ class Meshes {
bool show_mesh_analysis = false;
bool show_face = false;
bool show_face_dots = false;
bool show_weight = false;
bool select_edge = false;
bool select_face = false;
@@ -96,6 +98,7 @@ class Meshes {
show_mesh_analysis = (edit_flag & V3D_OVERLAY_EDIT_STATVIS);
show_face = (edit_flag & V3D_OVERLAY_EDIT_FACES);
show_face_dots = ((edit_flag & V3D_OVERLAY_EDIT_FACE_DOT) || state.xray_enabled) & select_face;
show_weight = (edit_flag & V3D_OVERLAY_EDIT_WEIGHT);
const bool show_face_nor = (edit_flag & V3D_OVERLAY_EDIT_FACE_NORMALS);
const bool show_loop_nor = (edit_flag & V3D_OVERLAY_EDIT_LOOP_NORMALS);
@@ -167,6 +170,26 @@ class Meshes {
vert_normals_ = shader_pass(res.shaders.mesh_vert_normal.get(), "VertexNor");
}
}
{
/* Support masked transparency in Workbench.
* EEVEE can't be supported since depth won't match. */
const bool shadeless = eDrawType(state.v3d->shading.type) == OB_WIRE;
auto &pass = edit_mesh_weight_ps_;
pass.init();
pass.state_set(DRW_STATE_WRITE_COLOR | DRW_STATE_DEPTH_LESS_EQUAL | DRW_STATE_WRITE_DEPTH,
state.clipping_plane_count);
pass.shader_set(shadeless ? res.shaders.paint_weight.get() :
res.shaders.paint_weight_fake_shading.get());
pass.bind_ubo("globalsBlock", &res.globals_buf);
pass.bind_texture("colorramp", &res.weight_ramp_tx);
pass.push_constant("drawContours", false);
pass.push_constant("opacity", state.overlay.weight_paint_mode_opacity);
if (!shadeless) {
/* Arbitrary light to give a hint of the geometry behind the weights. */
pass.push_constant("light_dir", math::normalize(float3(0.0f, 0.5f, 0.86602f)));
}
}
{
auto &pass = edit_mesh_analysis_ps_;
pass.init();
@@ -279,6 +302,11 @@ class Meshes {
edit_mesh_analysis_ps_.draw(geom, res_handle);
}
if (show_weight) {
gpu::Batch *geom = DRW_cache_mesh_surface_weights_get(ob);
edit_mesh_weight_ps_.draw(geom, res_handle);
}
if (face_normals_) {
gpu::Batch *geom = DRW_mesh_batch_cache_get_edit_facedots(mesh);
(use_gpu_subdiv ? face_normals_subdiv_ : face_normals_)
@@ -332,6 +360,7 @@ class Meshes {
GPU_framebuffer_bind(framebuffer);
manager.submit(edit_mesh_prepass_ps_, view);
manager.submit(edit_mesh_analysis_ps_, view);
manager.submit(edit_mesh_weight_ps_, view);
if (xray_enabled) {
GPU_debug_group_end();