From 7379f9c92304133c4d750757a9137af0ca1f70b3 Mon Sep 17 00:00:00 2001 From: ZappoMan Date: Thu, 6 Feb 2014 23:59:46 -0800 Subject: [PATCH] tweaks to scriptable camera --- interface/src/Camera.cpp | 3 --- interface/src/Camera.h | 6 +++++- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/interface/src/Camera.cpp b/interface/src/Camera.cpp index 3dcc7a7089..cc53f29373 100644 --- a/interface/src/Camera.cpp +++ b/interface/src/Camera.cpp @@ -268,8 +268,5 @@ void CameraScriptableObject::setMode(const QString& mode) { } } -void CameraScriptableObject::setPosition(const glm::vec3& p) { - _camera->setTargetPosition(p); -} diff --git a/interface/src/Camera.h b/interface/src/Camera.h index 7ad3a0e626..3d44b875f5 100644 --- a/interface/src/Camera.h +++ b/interface/src/Camera.h @@ -110,9 +110,13 @@ public: public slots: QString getMode() const; void setMode(const QString& mode); - void setPosition(const glm::vec3& p); + void setPosition(const glm::vec3& value) { _camera->setTargetPosition(value);} + glm::vec3 getPosition() const { return _camera->getPosition(); } + void setOrientation(const glm::quat& value) { _camera->setTargetRotation(value); } + glm::quat getOrientation() const { return _camera->getRotation(); } + private: Camera* _camera; };