Merge branch 'master' into epec-kernel

9 files changed, 55 insertions, 9 deletions

diff --git a/testdata/scad/features/background-modifier.scad b/testdata/scad/features/background-modifier.scad
index 5430472..d67270e 100644
--- a/testdata/scad/features/background-modifier.scad
+++ b/testdata/scad/features/background-modifier.scad
@@ -3,3 +3,8 @@ difference() {
   %cylinder(h=30, r=6, center=true);
 }
 %if (true) cube([25,6,3], center=true);
+
+%translate([0,-9,0]) difference() {
+  color("green") cube([10,4,10], center=true);
+  color("red") translate([0,-2,0]) sphere(3);
+}
diff --git a/testdata/scad/features/circle-tests.scad b/testdata/scad/features/circle-tests.scad
index 6b54d55..90cd9f6 100644
--- a/testdata/scad/features/circle-tests.scad
+++ b/testdata/scad/features/circle-tests.scad
@@ -8,3 +8,4 @@ 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);
diff --git a/testdata/scad/features/cylinder-tests.scad b/testdata/scad/features/cylinder-tests.scad
index 71f43a6..75b06f2 100644
--- a/testdata/scad/features/cylinder-tests.scad
+++ b/testdata/scad/features/cylinder-tests.scad
@@ -16,5 +16,5 @@ translate([22,11,0]) cylinder(h=15, r=5, r2=5);
 // tend to "abuse" this for captured nut slots
 translate([-10,0,0]) cylinder(h=2, r=3, $fn=6);
 
-
-// FIXME: We could test $fs, $fa, $fn as well
+// Test that we clamp number of sections to a minimum of 3
+translate([-10, -10, 0]) cylinder(r=3.5356, h=7.0711, $fn=0.1, center=true);
diff --git a/testdata/scad/features/highlight-and-background-modifier.scad b/testdata/scad/features/highlight-and-background-modifier.scad
index 5dca703..d97408b 100644
--- a/testdata/scad/features/highlight-and-background-modifier.scad
+++ b/testdata/scad/features/highlight-and-background-modifier.scad
@@ -1,10 +1,31 @@
 difference() {
   sphere(r=10);
   %#cylinder(h=30, r=6, center=true);
-  %#if (true) cube([6,25,3], center=true);
+  %#if (true) cube([25,6,3], center=true);
 }
-translate([13,0,0]) difference() {
-  sphere(r=10);
-  #%cylinder(h=30, r=6, center=true);
-  #%if (true) cube([6,25,3], center=true);
+%#translate([0,-9,0]) difference() {
+  color("green") cube([10,4,10], center=true);
+  color("red") translate([0,-2,0]) sphere(3);
+}
+%translate([13,0,0]){
+  difference() {
+    sphere(r=10);
+    cylinder(h=30, r=6, center=true);
+    if (true) cube([25,6,3], center=true);
+  }
+  #translate([0,-9,0]) difference() {
+    color("green") cube([10,4,10], center=true);
+    color("red") translate([0,-2,0]) sphere(3);
+  }
+}
+#translate([26,0,0]){
+  difference() {
+    sphere(r=10);
+    cylinder(h=30, r=6, center=true);
+    if (true) cube([25,6,3], center=true);
+  }
+  %translate([0,-9,0]) difference() {
+    color("green") cube([10,4,10], center=true);
+    color("red") translate([0,-2,0]) sphere(3);
+  }
 }
diff --git a/testdata/scad/features/highlight-modifier.scad b/testdata/scad/features/highlight-modifier.scad
index f228d08..2141f58 100644
--- a/testdata/scad/features/highlight-modifier.scad
+++ b/testdata/scad/features/highlight-modifier.scad
@@ -3,3 +3,8 @@ difference() {
   #cylinder(h=30, r=6, center=true);
 }
 #if (true) cube([25,6,3], center=true);
+
+#translate([0,-9,0]) difference() {
+  color("green") cube([10,4,10], center=true);
+  color("red") translate([0,-2,0]) sphere(3);
+}
diff --git a/testdata/scad/features/ifelse-tests.scad b/testdata/scad/features/ifelse-tests.scad
index d8c777b..3c72d55 100644
--- a/testdata/scad/features/ifelse-tests.scad
+++ b/testdata/scad/features/ifelse-tests.scad
@@ -1,5 +1,11 @@
-if (true) cube(2, true);
-else cylinder(r=1,h=2);
+if (true) {
+  cube(2, true);
+  translate([-3,0,0]) cube(2, true);
+}
+else {
+  cylinder(r=1,h=2);
+  translate([-3,0,0]) cylinder(r=1,h=2);
+}
 
 translate([3,0,0])
   if (false) cylinder(r=1,h=2);
diff --git a/testdata/scad/features/linear_extrude-tests.scad b/testdata/scad/features/linear_extrude-tests.scad
index 528eea2..680bf53 100644
--- a/testdata/scad/features/linear_extrude-tests.scad
+++ b/testdata/scad/features/linear_extrude-tests.scad
@@ -22,3 +22,6 @@ translate([-15,20,0]) linear_extrude(height=20, scale=[4,5,6]) square(10);
 translate([-10,5,0]) linear_extrude(height=15, scale=-2) square(10, center=true);
 // scale given as undefined
 translate([-15,-15,0]) linear_extrude(height=10, scale=var_undef) square(10);
+
+// height is negative
+translate([0,-25,0]) linear_extrude(-1) square(10, center=true);
diff --git a/testdata/scad/features/rotate_extrude-tests.scad b/testdata/scad/features/rotate_extrude-tests.scad
index 347bc78..010b7d2 100644
--- a/testdata/scad/features/rotate_extrude-tests.scad
+++ b/testdata/scad/features/rotate_extrude-tests.scad
@@ -28,3 +28,7 @@ translate([50,50,0]) {
     translate([-50,0,0]) cube([100,100,100], center=true);
   }
 }
+
+// Minimal $fn
+translate([0,-60,0]) rotate_extrude($fn=1) translate([20,0,0]) circle(r=10,$fn=1);
+
diff --git a/testdata/scad/features/sphere-tests.scad b/testdata/scad/features/sphere-tests.scad
index e666c1b..cc80738 100644
--- a/testdata/scad/features/sphere-tests.scad
+++ b/testdata/scad/features/sphere-tests.scad
@@ -8,3 +8,4 @@ translate([11,11,0]) sphere(5, $fn=15);
 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);