diff options
author | Don Bright <hugh.m.bright@gmail.com> | 2011-11-27 04:21:38 (GMT) |
---|---|---|
committer | Don Bright <hugh.m.bright@gmail.com> | 2011-11-27 04:21:38 (GMT) |
commit | 610ab20ddba6d07e9b6e0b7565a44913854e467b (patch) | |
tree | 81c75e9ce9b68490bc5a81293290b96bb49d9510 /examples/example009.scad | |
parent | 2376814f2c4dd6e34a765ca37275b136785b26fd (diff) | |
parent | 04c340b35d8809b595ebb3ce53b7a00313d00a9b (diff) |
Merge remote branch 'upstream/master' into cakebaby
Conflicts:
doc/testing.txt
tests/CMakeLists.txt
tests/system-gl.cc
tests/system-gl.h
Diffstat (limited to 'examples/example009.scad')
-rw-r--r-- | examples/example009.scad | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/examples/example009.scad b/examples/example009.scad index 5f39f00..017ecc3 100644 --- a/examples/example009.scad +++ b/examples/example009.scad @@ -2,27 +2,29 @@ bodywidth = dxf_dim(file = "example009.dxf", name = "bodywidth"); fanwidth = dxf_dim(file = "example009.dxf", name = "fanwidth"); platewidth = dxf_dim(file = "example009.dxf", name = "platewidth"); -fan_side_center = dxf_cross(file = "example009.dxf", - layer = "fan_side_center"); +fan_side_center = dxf_cross(file = "example009.dxf", layer = "fan_side_center"); fanrot = dxf_dim(file = "example009.dxf", name = "fanrot"); -% dxf_linear_extrude(file = "example009.dxf", layer = "body", - height = bodywidth, center = true, convexity = 10); +% linear_extrude(height = bodywidth, center = true, convexity = 10) + import(file = "example009.dxf", layer = "body"); % for (z = [+(bodywidth/2 + platewidth/2), -(bodywidth/2 + platewidth/2)]) { translate([0, 0, z]) - dxf_linear_extrude(file = "example009.dxf", layer = "plate", - height = platewidth, center = true, convexity = 10); + linear_extrude(height = platewidth, center = true, convexity = 10) + import(file = "example009.dxf", layer = "plate"); } intersection() { - dxf_linear_extrude(file = "example009.dxf", layer = "fan_top", - height = fanwidth, center = true, convexity = 10, - twist = -fanrot); - dxf_rotate_extrude(file = "example009.dxf", layer = "fan_side", + 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); } |