Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: solvespace/solvespace
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: c355a4730adf
Choose a base ref
...
head repository: solvespace/solvespace
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: e84fd4649b05
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on May 11, 2020

  1. Use omp critical to simplify parallel triangulation. NFC.

    @phkahler
    phkahler authored May 11, 2020
    Copy the full SHA
    e84fd46 View commit details
Showing with 3 additions and 7 deletions.
  1. +3 −7 src/srf/surface.cpp
10 changes: 3 additions & 7 deletions src/srf/surface.cpp
View file
Original file line number Diff line number Diff line change
@@ -1050,16 +1050,12 @@ void SShell::MakeSectionEdgesInto(Vector n, double d, SEdgeList *sel, SBezierLis
}

void SShell::TriangulateInto(SMesh *sm) {
std::vector<SMesh> tm(surface.n);

#pragma omp parallel for
for(int i=0; i<surface.n; i++) {
SSurface *s = &surface[i];
s->TriangulateInto(this, &tm[i]);
}

// merge the per-surface meshes
for (auto& m : tm) {
SMesh m;
s->TriangulateInto(this, &m);
#pragma omp critical
sm->MakeFromCopyOf(&m);
m.Clear();
}