mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-05-13 06:49:05 -05:00
Code Issues Packages Projects Releases Wiki Activity

Remove psc internally from camera class.

Browse Source
This commit is contained in:
Kalle Bladin
2016-05-20 10:31:33 -04:00
parent 1db9f2f60c
commit e057f60a18
2 changed files with 23 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/openspace/util/camera.h
+9 -9
View File
@@ -73,14 +73,14 @@ namespace openspace {
void rotate(Quat rotation);
// Accessors
const psc& position() const;
const psc& unsynchedPosition() const;
const psc& focusPosition() const;
const glm::vec3 viewDirectionWorldSpace() const;
const glm::vec3 lookUpVectorCameraSpace() const;
psc position() const;
psc unsynchedPosition() const;
psc focusPosition() const;
glm::vec3 viewDirectionWorldSpace() const;
glm::vec3 lookUpVectorCameraSpace() const;
const glm::vec2& scaling() const;
const glm::mat4 viewRotationMatrix() const;
const glm::quat rotationQuaternion() const;
glm::mat4 viewRotationMatrix() const;
glm::quat rotationQuaternion() const;
float maxFov() const;
float sinMaxFov() const;
@@ -159,9 +159,9 @@ namespace openspace {
// State of the camera
SyncData<Quat> _rotation;
SyncData<glm::vec2> _scaling;
SyncData<psc> _position;
SyncData<Vec3> _position;
psc _focusPosition;
Vec3 _focusPosition;
float _maxFov;