blender
/
blender
129
398
Fork 572
Code Issues 6.2k Pull Requests 749 Projects 19 Wiki Activity

Fix CDT bug causing crash with some output modes. 

Forgot to properly maintain the edge for faces while
dissolving edges.
This commit is contained in:
Howard Trickey 2019-08-15 07:55:29 -04:00
parent 48a6997e2a
commit e4084f8b24
2 changed files with 62 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
source/blender/blenlib/intern/delaunay_2d.c
View File

@ -1961,13 +1961,17 @@ static void add_face_ids(
}
}
/* Delete_edge but try not to mess up outer face. */
/* Delete_edge but try not to mess up outer face.
* Also faces have symedges now, so make sure not
* to mess those up either. */
static void dissolve_symedge(CDT_state *cdt, SymEdge *se)
{
if (sym(se)->face == cdt->outer_face) {
SymEdge *symse = sym(se);
if (symse->face == cdt->outer_face) {
se = sym(se);
symse = sym(se);
}
if (cdt->outer_face->symedge == se || cdt->outer_face->symedge == sym(se)) {
if (cdt->outer_face->symedge == se || cdt->outer_face->symedge == symse) {
/* Advancing by 2 to get past possible 'sym(se)'. */
if (se->next->next == se) {
cdt->outer_face->symedge = NULL;
@ -1976,6 +1980,14 @@ static void dissolve_symedge(CDT_state *cdt, SymEdge *se)
cdt->outer_face->symedge = se->next->next;
}
}
else {
if (se->face->symedge == se) {
se->face->symedge = se->next;
}
if (symse->face->symedge == se) {
symse->face->symedge = symse->next;
}
}
delete_edge(cdt, se);
}

52
tests/gtests/blenlib/BLI_delaunay_2d_test.cc
View File

@ -616,6 +616,33 @@ TEST(delaunay, OverlapFaces)
BLI_delaunay_2d_cdt_free(out);
}
TEST(delaunay, TwoSquaresOverlap)
{
CDT_input in;
CDT_result *out;
float p[][2] = {
{1.0f, -1.0f},
{-1.0f, -1.0f},
{-1.0f, 1.0f},
{1.0f, 1.0f},
{-1.5f, 1.5f},
{0.5f, 1.5f},
{0.5f, -0.5f},
{-1.5f, -0.5f},
};
int f[] = {/* 0 */ 7, 6, 5, 4, /* 1 */ 3, 2, 1, 0};
int fstart[] = {0, 4};
int flen[] = {4, 4};
fill_input_verts(&in, p, 8);
add_input_faces(&in, f, fstart, flen, 2);
out = BLI_delaunay_2d_cdt_calc(&in, CDT_CONSTRAINTS_VALID_BMESH);
EXPECT_EQ(out->verts_len, 10);
EXPECT_EQ(out->edges_len, 12);
EXPECT_EQ(out->faces_len, 3);
BLI_delaunay_2d_cdt_free(out);
}
enum {
RANDOM_PTS,
RANDOM_SEGS,
@ -623,7 +650,7 @@ enum {
};
// #define DO_TIMING
static void rand_delaunay_test(int test_kind, int max_lg_size, int reps_per_size)
static void rand_delaunay_test(int test_kind, int max_lg_size, int reps_per_size, CDT_output_type otype)
{
CDT_input in;
CDT_result *out;
@ -679,7 +706,7 @@ static void rand_delaunay_test(int test_kind, int max_lg_size, int reps_per_size
add_input_edges(&in, e, size - 1 + (test_kind == RANDOM_POLY));
}
tstart = PIL_check_seconds_timer();
out = BLI_delaunay_2d_cdt_calc(&in, CDT_FULL);
out = BLI_delaunay_2d_cdt_calc(&in, otype);
EXPECT_NE(out->verts_len, 0);
BLI_delaunay_2d_cdt_free(out);
times[lg_size] += PIL_check_seconds_timer() - tstart;
@ -700,17 +727,32 @@ static void rand_delaunay_test(int test_kind, int max_lg_size, int reps_per_size
TEST(delaunay, randompts)
{
rand_delaunay_test(RANDOM_PTS, 7, 1);
rand_delaunay_test(RANDOM_PTS, 7, 1, CDT_FULL);
}
TEST(delaunay, randomsegs)
{
rand_delaunay_test(RANDOM_SEGS, 7, 1);
rand_delaunay_test(RANDOM_SEGS, 7, 1, CDT_FULL);
}
TEST(delaunay, randompoly)
{
rand_delaunay_test(RANDOM_POLY, 7, 1);
rand_delaunay_test(RANDOM_POLY, 7, 1, CDT_FULL);
}
TEST(delaunay, randompoly_inside)
{
rand_delaunay_test(RANDOM_POLY, 7, 1, CDT_INSIDE);
}
TEST(delaunay, randompoly_constraints)
{
rand_delaunay_test(RANDOM_POLY, 7, 1, CDT_CONSTRAINTS);
}
TEST(delaunay, randompoly_validbmesh)
{
rand_delaunay_test(RANDOM_POLY, 7, 1, CDT_CONSTRAINTS_VALID_BMESH);
}
#if 0