From c41b1b178a72303be02881f3dec2c6c33d8561be Mon Sep 17 00:00:00 2001 From: Alexander Bock Date: Mon, 13 Oct 2014 00:43:36 +0200 Subject: [PATCH] Added missing commit --- include/openspace/interaction/controller.h | 32 ++-------------------- 1 file changed, 3 insertions(+), 29 deletions(-) diff --git a/include/openspace/interaction/controller.h b/include/openspace/interaction/controller.h index ca812baf65..6675b1acb2 100644 --- a/include/openspace/interaction/controller.h +++ b/include/openspace/interaction/controller.h @@ -55,37 +55,11 @@ protected: void rotateDelta(const glm::quat& rotation); - void distanceDelta(const PowerScaledScalar& distance) { - assert(_handler); - _handler->lockControls(); - - psc relative = _handler->_camera->position(); - const psc origin = (_handler->_focusNode) ? _handler->_focusNode->worldPosition() : psc(); + void distanceDelta(const PowerScaledScalar& distance); - psc relative_origin_coordinate = relative - origin; - const glm::vec3 dir(relative_origin_coordinate.direction()); - glm:: vec3 newdir = dir * distance[0]; - relative_origin_coordinate = newdir; - relative_origin_coordinate[3] = distance[1]; - relative = relative + relative_origin_coordinate; + void lookAt(const glm::quat& rotation); - relative_origin_coordinate = relative - origin; - newdir = relative_origin_coordinate.direction(); - - // update only if on the same side of the origin - if(glm::angle(newdir, dir) < 90.0f) - _handler->_camera->setPosition(relative); - - _handler->unlockControls(); - } - - void lookAt(const glm::quat& rotation) { - assert(_handler); - } - - void setRotation(const glm::quat& rotation) { - assert(_handler); - } + void setRotation(const glm::quat& rotation); private: InteractionHandler* _handler;