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

Clean up camera class.

Browse Source
This commit is contained in:
Kalle Bladin
2016-05-19 23:21:48 -04:00
parent 9dda48d44b
commit 1db9f2f60c
9 changed files with 356 additions and 393 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/scene/scene.cpp
+2 -2
View File
@@ -299,9 +299,9 @@ bool Scene::loadSceneInternal(const std::string& sceneDescriptionFilePath) {
}
// Check crash for when fn == nullptr
glm::mat4 la = glm::lookAt(cameraPosition.vec3(), fn->worldPosition().vec3(), c->lookUpVector());
glm::mat4 la = glm::lookAt(cameraPosition.vec3(), fn->worldPosition().vec3(), glm::vec3(c->lookUpVectorCameraSpace()));
c->setRotation(la);
c->setRotation(glm::quat_cast(la));
c->setPosition(cameraPosition);
c->setScaling(cameraScaling);