History

Remove annotation API from controller display

Ryan Huffman committed 10 years ago

Commit c0e372c1 parent b9bc9bb2 files · +0 −21Browse files

Showing the changes to tutorial/tutorial.js (1 of 2 files). Show all

Unified · Split

tutorial/tutorial.js+0−20
@@ -116,14 +116,6 @@ findEntities = function(properties, searchRadius, filterFn) { · 115 unmodified lines
116116 return matchedEntities;
117117 }
118118
119−function setControllerVisible(name, visible) {
120− return;
121− Messages.sendLocalMessage('Controller-Display', JSON.stringify({
122− name: name,
123− visible: visible,
124− }));
125−}
126−
127119 function setControllerPartsVisible(parts) {
128120 Messages.sendLocalMessage('Controller-Display-Parts', JSON.stringify(parts));
129121 }
@@ -479,7 +471,6 @@ stepNearGrab.prototype = { · 349 unmodified lines
479471 this.finished = false;
480472 this.onFinish = onFinish;
481473
482− setControllerVisible("trigger", true);
483474 setControllerPartLayer('tips', 'trigger');
484475 setControllerPartLayer('trigger', 'highlight');
485476 var tag = this.tag;
@@ -522,7 +513,6 @@ stepNearGrab.prototype = { · 36 unmodified lines
522513 cleanup: function() {
523514 debug("NearGrab | Cleanup");
524515 this.finished = true;
525− setControllerVisible("trigger", false);
526516 setControllerPartLayer('tips', 'blank');
527517 setControllerPartLayer('trigger', 'normal');
528518 hideEntitiesWithTag(this.tag, { visible: false});
@@ -558,7 +548,6 @@ stepFarGrab.prototype = { · 29 unmodified lines
558548
559549 showEntitiesWithTag('bothGrab', { visible: true });
560550
561− setControllerVisible("trigger", true);
562551 setControllerPartLayer('tips', 'trigger');
563552 setControllerPartLayer('trigger', 'highlight');
564553 Messages.sendLocalMessage('Hifi-Grab-Disable', JSON.stringify({
@@ -602,7 +591,6 @@ stepFarGrab.prototype = { · 37 unmodified lines
602591 cleanup: function() {
603592 debug("FarGrab | Cleanup");
604593 this.finished = true;
605− setControllerVisible("trigger", false);
606594 setControllerPartLayer('tips', 'blank');
607595 setControllerPartLayer('trigger', 'normal');
608596 hideEntitiesWithTag(this.tag, { visible: false});
@@ -662,7 +650,6 @@ var stepEquip = function(name) { · 53 unmodified lines
662650 }
663651 stepEquip.prototype = {
664652 start: function(onFinish) {
665− setControllerVisible("trigger", true);
666653 setControllerPartLayer('tips', 'trigger');
667654 setControllerPartLayer('trigger', 'highlight');
668655 Messages.sendLocalMessage('Hifi-Grab-Disable', JSON.stringify({
@@ -764,7 +751,6 @@ stepEquip.prototype = { · 95 unmodified lines
764751 this.watcherIntervalID = null;
765752 }
766753
767− setControllerVisible("trigger", false);
768754 setControllerPartLayer('tips', 'blank');
769755 setControllerPartLayer('trigger', 'normal');
770756 this.stopWatchingGun();
@@ -798,9 +784,6 @@ var stepTurnAround = function(name) { · 27 unmodified lines
798784 }
799785 stepTurnAround.prototype = {
800786 start: function(onFinish) {
801− setControllerVisible("left", true);
802− setControllerVisible("right", true);
803−
804787 setControllerPartLayer('touchpad', 'arrows');
805788 setControllerPartLayer('tips', 'arrows');
806789
@@ -840,9 +823,6 @@ stepTurnAround.prototype = { · 33 unmodified lines
840823 } catch (e) {
841824 }
842825
843− setControllerVisible("left", false);
844− setControllerVisible("right", false);
845−
846826 setControllerPartLayer('touchpad', 'blank');
847827 setControllerPartLayer('tips', 'blank');
848828