diff options
| author | Marius Kintel <marius@kintel.net> | 2013-04-27 05:01:45 (GMT) |
|---|---|---|
| committer | Marius Kintel <marius@kintel.net> | 2013-04-27 05:01:45 (GMT) |
| commit | 17df3f6275fce73119c311cc73a6ad057d3b47ee (patch) | |
| tree | 6c907e241b53c40c10743bbf08754b86a13f6457 /src/surface.cc | |
| parent | 6b3daa748543f13cc7cf8eff1c9efeebd6dc3a14 (diff) | |
| parent | 7858b0443e7fb09134f2b69a535417688353c0bb (diff) | |
Merge pull request #328 from openscad/issue116
Issue116
Diffstat (limited to 'src/surface.cc')
| -rw-r--r-- | src/surface.cc | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/src/surface.cc b/src/surface.cc index ca5031e..d8fa422 100644 --- a/src/surface.cc +++ b/src/surface.cc @@ -27,7 +27,7 @@ #include "module.h" #include "node.h" #include "polyset.h" -#include "context.h" +#include "evalcontext.h" #include "builtin.h" #include "printutils.h" #include "handle_dep.h" // handle_dep() @@ -50,7 +50,7 @@ class SurfaceModule : public AbstractModule { public: SurfaceModule() { } - virtual AbstractNode *evaluate(const Context *ctx, const ModuleInstantiation *inst) const; + virtual AbstractNode *evaluate(const Context *ctx, const ModuleInstantiation *inst, const EvalContext *evalctx) const; }; class SurfaceNode : public AbstractPolyNode @@ -69,18 +69,17 @@ public: virtual PolySet *evaluate_polyset(class PolySetEvaluator *) const; }; -AbstractNode *SurfaceModule::evaluate(const Context *ctx, const ModuleInstantiation *inst) const +AbstractNode *SurfaceModule::evaluate(const Context *ctx, const ModuleInstantiation *inst, const EvalContext *evalctx) const { SurfaceNode *node = new SurfaceNode(inst); node->center = false; node->convexity = 1; - std::vector<std::string> argnames; - argnames += "file", "center", "convexity"; - std::vector<Expression*> argexpr; + AssignmentList args; + args += Assignment("file", NULL), Assignment("center", NULL), Assignment("convexity", NULL); Context c(ctx); - c.args(argnames, argexpr, inst->argnames, inst->argvalues); + c.setVariables(args, evalctx); Value fileval = c.lookup_variable("file"); node->filename = inst->getAbsolutePath(fileval.isUndefined() ? "" : fileval.toString()); |