diff options
| author | Marius Kintel <marius@kintel.net> | 2013-10-21 18:47:15 (GMT) |
|---|---|---|
| committer | Marius Kintel <marius@kintel.net> | 2013-10-21 18:47:15 (GMT) |
| commit | f6b381fc7e3d10b6f8940b4222415f16d85ae422 (patch) | |
| tree | c80b9777d10714790fe278b5527da05fc018945a /testdata | |
| parent | 170d4a54970f34d4790b0b3ae3a3d4f2f7502660 (diff) | |
| parent | 74082c8cff46863fe56ddc9de93cca57b610c4d9 (diff) | |
Merge pull request #509 from t-paul/issue392
Add diameter variable to the sphere, cylinder and circle primitives.
Diffstat (limited to 'testdata')
| -rw-r--r-- | testdata/scad/features/circle-tests.scad | 4 | ||||
| -rw-r--r-- | testdata/scad/features/cylinder-diameter-tests.scad | 13 | ||||
| -rw-r--r-- | testdata/scad/features/sphere-tests.scad | 2 |
3 files changed, 18 insertions, 1 deletions
diff --git a/testdata/scad/features/circle-tests.scad b/testdata/scad/features/circle-tests.scad index 90cd9f6..57b1992 100644 --- a/testdata/scad/features/circle-tests.scad +++ b/testdata/scad/features/circle-tests.scad @@ -8,4 +8,6 @@ translate([6,-3,0]) circle(1, $fn=12); translate([0,-6,0]) circle(1, $fa=20, $fs=0.3); translate([3,-6,0]) circle(1, $fa=30, $fs=0.3); translate([6,-6,0]) circle(1, $fa=40, $fs=0.3); -translate([3,-9,0]) circle(1, $fn=0.1); +translate([0,-9,0]) circle(1, $fn=0.1); +translate([3,-9,0]) circle(d=2, $fn=8); +translate([6,-9,0]) circle(r=10, d=2, $fn=8); diff --git a/testdata/scad/features/cylinder-diameter-tests.scad b/testdata/scad/features/cylinder-diameter-tests.scad new file mode 100644 index 0000000..57eab65 --- /dev/null +++ b/testdata/scad/features/cylinder-diameter-tests.scad @@ -0,0 +1,13 @@ +cylinder(); +translate([-11,-11,0]) cylinder(h=3, r=5); +translate([-11, 0,0]) cylinder(h=5, d=10); +translate([-11, 11,0]) cylinder(h=7, r=1, d=10); +translate([ 11,-11,0]) cylinder(h=5, r1=5); +translate([ 11, 0,0]) cylinder(h=7, d1=10); +translate([ 11, 11,0]) cylinder(h=9, r1=1, d1=10); +translate([ 22,-11,0]) cylinder(h=5, r2=5); +translate([ 22, 0,0]) cylinder(h=7, d2=10); +translate([ 22, 11,0]) cylinder(h=9, r2=1, d2=10); +translate([ 33,-11,0]) cylinder(h=5, r1=5, r2=5); +translate([ 33, 0,0]) cylinder(h=7, d1=10, d2=10); +translate([ 33, 11,0]) cylinder(h=9, r1=1, d1=10, r2=1, d2=10); diff --git a/testdata/scad/features/sphere-tests.scad b/testdata/scad/features/sphere-tests.scad index cc80738..5c38f6b 100644 --- a/testdata/scad/features/sphere-tests.scad +++ b/testdata/scad/features/sphere-tests.scad @@ -9,3 +9,5 @@ translate([22,-11, 0]) sphere(5, $fa=20, $fs=0.3); translate([22, 0, 0]) sphere(5, $fa=30, $fs=0.3); translate([22, 11, 0]) sphere(5, $fa=40, $fs=0.3); translate([11, 22, 0]) sphere(5, $fn=0.1); +translate([33, 0, 0]) sphere(d=10); +translate([33, 11, 0]) sphere(r=1, d=10); |