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

Started work on trackball-functionality in interactionhandler

Browse Source
This commit is contained in:
Hans-Christian Helltegen
2014-04-23 16:55:49 -04:00
parent 1de2d2fea1
commit ed93372c8b
2 changed files with 23 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/interaction/interactionhandler.cpp
View File

@@ -1,5 +1,6 @@
// open space includes
#include <ghoul/logging/logmanager.h>
#include <openspace/interaction/interactionhandler.h>
#include <openspace/interaction/deviceidentifier.h>
#include <openspace/interaction/externalcontrol/randomexternalcontrol.h>
@@ -10,6 +11,8 @@
// std includes
#include <cassert>
std::string _loggerCat = "InteractionHandler";
namespace openspace {
InteractionHandler::InteractionHandler() {
@@ -225,6 +228,18 @@ double InteractionHandler::getDt() {
return dt_;
}
// Implementation of Holroyd's Trackball
glm::vec3 InteractionHandler::mapToTrackball(glm::vec2 mousePos) {
glm::vec3 out = glm::vec3(mousePos.x, mousePos.y, 0);
const float RADIUS = 0.5; // Sphere radius
if (out.x*out.x + out.y*out.y <= RADIUS*RADIUS/2.0)
out.z = sqrt(RADIUS*RADIUS - (out.x*out.x + out.y*out.y));
else
out.z = (RADIUS*RADIUS/2.0)/sqrt(out.x*out.x + out.y*out.y);
return out;
}
void InteractionHandler::keyboardCallback(int key, int action) {
// TODO package in script
const double speed = 2.75;
@@ -312,6 +327,11 @@ void InteractionHandler::mouseButtonCallback(int key, int action) {
}
void InteractionHandler::mousePositionCallback(int x, int y) {
float width = sgct::Engine::instance()->getActiveXResolution();
float height = sgct::Engine::instance()->getActiveYResolution();
glm::vec2 mousePos = glm::vec2(((float)x/width)-0.5, ((float)y/height)-0.5);
glm::vec3 trackballPos = mapToTrackball(mousePos);
LDEBUG(mousePos.x << ", " << mousePos.y << " = " << trackballPos.x << ", " << trackballPos.y << ", " << trackballPos.z);
//if(mouseControl_ != nullptr) {
// mouseControl_->mousePosCallback(x,y);
//}
@@ -324,4 +344,4 @@ void InteractionHandler::mouseScrollWheelCallback(int pos) {
}
} // namespace openspace
} // namespace openspace