From e7766039b9e66ca8c22a768d22be6f0bfcc668d2 Mon Sep 17 00:00:00 2001 From: sabrina-shanman Date: Fri, 3 Aug 2018 14:08:47 -0700 Subject: [PATCH] Pass pick variant map into unsuccessful/default collision results --- interface/src/raypick/CollisionPick.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/interface/src/raypick/CollisionPick.cpp b/interface/src/raypick/CollisionPick.cpp index d3411a77ca..eac71ab6ce 100644 --- a/interface/src/raypick/CollisionPick.cpp +++ b/interface/src/raypick/CollisionPick.cpp @@ -318,7 +318,7 @@ CollisionRegion CollisionPick::getMathematicalPick() const { PickResultPointer CollisionPick::getEntityIntersection(const CollisionRegion& pick) { if (!isShapeInfoReady()) { // Cannot compute result - return std::make_shared(); + return std::make_shared(pick.toVariantMap()); } const auto& entityIntersections = _physicsEngine->getCollidingInRegion(MOTIONSTATE_TYPE_ENTITY, *pick.shapeInfo, pick.transform); @@ -326,13 +326,13 @@ PickResultPointer CollisionPick::getEntityIntersection(const CollisionRegion& pi } PickResultPointer CollisionPick::getOverlayIntersection(const CollisionRegion& pick) { - return getDefaultResult(QVariantMap()); + return getDefaultResult(pick.toVariantMap()); } PickResultPointer CollisionPick::getAvatarIntersection(const CollisionRegion& pick) { if (!isShapeInfoReady()) { // Cannot compute result - return std::make_shared(); + return std::make_shared(pick.toVariantMap()); } const auto& avatarIntersections = _physicsEngine->getCollidingInRegion(MOTIONSTATE_TYPE_AVATAR, *pick.shapeInfo, pick.transform); @@ -340,5 +340,5 @@ PickResultPointer CollisionPick::getAvatarIntersection(const CollisionRegion& pi } PickResultPointer CollisionPick::getHUDIntersection(const CollisionRegion& pick) { - return getDefaultResult(QVariantMap()); + return getDefaultResult(pick.toVariantMap()); } \ No newline at end of file