Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-09 11:28:03 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Removed unneeded variable

Browse source
This commit is contained in:
barnold1953 2014-07-10 17:34:10 -07:00
parent 1781a2d125
commit 97165cadcc
1 changed files with 1 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
interface/src/ui/ApplicationOverlay.cpp
View file

@ -166,7 +166,6 @@ void ApplicationOverlay::displayOverlayTexture() {
void ApplicationOverlay::computeOculusPickRay(float x, float y, glm::vec3& direction) const { void ApplicationOverlay::computeOculusPickRay(float x, float y, glm::vec3& direction) const {
MyAvatar* myAvatar = Application::getInstance()->getAvatar(); MyAvatar* myAvatar = Application::getInstance()->getAvatar();
glm::quat rot = myAvatar->getOrientation();
//invert y direction //invert y direction
y = 1.0 - y; y = 1.0 - y;
@ -179,7 +178,7 @@ void ApplicationOverlay::computeOculusPickRay(float x, float y, glm::vec3& direc
float z = -sqrt(1.0f - dist * dist); float z = -sqrt(1.0f - dist * dist);
glm::vec3 relativePosition = myAvatar->getHead()->calculateAverageEyePosition() + glm::vec3 relativePosition = myAvatar->getHead()->calculateAverageEyePosition() +
glm::normalize(rot * glm::vec3(x, y, z)); glm::normalize(myAvatar->getOrientation() * glm::vec3(x, y, z));
//Rotate the UI pick ray by the avatar orientation //Rotate the UI pick ray by the avatar orientation
direction = glm::normalize(relativePosition - Application::getInstance()->getCamera()->getPosition()); direction = glm::normalize(relativePosition - Application::getInstance()->getCamera()->getPosition());