caiyu/solvespace
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix #656 by making SSurface::SplitInHalf thread safe.

Browse Source 
SSurface::SplitInHalf was modifying the surface and then restoring it at the end. Make temporary copy instead.
This commit is contained in:
phkahler 2020-07-31 22:10:29 -04:00
parent d8b76ef7f1
commit fd2dfe87f6
1 changed files with 17 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/srf/raycast.cpp
View File

@ -130,39 +130,38 @@ void SSurface::SplitInHalf(bool byU, SSurface *sa, SSurface *sb) {
sa->degn = sb->degn = degn; sa->degn = sb->degn = degn;
// by de Casteljau's algorithm in a projective space; so we must work // by de Casteljau's algorithm in a projective space; so we must work
// on points (w*x, w*y, w*z, w) // on points (w*x, w*y, w*z, w) so create a temporary copy
WeightControlPoints(); SSurface st;
st = *this;
st.WeightControlPoints();
switch(byU ? degm : degn) { switch(byU ? degm : degn) {
case 1: case 1:
sa->CopyRowOrCol (byU, 0, this, 0); sa->CopyRowOrCol (byU, 0, &st, 0);
sb->CopyRowOrCol (byU, 1, this, 1); sb->CopyRowOrCol (byU, 1, &st, 1);
sa->BlendRowOrCol(byU, 1, this, 0, this, 1); sa->BlendRowOrCol(byU, 1, &st, 0, &st, 1);
sb->BlendRowOrCol(byU, 0, this, 0, this, 1); sb->BlendRowOrCol(byU, 0, &st, 0, &st, 1);
break; break;
case 2: case 2:
sa->CopyRowOrCol (byU, 0, this, 0); sa->CopyRowOrCol (byU, 0, &st, 0);
sb->CopyRowOrCol (byU, 2, this, 2); sb->CopyRowOrCol (byU, 2, &st, 2);
sa->BlendRowOrCol(byU, 1, this, 0, this, 1); sa->BlendRowOrCol(byU, 1, &st, 0, &st, 1);
sb->BlendRowOrCol(byU, 1, this, 1, this, 2); sb->BlendRowOrCol(byU, 1, &st, 1, &st, 2);
sa->BlendRowOrCol(byU, 2, sa, 1, sb, 1); sa->BlendRowOrCol(byU, 2, sa, 1, sb, 1);
sb->BlendRowOrCol(byU, 0, sa, 1, sb, 1); sb->BlendRowOrCol(byU, 0, sa, 1, sb, 1);
break; break;
case 3: { case 3: {
SSurface st; sa->CopyRowOrCol (byU, 0, &st, 0);
st.degm = degm; st.degn = degn; sb->CopyRowOrCol (byU, 3, &st, 3);
sa->CopyRowOrCol (byU, 0, this, 0); sa->BlendRowOrCol(byU, 1, &st, 0, &st, 1);
sb->CopyRowOrCol (byU, 3, this, 3); sb->BlendRowOrCol(byU, 2, &st, 2, &st, 3);
st. BlendRowOrCol(byU, 0, &st, 1, &st, 2); // use row/col 0 as scratch
sa->BlendRowOrCol(byU, 1, this, 0, this, 1);
sb->BlendRowOrCol(byU, 2, this, 2, this, 3);
st. BlendRowOrCol(byU, 0, this, 1, this, 2); // scratch var
sa->BlendRowOrCol(byU, 2, sa, 1, &st, 0); sa->BlendRowOrCol(byU, 2, sa, 1, &st, 0);
sb->BlendRowOrCol(byU, 1, sb, 2, &st, 0); sb->BlendRowOrCol(byU, 1, sb, 2, &st, 0);
@ -177,7 +176,6 @@ void SSurface::SplitInHalf(bool byU, SSurface *sa, SSurface *sb) {
sa->UnWeightControlPoints(); sa->UnWeightControlPoints();
sb->UnWeightControlPoints(); sb->UnWeightControlPoints();
UnWeightControlPoints();
} }
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------