bartvdbraak/blender
1
0
Fork 4
Code Issues 4 Pull Requests 1 Actions 1 Packages Projects Releases Wiki Activity

Cleanup: Fixup naming for sculpt_project.cc

Browse Source 
This PR removes some unnecessary type and
function prefixes from `sculpt_gesture.cc`

Pull Request: https://projects.blender.org/blender/blender/pulls/120847
This commit is contained in:
Sean Kim 2024-04-20 04:04:29 +02:00 committed by Hans Goudey
parent d8f6ae7919
commit 285cbf9ee4
1 changed files with 17 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -20,17 +20,17 @@
namespace blender::ed::sculpt_paint::project {
struct SculptGestureProjectOperation {
struct ProjectOperation {
gesture::Operation operation;
};
static void sculpt_gesture_project_begin(bContext &C, gesture::GestureData &gesture_data)
static void gesture_begin(bContext &C, gesture::GestureData &gesture_data)
{
Depsgraph *depsgraph = CTX_data_depsgraph_pointer(&C);
BKE_sculpt_update_object_for_edit(depsgraph, gesture_data.vc.obact, false);
}
static void project_line_gesture_apply_task(gesture::GestureData &gesture_data, PBVHNode *node)
static void apply_projection(gesture::GestureData &gesture_data, PBVHNode *node)
{
PBVHVertexIter vd;
bool any_updated = false;
@ -66,14 +66,13 @@ static void project_line_gesture_apply_task(gesture::GestureData &gesture_data,
}
}
static void sculpt_gesture_project_apply_for_symmetry_pass(bContext & /*C*/,
gesture::GestureData &gesture_data)
static void gesture_apply_for_symmetry_pass(bContext & /*C*/, gesture::GestureData &gesture_data)
{
switch (gesture_data.shape_type) {
case gesture::ShapeType::Line:
threading::parallel_for(gesture_data.nodes.index_range(), 1, [&](const IndexRange range) {
for (const int i : range) {
project_line_gesture_apply_task(gesture_data, gesture_data.nodes[i]);
apply_projection(gesture_data, gesture_data.nodes[i]);
}
});
break;
@ -85,7 +84,7 @@ static void sculpt_gesture_project_apply_for_symmetry_pass(bContext & /*C*/,
}
}
static void sculpt_gesture_project_end(bContext &C, gesture::GestureData &gesture_data)
static void gesture_end(bContext &C, gesture::GestureData &gesture_data)
{
SculptSession *ss = gesture_data.ss;
Sculpt *sd = CTX_data_tool_settings(&C)->sculpt;
@ -97,22 +96,19 @@ static void sculpt_gesture_project_end(bContext &C, gesture::GestureData &gestur
SCULPT_flush_update_done(&C, gesture_data.vc.obact, SCULPT_UPDATE_COORDS);
}
static void sculpt_gesture_init_project_properties(gesture::GestureData &gesture_data,
wmOperator & /*op*/)
static void init_operation(gesture::GestureData &gesture_data, wmOperator & /*op*/)
{
gesture_data.operation = reinterpret_cast<gesture::Operation *>(
MEM_cnew<SculptGestureProjectOperation>(__func__));
MEM_cnew<ProjectOperation>(__func__));
SculptGestureProjectOperation *project_operation = (SculptGestureProjectOperation *)
gesture_data.operation;
ProjectOperation *project_operation = (ProjectOperation *)gesture_data.operation;
project_operation->operation.begin = sculpt_gesture_project_begin;
project_operation->operation.apply_for_symmetry_pass =
sculpt_gesture_project_apply_for_symmetry_pass;
project_operation->operation.end = sculpt_gesture_project_end;
project_operation->operation.begin = gesture_begin;
project_operation->operation.apply_for_symmetry_pass = gesture_apply_for_symmetry_pass;
project_operation->operation.end = gesture_end;
}
static int project_line_gesture_invoke(bContext *C, wmOperator *op, const wmEvent *event)
static int gesture_line_invoke(bContext *C, wmOperator *op, const wmEvent *event)
{
const View3D *v3d = CTX_wm_view3d(C);
const Base *base = CTX_data_active_base(C);
@ -123,13 +119,13 @@ static int project_line_gesture_invoke(bContext *C, wmOperator *op, const wmEven
return WM_gesture_straightline_active_side_invoke(C, op, event);
}
static int project_gesture_line_exec(bContext *C, wmOperator *op)
static int gesture_line_exec(bContext *C, wmOperator *op)
{
std::unique_ptr<gesture::GestureData> gesture_data = gesture::init_from_line(C, op);
if (!gesture_data) {
return OPERATOR_CANCELLED;
}
sculpt_gesture_init_project_properties(*gesture_data, *op);
init_operation(*gesture_data, *op);
gesture::apply(*C, *gesture_data, *op);
return OPERATOR_FINISHED;
}
@ -140,9 +136,9 @@ void SCULPT_OT_project_line_gesture(wmOperatorType *ot)
ot->idname = "SCULPT_OT_project_line_gesture";
ot->description = "Project the geometry onto a plane defined by a line";
ot->invoke = project_line_gesture_invoke;
ot->invoke = gesture_line_invoke;
ot->modal = WM_gesture_straightline_oneshot_modal;
ot->exec = project_gesture_line_exec;
ot->exec = gesture_line_exec;
ot->poll = SCULPT_mode_poll_view3d;