Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-07 16:50:43 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'debug-grab' of github.com:sethalves/hifi into debug-grab

Browse source
This commit is contained in:
Seth Alves 2015-09-30 10:58:05 -07:00
commit ba317a0511
1 changed files with 15 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
interface/src/ui/ApplicationCompositor.cpp
View file

@ -313,6 +313,8 @@ void ApplicationCompositor::displayOverlayTextureHmd(RenderArgs* renderArgs, int
glm::mat4 overlayXfm; glm::mat4 overlayXfm;
_modelTransform.getMatrix(overlayXfm); _modelTransform.getMatrix(overlayXfm);
// Only render the hand pointers if the HandMouseInput is enabled
if (Menu::getInstance()->isOptionChecked(MenuOption::HandMouseInput)) {
MyAvatar* myAvatar = DependencyManager::get<AvatarManager>()->getMyAvatar(); MyAvatar* myAvatar = DependencyManager::get<AvatarManager>()->getMyAvatar();
for (int i = 0; i < (int)myAvatar->getHand()->getNumPalms(); i++) { for (int i = 0; i < (int)myAvatar->getHand()->getNumPalms(); i++) {
PalmData& palm = myAvatar->getHand()->getPalms()[i]; PalmData& palm = myAvatar->getHand()->getPalms()[i];
@ -327,6 +329,7 @@ void ApplicationCompositor::displayOverlayTextureHmd(RenderArgs* renderArgs, int
geometryCache->renderUnitQuad(batch, glm::vec4(1), _reticleQuad); geometryCache->renderUnitQuad(batch, glm::vec4(1), _reticleQuad);
} }
} }
}
//Mouse Pointer //Mouse Pointer
if (_reticleActive[MOUSE]) { if (_reticleActive[MOUSE]) {