From bfa270375a891ea0292138f8108106988a67824f Mon Sep 17 00:00:00 2001 From: sabrina-shanman Date: Thu, 27 Sep 2018 14:33:29 -0700 Subject: [PATCH] Simplify PickRay calculations in RayPick::getMathematicalPick --- interface/src/raypick/RayPick.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/interface/src/raypick/RayPick.cpp b/interface/src/raypick/RayPick.cpp index 07e583ea1b..227b4e2f32 100644 --- a/interface/src/raypick/RayPick.cpp +++ b/interface/src/raypick/RayPick.cpp @@ -21,9 +21,9 @@ PickRay RayPick::getMathematicalPick() const { } Transform currentParentTransform = parentTransform->getTransform(); - Transform relativeTransform(rotationBetween(Vectors::UP, _mathPick.direction), glm::vec3(1.0f), _mathPick.origin); - Transform pickTransform = currentParentTransform.worldTransform(relativeTransform); - return PickRay(pickTransform.getTranslation(), pickTransform.getRotation() * Vectors::UP); + glm::vec3 origin = currentParentTransform.transform(_mathPick.origin); + glm::vec3 direction = currentParentTransform.transformDirection(_mathPick.direction); + return PickRay(origin, direction); } PickResultPointer RayPick::getEntityIntersection(const PickRay& pick) {