mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-01-18 01:41:29 -06:00
Code Issues Packages Projects Releases Wiki Activity

changed camera update (for object following) is now done in orbit function of interactionhandler

Browse Source
This commit is contained in:
Joakim Kilby
2015-02-17 12:00:58 +01:00
parent 525b8a4de3
commit eafa4e2fe6
3 changed files with 25 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/interaction/mousecontroller.cpp
View File

@@ -223,13 +223,13 @@ void OrbitalMouseController::scrollWheel(int pos) {
void OrbitalMouseController::update(const double& dt){
if (_leftMouseButtonDown || _rightMouseButtonDown || _middleMouseButtonDown){
//if (_leftMouseButtonDown || _rightMouseButtonDown || _middleMouseButtonDown){
_handler->orbit(
static_cast<float>(_leftMouseButtonDown) * static_cast<float>(dt) * _currentCursorDiff[MouseButtons::ButtonLeft].x * _rotationSpeed,
static_cast<float>(_leftMouseButtonDown) * static_cast<float>(dt) * _currentCursorDiff[MouseButtons::ButtonLeft].y * _rotationSpeed,
static_cast<float>(_middleMouseButtonDown) * static_cast<float>(dt) * _currentCursorDiff[MouseButtons::ButtonMiddle].x * _rotationSpeed,
static_cast<float>(_rightMouseButtonDown) * static_cast<float>(dt) * _currentCursorDiff[MouseButtons::ButtonRight].y * _navigationSpeed);
}
//}
// if (_leftMouseButtonDown){
// _handler->orbit(static_cast<float>(dt)* _currentCursorDiff[MouseButtons::ButtonLeft].x * _rotationSpeed, static_cast<float>(dt)* _currentCursorDiff[MouseButtons::ButtonLeft].y * _rotationSpeed, 0.f);