Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-05-10 10:48:20 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixing all the changes of interface name coming from upstream

Browse source
This commit is contained in:
samcake 2017-11-21 14:55:58 -08:00
parent ebd701a1ab
commit a0e40efdc8
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
interface/src/raypick/StylusPick.cpp
View file

@ -157,8 +157,8 @@ PickResultPointer StylusPick::getEntityIntersection(const StylusTip& pick) {
continue; continue;
} }
const auto entityRotation = entity->getRotation(); const auto entityRotation = entity->getWorldOrientation();
const auto entityPosition = entity->getPosition(); const auto entityPosition = entity->getWorldPosition();
glm::vec3 normal = entityRotation * Vectors::UNIT_Z; glm::vec3 normal = entityRotation * Vectors::UNIT_Z;
float distance = glm::dot(pick.position - entityPosition, normal); float distance = glm::dot(pick.position - entityPosition, normal);
@ -197,8 +197,8 @@ PickResultPointer StylusPick::getOverlayIntersection(const StylusTip& pick) {
} }
auto overlay3D = std::static_pointer_cast<Base3DOverlay>(overlay); auto overlay3D = std::static_pointer_cast<Base3DOverlay>(overlay);
const auto overlayRotation = overlay3D->getRotation(); const auto overlayRotation = overlay3D->getWorldOrientation();
const auto overlayPosition = overlay3D->getPosition(); const auto overlayPosition = overlay3D->getWorldPosition();
glm::vec3 normal = overlayRotation * Vectors::UNIT_Z; glm::vec3 normal = overlayRotation * Vectors::UNIT_Z;
float distance = glm::dot(pick.position - overlayPosition, normal); float distance = glm::dot(pick.position - overlayPosition, normal);