summaryrefslogtreecommitdiff
path: root/testdata
diff options
context:
space:
mode:
authorMarius Kintel <marius@kintel.net>2013-12-28 22:11:56 (GMT)
committerMarius Kintel <marius@kintel.net>2013-12-28 22:11:56 (GMT)
commitb272d1f0defa8dd908217ccd43a48eb60735d2d4 (patch)
treeaceb4f489e474d794519a5ab856b6af9c3c4b92d /testdata
parentce8bf70604b4366a1b5feb6f399be7d9a43516f9 (diff)
Added mixed 2D and 3D object for difference tests
Diffstat (limited to 'testdata')
-rw-r--r--testdata/scad/features/difference-2d-tests.scad6
-rw-r--r--testdata/scad/features/difference-tests.scad17
2 files changed, 17 insertions, 6 deletions
diff --git a/testdata/scad/features/difference-2d-tests.scad b/testdata/scad/features/difference-2d-tests.scad
index af74b50..bb798c2 100644
--- a/testdata/scad/features/difference-2d-tests.scad
+++ b/testdata/scad/features/difference-2d-tests.scad
@@ -21,3 +21,9 @@ translate([0,12]) difference() {
square(10, center=true);
circle(r=4);
}
+
+// Subtract 3D from 2D
+translate([24,0]) difference() {
+ square(10, center=true);
+ sphere(r=4);
+}
diff --git a/testdata/scad/features/difference-tests.scad b/testdata/scad/features/difference-tests.scad
index 4e4b218..0751213 100644
--- a/testdata/scad/features/difference-tests.scad
+++ b/testdata/scad/features/difference-tests.scad
@@ -3,27 +3,26 @@ difference();
// No children
difference() { }
+// Basic
difference() {
cube([10,10,10], center=true);
cylinder(r=4, h=20, center=true);
}
-translate([12,0,0]) difference() {
- cube([10,10,10], center=true);
- cylinder(r=4, h=10.5, center=true);
-}
-
+// Two negative objects
translate([0,12,0]) difference() {
cube([10,10,10], center=true);
cylinder(r=4, h=11, center=true);
rotate([0,90,0]) cylinder(r=4, h=11, center=true);
}
+// Not intersecting
translate([12,12,0]) difference() {
cube([10,10,10], center=true);
translate([0,0,7.01]) cylinder(r=4, h=4, center=true);
}
+// Barely intersecting
translate([24,0,0]) difference() {
cube([10,10,10], center=true);
translate([0,0,6.99]) cylinder(r=4, h=4, center=true);
@@ -36,8 +35,14 @@ translate([24,12,0]) difference() {
}
// Non-geometry (echo) statement as first child should be ignored
-translate([0,-12,0]) difference() {
+translate([24,-12,0]) difference() {
echo("difference-tests");
cube([10,10,10], center=true);
cylinder(r=4, h=20, center=true);
}
+
+// Subtracting 2D from 3D
+translate([12,0,0]) difference() {
+ cube([10,10,10], center=true);
+ circle(r=6);
+}
contact: Jan Huwald // Impressum