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

Cleanup: Move paint_mask functions to proper namespace

Browse Source 
Some of these operators aren't really related to masking
and should be moved elsewhere in the future.
This commit is contained in:
Hans Goudey
2023-12-02 14:43:56 -05:00
parent b74862127d
commit 785c49cf44
5 changed files with 42 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
source/blender/editors/sculpt_paint/paint_intern.hh
View File

@@ -460,23 +460,12 @@ void PAINT_OT_hide_show(wmOperatorType *ot);
/* `paint_mask.cc` */
/* The gesture API doesn't write to this enum type,
* it writes to eSelectOp from ED_select_utils.hh.
* We must thus map the modes here to the desired
* eSelectOp modes.
*
* Fixes #102349.
*/
enum PaintMaskFloodMode {
PAINT_MASK_FLOOD_VALUE = SEL_OP_SUB,
PAINT_MASK_FLOOD_VALUE_INVERSE = SEL_OP_ADD,
PAINT_MASK_INVERT = SEL_OP_XOR,
};
namespace blender::ed::sculpt_paint::mask {
void PAINT_OT_mask_flood_fill(wmOperatorType *ot);
void PAINT_OT_mask_lasso_gesture(wmOperatorType *ot);
void PAINT_OT_mask_box_gesture(wmOperatorType *ot);
void PAINT_OT_mask_line_gesture(wmOperatorType *ot);
} // namespace blender::ed::sculpt_paint::mask
/* `paint_curve.cc` */

42
source/blender/editors/sculpt_paint/paint_mask.cc
View File

@@ -56,10 +56,20 @@
/* For undo push. */
#include "sculpt_intern.hh"
using blender::float3;
using blender::OffsetIndices;
using blender::Span;
using blender::Vector;
namespace blender::ed::sculpt_paint::mask {
/* The gesture API doesn't write to this enum type,
* it writes to eSelectOp from ED_select_utils.hh.
* We must thus map the modes here to the desired
* eSelectOp modes.
*
* Fixes #102349.
*/
enum PaintMaskFloodMode {
PAINT_MASK_FLOOD_VALUE = SEL_OP_SUB,
PAINT_MASK_FLOOD_VALUE_INVERSE = SEL_OP_ADD,
PAINT_MASK_INVERT = SEL_OP_XOR,
};
static const EnumPropertyItem mode_items[] = {
{PAINT_MASK_FLOOD_VALUE,
@@ -93,7 +103,6 @@ static float mask_flood_fill_get_new_value_for_elem(const float elem,
static int mask_flood_fill_exec(bContext *C, wmOperator *op)
{
using namespace blender;
const Scene *scene = CTX_data_scene(C);
Object *ob = CTX_data_active_object(C);
Depsgraph *depsgraph = CTX_data_ensure_evaluated_depsgraph(C);
@@ -108,7 +117,7 @@ static int mask_flood_fill_exec(bContext *C, wmOperator *op)
PBVH *pbvh = ob->sculpt->pbvh;
const bool multires = (BKE_pbvh_type(pbvh) == PBVH_GRIDS);
Vector<PBVHNode *> nodes = blender::bke::pbvh::search_gather(pbvh, {});
Vector<PBVHNode *> nodes = bke::pbvh::search_gather(pbvh, {});
const SculptMaskWriteInfo mask_write = SCULPT_mask_get_for_write(ob->sculpt);
SCULPT_undo_push_begin(ob, op);
@@ -567,7 +576,7 @@ static Vector<PBVHNode *> sculpt_gesture_update_effected_nodes_by_line_plane(
frustum.planes = clip_planes;
frustum.num_planes = sgcontext->line.use_side_planes ? 3 : 1;
return sgcontext->nodes = blender::bke::pbvh::search_gather(ss->pbvh, [&](PBVHNode &node) {
return sgcontext->nodes = bke::pbvh::search_gather(ss->pbvh, [&](PBVHNode &node) {
return BKE_pbvh_node_frustum_contain_AABB(&node, &frustum);
});
}
@@ -583,7 +592,7 @@ static void sculpt_gesture_update_effected_nodes_by_clip_planes(SculptGestureCon
frustum.planes = clip_planes;
frustum.num_planes = 4;
sgcontext->nodes = blender::bke::pbvh::search_gather(ss->pbvh, [&](PBVHNode &node) {
sgcontext->nodes = bke::pbvh::search_gather(ss->pbvh, [&](PBVHNode &node) {
return BKE_pbvh_node_frustum_contain_AABB(&node, &frustum);
});
}
@@ -695,7 +704,6 @@ static void sculpt_gesture_face_set_begin(bContext *C, SculptGestureContext *sgc
static void face_set_gesture_apply_task(SculptGestureContext *sgcontext, PBVHNode *node)
{
using namespace blender;
SculptGestureFaceSetOperation *face_set_operation = (SculptGestureFaceSetOperation *)
sgcontext->operation;
SculptSession &ss = *sgcontext->ss;
@@ -759,7 +767,6 @@ static void face_set_gesture_apply_task(SculptGestureContext *sgcontext, PBVHNod
static void sculpt_gesture_face_set_apply_for_symmetry_pass(bContext * /*C*/,
SculptGestureContext *sgcontext)
{
using namespace blender;
threading::parallel_for(sgcontext->nodes.index_range(), 1, [&](const IndexRange range) {
for (const int i : range) {
face_set_gesture_apply_task(sgcontext, sgcontext->nodes[i]);
@@ -854,7 +861,6 @@ static void mask_gesture_apply_task(SculptGestureContext *sgcontext,
static void sculpt_gesture_mask_apply_for_symmetry_pass(bContext * /*C*/,
SculptGestureContext *sgcontext)
{
using namespace blender;
const SculptMaskWriteInfo mask_write = SCULPT_mask_get_for_write(sgcontext->ss);
threading::parallel_for(sgcontext->nodes.index_range(), 1, [&](const IndexRange range) {
for (const int i : range) {
@@ -1168,8 +1174,7 @@ static void sculpt_gesture_trim_geometry_generate(SculptGestureContext *sgcontex
const float(*ob_imat)[4] = vc->obact->world_to_object;
/* Write vertices coordinatesSCULPT_GESTURE_TRIM_DIFFERENCE for the front face. */
blender::MutableSpan<blender::float3> positions =
trim_operation->mesh->vert_positions_for_write();
MutableSpan<float3> positions = trim_operation->mesh->vert_positions_for_write();
float depth_point[3];
@@ -1242,8 +1247,8 @@ static void sculpt_gesture_trim_geometry_generate(SculptGestureContext *sgcontex
BLI_polyfill_calc(screen_points, tot_screen_points, 0, r_tris);
/* Write the front face triangle indices. */
blender::MutableSpan<int> face_offsets = trim_operation->mesh->face_offsets_for_write();
blender::MutableSpan<int> corner_verts = trim_operation->mesh->corner_verts_for_write();
MutableSpan<int> face_offsets = trim_operation->mesh->face_offsets_for_write();
MutableSpan<int> corner_verts = trim_operation->mesh->corner_verts_for_write();
int face_index = 0;
int loop_index = 0;
for (int i = 0; i < tot_tris_face; i++) {
@@ -1345,7 +1350,7 @@ static void sculpt_gesture_apply_trim(SculptGestureContext *sgcontext)
* we could calculate on the fly too (before calling split). */
const short ob_src_totcol = trim_mesh->totcol;
blender::Array<short> material_remap(ob_src_totcol ? ob_src_totcol : 1);
Array<short> material_remap(ob_src_totcol ? ob_src_totcol : 1);
BMFace *efa;
i = 0;
@@ -1424,7 +1429,7 @@ static void sculpt_gesture_trim_apply_for_symmetry_pass(bContext * /*C*/,
{
SculptGestureTrimOperation *trim_operation = (SculptGestureTrimOperation *)sgcontext->operation;
Mesh *trim_mesh = trim_operation->mesh;
blender::MutableSpan<blender::float3> positions = trim_mesh->vert_positions_for_write();
MutableSpan<float3> positions = trim_mesh->vert_positions_for_write();
for (int i = 0; i < trim_mesh->totvert; i++) {
flip_v3_v3(positions[i], trim_operation->true_mesh_co[i], sgcontext->symmpass);
}
@@ -1562,7 +1567,6 @@ static void sculpt_gesture_project_apply_for_symmetry_pass(bContext * /*C*/,
{
switch (sgcontext->shape_type) {
case SCULPT_GESTURE_SHAPE_LINE:
using namespace blender;
threading::parallel_for(sgcontext->nodes.index_range(), 1, [&](const IndexRange range) {
for (const int i : range) {
project_line_gesture_apply_task(sgcontext, sgcontext->nodes[i]);
@@ -1924,3 +1928,5 @@ void SCULPT_OT_project_line_gesture(wmOperatorType *ot)
WM_operator_properties_gesture_straightline(ot, WM_CURSOR_EDIT);
sculpt_gesture_operator_properties(ot);
}
} // namespace blender::ed::sculpt_paint::mask

8
source/blender/editors/sculpt_paint/paint_ops.cc
View File

@@ -1551,10 +1551,10 @@ void ED_operatortypes_paint()
WM_operatortype_append(blender::ed::sculpt_paint::hide::PAINT_OT_hide_show);
/* paint masking */
WM_operatortype_append(PAINT_OT_mask_flood_fill);
WM_operatortype_append(PAINT_OT_mask_lasso_gesture);
WM_operatortype_append(PAINT_OT_mask_box_gesture);
WM_operatortype_append(PAINT_OT_mask_line_gesture);
WM_operatortype_append(blender::ed::sculpt_paint::mask::PAINT_OT_mask_flood_fill);
WM_operatortype_append(blender::ed::sculpt_paint::mask::PAINT_OT_mask_lasso_gesture);
WM_operatortype_append(blender::ed::sculpt_paint::mask::PAINT_OT_mask_box_gesture);
WM_operatortype_append(blender::ed::sculpt_paint::mask::PAINT_OT_mask_line_gesture);
}
void ED_keymap_paint(wmKeyConfig *keyconf)

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

@@ -1552,6 +1552,8 @@ void sculpt_expand_modal_keymap(wmKeyConfig *keyconf);
/** \name Gesture Operators
* \{ */
namespace blender::ed::sculpt_paint::mask {
void SCULPT_OT_face_set_lasso_gesture(wmOperatorType *ot);
void SCULPT_OT_face_set_box_gesture(wmOperatorType *ot);
@@ -1559,6 +1561,9 @@ void SCULPT_OT_trim_lasso_gesture(wmOperatorType *ot);
void SCULPT_OT_trim_box_gesture(wmOperatorType *ot);
void SCULPT_OT_project_line_gesture(wmOperatorType *ot);
}
/** \} */
/* -------------------------------------------------------------------- */

14
source/blender/editors/sculpt_paint/sculpt_ops.cc
View File

@@ -915,7 +915,7 @@ static int sculpt_mask_by_color_invoke(bContext *C, wmOperator *op, const wmEven
MultiresModifierData *mmd = BKE_sculpt_multires_active(CTX_data_scene(C), ob);
BKE_sculpt_mask_layers_ensure(depsgraph, CTX_data_main(C), ob, mmd);
BKE_sculpt_update_object_for_edit(depsgraph, ob, false);
BKE_sculpt_update_object_for_edit(depsgraph, ob, false);
SCULPT_vertex_random_access_ensure(ss);
/* Tools that are not brushes do not have the brush gizmo to update the vertex as the mouse move,
@@ -1064,7 +1064,7 @@ static int sculpt_bake_cavity_exec(bContext *C, wmOperator *op)
MultiresModifierData *mmd = BKE_sculpt_multires_active(CTX_data_scene(C), ob);
BKE_sculpt_mask_layers_ensure(depsgraph, CTX_data_main(C), ob, mmd);
BKE_sculpt_update_object_for_edit(depsgraph, ob, false);
BKE_sculpt_update_object_for_edit(depsgraph, ob, false);
SCULPT_vertex_random_access_ensure(ss);
SCULPT_undo_push_begin(ob, op);
@@ -1283,11 +1283,11 @@ void ED_operatortypes_sculpt()
WM_operatortype_append(SCULPT_OT_face_sets_init);
WM_operatortype_append(SCULPT_OT_cloth_filter);
WM_operatortype_append(SCULPT_OT_face_sets_edit);
WM_operatortype_append(SCULPT_OT_face_set_lasso_gesture);
WM_operatortype_append(SCULPT_OT_face_set_box_gesture);
WM_operatortype_append(SCULPT_OT_trim_box_gesture);
WM_operatortype_append(SCULPT_OT_trim_lasso_gesture);
WM_operatortype_append(SCULPT_OT_project_line_gesture);
WM_operatortype_append(blender::ed::sculpt_paint::mask::SCULPT_OT_face_set_lasso_gesture);
WM_operatortype_append(blender::ed::sculpt_paint::mask::SCULPT_OT_face_set_box_gesture);
WM_operatortype_append(blender::ed::sculpt_paint::mask::SCULPT_OT_trim_box_gesture);
WM_operatortype_append(blender::ed::sculpt_paint::mask::SCULPT_OT_trim_lasso_gesture);
WM_operatortype_append(blender::ed::sculpt_paint::mask::SCULPT_OT_project_line_gesture);
WM_operatortype_append(SCULPT_OT_sample_color);
WM_operatortype_append(SCULPT_OT_color_filter);