Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-13 18:20:28 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Restoring position as a slot

Browse source
This commit is contained in:
Brad Davis 2015-05-12 14:45:38 -07:00
parent 64d0aa39dd
commit 02a6b557dd
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
interface/src/Camera.h
View file

@ -43,7 +43,6 @@ public:
void update( float deltaTime );
void setPosition(const glm::vec3& position);
void setRotation(const glm::quat& rotation);
void setProjection(const glm::mat4 & projection);
void setHmdPosition(const glm::vec3& hmdPosition);
@ -51,7 +50,6 @@ public:
void setMode(CameraMode m);
glm::quat getRotation() const { return _rotation * _hmdRotation; }
glm::vec3 getPosition() const { return _position + _hmdPosition; }
const glm::mat4& getProjection() const { return _projection; }
const glm::vec3& getHmdPosition() const { return _hmdPosition; }
const glm::quat& getHmdRotation() const { return _hmdRotation; }
@ -61,6 +59,9 @@ public slots:
QString getModeString() const;
void setModeString(const QString& mode);
glm::vec3 getPosition() const { return _position + _hmdPosition; }
void setPosition(const glm::vec3& position);
void setOrientation(const glm::quat& orientation) { setRotation(orientation); }
glm::quat getOrientation() const { return getRotation(); }