From a0e40efdc85ac01a62ea4b0515f06c90a8a27a8f Mon Sep 17 00:00:00 2001 From: samcake Date: Tue, 21 Nov 2017 14:55:58 -0800 Subject: [PATCH] Fixing all the changes of interface name coming from upstream --- interface/src/raypick/StylusPick.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/interface/src/raypick/StylusPick.cpp b/interface/src/raypick/StylusPick.cpp index f15b2c13f1..9021c922a6 100644 --- a/interface/src/raypick/StylusPick.cpp +++ b/interface/src/raypick/StylusPick.cpp @@ -157,8 +157,8 @@ PickResultPointer StylusPick::getEntityIntersection(const StylusTip& pick) { continue; } - const auto entityRotation = entity->getRotation(); - const auto entityPosition = entity->getPosition(); + const auto entityRotation = entity->getWorldOrientation(); + const auto entityPosition = entity->getWorldPosition(); glm::vec3 normal = entityRotation * Vectors::UNIT_Z; float distance = glm::dot(pick.position - entityPosition, normal); @@ -197,8 +197,8 @@ PickResultPointer StylusPick::getOverlayIntersection(const StylusTip& pick) { } auto overlay3D = std::static_pointer_cast(overlay); - const auto overlayRotation = overlay3D->getRotation(); - const auto overlayPosition = overlay3D->getPosition(); + const auto overlayRotation = overlay3D->getWorldOrientation(); + const auto overlayPosition = overlay3D->getWorldPosition(); glm::vec3 normal = overlayRotation * Vectors::UNIT_Z; float distance = glm::dot(pick.position - overlayPosition, normal);