From c9ef6d5b26f432781930c00f40f4c1fe4d8e5e24 Mon Sep 17 00:00:00 2001
From: Sam Gondelman <samuel_gondelman@brown.edu>
Date: Wed, 29 Jul 2015 12:09:28 -0700
Subject: [PATCH] fixed some scripts to work with plugins branch

---
 examples/hmdControls.js   | 22 +++++++++++-----------
 examples/notifications.js |  3 +--
 examples/progress.js      |  3 +--
 3 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/examples/hmdControls.js b/examples/hmdControls.js
index e14ddca3ef..8cb8a4934a 100644
--- a/examples/hmdControls.js
+++ b/examples/hmdControls.js
@@ -55,8 +55,8 @@ var warpLine = Overlays.addOverlay("line3d", {
 var velocity = { x: 0, y: 0, z: 0 };
 var VERY_LONG_TIME = 1000000.0;
 
-var active = Menu.isOptionChecked("Enable VR Mode");
-var prevVRMode = Menu.isOptionChecked("Enable VR Mode");
+var active = HMD.active;
+var prevVRMode = HMD.active;
 
 var hmdControls = (function () {
 
@@ -121,28 +121,28 @@ var hmdControls = (function () {
                 velocity = Vec3.sum(velocity, direction);
                 break;
             case findAction("YAW_LEFT"):
-                if (yawTimer < 0.0 && Menu.isOptionChecked("Enable VR Mode")) {
+                if (yawTimer < 0.0 && HMD.active) {
                     yawChange = yawChange + (shifted ? SHIFT_MAG * VR_YAW_INCREMENT : VR_YAW_INCREMENT);
                     yawTimer = CAMERA_UPDATE_TIME;
-                } else if (!Menu.isOptionChecked("Enable VR Mode")) {
+                } else if (!HMD.active) {
                     yawChange = yawChange + (shifted ? SHIFT_MAG * YAW_INCREMENT : YAW_INCREMENT);
                 }
                 break;
             case findAction("YAW_RIGHT"):
-                if (yawTimer < 0.0 && Menu.isOptionChecked("Enable VR Mode")) {
+                if (yawTimer < 0.0 && HMD.active) {
                     yawChange = yawChange - (shifted ? SHIFT_MAG * VR_YAW_INCREMENT : VR_YAW_INCREMENT);
                     yawTimer = CAMERA_UPDATE_TIME;
-                } else if (!Menu.isOptionChecked("Enable VR Mode")) {
+                } else if (!HMD.active) {
                     yawChange = yawChange - (shifted ? SHIFT_MAG * YAW_INCREMENT : YAW_INCREMENT);
                 }
                 break;
             case findAction("PITCH_DOWN"):
-                if (!Menu.isOptionChecked("Enable VR Mode")) {
+                if (!HMD.active) {
                     pitchChange = pitchChange - (shifted ? SHIFT_MAG * PITCH_INCREMENT : PITCH_INCREMENT);
                 }
                 break;
             case findAction("PITCH_UP"):
-                if (!Menu.isOptionChecked("Enable VR Mode")) {
+                if (!HMD.active) {
                     pitchChange = pitchChange + (shifted ? SHIFT_MAG * PITCH_INCREMENT : PITCH_INCREMENT);
                 }
                 break;
@@ -175,9 +175,9 @@ var hmdControls = (function () {
     }
 
     function update(dt) {
-        if (prevVRMode != Menu.isOptionChecked("Enable VR Mode")) {
-            active = Menu.isOptionChecked("Enable VR Mode");
-            prevVRMode = Menu.isOptionChecked("Enable VR Mode");
+        if (prevVRMode != HMD.active) {
+            active = HMD.active;
+            prevVRMode = HMD.active;
         }
 
         if (yawTimer >= 0.0) {
diff --git a/examples/notifications.js b/examples/notifications.js
index 5ee6874521..7d58404a7b 100644
--- a/examples/notifications.js
+++ b/examples/notifications.js
@@ -130,7 +130,6 @@ var heights = [];
 var myAlpha = [];
 var arrays = [];
 var isOnHMD = false,
-    ENABLE_VR_MODE = "Enable VR Mode",
     NOTIFICATIONS_3D_DIRECTION = 0.0,  // Degrees from avatar orientation.
     NOTIFICATIONS_3D_DISTANCE = 0.6,  // Horizontal distance from avatar position.
     NOTIFICATIONS_3D_ELEVATION = -0.8,  // Height of top middle of top notification relative to avatar eyes.
@@ -414,7 +413,7 @@ function update() {
         j,
         k;
 
-    if (isOnHMD !== Menu.isOptionChecked(ENABLE_VR_MODE)) {
+    if (isOnHMD !== HMD.active) {
         while (arrays.length > 0) {
             deleteNotification(0);
         }
diff --git a/examples/progress.js b/examples/progress.js
index 55ea15f218..349f192f91 100644
--- a/examples/progress.js
+++ b/examples/progress.js
@@ -41,7 +41,6 @@
         SCALE_2D = 0.35,                            // Scale the SVGs for 2D display.
         background3D = {},
         bar3D = {},
-        ENABLE_VR_MODE_MENU_ITEM = "Enable VR Mode",
         PROGRESS_3D_DIRECTION = 0.0,                // Degrees from avatar orientation.
         PROGRESS_3D_DISTANCE = 0.602,               // Horizontal distance from avatar position.
         PROGRESS_3D_ELEVATION = -0.8,               // Height of top middle of top notification relative to avatar eyes.
@@ -157,7 +156,7 @@
             eyePosition,
             avatarOrientation;
 
-        if (isOnHMD !== Menu.isOptionChecked(ENABLE_VR_MODE_MENU_ITEM)) {
+        if (isOnHMD !== HMD.active) {
             deleteOverlays();
             isOnHMD = !isOnHMD;
             createOverlays();