diff options
| author | Marius Kintel <marius@kintel.net> | 2010-03-19 03:07:38 (GMT) |
|---|---|---|
| committer | Marius Kintel <marius@kintel.net> | 2010-10-31 00:42:34 (GMT) |
| commit | 3396706e248d4baccf08707103deae378181b299 (patch) | |
| tree | 32e812dbed8fa2188fcf66fd5991f6e74b4fb920 | |
| parent | 311d1befb425a684349fcd7255bb76217ac9f4b6 (diff) | |
Added CGALRenderer + some minor fixes
| -rw-r--r-- | openscad.pro | 6 | ||||
| -rw-r--r-- | src/nodedumper.cc | 4 | ||||
| -rw-r--r-- | src/nodedumper.h | 1 | ||||
| -rw-r--r-- | src/openscad.cc | 12 |
4 files changed, 9 insertions, 14 deletions
diff --git a/openscad.pro b/openscad.pro index 8415b1f..496250a 100644 --- a/openscad.pro +++ b/openscad.pro @@ -115,7 +115,8 @@ HEADERS += src/CGAL_renderer.h \ src/state.h \ src/traverser.h \ src/nodecache.h \ - src/nodedumper.h + src/nodedumper.h \ + src/CGALRenderer.h SOURCES += src/openscad.cc \ src/mainwin.cc \ @@ -154,7 +155,8 @@ SOURCES += src/openscad.cc \ src/progress.cc \ src/editor.cc \\ src/traverser.cc \ - src/nodedumper.cc + src/nodedumper.cc \ + src/CGALRenderer.cc macx { HEADERS += src/AppleEvents.h \ diff --git a/src/nodedumper.cc b/src/nodedumper.cc index 66a8406..0e66e5b 100644 --- a/src/nodedumper.cc +++ b/src/nodedumper.cc @@ -86,6 +86,10 @@ const string &NodeDumper::getDump() const return this->cache[*this->root]; } +/*! + Adds this given node to its parent's child list. + Should be called for all nodes, including leaf nodes. +*/ void NodeDumper::handleVisitedChildren(const State &state, const AbstractNode &node) { if (state.isPostfix()) { diff --git a/src/nodedumper.h b/src/nodedumper.h index ac965ca..a28b8ad 100644 --- a/src/nodedumper.h +++ b/src/nodedumper.h @@ -20,6 +20,7 @@ public: virtual Response visit(const State &state, const AbstractNode &node); const string &getDump() const; + const NodeCache<string> &getCache() const { return this->cache; } private: void handleVisitedChildren(const State &state, const AbstractNode &node); bool isCached(const AbstractNode &node); diff --git a/src/openscad.cc b/src/openscad.cc index fdd2502..86dce1b 100644 --- a/src/openscad.cc +++ b/src/openscad.cc @@ -285,18 +285,6 @@ int main(int argc, char **argv) AbstractNode::resetIndexCounter(); root_node = root_module->evaluate(&root_ctx, &root_inst); - NodeDumper dumper; - Traverser trav(dumper, *root_node, Traverser::PRE_AND_POSTFIX); - trav.execute(); -// std::cout << dumper.getDump(); -// std::cout << std::endl; -// trav.execute(); -// std::cout << dumper.getDump(); -// std::cout << std::endl; - printf(dumper.getDump().c_str()); - exit(1); - - CGAL_Nef_polyhedron *root_N; root_N = new CGAL_Nef_polyhedron(root_node->renderCSGMesh()); |