Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-25 23:36:41 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Don't render the hover text in mirror/billboard mode. Closes #2098.

Browse source
This commit is contained in:
Andrzej Kapolka 2014-02-25 15:34:16 -08:00
parent c588a33b01
commit 038f1acf01
3 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
interface/src/avatar/AvatarManager.cpp
View file

@ -92,7 +92,7 @@ void AvatarManager::renderAvatars(bool forceRenderMyHead, bool selfAvatarOnly) {
renderAvatarFades(); renderAvatarFades();
} else { } else {
// just render myAvatar // just render myAvatar
_myAvatar->render(forceRenderMyHead); _myAvatar->render(forceRenderMyHead, true);
_myAvatar->setDisplayingLookatVectors(renderLookAtVectors); _myAvatar->setDisplayingLookatVectors(renderLookAtVectors);
} }
} }

7
interface/src/avatar/MyAvatar.cpp
View file

@ -452,7 +452,7 @@ void MyAvatar::renderDebugBodyPoints() {
} }
void MyAvatar::render(bool forceRenderHead) { void MyAvatar::render(bool forceRenderHead, bool avatarOnly) {
// don't render if we've been asked to disable local rendering // don't render if we've been asked to disable local rendering
if (!_shouldRender) { if (!_shouldRender) {
return; // exit early return; // exit early
@ -468,7 +468,10 @@ void MyAvatar::render(bool forceRenderHead) {
if (Menu::getInstance()->isOptionChecked(MenuOption::Avatars)) { if (Menu::getInstance()->isOptionChecked(MenuOption::Avatars)) {
renderBody(forceRenderHead); renderBody(forceRenderHead);
} }
setShowDisplayName(true); setShowDisplayName(!avatarOnly);
if (avatarOnly) {
return;
}
renderDisplayName(); renderDisplayName();
if (!_chatMessage.empty()) { if (!_chatMessage.empty()) {

2
interface/src/avatar/MyAvatar.h
View file

@ -35,7 +35,7 @@ public:
void simulate(float deltaTime); void simulate(float deltaTime);
void updateFromGyros(float deltaTime); void updateFromGyros(float deltaTime);
void render(bool forceRenderHead); void render(bool forceRenderHead, bool avatarOnly = false);
void renderDebugBodyPoints(); void renderDebugBodyPoints();
void renderHeadMouse() const; void renderHeadMouse() const;