diff options
| author | Don Bright <hugh.m.bright@gmail.com> | 2011-09-12 22:40:51 (GMT) |
|---|---|---|
| committer | Don Bright <hugh.m.bright@gmail.com> | 2011-09-12 22:40:51 (GMT) |
| commit | f5f06c8e976ca45aebea42fe8c04bf7404357ac8 (patch) | |
| tree | 8d0cdd2698e7806c1b12cc49e743b561e1082961 /tests/OffscreenView.h | |
| parent | 007c40848db9efd704694f2e7596cabed80da50f (diff) | |
| parent | 5ac9162f1c67fd21737ead11d7ebc638bf4eef5f (diff) | |
merge
Merge remote branch 'upstream/visitor' into visitortests
Conflicts:
src/export.cc
src/openscad.cc
src/polyset.cc
src/transform.cc
tests/CMakeLists.txt
tests/FindGLEW.cmake
tests/csgtermtest.cc
Diffstat (limited to 'tests/OffscreenView.h')
| -rw-r--r-- | tests/OffscreenView.h | 17 |
1 files changed, 6 insertions, 11 deletions
diff --git a/tests/OffscreenView.h b/tests/OffscreenView.h index d71ea2f..587255a 100644 --- a/tests/OffscreenView.h +++ b/tests/OffscreenView.h @@ -2,6 +2,8 @@ #define OFFSCREENVIEW_H_ #include "OffscreenContext.h" +#include <Eigen/Core> +#include <Eigen/Geometry> #include <stdint.h> class OffscreenView @@ -11,8 +13,7 @@ public: ~OffscreenView(); void setRenderer(class Renderer* r); - void setCamera(double xpos, double ypos, double zpos, - double xcenter, double ycenter, double zcenter); + void setCamera(const Eigen::Vector3d &pos, const Eigen::Vector3d ¢er); void initializeGL(); void resizeGL(int w, int h); void setupPerspective(); @@ -25,15 +26,9 @@ public: private: Renderer *renderer; double w_h_ratio; - double object_rot_x; - double object_rot_y; - double object_rot_z; - double camera_eye_x; - double camera_eye_y; - double camera_eye_z; - double camera_center_x; - double camera_center_y; - double camera_center_z; + Eigen::Vector3d object_rot; + Eigen::Vector3d camera_eye; + Eigen::Vector3d camera_center; bool orthomode; bool showaxes; |