Merge branch 'master' of github.com:openscad/openscad into colorsfix

13 files changed, 57 insertions, 8 deletions

diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 70e56c6..0be819b 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -507,6 +507,7 @@ set(CORE_SOURCES
   ../src/linalg.cc
   ../src/handle_dep.cc 
   ../src/value.cc 
+  ../src/calc.cc 
   ../src/expr.cc 
   ../src/func.cc 
   ../src/localscope.cc 
diff --git a/tests/regression/cgalpngtest/difference-2d-tests-expected.png b/tests/regression/cgalpngtest/difference-2d-tests-expected.png
new file mode 100644
index 0000000..1476953
--- /dev/null
+++ b/tests/regression/cgalpngtest/difference-2d-tests-expected.png
diff --git a/tests/regression/cgalpngtest/difference-tests-expected.png b/tests/regression/cgalpngtest/difference-tests-expected.png
index e672c48..bd27d89 100644
--- a/tests/regression/cgalpngtest/difference-tests-expected.png
+++ b/tests/regression/cgalpngtest/difference-tests-expected.png
diff --git a/tests/regression/cgalpngtest/linear_extrude-tests-expected.png b/tests/regression/cgalpngtest/linear_extrude-tests-expected.png
index c85142e..597b148 100644
--- a/tests/regression/cgalpngtest/linear_extrude-tests-expected.png
+++ b/tests/regression/cgalpngtest/linear_extrude-tests-expected.png
diff --git a/tests/regression/dumptest/difference-2d-tests-expected.csg b/tests/regression/dumptest/difference-2d-tests-expected.csg
new file mode 100644
index 0000000..7bc257d
--- /dev/null
+++ b/tests/regression/dumptest/difference-2d-tests-expected.csg
@@ -0,0 +1,36 @@
+group() {
+	difference() {
+		square(size = [10, 10], center = true);
+		circle($fn = 0, $fa = 12, $fs = 2, r = 4);
+	}
+	multmatrix([[1, 0, 0, 12], [0, 1, 0, 0], [0, 0, 1, 0], [0, 0, 0, 1]]) {
+		difference() {
+			square(size = [10, 10], center = true);
+			multmatrix([[1, 0, 0, 2], [0, 1, 0, 2], [0, 0, 1, 0], [0, 0, 0, 1]]) {
+				circle($fn = 0, $fa = 12, $fs = 2, r = 2);
+			}
+			multmatrix([[1, 0, 0, -2], [0, 1, 0, -2], [0, 0, 1, 0], [0, 0, 0, 1]]) {
+				circle($fn = 0, $fa = 12, $fs = 2, r = 2);
+			}
+		}
+	}
+	multmatrix([[1, 0, 0, 12], [0, 1, 0, 12], [0, 0, 1, 0], [0, 0, 0, 1]]) {
+		difference() {
+			square(size = [0, 10], center = true);
+			circle($fn = 0, $fa = 12, $fs = 2, r = 4);
+		}
+	}
+	multmatrix([[1, 0, 0, 0], [0, 1, 0, 12], [0, 0, 1, 0], [0, 0, 0, 1]]) {
+		difference() {
+			group();
+			square(size = [10, 10], center = true);
+			circle($fn = 0, $fa = 12, $fs = 2, r = 4);
+		}
+	}
+	multmatrix([[1, 0, 0, 24], [0, 1, 0, 0], [0, 0, 1, 0], [0, 0, 0, 1]]) {
+		difference() {
+			square(size = [10, 10], center = true);
+			sphere($fn = 0, $fa = 12, $fs = 2, r = 4);
+		}
+	}
+}
diff --git a/tests/regression/dumptest/difference-tests-expected.csg b/tests/regression/dumptest/difference-tests-expected.csg
index d5d2bb3..8ff8a24 100644
--- a/tests/regression/dumptest/difference-tests-expected.csg
+++ b/tests/regression/dumptest/difference-tests-expected.csg
@@ -5,12 +5,6 @@ group() {
 		cube(size = [10, 10, 10], center = true);
 		cylinder($fn = 0, $fa = 12, $fs = 2, h = 20, r1 = 4, r2 = 4, center = true);
 	}
-	multmatrix([[1, 0, 0, 12], [0, 1, 0, 0], [0, 0, 1, 0], [0, 0, 0, 1]]) {
-		difference() {
-			cube(size = [10, 10, 10], center = true);
-			cylinder($fn = 0, $fa = 12, $fs = 2, h = 10.5, r1 = 4, r2 = 4, center = true);
-		}
-	}
 	multmatrix([[1, 0, 0, 0], [0, 1, 0, 12], [0, 0, 1, 0], [0, 0, 0, 1]]) {
 		difference() {
 			cube(size = [10, 10, 10], center = true);
@@ -42,4 +36,17 @@ group() {
 			cylinder($fn = 0, $fa = 12, $fs = 2, h = 20, r1 = 4, r2 = 4, center = true);
 		}
 	}
+	multmatrix([[1, 0, 0, 24], [0, 1, 0, -12], [0, 0, 1, 0], [0, 0, 0, 1]]) {
+		difference() {
+			group();
+			cube(size = [10, 10, 10], center = true);
+			cylinder($fn = 0, $fa = 12, $fs = 2, h = 20, r1 = 4, r2 = 4, center = true);
+		}
+	}
+	multmatrix([[1, 0, 0, 12], [0, 1, 0, 0], [0, 0, 1, 0], [0, 0, 0, 1]]) {
+		difference() {
+			cube(size = [10, 10, 10], center = true);
+			circle($fn = 0, $fa = 12, $fs = 2, r = 6);
+		}
+	}
 }
diff --git a/tests/regression/dumptest/linear_extrude-tests-expected.csg b/tests/regression/dumptest/linear_extrude-tests-expected.csg
index a0deb81..539412d 100644
--- a/tests/regression/dumptest/linear_extrude-tests-expected.csg
+++ b/tests/regression/dumptest/linear_extrude-tests-expected.csg
@@ -21,8 +21,13 @@ group() {
 		}
 	}
 	multmatrix([[1, 0, 0, 0], [0, 1, 0, 20], [0, 0, 1, 0], [0, 0, 0, 1]]) {
-		linear_extrude(height = 20, center = false, convexity = 1, twist = 45, slices = 2, scale = [1, 1], $fn = 0, $fa = 12, $fs = 2) {
-			square(size = [10, 10], center = false);
+		linear_extrude(height = 20, center = false, convexity = 1, twist = 30, slices = 2, scale = [1, 1], $fn = 0, $fa = 12, $fs = 2) {
+			difference() {
+				square(size = [10, 10], center = false);
+				multmatrix([[1, 0, 0, 1], [0, 1, 0, 1], [0, 0, 1, 0], [0, 0, 0, 1]]) {
+					square(size = [8, 8], center = false);
+				}
+			}
 		}
 	}
 	multmatrix([[1, 0, 0, 19], [0, 1, 0, 20], [0, 0, 1, 0], [0, 0, 0, 1]]) {
diff --git a/tests/regression/opencsgtest/difference-2d-tests-expected.png b/tests/regression/opencsgtest/difference-2d-tests-expected.png
new file mode 100644
index 0000000..ec45e77
--- /dev/null
+++ b/tests/regression/opencsgtest/difference-2d-tests-expected.png
diff --git a/tests/regression/opencsgtest/difference-tests-expected.png b/tests/regression/opencsgtest/difference-tests-expected.png
index 8db2742..69a4ac2 100644
--- a/tests/regression/opencsgtest/difference-tests-expected.png
+++ b/tests/regression/opencsgtest/difference-tests-expected.png
diff --git a/tests/regression/opencsgtest/linear_extrude-tests-expected.png b/tests/regression/opencsgtest/linear_extrude-tests-expected.png
index cbbdc11..faba00e 100644
--- a/tests/regression/opencsgtest/linear_extrude-tests-expected.png
+++ b/tests/regression/opencsgtest/linear_extrude-tests-expected.png
diff --git a/tests/regression/throwntogethertest/difference-2d-tests-expected.png b/tests/regression/throwntogethertest/difference-2d-tests-expected.png
new file mode 100644
index 0000000..4aae3be
--- /dev/null
+++ b/tests/regression/throwntogethertest/difference-2d-tests-expected.png
diff --git a/tests/regression/throwntogethertest/difference-tests-expected.png b/tests/regression/throwntogethertest/difference-tests-expected.png
index 7a61f42..0227306 100644
--- a/tests/regression/throwntogethertest/difference-tests-expected.png
+++ b/tests/regression/throwntogethertest/difference-tests-expected.png
diff --git a/tests/regression/throwntogethertest/linear_extrude-tests-expected.png b/tests/regression/throwntogethertest/linear_extrude-tests-expected.png
index cbbdc11..faba00e 100644
--- a/tests/regression/throwntogethertest/linear_extrude-tests-expected.png
+++ b/tests/regression/throwntogethertest/linear_extrude-tests-expected.png