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

Compile fixes for test programs

stl_dim
Marius Kintel 2010-03-30 22:49:41 +02:00
parent 398571275e
commit eb81def6eb
5 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
test-code/CSGTextRenderer.cc
View File

@ -15,7 +15,7 @@
#include <assert.h>
#include <QRegExp>
string CSGTextRenderer::getCGALMesh() const
string CSGTextRenderer::getCSGString() const
{
assert(this->root);
// FIXME: assert that cache contains root

5
test-code/CSGTextRenderer.h
View File

@ -25,8 +25,7 @@ public:
virtual Response visit(const State &state, const TransformNode &node);
virtual Response visit(const State &state, const AbstractPolyNode &node);
string getCGALMesh() const;
// CGAL_Nef_polyhedron getCGALMesh() const;
string getCSGString() const;
private:
void addToParent(const State &state, const AbstractNode &node);
bool isCached(const AbstractNode &node);
@ -38,9 +37,7 @@ private:
const AbstractNode *root;
typedef list<pair<const AbstractNode *, QString> > ChildList;
map<int, ChildList> visitedchildren;
// hashmap<string, CGAL_Nef_polyhedron> cache;
// For now use strings instead of Nef polyhedrons for testing caching
QHash<QString, string> cache;
const NodeCache<string> &dumpcache;
};

6
test-code/csgtexttest.cc
View File

@ -31,7 +31,7 @@
#include "export.h"
#include "builtin.h"
#include "nodedumper.h"
#include "CGALRenderer.h"
#include "CSGTextRenderer.h"
#include <QApplication>
#include <QFile>
@ -152,10 +152,10 @@ int main(int argc, char **argv)
std::string dumpstdstr = dumper.getDump() + "\n";
std::cout << dumpstdstr << "\n";
CGALRenderer renderer(dumper.getCache());
CSGTextRenderer renderer(dumper.getCache());
Traverser render(renderer, *root_node, Traverser::PRE_AND_POSTFIX);
render.execute();
std::cout << renderer.getCGALMesh() << "\n";
std::cout << renderer.getCSGString() << "\n";
destroy_builtin_functions();
destroy_builtin_modules();

13
test-code/csgtexttest.pro
View File

@ -35,7 +35,6 @@ LEXSOURCES += ../src/lexer.l
YACCSOURCES += ../src/parser.y
HEADERS += ../src/builtin.h \
../src/cgal.h \
../src/context.h \
../src/csgterm.h \
../src/dxfdata.h \
@ -63,12 +62,13 @@ HEADERS += ../src/builtin.h \
../src/csgnode.h \
../src/visitor.h \
../src/nodedumper.h \
../src/CGALRenderer.h \
../src/CSGTextRenderer.h \
../src/nodecache.h \
../src/importnode.h \
../src/state.h
../src/state.h \
../src/PolySetRenderer.h
SOURCES += cgaltest.cc \
SOURCES += csgtexttest.cc \
../src/export.cc \
../src/value.cc \
../src/expr.cc \
@ -97,5 +97,6 @@ SOURCES += cgaltest.cc \
../src/printutils.cc \
../src/progress.cc \
../src/nodedumper.cc \
../src/CGALRenderer.cc \
../src/traverser.cc
../src/CSGTextRenderer.cc \
../src/traverser.cc \
../src/PolySetRenderer.cc

6
test-code/dumptest.pro
View File

@ -67,7 +67,8 @@ HEADERS += ../src/builtin.h \
../src/nodedumper.h \
../src/nodecache.h \
../src/importnode.h \
../src/state.h
../src/state.h \
../src/PolySetRenderer.h
SOURCES += dumptest.cc \
../src/export.cc \
@ -98,4 +99,5 @@ SOURCES += dumptest.cc \
../src/printutils.cc \
../src/progress.cc \
../src/nodedumper.cc \
../src/traverser.cc
../src/traverser.cc \
../src/PolySetRenderer.cc