diff options
| author | Vicnet <vo.publique@gmail.com> | 2013-09-13 12:52:22 (GMT) |
|---|---|---|
| committer | Vicnet <vo.publique@gmail.com> | 2013-09-13 12:52:22 (GMT) |
| commit | 7b1e423f8214bb42c7668505066507e4d9c7091a (patch) | |
| tree | 19e9174a312f35af416f9fa4cd58f31876052e79 /src/Camera.h | |
| parent | f6343949ebc6936880a6cd62bfe3574541a11fb5 (diff) | |
| parent | ead8749e99238c18a3d7bb903f98bb7bca6a7685 (diff) | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'src/Camera.h')
| -rw-r--r-- | src/Camera.h | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/src/Camera.h b/src/Camera.h index dfc71f8..6079672 100644 --- a/src/Camera.h +++ b/src/Camera.h @@ -47,7 +47,8 @@ public: projection = Camera::PERSPECTIVE; } - void setup( std::vector<double> params ) { + void setup( std::vector<double> params ) + { if ( params.size() == 7 ) { type = Camera::GIMBAL; object_trans << params[0], params[1], params[2]; @@ -62,6 +63,16 @@ public: } } + void gimbalDefaultTranslate() + { // match the GUI viewport numbers (historical reasons) + object_trans.x() *= -1; + object_trans.y() *= -1; + object_trans.z() *= -1; + object_rot.x() = fmodf(360 - object_rot.x() + 90, 360 ); + object_rot.y() = fmodf(360 - object_rot.y(), 360); + object_rot.z() = fmodf(360 - object_rot.z(), 360); + } + // Vectorcam Eigen::Vector3d eye; Eigen::Vector3d center; // (aka 'target') |