blender
/
blender
136
406
Fork 589
Code Issues 6.3k Pull Requests 766 Projects 19 Wiki Activity

Curves: Add box selection #104411

Merged
Falk David merged 5 commits from filedescriptor/blender:curves-mouse-selection into main 2023-02-09 15:53:44 +01:00
Conversation 1 Commits 5 Files Changed 4 +23 -43
1 changed files with 23 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 9ed9ae3e86 - Show all commits

66
source/blender/editors/curves/intern/curves_selection.cc
View File

@ -286,6 +286,25 @@ void select_random(bke::CurvesGeometry &curves,
selection.finish();
}
template<typename T>
filedescriptor marked this conversation as resolved
Hans Goudey commented 2023-02-09 14:42:30 +01:00
Review
Copy Link

Theoretically this function could return whether the value was changed. Maybe a premature optimization though..

Theoretically this function could return whether the value was changed. Maybe a premature optimization though..
static void apply_selection_operation(MutableSpan<T> selection, int index, eSelectOp sel_op)
filedescriptor marked this conversation as resolved
Hans Goudey commented 2023-02-09 14:34:47 +01:00
Review
Copy Link

const int index, const eSelectOp sel_op just for consistency.

`const int index, const eSelectOp sel_op` just for consistency.
{
switch (sel_op) {
case SEL_OP_ADD:
case SEL_OP_SET:
selection[index] = T(1);
break;
case SEL_OP_SUB:
selection[index] = T(0);
break;
case SEL_OP_XOR:
selection[index] = T(1 - selection[index]);
break;
default:
break;
}
}
/**
* Helper struct for `find_closest_point_to_screen_co`.
*/
@ -400,20 +419,7 @@ bool select_pick(const ViewContext &vc,
}
else {
MutableSpan<T> selection_typed = selection.span.typed<T>();
switch (params.sel_op) {
case SEL_OP_ADD:
case SEL_OP_SET:
selection_typed[elem_index] = T(1);
break;
case SEL_OP_SUB:
selection_typed[elem_index] = T(0);
break;
case SEL_OP_XOR:
selection_typed[elem_index] = T(1 - selection_typed[elem_index]);
break;
default:
break;
}
apply_selection_operation(selection_typed, elem_index, params.sel_op);
}
});
selection.finish();
@ -463,20 +469,7 @@ bool select_box(const ViewContext &vc,
float2 pos_proj;
ED_view3d_project_float_v2_m4(vc.region, pos, pos_proj, projection.ptr());
if (BLI_rctf_isect_pt_v(&rectf, pos_proj)) {
switch (sel_op) {
case SEL_OP_ADD:
case SEL_OP_SET:
selection_typed[point_i] = T(1);
break;
case SEL_OP_SUB:
selection_typed[point_i] = T(0);
break;
case SEL_OP_XOR:
selection_typed[point_i] = T(1 - selection_typed[point_i]);
break;
default:
break;
}
apply_selection_operation(selection_typed, point_i, sel_op);
changed = true;
}
}
@ -492,22 +485,9 @@ bool select_box(const ViewContext &vc,
float2 pos_proj;
ED_view3d_project_float_v2_m4(vc.region, pos, pos_proj, projection.ptr());
if (BLI_rctf_isect_pt_v(&rectf, pos_proj)) {
switch (sel_op) {
case SEL_OP_ADD:
case SEL_OP_SET:
selection_typed[curve_i] = T(1);
break;
case SEL_OP_SUB:
selection_typed[curve_i] = T(0);
break;
case SEL_OP_XOR:
selection_typed[curve_i] = T(1 - selection_typed[curve_i]);
break;
default:
break;
}
break;
apply_selection_operation(selection_typed, curve_i, sel_op);
changed = true;
break;
}
}
}