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/color.cc | |
| parent | 6b3daa748543f13cc7cf8eff1c9efeebd6dc3a14 (diff) | |
| parent | 7858b0443e7fb09134f2b69a535417688353c0bb (diff) | |
Merge pull request #328 from openscad/issue116
Issue116
Diffstat (limited to 'src/color.cc')
| -rw-r--r-- | src/color.cc | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/src/color.cc b/src/color.cc index acca652..6c3aaef 100644 --- a/src/color.cc +++ b/src/color.cc @@ -26,7 +26,7 @@ #include "colornode.h" #include "module.h" -#include "context.h" +#include "evalcontext.h" #include "builtin.h" #include "printutils.h" #include <sstream> @@ -40,27 +40,26 @@ class ColorModule : public AbstractModule { public: ColorModule() { } - virtual AbstractNode *evaluate(const Context *ctx, const ModuleInstantiation *inst) const; + virtual AbstractNode *evaluate(const Context *ctx, const ModuleInstantiation *inst, const EvalContext *evalctx) const; private: static boost::unordered_map<std::string, Color4f> colormap; }; #include "colormap.h" -AbstractNode *ColorModule::evaluate(const Context *ctx, const ModuleInstantiation *inst) const +AbstractNode *ColorModule::evaluate(const Context *ctx, const ModuleInstantiation *inst, const EvalContext *evalctx) const { ColorNode *node = new ColorNode(inst); node->color[0] = node->color[1] = node->color[2] = -1.0; node->color[3] = 1.0; - std::vector<std::string> argnames; - std::vector<Expression*> argexpr; + AssignmentList args; - argnames += "c", "alpha"; + args += Assignment("c", NULL), Assignment("alpha", NULL); Context c(ctx); - c.args(argnames, argexpr, inst->argnames, inst->argvalues); + c.setVariables(args, evalctx); Value v = c.lookup_variable("c"); if (v.type() == Value::VECTOR) { @@ -88,7 +87,7 @@ AbstractNode *ColorModule::evaluate(const Context *ctx, const ModuleInstantiatio node->color[3] = alpha.toDouble(); } - std::vector<AbstractNode *> evaluatednodes = inst->evaluateChildren(); + std::vector<AbstractNode *> evaluatednodes = inst->evaluateChildren(evalctx); node->children.insert(node->children.end(), evaluatednodes.begin(), evaluatednodes.end()); return node; |