diff --git a/packages/aaron/example/src/App.js b/packages/aaron/example/src/App.js index 7b300b39dd4..3bad5ad72fb 100644 --- a/packages/aaron/example/src/App.js +++ b/packages/aaron/example/src/App.js @@ -10,14 +10,7 @@ const App = props => { let instance = new Pattern() let config = instance.config - return ( - - ) + return } export default App diff --git a/packages/benjamin/example/src/App.js b/packages/benjamin/example/src/App.js index 7b300b39dd4..3bad5ad72fb 100644 --- a/packages/benjamin/example/src/App.js +++ b/packages/benjamin/example/src/App.js @@ -10,14 +10,7 @@ const App = props => { let instance = new Pattern() let config = instance.config - return ( - - ) + return } export default App diff --git a/packages/bent/example/src/App.js b/packages/bent/example/src/App.js index 7b300b39dd4..3bad5ad72fb 100644 --- a/packages/bent/example/src/App.js +++ b/packages/bent/example/src/App.js @@ -10,14 +10,7 @@ const App = props => { let instance = new Pattern() let config = instance.config - return ( - - ) + return } export default App diff --git a/packages/breanna/example/src/App.js b/packages/breanna/example/src/App.js index 7b300b39dd4..3bad5ad72fb 100644 --- a/packages/breanna/example/src/App.js +++ b/packages/breanna/example/src/App.js @@ -10,14 +10,7 @@ const App = props => { let instance = new Pattern() let config = instance.config - return ( - - ) + return } export default App diff --git a/packages/brian/example/src/App.js b/packages/brian/example/src/App.js index 7b300b39dd4..3bad5ad72fb 100644 --- a/packages/brian/example/src/App.js +++ b/packages/brian/example/src/App.js @@ -10,14 +10,7 @@ const App = props => { let instance = new Pattern() let config = instance.config - return ( - - ) + return } export default App diff --git a/packages/bruce/example/src/App.js b/packages/bruce/example/src/App.js index 7b300b39dd4..3bad5ad72fb 100644 --- a/packages/bruce/example/src/App.js +++ b/packages/bruce/example/src/App.js @@ -10,14 +10,7 @@ const App = props => { let instance = new Pattern() let config = instance.config - return ( - - ) + return } export default App diff --git a/packages/carlita/example/src/App.js b/packages/carlita/example/src/App.js index 7b300b39dd4..3bad5ad72fb 100644 --- a/packages/carlita/example/src/App.js +++ b/packages/carlita/example/src/App.js @@ -10,14 +10,7 @@ const App = props => { let instance = new Pattern() let config = instance.config - return ( - - ) + return } export default App diff --git a/packages/carlton/example/src/App.js b/packages/carlton/example/src/App.js index 7b300b39dd4..3bad5ad72fb 100644 --- a/packages/carlton/example/src/App.js +++ b/packages/carlton/example/src/App.js @@ -10,14 +10,7 @@ const App = props => { let instance = new Pattern() let config = instance.config - return ( - - ) + return } export default App diff --git a/packages/cathrin/example/src/App.js b/packages/cathrin/example/src/App.js index 7b300b39dd4..3bad5ad72fb 100644 --- a/packages/cathrin/example/src/App.js +++ b/packages/cathrin/example/src/App.js @@ -10,14 +10,7 @@ const App = props => { let instance = new Pattern() let config = instance.config - return ( - - ) + return } export default App diff --git a/packages/examples/example/src/App.js b/packages/examples/example/src/App.js index 7b300b39dd4..3bad5ad72fb 100644 --- a/packages/examples/example/src/App.js +++ b/packages/examples/example/src/App.js @@ -10,14 +10,7 @@ const App = props => { let instance = new Pattern() let config = instance.config - return ( - - ) + return } export default App diff --git a/packages/florent/example/src/App.js b/packages/florent/example/src/App.js index 7b300b39dd4..3bad5ad72fb 100644 --- a/packages/florent/example/src/App.js +++ b/packages/florent/example/src/App.js @@ -10,14 +10,7 @@ const App = props => { let instance = new Pattern() let config = instance.config - return ( - - ) + return } export default App diff --git a/packages/fu/example/src/App.js b/packages/fu/example/src/App.js index 7b300b39dd4..3bad5ad72fb 100644 --- a/packages/fu/example/src/App.js +++ b/packages/fu/example/src/App.js @@ -10,14 +10,7 @@ const App = props => { let instance = new Pattern() let config = instance.config - return ( - - ) + return } export default App diff --git a/packages/holmes/example/src/App.js b/packages/holmes/example/src/App.js index 7b300b39dd4..3bad5ad72fb 100644 --- a/packages/holmes/example/src/App.js +++ b/packages/holmes/example/src/App.js @@ -10,14 +10,7 @@ const App = props => { let instance = new Pattern() let config = instance.config - return ( - - ) + return } export default App diff --git a/packages/holmes/src/ear.js b/packages/holmes/src/ear.js index f95e437e86a..9c4c281ed1b 100644 --- a/packages/holmes/src/ear.js +++ b/packages/holmes/src/ear.js @@ -12,33 +12,35 @@ export default function(part) { Snippet, paperless, macro - } = part.shorthand(); + } = part.shorthand() -// Design pattern here + // Design pattern here -points.top = new Point(0, 0) -points.bottom = new Point(measurements.headCircumference/12, options.lengthRatio*measurements.headCircumference/2) -points.topC = points.top.shift(0, points.bottom.x) -points.bottomC = points.bottom.shift(90, points.bottom.y-points.bottom.x) -points.topCFlipped = points.topC.flipX() -points.bottomFlipped = points.bottom.flipX() -points.bottomCFlipped = points.bottomC.flipX() + points.top = new Point(0, 0) + points.bottom = new Point( + measurements.headCircumference / 12, + (options.lengthRatio * measurements.headCircumference) / 2 + ) + points.topC = points.top.shift(0, points.bottom.x) + points.bottomC = points.bottom.shift(90, points.bottom.y - points.bottom.x) + points.topCFlipped = points.topC.flipX() + points.bottomFlipped = points.bottom.flipX() + points.bottomCFlipped = points.bottomC.flipX() -paths.seam = new Path() - .move(points.top) - .curve(points.topCFlipped, points.bottomCFlipped, points.bottomFlipped) - .line(points.bottom) - .curve(points.bottomC, points.topC, points.top) - .close() + paths.seam = new Path() + .move(points.top) + .curve(points.topCFlipped, points.bottomCFlipped, points.bottomFlipped) + .line(points.bottom) + .curve(points.bottomC, points.topC, points.top) + .close() // Complete? if (complete) { - macro('grainline', {from: points.top, to: new Point(0, points.bottom.y)}) - points.logo = new Point(-0.5*points.bottom.x, 0.75*points.bottom.y) - snippets.logo = new Snippet("logo", points.logo) - .attr("data-scale", 0.7); - points.title = new Point(0.3*points.bottom.x, 0.75*points.bottom.y) - macro('title', { at: points.title, nr: 3, title: 'ear', scale: 0.5}) + macro('grainline', { from: points.top, to: new Point(0, points.bottom.y) }) + points.logo = new Point(-0.5 * points.bottom.x, 0.75 * points.bottom.y) + snippets.logo = new Snippet('logo', points.logo).attr('data-scale', 0.7) + points.title = new Point(0.3 * points.bottom.x, 0.75 * points.bottom.y) + macro('title', { at: points.title, nr: 3, title: 'ear', scale: 0.5 }) if (sa) { paths.sa = paths.seam.offset(sa).attr('class', 'fabric sa') @@ -58,5 +60,5 @@ paths.seam = new Path() }) } } - return part; + return part } diff --git a/packages/huey/example/src/App.js b/packages/huey/example/src/App.js index 7b300b39dd4..3bad5ad72fb 100644 --- a/packages/huey/example/src/App.js +++ b/packages/huey/example/src/App.js @@ -10,14 +10,7 @@ const App = props => { let instance = new Pattern() let config = instance.config - return ( - - ) + return } export default App diff --git a/packages/hugo/example/src/App.js b/packages/hugo/example/src/App.js index 7b300b39dd4..3bad5ad72fb 100644 --- a/packages/hugo/example/src/App.js +++ b/packages/hugo/example/src/App.js @@ -10,14 +10,7 @@ const App = props => { let instance = new Pattern() let config = instance.config - return ( - - ) + return } export default App diff --git a/packages/jaeger/example/src/App.js b/packages/jaeger/example/src/App.js index 7b300b39dd4..3bad5ad72fb 100644 --- a/packages/jaeger/example/src/App.js +++ b/packages/jaeger/example/src/App.js @@ -10,14 +10,7 @@ const App = props => { let instance = new Pattern() let config = instance.config - return ( - - ) + return } export default App diff --git a/packages/penelope/example/src/App.js b/packages/penelope/example/src/App.js index 7b300b39dd4..3bad5ad72fb 100644 --- a/packages/penelope/example/src/App.js +++ b/packages/penelope/example/src/App.js @@ -10,14 +10,7 @@ const App = props => { let instance = new Pattern() let config = instance.config - return ( - - ) + return } export default App diff --git a/packages/rendertest/example/src/App.js b/packages/rendertest/example/src/App.js index 7b300b39dd4..3bad5ad72fb 100644 --- a/packages/rendertest/example/src/App.js +++ b/packages/rendertest/example/src/App.js @@ -10,14 +10,7 @@ const App = props => { let instance = new Pattern() let config = instance.config - return ( - - ) + return } export default App diff --git a/packages/sandy/example/src/App.js b/packages/sandy/example/src/App.js index 7b300b39dd4..3bad5ad72fb 100644 --- a/packages/sandy/example/src/App.js +++ b/packages/sandy/example/src/App.js @@ -10,14 +10,7 @@ const App = props => { let instance = new Pattern() let config = instance.config - return ( - - ) + return } export default App diff --git a/packages/shin/example/src/App.js b/packages/shin/example/src/App.js index 7b300b39dd4..3bad5ad72fb 100644 --- a/packages/shin/example/src/App.js +++ b/packages/shin/example/src/App.js @@ -10,14 +10,7 @@ const App = props => { let instance = new Pattern() let config = instance.config - return ( - - ) + return } export default App diff --git a/packages/simon/example/src/App.js b/packages/simon/example/src/App.js index 7b300b39dd4..3bad5ad72fb 100644 --- a/packages/simon/example/src/App.js +++ b/packages/simon/example/src/App.js @@ -10,14 +10,7 @@ const App = props => { let instance = new Pattern() let config = instance.config - return ( - - ) + return } export default App diff --git a/packages/simone/example/src/App.js b/packages/simone/example/src/App.js index 7b300b39dd4..3bad5ad72fb 100644 --- a/packages/simone/example/src/App.js +++ b/packages/simone/example/src/App.js @@ -10,14 +10,7 @@ const App = props => { let instance = new Pattern() let config = instance.config - return ( - - ) + return } export default App diff --git a/packages/sven/example/src/App.js b/packages/sven/example/src/App.js index 7b300b39dd4..3bad5ad72fb 100644 --- a/packages/sven/example/src/App.js +++ b/packages/sven/example/src/App.js @@ -10,14 +10,7 @@ const App = props => { let instance = new Pattern() let config = instance.config - return ( - - ) + return } export default App diff --git a/packages/tamiko/example/src/App.js b/packages/tamiko/example/src/App.js index 7b300b39dd4..3bad5ad72fb 100644 --- a/packages/tamiko/example/src/App.js +++ b/packages/tamiko/example/src/App.js @@ -10,14 +10,7 @@ const App = props => { let instance = new Pattern() let config = instance.config - return ( - - ) + return } export default App diff --git a/packages/theo/example/src/App.js b/packages/theo/example/src/App.js index 7b300b39dd4..3bad5ad72fb 100644 --- a/packages/theo/example/src/App.js +++ b/packages/theo/example/src/App.js @@ -10,14 +10,7 @@ const App = props => { let instance = new Pattern() let config = instance.config - return ( - - ) + return } export default App diff --git a/packages/trayvon/example/src/App.js b/packages/trayvon/example/src/App.js index 7b300b39dd4..3bad5ad72fb 100644 --- a/packages/trayvon/example/src/App.js +++ b/packages/trayvon/example/src/App.js @@ -10,14 +10,7 @@ const App = props => { let instance = new Pattern() let config = instance.config - return ( - - ) + return } export default App diff --git a/packages/tutorial/example/src/App.js b/packages/tutorial/example/src/App.js index 7b300b39dd4..3bad5ad72fb 100644 --- a/packages/tutorial/example/src/App.js +++ b/packages/tutorial/example/src/App.js @@ -10,14 +10,7 @@ const App = props => { let instance = new Pattern() let config = instance.config - return ( - - ) + return } export default App diff --git a/packages/wahid/example/src/App.js b/packages/wahid/example/src/App.js index 7b300b39dd4..3bad5ad72fb 100644 --- a/packages/wahid/example/src/App.js +++ b/packages/wahid/example/src/App.js @@ -10,14 +10,7 @@ const App = props => { let instance = new Pattern() let config = instance.config - return ( - - ) + return } export default App diff --git a/packages/waralee/example/src/App.js b/packages/waralee/example/src/App.js index 7b300b39dd4..3bad5ad72fb 100644 --- a/packages/waralee/example/src/App.js +++ b/packages/waralee/example/src/App.js @@ -10,14 +10,7 @@ const App = props => { let instance = new Pattern() let config = instance.config - return ( - - ) + return } export default App