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

Cleanup: Sculpt: Remove last usage of PBVHVertRef visibility function

Browse Source 
Pat of #118145.
This commit is contained in:
Hans Goudey
2024-08-14 14:06:59 -04:00
parent 70a24258c6
commit e04707bf2a
2 changed files with 3 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
source/blender/editors/sculpt_paint/sculpt.cc
View File

@@ -275,56 +275,6 @@ bool vert_visible_get(const Object &object, PBVHVertRef vertex)
return true;
}
bool vert_all_faces_visible_get(const SculptSession &ss, PBVHVertRef vertex)
{
switch (ss.pbvh->type()) {
case bke::pbvh::Type::Mesh: {
if (!ss.hide_poly) {
return true;
}
for (const int face : ss.vert_to_face_map[vertex.i]) {
if (ss.hide_poly[face]) {
return false;
}
}
return true;
}
case bke::pbvh::Type::BMesh: {
BMVert *v = (BMVert *)vertex.i;
BMEdge *e = v->e;
if (!e) {
return true;
}
do {
BMLoop *l = e->l;
if (!l) {
continue;
}
do {
if (BM_elem_flag_test(l->f, BM_ELEM_HIDDEN)) {
return false;
}
} while ((l = l->radial_next) != e->l);
} while ((e = BM_DISK_EDGE_NEXT(e, v)) != v->e);
return true;
}
case bke::pbvh::Type::Grids: {
if (!ss.hide_poly) {
return true;
}
const CCGKey key = BKE_subdiv_ccg_key_top_level(*ss.subdiv_ccg);
const int grid_index = vertex.i / key.grid_area;
const int face_index = BKE_subdiv_ccg_grid_to_face_index(*ss.subdiv_ccg, grid_index);
return !ss.hide_poly[face_index];
}
}
return true;
}
bool vert_all_faces_visible_get(const Span<bool> hide_poly,
const GroupedSpan<int> vert_to_face_map,
@@ -806,7 +756,9 @@ bool vert_is_boundary(const SculptSession &ss, const PBVHVertRef vertex)
{
switch (ss.pbvh->type()) {
case bke::pbvh::Type::Mesh: {
if (!hide::vert_all_faces_visible_get(ss, vertex)) {
if (!hide::vert_all_faces_visible_get(
Span(ss.hide_poly, ss.faces_num), ss.vert_to_face_map, vertex.i))
{
return true;
}
return sculpt_check_boundary_vertex_in_base_mesh(ss, vertex.i);

1
source/blender/editors/sculpt_paint/sculpt_intern.hh
View File

@@ -985,7 +985,6 @@ Span<int> node_visible_verts(const bke::pbvh::Node &node,
bool vert_visible_get(const Object &object, PBVHVertRef vertex);
/* Determines if all faces attached to a given vertex are visible. */
bool vert_all_faces_visible_get(const SculptSession &ss, PBVHVertRef vertex);
bool vert_all_faces_visible_get(Span<bool> hide_poly, GroupedSpan<int> vert_to_face_map, int vert);
bool vert_all_faces_visible_get(Span<bool> hide_poly,
const SubdivCCG &subdiv_ccg,