From d86f1b50a7c8a68c1d261879520eb0d915dc19ca Mon Sep 17 00:00:00 2001 From: Brad Hefta-Gaub Date: Tue, 27 Oct 2015 16:37:43 -0700 Subject: [PATCH] more cleanup --- interface/src/avatar/Hand.cpp | 6 ++---- interface/src/ui/ApplicationCompositor.cpp | 3 +-- libraries/avatars/src/HandData.cpp | 3 +-- 3 files changed, 4 insertions(+), 8 deletions(-) diff --git a/interface/src/avatar/Hand.cpp b/interface/src/avatar/Hand.cpp index dfac5e393f..15a3163998 100644 --- a/interface/src/avatar/Hand.cpp +++ b/interface/src/avatar/Hand.cpp @@ -51,8 +51,7 @@ void Hand::renderHandTargets(RenderArgs* renderArgs, bool isMine) { gpu::Batch& batch = *renderArgs->_batch; if (isMine) { - for (size_t i = 0; i < palms.size(); i++) { - PalmData& palm = palms[i]; + for (const auto& palm : palms) { if (!palm.isActive()) { continue; } @@ -78,8 +77,7 @@ void Hand::renderHandTargets(RenderArgs* renderArgs, bool isMine) { const float AXIS_LENGTH = 10.0f * SPHERE_RADIUS; // Draw the coordinate frames of the hand targets - for (size_t i = 0; i < palms.size(); ++i) { - PalmData& palm = palms[i]; + for (const auto& palm : palms) { if (palm.isActive()) { glm::vec3 root = palm.getPosition(); diff --git a/interface/src/ui/ApplicationCompositor.cpp b/interface/src/ui/ApplicationCompositor.cpp index 2f442a3284..2a2a45b67b 100644 --- a/interface/src/ui/ApplicationCompositor.cpp +++ b/interface/src/ui/ApplicationCompositor.cpp @@ -321,8 +321,7 @@ void ApplicationCompositor::displayOverlayTextureHmd(RenderArgs* renderArgs, int if (Menu::getInstance()->isOptionChecked(MenuOption::EnableHandMouseInput)) { MyAvatar* myAvatar = DependencyManager::get()->getMyAvatar(); auto palms = myAvatar->getHand()->getCopyOfPalms(); - for (int i = 0; i < (int)palms.size(); i++) { - const auto& palm = palms[i]; + for (const auto& palm : palms) { if (palm.isActive()) { glm::vec2 polar = getPolarCoordinates(palm); // Convert to quaternion diff --git a/libraries/avatars/src/HandData.cpp b/libraries/avatars/src/HandData.cpp index 413a5ea955..fc6d18932a 100644 --- a/libraries/avatars/src/HandData.cpp +++ b/libraries/avatars/src/HandData.cpp @@ -85,8 +85,7 @@ bool HandData::findSpherePenetration(const glm::vec3& penetratorCenter, float pe const PalmData*& collidingPalm) const { QReadLocker locker(&_palmsLock); - for (size_t i = 0; i < _palms.size(); ++i) { - const PalmData& palm = _palms[i]; + for (const auto& palm : _palms) { if (!palm.isActive()) { continue; }