From b32b811fff967bada1eb41a7d5cb14769f0286fe Mon Sep 17 00:00:00 2001
From: sabrina-shanman <sabrina@highfidelity.io>
Date: Thu, 9 Aug 2018 17:24:09 -0700
Subject: [PATCH] Move up buildObjectIntersectionsMap in CollisionPick.cpp

---
 interface/src/raypick/CollisionPick.cpp | 40 ++++++++++++-------------
 1 file changed, 20 insertions(+), 20 deletions(-)

diff --git a/interface/src/raypick/CollisionPick.cpp b/interface/src/raypick/CollisionPick.cpp
index 503832c0eb..87c8c91e6d 100644
--- a/interface/src/raypick/CollisionPick.cpp
+++ b/interface/src/raypick/CollisionPick.cpp
@@ -15,6 +15,26 @@
 #include "ScriptEngineLogging.h"
 #include "UUIDHasher.h"
 
+void buildObjectIntersectionsMap(IntersectionType intersectionType, const std::vector<ContactTestResult>& objectIntersections, std::unordered_map<QUuid, QVariantMap>& intersections, std::unordered_map<QUuid, QVariantList>& collisionPointPairs) {
+    for (auto& objectIntersection : objectIntersections) {
+        auto at = intersections.find(objectIntersection.foundID);
+        if (at == intersections.end()) {
+            QVariantMap intersectingObject;
+            intersectingObject["id"] = objectIntersection.foundID;
+            intersectingObject["type"] = intersectionType;
+            intersections[objectIntersection.foundID] = intersectingObject;
+
+            collisionPointPairs[objectIntersection.foundID] = QVariantList();
+        }
+
+        QVariantMap collisionPointPair;
+        collisionPointPair["pointOnPick"] = vec3toVariant(objectIntersection.testCollisionPoint);
+        collisionPointPair["pointOnObject"] = vec3toVariant(objectIntersection.foundCollisionPoint);
+
+        collisionPointPairs[objectIntersection.foundID].append(collisionPointPair);
+    }
+}
+
 QVariantMap CollisionPickResult::toVariantMap() const {
     QVariantMap variantMap;
 
@@ -42,26 +62,6 @@ QVariantMap CollisionPickResult::toVariantMap() const {
     return variantMap;
 }
 
-void buildObjectIntersectionsMap(IntersectionType intersectionType, const std::vector<ContactTestResult>& objectIntersections, std::unordered_map<QUuid, QVariantMap>& intersections, std::unordered_map<QUuid, QVariantList>& collisionPointPairs) {
-    for (auto& objectIntersection : objectIntersections) {
-        auto at = intersections.find(objectIntersection.foundID);
-        if (at == intersections.end()) {
-            QVariantMap intersectingObject;
-            intersectingObject["id"] = objectIntersection.foundID;
-            intersectingObject["type"] = intersectionType;
-            intersections[objectIntersection.foundID] = intersectingObject;
-
-            collisionPointPairs[objectIntersection.foundID] = QVariantList();
-        }
-
-        QVariantMap collisionPointPair;
-        collisionPointPair["pointOnPick"] = vec3toVariant(objectIntersection.testCollisionPoint);
-        collisionPointPair["pointOnObject"] = vec3toVariant(objectIntersection.foundCollisionPoint);
-
-        collisionPointPairs[objectIntersection.foundID].append(collisionPointPair);
-    }
-}
-
 bool CollisionPick::isShapeInfoReady() {
     if (_mathPick.shouldComputeShapeInfo()) {
         if (_cachedResource && _cachedResource->isLoaded()) {