From 337bc8b9472accafb34cfdf4e42779f5f23478a5 Mon Sep 17 00:00:00 2001 From: Andrew Meadows Date: Fri, 16 May 2014 08:28:36 -0700 Subject: [PATCH] reuse boolean results rather than recomputing them --- interface/src/avatar/Avatar.cpp | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/interface/src/avatar/Avatar.cpp b/interface/src/avatar/Avatar.cpp index 3ebc9f016f..0a3411f858 100644 --- a/interface/src/avatar/Avatar.cpp +++ b/interface/src/avatar/Avatar.cpp @@ -222,16 +222,14 @@ void Avatar::render(const glm::vec3& cameraPosition, RenderMode renderMode) { updateShapePositions(); } - if (Menu::getInstance()->isOptionChecked(MenuOption::RenderSkeletonCollisionShapes)) { + if (renderSkeleton) { _skeletonModel.renderJointCollisionShapes(0.7f); } - if (Menu::getInstance()->isOptionChecked(MenuOption::RenderHeadCollisionShapes) - && shouldRenderHead(cameraPosition, renderMode)) { + if (renderHead && shouldRenderHead(cameraPosition, renderMode)) { getHead()->getFaceModel().renderJointCollisionShapes(0.7f); } - if (Menu::getInstance()->isOptionChecked(MenuOption::RenderBoundingCollisionShapes) - && shouldRenderHead(cameraPosition, renderMode)) { + if (renderBounding && shouldRenderHead(cameraPosition, renderMode)) { getHead()->getFaceModel().renderBoundingCollisionShapes(0.7f); _skeletonModel.renderBoundingCollisionShapes(0.7f); }