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

Remove old parts of the interface to interaction handler.

Browse Source
This commit is contained in:
Kalle Bladin
2016-05-20 18:50:11 -04:00
parent c2ef5cca58
commit 9d235f42b2
5 changed files with 24 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/interaction/mousecontroller.cpp
View File

@@ -102,7 +102,7 @@ void MouseController::trackballRotate(int x, int y) {
glm::quat quaternion = glm::angleAxis(rotationAngle, rotationAxis);
// Apply quaternion to camera
_handler->orbitDelta(quaternion);
//_handler->orbitDelta(quaternion);
_lastTrackballPos = curTrackballPos;
}
@@ -129,6 +129,7 @@ void TrackballMouseController::move(float x, float y) {
}
void TrackballMouseController::scrollWheel(int pos) {
/*
const float speed = 4.75f;
const float dt = static_cast<float>(_handler->deltaTime());
if (pos < 0) {
@@ -139,6 +140,7 @@ void TrackballMouseController::scrollWheel(int pos) {
PowerScaledScalar dist(-speed * dt, 0.0f);
_handler->distanceDelta(dist);
}
*/
}
void TrackballMouseController::update(const double& dt){
@@ -219,6 +221,7 @@ void OrbitalMouseController::scrollWheel(int pos) {
}
void OrbitalMouseController::update(const double& dt){
/*
const float interactionSpeed = OsEng.interactionHandler().interactionSensitivity();
const bool rotationInvert = OsEng.interactionHandler().invertRotation();
const bool rollInvert = OsEng.interactionHandler().invertRoll();
@@ -230,6 +233,7 @@ void OrbitalMouseController::update(const double& dt){
static_cast<float>(_middleMouseButtonDown) * static_cast<float>(dt) * _currentCursorDiff[MouseButtons::ButtonMiddle].x * interactionSpeed * (rollInvert ? -1.f : 1.f),
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);