[Bf-blender-cvs] [8715fd0] master: BMesh: join tris, split angle limit in two
Campbell Barton
noreply at git.blender.org
Tue May 26 06:31:25 CEST 2015
Commit: 8715fd092514547460e58d4f8a39b2fb6704e810
Author: Campbell Barton
Date: Tue May 26 14:27:38 2015 +1000
Branches: master
https://developer.blender.org/rB8715fd092514547460e58d4f8a39b2fb6704e810
BMesh: join tris, split angle limit in two
Use a separate limit for face-angle and shape comparisons.
There was no way to join non-rectangular, co-planer tries.
===================================================================
M source/blender/bmesh/intern/bmesh_opdefines.c
M source/blender/bmesh/operators/bmo_join_triangles.c
M source/blender/editors/mesh/editmesh_tools.c
===================================================================
diff --git a/source/blender/bmesh/intern/bmesh_opdefines.c b/source/blender/bmesh/intern/bmesh_opdefines.c
index 211c53a..ce988c6 100644
--- a/source/blender/bmesh/intern/bmesh_opdefines.c
+++ b/source/blender/bmesh/intern/bmesh_opdefines.c
@@ -487,7 +487,7 @@ static BMOpDefine bmo_create_vert_def = {
* Join Triangles.
*
* Tries to intelligently join triangles according
- * to various settings and stuff.
+ * to angle threshold and delimiters.
*/
static BMOpDefine bmo_join_triangles_def = {
"join_triangles",
@@ -498,7 +498,8 @@ static BMOpDefine bmo_join_triangles_def = {
{"cmp_uvs", BMO_OP_SLOT_BOOL},
{"cmp_vcols", BMO_OP_SLOT_BOOL},
{"cmp_materials", BMO_OP_SLOT_BOOL},
- {"limit", BMO_OP_SLOT_FLT},
+ {"angle_face_threshold", BMO_OP_SLOT_FLT},
+ {"angle_shape_threshold", BMO_OP_SLOT_FLT},
{{'\0'}},
},
/* slots_out */
diff --git a/source/blender/bmesh/operators/bmo_join_triangles.c b/source/blender/bmesh/operators/bmo_join_triangles.c
index 06200ba..841a68f 100644
--- a/source/blender/bmesh/operators/bmo_join_triangles.c
+++ b/source/blender/bmesh/operators/bmo_join_triangles.c
@@ -135,10 +135,13 @@ struct DelimitData {
unsigned int do_seam : 1;
unsigned int do_sharp : 1;
unsigned int do_mat : 1;
- unsigned int do_angle : 1;
+ unsigned int do_angle_face : 1;
+ unsigned int do_angle_shape : 1;
- float angle;
- float angle__cos;
+ float angle_face;
+ float angle_face__cos;
+
+ float angle_shape;
struct DelimitData_CD cdata[4];
int cdata_len;
@@ -200,16 +203,23 @@ static float bm_edge_is_delimit(
goto fail;
}
- if (delimit_data->do_angle) {
- if (dot_v3v3(f_a->no, f_b->no) < delimit_data->angle__cos) {
+ if (delimit_data->do_angle_face) {
+ if (dot_v3v3(f_a->no, f_b->no) < delimit_data->angle_face__cos) {
+ goto fail;
+ }
+ }
+
+ if (delimit_data->do_angle_shape) {
+ const BMVert *verts[4];
+ bm_edge_to_quad_verts(e, verts);
+
+ /* if we're checking the shape at all, a flipped face is out of the question */
+ if (is_quad_flip_v3(verts[0]->co, verts[1]->co, verts[2]->co, verts[3]->co)) {
goto fail;
}
else {
- const BMVert *verts[4];
float edge_vecs[4][3];
- bm_edge_to_quad_verts(e, verts);
-
sub_v3_v3v3(edge_vecs[0], verts[0]->co, verts[1]->co);
sub_v3_v3v3(edge_vecs[1], verts[1]->co, verts[2]->co);
sub_v3_v3v3(edge_vecs[2], verts[2]->co, verts[3]->co);
@@ -220,10 +230,10 @@ static float bm_edge_is_delimit(
normalize_v3(edge_vecs[2]);
normalize_v3(edge_vecs[3]);
- if ((fabsf(angle_normalized_v3v3(edge_vecs[0], edge_vecs[1]) - (float)M_PI_2) > delimit_data->angle) ||
- (fabsf(angle_normalized_v3v3(edge_vecs[1], edge_vecs[2]) - (float)M_PI_2) > delimit_data->angle) ||
- (fabsf(angle_normalized_v3v3(edge_vecs[2], edge_vecs[3]) - (float)M_PI_2) > delimit_data->angle) ||
- (fabsf(angle_normalized_v3v3(edge_vecs[3], edge_vecs[0]) - (float)M_PI_2) > delimit_data->angle))
+ if ((fabsf(angle_normalized_v3v3(edge_vecs[0], edge_vecs[1]) - (float)M_PI_2) > delimit_data->angle_shape) ||
+ (fabsf(angle_normalized_v3v3(edge_vecs[1], edge_vecs[2]) - (float)M_PI_2) > delimit_data->angle_shape) ||
+ (fabsf(angle_normalized_v3v3(edge_vecs[2], edge_vecs[3]) - (float)M_PI_2) > delimit_data->angle_shape) ||
+ (fabsf(angle_normalized_v3v3(edge_vecs[3], edge_vecs[0]) - (float)M_PI_2) > delimit_data->angle_shape))
{
goto fail;
}
@@ -255,7 +265,7 @@ fail:
void bmo_join_triangles_exec(BMesh *bm, BMOperator *op)
{
- float limit;
+ float angle_face, angle_shape;
BMIter iter;
BMOIter siter;
@@ -272,14 +282,23 @@ void bmo_join_triangles_exec(BMesh *bm, BMOperator *op)
delimit_data.do_sharp = BMO_slot_bool_get(op->slots_in, "cmp_sharp");
delimit_data.do_mat = BMO_slot_bool_get(op->slots_in, "cmp_materials");
- limit = BMO_slot_float_get(op->slots_in, "limit");
- if (limit < DEG2RADF(180.0f)) {
- delimit_data.angle = limit;
- delimit_data.angle__cos = cosf(limit);
- delimit_data.do_angle = true;
+ angle_face = BMO_slot_float_get(op->slots_in, "angle_face_threshold");
+ if (angle_face < DEG2RADF(180.0f)) {
+ delimit_data.angle_face = angle_face;
+ delimit_data.angle_face__cos = cosf(angle_face);
+ delimit_data.do_angle_face = true;
+ }
+ else {
+ delimit_data.do_angle_face = false;
+ }
+
+ angle_shape = BMO_slot_float_get(op->slots_in, "angle_shape_threshold");
+ if (angle_shape < DEG2RADF(180.0f)) {
+ delimit_data.angle_shape = angle_shape;
+ delimit_data.do_angle_shape = true;
}
else {
- delimit_data.do_angle = false;
+ delimit_data.do_angle_shape = false;
}
if (BMO_slot_bool_get(op->slots_in, "cmp_uvs") &&
diff --git a/source/blender/editors/mesh/editmesh_tools.c b/source/blender/editors/mesh/editmesh_tools.c
index 5d19e6c..679d017 100644
--- a/source/blender/editors/mesh/editmesh_tools.c
+++ b/source/blender/editors/mesh/editmesh_tools.c
@@ -3760,19 +3760,29 @@ static int edbm_tris_convert_to_quads_exec(bContext *C, wmOperator *op)
Object *obedit = CTX_data_edit_object(C);
BMEditMesh *em = BKE_editmesh_from_object(obedit);
bool do_seam, do_sharp, do_uvs, do_vcols, do_materials;
- float limit;
+ float angle_face_threshold, angle_shape_threshold;
PropertyRNA *prop;
/* When joining exactly 2 faces, no limit.
* this is useful for one off joins while editing. */
- prop = RNA_struct_find_property(op->ptr, "limit");
+ prop = RNA_struct_find_property(op->ptr, "face_threshold");
if ((em->bm->totfacesel == 2) &&
(RNA_property_is_set(op->ptr, prop) == false))
{
- limit = DEG2RADF(180.0f);
+ angle_face_threshold = DEG2RADF(180.0f);
}
else {
- limit = RNA_property_float_get(op->ptr, prop);
+ angle_face_threshold = RNA_property_float_get(op->ptr, prop);
+ }
+
+ prop = RNA_struct_find_property(op->ptr, "shape_threshold");
+ if ((em->bm->totfacesel == 2) &&
+ (RNA_property_is_set(op->ptr, prop) == false))
+ {
+ angle_shape_threshold = DEG2RADF(180.0f);
+ }
+ else {
+ angle_shape_threshold = RNA_property_float_get(op->ptr, prop);
}
do_seam = RNA_boolean_get(op->ptr, "seam");
@@ -3784,8 +3794,10 @@ static int edbm_tris_convert_to_quads_exec(bContext *C, wmOperator *op)
if (!EDBM_op_call_and_selectf(
em, op,
"faces.out", true,
- "join_triangles faces=%hf limit=%f cmp_seam=%b cmp_sharp=%b cmp_uvs=%b cmp_vcols=%b cmp_materials=%b",
- BM_ELEM_SELECT, limit, do_seam, do_sharp, do_uvs, do_vcols, do_materials))
+ "join_triangles faces=%hf angle_face_threshold=%f angle_shape_threshold=%f "
+ "cmp_seam=%b cmp_sharp=%b cmp_uvs=%b cmp_vcols=%b cmp_materials=%b",
+ BM_ELEM_SELECT, angle_face_threshold, angle_shape_threshold,
+ do_seam, do_sharp, do_uvs, do_vcols, do_materials))
{
return OPERATOR_CANCELLED;
}
@@ -3799,8 +3811,14 @@ static void join_triangle_props(wmOperatorType *ot)
{
PropertyRNA *prop;
- prop = RNA_def_float_rotation(ot->srna, "limit", 0, NULL, 0.0f, DEG2RADF(180.0f),
- "Max Angle", "Angle Limit", 0.0f, DEG2RADF(180.0f));
+ prop = RNA_def_float_rotation(
+ ot->srna, "face_threshold", 0, NULL, 0.0f, DEG2RADF(180.0f),
+ "Max Face Angle", "Face angle limit", 0.0f, DEG2RADF(180.0f));
+ RNA_def_property_float_default(prop, DEG2RADF(40.0f));
+
+ prop = RNA_def_float_rotation(
+ ot->srna, "shape_threshold", 0, NULL, 0.0f, DEG2RADF(180.0f),
+ "Max Shape Angle", "Shape angle limit", 0.0f, DEG2RADF(180.0f));
RNA_def_property_float_default(prop, DEG2RADF(40.0f));
RNA_def_boolean(ot->srna, "uvs", 0, "Compare UVs", "");
More information about the Bf-blender-cvs
mailing list