mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-04-23 04:30:09 -05:00
Code Issues Packages Projects Releases Wiki Activity

removed mouseinteraction test for screenspacerenderables

Browse Source
This commit is contained in:
Sebastian Piwell
2016-03-21 09:20:47 -04:00
parent 85225946b9
commit 48978f38fc
4 changed files with 4 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/interaction/mousecontroller.cpp
+3 -22
View File
@@ -26,7 +26,7 @@
#include <openspace/engine/openspaceengine.h>
#include <openspace/engine/wrapper/windowwrapper.h>
#include <openspace/rendering/renderengine.h>
#include <openspace/interaction/interactionhandler.h>
namespace openspace {
@@ -230,26 +230,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);
//}
glm::vec2 v(0.0);
if(!_middleMouseButtonDown ){
if(_leftMouseButtonDown && !_rightMouseButtonDown ){
v.x = static_cast<float>(dt);
} else if(!_leftMouseButtonDown && _rightMouseButtonDown ){
v.y = static_cast<float>(dt);
}else if(_leftMouseButtonDown && _rightMouseButtonDown ){
// v.z = static_cast<float>(dt);
}
OsEng.renderEngine().ssr->move(v);
} else {
if(_leftMouseButtonDown && !_rightMouseButtonDown ){
v.x = -static_cast<float>(dt);
} else if(!_leftMouseButtonDown && _rightMouseButtonDown ){
v.y = -static_cast<float>(dt);
}else if(_leftMouseButtonDown && _rightMouseButtonDown ){
// v.z = -static_cast<float>(dt);
}
OsEng.renderEngine().ssr->move(v);
}
// if (_leftMouseButtonDown){
// _handler->orbit(static_cast<float>(dt)* _currentCursorDiff[MouseButtons::ButtonLeft].x * _rotationSpeed, static_cast<float>(dt)* _currentCursorDiff[MouseButtons::ButtonLeft].y * _rotationSpeed, 0.f);
// }
@@ -262,4 +243,4 @@ void OrbitalMouseController::update(const double& dt){
}
} // namespace interaction
} // namespace openspace
} // namespace openspace