From 2ddd46f30b167497fa416604335362ce3514c07c Mon Sep 17 00:00:00 2001
From: David Kelly <david@highfidelity.com>
Date: Fri, 16 Sep 2016 10:56:59 -0700
Subject: [PATCH] Switch to the cool looking model instead

---
 .../system/controllers/handControllerGrab.js  | 57 ++++++-------------
 1 file changed, 18 insertions(+), 39 deletions(-)

diff --git a/scripts/system/controllers/handControllerGrab.js b/scripts/system/controllers/handControllerGrab.js
index 284599eb4d..ba999a5515 100644
--- a/scripts/system/controllers/handControllerGrab.js
+++ b/scripts/system/controllers/handControllerGrab.js
@@ -205,6 +205,8 @@ var CONTROLLER_STATE_MACHINE = {};
 
 var mostRecentSearchingHand = RIGHT_HAND;
 
+var DEFAULT_SPHERE_MODEL_URL = "http://hifi-content.s3.amazonaws.com/alan/dev/equip-Fresnel-3.fbx";
+
 CONTROLLER_STATE_MACHINE[STATE_OFF] = {
     name: "off",
     enterMethod: "offEnter",
@@ -602,47 +604,24 @@ EquipHotspotBuddy.prototype.updateHotspot = function(hotspot, timestamp) {
             targetSize: 1,
             overlays: []
         };
-
+        
         var diameter = hotspot.radius * 2;
 
-        if (hotspot.modelURL) {
-            // override default sphere with a user specified model
-            overlayInfoSet.overlays.push(Overlays.addOverlay("model", {
-                url: hotspot.modelURL,
-                position: hotspot.worldPosition,
-                rotation: {
-                    x: 0,
-                    y: 0,
-                    z: 0,
-                    w: 1
-                },
-                dimensions: diameter * EQUIP_SPHERE_SCALE_FACTOR,
-                scale: hotspot.modelScale,
-                ignoreRayIntersection: true
-            }));
-            overlayInfoSet.type = "model";
-        } else {
-            // default sphere overlay
-            overlayInfoSet.overlays.push(Overlays.addOverlay("sphere", {
-                position: hotspot.worldPosition,
-                rotation: {
-                    x: 0,
-                    y: 0,
-                    z: 0,
-                    w: 1
-                },
-                dimensions: diameter * EQUIP_SPHERE_SCALE_FACTOR,
-                color: EQUIP_SPHERE_COLOR,
-                alpha: EQUIP_SPHERE_ALPHA,
-                emissive: true,
-                solid: true,
-                visible: true,
-                ignoreRayIntersection: true,
-                drawInFront: false
-            }));
-            overlayInfoSet.type = "sphere";
-        }
-
+        // override default sphere with a user specified model, if it exists.
+        overlayInfoSet.overlays.push(Overlays.addOverlay("model", {
+            url: hotspot.modelURL ? hotspot.modelURL : DEFAULT_SPHERE_MODEL_URL,
+            position: hotspot.worldPosition,
+            rotation: {
+                x: 0,
+                y: 0,
+                z: 0,
+                w: 1
+            },
+            dimensions: diameter * EQUIP_SPHERE_SCALE_FACTOR,
+            scale: hotspot.modelScale,
+            ignoreRayIntersection: true
+        }));
+        overlayInfoSet.type = "model";
         this.map[hotspot.key] = overlayInfoSet;
     } else {
         overlayInfoSet.timestamp = timestamp;