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

Merge branch 'master' of github.com:OpenSpace/OpenSpace into feature/data-management

Browse Source
This commit is contained in:
Emil Axelsson
2017-11-10 16:07:58 +01:00
parent e201dec907 afa1d6d33e
commit cb07af4a2b
482 changed files with 7286 additions and 3720 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/interaction/navigationhandler.cpp
View File

@@ -85,7 +85,7 @@ NavigationHandler::NavigationHandler()
_inputState = std::make_unique<InputState>();
_orbitalNavigator = std::make_unique<OrbitalNavigator>();
_keyframeNavigator = std::make_unique<KeyframeNavigator>();
// Add the properties
addProperty(_origin);
addProperty(_useKeyFrameInteraction);
@@ -149,7 +149,7 @@ void NavigationHandler::updateCamera(double deltaTime) {
}
else {
_orbitalNavigator->updateMouseStatesFromInput(*_inputState, deltaTime);
_orbitalNavigator->updateCameraStateFromMouseStates(*_camera, deltaTime);
_orbitalNavigator->updateCameraStateFromMouseStates(*_camera, deltaTime);
}
_camera->setFocusPositionVec3(focusNode()->worldPosition());
}
@@ -248,9 +248,9 @@ void NavigationHandler::saveCameraStateToFile(const std::string& filepath) {
// TODO : Should get the camera state as a dictionary and save the dictionary to
// a file in form of a lua state and not use ofstreams here.
std::ofstream ofs(fullpath.c_str());
glm::dvec3 p = _camera->positionVec3();
glm::dquat q = _camera->rotationQuaternion();