From 4f578513a0960d4f079260922cdc86de0948099c Mon Sep 17 00:00:00 2001 From: don bright Date: Thu, 21 Feb 2013 06:43:26 -0600 Subject: continue with gimbalcam vs eye-center-cam changes diff --git a/src/OffscreenView.h b/src/OffscreenView.h index 2f19a0c..d455ee9 100644 --- a/src/OffscreenView.h +++ b/src/OffscreenView.h @@ -14,19 +14,20 @@ class OffscreenView { public: - OffscreenView(size_t width, size_t height); - ~OffscreenView(); - void setRenderer(class Renderer* r); + OffscreenView(size_t width, size_t height); // not + ~OffscreenView(); // not + void setRenderer(class Renderer* r); // - void setCamera(const Eigen::Vector3d &pos, const Eigen::Vector3d ¢er); - void initializeGL(); - void resizeGL(int w, int h); + void initializeGL(); // + void resizeGL(int w, int h); // - void setupGimbalPerspective(); - void setupGimbalOrtho(double distance, bool offset=false); + void setGimbalCamera(const Eigen::Vector3d &pos, const Eigen::Vector3d &rot, double distance); // + void setupGimbalPerspective(); // + void setupGimbalOrtho(double distance, bool offset=false); // - void setupPerspective(); - void setupOrtho(bool offset=false); + void setCamera(const Eigen::Vector3d &pos, const Eigen::Vector3d ¢er); // + void setupPerspective(); // + void setupOrtho(bool offset=false); // void paintGL(); // bool save(const char *filename); // diff --git a/src/QGLView.h b/src/QGLView.h index 48a46df..bc7e6d3 100644 --- a/src/QGLView.h +++ b/src/QGLView.h @@ -81,9 +81,11 @@ private: void initializeGL(); void resizeGL(int w, int h); + void setGimbalCamera(const Eigen::Vector3d &pos, const Eigen::Vector3d &rot, double distance); void setupGimbalPerspective(); void setupGimbalOrtho(double distance,bool offset=false); + void setCamera(const Eigen::Vector3d &pos, const Eigen::Vector3d ¢er); void setupPerspective(); void setupOrtho(bool offset=false); -- cgit v0.10.1