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

Refactor: Replace SculptBoundaryPreviewEdge with std::pair

Browse Source 
This commit replaces the PBVHVertRef with specific float3 positions for
the edges. To ensure data is displayed correctly, we also remove the
conditional check on updating this data when drawing the cursor to
force recaculating the edge positions on the start of every brush
stroke.

Pull Request: https://projects.blender.org/blender/blender/pulls/124754
This commit is contained in:
Sean Kim
2024-07-16 03:40:49 +02:00
committed by Sean Kim
parent e30a1326a4
commit c20b8f5d6e
3 changed files with 15 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -329,12 +329,6 @@ struct SculptBoundaryEditInfo {
float strength_factor;
};
/* Edge for drawing the boundary preview in the cursor. */
struct SculptBoundaryPreviewEdge {
PBVHVertRef v1;
PBVHVertRef v2;
};
struct SculptBoundary {
/* Vertex indices of the active boundary. */
blender::Vector<PBVHVertRef> verts;
@@ -345,7 +339,7 @@ struct SculptBoundary {
blender::Array<float> distance;
/* Data for drawing the preview. */
blender::Vector<SculptBoundaryPreviewEdge> edges;
blender::Vector<std::pair<blender::float3, blender::float3>> edges;
/* True if the boundary loops into itself. */
bool forms_loop;

9
source/blender/editors/sculpt_paint/paint_cursor.cc
View File

@@ -1709,15 +1709,10 @@ static void paint_cursor_preview_boundary_data_pivot_draw(PaintCursorContext *pc
3);
}
static void paint_cursor_preview_boundary_data_update(PaintCursorContext *pcontext,
const bool update_previews)
static void paint_cursor_preview_boundary_data_update(PaintCursorContext *pcontext)
{
using namespace blender::ed::sculpt_paint;
SculptSession &ss = *pcontext->ss;
if (!(update_previews || !ss.boundary_preview)) {
return;
}
/* Needed for updating the necessary SculptSession data in order to initialize the
* boundary data for the preview. */
BKE_sculpt_update_object_for_edit(pcontext->depsgraph, pcontext->vc.obact, false);
@@ -1815,7 +1810,7 @@ static void paint_cursor_draw_3d_view_brush_cursor_inactive(PaintCursorContext *
}
if (is_brush_tool && brush.sculpt_tool == SCULPT_TOOL_BOUNDARY) {
paint_cursor_preview_boundary_data_update(pcontext, update_previews);
paint_cursor_preview_boundary_data_update(pcontext);
paint_cursor_preview_boundary_data_pivot_draw(pcontext);
}

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

@@ -184,18 +184,20 @@ static bool floodfill_fn(SculptSession &ss,
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);
const float3 from_v_co = SCULPT_vertex_co_get(ss, from_v);
const float3 to_v_co = SCULPT_vertex_co_get(ss, to_v);
SculptBoundary &boundary = *data->boundary;
if (!SCULPT_vertex_is_boundary(ss, to_v)) {
return false;
}
const float edge_len = len_v3v3(SCULPT_vertex_co_get(ss, from_v),
SCULPT_vertex_co_get(ss, to_v));
const float edge_len = len_v3v3(from_v_co, to_v_co);
const float distance_boundary_to_dst = !boundary.distance.is_empty() ?
boundary.distance[from_v_i] + edge_len :
0.0f;
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});
boundary.edges.append({from_v_co, to_v_co});
}
return is_vert_in_editable_boundary(ss, to_v);
}
@@ -242,7 +244,11 @@ static void indices_init(SculptSession &ss,
if (BLI_gset_haskey(included_verts, POINTER_FROM_INT(ni.index)) &&
is_vert_in_editable_boundary(ss, ni.vertex))
{
boundary.edges.append({fdata.last_visited_vertex, ni.vertex});
const float3 from_v_co = SCULPT_vertex_co_get(ss, fdata.last_visited_vertex);
const float3 to_v_co = SCULPT_vertex_co_get(ss, ni.vertex);
boundary.edges.append({from_v_co, to_v_co});
boundary.forms_loop = true;
}
}
@@ -958,8 +964,8 @@ void edges_preview_draw(const uint gpuattr,
GPU_line_width(2.0f);
immBegin(GPU_PRIM_LINES, ss.boundary_preview->edges.size() * 2);
for (int i = 0; i < ss.boundary_preview->edges.size(); i++) {
immVertex3fv(gpuattr, SCULPT_vertex_co_get(ss, ss.boundary_preview->edges[i].v1));
immVertex3fv(gpuattr, SCULPT_vertex_co_get(ss, ss.boundary_preview->edges[i].v2));
immVertex3fv(gpuattr, ss.boundary_preview->edges[i].first);
immVertex3fv(gpuattr, ss.boundary_preview->edges[i].second);
}
immEnd();
}