diff options
| author | Marius Kintel <marius@kintel.net> | 2011-10-04 19:06:40 (GMT) |
|---|---|---|
| committer | Marius Kintel <marius@kintel.net> | 2011-10-04 19:06:40 (GMT) |
| commit | 799ca1d1b3f2e9142460ab3ce895a0641f54dfda (patch) | |
| tree | 6c168de6d55cb92b94b0ddeb54c668bd4946c10d /src/polyset.cc | |
| parent | 9259d57659f61e9e56942bb36125f605f8f3c338 (diff) | |
| parent | f5e0f3a531b0c8806e4ebc62cd91ca31275ae481 (diff) | |
Merge branch 'master' into visitortests
Conflicts:
src/polyset.h
Diffstat (limited to 'src/polyset.cc')
| -rw-r--r-- | src/polyset.cc | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/src/polyset.cc b/src/polyset.cc index 23b9876..1d31005 100644 --- a/src/polyset.cc +++ b/src/polyset.cc @@ -25,14 +25,13 @@ */ #include "polyset.h" -#include "printutils.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> #endif -#include <Eigen/Core> +#include "linalg.h" #include <Eigen/LU> #include <QColor> @@ -113,13 +112,9 @@ static void gl_draw_triangle(GLint *shaderinfo, const Vector3d &p0, const Vector } } -void PolySet::render_surface(colormode_e colormode, csgmode_e csgmode, double *m, GLint *shaderinfo) const +void PolySet::render_surface(colormode_e colormode, csgmode_e csgmode, const Transform3d &m, GLint *shaderinfo) const { - Eigen::Matrix3f m3f; - m3f << m[0], m[4], m[8], - m[1], m[5], m[9], - m[2], m[6], m[10]; - bool mirrored = m3f.determinant() < 0; + bool mirrored = m.matrix().determinant() < 0; if (colormode == COLORMODE_MATERIAL) { // FIXME: Reenable/rewrite - don't be dependant on GUI |