Skip to content

Commit

Permalink
Optimize sort_by_key (SortFaces/SortVerts)
Browse files Browse the repository at this point in the history
Remap boxes separately
  • Loading branch information
stephomi committed Jul 16, 2023
1 parent 2aef6e4 commit 4eea1e0
Showing 1 changed file with 8 additions and 5 deletions.
13 changes: 8 additions & 5 deletions src/manifold/src/sort.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -312,8 +312,9 @@ void Manifold::Impl::SortVerts() {

VecDH<int> vertNew2Old(numVert);
sequence(policy, vertNew2Old.begin(), vertNew2Old.end());

sort_by_key(policy, vertMorton.begin(), vertMorton.end(),
zip(vertPos_.begin(), vertNew2Old.begin()));
vertNew2Old.begin());

ReindexVerts(vertNew2Old, numVert);

Expand All @@ -323,10 +324,12 @@ void Manifold::Impl::SortVerts() {
lower_bound<decltype(vertMorton.begin())>(policy, vertMorton.begin(),
vertMorton.end(), kNoCode) -
vertMorton.begin();
vertPos_.resize(newNumVert);

vertNew2Old.resize(newNumVert);
Permute(vertPos_, vertNew2Old);

if (vertNormal_.size() == numVert) {
Permute(vertNormal_, vertNew2Old);
vertNormal_.resize(newNumVert);
}
}

Expand Down Expand Up @@ -395,18 +398,18 @@ void Manifold::Impl::SortFaces(VecDH<Box>& faceBox,
sequence(policy, faceNew2Old.begin(), faceNew2Old.end());

sort_by_key(policy, faceMorton.begin(), faceMorton.end(),
zip(faceBox.begin(), faceNew2Old.begin()));
faceNew2Old.begin());

// Tris were flagged for removal with pairedHalfedge = -1 and assigned kNoCode
// to sort them to the end, which allows them to be removed.
const int newNumTri =
find<decltype(faceMorton.begin())>(policy, faceMorton.begin(),
faceMorton.end(), kNoCode) -
faceMorton.begin();
faceBox.resize(newNumTri);
faceMorton.resize(newNumTri);
faceNew2Old.resize(newNumTri);

Permute(faceBox, faceNew2Old);
GatherFaces(faceNew2Old);
}

Expand Down

0 comments on commit 4eea1e0

Please sign in to comment.