diff options
| author | Marius Kintel <marius@kintel.net> | 2013-04-09 04:28:16 (GMT) |
|---|---|---|
| committer | Marius Kintel <marius@kintel.net> | 2013-04-09 04:28:16 (GMT) |
| commit | a37813a8999571f4b9235f33fdc7c22bcbe5fd17 (patch) | |
| tree | 266d8c106100edab9f51b93cf229cf55cd083918 /src/csgops.cc | |
| parent | b16c24fb2888d932ec035fff27cb29b4ffbc256b (diff) | |
Refactored context handling into using separate Module contexts and Eval contexts. This allows for recursive module calls, and cascading children. I believe this fixes issue #116
Diffstat (limited to 'src/csgops.cc')
| -rw-r--r-- | src/csgops.cc | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/csgops.cc b/src/csgops.cc index 7524559..425b747 100644 --- a/src/csgops.cc +++ b/src/csgops.cc @@ -26,6 +26,7 @@ #include "csgnode.h" +#include "evalcontext.h" #include "module.h" #include "csgterm.h" #include "builtin.h" @@ -37,13 +38,13 @@ class CsgModule : public AbstractModule public: csg_type_e type; CsgModule(csg_type_e type) : type(type) { } - virtual AbstractNode *evaluate(const Context *ctx, const ModuleInstantiation *inst) const; + virtual AbstractNode *evaluate(const Context *ctx, const ModuleInstantiation *inst, const EvalContext *evalctx) const; }; -AbstractNode *CsgModule::evaluate(const Context*, const ModuleInstantiation *inst) const +AbstractNode *CsgModule::evaluate(const Context*, const ModuleInstantiation *inst, const EvalContext *evalctx) const { CsgNode *node = new CsgNode(inst, type); - 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; } |