[Bf-blender-cvs] [5f8d3694958] blender2.8: Multi-Objects: MBALL_OT_select_similar
Habib Gahbiche
noreply at git.blender.org
Wed Nov 7 03:15:58 CET 2018
Commit: 5f8d3694958a8ff8ea08d5df60155dfa5796e1fa
Author: Habib Gahbiche
Date: Tue Nov 6 23:36:50 2018 -0200
Branches: blender2.8
https://developer.blender.org/rB5f8d3694958a8ff8ea08d5df60155dfa5796e1fa
Multi-Objects: MBALL_OT_select_similar
Compared to previous implementation, the following has been changed:
* Threshold: is now an absolute value. This allows a comparison with e.g. radii
that are much larger than selected radius. This is also consistent with
`CURVE_OT_select_similar`
* Radius in world space is the average of the radius scaled in x, y and z
directions
* Since MetaBalls are symmetrical, rotation is only considered from 0 to π/2.
So for example rotations of 90° and -90° are considered equal.
This is also consistent with the way `CURVE_OT_select_similar` works.
Fix/changes from committer (Dalai Felinto):
* Drawing not updating after changes. (see original patch for details).
Reviewers: dfelinto
Differential Revision: https://developer.blender.org/D3895
===================================================================
M source/blender/blenkernel/BKE_mball.h
M source/blender/blenkernel/intern/mball.c
M source/blender/editors/metaball/mball_edit.c
===================================================================
diff --git a/source/blender/blenkernel/BKE_mball.h b/source/blender/blenkernel/BKE_mball.h
index ae86d978cb7..c09d3f3fba1 100644
--- a/source/blender/blenkernel/BKE_mball.h
+++ b/source/blender/blenkernel/BKE_mball.h
@@ -71,6 +71,8 @@ void BKE_mball_translate(struct MetaBall *mb, const float offset[3]);
struct MetaElem *BKE_mball_element_add(struct MetaBall *mb, const int type);
+int BKE_mball_select_count(struct MetaBall *mb);
+int BKE_mball_select_count_multi(struct Object **objects, int objects_len);
void BKE_mball_select_all(struct MetaBall *mb);
void BKE_mball_select_all_multi(struct Object **objects, int objects_len);
void BKE_mball_deselect_all(struct MetaBall *mb);
diff --git a/source/blender/blenkernel/intern/mball.c b/source/blender/blenkernel/intern/mball.c
index 5b1accd955d..4c634ed9140 100644
--- a/source/blender/blenkernel/intern/mball.c
+++ b/source/blender/blenkernel/intern/mball.c
@@ -561,6 +561,29 @@ void BKE_mball_translate(MetaBall *mb, const float offset[3])
}
/* *** select funcs *** */
+int BKE_mball_select_count(struct MetaBall *mb) {
+ int sel = 0;
+ MetaElem *ml;
+
+ for (ml = mb->editelems->first; ml; ml = ml->next) {
+ if (ml->flag & SELECT) {
+ sel++;
+ }
+ }
+ return sel;
+}
+
+int BKE_mball_select_count_multi(Object **objects, int objects_len) {
+
+ int sel = 0;
+ for (uint ob_index = 0; ob_index < objects_len; ob_index++) {
+ Object *obedit = objects[ob_index];
+ MetaBall *mb = (MetaBall *)obedit->data;
+ sel += BKE_mball_select_count(mb);
+ }
+ return sel;
+}
+
void BKE_mball_select_all(struct MetaBall *mb)
{
MetaElem *ml;
diff --git a/source/blender/editors/metaball/mball_edit.c b/source/blender/editors/metaball/mball_edit.c
index b959ff80024..77f991b4295 100644
--- a/source/blender/editors/metaball/mball_edit.c
+++ b/source/blender/editors/metaball/mball_edit.c
@@ -38,6 +38,7 @@
#include "BLI_math.h"
#include "BLI_rand.h"
#include "BLI_utildefines.h"
+#include "BLI_kdtree.h"
#include "DNA_defs.h"
#include "DNA_meta_types.h"
@@ -50,6 +51,7 @@
#include "BKE_context.h"
#include "BKE_mball.h"
#include "BKE_layer.h"
+#include "BKE_object.h"
#include "DEG_depsgraph.h"
@@ -197,150 +199,199 @@ static const EnumPropertyItem prop_similar_types[] = {
{0, NULL, 0, NULL, NULL}
};
-static bool mball_select_similar_type(MetaBall *mb)
+static void mball_select_similar_type_get(Object *obedit, MetaBall *mb, int type, KDTree *r_tree)
{
+ float tree_entry[3] = {0.0f, 0.0f, 0.0f};
MetaElem *ml;
- bool changed = false;
-
+ int tree_index = 0;
for (ml = mb->editelems->first; ml; ml = ml->next) {
if (ml->flag & SELECT) {
- MetaElem *ml_iter;
-
- for (ml_iter = mb->editelems->first; ml_iter; ml_iter = ml_iter->next) {
- if ((ml_iter->flag & SELECT) == 0) {
- if (ml->type == ml_iter->type) {
- ml_iter->flag |= SELECT;
- changed = true;
- }
+ 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;
}
}
+ BLI_kdtree_insert(r_tree, tree_index++, tree_entry);
}
}
-
- return changed;
}
-static bool mball_select_similar_radius(MetaBall *mb, const float thresh)
+static bool mball_select_similar_type(Object *obedit, MetaBall *mb, int type, const KDTree *tree, const float thresh)
{
MetaElem *ml;
bool changed = false;
-
for (ml = mb->editelems->first; ml; ml = ml->next) {
- if (ml->flag & SELECT) {
- MetaElem *ml_iter;
-
- for (ml_iter = mb->editelems->first; ml_iter; ml_iter = ml_iter->next) {
- if ((ml_iter->flag & SELECT) == 0) {
- if (fabsf(ml_iter->rad - ml->rad) <= (thresh * ml->rad)) {
- ml_iter->flag |= SELECT;
- changed = true;
+ 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, radius, thresh, SIM_CMP_EQ)) {
+ select = true;
+ }
+ break;
+ }
+ case SIMMBALL_STIFFNESS:
+ {
+ float s = ml->s;
+ if(ED_select_similar_compare_float_tree(tree, 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 nearest;
+ if (BLI_kdtree_find_nearest(tree, 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 bool mball_select_similar_stiffness(MetaBall *mb, const float thresh)
+static int mball_select_similar_exec(bContext *C, wmOperator *op)
{
- MetaElem *ml;
- bool changed = false;
+ const int type = RNA_enum_get(op->ptr, "type");
+ const float thresh = RNA_float_get(op->ptr, "threshold");
+ int tot_mball_selected_all = 0;
- for (ml = mb->editelems->first; ml; ml = ml->next) {
- if (ml->flag & SELECT) {
- MetaElem *ml_iter;
+ 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, &objects_len);
- for (ml_iter = mb->editelems->first; ml_iter; ml_iter = ml_iter->next) {
- if ((ml_iter->flag & SELECT) == 0) {
- if (fabsf(ml_iter->s - ml->s) <= thresh) {
- ml_iter->flag |= SELECT;
- changed = true;
+ tot_mball_selected_all = BKE_mball_select_count_multi(objects, objects_len);
+
+ short type_ref = 0;
+ KDTree *tree = NULL;
+
+ if (type != SIMMBALL_TYPE) {
+ tree = BLI_kdtree_new(tot_mball_selected_all);
+ }
+
+ /* Get type of selected MetaBall */
+ for (uint ob_index = 0; ob_index < objects_len; ob_index++) {
+ Object *obedit = objects[ob_index];
+ 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);
+ break;
+ default:
+ BLI_assert(0);
+ break;
}
}
- return changed;
-}
-
-static bool mball_select_similar_rotation(MetaBall *mb, const float thresh)
-{
- const float thresh_rad = thresh * (float)M_PI_2;
- MetaElem *ml;
- bool changed = false;
-
- for (ml = mb->editelems->first; ml; ml = ml->next) {
- if (ml->flag & SELECT) {
- MetaElem *ml_iter;
-
- float ml_mat[3][3];
-
- unit_m3(ml_mat);
- mul_qt_v3(ml->quat, ml_mat[0]);
- mul_qt_v3(ml->quat, ml_mat[1]);
- mul_qt_v3(ml->quat, ml_mat[2]);
- normalize_m3(ml_mat);
-
- for (ml_iter = mb->editelems->first; ml_iter; ml_iter = ml_iter->next) {
- if ((ml_iter->flag & SELECT) == 0) {
- float ml_iter_mat[3][3];
-
- unit_m3(ml_iter_mat);
- mul_qt_v3(ml_iter->quat, ml_iter_mat[0]);
- mul_qt_v3(ml_iter->quat, ml_iter_mat[1]);
- mul_qt_v3(ml_iter->quat, ml_iter_mat[2]);
- normalize_m3(ml_iter_mat);
-
- if ((angle_normalized_v3v3(ml_mat[0], ml_iter_mat[0]) +
- angle_normalized_v3v3(ml_mat[1], ml_iter_mat[1]) +
- angle_normalized_v3v3(ml_mat[2], ml_iter_mat[2])) < thresh_rad)
- {
- ml_iter->flag |= SELECT;
+ if (tree != NULL) {
+ BLI_kdtree_balance(tree);
+ }
+ /* Select MetaBalls with desired type. */
+ for (uint ob_index = 0; ob_index < objects_len; ob_index++) {
+ Object *obedit = objects[ob_index];
+ 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, thresh);
+ break;
+ default:
+ BLI_assert(0);
+ break;
}
- }
- return changed;
-}
-
-static int mball_select_similar_exec(bContext *C, wmOperator *op)
-{
- Object *obedit = CTX_data_edit_object(C);
- MetaBall *mb = (MetaBall *)obedit->data;
-
- int type = RNA_enum_get(op->ptr, "type");
- float thresh = RNA_float_get(op->ptr, "threshold");
- bool changed = false;
-
- switch (type) {
- case SIMMBALL_TYPE:
- changed = mball_select_similar_type(mb);
- break;
- case SIMMBALL_RADIUS:
- changed = mball_select_similar_radius(mb, thresh);
- break;
- case SIMMBALL_STIFFNESS:
- changed = mball_select_similar_stiffness(mb, thresh);
- break;
- case SIMMBALL_ROTATION:
- changed = mball_select_similar_rotation(mb, thresh);
- break;
- default:
- BLI_assert(0);
- break;
+ if (changed) {
+ DEG_id_tag_update(&mb->id, DEG_TAG_SELECT_UPDATE);
+ WM_event_add_notifier(C, NC_GEO
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list