summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarius Kintel <marius@kintel.net>2011-09-08 00:31:27 (GMT)
committerMarius Kintel <marius@kintel.net>2011-09-08 00:31:27 (GMT)
commitfab0f891b79c0c2cbc91120f7648af8a96c6669d (patch)
treed5639805ea0abdd3b104f12b80b523a388dfac90
parent838f1fb8fcb527c5c9628b444f120058bba5479f (diff)
Updated the include tests to provide geometry
-rw-r--r--testdata/scad/features/include test6.scad5
-rw-r--r--testdata/scad/features/include-test5.scad2
-rw-r--r--testdata/scad/features/include-tests.scad (renamed from testdata/scad/features/include-test.scad)10
-rw-r--r--testdata/scad/features/sub1/sub2/sub3/include-test4.scad2
-rw-r--r--testdata/scad/features/sub1/sub2/sub3/sub4/include-test2.scad2
-rw-r--r--testdata/scad/features/sub1/sub2/sub3/sub4/include-test3.scad2
6 files changed, 13 insertions, 10 deletions
diff --git a/testdata/scad/features/include test6.scad b/testdata/scad/features/include test6.scad
index 7a79456..0d96b26 100644
--- a/testdata/scad/features/include test6.scad
+++ b/testdata/scad/features/include test6.scad
@@ -1,4 +1,7 @@
module test6()
{
- echo("included from include test6.scad");
+ difference() {
+ cube(center=true);
+ cylinder(r=0.4, h=2, center=true);
+ }
}
diff --git a/testdata/scad/features/include-test5.scad b/testdata/scad/features/include-test5.scad
index 4f6e656..e4393cb 100644
--- a/testdata/scad/features/include-test5.scad
+++ b/testdata/scad/features/include-test5.scad
@@ -1,4 +1,4 @@
module test5()
{
- echo("included from include-test5.scad");
+ sphere(r=0.5, $fn=8);
}
diff --git a/testdata/scad/features/include-test.scad b/testdata/scad/features/include-tests.scad
index 5db02d7..36c04ca 100644
--- a/testdata/scad/features/include-test.scad
+++ b/testdata/scad/features/include-tests.scad
@@ -28,13 +28,13 @@ include <>
module test1()
{
test2();
- test3();
- test4();
- test5();
- test6();
+ translate([2,0,0]) test3();
+ translate([2,-2,0]) test4();
+ translate([-2,0,0]) test5();
+ translate([-2,-2,0]) test6();
//Just to give a top level object
- sphere(1);
+ translate([0,-2,0]) sphere(0.7, $fn=16);
}
test1();
diff --git a/testdata/scad/features/sub1/sub2/sub3/include-test4.scad b/testdata/scad/features/sub1/sub2/sub3/include-test4.scad
index 1cb7eab..c13368c 100644
--- a/testdata/scad/features/sub1/sub2/sub3/include-test4.scad
+++ b/testdata/scad/features/sub1/sub2/sub3/include-test4.scad
@@ -1,4 +1,4 @@
module test4()
{
- echo("included from include-test4.scad");
+ cylinder(r=0.5, $fn=10, center=true);
}
diff --git a/testdata/scad/features/sub1/sub2/sub3/sub4/include-test2.scad b/testdata/scad/features/sub1/sub2/sub3/sub4/include-test2.scad
index 9f4c963..140c4ed 100644
--- a/testdata/scad/features/sub1/sub2/sub3/sub4/include-test2.scad
+++ b/testdata/scad/features/sub1/sub2/sub3/sub4/include-test2.scad
@@ -6,5 +6,5 @@ include <../include-test4.scad>
module test2 ()
{
- echo("included from include-test2.scad");
+ cube(center=true);
}
diff --git a/testdata/scad/features/sub1/sub2/sub3/sub4/include-test3.scad b/testdata/scad/features/sub1/sub2/sub3/sub4/include-test3.scad
index 2f67e93..6e3537e 100644
--- a/testdata/scad/features/sub1/sub2/sub3/sub4/include-test3.scad
+++ b/testdata/scad/features/sub1/sub2/sub3/sub4/include-test3.scad
@@ -1,4 +1,4 @@
module test3()
{
- echo("included from include-test3.scad");
+ cylinder(r1=0.7, r2=0.2, center=true);
}
contact: Jan Huwald // Impressum