Removed use of deprecated rotate_extrude variant

kintel · kintel · commit 541352acad8e · 2015-03-12T00:04:54.000-04:00
diff --git a/examples/Old/example007.scad b/examples/Old/example007.scad
@@ -18,11 +18,9 @@ module cutout()
 module clip()
 {
   difference() {
-    // NB! We have to use the deprecated module here since the "dorn"
-                // layer contains an open polyline, which is not yet supported
-                // by the import() module.
-    rotate_extrude(file = "example007.dxf",
-                   layer="dorn", convexity = 3);
+    rotate_extrude(convexity = 3, $fn = 0, $fa = 12, $fs = 2) {
+      import(file = "example007.dxf", layer = "dorn");
+    }
     for (r = [0, 90])
       rotate(r, [0, 0, 1])
         cutout();
diff --git a/examples/Old/example009.scad b/examples/Old/example009.scad
@@ -20,11 +20,8 @@ intersection() {
   linear_extrude(height = fanwidth, center = true, convexity = 10, twist = -fanrot)
     import(file = "example009.dxf", layer = "fan_top");
     
-  // NB! We have to use the deprecated module here since the "fan_side"
-  // layer contains an open polyline, which is not yet supported
-  // by the import() module.
-  rotate_extrude(file = "example009.dxf", layer = "fan_side",
-                 origin = fan_side_center, convexity = 10);
+  rotate_extrude(convexity = 10)
+    import(file = "example009.dxf", layer = "fan_side", origin = [0, -40]);
 }
 
 // Written by Clifford Wolf <clifford@clifford.at> and Marius
diff --git a/tests/regression/dumptest-examples/example007-expected.csg b/tests/regression/dumptest-examples/example007-expected.csg
@@ -3,7 +3,9 @@ group() {
 	multmatrix([[1, 0, 0, 0], [0, 1, 0, 0], [0, 0, 1, -10], [0, 0, 0, 1]]) {
 		group() {
 			difference() {
-				rotate_extrude(file = "example007.dxf", layer = "dorn", origin = [0, 0], scale = 1, convexity = 3, $fn = 0, $fa = 12, $fs = 2);
+				rotate_extrude(convexity = 3, $fn = 0, $fa = 12, $fs = 2) {
+					import(file = "example007.dxf", layer = "dorn", origin = [0, 0], scale = 1, convexity = 1, $fn = 0, $fa = 12, $fs = 2);
+				}
 				group() {
 					multmatrix([[1, 0, 0, 0], [0, 1, 0, 0], [0, 0, 1, 0], [0, 0, 0, 1]]) {
 						group() {
diff --git a/tests/regression/dumptest-examples/example009-expected.csg b/tests/regression/dumptest-examples/example009-expected.csg
@@ -19,6 +19,8 @@ group() {
 		linear_extrude(height = 20, center = true, convexity = 10, twist = -57.5288, slices = 4, scale = [1, 1], $fn = 0, $fa = 12, $fs = 2) {
 			import(file = "example009.dxf", layer = "fan_top", origin = [0, 0], scale = 1, convexity = 1, $fn = 0, $fa = 12, $fs = 2);
 		}
-		rotate_extrude(file = "example009.dxf", layer = "fan_side", origin = [0, -40], scale = 1, convexity = 10, $fn = 0, $fa = 12, $fs = 2);
+		rotate_extrude(convexity = 10, $fn = 0, $fa = 12, $fs = 2) {
+			import(file = "example009.dxf", layer = "fan_side", origin = [0, -40], scale = 1, convexity = 1, $fn = 0, $fa = 12, $fs = 2);
+		}
 	}
 }

Original file line number	Diff line number	Diff line change
`@@ -19,6 +19,8 @@ group() {`
`19`	`19`	`linear_extrude(height = 20, center = true, convexity = 10, twist = -57.5288, slices = 4, scale = [1, 1], $fn = 0, $fa = 12, $fs = 2) {`
`20`	`20`	`import(file = "example009.dxf", layer = "fan_top", origin = [0, 0], scale = 1, convexity = 1, $fn = 0, $fa = 12, $fs = 2);`
`21`	`21`	`}`
`22`		`- rotate_extrude(file = "example009.dxf", layer = "fan_side", origin = [0, -40], scale = 1, convexity = 10, $fn = 0, $fa = 12, $fs = 2);`
	`22`	`+ rotate_extrude(convexity = 10, $fn = 0, $fa = 12, $fs = 2) {`
	`23`	`+ import(file = "example009.dxf", layer = "fan_side", origin = [0, -40], scale = 1, convexity = 1, $fn = 0, $fa = 12, $fs = 2);`
	`24`	`+ }`
`23`	`25`	`}`
`24`	`26`	`}`