From ae301602e71e6d74e5173013504a233f22af3285 Mon Sep 17 00:00:00 2001
From: "Anthony J. Thibault" <tony@highfidelity.io>
Date: Fri, 21 Oct 2016 14:49:46 -0700
Subject: [PATCH] Fix for incorrect tip texture URLs.

---
 .../system/controllers/controllerDisplay.js   |  3 +++
 .../viveControllerConfiguration.js            | 22 ++++++++++---------
 2 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/scripts/system/controllers/controllerDisplay.js b/scripts/system/controllers/controllerDisplay.js
index c25dfa25e0..f42ac3aeda 100644
--- a/scripts/system/controllers/controllerDisplay.js
+++ b/scripts/system/controllers/controllerDisplay.js
@@ -67,6 +67,9 @@ createControllerDisplay = function(config) {
                         textures[part.textureName] = layer.defaultTextureURL;
                     }
                     for (var i = 0; i < this.partOverlays[partName].length; ++i) {
+
+                        // AJT: REMOVE
+                        print("AJT: Overlays.editOverlays(" + partName + ", " + i + ", { textures: " + JSON.stringify(textures) + " })");
                         Overlays.editOverlay(this.partOverlays[partName][i], {
                             textures: textures
                         });
diff --git a/scripts/system/controllers/viveControllerConfiguration.js b/scripts/system/controllers/viveControllerConfiguration.js
index ed61bb1be6..341b8256f7 100644
--- a/scripts/system/controllers/viveControllerConfiguration.js
+++ b/scripts/system/controllers/viveControllerConfiguration.js
@@ -58,6 +58,8 @@ var viveNaturalPosition = {
 };
 
 var BASE_URL = Script.resourcesPath();
+var TIP_TEXTURE_BASE_URL = BASE_URL + "meshes/controller/vive_tips.fbm/";
+
 var viveModelURL = BASE_URL + "meshes/controller/vive_body.fbx";
 var viveTipsModelURL = BASE_URL + "meshes/controller/vive_tips.fbx";
 
@@ -84,19 +86,19 @@ VIVE_CONTROLLER_CONFIGURATION_LEFT = {
                     defaultTextureLayer: "blank",
                     textureLayers: {
                         blank: {
-                            defaultTextureURL: viveTipsModelURL + "meshes/Controller-Tips.fbm/Blank.png"
+                            defaultTextureURL: TIP_TEXTURE_BASE_URL + "Blank.png"
                         },
                         trigger: {
-                            defaultTextureURL: viveTipsModelURL + "meshes/Controller-Tips.fbm/Trigger.png"
+                            defaultTextureURL: TIP_TEXTURE_BASE_URL + "/Trigger.png"
                         },
                         arrows: {
-                            defaultTextureURL: viveTipsModelURL + "meshes/Controller-Tips.fbm/Rotate.png"
+                            defaultTextureURL: TIP_TEXTURE_BASE_URL + "/Rotate.png"
                         },
                         grip: {
-                            defaultTextureURL: viveTipsModelURL + "meshes/Controller-Tips.fbm/Grip.png"
+                            defaultTextureURL: TIP_TEXTURE_BASE_URL + "/Grip.png"
                         },
                         teleport: {
-                            defaultTextureURL: viveTipsModelURL + "meshes/Controller-Tips.fbm/Teleport.png"
+                            defaultTextureURL: TIP_TEXTURE_BASE_URL + "/Teleport.png"
                         }
                     }
                 },
@@ -205,19 +207,19 @@ VIVE_CONTROLLER_CONFIGURATION_RIGHT = {
                     defaultTextureLayer: "blank",
                     textureLayers: {
                         blank: {
-                            defaultTextureURL: viveTipsModelURL + "meshes/Controller-Tips.fbm/Blank.png"
+                            defaultTextureURL: TIP_TEXTURE_BASE_URL + "/Blank.png"
                         },
                         trigger: {
-                            defaultTextureURL: viveTipsModelURL + "meshes/Controller-Tips.fbm/Trigger.png"
+                            defaultTextureURL: TIP_TEXTURE_BASE_URL + "/Trigger.png"
                         },
                         arrows: {
-                            defaultTextureURL: viveTipsModelURL + "meshes/Controller-Tips.fbm/Rotate.png"
+                            defaultTextureURL: TIP_TEXTURE_BASE_URL + "/Rotate.png"
                         },
                         grip: {
-                            defaultTextureURL: viveTipsModelURL + "meshes/Controller-Tips.fbm/Grip.png"
+                            defaultTextureURL: TIP_TEXTURE_BASE_URL + "/Grip.png"
                         },
                         teleport: {
-                            defaultTextureURL: viveTipsModelURL + "meshes/Controller-Tips.fbm/Teleport.png"
+                            defaultTextureURL: TIP_TEXTURE_BASE_URL + "/Teleport.png"
                         }
                     }
                 },