Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-06 16:36:54 +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

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

@ -313,18 +313,21 @@ void ApplicationCompositor::displayOverlayTextureHmd(RenderArgs* renderArgs, int
glm::mat4 overlayXfm; glm::mat4 overlayXfm;
_modelTransform.getMatrix(overlayXfm); _modelTransform.getMatrix(overlayXfm);
MyAvatar* myAvatar = DependencyManager::get<AvatarManager>()->getMyAvatar(); // Only render the hand pointers if the HandMouseInput is enabled
for (int i = 0; i < (int)myAvatar->getHand()->getNumPalms(); i++) { if (Menu::getInstance()->isOptionChecked(MenuOption::HandMouseInput)) {
PalmData& palm = myAvatar->getHand()->getPalms()[i]; MyAvatar* myAvatar = DependencyManager::get<AvatarManager>()->getMyAvatar();
if (palm.isActive()) { for (int i = 0; i < (int)myAvatar->getHand()->getNumPalms(); i++) {
glm::vec2 polar = getPolarCoordinates(palm); PalmData& palm = myAvatar->getHand()->getPalms()[i];
// Convert to quaternion if (palm.isActive()) {
mat4 pointerXfm = glm::mat4_cast(quat(vec3(polar.y, -polar.x, 0.0f))) * glm::translate(mat4(), vec3(0, 0, -1)); glm::vec2 polar = getPolarCoordinates(palm);
mat4 reticleXfm = overlayXfm * pointerXfm; // Convert to quaternion
reticleXfm = glm::scale(reticleXfm, reticleScale); mat4 pointerXfm = glm::mat4_cast(quat(vec3(polar.y, -polar.x, 0.0f))) * glm::translate(mat4(), vec3(0, 0, -1));
batch.setModelTransform(reticleXfm); mat4 reticleXfm = overlayXfm * pointerXfm;
// Render reticle at location reticleXfm = glm::scale(reticleXfm, reticleScale);
geometryCache->renderUnitQuad(batch, glm::vec4(1), _reticleQuad); batch.setModelTransform(reticleXfm);
// Render reticle at location
geometryCache->renderUnitQuad(batch, glm::vec4(1), _reticleQuad);
}
} }
} }