Skip to content

Silently remove duplicate consecutive prism vertices #60

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
stevengj merged 3 commits into from
Feb 2, 2022
Merged

Silently remove duplicate consecutive prism vertices #60

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
406f34f
Check whether consecutive prism vertices are duplicates
oskooi Jan 15, 2022
eb87684
remove duplicate consecutive vertices
oskooi Jan 26, 2022
90e7d79
realloc the vertices array, if necessary
oskooi Jan 26, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 15 additions & 1 deletion utils/geom.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2552,7 +2552,7 @@ vector3 triangle_normal(vector3 v1, vector3 v2, vector3 v3) {

/***************************************************************/
/* On entry, the only fields in o->prism that are assumed to */
/* be initialized are: vertices, height, (optionally) */
/* be initialized are: vertices, height, (optionally) */
/* axis, and sidewall_angle. If axis has not been initialized */
/* (i.e. it is set to its default value, which is the zero */
/* vector) then the prism axis is automatically computed as */
Expand All @@ -2570,6 +2570,20 @@ void init_prism(geometric_object *o) {
int num_vertices = prsm->vertices.num_items;
CHECK(num_vertices >= 3, "fewer than 3 vertices in init_prism");

// remove duplicate consecutive prism vertices
int i = 0; // last non-deleted vertex
for (int j = 1; j < num_vertices; ++j) {
if (!vector3_equal(vertices[i], vertices[j])) {
i += 1;
if (i < j) vertices[i] = vertices[j];
}
}
num_vertices = i + 1 - vector3_equal(vertices[0], vertices[i]);
if (prsm->vertices.num_items != num_vertices) {
prsm->vertices.num_items = num_vertices;
vertices = (vector3 *)realloc(vertices, num_vertices * sizeof(vector3));
}

// compute centroid of vertices
vector3 centroid = {0.0, 0.0, 0.0};
int nv;
Expand Down