diff options
Diffstat (limited to 'src/polyset.cc')
| -rw-r--r-- | src/polyset.cc | 23 |
1 files changed, 11 insertions, 12 deletions
diff --git a/src/polyset.cc b/src/polyset.cc index e34aeb3..679d754 100644 --- a/src/polyset.cc +++ b/src/polyset.cc @@ -26,7 +26,8 @@ #include "polyset.h" #include "printutils.h" -#include "Preferences.h" +// FIXME: Reenable/rewrite - don't be dependant on GUI +// #include "Preferences.h" #ifdef ENABLE_CGAL #include <CGAL/assertions_behaviour.h> #include <CGAL/exceptions.h> @@ -34,15 +35,6 @@ #include <Eigen/Core> #include <Eigen/LU> -QCache<QString,PolySet::ps_cache_entry> PolySet::ps_cache(100); - -PolySet::ps_cache_entry::ps_cache_entry(PolySet *ps) : - ps(ps), msg(print_messages_stack.last()) { } - -PolySet::ps_cache_entry::~ps_cache_entry() { - ps->unlink(); -} - PolySet::PolySet() : grid(GRID_FINE) { is2d = false; @@ -145,7 +137,9 @@ void PolySet::render_surface(colormode_e colormode, csgmode_e csgmode, double *m bool mirrored = m3f.determinant() < 0; if (colormode == COLORMODE_MATERIAL) { - const QColor &col = Preferences::inst()->color(Preferences::OPENCSG_FACE_FRONT_COLOR); +// FIXME: Reenable/rewrite - don't be dependant on GUI +// const QColor &col = Preferences::inst()->color(Preferences::OPENCSG_FACE_FRONT_COLOR); + const QColor &col = QColor(0xf9, 0xd7, 0x2c); glColor3f(col.redF(), col.greenF(), col.blueF()); #ifdef ENABLE_OPENCSG if (shaderinfo) { @@ -155,7 +149,9 @@ void PolySet::render_surface(colormode_e colormode, csgmode_e csgmode, double *m #endif /* ENABLE_OPENCSG */ } if (colormode == COLORMODE_CUTOUT) { - const QColor &col = Preferences::inst()->color(Preferences::OPENCSG_FACE_BACK_COLOR); +// FIXME: Reenable/rewrite - don't be dependant on GUI +// const QColor &col = Preferences::inst()->color(Preferences::OPENCSG_FACE_BACK_COLOR); + const QColor &col = QColor(0x9d, 0xcb, 0x51); glColor3f(col.redF(), col.greenF(), col.blueF()); #ifdef ENABLE_OPENCSG if (shaderinfo) { @@ -322,6 +318,8 @@ void PolySet::render_edges(colormode_e colormode, csgmode_e csgmode) const } } } +<<<<<<< HEAD +======= #ifdef ENABLE_CGAL @@ -676,3 +674,4 @@ CGAL_Nef_polyhedron PolySet::render_cgal_nef_polyhedron() const #endif /* ENABLE_CGAL */ +>>>>>>> master |