Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

code cleanup: avoid unneeded normalizations when joining tris -> quads, also correct assert with edge-collapse-decimate.

Browse Source
This commit is contained in:
Campbell Barton
2013-04-21 13:10:05 +00:00
parent 5725be6f08
commit 1fe7657b4f
2 changed files with 26 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
source/blender/bmesh/operators/bmo_join_triangles.c
View File

@@ -43,8 +43,8 @@
#include "intern/bmesh_operators_private.h" /* own include */ #include "intern/bmesh_operators_private.h" /* own include */
/* assumes edges are validated before reaching this poin */ /* assumes edges are validated before reaching this poin */
static float measure_facepair(BMVert *v1, BMVert *v2, static float measure_facepair(const float v1[3], const float v2[3],
BMVert *v3, BMVert *v4, float limit) const float v3[3], const float v4[3], float limit)
{ {
/* gives a 'weight' to a pair of triangles that join an edge to decide how good a join they would make */ /* gives a 'weight' to a pair of triangles that join an edge to decide how good a join they would make */
/* Note: this is more complicated than it needs to be and should be cleaned up.. */ /* Note: this is more complicated than it needs to be and should be cleaned up.. */
@@ -53,17 +53,17 @@ static float measure_facepair(BMVert *v1, BMVert *v2,
float minarea, maxarea, areaA, areaB; float minarea, maxarea, areaA, areaB;
/* First Test: Normal difference */ /* First Test: Normal difference */
normal_tri_v3(n1, v1->co, v2->co, v3->co); normal_tri_v3(n1, v1, v2, v3);
normal_tri_v3(n2, v1->co, v3->co, v4->co); normal_tri_v3(n2, v1, v3, v4);
if (n1[0] == n2[0] && n1[1] == n2[1] && n1[2] == n2[2]) angle1 = 0.0f; if (n1[0] == n2[0] && n1[1] == n2[1] && n1[2] == n2[2]) angle1 = 0.0f;
else angle1 = angle_v3v3(n1, n2); else angle1 = angle_v3v3(n1, n2);
normal_tri_v3(n1, v2->co, v3->co, v4->co); normal_tri_v3(n1, v2, v3, v4);
normal_tri_v3(n2, v4->co, v1->co, v2->co); normal_tri_v3(n2, v4, v1, v2);
if (n1[0] == n2[0] && n1[1] == n2[1] && n1[2] == n2[2]) angle2 = 0.0f; if (n1[0] == n2[0] && n1[1] == n2[1] && n1[2] == n2[2]) angle2 = 0.0f;
else angle2 = angle_v3v3(n1, n2); else angle2 = angle_normalized_v3v3(n1, n2);
measure += (angle1 + angle2) * 0.5f; measure += (angle1 + angle2) * 0.5f;
if (measure > limit) { if (measure > limit) {
@@ -71,16 +71,21 @@ static float measure_facepair(BMVert *v1, BMVert *v2,
} }
/* Second test: Colinearity */ /* Second test: Colinearity */
sub_v3_v3v3(edgeVec1, v1->co, v2->co); sub_v3_v3v3(edgeVec1, v1, v2);
sub_v3_v3v3(edgeVec2, v2->co, v3->co); sub_v3_v3v3(edgeVec2, v2, v3);
sub_v3_v3v3(edgeVec3, v3->co, v4->co); sub_v3_v3v3(edgeVec3, v3, v4);
sub_v3_v3v3(edgeVec4, v4->co, v1->co); sub_v3_v3v3(edgeVec4, v4, v1);
normalize_v3(edgeVec1);
normalize_v3(edgeVec2);
normalize_v3(edgeVec3);
normalize_v3(edgeVec4);
/* a completely skinny face is 'pi' after halving */ /* a completely skinny face is 'pi' after halving */
diff = 0.25f * (fabsf(angle_v3v3(edgeVec1, edgeVec2) - (float)M_PI_2) + diff = 0.25f * (fabsf(angle_normalized_v3v3(edgeVec1, edgeVec2) - (float)M_PI_2) +
fabsf(angle_v3v3(edgeVec2, edgeVec3) - (float)M_PI_2) + fabsf(angle_normalized_v3v3(edgeVec2, edgeVec3) - (float)M_PI_2) +
fabsf(angle_v3v3(edgeVec3, edgeVec4) - (float)M_PI_2) + fabsf(angle_normalized_v3v3(edgeVec3, edgeVec4) - (float)M_PI_2) +
fabsf(angle_v3v3(edgeVec4, edgeVec1) - (float)M_PI_2)); fabsf(angle_normalized_v3v3(edgeVec4, edgeVec1) - (float)M_PI_2));
if (!diff) { if (!diff) {
return 0.0; return 0.0;
@@ -92,8 +97,8 @@ static float measure_facepair(BMVert *v1, BMVert *v2,
} }
/* Third test: Concavity */ /* Third test: Concavity */
areaA = area_tri_v3(v1->co, v2->co, v3->co) + area_tri_v3(v1->co, v3->co, v4->co); areaA = area_tri_v3(v1, v2, v3) + area_tri_v3(v1, v3, v4);
areaB = area_tri_v3(v2->co, v3->co, v4->co) + area_tri_v3(v4->co, v1->co, v2->co); areaB = area_tri_v3(v2, v3, v4) + area_tri_v3(v4, v1, v2);
if (areaA <= areaB) minarea = areaA; if (areaA <= areaB) minarea = areaA;
else minarea = areaB; else minarea = areaB;
@@ -274,7 +279,7 @@ void bmo_join_triangles_exec(BMesh *bm, BMOperator *op)
if ((do_uv || do_tf || do_vcol) && (bm_edge_faces_cmp(bm, e, do_uv, do_tf, do_vcol) == false)) if ((do_uv || do_tf || do_vcol) && (bm_edge_faces_cmp(bm, e, do_uv, do_tf, do_vcol) == false))
continue; continue;
measure = measure_facepair(v1, v2, v3, v4, limit); measure = measure_facepair(v1->co, v2->co, v3->co, v4->co, limit);
if (measure < limit) { if (measure < limit) {
BLI_array_grow_one(jedges); BLI_array_grow_one(jedges);

6
source/blender/bmesh/tools/bmesh_decimate_collapse.c
View File

@@ -735,9 +735,6 @@ static bool bm_edge_collapse(BMesh *bm, BMEdge *e_clear, BMVert *v_clear, int r_
e_b_other[0] = l_b->next->e; e_b_other[0] = l_b->next->e;
} }
BLI_assert(BM_edge_share_vert(e_a_other[0], e_b_other[0]));
BLI_assert(BM_edge_share_vert(e_a_other[1], e_b_other[1]));
/* we could assert this case, but better just bail out */ /* we could assert this case, but better just bail out */
#if 0 #if 0
BLI_assert(e_a_other[0] != e_b_other[0]); BLI_assert(e_a_other[0] != e_b_other[0]);
@@ -752,6 +749,9 @@ static bool bm_edge_collapse(BMesh *bm, BMEdge *e_clear, BMVert *v_clear, int r_
return false; return false;
} }
BLI_assert(BM_edge_share_vert(e_a_other[0], e_b_other[0]));
BLI_assert(BM_edge_share_vert(e_a_other[1], e_b_other[1]));
r_e_clear_other[0] = BM_elem_index_get(e_a_other[0]); r_e_clear_other[0] = BM_elem_index_get(e_a_other[0]);
r_e_clear_other[1] = BM_elem_index_get(e_b_other[0]); r_e_clear_other[1] = BM_elem_index_get(e_b_other[0]);