Modified tests for #304

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);
+}

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);
+  }
 }

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);
+}

tests/CMakeLists.txt

@@ -833,10 +833,7 @@ disable_tests(cgalpngtest_child-background
               cgalpngtest_testcolornames
               openscad-cgalpng_child-background
               openscad-cgalpng_highlight-and-background-modifier
-              openscad-cgalpng_testcolornames
-              throwntogethertest_child-background
-              throwntogethertest_highlight-and-background-modifier
-              throwntogethertest_testcolornames)
+              openscad-cgalpng_testcolornames)
 
 # Test config handling
 

tests/regression/dumptest/background-modifier-expected.txt

@@ -5,4 +5,16 @@
 	%group() {
 		cube(size = [25, 6, 3], center = true);
 	}
+	%multmatrix([[1, 0, 0, 0], [0, 1, 0, -9], [0, 0, 1, 0], [0, 0, 0, 1]]) {
+		difference() {
+			color([0, 0.501961, 0, 1]) {
+				cube(size = [10, 4, 10], center = true);
+			}
+			color([1, 0, 0, 1]) {
+				multmatrix([[1, 0, 0, 0], [0, 1, 0, -2], [0, 0, 1, 0], [0, 0, 0, 1]]) {
+					sphere($fn = 0, $fa = 12, $fs = 2, r = 3);
+				}
+			}
+		}
+	}
 

tests/regression/dumptest/highlight-and-background-modifier-expected.txt

@@ -2,15 +2,60 @@
 		sphere($fn = 0, $fa = 12, $fs = 2, r = 10);
 		%cylinder($fn = 0, $fa = 12, $fs = 2, h = 30, r1 = 6, r2 = 6, center = true);
 		%group() {
-			cube(size = [6, 25, 3], center = true);
+			cube(size = [25, 6, 3], center = true);
 		}
 	}
-	multmatrix([[1, 0, 0, 13], [0, 1, 0, 0], [0, 0, 1, 0], [0, 0, 0, 1]]) {
+	%multmatrix([[1, 0, 0, 0], [0, 1, 0, -9], [0, 0, 1, 0], [0, 0, 0, 1]]) {
+		difference() {
+			color([0, 0.501961, 0, 1]) {
+				cube(size = [10, 4, 10], center = true);
+			}
+			color([1, 0, 0, 1]) {
+				multmatrix([[1, 0, 0, 0], [0, 1, 0, -2], [0, 0, 1, 0], [0, 0, 0, 1]]) {
+					sphere($fn = 0, $fa = 12, $fs = 2, r = 3);
+				}
+			}
+		}
+	}
+	%multmatrix([[1, 0, 0, 13], [0, 1, 0, 0], [0, 0, 1, 0], [0, 0, 0, 1]]) {
 		difference() {
 			sphere($fn = 0, $fa = 12, $fs = 2, r = 10);
-			%cylinder($fn = 0, $fa = 12, $fs = 2, h = 30, r1 = 6, r2 = 6, center = true);
-			%group() {
-				cube(size = [6, 25, 3], center = true);
+			cylinder($fn = 0, $fa = 12, $fs = 2, h = 30, r1 = 6, r2 = 6, center = true);
+			group() {
+				cube(size = [25, 6, 3], center = true);
+			}
+		}
+		multmatrix([[1, 0, 0, 0], [0, 1, 0, -9], [0, 0, 1, 0], [0, 0, 0, 1]]) {
+			difference() {
+				color([0, 0.501961, 0, 1]) {
+					cube(size = [10, 4, 10], center = true);
+				}
+				color([1, 0, 0, 1]) {
+					multmatrix([[1, 0, 0, 0], [0, 1, 0, -2], [0, 0, 1, 0], [0, 0, 0, 1]]) {
+						sphere($fn = 0, $fa = 12, $fs = 2, r = 3);
+					}
+				}
+			}
+		}
+	}
+	multmatrix([[1, 0, 0, 26], [0, 1, 0, 0], [0, 0, 1, 0], [0, 0, 0, 1]]) {
+		difference() {
+			sphere($fn = 0, $fa = 12, $fs = 2, r = 10);
+			cylinder($fn = 0, $fa = 12, $fs = 2, h = 30, r1 = 6, r2 = 6, center = true);
+			group() {
+				cube(size = [25, 6, 3], center = true);
+			}
+		}
+		%multmatrix([[1, 0, 0, 0], [0, 1, 0, -9], [0, 0, 1, 0], [0, 0, 0, 1]]) {
+			difference() {
+				color([0, 0.501961, 0, 1]) {
+					cube(size = [10, 4, 10], center = true);
+				}
+				color([1, 0, 0, 1]) {
+					multmatrix([[1, 0, 0, 0], [0, 1, 0, -2], [0, 0, 1, 0], [0, 0, 0, 1]]) {
+						sphere($fn = 0, $fa = 12, $fs = 2, r = 3);
+					}
+				}
 			}
 		}
 	}

tests/regression/dumptest/highlight-modifier-expected.txt

@@ -5,4 +5,16 @@
 	group() {
 		cube(size = [25, 6, 3], center = true);
 	}
+	multmatrix([[1, 0, 0, 0], [0, 1, 0, -9], [0, 0, 1, 0], [0, 0, 0, 1]]) {
+		difference() {
+			color([0, 0.501961, 0, 1]) {
+				cube(size = [10, 4, 10], center = true);
+			}
+			color([1, 0, 0, 1]) {
+				multmatrix([[1, 0, 0, 0], [0, 1, 0, -2], [0, 0, 1, 0], [0, 0, 0, 1]]) {
+					sphere($fn = 0, $fa = 12, $fs = 2, r = 3);
+				}
+			}
+		}
+	}