diff options
Diffstat (limited to 'source/blender/editors/metaball/mball_edit.c')
| -rw-r--r-- | source/blender/editors/metaball/mball_edit.c | 1289 |
1 files changed, 643 insertions, 646 deletions
diff --git a/source/blender/editors/metaball/mball_edit.c b/source/blender/editors/metaball/mball_edit.c index 5ab6f9e0750..45eb66c228b 100644 --- a/source/blender/editors/metaball/mball_edit.c +++ b/source/blender/editors/metaball/mball_edit.c @@ -63,29 +63,29 @@ /* This function is used to free all MetaElems from MetaBall */ void ED_mball_editmball_free(Object *obedit) { - MetaBall *mb = (MetaBall *)obedit->data; + MetaBall *mb = (MetaBall *)obedit->data; - mb->editelems = NULL; - mb->lastelem = NULL; + mb->editelems = NULL; + mb->lastelem = NULL; } /* This function is called, when MetaBall Object is * switched from object mode to edit mode */ void ED_mball_editmball_make(Object *obedit) { - MetaBall *mb = (MetaBall *)obedit->data; - MetaElem *ml; /*, *newml;*/ + MetaBall *mb = (MetaBall *)obedit->data; + MetaElem *ml; /*, *newml;*/ - ml = mb->elems.first; + ml = mb->elems.first; - while (ml) { - if (ml->flag & SELECT) { - mb->lastelem = ml; - } - ml = ml->next; - } + while (ml) { + if (ml->flag & SELECT) { + mb->lastelem = ml; + } + ml = ml->next; + } - mb->editelems = &mb->elems; + mb->editelems = &mb->elems; } /* This function is called, when MetaBall Object switched from @@ -96,27 +96,28 @@ void ED_mball_editmball_load(Object *UNUSED(obedit)) } /* Add metaelem primitive to metaball object (which is in edit mode) */ -MetaElem *ED_mball_add_primitive(bContext *UNUSED(C), Object *obedit, float mat[4][4], float dia, int type) +MetaElem *ED_mball_add_primitive( + bContext *UNUSED(C), Object *obedit, float mat[4][4], float dia, int type) { - MetaBall *mball = (MetaBall *)obedit->data; - MetaElem *ml; - - /* Deselect all existing metaelems */ - ml = mball->editelems->first; - while (ml) { - ml->flag &= ~SELECT; - ml = ml->next; - } - - ml = BKE_mball_element_add(mball, type); - ml->rad *= dia; - mball->wiresize *= dia; - mball->rendersize *= dia; - copy_v3_v3(&ml->x, mat[3]); - - ml->flag |= SELECT; - mball->lastelem = ml; - return ml; + MetaBall *mball = (MetaBall *)obedit->data; + MetaElem *ml; + + /* Deselect all existing metaelems */ + ml = mball->editelems->first; + while (ml) { + ml->flag &= ~SELECT; + ml = ml->next; + } + + ml = BKE_mball_element_add(mball, type); + ml->rad *= dia; + mball->wiresize *= dia; + mball->rendersize *= dia; + copy_v3_v3(&ml->x, mat[3]); + + ml->flag |= SELECT; + mball->lastelem = ml; + return ml; } /***************************** Select/Deselect operator *****************************/ @@ -124,384 +125,375 @@ MetaElem *ED_mball_add_primitive(bContext *UNUSED(C), Object *obedit, float mat[ /* Select or deselect all MetaElements */ static int mball_select_all_exec(bContext *C, wmOperator *op) { - int action = RNA_enum_get(op->ptr, "action"); - - ViewLayer *view_layer = CTX_data_view_layer(C); - uint bases_len = 0; - Base **bases = BKE_view_layer_array_from_bases_in_edit_mode_unique_data(view_layer, CTX_wm_view3d(C), &bases_len); - - if (action == SEL_TOGGLE) { - action = BKE_mball_is_any_selected_multi(bases, bases_len) ? - SEL_DESELECT : - SEL_SELECT; - } - - switch (action) { - case SEL_SELECT: - BKE_mball_select_all_multi_ex(bases, bases_len); - break; - case SEL_DESELECT: - BKE_mball_deselect_all_multi_ex(bases, bases_len); - break; - case SEL_INVERT: - BKE_mball_select_swap_multi_ex(bases, bases_len); - break; - } - - for (uint base_index = 0; base_index < bases_len; base_index++) { - Object *obedit = bases[base_index]->object; - MetaBall *mb = (MetaBall *)obedit->data; - DEG_id_tag_update(&mb->id, ID_RECALC_SELECT); - WM_event_add_notifier(C, NC_GEOM | ND_SELECT, mb); - } - - MEM_freeN(bases); - - return OPERATOR_FINISHED; + int action = RNA_enum_get(op->ptr, "action"); + + ViewLayer *view_layer = CTX_data_view_layer(C); + uint bases_len = 0; + Base **bases = BKE_view_layer_array_from_bases_in_edit_mode_unique_data( + view_layer, CTX_wm_view3d(C), &bases_len); + + if (action == SEL_TOGGLE) { + action = BKE_mball_is_any_selected_multi(bases, bases_len) ? SEL_DESELECT : SEL_SELECT; + } + + switch (action) { + case SEL_SELECT: + BKE_mball_select_all_multi_ex(bases, bases_len); + break; + case SEL_DESELECT: + BKE_mball_deselect_all_multi_ex(bases, bases_len); + break; + case SEL_INVERT: + BKE_mball_select_swap_multi_ex(bases, bases_len); + break; + } + + for (uint base_index = 0; base_index < bases_len; base_index++) { + Object *obedit = bases[base_index]->object; + MetaBall *mb = (MetaBall *)obedit->data; + DEG_id_tag_update(&mb->id, ID_RECALC_SELECT); + WM_event_add_notifier(C, NC_GEOM | ND_SELECT, mb); + } + + MEM_freeN(bases); + + return OPERATOR_FINISHED; } void MBALL_OT_select_all(wmOperatorType *ot) { - /* identifiers */ - ot->name = "(De)select All"; - ot->description = "Change selection of all meta elements"; - ot->idname = "MBALL_OT_select_all"; + /* identifiers */ + ot->name = "(De)select All"; + ot->description = "Change selection of all meta elements"; + ot->idname = "MBALL_OT_select_all"; - /* callback functions */ - ot->exec = mball_select_all_exec; - ot->poll = ED_operator_editmball; + /* callback functions */ + ot->exec = mball_select_all_exec; + ot->poll = ED_operator_editmball; - /* flags */ - ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO; + /* flags */ + ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO; - WM_operator_properties_select_all(ot); + WM_operator_properties_select_all(ot); } - /* -------------------------------------------------------------------- */ /* Select Similar */ enum { - SIMMBALL_TYPE = 1, - SIMMBALL_RADIUS, - SIMMBALL_STIFFNESS, - SIMMBALL_ROTATION, + SIMMBALL_TYPE = 1, + SIMMBALL_RADIUS, + SIMMBALL_STIFFNESS, + SIMMBALL_ROTATION, }; static const EnumPropertyItem prop_similar_types[] = { - {SIMMBALL_TYPE, "TYPE", 0, "Type", ""}, - {SIMMBALL_RADIUS, "RADIUS", 0, "Radius", ""}, - {SIMMBALL_STIFFNESS, "STIFFNESS", 0, "Stiffness", ""}, - {SIMMBALL_ROTATION, "ROTATION", 0, "Rotation", ""}, - {0, NULL, 0, NULL, NULL}, + {SIMMBALL_TYPE, "TYPE", 0, "Type", ""}, + {SIMMBALL_RADIUS, "RADIUS", 0, "Radius", ""}, + {SIMMBALL_STIFFNESS, "STIFFNESS", 0, "Stiffness", ""}, + {SIMMBALL_ROTATION, "ROTATION", 0, "Rotation", ""}, + {0, NULL, 0, NULL, NULL}, }; static void mball_select_similar_type_get( - Object *obedit, MetaBall *mb, int type, - KDTree_1d *tree_1d, KDTree_3d *tree_3d) + Object *obedit, MetaBall *mb, int type, KDTree_1d *tree_1d, KDTree_3d *tree_3d) { - float tree_entry[3] = {0.0f, 0.0f, 0.0f}; - MetaElem *ml; - int tree_index = 0; - for (ml = mb->editelems->first; ml; ml = ml->next) { - if (ml->flag & SELECT) { - switch (type) { - case SIMMBALL_RADIUS: - { - float radius = ml->rad; - /* Radius in world space. */ - float smat[3][3]; - float radius_vec[3] = {radius, radius, radius}; - BKE_object_scale_to_mat3(obedit, smat); - mul_m3_v3(smat, radius_vec); - radius = (radius_vec[0] + radius_vec[1] + radius_vec[2]) / 3; - tree_entry[0] = radius; - break; - } - case SIMMBALL_STIFFNESS: - { - tree_entry[0] = ml->s; - break; - } - break; - case SIMMBALL_ROTATION: - { - float dir[3] = {1.0f, 0.0f, 0.0f}; - float rmat[3][3]; - mul_qt_v3(ml->quat, dir); - BKE_object_rot_to_mat3(obedit, rmat, true); - mul_m3_v3(rmat, dir); - copy_v3_v3(tree_entry, dir); - break; - } - } - if (tree_1d) { - BLI_kdtree_1d_insert(tree_1d, tree_index++, tree_entry); - } - else { - BLI_kdtree_3d_insert(tree_3d, tree_index++, tree_entry); - } - } - } + float tree_entry[3] = {0.0f, 0.0f, 0.0f}; + MetaElem *ml; + int tree_index = 0; + for (ml = mb->editelems->first; ml; ml = ml->next) { + if (ml->flag & SELECT) { + switch (type) { + case SIMMBALL_RADIUS: { + float radius = ml->rad; + /* Radius in world space. */ + float smat[3][3]; + float radius_vec[3] = {radius, radius, radius}; + BKE_object_scale_to_mat3(obedit, smat); + mul_m3_v3(smat, radius_vec); + radius = (radius_vec[0] + radius_vec[1] + radius_vec[2]) / 3; + tree_entry[0] = radius; + break; + } + case SIMMBALL_STIFFNESS: { + tree_entry[0] = ml->s; + break; + } break; + case SIMMBALL_ROTATION: { + float dir[3] = {1.0f, 0.0f, 0.0f}; + float rmat[3][3]; + mul_qt_v3(ml->quat, dir); + BKE_object_rot_to_mat3(obedit, rmat, true); + mul_m3_v3(rmat, dir); + copy_v3_v3(tree_entry, dir); + break; + } + } + if (tree_1d) { + BLI_kdtree_1d_insert(tree_1d, tree_index++, tree_entry); + } + else { + BLI_kdtree_3d_insert(tree_3d, tree_index++, tree_entry); + } + } + } } -static bool mball_select_similar_type( - Object *obedit, MetaBall *mb, int type, - const KDTree_1d *tree_1d, const KDTree_3d *tree_3d, - const float thresh) +static bool mball_select_similar_type(Object *obedit, + MetaBall *mb, + int type, + const KDTree_1d *tree_1d, + const KDTree_3d *tree_3d, + const float thresh) { - MetaElem *ml; - bool changed = false; - for (ml = mb->editelems->first; ml; ml = ml->next) { - bool select = false; - switch (type) { - case SIMMBALL_RADIUS: - { - float radius = ml->rad; - /* Radius in world space is the average of the - * scaled radius in x, y and z directions. */ - float smat[3][3]; - float radius_vec[3] = {radius, radius, radius}; - BKE_object_scale_to_mat3(obedit, smat); - mul_m3_v3(smat, radius_vec); - radius = (radius_vec[0] + radius_vec[1] + radius_vec[2]) / 3; - - if (ED_select_similar_compare_float_tree(tree_1d, radius, thresh, SIM_CMP_EQ)) { - select = true; - } - break; - } - case SIMMBALL_STIFFNESS: - { - float s = ml->s; - if (ED_select_similar_compare_float_tree(tree_1d, s, thresh, SIM_CMP_EQ)) { - select = true; - } - break; - } - case SIMMBALL_ROTATION: - { - float dir[3] = {1.0f, 0.0f, 0.0f}; - float rmat[3][3]; - mul_qt_v3(ml->quat, dir); - BKE_object_rot_to_mat3(obedit, rmat, true); - mul_m3_v3(rmat, dir); - - float thresh_cos = cosf(thresh * (float)M_PI_2); - - KDTreeNearest_3d nearest; - if (BLI_kdtree_3d_find_nearest(tree_3d, dir, &nearest) != -1) { - float orient = angle_normalized_v3v3(dir, nearest.co); - /* Map to 0-1 to compare orientation. */ - float delta = thresh_cos - fabsf(cosf(orient)); - if (ED_select_similar_compare_float(delta, thresh, SIM_CMP_EQ)) { - select = true; - } - } - break; - } - } - - if (select) { - changed = true; - ml->flag |= SELECT; - } - } - return changed; + MetaElem *ml; + bool changed = false; + for (ml = mb->editelems->first; ml; ml = ml->next) { + bool select = false; + switch (type) { + case SIMMBALL_RADIUS: { + float radius = ml->rad; + /* Radius in world space is the average of the + * scaled radius in x, y and z directions. */ + float smat[3][3]; + float radius_vec[3] = {radius, radius, radius}; + BKE_object_scale_to_mat3(obedit, smat); + mul_m3_v3(smat, radius_vec); + radius = (radius_vec[0] + radius_vec[1] + radius_vec[2]) / 3; + + if (ED_select_similar_compare_float_tree(tree_1d, radius, thresh, SIM_CMP_EQ)) { + select = true; + } + break; + } + case SIMMBALL_STIFFNESS: { + float s = ml->s; + if (ED_select_similar_compare_float_tree(tree_1d, s, thresh, SIM_CMP_EQ)) { + select = true; + } + break; + } + case SIMMBALL_ROTATION: { + float dir[3] = {1.0f, 0.0f, 0.0f}; + float rmat[3][3]; + mul_qt_v3(ml->quat, dir); + BKE_object_rot_to_mat3(obedit, rmat, true); + mul_m3_v3(rmat, dir); + + float thresh_cos = cosf(thresh * (float)M_PI_2); + + KDTreeNearest_3d nearest; + if (BLI_kdtree_3d_find_nearest(tree_3d, dir, &nearest) != -1) { + float orient = angle_normalized_v3v3(dir, nearest.co); + /* Map to 0-1 to compare orientation. */ + float delta = thresh_cos - fabsf(cosf(orient)); + if (ED_select_similar_compare_float(delta, thresh, SIM_CMP_EQ)) { + select = true; + } + } + break; + } + } + + if (select) { + changed = true; + ml->flag |= SELECT; + } + } + return changed; } static int mball_select_similar_exec(bContext *C, wmOperator *op) { - const int type = RNA_enum_get(op->ptr, "type"); - const float thresh = RNA_float_get(op->ptr, "threshold"); - int tot_mball_selected_all = 0; - - ViewLayer *view_layer = CTX_data_view_layer(C); - uint bases_len = 0; - Base **bases = BKE_view_layer_array_from_bases_in_edit_mode_unique_data(view_layer, CTX_wm_view3d(C), &bases_len); - - tot_mball_selected_all = BKE_mball_select_count_multi(bases, bases_len); - - short type_ref = 0; - KDTree_1d *tree_1d = NULL; - KDTree_3d *tree_3d = NULL; - - switch (type) { - case SIMMBALL_RADIUS: - case SIMMBALL_STIFFNESS: - tree_1d = BLI_kdtree_1d_new(tot_mball_selected_all); - break; - case SIMMBALL_ROTATION: - tree_3d = BLI_kdtree_3d_new(tot_mball_selected_all); - break; - } - - /* Get type of selected MetaBall */ - for (uint base_index = 0; base_index < bases_len; base_index++) { - Object *obedit = bases[base_index]->object; - MetaBall *mb = (MetaBall *)obedit->data; - - switch (type) { - case SIMMBALL_TYPE: - { - MetaElem *ml; - for (ml = mb->editelems->first; ml; ml = ml->next) { - if (ml->flag & SELECT) { - short mball_type = 1 << (ml->type + 1); - type_ref |= mball_type; - } - } - break; - } - case SIMMBALL_RADIUS: - case SIMMBALL_STIFFNESS: - case SIMMBALL_ROTATION: - mball_select_similar_type_get(obedit, mb, type, tree_1d, tree_3d); - break; - default: - BLI_assert(0); - break; - } - } - - if (tree_1d != NULL) { - BLI_kdtree_1d_deduplicate(tree_1d); - BLI_kdtree_1d_balance(tree_1d); - } - if (tree_3d != NULL) { - BLI_kdtree_3d_deduplicate(tree_3d); - BLI_kdtree_3d_balance(tree_3d); - } - /* Select MetaBalls with desired type. */ - for (uint base_index = 0; base_index < bases_len; base_index++) { - Object *obedit = bases[base_index]->object; - MetaBall *mb = (MetaBall *)obedit->data; - bool changed = false; - - switch (type) { - case SIMMBALL_TYPE: - { - MetaElem *ml; - for (ml = mb->editelems->first; ml; ml = ml->next) { - short mball_type = 1 << (ml->type + 1); - if (mball_type & type_ref) { - ml->flag |= SELECT; - changed = true; - } - } - break; - } - case SIMMBALL_RADIUS: - case SIMMBALL_STIFFNESS: - case SIMMBALL_ROTATION: - changed = mball_select_similar_type(obedit, mb, type, tree_1d, tree_3d, thresh); - break; - default: - BLI_assert(0); - break; - } - - if (changed) { - DEG_id_tag_update(&mb->id, ID_RECALC_SELECT); - WM_event_add_notifier(C, NC_GEOM | ND_SELECT, mb); - } - } - - MEM_freeN(bases); - if (tree_1d != NULL) { - BLI_kdtree_1d_free(tree_1d); - } - if (tree_3d != NULL) { - BLI_kdtree_3d_free(tree_3d); - } - return OPERATOR_FINISHED; + const int type = RNA_enum_get(op->ptr, "type"); + const float thresh = RNA_float_get(op->ptr, "threshold"); + int tot_mball_selected_all = 0; + + ViewLayer *view_layer = CTX_data_view_layer(C); + uint bases_len = 0; + Base **bases = BKE_view_layer_array_from_bases_in_edit_mode_unique_data( + view_layer, CTX_wm_view3d(C), &bases_len); + + tot_mball_selected_all = BKE_mball_select_count_multi(bases, bases_len); + + short type_ref = 0; + KDTree_1d *tree_1d = NULL; + KDTree_3d *tree_3d = NULL; + + switch (type) { + case SIMMBALL_RADIUS: + case SIMMBALL_STIFFNESS: + tree_1d = BLI_kdtree_1d_new(tot_mball_selected_all); + break; + case SIMMBALL_ROTATION: + tree_3d = BLI_kdtree_3d_new(tot_mball_selected_all); + break; + } + + /* Get type of selected MetaBall */ + for (uint base_index = 0; base_index < bases_len; base_index++) { + Object *obedit = bases[base_index]->object; + MetaBall *mb = (MetaBall *)obedit->data; + + switch (type) { + case SIMMBALL_TYPE: { + MetaElem *ml; + for (ml = mb->editelems->first; ml; ml = ml->next) { + if (ml->flag & SELECT) { + short mball_type = 1 << (ml->type + 1); + type_ref |= mball_type; + } + } + break; + } + case SIMMBALL_RADIUS: + case SIMMBALL_STIFFNESS: + case SIMMBALL_ROTATION: + mball_select_similar_type_get(obedit, mb, type, tree_1d, tree_3d); + break; + default: + BLI_assert(0); + break; + } + } + + if (tree_1d != NULL) { + BLI_kdtree_1d_deduplicate(tree_1d); + BLI_kdtree_1d_balance(tree_1d); + } + if (tree_3d != NULL) { + BLI_kdtree_3d_deduplicate(tree_3d); + BLI_kdtree_3d_balance(tree_3d); + } + /* Select MetaBalls with desired type. */ + for (uint base_index = 0; base_index < bases_len; base_index++) { + Object *obedit = bases[base_index]->object; + MetaBall *mb = (MetaBall *)obedit->data; + bool changed = false; + + switch (type) { + case SIMMBALL_TYPE: { + MetaElem *ml; + for (ml = mb->editelems->first; ml; ml = ml->next) { + short mball_type = 1 << (ml->type + 1); + if (mball_type & type_ref) { + ml->flag |= SELECT; + changed = true; + } + } + break; + } + case SIMMBALL_RADIUS: + case SIMMBALL_STIFFNESS: + case SIMMBALL_ROTATION: + changed = mball_select_similar_type(obedit, mb, type, tree_1d, tree_3d, thresh); + break; + default: + BLI_assert(0); + break; + } + + if (changed) { + DEG_id_tag_update(&mb->id, ID_RECALC_SELECT); + WM_event_add_notifier(C, NC_GEOM | ND_SELECT, mb); + } + } + + MEM_freeN(bases); + if (tree_1d != NULL) { + BLI_kdtree_1d_free(tree_1d); + } + if (tree_3d != NULL) { + BLI_kdtree_3d_free(tree_3d); + } + return OPERATOR_FINISHED; } void MBALL_OT_select_similar(wmOperatorType *ot) { - /* identifiers */ - ot->name = "Select Similar"; - ot->idname = "MBALL_OT_select_similar"; + /* identifiers */ + ot->name = "Select Similar"; + ot->idname = "MBALL_OT_select_similar"; - /* callback functions */ - ot->invoke = WM_menu_invoke; - ot->exec = mball_select_similar_exec; - ot->poll = ED_operator_editmball; - ot->description = "Select similar metaballs by property types"; + /* callback functions */ + ot->invoke = WM_menu_invoke; + ot->exec = mball_select_similar_exec; + ot->poll = ED_operator_editmball; + ot->description = "Select similar metaballs by property types"; - /* flags */ - ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO; + /* flags */ + ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO; - /* properties */ - ot->prop = RNA_def_enum(ot->srna, "type", prop_similar_types, 0, "Type", ""); + /* properties */ + ot->prop = RNA_def_enum(ot->srna, "type", prop_similar_types, 0, "Type", ""); - RNA_def_float(ot->srna, "threshold", 0.1, 0.0, FLT_MAX, "Threshold", "", 0.01, 1.0); + RNA_def_float(ot->srna, "threshold", 0.1, 0.0, FLT_MAX, "Threshold", "", 0.01, 1.0); } - /***************************** Select random operator *****************************/ /* Random metaball selection */ static int select_random_metaelems_exec(bContext *C, wmOperator *op) { - const bool select = (RNA_enum_get(op->ptr, "action") == SEL_SELECT); - const float randfac = RNA_float_get(op->ptr, "percent") / 100.0f; - const int seed = WM_operator_properties_select_random_seed_increment_get(op); - - ViewLayer *view_layer = CTX_data_view_layer(C); - uint objects_len = 0; - Object **objects = BKE_view_layer_array_from_objects_in_edit_mode_unique_data(view_layer, CTX_wm_view3d(C), &objects_len); - for (uint ob_index = 0; ob_index < objects_len; ob_index++) { - Object *obedit = objects[ob_index]; - MetaBall *mb = (MetaBall *)obedit->data; - if (!BKE_mball_is_any_unselected(mb)) { - continue; - } - int seed_iter = seed; - - /* This gives a consistent result regardless of object order. */ - if (ob_index) { - seed_iter += BLI_ghashutil_strhash_p(obedit->id.name); - } - - RNG *rng = BLI_rng_new_srandom(seed_iter); - - for (MetaElem *ml = mb->editelems->first; ml; ml = ml->next) { - if (BLI_rng_get_float(rng) < randfac) { - if (select) { - ml->flag |= SELECT; - } - else { - ml->flag &= ~SELECT; - } - } - } - - BLI_rng_free(rng); - - DEG_id_tag_update(&mb->id, ID_RECALC_SELECT); - WM_event_add_notifier(C, NC_GEOM | ND_SELECT, mb); - } - MEM_freeN(objects); - return OPERATOR_FINISHED; + const bool select = (RNA_enum_get(op->ptr, "action") == SEL_SELECT); + const float randfac = RNA_float_get(op->ptr, "percent") / 100.0f; + const int seed = WM_operator_properties_select_random_seed_increment_get(op); + + ViewLayer *view_layer = CTX_data_view_layer(C); + uint objects_len = 0; + Object **objects = BKE_view_layer_array_from_objects_in_edit_mode_unique_data( + view_layer, CTX_wm_view3d(C), &objects_len); + for (uint ob_index = 0; ob_index < objects_len; ob_index++) { + Object *obedit = objects[ob_index]; + MetaBall *mb = (MetaBall *)obedit->data; + if (!BKE_mball_is_any_unselected(mb)) { + continue; + } + int seed_iter = seed; + + /* This gives a consistent result regardless of object order. */ + if (ob_index) { + seed_iter += BLI_ghashutil_strhash_p(obedit->id.name); + } + + RNG *rng = BLI_rng_new_srandom(seed_iter); + + for (MetaElem *ml = mb->editelems->first; ml; ml = ml->next) { + if (BLI_rng_get_float(rng) < randfac) { + if (select) { + ml->flag |= SELECT; + } + else { + ml->flag &= ~SELECT; + } + } + } + + BLI_rng_free(rng); + + DEG_id_tag_update(&mb->id, ID_RECALC_SELECT); + WM_event_add_notifier(C, NC_GEOM | ND_SELECT, mb); + } + MEM_freeN(objects); + return OPERATOR_FINISHED; } void MBALL_OT_select_random_metaelems(struct wmOperatorType *ot) { - /* identifiers */ - ot->name = "Select Random"; - ot->description = "Randomly select metaelements"; - ot->idname = "MBALL_OT_select_random_metaelems"; + /* identifiers */ + ot->name = "Select Random"; + ot->description = "Randomly select metaelements"; + ot->idname = "MBALL_OT_select_random_metaelems"; - /* callback functions */ - ot->exec = select_random_metaelems_exec; - ot->poll = ED_operator_editmball; + /* callback functions */ + ot->exec = select_random_metaelems_exec; + ot->poll = ED_operator_editmball; - /* flags */ - ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO; + /* flags */ + ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO; - /* properties */ - WM_operator_properties_select_random(ot); + /* properties */ + WM_operator_properties_select_random(ot); } /***************************** Duplicate operator *****************************/ @@ -509,50 +501,51 @@ void MBALL_OT_select_random_metaelems(struct wmOperatorType *ot) /* Duplicate selected MetaElements */ static int duplicate_metaelems_exec(bContext *C, wmOperator *UNUSED(op)) { - ViewLayer *view_layer = CTX_data_view_layer(C); - uint objects_len = 0; - Object **objects = BKE_view_layer_array_from_objects_in_edit_mode_unique_data(view_layer, CTX_wm_view3d(C), &objects_len); - for (uint ob_index = 0; ob_index < objects_len; ob_index++) { - Object *obedit = objects[ob_index]; - MetaBall *mb = (MetaBall *)obedit->data; - MetaElem *ml, *newml; - - if (!BKE_mball_is_any_selected(mb)) { - continue; - } - - ml = mb->editelems->last; - if (ml) { - while (ml) { - if (ml->flag & SELECT) { - newml = MEM_dupallocN(ml); - BLI_addtail(mb->editelems, newml); - mb->lastelem = newml; - ml->flag &= ~SELECT; - } - ml = ml->prev; - } - WM_event_add_notifier(C, NC_GEOM | ND_DATA, mb); - DEG_id_tag_update(obedit->data, 0); - } - } - MEM_freeN(objects); - return OPERATOR_FINISHED; + ViewLayer *view_layer = CTX_data_view_layer(C); + uint objects_len = 0; + Object **objects = BKE_view_layer_array_from_objects_in_edit_mode_unique_data( + view_layer, CTX_wm_view3d(C), &objects_len); + for (uint ob_index = 0; ob_index < objects_len; ob_index++) { + Object *obedit = objects[ob_index]; + MetaBall *mb = (MetaBall *)obedit->data; + MetaElem *ml, *newml; + + if (!BKE_mball_is_any_selected(mb)) { + continue; + } + + ml = mb->editelems->last; + if (ml) { + while (ml) { + if (ml->flag & SELECT) { + newml = MEM_dupallocN(ml); + BLI_addtail(mb->editelems, newml); + mb->lastelem = newml; + ml->flag &= ~SELECT; + } + ml = ml->prev; + } + WM_event_add_notifier(C, NC_GEOM | ND_DATA, mb); + DEG_id_tag_update(obedit->data, 0); + } + } + MEM_freeN(objects); + return OPERATOR_FINISHED; } void MBALL_OT_duplicate_metaelems(wmOperatorType *ot) { - /* identifiers */ - ot->name = "Duplicate Metaelements"; - ot->description = "Duplicate selected metaelement(s)"; - ot->idname = "MBALL_OT_duplicate_metaelems"; + /* identifiers */ + ot->name = "Duplicate Metaelements"; + ot->description = "Duplicate selected metaelement(s)"; + ot->idname = "MBALL_OT_duplicate_metaelems"; - /* callback functions */ - ot->exec = duplicate_metaelems_exec; - ot->poll = ED_operator_editmball; + /* callback functions */ + ot->exec = duplicate_metaelems_exec; + ot->poll = ED_operator_editmball; - /* flags */ - ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO; + /* flags */ + ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO; } /***************************** Delete operator *****************************/ @@ -560,53 +553,54 @@ void MBALL_OT_duplicate_metaelems(wmOperatorType *ot) /* Delete all selected MetaElems (not MetaBall) */ static int delete_metaelems_exec(bContext *C, wmOperator *UNUSED(op)) { - ViewLayer *view_layer = CTX_data_view_layer(C); - uint objects_len = 0; - Object **objects = BKE_view_layer_array_from_objects_in_edit_mode_unique_data(view_layer, CTX_wm_view3d(C), &objects_len); - for (uint ob_index = 0; ob_index < objects_len; ob_index++) { - Object *obedit = objects[ob_index]; - MetaBall *mb = (MetaBall *)obedit->data; - MetaElem *ml, *next; - - if (!BKE_mball_is_any_selected(mb)) { - continue; - } - - ml = mb->editelems->first; - if (ml) { - while (ml) { - next = ml->next; - if (ml->flag & SELECT) { - if (mb->lastelem == ml) { - mb->lastelem = NULL; - } - BLI_remlink(mb->editelems, ml); - MEM_freeN(ml); - } - ml = next; - } - WM_event_add_notifier(C, NC_GEOM | ND_DATA, mb); - DEG_id_tag_update(obedit->data, 0); - } - } - MEM_freeN(objects); - return OPERATOR_FINISHED; + ViewLayer *view_layer = CTX_data_view_layer(C); + uint objects_len = 0; + Object **objects = BKE_view_layer_array_from_objects_in_edit_mode_unique_data( + view_layer, CTX_wm_view3d(C), &objects_len); + for (uint ob_index = 0; ob_index < objects_len; ob_index++) { + Object *obedit = objects[ob_index]; + MetaBall *mb = (MetaBall *)obedit->data; + MetaElem *ml, *next; + + if (!BKE_mball_is_any_selected(mb)) { + continue; + } + + ml = mb->editelems->first; + if (ml) { + while (ml) { + next = ml->next; + if (ml->flag & SELECT) { + if (mb->lastelem == ml) { + mb->lastelem = NULL; + } + BLI_remlink(mb->editelems, ml); + MEM_freeN(ml); + } + ml = next; + } + WM_event_add_notifier(C, NC_GEOM | ND_DATA, mb); + DEG_id_tag_update(obedit->data, 0); + } + } + MEM_freeN(objects); + return OPERATOR_FINISHED; } void MBALL_OT_delete_metaelems(wmOperatorType *ot) { - /* identifiers */ - ot->name = "Delete"; - ot->description = "Delete selected metaelement(s)"; - ot->idname = "MBALL_OT_delete_metaelems"; - - /* callback functions */ - ot->invoke = WM_operator_confirm; - ot->exec = delete_metaelems_exec; - ot->poll = ED_operator_editmball; - - /* flags */ - ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO; + /* identifiers */ + ot->name = "Delete"; + ot->description = "Delete selected metaelement(s)"; + ot->idname = "MBALL_OT_delete_metaelems"; + + /* callback functions */ + ot->invoke = WM_operator_confirm; + ot->exec = delete_metaelems_exec; + ot->poll = ED_operator_editmball; + + /* flags */ + ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO; } /***************************** Hide operator *****************************/ @@ -614,43 +608,44 @@ void MBALL_OT_delete_metaelems(wmOperatorType *ot) /* Hide selected MetaElems */ static int hide_metaelems_exec(bContext *C, wmOperator *op) { - Object *obedit = CTX_data_edit_object(C); - MetaBall *mb = (MetaBall *)obedit->data; - MetaElem *ml; - const bool invert = RNA_boolean_get(op->ptr, "unselected") ? SELECT : 0; - - ml = mb->editelems->first; - - if (ml) { - while (ml) { - if ((ml->flag & SELECT) != invert) { - ml->flag |= MB_HIDE; - } - ml = ml->next; - } - WM_event_add_notifier(C, NC_GEOM | ND_DATA, mb); - DEG_id_tag_update(obedit->data, 0); - } - - return OPERATOR_FINISHED; + Object *obedit = CTX_data_edit_object(C); + MetaBall *mb = (MetaBall *)obedit->data; + MetaElem *ml; + const bool invert = RNA_boolean_get(op->ptr, "unselected") ? SELECT : 0; + + ml = mb->editelems->first; + + if (ml) { + while (ml) { + if ((ml->flag & SELECT) != invert) { + ml->flag |= MB_HIDE; + } + ml = ml->next; + } + WM_event_add_notifier(C, NC_GEOM | ND_DATA, mb); + DEG_id_tag_update(obedit->data, 0); + } + + return OPERATOR_FINISHED; } void MBALL_OT_hide_metaelems(wmOperatorType *ot) { - /* identifiers */ - ot->name = "Hide Selected"; - ot->description = "Hide (un)selected metaelement(s)"; - ot->idname = "MBALL_OT_hide_metaelems"; + /* identifiers */ + ot->name = "Hide Selected"; + ot->description = "Hide (un)selected metaelement(s)"; + ot->idname = "MBALL_OT_hide_metaelems"; - /* callback functions */ - ot->exec = hide_metaelems_exec; - ot->poll = ED_operator_editmball; + /* callback functions */ + ot->exec = hide_metaelems_exec; + ot->poll = ED_operator_editmball; - /* flags */ - ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO; + /* flags */ + ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO; - /* props */ - RNA_def_boolean(ot->srna, "unselected", false, "Unselected", "Hide unselected rather than selected"); + /* props */ + RNA_def_boolean( + ot->srna, "unselected", false, "Unselected", "Hide unselected rather than selected"); } /***************************** Unhide operator *****************************/ @@ -658,194 +653,196 @@ void MBALL_OT_hide_metaelems(wmOperatorType *ot) /* Unhide all edited MetaElems */ static int reveal_metaelems_exec(bContext *C, wmOperator *op) { - Object *obedit = CTX_data_edit_object(C); - MetaBall *mb = (MetaBall *)obedit->data; - const bool select = RNA_boolean_get(op->ptr, "select"); - bool changed = false; - - for (MetaElem *ml = mb->editelems->first; ml; ml = ml->next) { - if (ml->flag & MB_HIDE) { - SET_FLAG_FROM_TEST(ml->flag, select, SELECT); - ml->flag &= ~MB_HIDE; - changed = true; - } - } - if (changed) { - WM_event_add_notifier(C, NC_GEOM | ND_DATA, mb); - DEG_id_tag_update(obedit->data, 0); - } - - return OPERATOR_FINISHED; + Object *obedit = CTX_data_edit_object(C); + MetaBall *mb = (MetaBall *)obedit->data; + const bool select = RNA_boolean_get(op->ptr, "select"); + bool changed = false; + + for (MetaElem *ml = mb->editelems->first; ml; ml = ml->next) { + if (ml->flag & MB_HIDE) { + SET_FLAG_FROM_TEST(ml->flag, select, SELECT); + ml->flag &= ~MB_HIDE; + changed = true; + } + } + if (changed) { + WM_event_add_notifier(C, NC_GEOM | ND_DATA, mb); + DEG_id_tag_update(obedit->data, 0); + } + + return OPERATOR_FINISHED; } void MBALL_OT_reveal_metaelems(wmOperatorType *ot) { - /* identifiers */ - ot->name = "Reveal Hidden"; - ot->description = "Reveal all hidden metaelements"; - ot->idname = "MBALL_OT_reveal_metaelems"; + /* identifiers */ + ot->name = "Reveal Hidden"; + ot->description = "Reveal all hidden metaelements"; + ot->idname = "MBALL_OT_reveal_metaelems"; - /* callback functions */ - ot->exec = reveal_metaelems_exec; - ot->poll = ED_operator_editmball; + /* callback functions */ + ot->exec = reveal_metaelems_exec; + ot->poll = ED_operator_editmball; - /* flags */ - ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO; + /* flags */ + ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO; - /* props */ - RNA_def_boolean(ot->srna, "select", true, "Select", ""); + /* props */ + RNA_def_boolean(ot->srna, "select", true, "Select", ""); } /* Select MetaElement with mouse click (user can select radius circle or * stiffness circle) */ bool ED_mball_select_pick(bContext *C, const int mval[2], bool extend, bool deselect, bool toggle) { - static MetaElem *startelem = NULL; - ViewContext vc; - int a, hits; - unsigned int buffer[MAXPICKBUF]; - rcti rect; - - ED_view3d_viewcontext_init(C, &vc); - - BLI_rcti_init_pt_radius(&rect, mval, 12); - - hits = view3d_opengl_select( - &vc, buffer, MAXPICKBUF, &rect, - VIEW3D_SELECT_PICK_NEAREST, VIEW3D_SELECT_FILTER_NOP); - - FOREACH_BASE_IN_EDIT_MODE_BEGIN (vc.view_layer, vc.v3d, base) { - ED_view3d_viewcontext_init_object(&vc, base->object); - MetaBall *mb = (MetaBall *)base->object->data; - MetaElem *ml, *ml_act = NULL; - - /* does startelem exist? */ - ml = mb->editelems->first; - while (ml) { - if (ml == startelem) { - break; - } - ml = ml->next; - } - - if (ml == NULL) { - startelem = mb->editelems->first; - } - - if (hits > 0) { - int metaelem_id = 0; - ml = startelem; - while (ml) { - for (a = 0; a < hits; a++) { - int hitresult = buffer[(4 * a) + 3]; - if (hitresult == -1) { - continue; - } - else if (hitresult & MBALL_NOSEL) { - continue; - } - - const uint hit_object = hitresult & 0xFFFF; - if (vc.obedit->select_id != hit_object) { - continue; - } - - if (metaelem_id != (hitresult & 0xFFFF0000 & ~(MBALLSEL_ANY))) { - continue; - } - - if (hitresult & MBALLSEL_RADIUS) { - ml->flag |= MB_SCALE_RAD; - ml_act = ml; - break; - } - - if (hitresult & MBALLSEL_STIFF) { - ml->flag &= ~MB_SCALE_RAD; - ml_act = ml; - break; - } - } - - if (ml_act) { - break; - } - ml = ml->next; - if (ml == NULL) { - ml = mb->editelems->first; - } - if (ml == startelem) { - break; - } - - metaelem_id += 0x10000; - } - - /* When some metaelem was found, then it is necessary to select or deselect it. */ - if (ml_act) { - if (!extend && !deselect && !toggle) { - uint objects_len; - Object **objects = BKE_view_layer_array_from_objects_in_edit_mode_unique_data(vc.view_layer, vc.v3d, &objects_len); - for (uint ob_index = 0; ob_index < objects_len; ob_index++) { - Object *ob_iter = objects[ob_index]; - - if (ob_iter == base->object) { - continue; - } - - BKE_mball_deselect_all((MetaBall *)ob_iter->data); - DEG_id_tag_update(ob_iter->data, ID_RECALC_SELECT); - WM_event_add_notifier(C, NC_GEOM | ND_SELECT, ob_iter->data); - } - MEM_freeN(objects); - } - - if (extend) { - ml_act->flag |= SELECT; - } - else if (deselect) { - ml_act->flag &= ~SELECT; - } - else if (toggle) { - if (ml_act->flag & SELECT) { - ml_act->flag &= ~SELECT; - } - else { - ml_act->flag |= SELECT; - } - } - else { - /* Deselect all existing metaelems */ - BKE_mball_deselect_all(mb); - - /* Select only metaelem clicked on */ - ml_act->flag |= SELECT; - } - - mb->lastelem = ml_act; - - DEG_id_tag_update(&mb->id, ID_RECALC_SELECT); - WM_event_add_notifier(C, NC_GEOM | ND_SELECT, mb); - - if (vc.view_layer->basact != base) { - ED_object_base_activate(C, base); - } - - return true; - } - } - } FOREACH_BASE_IN_EDIT_MODE_END; - - return false; + static MetaElem *startelem = NULL; + ViewContext vc; + int a, hits; + unsigned int buffer[MAXPICKBUF]; + rcti rect; + + ED_view3d_viewcontext_init(C, &vc); + + BLI_rcti_init_pt_radius(&rect, mval, 12); + + hits = view3d_opengl_select( + &vc, buffer, MAXPICKBUF, &rect, VIEW3D_SELECT_PICK_NEAREST, VIEW3D_SELECT_FILTER_NOP); + + FOREACH_BASE_IN_EDIT_MODE_BEGIN (vc.view_layer, vc.v3d, base) { + ED_view3d_viewcontext_init_object(&vc, base->object); + MetaBall *mb = (MetaBall *)base->object->data; + MetaElem *ml, *ml_act = NULL; + + /* does startelem exist? */ + ml = mb->editelems->first; + while (ml) { + if (ml == startelem) { + break; + } + ml = ml->next; + } + + if (ml == NULL) { + startelem = mb->editelems->first; + } + + if (hits > 0) { + int metaelem_id = 0; + ml = startelem; + while (ml) { + for (a = 0; a < hits; a++) { + int hitresult = buffer[(4 * a) + 3]; + if (hitresult == -1) { + continue; + } + else if (hitresult & MBALL_NOSEL) { + continue; + } + + const uint hit_object = hitresult & 0xFFFF; + if (vc.obedit->select_id != hit_object) { + continue; + } + + if (metaelem_id != (hitresult & 0xFFFF0000 & ~(MBALLSEL_ANY))) { + continue; + } + + if (hitresult & MBALLSEL_RADIUS) { + ml->flag |= MB_SCALE_RAD; + ml_act = ml; + break; + } + + if (hitresult & MBALLSEL_STIFF) { + ml->flag &= ~MB_SCALE_RAD; + ml_act = ml; + break; + } + } + + if (ml_act) { + break; + } + ml = ml->next; + if (ml == NULL) { + ml = mb->editelems->first; + } + if (ml == startelem) { + break; + } + + metaelem_id += 0x10000; + } + + /* When some metaelem was found, then it is necessary to select or deselect it. */ + if (ml_act) { + if (!extend && !deselect && !toggle) { + uint objects_len; + Object **objects = BKE_view_layer_array_from_objects_in_edit_mode_unique_data( + vc.view_layer, vc.v3d, &objects_len); + for (uint ob_index = 0; ob_index < objects_len; ob_index++) { + Object *ob_iter = objects[ob_index]; + + if (ob_iter == base->object) { + continue; + } + + BKE_mball_deselect_all((MetaBall *)ob_iter->data); + DEG_id_tag_update(ob_iter->data, ID_RECALC_SELECT); + WM_event_add_notifier(C, NC_GEOM | ND_SELECT, ob_iter->data); + } + MEM_freeN(objects); + } + + if (extend) { + ml_act->flag |= SELECT; + } + else if (deselect) { + ml_act->flag &= ~SELECT; + } + else if (toggle) { + if (ml_act->flag & SELECT) { + ml_act->flag &= ~SELECT; + } + else { + ml_act->flag |= SELECT; + } + } + else { + /* Deselect all existing metaelems */ + BKE_mball_deselect_all(mb); + + /* Select only metaelem clicked on */ + ml_act->flag |= SELECT; + } + + mb->lastelem = ml_act; + + DEG_id_tag_update(&mb->id, ID_RECALC_SELECT); + WM_event_add_notifier(C, NC_GEOM | ND_SELECT, mb); + + if (vc.view_layer->basact != base) { + ED_object_base_activate(C, base); + } + + return true; + } + } + } + FOREACH_BASE_IN_EDIT_MODE_END; + + return false; } bool ED_mball_deselect_all_multi(bContext *C) { - ViewContext vc; - ED_view3d_viewcontext_init(C, &vc); - uint bases_len = 0; - Base **bases = BKE_view_layer_array_from_bases_in_edit_mode_unique_data(vc.view_layer, vc.v3d, &bases_len); - bool changed_multi = BKE_mball_deselect_all_multi_ex(bases, bases_len); - MEM_freeN(bases); - return changed_multi; + ViewContext vc; + ED_view3d_viewcontext_init(C, &vc); + uint bases_len = 0; + Base **bases = BKE_view_layer_array_from_bases_in_edit_mode_unique_data( + vc.view_layer, vc.v3d, &bases_len); + bool changed_multi = BKE_mball_deselect_all_multi_ex(bases, bases_len); + MEM_freeN(bases); + return changed_multi; } |