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.h | |
| parent | 9259d57659f61e9e56942bb36125f605f8f3c338 (diff) | |
| parent | f5e0f3a531b0c8806e4ebc62cd91ca31275ae481 (diff) | |
Merge branch 'master' into visitortests
Conflicts:
src/polyset.h
Diffstat (limited to 'src/polyset.h')
| -rw-r--r-- | src/polyset.h | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/src/polyset.h b/src/polyset.h index 3cfb21a..57f5057 100644 --- a/src/polyset.h +++ b/src/polyset.h @@ -1,20 +1,11 @@ #ifndef POLYSET_H_ #define POLYSET_H_ -#ifndef __APPLE__ -#define EIGEN_DONT_VECTORIZE 1 -#define EIGEN_DISABLE_UNALIGNED_ARRAY_ASSERT 1 -#endif - -#include <GL/glew.h> +#include "system-gl.h" #include "grid.h" -#include <Eigen/Core> -#include <Eigen/Geometry> +#include "linalg.h" #include <vector> -using Eigen::Vector3d; -typedef Eigen::AlignedBox<double, 3> BoundingBox; - class PolySet { public: @@ -54,7 +45,7 @@ public: CSGMODE_HIGHLIGHT_DIFFERENCE = 22 }; - void render_surface(colormode_e colormode, csgmode_e csgmode, double *m, GLint *shaderinfo = NULL) const; + void render_surface(colormode_e colormode, csgmode_e csgmode, const Transform3d &m, GLint *shaderinfo = NULL) const; void render_edges(colormode_e colormode, csgmode_e csgmode) const; }; |