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

Reduce scopes and placate clang-tidy. NFC.

Browse Source 
Pointing out one potential issue with an assert.
This commit is contained in:
Ryan Pavlik 2019-05-15 16:30:49 -05:00 committed by whitequark
parent 60fdac141d
commit 3ea077b70f
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/export.cpp
View File

@ -319,16 +319,14 @@ void SolveSpaceUI::ExportLinesAndMesh(SEdgeList *sel, SBezierList *sbl, SMesh *s
// Project into the export plane; so when we're done, z doesn't matter, // Project into the export plane; so when we're done, z doesn't matter,
// and x and y are what goes in the DXF. // and x and y are what goes in the DXF.
SEdge *e; for(SEdge *e = sel->l.First(); e; e = sel->l.NextAfter(e)) {
for(e = sel->l.First(); e; e = sel->l.NextAfter(e)) {
// project into the specified csys, and apply export scale // project into the specified csys, and apply export scale
(e->a) = e->a.InPerspective(u, v, n, origin, cameraTan).ScaledBy(s); (e->a) = e->a.InPerspective(u, v, n, origin, cameraTan).ScaledBy(s);
(e->b) = e->b.InPerspective(u, v, n, origin, cameraTan).ScaledBy(s); (e->b) = e->b.InPerspective(u, v, n, origin, cameraTan).ScaledBy(s);
} }
SBezier *b;
if(sbl) { if(sbl) {
for(b = sbl->l.First(); b; b = sbl->l.NextAfter(b)) { for(SBezier *b = sbl->l.First(); b; b = sbl->l.NextAfter(b)) {
*b = b->InPerspective(u, v, n, origin, cameraTan); *b = b->InPerspective(u, v, n, origin, cameraTan);
int i; int i;
for(i = 0; i <= b->deg; i++) { for(i = 0; i <= b->deg; i++) {
@ -576,12 +574,13 @@ void SolveSpaceUI::ExportLinesAndMesh(SEdgeList *sel, SBezierList *sbl, SMesh *s
// We kept the line segments and Beziers separate until now; but put them // We kept the line segments and Beziers separate until now; but put them
// all together, and also project everything into the xy plane, since not // all together, and also project everything into the xy plane, since not
// all export targets ignore the z component of the points. // all export targets ignore the z component of the points.
for(e = sel->l.First(); e; e = sel->l.NextAfter(e)) { ssassert(sbl != nullptr, "Adding line segments to beziers assumes bezier list is non-null.");
for(SEdge *e = sel->l.First(); e; e = sel->l.NextAfter(e)) {
SBezier sb = SBezier::From(e->a, e->b); SBezier sb = SBezier::From(e->a, e->b);
sb.auxA = e->auxA; sb.auxA = e->auxA;
sbl->l.Add(&sb); sbl->l.Add(&sb);
} }
for(b = sbl->l.First(); b; b = sbl->l.NextAfter(b)) { for(SBezier *b = sbl->l.First(); b; b = sbl->l.NextAfter(b)) {
for(int i = 0; i <= b->deg; i++) { for(int i = 0; i <= b->deg; i++) {
b->ctrl[i].z = 0; b->ctrl[i].z = 0;
} }