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

Added missing commit

Browse Source
This commit is contained in:
Alexander Bock
2014-10-13 00:43:36 +02:00
parent ff62c06320
commit c41b1b178a
1 changed files with 3 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
include/openspace/interaction/controller.h
View File

@@ -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;