From 72f80d4a0fded278994bda3869ed795eecb043cf Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Tue, 4 Nov 2014 12:39:50 -0800 Subject: [PATCH] make camera getPosition() callable from js --- interface/src/Camera.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/interface/src/Camera.h b/interface/src/Camera.h index bc7a3c5687..06db3dc3ef 100644 --- a/interface/src/Camera.h +++ b/interface/src/Camera.h @@ -56,7 +56,6 @@ public: void setEyeOffsetOrientation(const glm::quat& o) { _eyeOffsetOrientation = o; } void setScale(const float s) { _scale = s; } - glm::vec3 getPosition() const { return _position + _hmdPosition; } glm::quat getRotation() const { return _rotation * _hmdRotation; } const glm::vec3& getHmdPosition() const { return _hmdPosition; } const glm::quat& getHmdRotation() const { return _hmdRotation; } @@ -73,6 +72,7 @@ public slots: QString getModeString() const; void setModeString(const QString& mode); + glm::vec3 getPosition() const { return _position + _hmdPosition; } void setPosition(const glm::vec3& position) { _position = position; } void setOrientation(const glm::quat& orientation) { setRotation(orientation); }