From f71fc833099aaa678f41779adc9fd1a2bf439c97 Mon Sep 17 00:00:00 2001
From: sabrina-shanman <sabrina@highfidelity.io>
Date: Fri, 31 Aug 2018 10:48:48 -0700
Subject: [PATCH] Remove PickResult::needsToCompareResults

---
 interface/src/raypick/CollisionPick.h       | 1 -
 libraries/pointers/src/Pick.h               | 1 -
 libraries/pointers/src/PickCacheOptimizer.h | 6 +++---
 3 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/interface/src/raypick/CollisionPick.h b/interface/src/raypick/CollisionPick.h
index a1636e4b47..ce8b3bd199 100644
--- a/interface/src/raypick/CollisionPick.h
+++ b/interface/src/raypick/CollisionPick.h
@@ -40,7 +40,6 @@ public:
     QVariantMap toVariantMap() const override;
 
     bool doesIntersect() const override { return intersects; }
-    bool needsToCompareResults() const override { return true; }
     bool checkOrFilterAgainstMaxDistance(float maxDistance) override { return true; }
 
     PickResultPointer compareAndProcessNewResult(const PickResultPointer& newRes) override;
diff --git a/libraries/pointers/src/Pick.h b/libraries/pointers/src/Pick.h
index 9c4de6c46e..099a791407 100644
--- a/libraries/pointers/src/Pick.h
+++ b/libraries/pointers/src/Pick.h
@@ -115,7 +115,6 @@ public:
     }
 
     virtual bool doesIntersect() const = 0;
-    virtual bool needsToCompareResults() const { return doesIntersect(); }
 
     // for example: if we want the closest result, compare based on distance
     // if we want all results, combine them
diff --git a/libraries/pointers/src/PickCacheOptimizer.h b/libraries/pointers/src/PickCacheOptimizer.h
index ae515fc8d7..448d67b5a9 100644
--- a/libraries/pointers/src/PickCacheOptimizer.h
+++ b/libraries/pointers/src/PickCacheOptimizer.h
@@ -92,7 +92,7 @@ void PickCacheOptimizer<T>::update(std::unordered_map<uint32_t, std::shared_ptr<
                 if (!checkAndCompareCachedResults(mathematicalPick, results, res, entityKey)) {
                     PickResultPointer entityRes = pick->getEntityIntersection(mathematicalPick);
                     if (entityRes) {
-                        cacheResult(entityRes->needsToCompareResults(), entityRes, entityKey, res, mathematicalPick, results, pick);
+                        cacheResult(entityRes->doesIntersect(), entityRes, entityKey, res, mathematicalPick, results, pick);
                     }
                 }
             }
@@ -102,7 +102,7 @@ void PickCacheOptimizer<T>::update(std::unordered_map<uint32_t, std::shared_ptr<
                 if (!checkAndCompareCachedResults(mathematicalPick, results, res, overlayKey)) {
                     PickResultPointer overlayRes = pick->getOverlayIntersection(mathematicalPick);
                     if (overlayRes) {
-                        cacheResult(overlayRes->needsToCompareResults(), overlayRes, overlayKey, res, mathematicalPick, results, pick);
+                        cacheResult(overlayRes->doesIntersect(), overlayRes, overlayKey, res, mathematicalPick, results, pick);
                     }
                 }
             }
@@ -112,7 +112,7 @@ void PickCacheOptimizer<T>::update(std::unordered_map<uint32_t, std::shared_ptr<
                 if (!checkAndCompareCachedResults(mathematicalPick, results, res, avatarKey)) {
                     PickResultPointer avatarRes = pick->getAvatarIntersection(mathematicalPick);
                     if (avatarRes) {
-                        cacheResult(avatarRes->needsToCompareResults(), avatarRes, avatarKey, res, mathematicalPick, results, pick);
+                        cacheResult(avatarRes->doesIntersect(), avatarRes, avatarKey, res, mathematicalPick, results, pick);
                     }
                 }
             }