From c0e372c3802b9f550d786dc076865afe7bbf340a Mon Sep 17 00:00:00 2001
From: Ryan Huffman <ryanhuffman@gmail.com>
Date: Tue, 18 Oct 2016 08:49:00 -0700
Subject: [PATCH] Remove annotation API from controller display

---
 .../controllers/controllerDisplayManager.js   |  1 -
 tutorial/tutorial.js                          | 20 -------------------
 2 files changed, 21 deletions(-)

diff --git a/scripts/system/controllers/controllerDisplayManager.js b/scripts/system/controllers/controllerDisplayManager.js
index 2c621f7e90..550357d659 100644
--- a/scripts/system/controllers/controllerDisplayManager.js
+++ b/scripts/system/controllers/controllerDisplayManager.js
@@ -69,7 +69,6 @@ ControllerDisplayManager = function() {
         }
     }
 
-    Messages.subscribe('Controller-Display');
     var handleMessages = function(channel, message, sender) {
         var i, data, name, visible;
         if (!controllerLeft && !controllerRight) {
diff --git a/tutorial/tutorial.js b/tutorial/tutorial.js
index 0f0a24356a..ea8dd792de 100644
--- a/tutorial/tutorial.js
+++ b/tutorial/tutorial.js
@@ -116,14 +116,6 @@ findEntities = function(properties, searchRadius, filterFn) {
     return matchedEntities;
 }
 
-function setControllerVisible(name, visible) {
-    return;
-    Messages.sendLocalMessage('Controller-Display', JSON.stringify({
-        name: name,
-        visible: visible,
-    }));
-}
-
 function setControllerPartsVisible(parts) {
     Messages.sendLocalMessage('Controller-Display-Parts', JSON.stringify(parts));
 }
@@ -479,7 +471,6 @@ stepNearGrab.prototype = {
         this.finished = false;
         this.onFinish = onFinish;
 
-        setControllerVisible("trigger", true);
         setControllerPartLayer('tips', 'trigger');
         setControllerPartLayer('trigger', 'highlight');
         var tag = this.tag;
@@ -522,7 +513,6 @@ stepNearGrab.prototype = {
     cleanup: function() {
         debug("NearGrab | Cleanup");
         this.finished = true;
-        setControllerVisible("trigger", false);
         setControllerPartLayer('tips', 'blank');
         setControllerPartLayer('trigger', 'normal');
         hideEntitiesWithTag(this.tag, { visible: false});
@@ -558,7 +548,6 @@ stepFarGrab.prototype = {
 
         showEntitiesWithTag('bothGrab', { visible: true });
 
-        setControllerVisible("trigger", true);
         setControllerPartLayer('tips', 'trigger');
         setControllerPartLayer('trigger', 'highlight');
         Messages.sendLocalMessage('Hifi-Grab-Disable', JSON.stringify({
@@ -602,7 +591,6 @@ stepFarGrab.prototype = {
     cleanup: function() {
         debug("FarGrab | Cleanup");
         this.finished = true;
-        setControllerVisible("trigger", false);
         setControllerPartLayer('tips', 'blank');
         setControllerPartLayer('trigger', 'normal');
         hideEntitiesWithTag(this.tag, { visible: false});
@@ -662,7 +650,6 @@ var stepEquip = function(name) {
 }
 stepEquip.prototype = {
     start: function(onFinish) {
-        setControllerVisible("trigger", true);
         setControllerPartLayer('tips', 'trigger');
         setControllerPartLayer('trigger', 'highlight');
         Messages.sendLocalMessage('Hifi-Grab-Disable', JSON.stringify({
@@ -764,7 +751,6 @@ stepEquip.prototype = {
             this.watcherIntervalID = null;
         }
 
-        setControllerVisible("trigger", false);
         setControllerPartLayer('tips', 'blank');
         setControllerPartLayer('trigger', 'normal');
         this.stopWatchingGun();
@@ -798,9 +784,6 @@ var stepTurnAround = function(name) {
 }
 stepTurnAround.prototype = {
     start: function(onFinish) {
-        setControllerVisible("left", true);
-        setControllerVisible("right", true);
-
         setControllerPartLayer('touchpad', 'arrows');
         setControllerPartLayer('tips', 'arrows');
 
@@ -840,9 +823,6 @@ stepTurnAround.prototype = {
         } catch (e) {
         }
 
-        setControllerVisible("left", false);
-        setControllerVisible("right", false);
-
         setControllerPartLayer('touchpad', 'blank');
         setControllerPartLayer('tips', 'blank');