mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-04-27 06:19:51 -05:00
Code Issues Packages Projects Releases Wiki Activity

More PowerscaledCoordinate cleanup

Browse Source
This commit is contained in:
Alexander Bock
2014-05-11 15:59:48 +02:00
parent 89142340d0
commit 9bc084bf81
6 changed files with 99 additions and 128 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/interaction/interactionhandler.cpp
+3 -3
View File
@@ -160,7 +160,7 @@ void InteractionHandler::orbit(const glm::quat &rotation) {
psc relative_origin_coordinate = relative - origin;
glm::mat4 rotation_matrix = glm::mat4_cast(rotation);
relative_origin_coordinate = relative_origin_coordinate.mul(rotation_matrix);
relative_origin_coordinate = relative_origin_coordinate * rotation_matrix;
relative = relative_origin_coordinate + origin;
camera_->setPosition(relative);
@@ -179,7 +179,7 @@ void InteractionHandler::distance(const pss &distance) {
}
psc relative_origin_coordinate = relative - origin;
glm::dvec3 dir = relative_origin_coordinate.getDirection();
glm::dvec3 dir(relative_origin_coordinate.direction());
dir = dir * distance[0];
relative_origin_coordinate = dir;
relative_origin_coordinate[3] = distance[1];
@@ -247,7 +247,7 @@ glm::vec3 InteractionHandler::mapToCamera(glm::vec3 trackballPos) {
//Get x,y,z axis vectors of current camera view
glm::vec3 currentViewYaxis = glm::normalize(camera_->lookUpVector());
psc viewDir = camera_->position() - node_->getWorldPosition();
glm::vec3 currentViewZaxis = glm::normalize(viewDir.getVec3f());
glm::vec3 currentViewZaxis = glm::normalize(viewDir.vec3());
glm::vec3 currentViewXaxis = glm::normalize(glm::cross(currentViewYaxis, currentViewZaxis));
//mapping to camera co-ordinate