diff options
| author | Marius Kintel <marius@kintel.net> | 2011-07-30 23:58:51 (GMT) |
|---|---|---|
| committer | Marius Kintel <marius@kintel.net> | 2011-07-30 23:58:51 (GMT) |
| commit | 6882228058d313bb7b98fddd90239bdb1a3e25ef (patch) | |
| tree | 9e3f0077a319939df7496fc6b18350c44cc4b0ec /openscad.pro | |
| parent | dd9dfcb4ece4dcd1ae7f3374ef03a4babdb91dd8 (diff) | |
| parent | c79ad5010e4ae8a612de5423cd52a518ed6b4d65 (diff) | |
Merge branch 'master' into visitor
Conflicts:
src/GLView.h
src/glview.cc
src/mainwin.cc
src/render-opencsg.cc
Diffstat (limited to 'openscad.pro')
| -rw-r--r-- | openscad.pro | 24 |
1 files changed, 15 insertions, 9 deletions
diff --git a/openscad.pro b/openscad.pro index 4a785fd..a4381be 100644 --- a/openscad.pro +++ b/openscad.pro @@ -118,7 +118,11 @@ include(boost.pri) FORMS += src/MainWindow.ui \ src/Preferences.ui -HEADERS += src/CGAL_renderer.h \ +HEADERS += src/renderer.h \ + src/cgalrenderer.h \ + src/throwntogetherrenderer.h \ + src/CGAL_renderer.h \ + src/OGL_helper.h \ src/GLView.h \ src/MainWindow.h \ src/Preferences.h \ @@ -154,16 +158,18 @@ HEADERS += src/CGAL_renderer.h \ src/traverser.h \ src/nodecache.h \ src/nodedumper.h \ - src/CGALRenderer.h \ - src/PolySetRenderer.h \ - src/PolySetCGALRenderer.h \ - src/CSGTermRenderer.h \ + src/CGALEvaluator.h \ + src/PolySetEvaluator.h \ + src/PolySetCGALEvaluator.h \ + src/CSGTermEvaluator.h \ src/myqhash.h \ src/Tree.h \ src/mathc99.h SOURCES += src/openscad.cc \ src/mainwin.cc \ + src/cgalrenderer.cc \ + src/throwntogetherrenderer.cc \ src/glview.cc \ src/export.cc \ src/value.cc \ @@ -201,10 +207,10 @@ SOURCES += src/openscad.cc \ src/editor.cc \ src/traverser.cc \ src/nodedumper.cc \ - src/CGALRenderer.cc \ - src/PolySetRenderer.cc \ - src/PolySetCGALRenderer.cc \ - src/CSGTermRenderer.cc \ + src/CGALEvaluator.cc \ + src/PolySetEvaluator.cc \ + src/PolySetCGALEvaluator.cc \ + src/CSGTermEvaluator.cc \ src/qhash.cc \ src/Tree.cc \ src/mathc99.cc |