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
116 return matchedEntities;116 return matchedEntities;
117}117}
118 118
119function setControllerVisible(name, visible) {
120 return;
121 Messages.sendLocalMessage('Controller-Display', JSON.stringify({
122 name: name,
123 visible: visible,
124 }));
125}
126
127function setControllerPartsVisible(parts) {119function setControllerPartsVisible(parts) {
128 Messages.sendLocalMessage('Controller-Display-Parts', JSON.stringify(parts));120 Messages.sendLocalMessage('Controller-Display-Parts', JSON.stringify(parts));
129}121}
@@ -479,7 +471,6 @@ stepNearGrab.prototype = { · 349 unmodified lines
479 this.finished = false;471 this.finished = false;
480 this.onFinish = onFinish;472 this.onFinish = onFinish;
481 473
482 setControllerVisible("trigger", true);
483 setControllerPartLayer('tips', 'trigger');474 setControllerPartLayer('tips', 'trigger');
484 setControllerPartLayer('trigger', 'highlight');475 setControllerPartLayer('trigger', 'highlight');
485 var tag = this.tag;476 var tag = this.tag;
@@ -522,7 +513,6 @@ stepNearGrab.prototype = { · 36 unmodified lines
522 cleanup: function() {513 cleanup: function() {
523 debug("NearGrab | Cleanup");514 debug("NearGrab | Cleanup");
524 this.finished = true;515 this.finished = true;
525 setControllerVisible("trigger", false);
526 setControllerPartLayer('tips', 'blank');516 setControllerPartLayer('tips', 'blank');
527 setControllerPartLayer('trigger', 'normal');517 setControllerPartLayer('trigger', 'normal');
528 hideEntitiesWithTag(this.tag, { visible: false});518 hideEntitiesWithTag(this.tag, { visible: false});
@@ -558,7 +548,6 @@ stepFarGrab.prototype = { · 29 unmodified lines
558 548
559 showEntitiesWithTag('bothGrab', { visible: true });549 showEntitiesWithTag('bothGrab', { visible: true });
560 550
561 setControllerVisible("trigger", true);
562 setControllerPartLayer('tips', 'trigger');551 setControllerPartLayer('tips', 'trigger');
563 setControllerPartLayer('trigger', 'highlight');552 setControllerPartLayer('trigger', 'highlight');
564 Messages.sendLocalMessage('Hifi-Grab-Disable', JSON.stringify({553 Messages.sendLocalMessage('Hifi-Grab-Disable', JSON.stringify({
@@ -602,7 +591,6 @@ stepFarGrab.prototype = { · 37 unmodified lines
602 cleanup: function() {591 cleanup: function() {
603 debug("FarGrab | Cleanup");592 debug("FarGrab | Cleanup");
604 this.finished = true;593 this.finished = true;
605 setControllerVisible("trigger", false);
606 setControllerPartLayer('tips', 'blank');594 setControllerPartLayer('tips', 'blank');
607 setControllerPartLayer('trigger', 'normal');595 setControllerPartLayer('trigger', 'normal');
608 hideEntitiesWithTag(this.tag, { visible: false});596 hideEntitiesWithTag(this.tag, { visible: false});
@@ -662,7 +650,6 @@ var stepEquip = function(name) { · 53 unmodified lines
662}650}
663stepEquip.prototype = {651stepEquip.prototype = {
664 start: function(onFinish) {652 start: function(onFinish) {
665 setControllerVisible("trigger", true);
666 setControllerPartLayer('tips', 'trigger');653 setControllerPartLayer('tips', 'trigger');
667 setControllerPartLayer('trigger', 'highlight');654 setControllerPartLayer('trigger', 'highlight');
668 Messages.sendLocalMessage('Hifi-Grab-Disable', JSON.stringify({655 Messages.sendLocalMessage('Hifi-Grab-Disable', JSON.stringify({
@@ -764,7 +751,6 @@ stepEquip.prototype = { · 95 unmodified lines
764 this.watcherIntervalID = null;751 this.watcherIntervalID = null;
765 }752 }
766 753
767 setControllerVisible("trigger", false);
768 setControllerPartLayer('tips', 'blank');754 setControllerPartLayer('tips', 'blank');
769 setControllerPartLayer('trigger', 'normal');755 setControllerPartLayer('trigger', 'normal');
770 this.stopWatchingGun();756 this.stopWatchingGun();
@@ -798,9 +784,6 @@ var stepTurnAround = function(name) { · 27 unmodified lines
798}784}
799stepTurnAround.prototype = {785stepTurnAround.prototype = {
800 start: function(onFinish) {786 start: function(onFinish) {
801 setControllerVisible("left", true);
802 setControllerVisible("right", true);
803
804 setControllerPartLayer('touchpad', 'arrows');787 setControllerPartLayer('touchpad', 'arrows');
805 setControllerPartLayer('tips', 'arrows');788 setControllerPartLayer('tips', 'arrows');
806 789
@@ -840,9 +823,6 @@ stepTurnAround.prototype = { · 33 unmodified lines
840 } catch (e) {823 } catch (e) {
841 }824 }
842 825
843 setControllerVisible("left", false);
844 setControllerVisible("right", false);
845
846 setControllerPartLayer('touchpad', 'blank');826 setControllerPartLayer('touchpad', 'blank');
847 setControllerPartLayer('tips', 'blank');827 setControllerPartLayer('tips', 'blank');
848 828