diff options
| -rw-r--r-- | dxflinextrude.cc | 65 | ||||
| -rw-r--r-- | examples/example015.scad | 33 |
2 files changed, 66 insertions, 32 deletions
diff --git a/dxflinextrude.cc b/dxflinextrude.cc index dc4ec9c..1e8bb2e 100644 --- a/dxflinextrude.cc +++ b/dxflinextrude.cc @@ -106,12 +106,21 @@ AbstractNode *DxfLinearExtrudeModule::evaluate(const Context *ctx, const ModuleI node->has_twist = true; } + if (node->filename.isEmpty()) { + foreach (ModuleInstanciation *v, inst->children) { + AbstractNode *n = v->evaluate(inst->ctx); + if (n) + node->children.append(n); + } + } + return node; } void register_builtin_dxf_linear_extrude() { builtin_modules["dxf_linear_extrude"] = new DxfLinearExtrudeModule(); + builtin_modules["linear_extrude"] = new DxfLinearExtrudeModule(); } static void add_slice(PolySet *ps, DxfData::Path *pt, double rot1, double rot2, double h1, double h2) @@ -165,7 +174,21 @@ PolySet *DxfLinearExtrudeNode::render_polyset(render_mode_e) const } print_messages_push(); - DxfData dxf(fn, fs, fa, filename, layername, origin_x, origin_y, scale); + DxfData *dxf; + + if (filename.isEmpty()) + { + CGAL_Nef_polyhedron N; + N.dim = 2; + foreach(AbstractNode * v, children) { + if (v->modinst->tag_background) + continue; + N.p2 += v->render_cgal_nef_polyhedron().p2; + } + dxf = new DxfData(N); + } else { + dxf = new DxfData(fn, fs, fa, filename, layername, origin_x, origin_y, scale); + } PolySet *ps = new PolySet(); ps->convexity = convexity; @@ -181,9 +204,9 @@ PolySet *DxfLinearExtrudeNode::render_polyset(render_mode_e) const } bool first_open_path = true; - for (int i = 0; i < dxf.paths.count(); i++) + for (int i = 0; i < dxf->paths.count(); i++) { - if (dxf.paths[i].is_closed) + if (dxf->paths[i].is_closed) continue; if (first_open_path) { PRINTF("WARING: Open paths in dxf_liniear_extrude(file = \"%s\", layer = \"%s\"):", @@ -191,45 +214,46 @@ PolySet *DxfLinearExtrudeNode::render_polyset(render_mode_e) const first_open_path = false; } PRINTF(" %9.5f %10.5f ... %10.5f %10.5f", - dxf.paths[i].points.first()->x / scale + origin_x, - dxf.paths[i].points.first()->y / scale + origin_y, - dxf.paths[i].points.last()->x / scale + origin_x, - dxf.paths[i].points.last()->y / scale + origin_y); + dxf->paths[i].points.first()->x / scale + origin_x, + dxf->paths[i].points.first()->y / scale + origin_y, + dxf->paths[i].points.last()->x / scale + origin_x, + dxf->paths[i].points.last()->y / scale + origin_y); } if (has_twist) { - dxf_tesselate(ps, &dxf, 0, false, true, h1); - dxf_tesselate(ps, &dxf, twist, true, true, h2); + dxf_tesselate(ps, dxf, 0, false, true, h1); + dxf_tesselate(ps, dxf, twist, true, true, h2); for (int j = 0; j < slices; j++) { double t1 = twist*j / slices; double t2 = twist*(j+1) / slices; double g1 = h1 + (h2-h1)*j / slices; double g2 = h1 + (h2-h1)*(j+1) / slices; - for (int i = 0; i < dxf.paths.count(); i++) + for (int i = 0; i < dxf->paths.count(); i++) { - if (!dxf.paths[i].is_closed) + if (!dxf->paths[i].is_closed) continue; - add_slice(ps, &dxf.paths[i], t1, t2, g1, g2); + add_slice(ps, &dxf->paths[i], t1, t2, g1, g2); } } } else { - dxf_tesselate(ps, &dxf, 0, false, true, h1); - dxf_tesselate(ps, &dxf, 0, true, true, h2); - for (int i = 0; i < dxf.paths.count(); i++) + dxf_tesselate(ps, dxf, 0, false, true, h1); + dxf_tesselate(ps, dxf, 0, true, true, h2); + for (int i = 0; i < dxf->paths.count(); i++) { - if (!dxf.paths[i].is_closed) + if (!dxf->paths[i].is_closed) continue; - add_slice(ps, &dxf.paths[i], 0, 0, h1, h2); + add_slice(ps, &dxf->paths[i], 0, 0, h1, h2); } } PolySet::ps_cache.insert(key, new PolySet::ps_cache_entry(ps->link())); print_messages_pop(); + delete dxf; return ps; } @@ -241,7 +265,7 @@ QString DxfLinearExtrudeNode::dump(QString indent) const struct stat st; memset(&st, 0, sizeof(struct stat)); stat(filename.toAscii().data(), &st); - text.sprintf("dxf_linear_extrude(file = \"%s\", cache = \"%x.%x\", layer = \"%s\", " + text.sprintf("linear_extrude(file = \"%s\", cache = \"%x.%x\", layer = \"%s\", " "height = %f, origin = [ %f %f ], scale = %f, center = %s, convexity = %d", filename.toAscii().data(), (int)st.st_mtime, (int)st.st_size, layername.toAscii().data(), height, origin_x, origin_y, scale, @@ -252,8 +276,11 @@ QString DxfLinearExtrudeNode::dump(QString indent) const text += t2; } QString t3; - t3.sprintf(", $fn = %f, $fa = %f, $fs = %f);\n", fn, fs, fa); + t3.sprintf(", $fn = %f, $fa = %f, $fs = %f) {\n", fn, fs, fa); text += t3; + foreach (AbstractNode *v, children) + text += v->dump(indent + QString("\t")); + text += indent + "}\n"; ((AbstractNode*)this)->dump_cache = indent + QString("n%1: ").arg(idx) + text; } return dump_cache; diff --git a/examples/example015.scad b/examples/example015.scad index 22a2ad0..21789b4 100644 --- a/examples/example015.scad +++ b/examples/example015.scad @@ -1,21 +1,28 @@ -difference() +module shape() { - translate([ -35, -35 ]) intersection() + difference() { - union() { - difference() { - square(100, true); - square(50, true); + translate([ -35, -35 ]) intersection() + { + union() { + difference() { + square(100, true); + square(50, true); + } + translate([ 50, 50 ]) + square(15, true); } - translate([ 50, 50 ]) - square(15, true); + rotate(45) translate([ 0, -15 ]) square([ 100, 30 ]); } - rotate(45) translate([ 0, -15 ]) square([ 100, 30 ]); + + rotate(-45) scale([ 0.7, 1.3 ]) circle(5); } - - rotate(-45) scale([ 0.7, 1.3 ]) circle(5); + + import_dxf(filename = "example009.dxf", + layername = "body", convexity = 6, scale=2); } -import_dxf(filename = "example009.dxf", - layername = "body", convexity = 6, scale=2); +// linear_extrude(convexity = 10, center = true) +shape(); + |