diff --git a/source/blender/blenkernel/BKE_paint.hh b/source/blender/blenkernel/BKE_paint.hh index 7dfc03bd505..6a8271e35da 100644 --- a/source/blender/blenkernel/BKE_paint.hh +++ b/source/blender/blenkernel/BKE_paint.hh @@ -337,8 +337,8 @@ struct SculptBoundary { bool forms_loop; /* Initial vertex in the boundary which is closest to the current sculpt active vertex. */ - PBVHVertRef initial_vertex; - int initial_vertex_i; + PBVHVertRef initial_vert; + int initial_vert_i; /* Vertex that at max_propagation_steps from the boundary and closest to the original active * vertex that was used to initialize the boundary. This is used as a reference to check how much @@ -348,7 +348,7 @@ struct SculptBoundary { /* Stores the initial positions of the pivot and boundary initial vertex as they may be deformed * during the brush action. This allows to use them as a reference positions and vectors for some * brush effects. */ - blender::float3 initial_vertex_position; + blender::float3 initial_vert_position; blender::float3 initial_pivot_position; /* Maximum number of topology steps that were calculated from the boundary. */ diff --git a/source/blender/editors/sculpt_paint/sculpt_boundary.cc b/source/blender/editors/sculpt_paint/sculpt_boundary.cc index 8d12144f1c0..7d120ad9b2e 100644 --- a/source/blender/editors/sculpt_paint/sculpt_boundary.cc +++ b/source/blender/editors/sculpt_paint/sculpt_boundary.cc @@ -34,20 +34,20 @@ namespace blender::ed::sculpt_paint::boundary { struct BoundaryInitialVertexFloodFillData { - PBVHVertRef initial_vertex; - int initial_vertex_i; - int boundary_initial_vertex_steps; - PBVHVertRef boundary_initial_vertex; - int boundary_initial_vertex_i; + PBVHVertRef initial_vert; + int initial_vert_i; + int boundary_initial_vert_steps; + PBVHVertRef boundary_initial_vert; + int boundary_initial_vert_i; int *floodfill_steps; float radius_sq; }; -static bool boundary_initial_vertex_floodfill_cb(SculptSession &ss, - PBVHVertRef from_v, - PBVHVertRef to_v, - bool is_duplicate, - BoundaryInitialVertexFloodFillData *data) +static bool initial_vert_floodfill_fn(SculptSession &ss, + PBVHVertRef from_v, + PBVHVertRef to_v, + bool is_duplicate, + BoundaryInitialVertexFloodFillData *data) { int from_v_i = BKE_pbvh_vertex_to_index(*ss.pbvh, from_v); int to_v_i = BKE_pbvh_vertex_to_index(*ss.pbvh, to_v); @@ -64,46 +64,46 @@ static bool boundary_initial_vertex_floodfill_cb(SculptSession &ss, } if (SCULPT_vertex_is_boundary(ss, to_v)) { - if (data->floodfill_steps[to_v_i] < data->boundary_initial_vertex_steps) { - data->boundary_initial_vertex_steps = data->floodfill_steps[to_v_i]; - data->boundary_initial_vertex_i = to_v_i; - data->boundary_initial_vertex = to_v; + if (data->floodfill_steps[to_v_i] < data->boundary_initial_vert_steps) { + data->boundary_initial_vert_steps = data->floodfill_steps[to_v_i]; + data->boundary_initial_vert_i = to_v_i; + data->boundary_initial_vert = to_v; } } - const float len_sq = len_squared_v3v3(SCULPT_vertex_co_get(ss, data->initial_vertex), + const float len_sq = len_squared_v3v3(SCULPT_vertex_co_get(ss, data->initial_vert), SCULPT_vertex_co_get(ss, to_v)); return len_sq < data->radius_sq; } /* From a vertex index anywhere in the mesh, returns the closest vertex in a mesh boundary inside * the given radius, if it exists. */ -static PBVHVertRef sculpt_boundary_get_closest_boundary_vertex(SculptSession &ss, - const PBVHVertRef initial_vertex, - const float radius) +static PBVHVertRef get_closest_boundary_vert(SculptSession &ss, + const PBVHVertRef initial_vert, + const float radius) { - if (SCULPT_vertex_is_boundary(ss, initial_vertex)) { - return initial_vertex; + if (SCULPT_vertex_is_boundary(ss, initial_vert)) { + return initial_vert; } flood_fill::FillData flood = flood_fill::init_fill(ss); - flood_fill::add_initial(flood, initial_vertex); + flood_fill::add_initial(flood, initial_vert); BoundaryInitialVertexFloodFillData fdata{}; - fdata.initial_vertex = initial_vertex; - fdata.boundary_initial_vertex = {BOUNDARY_VERTEX_NONE}; - fdata.boundary_initial_vertex_steps = INT_MAX; + fdata.initial_vert = initial_vert; + fdata.boundary_initial_vert = {BOUNDARY_VERTEX_NONE}; + fdata.boundary_initial_vert_steps = INT_MAX; fdata.radius_sq = radius * radius; fdata.floodfill_steps = MEM_cnew_array(SCULPT_vertex_count_get(ss), __func__); flood_fill::execute(ss, flood, [&](PBVHVertRef from_v, PBVHVertRef to_v, bool is_duplicate) { - return boundary_initial_vertex_floodfill_cb(ss, from_v, to_v, is_duplicate, &fdata); + return initial_vert_floodfill_fn(ss, from_v, to_v, is_duplicate, &fdata); }); MEM_freeN(fdata.floodfill_steps); - return fdata.boundary_initial_vertex; + return fdata.boundary_initial_vert; } /* Used to allocate the memory of the boundary index arrays. This was decided considered the most @@ -111,11 +111,11 @@ static PBVHVertRef sculpt_boundary_get_closest_boundary_vertex(SculptSession &ss * deformations usually need in the boundary. */ static int BOUNDARY_INDICES_BLOCK_SIZE = 300; -static void sculpt_boundary_index_add(SculptBoundary &boundary, - const PBVHVertRef new_vertex, - const int new_index, - const float distance, - GSet *included_verts) +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); @@ -131,18 +131,17 @@ static void sculpt_boundary_index_add(SculptBoundary &boundary, * This function is used to check where the propagation should stop when calculating the boundary, * as well as to check if the initial vertex is valid. */ -static bool sculpt_boundary_is_vertex_in_editable_boundary(SculptSession &ss, - const PBVHVertRef initial_vertex) +static bool is_vert_in_editable_boundary(SculptSession &ss, const PBVHVertRef initial_vert) { - if (!hide::vert_visible_get(ss, initial_vertex)) { + if (!hide::vert_visible_get(ss, initial_vert)) { return false; } int neighbor_count = 0; int boundary_vertex_count = 0; SculptVertexNeighborIter ni; - SCULPT_VERTEX_NEIGHBORS_ITER_BEGIN (ss, initial_vertex, ni) { + SCULPT_VERTEX_NEIGHBORS_ITER_BEGIN (ss, initial_vert, ni) { if (hide::vert_visible_get(ss, ni.vertex)) { neighbor_count++; if (SCULPT_vertex_is_boundary(ss, ni.vertex)) { @@ -177,11 +176,11 @@ struct BoundaryFloodFillData { PBVHVertRef last_visited_vertex; }; -static bool boundary_floodfill_cb(SculptSession &ss, - PBVHVertRef from_v, - PBVHVertRef to_v, - bool is_duplicate, - BoundaryFloodFillData *data) +static bool floodfill_fn(SculptSession &ss, + PBVHVertRef from_v, + PBVHVertRef to_v, + bool is_duplicate, + BoundaryFloodFillData *data) { int from_v_i = BKE_pbvh_vertex_to_index(*ss.pbvh, from_v); int to_v_i = BKE_pbvh_vertex_to_index(*ss.pbvh, to_v); @@ -195,18 +194,17 @@ static bool boundary_floodfill_cb(SculptSession &ss, const float distance_boundary_to_dst = !boundary.distance.is_empty() ? boundary.distance[from_v_i] + edge_len : 0.0f; - sculpt_boundary_index_add( - boundary, to_v, to_v_i, distance_boundary_to_dst, data->included_verts); + add_index(boundary, to_v, to_v_i, distance_boundary_to_dst, data->included_verts); if (!is_duplicate) { boundary.edges.append({from_v, to_v}); } - return sculpt_boundary_is_vertex_in_editable_boundary(ss, to_v); + return is_vert_in_editable_boundary(ss, to_v); } -static void sculpt_boundary_indices_init(SculptSession &ss, - SculptBoundary &boundary, - const bool init_boundary_distances, - const PBVHVertRef initial_boundary_vertex) +static void indices_init(SculptSession &ss, + SculptBoundary &boundary, + const bool init_boundary_distances, + const PBVHVertRef initial_boundary_vert) { const int totvert = SCULPT_vertex_count_get(ss); @@ -218,15 +216,14 @@ static void sculpt_boundary_indices_init(SculptSession &ss, GSet *included_verts = BLI_gset_int_new_ex("included verts", BOUNDARY_INDICES_BLOCK_SIZE); flood_fill::FillData flood = flood_fill::init_fill(ss); - int initial_boundary_index = BKE_pbvh_vertex_to_index(*ss.pbvh, initial_boundary_vertex); + int initial_boundary_index = BKE_pbvh_vertex_to_index(*ss.pbvh, initial_boundary_vert); - boundary.initial_vertex = initial_boundary_vertex; - boundary.initial_vertex_i = initial_boundary_index; + boundary.initial_vert = initial_boundary_vert; + boundary.initial_vert_i = initial_boundary_index; - copy_v3_v3(boundary.initial_vertex_position, SCULPT_vertex_co_get(ss, boundary.initial_vertex)); - sculpt_boundary_index_add( - boundary, initial_boundary_vertex, initial_boundary_index, 0.0f, included_verts); - flood_fill::add_initial(flood, boundary.initial_vertex); + copy_v3_v3(boundary.initial_vert_position, SCULPT_vertex_co_get(ss, boundary.initial_vert)); + add_index(boundary, initial_boundary_vert, initial_boundary_index, 0.0f, included_verts); + flood_fill::add_initial(flood, boundary.initial_vert); BoundaryFloodFillData fdata{}; fdata.boundary = &boundary; @@ -234,17 +231,17 @@ static void sculpt_boundary_indices_init(SculptSession &ss, fdata.last_visited_vertex = {BOUNDARY_VERTEX_NONE}; flood_fill::execute(ss, flood, [&](PBVHVertRef from_v, PBVHVertRef to_v, bool is_duplicate) { - return boundary_floodfill_cb(ss, from_v, to_v, is_duplicate, &fdata); + return floodfill_fn(ss, from_v, to_v, is_duplicate, &fdata); }); /* Check if the boundary loops into itself and add the extra preview edge to close the loop. */ if (fdata.last_visited_vertex.i != BOUNDARY_VERTEX_NONE && - sculpt_boundary_is_vertex_in_editable_boundary(ss, fdata.last_visited_vertex)) + is_vert_in_editable_boundary(ss, fdata.last_visited_vertex)) { SculptVertexNeighborIter ni; SCULPT_VERTEX_NEIGHBORS_ITER_BEGIN (ss, fdata.last_visited_vertex, ni) { if (BLI_gset_haskey(included_verts, POINTER_FROM_INT(ni.index)) && - sculpt_boundary_is_vertex_in_editable_boundary(ss, ni.vertex)) + is_vert_in_editable_boundary(ss, ni.vertex)) { boundary.edges.append({fdata.last_visited_vertex, ni.vertex}); boundary.forms_loop = true; @@ -262,10 +259,10 @@ static void sculpt_boundary_indices_init(SculptSession &ss, * needed to go from a boundary vertex to an interior vertex and which vertex of the boundary is * the closest one. */ -static void sculpt_boundary_edit_data_init(SculptSession &ss, - SculptBoundary &boundary, - const PBVHVertRef initial_vertex, - const float radius) +static void edit_data_init(SculptSession &ss, + SculptBoundary &boundary, + const PBVHVertRef initial_vert, + const float radius) { const int totvert = SCULPT_vertex_count_get(ss); @@ -363,7 +360,7 @@ static void sculpt_boundary_edit_data_init(SculptSession &ss, /* Check the distance using the vertex that was propagated from the initial vertex that * was used to initialize the boundary. */ if (boundary.edit_info[from_v_i].original_vertex_i == - BKE_pbvh_vertex_to_index(*ss.pbvh, initial_vertex)) + BKE_pbvh_vertex_to_index(*ss.pbvh, initial_vert)) { boundary.pivot_vertex = ni.vertex; copy_v3_v3(boundary.initial_pivot_position, SCULPT_vertex_co_get(ss, ni.vertex)); @@ -389,10 +386,10 @@ static void sculpt_boundary_edit_data_init(SculptSession &ss, /* This functions assigns a falloff factor to each one of the SculptBoundaryEditInfo structs based * on the brush curve and its propagation steps. The falloff goes from the boundary into the mesh. */ -static void sculpt_boundary_falloff_factor_init(SculptSession &ss, - SculptBoundary &boundary, - const Brush &brush, - const float radius) +static void init_falloff(SculptSession &ss, + SculptBoundary &boundary, + const Brush &brush, + const float radius) { const int totvert = SCULPT_vertex_count_get(ss); BKE_curvemapping_init(brush.curve); @@ -404,7 +401,7 @@ static void sculpt_boundary_falloff_factor_init(SculptSession &ss, } if (boundary.edit_info[i].original_vertex_i == - BKE_pbvh_vertex_to_index(*ss.pbvh, boundary.initial_vertex)) + BKE_pbvh_vertex_to_index(*ss.pbvh, boundary.initial_vert)) { /* All vertices that are propagated from the original vertex won't be affected by the * boundary falloff, so there is no need to calculate anything else. */ @@ -453,28 +450,27 @@ static void sculpt_boundary_falloff_factor_init(SculptSession &ss, std::unique_ptr data_init(Object &object, const Brush *brush, - const PBVHVertRef initial_vertex, + const PBVHVertRef initial_vert, const float radius) { SculptSession &ss = *object.sculpt; - if (initial_vertex.i == PBVH_REF_NONE) { + if (initial_vert.i == PBVH_REF_NONE) { return nullptr; } SCULPT_vertex_random_access_ensure(ss); SCULPT_boundary_info_ensure(object); - const PBVHVertRef boundary_initial_vertex = sculpt_boundary_get_closest_boundary_vertex( - ss, initial_vertex, radius); + const PBVHVertRef boundary_initial_vert = get_closest_boundary_vert(ss, initial_vert, radius); - if (boundary_initial_vertex.i == BOUNDARY_VERTEX_NONE) { + if (boundary_initial_vert.i == BOUNDARY_VERTEX_NONE) { return nullptr; } /* Starting from a vertex that is the limit of a boundary is ambiguous, so return nullptr instead * of forcing a random active boundary from a corner. */ - if (!sculpt_boundary_is_vertex_in_editable_boundary(ss, initial_vertex)) { + if (!is_vert_in_editable_boundary(ss, initial_vert)) { return nullptr; } @@ -485,10 +481,10 @@ std::unique_ptr data_init(Object &object, BRUSH_BOUNDARY_FALLOFF_CONSTANT : false; - sculpt_boundary_indices_init(ss, *boundary, init_boundary_distances, boundary_initial_vertex); + indices_init(ss, *boundary, init_boundary_distances, boundary_initial_vert); const float boundary_radius = brush ? radius * (1.0f + brush->boundary_offset) : radius; - sculpt_boundary_edit_data_init(ss, *boundary, boundary_initial_vertex, boundary_radius); + edit_data_init(ss, *boundary, boundary_initial_vert, boundary_radius); return boundary; } @@ -497,7 +493,7 @@ std::unique_ptr data_init(Object &object, * SculptBoundaryEditInfo. They calculate the data using the vertices that have the * max_propagation_steps value and them this data is copied to the rest of the vertices using the * original vertex index. */ -static void sculpt_boundary_bend_data_init(SculptSession &ss, SculptBoundary &boundary) +static void bend_data_init(SculptSession &ss, SculptBoundary &boundary) { const int totvert = SCULPT_vertex_count_get(ss); boundary.bend.pivot_rotation_axis = Array(totvert, float3(0)); @@ -535,7 +531,7 @@ static void sculpt_boundary_bend_data_init(SculptSession &ss, SculptBoundary &bo } } -static void sculpt_boundary_slide_data_init(SculptSession &ss, SculptBoundary &boundary) +static void slide_data_init(SculptSession &ss, SculptBoundary &boundary) { const int totvert = SCULPT_vertex_count_get(ss); boundary.slide.directions = Array(totvert, float3(0)); @@ -561,7 +557,7 @@ static void sculpt_boundary_slide_data_init(SculptSession &ss, SculptBoundary &b } } -static void sculpt_boundary_twist_data_init(SculptSession &ss, SculptBoundary &boundary) +static void twist_data_init(SculptSession &ss, SculptBoundary &boundary) { zero_v3(boundary.twist.pivot_position); Array face_verts(boundary.verts.size()); @@ -578,13 +574,12 @@ static void sculpt_boundary_twist_data_init(SculptSession &ss, SculptBoundary &b else { sub_v3_v3v3(boundary.twist.rotation_axis, SCULPT_vertex_co_get(ss, boundary.pivot_vertex), - SCULPT_vertex_co_get(ss, boundary.initial_vertex)); + SCULPT_vertex_co_get(ss, boundary.initial_vert)); normalize_v3(boundary.twist.rotation_axis); } } -static float sculpt_boundary_displacement_from_grab_delta_get(SculptSession &ss, - SculptBoundary &boundary) +static float displacement_from_grab_delta_get(SculptSession &ss, SculptBoundary &boundary) { float plane[4]; float pos[3]; @@ -596,7 +591,7 @@ static float sculpt_boundary_displacement_from_grab_delta_get(SculptSession &ss, return dist_signed_to_plane_v3(pos, plane); } -static void do_boundary_brush_bend_task(Object &ob, const Brush &brush, PBVHNode *node) +static void boundary_brush_bend_task(Object &ob, const Brush &brush, PBVHNode *node) { SculptSession &ss = *ob.sculpt; const int symm_area = ss.cache->mirror_symmetry_pass; @@ -609,7 +604,7 @@ static void do_boundary_brush_bend_task(Object &ob, const Brush &brush, PBVHNode SculptOrigVertData orig_data; SCULPT_orig_vert_data_init(orig_data, ob, *node, undo::Type::Position); - const float disp = strength * sculpt_boundary_displacement_from_grab_delta_get(ss, boundary); + const float disp = strength * displacement_from_grab_delta_get(ss, boundary); float angle_factor = disp / ss.cache->radius; /* Angle Snapping when inverting the brush. */ if (ss.cache->invert) { @@ -626,8 +621,7 @@ static void do_boundary_brush_bend_task(Object &ob, const Brush &brush, PBVHNode auto_mask::node_update(automask_data, vd); SCULPT_orig_vert_data_update(orig_data, vd); - if (!SCULPT_check_vertex_pivot_symmetry(orig_data.co, boundary.initial_vertex_position, symm)) - { + if (!SCULPT_check_vertex_pivot_symmetry(orig_data.co, boundary.initial_vert_position, symm)) { continue; } @@ -646,7 +640,7 @@ static void do_boundary_brush_bend_task(Object &ob, const Brush &brush, PBVHNode BKE_pbvh_vertex_iter_end; } -static void do_boundary_brush_slide_task(Object &ob, const Brush &brush, PBVHNode *node) +static void brush_slide_task(Object &ob, const Brush &brush, PBVHNode *node) { SculptSession &ss = *ob.sculpt; const int symm_area = ss.cache->mirror_symmetry_pass; @@ -659,7 +653,7 @@ static void do_boundary_brush_slide_task(Object &ob, const Brush &brush, PBVHNod SculptOrigVertData orig_data; SCULPT_orig_vert_data_init(orig_data, ob, *node, undo::Type::Position); - const float disp = sculpt_boundary_displacement_from_grab_delta_get(ss, boundary); + const float disp = displacement_from_grab_delta_get(ss, boundary); auto_mask::NodeData automask_data = auto_mask::node_begin( ob, ss.cache->automasking.get(), *node); @@ -670,8 +664,7 @@ static void do_boundary_brush_slide_task(Object &ob, const Brush &brush, PBVHNod auto_mask::node_update(automask_data, vd); SCULPT_orig_vert_data_update(orig_data, vd); - if (!SCULPT_check_vertex_pivot_symmetry(orig_data.co, boundary.initial_vertex_position, symm)) - { + if (!SCULPT_check_vertex_pivot_symmetry(orig_data.co, boundary.initial_vert_position, symm)) { continue; } @@ -688,7 +681,7 @@ static void do_boundary_brush_slide_task(Object &ob, const Brush &brush, PBVHNod BKE_pbvh_vertex_iter_end; } -static void do_boundary_brush_inflate_task(Object &ob, const Brush &brush, PBVHNode *node) +static void brush_inflate_task(Object &ob, const Brush &brush, PBVHNode *node) { SculptSession &ss = *ob.sculpt; const int symm_area = ss.cache->mirror_symmetry_pass; @@ -703,7 +696,7 @@ static void do_boundary_brush_inflate_task(Object &ob, const Brush &brush, PBVHN auto_mask::NodeData automask_data = auto_mask::node_begin( ob, ss.cache->automasking.get(), *node); - const float disp = sculpt_boundary_displacement_from_grab_delta_get(ss, boundary); + const float disp = displacement_from_grab_delta_get(ss, boundary); BKE_pbvh_vertex_iter_begin (*ss.pbvh, node, vd, PBVH_ITER_UNIQUE) { if (boundary.edit_info[vd.index].propagation_steps_num == -1) { @@ -712,8 +705,7 @@ static void do_boundary_brush_inflate_task(Object &ob, const Brush &brush, PBVHN auto_mask::node_update(automask_data, vd); SCULPT_orig_vert_data_update(orig_data, vd); - if (!SCULPT_check_vertex_pivot_symmetry(orig_data.co, boundary.initial_vertex_position, symm)) - { + if (!SCULPT_check_vertex_pivot_symmetry(orig_data.co, boundary.initial_vert_position, symm)) { continue; } @@ -730,7 +722,7 @@ static void do_boundary_brush_inflate_task(Object &ob, const Brush &brush, PBVHN BKE_pbvh_vertex_iter_end; } -static void do_boundary_brush_grab_task(Object &ob, const Brush &brush, PBVHNode *node) +static void brush_grab_task(Object &ob, const Brush &brush, PBVHNode *node) { SculptSession &ss = *ob.sculpt; const int symm_area = ss.cache->mirror_symmetry_pass; @@ -752,8 +744,7 @@ static void do_boundary_brush_grab_task(Object &ob, const Brush &brush, PBVHNode auto_mask::node_update(automask_data, vd); SCULPT_orig_vert_data_update(orig_data, vd); - if (!SCULPT_check_vertex_pivot_symmetry(orig_data.co, boundary.initial_vertex_position, symm)) - { + if (!SCULPT_check_vertex_pivot_symmetry(orig_data.co, boundary.initial_vert_position, symm)) { continue; } @@ -769,7 +760,7 @@ static void do_boundary_brush_grab_task(Object &ob, const Brush &brush, PBVHNode BKE_pbvh_vertex_iter_end; } -static void do_boundary_brush_twist_task(Object &ob, const Brush &brush, PBVHNode *node) +static void brush_twist_task(Object &ob, const Brush &brush, PBVHNode *node) { SculptSession &ss = *ob.sculpt; const int symm_area = ss.cache->mirror_symmetry_pass; @@ -784,7 +775,7 @@ static void do_boundary_brush_twist_task(Object &ob, const Brush &brush, PBVHNod auto_mask::NodeData automask_data = auto_mask::node_begin( ob, ss.cache->automasking.get(), *node); - const float disp = strength * sculpt_boundary_displacement_from_grab_delta_get(ss, boundary); + const float disp = strength * displacement_from_grab_delta_get(ss, boundary); float angle_factor = disp / ss.cache->radius; /* Angle Snapping when inverting the brush. */ if (ss.cache->invert) { @@ -799,8 +790,7 @@ static void do_boundary_brush_twist_task(Object &ob, const Brush &brush, PBVHNod auto_mask::node_update(automask_data, vd); SCULPT_orig_vert_data_update(orig_data, vd); - if (!SCULPT_check_vertex_pivot_symmetry(orig_data.co, boundary.initial_vertex_position, symm)) - { + if (!SCULPT_check_vertex_pivot_symmetry(orig_data.co, boundary.initial_vert_position, symm)) { continue; } @@ -819,7 +809,7 @@ static void do_boundary_brush_twist_task(Object &ob, const Brush &brush, PBVHNod BKE_pbvh_vertex_iter_end; } -static void do_boundary_brush_smooth_task(Object &ob, const Brush &brush, PBVHNode *node) +static void brush_smooth_task(Object &ob, const Brush &brush, PBVHNode *node) { SculptSession &ss = *ob.sculpt; const int symmetry_pass = ss.cache->mirror_symmetry_pass; @@ -838,8 +828,7 @@ static void do_boundary_brush_smooth_task(Object &ob, const Brush &brush, PBVHNo } SCULPT_orig_vert_data_update(orig_data, vd); - if (!SCULPT_check_vertex_pivot_symmetry(orig_data.co, boundary.initial_vertex_position, symm)) - { + if (!SCULPT_check_vertex_pivot_symmetry(orig_data.co, boundary.initial_vert_position, symm)) { continue; } @@ -878,30 +867,30 @@ void do_boundary_brush(const Sculpt &sd, Object &ob, Span nodes) const ePaintSymmetryFlags symm_area = ss.cache->mirror_symmetry_pass; if (SCULPT_stroke_is_first_brush_step_of_symmetry_pass(*ss.cache)) { - PBVHVertRef initial_vertex; + PBVHVertRef initial_vert; if (ss.cache->mirror_symmetry_pass == 0) { - initial_vertex = SCULPT_active_vertex_get(ss); + initial_vert = SCULPT_active_vertex_get(ss); } else { float location[3]; flip_v3_v3(location, SCULPT_active_vertex_co_get(ss), symm_area); - initial_vertex = SCULPT_nearest_vertex_get(ob, location, ss.cache->radius_squared, false); + initial_vert = SCULPT_nearest_vertex_get(ob, location, ss.cache->radius_squared, false); } ss.cache->boundaries[symm_area] = data_init( - ob, &brush, initial_vertex, ss.cache->initial_radius); + ob, &brush, initial_vert, ss.cache->initial_radius); if (ss.cache->boundaries[symm_area]) { switch (brush.boundary_deform_type) { case BRUSH_BOUNDARY_DEFORM_BEND: - sculpt_boundary_bend_data_init(ss, *ss.cache->boundaries[symm_area]); + bend_data_init(ss, *ss.cache->boundaries[symm_area]); break; case BRUSH_BOUNDARY_DEFORM_EXPAND: - sculpt_boundary_slide_data_init(ss, *ss.cache->boundaries[symm_area]); + slide_data_init(ss, *ss.cache->boundaries[symm_area]); break; case BRUSH_BOUNDARY_DEFORM_TWIST: - sculpt_boundary_twist_data_init(ss, *ss.cache->boundaries[symm_area]); + twist_data_init(ss, *ss.cache->boundaries[symm_area]); break; case BRUSH_BOUNDARY_DEFORM_INFLATE: case BRUSH_BOUNDARY_DEFORM_GRAB: @@ -909,8 +898,7 @@ void do_boundary_brush(const Sculpt &sd, Object &ob, Span nodes) break; } - sculpt_boundary_falloff_factor_init( - ss, *ss.cache->boundaries[symm_area], brush, ss.cache->initial_radius); + init_falloff(ss, *ss.cache->boundaries[symm_area], brush, ss.cache->initial_radius); } } @@ -923,42 +911,42 @@ void do_boundary_brush(const Sculpt &sd, Object &ob, Span nodes) case BRUSH_BOUNDARY_DEFORM_BEND: threading::parallel_for(nodes.index_range(), 1, [&](const IndexRange range) { for (const int i : range) { - do_boundary_brush_bend_task(ob, brush, nodes[i]); + boundary_brush_bend_task(ob, brush, nodes[i]); } }); break; case BRUSH_BOUNDARY_DEFORM_EXPAND: threading::parallel_for(nodes.index_range(), 1, [&](const IndexRange range) { for (const int i : range) { - do_boundary_brush_slide_task(ob, brush, nodes[i]); + brush_slide_task(ob, brush, nodes[i]); } }); break; case BRUSH_BOUNDARY_DEFORM_INFLATE: threading::parallel_for(nodes.index_range(), 1, [&](const IndexRange range) { for (const int i : range) { - do_boundary_brush_inflate_task(ob, brush, nodes[i]); + brush_inflate_task(ob, brush, nodes[i]); } }); break; case BRUSH_BOUNDARY_DEFORM_GRAB: threading::parallel_for(nodes.index_range(), 1, [&](const IndexRange range) { for (const int i : range) { - do_boundary_brush_grab_task(ob, brush, nodes[i]); + brush_grab_task(ob, brush, nodes[i]); } }); break; case BRUSH_BOUNDARY_DEFORM_TWIST: threading::parallel_for(nodes.index_range(), 1, [&](const IndexRange range) { for (const int i : range) { - do_boundary_brush_twist_task(ob, brush, nodes[i]); + brush_twist_task(ob, brush, nodes[i]); } }); break; case BRUSH_BOUNDARY_DEFORM_SMOOTH: threading::parallel_for(nodes.index_range(), 1, [&](const IndexRange range) { for (const int i : range) { - do_boundary_brush_smooth_task(ob, brush, nodes[i]); + brush_smooth_task(ob, brush, nodes[i]); } }); break; @@ -992,7 +980,7 @@ void pivot_line_preview_draw(const uint gpuattr, SculptSession &ss) GPU_line_width(2.0f); immBegin(GPU_PRIM_LINES, 2); immVertex3fv(gpuattr, SCULPT_vertex_co_get(ss, ss.boundary_preview->pivot_vertex)); - immVertex3fv(gpuattr, SCULPT_vertex_co_get(ss, ss.boundary_preview->initial_vertex)); + immVertex3fv(gpuattr, SCULPT_vertex_co_get(ss, ss.boundary_preview->initial_vert)); immEnd(); }