From 1f25ba8f1ffa654365fd676cfbf7f892a0e9d5b3 Mon Sep 17 00:00:00 2001
From: Ryan Huffman <ryanhuffman@gmail.com>
Date: Fri, 14 Oct 2016 14:05:06 -0700
Subject: [PATCH] Update controller tips and trigger highlight in tutorial

---
 .../viveControllerConfiguration.js            | 29 +++++++++++++++++--
 tutorial/tutorial.js                          | 11 +++++++
 2 files changed, 37 insertions(+), 3 deletions(-)

diff --git a/scripts/system/controllers/viveControllerConfiguration.js b/scripts/system/controllers/viveControllerConfiguration.js
index 341b8256f7..11fc774376 100644
--- a/scripts/system/controllers/viveControllerConfiguration.js
+++ b/scripts/system/controllers/viveControllerConfiguration.js
@@ -62,6 +62,7 @@ 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";
+var viveTriggerModelURL = "meshes/controller/vive_trigger.fbx"
 
 VIVE_CONTROLLER_CONFIGURATION_LEFT = {
     name: "Vive",
@@ -86,7 +87,7 @@ VIVE_CONTROLLER_CONFIGURATION_LEFT = {
                     defaultTextureLayer: "blank",
                     textureLayers: {
                         blank: {
-                            defaultTextureURL: TIP_TEXTURE_BASE_URL + "Blank.png"
+                            defaultTextureURL: TIP_TEXTURE_BASE_URL + "/Blank.png"
                         },
                         trigger: {
                             defaultTextureURL: TIP_TEXTURE_BASE_URL + "/Trigger.png"
@@ -141,7 +142,18 @@ VIVE_CONTROLLER_CONFIGURATION_LEFT = {
                     minValue: 0.0,
                     maxValue: 1.0,
                     axis: { x: -1, y: 0, z: 0 },
-                    maxAngle: 20
+                    maxAngle: 25,
+
+                    textureName: "Tex.black-trigger",
+                    defaultTextureLayer: "normal",
+                    textureLayers: {
+                        normal: {
+                            defaultTextureURL: viveTriggerModelURL + "/Trigger.fbm/black.jpg",
+                        },
+                        highlight: {
+                            defaultTextureURL: viveTriggerModelURL + "/Trigger.fbm/yellow.jpg",
+                        }
+                    }
                 },
 
                 l_grip: {
@@ -262,7 +274,18 @@ VIVE_CONTROLLER_CONFIGURATION_RIGHT = {
                     minValue: 0.0,
                     maxValue: 1.0,
                     axis: { x: -1, y: 0, z: 0 },
-                    maxAngle: 25
+                    maxAngle: 25,
+
+                    textureName: "Tex.black-trigger",
+                    defaultTextureLayer: "normal",
+                    textureLayers: {
+                        normal: {
+                            defaultTextureURL: viveTriggerModelURL + "/Trigger.fbm/black.jpg",
+                        },
+                        highlight: {
+                            defaultTextureURL: viveTriggerModelURL + "/Trigger.fbm/yellow.jpg",
+                        }
+                    }
                 },
 
                 l_grip: {
diff --git a/tutorial/tutorial.js b/tutorial/tutorial.js
index 871d16a218..d666c39aae 100644
--- a/tutorial/tutorial.js
+++ b/tutorial/tutorial.js
@@ -254,6 +254,7 @@ var stepDisableControllers = function(name) {
 stepDisableControllers.prototype = {
     start: function(onFinish) {
         HMD.requestShowHandControllers();
+
         disableEverything();
 
         onFinish();
@@ -277,6 +278,9 @@ function disableEverything() {
     setControllerPartLayer('tips', 'blank');
 
     hideEntitiesWithTag('finish');
+
+    controllerDisplayManager = new ControllerDisplayManager();
+
     setAwayEnabled(false);
 }
 
@@ -471,6 +475,7 @@ stepNearGrab.prototype = {
 
         setControllerVisible("trigger", true);
         setControllerPartLayer('tips', 'trigger');
+        setControllerPartLayer('trigger', 'highlight');
         var tag = this.tag;
 
         // Spawn content set
@@ -513,6 +518,7 @@ stepNearGrab.prototype = {
         this.finished = true;
         setControllerVisible("trigger", false);
         setControllerPartLayer('tips', 'blank');
+        setControllerPartLayer('trigger', 'normal');
         hideEntitiesWithTag(this.tag, { visible: false});
         deleteEntitiesWithTag(this.tempTag);
         if (this.positionWatcher) {
@@ -548,6 +554,7 @@ stepFarGrab.prototype = {
 
         setControllerVisible("trigger", true);
         setControllerPartLayer('tips', 'trigger');
+        setControllerPartLayer('trigger', 'highlight');
         Messages.sendLocalMessage('Hifi-Grab-Disable', JSON.stringify({
             farGrabEnabled: true,
         }));
@@ -591,6 +598,7 @@ stepFarGrab.prototype = {
         this.finished = true;
         setControllerVisible("trigger", false);
         setControllerPartLayer('tips', 'blank');
+        setControllerPartLayer('trigger', 'normal');
         hideEntitiesWithTag(this.tag, { visible: false});
         hideEntitiesWithTag('bothGrab', { visible: false});
         deleteEntitiesWithTag(this.tempTag);
@@ -650,6 +658,7 @@ stepEquip.prototype = {
     start: function(onFinish) {
         setControllerVisible("trigger", true);
         setControllerPartLayer('tips', 'trigger');
+        setControllerPartLayer('trigger', 'highlight');
         Messages.sendLocalMessage('Hifi-Grab-Disable', JSON.stringify({
             holdEnabled: true,
         }));
@@ -723,6 +732,7 @@ stepEquip.prototype = {
                     this.currentPart = this.PART3;
                     hideEntitiesWithTag(this.tagPart1);
                     showEntitiesWithTag(this.tagPart2);
+                    setControllerPartLayer('trigger', 'normal');
                     setControllerPartLayer('tips', 'grip');
                     Messages.subscribe('Hifi-Object-Manipulation');
                     debug("Equip | Finished starting part 3");
@@ -750,6 +760,7 @@ stepEquip.prototype = {
 
         setControllerVisible("trigger", false);
         setControllerPartLayer('tips', 'blank');
+        setControllerPartLayer('trigger', 'normal');
         this.stopWatchingGun();
         this.currentPart = this.COMPLETE;