vitalif
/
openscad
mirror of https://github.com/vitalif/openscad
1
0
Fork 0
Code Issues Releases Wiki Activity

Compile fixes

customizer
Marius Kintel 2013-11-14 21:17:41 -05:00
parent d9ad3a60a0
commit dc93436da9
2 changed files with 13 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
tests/CSGTextRenderer.cc
View File

@ -24,29 +24,29 @@ bool CSGTextRenderer::isCached(const AbstractNode &node)
target = target [op] src
*/
void
CSGTextRenderer::process(string &target, const string &src, CSGTextRenderer::CsgOp op)
CSGTextRenderer::process(string &target, const string &src, OpenSCADOperator op)
{
// if (target.dim != 2 && target.dim != 3) {
// assert(false && "Dimension of Nef polyhedron must be 2 or 3");
// }
switch (op) {
case UNION:
case OPENSCAD_UNION:
target += "+" + src;
break;
case INTERSECTION:
case OPENSCAD_INTERSECTION:
target += "*" + src;
break;
case DIFFERENCE:
case OPENSCAD_DIFFERENCE:
target += "-" + src;
break;
case MINKOWSKI:
case OPENSCAD_MINKOWSKI:
target += "M" + src;
break;
}
}
void CSGTextRenderer::applyToChildren(const AbstractNode &node, CSGTextRenderer::CsgOp op)
void CSGTextRenderer::applyToChildren(const AbstractNode &node, OpenSCADOperator op)
{
std::stringstream stream;
stream << node.name() << node.index();
@ -86,7 +86,7 @@ Response CSGTextRenderer::visit(State &state, const AbstractNode &node)
{
if (state.isPrefix() && isCached(node)) return PruneTraversal;
if (state.isPostfix()) {
if (!isCached(node)) applyToChildren(node, UNION);
if (!isCached(node)) applyToChildren(node, OPENSCAD_UNION);
addToParent(state, node);
}
return ContinueTraversal;
@ -96,7 +96,7 @@ Response CSGTextRenderer::visit(State &state, const AbstractIntersectionNode &no
{
if (state.isPrefix() && isCached(node)) return PruneTraversal;
if (state.isPostfix()) {
if (!isCached(node)) applyToChildren(node, INTERSECTION);
if (!isCached(node)) applyToChildren(node, OPENSCAD_INTERSECTION);
addToParent(state, node);
}
return ContinueTraversal;
@ -107,19 +107,7 @@ Response CSGTextRenderer::visit(State &state, const CsgNode &node)
if (state.isPrefix() && isCached(node)) return PruneTraversal;
if (state.isPostfix()) {
if (!isCached(node)) {
CsgOp op;
switch (node.type) {
case CSG_TYPE_UNION:
op = UNION;
break;
case CSG_TYPE_DIFFERENCE:
op = DIFFERENCE;
break;
case CSG_TYPE_INTERSECTION:
op = INTERSECTION;
break;
}
applyToChildren(node, op);
applyToChildren(node, node.type);
}
addToParent(state, node);
}
@ -132,7 +120,7 @@ Response CSGTextRenderer::visit(State &state, const TransformNode &node)
if (state.isPostfix()) {
if (!isCached(node)) {
// First union all children
applyToChildren(node, UNION);
applyToChildren(node, OPENSCAD_UNION);
// FIXME: Then apply transform
}
addToParent(state, node);

6
tests/CSGTextRenderer.h
View File

@ -3,6 +3,7 @@
#include "visitor.h"
#include "CSGTextCache.h"
#include "enums.h"
#include <map>
#include <list>
@ -24,11 +25,10 @@ public:
virtual Response visit(State &state, const AbstractPolyNode &node);
private:
enum CsgOp {UNION, INTERSECTION, DIFFERENCE, MINKOWSKI};
void addToParent(const State &state, const AbstractNode &node);
bool isCached(const AbstractNode &node);
void process(string &target, const string &src, CSGTextRenderer::CsgOp op);
void applyToChildren(const AbstractNode &node, CSGTextRenderer::CsgOp op);
void process(string &target, const string &src, OpenSCADOperator op);
void applyToChildren(const AbstractNode &node, OpenSCADOperator op);
string currindent;
typedef list<const AbstractNode *> ChildList;