From 581d87d6536b45867ea751369d5a3bd534948014 Mon Sep 17 00:00:00 2001
From: howard-stearns <howard.stearns@gmail.com>
Date: Wed, 22 Jun 2016 16:40:10 -0700
Subject: [PATCH] feedback re magic numbers and variable name.

---
 .../src/display-plugins/hmd/HmdDisplayPlugin.cpp      | 11 ++++++-----
 plugins/openvr/src/OpenVrHelpers.cpp                  |  3 ++-
 scripts/system/controllers/handControllerGrab.js      |  4 ++--
 3 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/libraries/display-plugins/src/display-plugins/hmd/HmdDisplayPlugin.cpp b/libraries/display-plugins/src/display-plugins/hmd/HmdDisplayPlugin.cpp
index dbf264179e..f1aa1edc81 100644
--- a/libraries/display-plugins/src/display-plugins/hmd/HmdDisplayPlugin.cpp
+++ b/libraries/display-plugins/src/display-plugins/hmd/HmdDisplayPlugin.cpp
@@ -420,8 +420,9 @@ bool HmdDisplayPlugin::setHandLaser(uint32_t hands, HandLaserMode mode, const ve
 }
 
 void HmdDisplayPlugin::compositeExtra() {
-    std::array<HandLaserInfo, 2> handLasers;
-    std::array<mat4, 2> renderHandPoses;
+    const int NUMBER_OF_HANDS = 2;
+    std::array<HandLaserInfo, NUMBER_OF_HANDS> handLasers;
+    std::array<mat4, NUMBER_OF_HANDS> renderHandPoses;
     Transform uiModelTransform;
     withPresentThreadLock([&] {
         handLasers = _handLasers;
@@ -443,9 +444,9 @@ void HmdDisplayPlugin::compositeExtra() {
     using namespace oglplus;
     useProgram(_laserProgram);
     _laserGeometry->Use();
-    std::array<mat4, 2> handLaserModelMatrices;
+    std::array<mat4, NUMBER_OF_HANDS> handLaserModelMatrices;
 
-    for (int i = 0; i < 2; ++i) {
+    for (int i = 0; i < NUMBER_OF_HANDS; ++i) {
         if (renderHandPoses[i] == identity) {
             continue;
         }
@@ -485,7 +486,7 @@ void HmdDisplayPlugin::compositeExtra() {
         auto eyePose = _currentPresentFrameInfo.presentPose * getEyeToHeadTransform(eye);
         auto view = glm::inverse(eyePose);
         const auto& projection = _eyeProjections[eye];
-        for (int i = 0; i < 2; ++i) {
+        for (int i = 0; i < NUMBER_OF_HANDS; ++i) {
             if (handLaserModelMatrices[i] == identity) {
                 continue;
             }
diff --git a/plugins/openvr/src/OpenVrHelpers.cpp b/plugins/openvr/src/OpenVrHelpers.cpp
index 436cd7fc30..e71c8942d6 100644
--- a/plugins/openvr/src/OpenVrHelpers.cpp
+++ b/plugins/openvr/src/OpenVrHelpers.cpp
@@ -194,7 +194,8 @@ void enableOpenVrKeyboard(PluginContainer* container) {
     _overlayMenuConnection = QObject::connect(action, &QAction::triggered, [action] {
         if (action->isChecked()) {
             _overlayRevealed = true;
-            QTimer::singleShot(100, [&] { _overlayRevealed = false; });
+            const int KEYBOARD_DELAY_MS = 100;
+            QTimer::singleShot(KEYBOARD_DELAY_MS, [&] { _overlayRevealed = false; });
         }
     });
 
diff --git a/scripts/system/controllers/handControllerGrab.js b/scripts/system/controllers/handControllerGrab.js
index 39d85f1224..7706132c58 100644
--- a/scripts/system/controllers/handControllerGrab.js
+++ b/scripts/system/controllers/handControllerGrab.js
@@ -877,8 +877,8 @@ function MyController(hand) {
 
         // find entities near the avatar that might be equipable.
         var entities = Entities.findEntities(MyAvatar.position, HOTSPOT_DRAW_DISTANCE);
-        var i, l = entities.length;
-        for (i = 0; i < l; i++) {
+        var i, length = entities.length;
+        for (i = 0; i < length; i++) {
             var grabProps = Entities.getEntityProperties(entities[i], GRABBABLE_PROPERTIES);
             // does this entity have an attach point?
             var wearableData = getEntityCustomData("wearable", entities[i], undefined);