Skip to content

Commit 0593c0f

Browse files
markrolandmarkroland
committed
Refactored to import patterns from index file
1 parent bdec936 commit 0593c0f

2 files changed

Lines changed: 72 additions & 67 deletions

File tree

‎src/js/patterns/index.js‎

Lines changed: 71 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,71 @@
1+
import env from './../env.js';
2+
3+
import Coordinates from './Coordinates.js';
4+
import Circle from './Circle.js';
5+
import Cross from './Cross.js';
6+
import Cycloid from './Cycloid.js';
7+
import Diameters from './Diameters.js';
8+
import Draw from './Draw.js';
9+
import Egg from './Egg.js';
10+
import Farris from './Farris.js';
11+
import FermatSpiral from './FermatSpiral.js';
12+
import Fibonacci from './Fibonacci.js';
13+
import FibonacciLollipops from './FibonacciLollipops.js';
14+
import Frame from './Frame.js';
15+
import Gcode from './Gcode.js';
16+
import Gravity from './Gravity.js';
17+
import Heart from './Heart.js';
18+
import Lindenmayer from './Lindenmayer.js';
19+
import Lissajous from './Lissajous.js';
20+
import Sunset from './Sunset.js';
21+
import LogarithmicSpiral from './LogarithmicSpiral.js';
22+
import Parametric from './Parametric.js';
23+
import Rectangle from './Rectangle.js';
24+
import Rhodonea from './Rhodonea.js';
25+
import ShapeMorph from './ShapeMorph.js';
26+
import ShapeSpin from './ShapeSpin.js';
27+
import Spiral from './Spiral.js';
28+
import Spokes from './Spokes.js';
29+
import Star from './Star.js';
30+
import Superellipse from './Superellipse.js';
31+
import Text from './Text.js';
32+
import ThetaRhoInput from './ThetaRhoInput.js';
33+
import WigglySpiral from './WigglySpiral.js';
34+
import ZigZag from './ZigZag.js';
35+
36+
const Patterns = {
37+
"coordinates": new Coordinates(),
38+
"circle": new Circle(env),
39+
"cross": new Cross(env),
40+
"cycloid": new Cycloid(env),
41+
"diameters": new Diameters(env),
42+
"draw": new Draw(env),
43+
"egg": new Egg(env),
44+
"farris": new Farris(env),
45+
"fermatspiral": new FermatSpiral(env),
46+
"fibonacci": new Fibonacci(env),
47+
"fibonaccilollipops": new FibonacciLollipops(env),
48+
"frame": new Frame(env),
49+
"gcode": new Gcode(env),
50+
"gravity": new Gravity(env),
51+
"heart": new Heart(),
52+
"lindenmayer": new Lindenmayer(env),
53+
"lissajous": new Lissajous(env),
54+
"parametric": new Parametric(),
55+
"rectangle": new Rectangle(env),
56+
"rhodonea": new Rhodonea(env),
57+
"shapemorph": new ShapeMorph(env),
58+
"shapespin": new ShapeSpin(),
59+
"spiral": new Spiral(env),
60+
"sunset": new Sunset(env),
61+
"logspiral": new LogarithmicSpiral(env),
62+
"spokes": new Spokes(env),
63+
"star": new Star(env),
64+
"superellipse": new Superellipse(env),
65+
"text": new Text(env),
66+
"thr": new ThetaRhoInput(env),
67+
"wigglyspiral": new WigglySpiral(env),
68+
"zigzag": new ZigZag(env)
69+
}
70+
71+
export default Patterns;

‎src/js/sand_table_pattern_maker.js‎

Lines changed: 1 addition & 67 deletions
Original file line numberDiff line numberDiff line change
@@ -10,39 +10,6 @@ import PathHelper from '@markroland/path-helper'
1010
import createGcode from './gCode.js';
1111
import thetaRho from './thetaRho.js';
1212

13-
import Coordinates from './patterns/Coordinates.js';
14-
import Circle from './patterns/Circle.js';
15-
import Cross from './patterns/Cross.js';
16-
import Cycloid from './patterns/Cycloid.js';
17-
import Diameters from './patterns/Diameters.js';
18-
import Draw from './patterns/Draw.js';
19-
import Egg from './patterns/Egg.js';
20-
import Farris from './patterns/Farris.js';
21-
import FermatSpiral from './patterns/FermatSpiral.js';
22-
import Fibonacci from './patterns/Fibonacci.js';
23-
import FibonacciLollipops from './patterns/FibonacciLollipops.js';
24-
import Frame from './patterns/Frame.js';
25-
import Gcode from './patterns/Gcode.js';
26-
import Gravity from './patterns/Gravity.js';
27-
import Heart from './patterns/Heart.js';
28-
import Lindenmayer from './patterns/Lindenmayer.js';
29-
import Lissajous from './patterns/Lissajous.js';
30-
import Sunset from './patterns/Sunset.js';
31-
import LogarithmicSpiral from './patterns/LogarithmicSpiral.js';
32-
import Parametric from './patterns/Parametric.js';
33-
import Rectangle from './patterns/Rectangle.js';
34-
import Rhodonea from './patterns/Rhodonea.js';
35-
import ShapeMorph from './patterns/ShapeMorph.js';
36-
import ShapeSpin from './patterns/ShapeSpin.js';
37-
import Spiral from './patterns/Spiral.js';
38-
import Spokes from './patterns/Spokes.js';
39-
import Star from './patterns/Star.js';
40-
import Superellipse from './patterns/Superellipse.js';
41-
import Text from './patterns/Text.js';
42-
import ThetaRhoInput from './patterns/ThetaRhoInput.js';
43-
import WigglySpiral from './patterns/WigglySpiral.js';
44-
import ZigZag from './patterns/ZigZag.js';
45-
4613
// Set application version. Used to validate Local Storage
4714
const app_version = env.app.version;
4815

@@ -91,40 +58,7 @@ let path_preview;
9158
var recalculate_pattern = env.recalculate_pattern;
9259

9360
// Master Patterns object to hold patterns
94-
var Patterns = {
95-
"coordinates": new Coordinates(),
96-
"circle": new Circle(env),
97-
"cross": new Cross(env),
98-
"cycloid": new Cycloid(env),
99-
"diameters": new Diameters(env),
100-
"draw": new Draw(env),
101-
"egg": new Egg(env),
102-
"farris": new Farris(env),
103-
"fermatspiral": new FermatSpiral(env),
104-
"fibonacci": new Fibonacci(env),
105-
"fibonaccilollipops": new FibonacciLollipops(env),
106-
"frame": new Frame(env),
107-
"gcode": new Gcode(env),
108-
"gravity": new Gravity(env),
109-
"heart": new Heart(),
110-
"lindenmayer": new Lindenmayer(env),
111-
"lissajous": new Lissajous(env),
112-
"parametric": new Parametric(),
113-
"rectangle": new Rectangle(env),
114-
"rhodonea": new Rhodonea(env),
115-
"shapemorph": new ShapeMorph(env),
116-
"shapespin": new ShapeSpin(),
117-
"spiral": new Spiral(env),
118-
"sunset": new Sunset(env),
119-
"logspiral": new LogarithmicSpiral(env),
120-
"spokes": new Spokes(env),
121-
"star": new Star(env),
122-
"superellipse": new Superellipse(env),
123-
"text": new Text(env),
124-
"thr": new ThetaRhoInput(env),
125-
"wigglyspiral": new WigglySpiral(env),
126-
"zigzag": new ZigZag(env)
127-
}
61+
import Patterns from './patterns/index.js';
12862

12963
const PathHelp = new PathHelper();
13064

0 commit comments

Comments
 (0)