diff options
| author | Don Bright <hugh.m.bright@gmail.com> | 2011-09-18 22:53:33 (GMT) |
|---|---|---|
| committer | Don Bright <hugh.m.bright@gmail.com> | 2011-09-18 22:53:33 (GMT) |
| commit | 0b219ae4b46bbab5593d0ee644d7f6bcdb36d17e (patch) | |
| tree | 83da7c12741a0409531657cac4a4217cf8e76727 /src | |
| parent | 6d70855a4d92a7aafbc21fdd97c570e9ef227182 (diff) | |
opencsg testing
Diffstat (limited to 'src')
| -rw-r--r-- | src/CGALRenderer.cc | 6 | ||||
| -rw-r--r-- | src/dxfdata.h | 7 | ||||
| -rw-r--r-- | src/polyset.h | 7 |
3 files changed, 16 insertions, 4 deletions
diff --git a/src/CGALRenderer.cc b/src/CGALRenderer.cc index 4d165ce..95bcba1 100644 --- a/src/CGALRenderer.cc +++ b/src/CGALRenderer.cc @@ -24,10 +24,12 @@ * */ -#include "CGALRenderer.h" +// dxfdata.h must come first for Eigen SIMD alignment issues +#include "dxfdata.h" #include "polyset.h" + +#include "CGALRenderer.h" #include "CGAL_renderer.h" -#include "dxfdata.h" #include "dxftess.h" #include "CGAL_Nef_polyhedron.h" #include "cgal.h" diff --git a/src/dxfdata.h b/src/dxfdata.h index bada031..4e4b4ab 100644 --- a/src/dxfdata.h +++ b/src/dxfdata.h @@ -1,8 +1,13 @@ #ifndef DXFDATA_H_ #define DXFDATA_H_ -#include <vector> +#ifndef __APPLE__ +#define EIGEN_DONT_VECTORIZE 1 +#define EIGEN_DISABLE_UNALIGNED_ARRAY_ASSERT 1 +#endif + #include <Eigen/Dense> +#include <vector> using Eigen::Vector2d; diff --git a/src/polyset.h b/src/polyset.h index c59d86a..3cfb21a 100644 --- a/src/polyset.h +++ b/src/polyset.h @@ -1,11 +1,16 @@ #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 "grid.h" -#include <vector> #include <Eigen/Core> #include <Eigen/Geometry> +#include <vector> using Eigen::Vector3d; typedef Eigen::AlignedBox<double, 3> BoundingBox; |