Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-07-05 10:58:49 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Proper header on ribbon.js, show display name for own avatar.

Browse source
This commit is contained in:
Andrzej Kapolka 2014-02-24 13:36:43 -08:00
parent 1167ecdf77
commit 2cea83a599
3 changed files with 11 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
examples/ribbon.js
View file

@ -1,4 +1,10 @@
// Draws a screensavery rainbow ribbon. //
// ribbon.js
// hifi
//
// Created by Andrzej Kapolka on 2/24/14.
// Copyright (c) 2014 High Fidelity, Inc. All rights reserved.
//
function vectorMultiply(vector, scalar) { function vectorMultiply(vector, scalar) {
return [ vector[0] * scalar, vector[1] * scalar, vector[2] * scalar ]; return [ vector[0] * scalar, vector[1] * scalar, vector[2] * scalar ];

4
interface/src/avatar/Avatar.h
View file

@ -171,6 +171,8 @@ protected:
float getPelvisFloatingHeight() const; float getPelvisFloatingHeight() const;
float getPelvisToHeadLength() const; float getPelvisToHeadLength() const;
void renderDisplayName();
private: private:
bool _initialized; bool _initialized;
@ -178,8 +180,6 @@ private:
void renderBody(); void renderBody();
void renderBillboard(); void renderBillboard();
void renderDisplayName();
}; };
#endif #endif

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

@ -480,8 +480,8 @@ void MyAvatar::render(bool forceRenderHead) {
if (Menu::getInstance()->isOptionChecked(MenuOption::Avatars)) { if (Menu::getInstance()->isOptionChecked(MenuOption::Avatars)) {
renderBody(forceRenderHead); renderBody(forceRenderHead);
} }
setShowDisplayName(true);
//renderDebugBodyPoints(); renderDisplayName();
if (!_chatMessage.empty()) { if (!_chatMessage.empty()) {
int width = 0; int width = 0;