mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-04-21 01:59:15 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merged master into NewAtmosphere.

Browse Source
This commit is contained in:
Jonathas Costa
2017-11-15 18:12:58 -05:00
parent 67033c4583 41dae755f5
commit 0264a3026c
441 changed files with 13553 additions and 6101 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/util/camera.cpp
+5 -3
View File
@@ -35,7 +35,7 @@
namespace openspace {
//////////////////////////////////////////////////////////////////////////////////////
// CAMERA //
// CAMERA //
//////////////////////////////////////////////////////////////////////////////////////
namespace {
@@ -176,7 +176,9 @@ namespace openspace {
const Camera::Mat4& Camera::viewRotationMatrix() const {
if (_cachedViewRotationMatrix.isDirty) {
_cachedViewRotationMatrix.datum = glm::mat4_cast(glm::inverse(static_cast<glm::dquat>(_rotation)));
_cachedViewRotationMatrix.datum = glm::mat4_cast(
glm::inverse(static_cast<glm::dquat>(_rotation))
);
}
return _cachedViewRotationMatrix.datum;
}
@@ -223,7 +225,7 @@ namespace openspace {
}
//////////////////////////////////////////////////////////////////////////////////////
// SGCT INTERNAL //
// SGCT INTERNAL //
//////////////////////////////////////////////////////////////////////////////////////
Camera::SgctInternal::SgctInternal()
: _sceneMatrix()