From f4ec09a48b935ebbef05c66d90d5c57276dd781a Mon Sep 17 00:00:00 2001 From: ZappoMan Date: Thu, 23 Jul 2015 10:42:22 -0700 Subject: [PATCH] move renderLaserPointers() into a draw item --- interface/src/Application.cpp | 4 ---- interface/src/avatar/MyAvatar.cpp | 5 +++++ 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp index 8f825a2768..2ea923db2d 100644 --- a/interface/src/Application.cpp +++ b/interface/src/Application.cpp @@ -3295,10 +3295,6 @@ void Application::displaySide(RenderArgs* renderArgs, Camera& theCamera, bool se sceneInterface->setEngineFeedOverlay3DItems(engineRC->_numFeedOverlay3DItems); sceneInterface->setEngineDrawnOverlay3DItems(engineRC->_numDrawnOverlay3DItems); } - //Render the sixense lasers - if (Menu::getInstance()->isOptionChecked(MenuOption::SixenseLasers)) { - _myAvatar->renderLaserPointers(*renderArgs->_batch); - } if (!selfAvatarOnly) { // give external parties a change to hook in diff --git a/interface/src/avatar/MyAvatar.cpp b/interface/src/avatar/MyAvatar.cpp index ac0cb3feda..2a5e92014c 100644 --- a/interface/src/avatar/MyAvatar.cpp +++ b/interface/src/avatar/MyAvatar.cpp @@ -345,6 +345,11 @@ void MyAvatar::render(RenderArgs* renderArgs, const glm::vec3& cameraPosition) { renderArgs && renderArgs->_batch) { _skeletonModel.renderIKConstraints(*renderArgs->_batch); } + + //Render the sixense lasers + if (Menu::getInstance()->isOptionChecked(MenuOption::SixenseLasers)) { + renderLaserPointers(*renderArgs->_batch); + } } const glm::vec3 HAND_TO_PALM_OFFSET(0.0f, 0.12f, 0.08f);