mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-03-17 11:00:31 -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

2
src/interaction/mousecontroller.cpp
View File

@@ -57,7 +57,7 @@ glm::vec3 MouseController::mapToTrackball(glm::vec2 mousePos) {
glm::vec3 MouseController::mapToCamera(glm::vec3 trackballPos) {
//Get x,y,z axis vectors of current camera view
glm::vec3 currentViewYaxis = glm::normalize(_handler->camera()->lookUpVector());
glm::vec3 currentViewYaxis = glm::normalize(_handler->camera()->lookUpVectorCameraSpace());
psc viewDir = _handler->camera()->position() - _handler->focusNode()->worldPosition();
glm::vec3 currentViewZaxis = glm::normalize(viewDir.vec3());
glm::vec3 currentViewXaxis = glm::normalize(glm::cross(currentViewYaxis, currentViewZaxis));