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

Clean up camera class cache variables.

Browse Source
This commit is contained in:
Kalle Bladin
2016-07-11 21:12:56 -04:00
parent ddd44ad837
commit 1ebbeb746d
1 changed files with 20 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/util/camera.cpp
+20
View File
@@ -73,16 +73,25 @@ namespace openspace {
void Camera::setPositionVec3(Vec3 pos) {
std::lock_guard<std::mutex> _lock(_mutex);
_position.local = pos;
_cachedCombinedViewMatrix.isDirty = true;
}
void Camera::setFocusPositionVec3(Vec3 pos) {
std::lock_guard<std::mutex> _lock(_mutex);
_focusPosition = pos;
_cachedViewDirection.isDirty = true;
_cachedLookupVector.isDirty = true;
_cachedViewRotationMatrix.isDirty = true;
_cachedCombinedViewMatrix.isDirty = true;
}
void Camera::setRotation(Quat rotation) {
std::lock_guard<std::mutex> _lock(_mutex);
_rotation.local = rotation;
_cachedViewDirection.isDirty = true;
_cachedLookupVector.isDirty = true;
_cachedViewRotationMatrix.isDirty = true;
_cachedCombinedViewMatrix.isDirty = true;
}
@@ -102,6 +111,11 @@ namespace openspace {
void Camera::rotate(Quat rotation) {
std::lock_guard<std::mutex> _lock(_mutex);
_rotation.local = rotation * _rotation.local;
_cachedViewDirection.isDirty = true;
_cachedLookupVector.isDirty = true;
_cachedViewRotationMatrix.isDirty = true;
_cachedCombinedViewMatrix.isDirty = true;
}
// Accessors
@@ -122,6 +136,7 @@ namespace openspace {
_cachedViewDirection.datum =
_rotation.synced * Vec3(_VIEW_DIRECTION_CAMERA_SPACE);
_cachedViewDirection.datum = glm::normalize(_cachedViewDirection.datum);
_cachedViewDirection.isDirty = true;
}
return _cachedViewDirection.datum;
}
@@ -135,6 +150,7 @@ namespace openspace {
_cachedLookupVector.datum =
_rotation.synced * Vec3(_LOOKUP_VECTOR_CAMERA_SPACE);
_cachedLookupVector.datum = glm::normalize(_cachedLookupVector.datum);
_cachedLookupVector.isDirty = true;
}
return _cachedLookupVector.datum;
}
@@ -150,6 +166,7 @@ namespace openspace {
float Camera::sinMaxFov() const {
if (_cachedSinMaxFov.isDirty) {
_cachedSinMaxFov.datum = sin(_maxFov);
_cachedSinMaxFov.isDirty = true;
}
return _cachedSinMaxFov.datum;
}
@@ -173,6 +190,7 @@ namespace openspace {
Mat4(sgctInternal.viewMatrix()) *
Mat4(viewRotationMatrix()) *
cameraTranslation;
_cachedCombinedViewMatrix.isDirty = true;
}
return _cachedCombinedViewMatrix.datum;
}
@@ -203,6 +221,8 @@ namespace openspace {
_cachedViewDirection.isDirty = true;
_cachedLookupVector.isDirty = true;
_cachedViewRotationMatrix.isDirty = true;
_cachedCombinedViewMatrix.isDirty = true;
}