Skip to content

Commit f5df152

Browse files
committed
Adjusted tutorial examples
1 parent 3155173 commit f5df152

File tree

7 files changed

+89
-30
lines changed

7 files changed

+89
-30
lines changed

examples/docs-web-tutorial/tutorial_10.js

Lines changed: 7 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -5,31 +5,26 @@ var position = [0, 0, layerHeight*2];
55
var radius = 40;
66
var nbLayers = 40;
77
var nbPointsInLayer = 50;
8-
var nozzleDiameter = layerThickness;
8+
99

1010
// SHAPING PARAMETERS
1111
var radiusShapingParameter = sinusoidal(10, 10, 20, nbPointsInLayer, 0, "");
1212
var scaleShapingParameter = sinusoidal(18, 60, -5.5, nbLayers, 0, "");
1313
var linearScaleSP = linear(.02, -.4, nbLayers, 0, "");
1414
var scalingRadiusParameter = sinusoidal(.7, 30, -12, nbLayers, linearScaleSP, "multiplicative");
1515
var translateShapingParameter = sinusoidal2D(4, 30, 4, 20, 0, 0, nbLayers, 0, 0, "");
16-
var rotateShapingParameter = exponential(1.5, 1.12, 1, -9, nbLayers, 0, "");
17-
var thicknessShapingParameter = linear(-.03, .8, nbPointsInLayer, 0, "");
16+
var rotateShapingParameter = exponential(2.1, 1.12, 1, -9, nbLayers, 0, "");
17+
var thicknessShapingParameter = square(1, nbPointsInLayer/5, 0, 8, nbLayers*nbPointsInLayer, 0, "");
1818

1919
// GENERATE TOOLPATH
2020
var toolpath = toolpathUnitGenerator(position, radius, layerHeight, nbLayers, nbPointsInLayer, radiusShapingParameter, scaleShapingParameter, scalingRadiusParameter, translateShapingParameter, rotateShapingParameter, thicknessShapingParameter);
2121

22-
// ADD BASE TO TOOLPATH, SPIRALIZE AND CENTER
23-
var b = base(position, radius, layerHeight, nbPointsInLayer, nozzleDiameter, toolpath);
22+
// ADD BASE TO TOOLPATH
23+
var b = base(position, 56, layerHeight, nbPointsInLayer, layerThickness, toolpath);
2424
toolpath = b.concat(toolpath);
25-
toolpath = spiralize(toolpath, layerHeight);
26-
var potterbotBedSize = [280, 265, 305];
27-
// toolpath = centerPrint(toolpath, position, potterbotBedSize, layerHeight);
2825

29-
// PRINT GCODE
30-
var potterbotPrintSpeed = 30;
31-
var gcodeString = generateGCode(toolpath, layerHeight, nozzleDiameter);
32-
// downloadGCode(gcodeString, "demo_vase.gcode");
26+
// SPIRALIZE
27+
toolpath = spiralize(toolpath, layerHeight);
3328

3429
// DISPLAY PATH
3530
updatePath(toolpath);
Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
// INITIALIZATION PARAMETERS
2+
var layerThickness = 6; //6 mm
3+
var layerHeight = layerThickness * .5;
4+
var position = [0, 0, layerHeight*2];
5+
var radius = 40;
6+
var nbLayers = 40;
7+
var nbPointsInLayer = 50;
8+
9+
10+
// SHAPING PARAMETERS
11+
var radiusShapingParameter = sinusoidal(10, 10, 20, nbPointsInLayer, 0, "");
12+
var scaleShapingParameter = sinusoidal(18, 60, -5.5, nbLayers, 0, "");
13+
var linearScaleSP = linear(.02, -.4, nbLayers, 0, "");
14+
var scalingRadiusParameter = sinusoidal(.7, 30, -12, nbLayers, linearScaleSP, "multiplicative");
15+
var translateShapingParameter = sinusoidal2D(4, 30, 4, 20, 0, 0, nbLayers, 0, 0, "");
16+
var rotateShapingParameter = exponential(2.1, 1.12, 1, -9, nbLayers, 0, "");
17+
var thicknessShapingParameter = square(1, nbPointsInLayer/5, 0, 8, nbLayers*nbPointsInLayer, 0, "");
18+
19+
// GENERATE TOOLPATH
20+
var toolpath = toolpathUnitGenerator(position, radius, layerHeight, nbLayers, nbPointsInLayer, radiusShapingParameter, scaleShapingParameter, scalingRadiusParameter, translateShapingParameter, rotateShapingParameter, thicknessShapingParameter);
21+
22+
// ADD BASE TO TOOLPATH
23+
var b = base(position, 56, layerHeight, nbPointsInLayer, layerThickness, toolpath);
24+
toolpath = b.concat(toolpath);
25+
26+
// SPIRALIZE
27+
toolpath = spiralize(toolpath, layerHeight);
28+
29+
// CENTER PRINT
30+
var potterbotBedSize = [280, 265, 305];
31+
toolpath = centerPrint(toolpath, [0, 0, 0]);
32+
33+
// DISPLAY PATH
34+
updatePath(toolpath);
Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
// INITIALIZATION PARAMETERS
2+
var layerThickness = 6; //6 mm
3+
var layerHeight = layerThickness * .5;
4+
var position = [0, 0, layerHeight*2];
5+
var radius = 40;
6+
var nbLayers = 40;
7+
var nbPointsInLayer = 50;
8+
9+
10+
// SHAPING PARAMETERS
11+
var radiusShapingParameter = sinusoidal(10, 10, 20, nbPointsInLayer, 0, "");
12+
var scaleShapingParameter = sinusoidal(18, 60, -5.5, nbLayers, 0, "");
13+
var linearScaleSP = linear(.02, -.4, nbLayers, 0, "");
14+
var scalingRadiusParameter = sinusoidal(.7, 30, -12, nbLayers, linearScaleSP, "multiplicative");
15+
var translateShapingParameter = sinusoidal2D(4, 30, 4, 20, 0, 0, nbLayers, 0, 0, "");
16+
var rotateShapingParameter = exponential(2.1, 1.12, 1, -9, nbLayers, 0, "");
17+
var thicknessShapingParameter = square(1, nbPointsInLayer/5, 0, 8, nbLayers*nbPointsInLayer, 0, "");
18+
19+
// GENERATE TOOLPATH
20+
var toolpath = toolpathUnitGenerator(position, radius, layerHeight, nbLayers, nbPointsInLayer, radiusShapingParameter, scaleShapingParameter, scalingRadiusParameter, translateShapingParameter, rotateShapingParameter, thicknessShapingParameter);
21+
22+
// ADD BASE TO TOOLPATH
23+
var b = base(position, 56, layerHeight, nbPointsInLayer, layerThickness, toolpath);
24+
toolpath = b.concat(toolpath);
25+
26+
// SPIRALIZE
27+
toolpath = spiralize(toolpath, layerHeight);
28+
29+
// CENTER PRINT
30+
var potterbotBedSize = [280, 265, 305];
31+
toolpath = centerPrint(toolpath, [0, 0, 0]);
32+
33+
// DISPLAY PATH
34+
updatePath(toolpath);
35+
36+
// GENERATE AND DOWNLOAD GCODE
37+
var gcode = generateGCode(toolpath, layerHeight, layerThickness);
38+
//downloadGCode(gcode, "tutorial.gcode");

examples/docs-web-tutorial/tutorial_4.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ var nbPointsInLayer = 50;
1010
// SHAPING PARAMETERS
1111
var radiusShapingParameter = sinusoidal(10, 10, 20, nbPointsInLayer, 0, "");
1212
var scaleShapingParameter = sinusoidal(18, 60, -5.5, nbLayers, 0, "");
13-
var scalingRadiusParameter = sinusoidal(.6, 30, -12, nbLayers, 0, "");
13+
var scalingRadiusParameter = sinusoidal(.7, 30, -12, nbLayers, 0, "");
1414

1515
// GENERATE TOOLPATH
1616
var toolpath = toolpathUnitGenerator(position, radius, layerHeight, nbLayers, nbPointsInLayer, radiusShapingParameter, scaleShapingParameter, scalingRadiusParameter, [], [], []);

examples/docs-web-tutorial/tutorial_7.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ var scaleShapingParameter = sinusoidal(18, 60, -5.5, nbLayers, 0, "");
1313
var linearScaleSP = linear(.02, -.4, nbLayers, 0, "");
1414
var scalingRadiusParameter = sinusoidal(.7, 30, -12, nbLayers, linearScaleSP, "multiplicative");
1515
var translateShapingParameter = sinusoidal2D(4, 30, 4, 20, 0, 0, nbLayers, 0, 0, "");
16-
var rotateShapingParameter = exponential(1.5, 1.12, 1, -9, nbLayers, 0, "");
16+
var rotateShapingParameter = exponential(2.1, 1.12, 1, -9, nbLayers, 0, "");
1717

1818
// GENERATE TOOLPATH
1919
var toolpath = toolpathUnitGenerator(position, radius, layerHeight, nbLayers, nbPointsInLayer, radiusShapingParameter, scaleShapingParameter, scalingRadiusParameter, translateShapingParameter, rotateShapingParameter, []);

examples/docs-web-tutorial/tutorial_8.js

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,8 @@ var scaleShapingParameter = sinusoidal(18, 60, -5.5, nbLayers, 0, "");
1313
var linearScaleSP = linear(.02, -.4, nbLayers, 0, "");
1414
var scalingRadiusParameter = sinusoidal(.7, 30, -12, nbLayers, linearScaleSP, "multiplicative");
1515
var translateShapingParameter = sinusoidal2D(4, 30, 4, 20, 0, 0, nbLayers, 0, 0, "");
16-
var rotateShapingParameter = exponential(1.5, 1.12, 1, -9, nbLayers, 0, "");
17-
var thicknessShapingParameter = linear(-.03, .8, nbPointsInLayer, 0, "");
18-
19-
// Repeat each point in thicknessShapingParameter nbLayers times
20-
thicknessShapingParameter = thicknessShapingParameter.flatMap(num => Array(nbLayers).fill(num));
16+
var rotateShapingParameter = exponential(2.1, 1.12, 1, -9, nbLayers, 0, "");
17+
var thicknessShapingParameter = square(1, nbPointsInLayer/5, 0, 8, nbLayers*nbPointsInLayer, 0, "");
2118

2219
// GENERATE TOOLPATH
2320
var toolpath = toolpathUnitGenerator(position, radius, layerHeight, nbLayers, nbPointsInLayer, radiusShapingParameter, scaleShapingParameter, scalingRadiusParameter, translateShapingParameter, rotateShapingParameter, thicknessShapingParameter);
Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,27 @@
11
// INITIALIZATION PARAMETERS
22
var layerThickness = 6; //6 mm
33
var layerHeight = layerThickness * .5;
4-
var position = [0, 0, layerHeight*3];
4+
var position = [0, 0, layerHeight*2];
55
var radius = 40;
66
var nbLayers = 40;
77
var nbPointsInLayer = 50;
88

9+
910
// SHAPING PARAMETERS
1011
var radiusShapingParameter = sinusoidal(10, 10, 20, nbPointsInLayer, 0, "");
1112
var scaleShapingParameter = sinusoidal(18, 60, -5.5, nbLayers, 0, "");
1213
var linearScaleSP = linear(.02, -.4, nbLayers, 0, "");
1314
var scalingRadiusParameter = sinusoidal(.7, 30, -12, nbLayers, linearScaleSP, "multiplicative");
1415
var translateShapingParameter = sinusoidal2D(4, 30, 4, 20, 0, 0, nbLayers, 0, 0, "");
15-
var rotateShapingParameter = exponential(1.5, 1.12, 1, -9, nbLayers, 0, "");
16-
var thicknessShapingParameter = linear(-.03, .8, nbPointsInLayer, 0, "");
17-
18-
// Repeat each point in thicknessShapingParameter nbLayers times
19-
thicknessShapingParameter = thicknessShapingParameter.flatMap(num => Array(nbLayers).fill(num));
16+
var rotateShapingParameter = exponential(2.1, 1.12, 1, -9, nbLayers, 0, "");
17+
var thicknessShapingParameter = square(1, nbPointsInLayer/5, 0, 8, nbLayers*nbPointsInLayer, 0, "");
2018

2119
// GENERATE TOOLPATH
2220
var toolpath = toolpathUnitGenerator(position, radius, layerHeight, nbLayers, nbPointsInLayer, radiusShapingParameter, scaleShapingParameter, scalingRadiusParameter, translateShapingParameter, rotateShapingParameter, thicknessShapingParameter);
2321

24-
// ADD BASE TO TOOLPATH, SPIRALIZE AND CENTER
25-
var b = base(position, toolpath, nbPointsInLayer, layerHeight, layerThickness, 53);
22+
// ADD BASE TO TOOLPATH
23+
var b = base(position, 56, layerHeight, nbPointsInLayer, layerThickness, toolpath);
2624
toolpath = b.concat(toolpath);
27-
toolpath = spiralize(toolpath, layerHeight);
28-
var potterbotBedSize = [280, 265, 305];
29-
toolpath = centerPrint(toolpath, position, potterbotBedSize, layerHeight);
3025

3126
// DISPLAY PATH
3227
updatePath(toolpath);

0 commit comments

Comments
 (0)