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

Refactor: Switch vector of PBVHVertRef in SculptBoundary for int

Browse Source 
Part of #118145

Both int indices and PBVVertRef objects are used in multiple places
throughout the sculpt_boundary.cc code. This commit removes the
external-facing PBVHVertRef in favor of the int index to make further
refactoring of the methods that use this data easier.

Pull Request: https://projects.blender.org/blender/blender/pulls/125274
This commit is contained in:
Sean Kim
2024-07-23 23:19:41 +02:00
committed by Sean Kim
parent f6ae3bf8f3
commit 06aa1ce7b2
3 changed files with 25 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/blenkernel/BKE_paint.hh
View File

@@ -341,7 +341,7 @@ struct SculptBoundaryPreview {
struct SculptBoundary {
/* Vertex indices of the active boundary. */
blender::Vector<PBVHVertRef> verts;
blender::Vector<int> verts;
/* Distance from a vertex in the boundary to initial vertex indexed by vertex index, taking into
* account the length of all edges between them. Any vertex that is not in the boundary will have

38
source/blender/editors/sculpt_paint/sculpt_boundary.cc
View File

@@ -222,12 +222,11 @@ static PBVHVertRef get_closest_boundary_vert(SculptSession &ss,
static int BOUNDARY_INDICES_BLOCK_SIZE = 300;
static void add_index(SculptBoundary &boundary,
const PBVHVertRef new_vertex,
const int new_index,
const float distance,
GSet *included_verts)
{
boundary.verts.append(new_vertex);
boundary.verts.append(new_index);
boundary.distance.add(new_index, distance);
if (included_verts) {
@@ -264,7 +263,7 @@ static bool floodfill_fn(SculptSession &ss,
const float edge_len = len_v3v3(from_v_co, to_v_co);
const float distance_boundary_to_dst = boundary.distance.lookup_default(from_v_i, 0.0f) +
edge_len;
add_index(boundary, to_v, to_v_i, distance_boundary_to_dst, data->included_verts);
add_index(boundary, to_v_i, distance_boundary_to_dst, data->included_verts);
if (!is_duplicate) {
boundary.edges.append({from_v_co, to_v_co});
}
@@ -284,7 +283,7 @@ static void indices_init(SculptSession &ss,
boundary.initial_vert_i = initial_boundary_index;
copy_v3_v3(boundary.initial_vert_position, SCULPT_vertex_co_get(ss, initial_boundary_vert));
add_index(boundary, initial_boundary_vert, initial_boundary_index, 0.0f, included_verts);
add_index(boundary, initial_boundary_index, 0.0f, included_verts);
flood_fill::add_initial(flood, initial_boundary_vert);
BoundaryFloodFillData fdata{};
@@ -341,30 +340,29 @@ static void edit_data_init(SculptSession &ss,
boundary.edit_info[i].propagation_steps_num = BOUNDARY_STEPS_NONE;
}
std::queue<PBVHVertRef> current_iteration;
std::queue<PBVHVertRef> next_iteration;
std::queue<int> current_iteration;
std::queue<int> next_iteration;
for (int i = 0; i < boundary.verts.size(); i++) {
int index = BKE_pbvh_vertex_to_index(*ss.pbvh, boundary.verts[i]);
const PBVHVertRef vert = BKE_pbvh_index_to_vertex(*ss.pbvh, boundary.verts[i]);
const int index = boundary.verts[i];
boundary.edit_info[index].original_vertex_i = BKE_pbvh_vertex_to_index(*ss.pbvh,
boundary.verts[i]);
boundary.edit_info[index].original_vertex_i = index;
boundary.edit_info[index].propagation_steps_num = 0;
/* This ensures that all duplicate vertices in the boundary have the same original_vertex
* index, so the deformation for them will be the same. */
if (has_duplicates) {
SculptVertexNeighborIter ni_duplis;
SCULPT_VERTEX_DUPLICATES_AND_NEIGHBORS_ITER_BEGIN (ss, boundary.verts[i], ni_duplis) {
SCULPT_VERTEX_DUPLICATES_AND_NEIGHBORS_ITER_BEGIN (ss, vert, ni_duplis) {
if (ni_duplis.is_duplicate) {
boundary.edit_info[ni_duplis.index].original_vertex_i = BKE_pbvh_vertex_to_index(
*ss.pbvh, boundary.verts[i]);
boundary.edit_info[ni_duplis.index].original_vertex_i = index;
}
}
SCULPT_VERTEX_NEIGHBORS_ITER_END(ni_duplis);
}
current_iteration.push(boundary.verts[i]);
current_iteration.push(index);
}
int propagation_steps_num = 0;
@@ -379,10 +377,10 @@ static void edit_data_init(SculptSession &ss,
}
while (!current_iteration.empty()) {
PBVHVertRef from_v = current_iteration.front();
const int from_v_i = current_iteration.front();
current_iteration.pop();
int from_v_i = BKE_pbvh_vertex_to_index(*ss.pbvh, from_v);
const PBVHVertRef from_v = BKE_pbvh_index_to_vertex(*ss.pbvh, from_v_i);
SculptVertexNeighborIter ni;
SCULPT_VERTEX_DUPLICATES_AND_NEIGHBORS_ITER_BEGIN (ss, from_v, ni) {
@@ -404,7 +402,7 @@ static void edit_data_init(SculptSession &ss,
boundary.edit_info[ni.index].propagation_steps_num =
boundary.edit_info[from_v_i].propagation_steps_num + 1;
next_iteration.push(ni.vertex);
next_iteration.push(ni.index);
/* When copying the data to the neighbor for the next iteration, it has to be copied to
* all its duplicates too. This is because it is not possible to know if the updated
@@ -438,7 +436,7 @@ static void edit_data_init(SculptSession &ss,
/* Copy the new vertices to the queue to be processed in the next iteration. */
while (!next_iteration.empty()) {
PBVHVertRef next_v = next_iteration.front();
const int next_v = next_iteration.front();
next_iteration.pop();
current_iteration.push(next_v);
}
@@ -528,8 +526,10 @@ static void twist_data_init(SculptSession &ss, SculptBoundary &boundary)
zero_v3(boundary.twist.pivot_position);
Array<float3> face_verts(boundary.verts.size());
for (int i = 0; i < boundary.verts.size(); i++) {
add_v3_v3(boundary.twist.pivot_position, SCULPT_vertex_co_get(ss, boundary.verts[i]));
copy_v3_v3(face_verts[i], SCULPT_vertex_co_get(ss, boundary.verts[i]));
const PBVHVertRef vert = BKE_pbvh_index_to_vertex(*ss.pbvh, boundary.verts[i]);
const float3 boundary_position = SCULPT_vertex_co_get(ss, vert);
add_v3_v3(boundary.twist.pivot_position, boundary_position);
copy_v3_v3(face_verts[i], boundary_position);
}
mul_v3_fl(boundary.twist.pivot_position, 1.0f / boundary.verts.size());
if (boundary.forms_loop) {

10
source/blender/editors/sculpt_paint/sculpt_expand.cc
View File

@@ -625,7 +625,7 @@ static Array<float> boundary_topology_falloff_create(Object &ob, const PBVHVertR
const int totvert = SCULPT_vertex_count_get(ss);
Array<float> dists(totvert, 0.0f);
BitVector<> visited_verts(totvert);
std::queue<PBVHVertRef> queue;
std::queue<int> queue;
/* Search and initialize a boundary per symmetry pass, then mark those vertices as visited. */
const char symm = SCULPT_mesh_symmetry_xyz_get(ob);
@@ -644,7 +644,7 @@ static Array<float> boundary_topology_falloff_create(Object &ob, const PBVHVertR
for (int i = 0; i < boundary->verts.size(); i++) {
queue.push(boundary->verts[i]);
visited_verts[BKE_pbvh_vertex_to_index(*ss.pbvh, boundary->verts[i])].set();
visited_verts[boundary->verts[i]].set();
}
}
@@ -655,10 +655,10 @@ static Array<float> boundary_topology_falloff_create(Object &ob, const PBVHVertR
/* Propagate the values from the boundaries to the rest of the mesh. */
while (!queue.empty()) {
PBVHVertRef v_next = queue.front();
int v_next_i = queue.front();
queue.pop();
int v_next_i = BKE_pbvh_vertex_to_index(*ss.pbvh, v_next);
PBVHVertRef v_next = BKE_pbvh_index_to_vertex(*ss.pbvh, v_next_i);
SculptVertexNeighborIter ni;
SCULPT_VERTEX_NEIGHBORS_ITER_BEGIN (ss, v_next, ni) {
@@ -667,7 +667,7 @@ static Array<float> boundary_topology_falloff_create(Object &ob, const PBVHVertR
}
dists[ni.index] = dists[v_next_i] + 1.0f;
visited_verts[ni.index].set();
queue.push(ni.vertex);
queue.push(ni.index);
}
SCULPT_VERTEX_NEIGHBORS_ITER_END(ni);
}